Kaynağa Gözat

Prevent circular references in date conversion

arvid-e 9 ay önce
ebeveyn
işleme
0b46e38a81

+ 95 - 23
apps/app/src/utils/axios-date-conversion.spec.ts

@@ -1,6 +1,7 @@
-import { convertDateStringsToDates } from './axios';
+import { convertStringsToDates } from './axios';
 
-describe('convertDateStringsToDates', () => {
+
+describe('convertStringsToDates', () => {
 
   // Test case 1: Basic conversion in a flat object
   test('should convert ISO date strings to Date objects in a flat object', () => {
@@ -15,7 +16,7 @@ describe('convertDateStringsToDates', () => {
       createdAt: new Date(dateString),
       name: 'Test Item',
     };
-    const result = convertDateStringsToDates(input);
+    const result = convertStringsToDates(input);
     expect(result.createdAt).toBeInstanceOf(Date);
     expect(result.createdAt.toISOString()).toEqual(dateString);
     expect(result).toEqual(expected);
@@ -53,7 +54,7 @@ describe('convertDateStringsToDates', () => {
         },
       },
     };
-    const result = convertDateStringsToDates(input);
+    const result = convertStringsToDates(input);
     expect(result.data.item1.updatedAt).toBeInstanceOf(Date);
     expect(result.data.item1.updatedAt.toISOString()).toEqual(dateString1);
     expect(result.data.item2.nested.deletedAt).toBeInstanceOf(Date);
@@ -73,7 +74,7 @@ describe('convertDateStringsToDates', () => {
       { id: 1, eventDate: new Date(dateString1) },
       { id: 2, eventDate: new Date(dateString2), data: { nestedProp: 'value' } },
     ];
-    const result = convertDateStringsToDates(input);
+    const result = convertStringsToDates(input);
     expect(result[0].eventDate).toBeInstanceOf(Date);
     expect(result[0].eventDate.toISOString()).toEqual(dateString1);
     expect(result[1].eventDate).toBeInstanceOf(Date);
@@ -86,7 +87,7 @@ describe('convertDateStringsToDates', () => {
     const dateString = '2023-06-20T18:00:00.000Z';
     const input = ['text', dateString, 123];
     const expected = ['text', new Date(dateString), 123];
-    const result = convertDateStringsToDates(input);
+    const result = convertStringsToDates(input);
     expect(result[1]).toBeInstanceOf(Date);
     expect(result[1].toISOString()).toEqual(dateString);
     expect(result).toEqual(expected);
@@ -101,28 +102,28 @@ describe('convertDateStringsToDates', () => {
       description: 'Some text',
     };
     const originalInput = JSON.parse(JSON.stringify(input)); // Deep copy to ensure no mutation
-    const result = convertDateStringsToDates(input);
+    const result = convertStringsToDates(input);
     expect(result).toEqual(originalInput); // Should be deeply equal
     expect(result).toBe(input); // Confirm it mutated the original object
   });
 
   // Test case 6: Null, undefined, and primitive values
   test('should return primitive values as is', () => {
-    expect(convertDateStringsToDates(null)).toBeNull();
-    expect(convertDateStringsToDates(undefined)).toBeUndefined();
-    expect(convertDateStringsToDates(123)).toBe(123);
-    expect(convertDateStringsToDates('hello')).toBe('hello');
-    expect(convertDateStringsToDates(true)).toBe(true);
+    expect(convertStringsToDates(null)).toBeNull();
+    expect(convertStringsToDates(undefined)).toBeUndefined();
+    expect(convertStringsToDates(123)).toBe(123);
+    expect(convertStringsToDates('hello')).toBe('hello');
+    expect(convertStringsToDates(true)).toBe(true);
   });
 
   // Test case 7: Edge case - empty objects/arrays
   test('should handle empty objects and arrays correctly', () => {
     const emptyObject = {};
     const emptyArray = [];
-    expect(convertDateStringsToDates(emptyObject)).toEqual({});
-    expect(convertDateStringsToDates(emptyArray)).toEqual([]);
-    expect(convertDateStringsToDates(emptyObject)).toBe(emptyObject);
-    expect(convertDateStringsToDates(emptyArray)).toEqual(emptyArray);
+    expect(convertStringsToDates(emptyObject)).toEqual({});
+    expect(convertStringsToDates(emptyArray)).toEqual([]);
+    expect(convertStringsToDates(emptyObject)).toBe(emptyObject);
+    expect(convertStringsToDates(emptyArray)).toEqual(emptyArray);
   });
 
   // Test case 8: Date string with different milliseconds (isoDateRegex without .000)
@@ -130,7 +131,7 @@ describe('convertDateStringsToDates', () => {
     const dateString = '2023-01-15T10:00:00Z'; // No milliseconds
     const input = { createdAt: dateString };
     const expected = { createdAt: new Date(dateString) };
-    const result = convertDateStringsToDates(input);
+    const result = convertStringsToDates(input);
     expect(result.createdAt).toBeInstanceOf(Date);
     expect(result.createdAt.toISOString()).toEqual('2023-01-15T10:00:00.000Z');
     expect(result).toEqual(expected);
@@ -155,7 +156,7 @@ describe('convertDateStringsToDates', () => {
         nestedDate: new Date(dateString),
       },
     };
-    const result = convertDateStringsToDates(input);
+    const result = convertStringsToDates(input);
     expect(result.prop1).toBeInstanceOf(Date);
     expect(result.prop3.nestedDate).toBeInstanceOf(Date);
     expect(result).toEqual(expected);
@@ -179,7 +180,7 @@ describe('convertDateStringsToDates', () => {
       },
     };
 
-    const result = convertDateStringsToDates(input);
+    const result = convertStringsToDates(input);
 
     expect(result.eventTime).toBeInstanceOf(Date);
     expect(result.eventTime.toISOString()).toEqual(new Date(dateStringWithOffset).toISOString());
@@ -199,7 +200,7 @@ describe('convertDateStringsToDates', () => {
       startTime: new Date(dateStringWithNegativeOffset),
     };
 
-    const result = convertDateStringsToDates(input);
+    const result = convertStringsToDates(input);
 
     expect(result.startTime).toBeInstanceOf(Date);
     expect(result.startTime.toISOString()).toEqual(new Date(dateStringWithNegativeOffset).toISOString());
@@ -216,7 +217,7 @@ describe('convertDateStringsToDates', () => {
       zeroOffsetDate: new Date(dateStringWithZeroOffset),
     };
 
-    const result = convertDateStringsToDates(input);
+    const result = convertStringsToDates(input);
 
     expect(result.zeroOffsetDate).toBeInstanceOf(Date);
     expect(result.zeroOffsetDate.toISOString()).toEqual(new Date(dateStringWithZeroOffset).toISOString());
@@ -233,7 +234,7 @@ describe('convertDateStringsToDates', () => {
       detailedTime: new Date(dateStringWithMsAndOffset),
     };
 
-    const result = convertDateStringsToDates(input);
+    const result = convertStringsToDates(input);
 
     expect(result.detailedTime).toBeInstanceOf(Date);
     expect(result.detailedTime.toISOString()).toEqual(new Date(dateStringWithMsAndOffset).toISOString());
@@ -260,7 +261,7 @@ describe('convertDateStringsToDates', () => {
     // Deep copy to ensure comparison is accurate since the function modifies in place
     const expected = JSON.parse(JSON.stringify(input));
 
-    const result = convertDateStringsToDates(input);
+    const result = convertStringsToDates(input);
 
     // Assert that they remain strings (or whatever their original type was)
     expect(typeof result.date1).toBe('string');
@@ -282,4 +283,75 @@ describe('convertDateStringsToDates', () => {
     expect(result).toEqual(expected);
   });
 
+
+  describe('test circular reference occurrences', () => {
+
+    // Test case 1: Circular references
+    test('should handle circular references without crashing and preserve the cycle', () => {
+      const dateString1 = '2023-02-20T12:30:00.000Z';
+      const dateString2 = '2023-03-01T08:00:00.000Z';
+      const dateString3 = '2023-04-05T14:15:00.000Z';
+
+      const input: any = {
+        data: {
+          item1: {
+            updatedAt: dateString1,
+            value: 10,
+          },
+          item2: {
+            nested1: {
+              deletedAt: dateString2,
+              isActive: false,
+              nested2: {
+                createdAt: dateString3,
+                parent: null as any,
+              },
+            },
+            anotherItem: {
+              someValue: 42,
+              lastSeen: '2023-11-01T12:00:00Z',
+            },
+          },
+        },
+      };
+
+      // Create a circular reference
+      input.data.item2.nested1.nested2.parent = input;
+
+      const convertedOutput = convertStringsToDates(input);
+
+      // Expect the function not to have thrown an error
+      expect(convertedOutput).toBeDefined();
+      expect(convertedOutput).toBeInstanceOf(Object);
+
+      // Check if circular reference is present
+      expect(convertedOutput.data.item2.nested1.nested2.parent).toBe(convertedOutput);
+
+      // Check if the date conversion worked
+      expect(convertedOutput.data.item1.updatedAt).toBeInstanceOf(Date);
+      expect(convertedOutput.data.item1.updatedAt.toISOString()).toBe(dateString1);
+
+      expect(convertedOutput.data.item2.nested1.deletedAt).toBeInstanceOf(Date);
+      expect(convertedOutput.data.item2.nested1.deletedAt.toISOString()).toBe(dateString2);
+
+      expect(convertedOutput.data.item2.nested1.nested2.createdAt).toBeInstanceOf(Date);
+      expect(convertedOutput.data.item2.nested1.nested2.createdAt.toISOString()).toBe(dateString3);
+
+      expect(convertedOutput.data.item2.anotherItem.lastSeen).toBeInstanceOf(Date);
+      expect(convertedOutput.data.item2.anotherItem.lastSeen.toISOString()).toBe(new Date(input.data.item2.anotherItem.lastSeen).toISOString());
+    });
+
+    // Test case 2: Direct self-reference
+    test('should work when encountering direct self-references', () => {
+      const obj: any = {};
+      obj.self = obj;
+      obj.createdAt = '2023-02-01T00:00:00Z';
+
+      const converted = convertStringsToDates(obj);
+
+      expect(converted).toBeDefined();
+      expect(converted.self).toBe(converted);
+      expect(converted.createdAt).toBeInstanceOf(Date);
+    });
+  });
 });

+ 15 - 4
apps/app/src/utils/axios.ts

@@ -8,7 +8,7 @@ export * from 'axios';
 
 const isoDateRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d{3})?(Z|[+-]\d{2}:\d{2})$/;
 
-export function convertDateStringsToDates(data: any): any {
+function convertStringsToDatesRecursive(data: any, seen: Set<any>): any {
   if (typeof data !== 'object' || data === null) {
     if (typeof data === 'string' && isoDateRegex.test(data)) {
       return new Date(data);
@@ -16,8 +16,14 @@ export function convertDateStringsToDates(data: any): any {
     return data;
   }
 
+  // Check for circular reference
+  if (seen.has(data)) {
+    return data;
+  }
+  seen.add(data);
+
   if (Array.isArray(data)) {
-    return data.map(item => convertDateStringsToDates(item));
+    return data.map(array => convertStringsToDatesRecursive(array, seen));
   }
 
   for (const key of Object.keys(data)) {
@@ -27,12 +33,17 @@ export function convertDateStringsToDates(data: any): any {
     }
 
     else if (typeof value === 'object' && value !== null) {
-      data[key] = convertDateStringsToDates(value);
+      data[key] = convertStringsToDatesRecursive(value, seen);
     }
   }
+
   return data;
 }
 
+export function convertStringsToDates(data: any): any {
+  return convertStringsToDatesRecursive(data, new Set());
+}
+
 // Determine the base array of transformers
 let baseTransformers = axios.defaults.transformResponse;
 
@@ -54,7 +65,7 @@ const customAxios = axios.create({
 
   transformResponse: baseTransformers.concat(
     (data) => {
-      return convertDateStringsToDates(data);
+      return convertStringsToDates(data);
     },
   ),
 });