@metadev/daga 4.2.9 → 4.2.10

package/Changelog.md

@@ -6,6 +6,10 @@ List of releases and changes.
 
 ## Next release Joyeuse
 
+## v. 4.2.10
+
+- Fix errors with cloned objects containing functions [#345](https://github.com/metadevpro/daga/pull/345)
+
 ## v. 4.2.9
 
 - Enable configuring the text heading the diagram properties component to values other than `'Diagram properties'` [#341](https://github.com/metadevpro/daga/pull/341)

package/index.cjs.js

@@ -1186,6 +1186,25 @@ const numberOfRows = s => {
   return ((_a = s.match(/\n/g)) === null || _a === void 0 ? void 0 : _a.length) || 0;
 };
 
+/**
+ * Clones an object with support for functions.
+ * @private
+ */
+const clone = o => {
+  if (typeof o !== 'object') {
+    return o;
+  }
+  const res = {};
+  for (const e of Object.entries(o)) {
+    if (typeof e[1] === 'object') {
+      res[e[0]] = clone(e[1]);
+    } else {
+      res[e[0]] = e[1];
+    }
+  }
+  return res;
+};
+
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -2050,7 +2069,7 @@ class ValueSet {
       if (property.type === exports.Type.Object) {
         this.valueSets[key] = this.constructSubValueSet(key);
       } else {
-        this.values[key] = structuredClone(property.defaultValue);
+        this.values[key] = clone(property.defaultValue);
       }
       if (rootAttribute !== undefined && rootAttribute !== null) {
         if (property.defaultValue !== undefined && !equals(this.getRootElementValue(rootAttribute), property.defaultValue)) {
@@ -2074,7 +2093,7 @@ class ValueSet {
     const property = this.propertySet.getProperty(key);
     const propertySet = new PropertySet(property.properties);
     const valueSet = new ValueSet(propertySet, this.rootElement);
-    valueSet.overwriteValues(structuredClone(property.defaultValue));
+    valueSet.overwriteValues(clone(property.defaultValue));
     return valueSet;
   }
   /**
@@ -5080,7 +5099,7 @@ class AddNodeCollabAction {
       node.label.text = this.label || '';
     }
     if (this.values !== undefined) {
-      node.valueSet.setValues(structuredClone(Object.assign(Object.assign({}, node.valueSet.getValues()), this.values)));
+      node.valueSet.setValues(clone(Object.assign(Object.assign({}, node.valueSet.getValues()), this.values)));
     } else {
       node.valueSet.resetValues();
     }
@@ -7307,7 +7326,7 @@ class DiagramUserSelection extends DiagramElementSet {
     if (selectedValueSet) {
       this.propertyEditorSelection = selection;
       if (makeUpdateValuesAction) {
-        this.propertyEditorValues = structuredClone(selectedValueSet.getValues());
+        this.propertyEditorValues = clone(selectedValueSet.getValues());
       }
       if (propertyEditor) {
         if (selection instanceof DiagramNode || selection instanceof DiagramConnection) {
@@ -7351,7 +7370,7 @@ class DiagramUserSelection extends DiagramElementSet {
       return;
     }
     const from = this.propertyEditorValues;
-    const to = structuredClone((_b = this.propertyEditorSelection) === null || _b === void 0 ? void 0 : _b.valueSet.getValues());
+    const to = clone((_b = this.propertyEditorSelection) === null || _b === void 0 ? void 0 : _b.valueSet.getValues());
     const [fromDiff, toDiff] = diffProperties(from, to, (_c = this.propertyEditorSelection) === null || _c === void 0 ? void 0 : _c.valueSet);
     const currentAction = new UpdateValuesAction(this.canvas, previousSelectionId, fromDiff, toDiff);
     currentAction.do();

package/index.esm.js

@@ -1165,6 +1165,25 @@ const numberOfRows = s => {
   return ((_a = s.match(/\n/g)) === null || _a === void 0 ? void 0 : _a.length) || 0;
 };
 
+/**
+ * Clones an object with support for functions.
+ * @private
+ */
+const clone = o => {
+  if (typeof o !== 'object') {
+    return o;
+  }
+  const res = {};
+  for (const e of Object.entries(o)) {
+    if (typeof e[1] === 'object') {
+      res[e[0]] = clone(e[1]);
+    } else {
+      res[e[0]] = e[1];
+    }
+  }
+  return res;
+};
+
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -2029,7 +2048,7 @@ class ValueSet {
       if (property.type === Type.Object) {
         this.valueSets[key] = this.constructSubValueSet(key);
       } else {
-        this.values[key] = structuredClone(property.defaultValue);
+        this.values[key] = clone(property.defaultValue);
       }
       if (rootAttribute !== undefined && rootAttribute !== null) {
         if (property.defaultValue !== undefined && !equals(this.getRootElementValue(rootAttribute), property.defaultValue)) {
@@ -2053,7 +2072,7 @@ class ValueSet {
     const property = this.propertySet.getProperty(key);
     const propertySet = new PropertySet(property.properties);
     const valueSet = new ValueSet(propertySet, this.rootElement);
-    valueSet.overwriteValues(structuredClone(property.defaultValue));
+    valueSet.overwriteValues(clone(property.defaultValue));
     return valueSet;
   }
   /**
@@ -5059,7 +5078,7 @@ class AddNodeCollabAction {
       node.label.text = this.label || '';
     }
     if (this.values !== undefined) {
-      node.valueSet.setValues(structuredClone(Object.assign(Object.assign({}, node.valueSet.getValues()), this.values)));
+      node.valueSet.setValues(clone(Object.assign(Object.assign({}, node.valueSet.getValues()), this.values)));
     } else {
       node.valueSet.resetValues();
     }
@@ -7286,7 +7305,7 @@ class DiagramUserSelection extends DiagramElementSet {
     if (selectedValueSet) {
       this.propertyEditorSelection = selection;
       if (makeUpdateValuesAction) {
-        this.propertyEditorValues = structuredClone(selectedValueSet.getValues());
+        this.propertyEditorValues = clone(selectedValueSet.getValues());
       }
       if (propertyEditor) {
         if (selection instanceof DiagramNode || selection instanceof DiagramConnection) {
@@ -7330,7 +7349,7 @@ class DiagramUserSelection extends DiagramElementSet {
       return;
     }
     const from = this.propertyEditorValues;
-    const to = structuredClone((_b = this.propertyEditorSelection) === null || _b === void 0 ? void 0 : _b.valueSet.getValues());
+    const to = clone((_b = this.propertyEditorSelection) === null || _b === void 0 ? void 0 : _b.valueSet.getValues());
     const [fromDiff, toDiff] = diffProperties(from, to, (_c = this.propertyEditorSelection) === null || _c === void 0 ? void 0 : _c.valueSet);
     const currentAction = new UpdateValuesAction(this.canvas, previousSelectionId, fromDiff, toDiff);
     currentAction.do();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metadev/daga",
-  "version": "4.2.9",
+  "version": "4.2.10",
   "dependencies": {},
   "peerDependencies": {
     "d3": "^7.9.0",

package/src/lib/util/object-util.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Clones an object with support for functions.
+ * @private
+ */
+export declare const clone: <T>(o: T) => T;

package/src/lib/util/test-util.d.ts

@@ -1,9 +1,4 @@
 import { DiagramConfig } from '../diagram/config/diagram-config';
-/**
- * Creates the structuredClone function if it doesn't exist.
- * @private
- */
-export declare const createStructuredClone: () => void;
 /**
  * Generic diagram configuration used for testing.
  * @private