Skip to content
/ qp-n8n Public
forked from n8n-io/n8n

Commit

Permalink
fix(core): Handle Date and RegExp correctly in jsonStringify (n8n-io#…
Browse files Browse the repository at this point in the history
  • Loading branch information
netroy authored and sunilrr committed Apr 24, 2023
1 parent 2762ffb commit 4afc96d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
19 changes: 9 additions & 10 deletions packages/workflow/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,17 +67,16 @@ type JSONStringifyOptions = {
};

const replaceCircularReferences = <T>(value: T, knownObjects = new WeakSet()): T => {
if (value && typeof value === 'object') {
if (knownObjects.has(value)) return '[Circular Reference]' as T;
knownObjects.add(value);
const copy = (Array.isArray(value) ? [] : {}) as T;
for (const key in value) {
copy[key] = replaceCircularReferences(value[key], knownObjects);
}
knownObjects.delete(value);
return copy;
if (typeof value !== 'object' || value === null || value instanceof RegExp) return value;
if ('toJSON' in value && typeof value.toJSON === 'function') return value.toJSON() as T;
if (knownObjects.has(value)) return '[Circular Reference]' as T;
knownObjects.add(value);
const copy = (Array.isArray(value) ? [] : {}) as T;
for (const key in value) {
copy[key] = replaceCircularReferences(value[key], knownObjects);
}
return value;
knownObjects.delete(value);
return copy;
};

export const jsonStringify = (obj: unknown, options: JSONStringifyOptions = {}): string => {
Expand Down
4 changes: 2 additions & 2 deletions packages/workflow/test/utils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ describe('jsonParse', () => {
});

describe('jsonStringify', () => {
const source: any = { a: 1, b: 2 };
const source: any = { a: 1, b: 2, d: new Date(1680089084200), r: new RegExp('^test$', 'ig') };
source.c = source;

it('should throw errors on circular references by default', () => {
Expand All @@ -27,7 +27,7 @@ describe('jsonStringify', () => {

it('should break circular references when requested', () => {
expect(jsonStringify(source, { replaceCircularRefs: true })).toEqual(
'{"a":1,"b":2,"c":"[Circular Reference]"}',
'{"a":1,"b":2,"d":"2023-03-29T11:24:44.200Z","r":{},"c":"[Circular Reference]"}',
);
});

Expand Down

0 comments on commit 4afc96d

Please sign in to comment.