mirror of
https://github.com/n8n-io/n8n.git
synced 2024-11-10 06:34:05 -08:00
fix(core): Handle Date and RegExp objects in AugmentObject (#5809)
This commit is contained in:
parent
4f91525022
commit
6c35ffa82c
|
@ -1,6 +1,24 @@
|
|||
import type { IDataObject } from './Interfaces';
|
||||
import util from 'util';
|
||||
|
||||
function augment<T>(value: T): T {
|
||||
if (
|
||||
typeof value !== 'object' ||
|
||||
value === null ||
|
||||
util.types.isProxy(value) ||
|
||||
value instanceof RegExp
|
||||
)
|
||||
return value;
|
||||
|
||||
if (value instanceof Date) return new Date(value.valueOf()) as T;
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-use-before-define
|
||||
if (Array.isArray(value)) return augmentArray(value) as T;
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-use-before-define
|
||||
return augmentObject(value) as T;
|
||||
}
|
||||
|
||||
export function augmentArray<T>(data: T[]): T[] {
|
||||
let newData: unknown[] | undefined = undefined;
|
||||
|
||||
|
@ -17,24 +35,12 @@ export function augmentArray<T>(data: T[]): T[] {
|
|||
},
|
||||
get(target, key: string, receiver): unknown {
|
||||
const value = Reflect.get(newData !== undefined ? newData : target, key, receiver) as unknown;
|
||||
|
||||
if (typeof value === 'object') {
|
||||
if (value === null || util.types.isProxy(value)) {
|
||||
return value;
|
||||
}
|
||||
|
||||
const newValue = augment(value);
|
||||
if (newValue !== value) {
|
||||
newData = getData();
|
||||
|
||||
if (Array.isArray(value)) {
|
||||
Reflect.set(newData, key, augmentArray(value));
|
||||
} else {
|
||||
// eslint-disable-next-line @typescript-eslint/no-use-before-define
|
||||
Reflect.set(newData, key, augmentObject(value as IDataObject));
|
||||
}
|
||||
|
||||
return Reflect.get(newData, key);
|
||||
Reflect.set(newData, key, newValue);
|
||||
return newValue;
|
||||
}
|
||||
|
||||
return value;
|
||||
},
|
||||
getOwnPropertyDescriptor(target, key) {
|
||||
|
@ -83,18 +89,13 @@ export function augmentObject<T extends object>(data: T): T {
|
|||
|
||||
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
||||
const value = Reflect.get(target, key, receiver);
|
||||
|
||||
if (value !== null && typeof value === 'object') {
|
||||
if (Array.isArray(value)) {
|
||||
newData[key] = augmentArray(value);
|
||||
} else {
|
||||
newData[key] = augmentObject(value as IDataObject);
|
||||
}
|
||||
|
||||
return newData[key];
|
||||
const newValue = augment(value);
|
||||
if (newValue !== value) {
|
||||
Object.assign(newData, { [key]: newValue });
|
||||
return newValue;
|
||||
}
|
||||
|
||||
return value as string;
|
||||
return value;
|
||||
},
|
||||
deleteProperty(target, key: string) {
|
||||
if (key in newData) {
|
||||
|
|
|
@ -193,11 +193,15 @@ describe('AugmentObject', () => {
|
|||
|
||||
describe('augmentObject', () => {
|
||||
test('should work with simple values on first level', () => {
|
||||
const date = new Date(1680089084200);
|
||||
const regexp = new RegExp('^test$', 'ig');
|
||||
const originalObject: IDataObject = {
|
||||
1: 11,
|
||||
2: '22',
|
||||
a: 111,
|
||||
b: '222',
|
||||
d: date,
|
||||
r: regexp,
|
||||
};
|
||||
const copyOriginal = JSON.parse(JSON.stringify(originalObject));
|
||||
|
||||
|
@ -221,7 +225,7 @@ describe('AugmentObject', () => {
|
|||
|
||||
augmentedObject.c = 3;
|
||||
|
||||
expect(originalObject).toEqual(copyOriginal);
|
||||
expect({ ...originalObject, d: date.toJSON(), r: {} }).toEqual(copyOriginal);
|
||||
|
||||
expect(augmentedObject).toEqual({
|
||||
1: 911,
|
||||
|
@ -229,6 +233,8 @@ describe('AugmentObject', () => {
|
|||
a: 9111,
|
||||
b: '9222',
|
||||
c: 3,
|
||||
d: date,
|
||||
r: regexp,
|
||||
});
|
||||
});
|
||||
|
||||
|
|
Loading…
Reference in a new issue