fix: proxy changelog of maps and sets

OpenHPS · Jun 17, 2024 · f6a3775 · f6a3775
1 parent ac927ee
commit f6a3775
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/src/data/decorators/ChangeLog.ts b/src/data/decorators/ChangeLog.ts
@@ -138,8 +138,22 @@ export function createChangeLog<T extends Object>(target: T): T & SerializableCh
     const metadata = DataSerializerUtils.getOwnMetadata(target.constructor);
     if (metadata) {
         metadata.dataMembers.forEach((member) => {
-            if (target[member.key] && target[member.key] instanceof Object) {
-                target[member.key] = createChangeLog(target[member.key]);
+            if (target[member.key]) {
+                if (Array.isArray(target[member.key])) {
+                    target[member.key].forEach((element) => {
+                        if (element instanceof Object) {
+                            element = createChangeLog(element);
+                        }
+                    });
+                } else if (target[member.key] instanceof Map || target[member.key] instanceof Set) {
+                    target[member.key].forEach((element) => {
+                        if (element instanceof Object) {
+                            element = createChangeLog(element);
+                        }
+                    });
+                } else if (target[member.key] instanceof Object) {
+                    target[member.key] = createChangeLog(target[member.key]);
+                }
             }
         });
     }

diff --git a/src/nodes/processing/CalibrationNode.ts b/src/nodes/processing/CalibrationNode.ts
@@ -5,6 +5,7 @@ import { ObjectProcessingNode, ObjectProcessingNodeOptions } from '../ObjectProc
 /**
  * Calibration node for sensors. This node allows intercepts data frames when
  * performing user-aided calibration.
+ * @type {@link http://purl.org/poso/CalibrationProcedure}
  */
 export class CalibrationNode<T extends DataObject = DataObject> extends ObjectProcessingNode {
     protected state: CalibrationState = CalibrationState.IDLE;

diff --git a/test/specs/data/data.object.spec.ts b/test/specs/data/data.object.spec.ts
@@ -15,6 +15,8 @@ import {
     SerializableMember,
     createChangeLog,
     CHANGELOG_METADATA_KEY,
+    SerializableObject,
+    SerializableMapMember,
 } from '../../../src';
 import { DummySensorObject } from '../../mock/data/object/DummySensorObject';
 
@@ -309,5 +311,21 @@ describe('DataObject', () => {
             expect(objectWithChangelog[CHANGELOG_METADATA_KEY].getDeletedProperties().length).to.equal(0);
             expect(objectWithChangelog[CHANGELOG_METADATA_KEY].getAddedProperties().length).to.equal(1);
         });
+
+        it('should not break maps', () => {
+            @SerializableObject()
+            class MyObject {
+                @SerializableMapMember(String, String)
+                features: Map<string, string>;
+            }
+
+            const object = new MyObject();
+            object.features = new Map();
+            object.features.set('test', '123');
+            const objectWithChangelog = createChangeLog(object);
+            objectWithChangelog.features.forEach((value, key) => {
+            });
+        });
+
     });
 });