From 732416f52f49eeb542401439e5b96b4b1a083c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Thu, 3 Aug 2023 12:19:30 +0200
Subject: [PATCH] fix(core): Fix property existence checks on AugmentObject
 (#6842)

Fixes https://community.n8n.io/t/code-node-returns-full-item-object-on-node-all/28823
---
 packages/workflow/src/AugmentObject.ts       | 9 ++++-----
 packages/workflow/test/AugmentObject.test.ts | 1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/workflow/src/AugmentObject.ts b/packages/workflow/src/AugmentObject.ts
index dd4e868f85..01e6f03ecb 100644
--- a/packages/workflow/src/AugmentObject.ts
+++ b/packages/workflow/src/AugmentObject.ts
@@ -33,7 +33,7 @@ export function augmentArray<T>(data: T[]): T[] {
 			return Reflect.deleteProperty(getData(), key);
 		},
 		get(target, key: string, receiver): unknown {
-			const value = Reflect.get(newData !== undefined ? newData : target, key, receiver) as unknown;
+			const value = Reflect.get(newData ?? target, key, receiver) as unknown;
 			const newValue = augment(value);
 			if (newValue !== value) {
 				newData = getData();
@@ -54,10 +54,10 @@ export function augmentArray<T>(data: T[]): T[] {
 			return Object.getOwnPropertyDescriptor(data, key) ?? defaultPropertyDescriptor;
 		},
 		has(target, key) {
-			return Reflect.has(newData !== undefined ? newData : target, key);
+			return Reflect.has(newData ?? target, key);
 		},
 		ownKeys(target) {
-			return Reflect.ownKeys(newData !== undefined ? newData : target);
+			return Reflect.ownKeys(newData ?? target);
 		},
 		set(target, key: string, newValue: unknown) {
 			// Always proxy all objects. Like that we can check in get simply if it
@@ -134,8 +134,7 @@ export function augmentObject<T extends object>(data: T): T {
 		},
 		has(target, key) {
 			if (deletedProperties.indexOf(key) !== -1) return false;
-			const newKeys = Object.keys(newData);
-			return Reflect.has(newKeys.length ? newData : target, key);
+			return Reflect.has(newData, key) || Reflect.has(target, key);
 		},
 		ownKeys(target) {
 			const originalKeys = Reflect.ownKeys(target);
diff --git a/packages/workflow/test/AugmentObject.test.ts b/packages/workflow/test/AugmentObject.test.ts
index ab208f6c21..25cc6d4317 100644
--- a/packages/workflow/test/AugmentObject.test.ts
+++ b/packages/workflow/test/AugmentObject.test.ts
@@ -570,6 +570,7 @@ describe('AugmentObject', () => {
 
 			augmentedObject.x.z = 5;
 			expect('z' in augmentedObject.x).toBe(true);
+			expect('y' in augmentedObject.x).toBe(true);
 		});
 	});
 });