Skip to content

Commit

Permalink
fix(core): Fix property existence checks on AugmentObject (#6842)
Browse files Browse the repository at this point in the history
  • Loading branch information
netroy committed Aug 17, 2023
1 parent 88c7090 commit 3e4483a
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 4 deletions.
11 changes: 7 additions & 4 deletions packages/workflow/src/AugmentObject.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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
Expand Down Expand Up @@ -133,7 +133,10 @@ export function augmentObject<T extends object>(data: T): T {

return true;
},

has(target, key) {
if (deletedProperties.indexOf(key) !== -1) return false;
return Reflect.has(newData, key) || Reflect.has(target, key);
},
ownKeys(target) {
const originalKeys = Reflect.ownKeys(target);
const newKeys = Object.keys(newData);
Expand Down
15 changes: 15 additions & 0 deletions packages/workflow/test/AugmentObject.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -557,5 +557,20 @@ describe('AugmentObject', () => {
writable: true,
});
});

test('should return valid values on `has` calls', () => {
const originalObject = {
x: {
y: {},
},
};
const augmentedObject = augmentObject(originalObject);
expect('y' in augmentedObject.x).toBe(true);
expect('z' in augmentedObject.x).toBe(false);

augmentedObject.x.z = 5;
expect('z' in augmentedObject.x).toBe(true);
expect('y' in augmentedObject.x).toBe(true);
});
});
});

0 comments on commit 3e4483a

Please sign in to comment.