mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-01-24 11:02:12 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(core): Handle Date and RegExp correctly in jsonStringify (#5812)

Browse source
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™ 2023-03-29 21:10:19 +02:00 committed by GitHub
parent 522c790817
commit 4f91525022
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
packages/workflow/src/utils.ts
View file

@ -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 => {

4
packages/workflow/test/utils.test.ts
View file

@ -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', () => {
@ -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]"}',
);
});