@woosh/meep-engine 2.47.37 → 2.47.39

package/build/meep.module.js

@@ -77596,28 +77596,31 @@ function planesEqual(a, b) {
  * @template T
  * @param {T[]} a
  * @param {T[]} b
- * @param {function(T,T):boolean} elementsEqual
+ * @param {function(T,T):boolean} elements_equal
  * @returns {boolean}
  */
-function isArraysEqualWithComparator(a, b, elementsEqual) {
+function isArraysEqualWithComparator(a, b, elements_equal) {
     if (a === b) {
+        // same object
         return true;
     }
 
     if (a === null || b === null || a === undefined || b === undefined) {
+        // check if one of the arrays is missing
         return false
     }
 
-    const l = a.length;
-    if (l !== b.length) {
+    const element_count = a.length;
+
+    if (element_count !== b.length) {
         return false;
     }
 
-    for (let i = 0; i < l; i++) {
+    for (let i = 0; i < element_count; i++) {
         const aE = a[i];
         const bE = b[i];
 
-        if (!elementsEqual(aE, bE)) {
+        if (!elements_equal(aE, bE)) {
             return false;
         }
     }
@@ -100733,16 +100736,29 @@ function objectDeepEquals(a, b) {
     }
 
     if (tA === "object") {
-        //one way
-        for (let pA in a) {
-            if (!objectDeepEquals(a[pA], b[pA])) {
+        if (Array.isArray(a)) {
+            // special fast path for arrays
+            if (!Array.isArray(b)) {
+                // one is an array, the other is not
                 return false;
             }
+            return isArraysEqualWithComparator(a, b, objectDeepEquals);
         }
 
-        //other way
-        for (let pB in b) {
-            if (!objectDeepEquals(a[pB], b[pB])) {
+        const keys_a = Object.keys(a);
+        const keys_b = Object.keys(b);
+
+        if (!isArrayEqualStrict(keys_a, keys_b)) {
+            // different fields
+            return false;
+        }
+
+        const key_count = keys_a.length;
+
+        for (let i = 0; i < key_count; i++) {
+            const key = keys_a[i];
+
+            if (!objectDeepEquals(a[key], b[key])) {
                 return false;
             }
         }

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.47.37",
+  "version": "2.47.39",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {
@@ -52,6 +52,7 @@
     "@rollup/plugin-strip": "3.0.2",
     "@types/three": "^0.135.0",
     "babel-jest": "26.6.3",
+    "jest": "26.6.3",
     "rollup": "3.16.0"
   },
   "keywords": [

package/src/core/collection/array/isArraysEqualWithComparator.js

@@ -2,28 +2,31 @@
  * @template T
  * @param {T[]} a
  * @param {T[]} b
- * @param {function(T,T):boolean} elementsEqual
+ * @param {function(T,T):boolean} elements_equal
  * @returns {boolean}
  */
-export function isArraysEqualWithComparator(a, b, elementsEqual) {
+export function isArraysEqualWithComparator(a, b, elements_equal) {
     if (a === b) {
+        // same object
         return true;
     }
 
     if (a === null || b === null || a === undefined || b === undefined) {
+        // check if one of the arrays is missing
         return false
     }
 
-    const l = a.length;
-    if (l !== b.length) {
+    const element_count = a.length;
+
+    if (element_count !== b.length) {
         return false;
     }
 
-    for (let i = 0; i < l; i++) {
+    for (let i = 0; i < element_count; i++) {
         const aE = a[i];
         const bE = b[i];
 
-        if (!elementsEqual(aE, bE)) {
+        if (!elements_equal(aE, bE)) {
             return false;
         }
     }

package/src/core/model/node-graph/json/deserializeNodeGraphFromJSON.js

@@ -58,19 +58,35 @@ export function deserializeNodeGraphFromJSON({
     for (let i = 0; i < j_descriptions.length; i++) {
         const jDescription = j_descriptions[i];
 
-        const nodeDescription = abstractJSONDeserializer(jDescription, deserializers);
+        const loaded_node = abstractJSONDeserializer(jDescription, deserializers);
 
         if (
-            typeof nodeDescription !== "object"
-            || nodeDescription.isNodeDescription !== true
+            typeof loaded_node !== "object"
+            || loaded_node.isNodeDescription !== true
         ) {
             throw new Error(`Deserialized object was expected to be a NodeDescription, instead got something else. Source JSON[${i}]: ${jDescription}`);
         }
 
-        descriptions[i] = nodeDescription;
+        const existing_node = node_registry.getNode(loaded_node.id);
+
+        if (existing_node === undefined) {
+
+            descriptions[i] = loaded_node;
+
+            // make sure to register the node
+            node_registry.addNode(loaded_node);
+
+        } else {
+
+            if (!existing_node.equals(loaded_node)) {
+                throw new Error(`Loaded node does not match the one in the registry`);
+            }
+
+            // re-use node from registry
+            descriptions[i] = existing_node;
+
+        }
 
-        // make sure to register the node
-        node_registry.addNode(nodeDescription);
     }
 
     // parse nodes

package/src/core/model/node-graph/node/NodeDescription.js

@@ -5,6 +5,7 @@ import { Port } from "./Port.js";
 import { PortDirection } from "./PortDirection.js";
 import Signal from "../../../events/signal/Signal.js";
 import { invokeObjectToJSON } from "../../object/invokeObjectToJSON.js";
+import { isArrayEqual } from "../../../collection/array/isArrayEqual.js";
 
 
 /**
@@ -88,7 +89,7 @@ export class NodeDescription {
      * This gives us an opportunity to add/change ports based on current state of a specific node instance
      * @param {NodeInstance} instance
      */
-    configureNode(instance){
+    configureNode(instance) {
         // override in subclasses as necessary
     }
 
@@ -326,6 +327,18 @@ export class NodeDescription {
         return this.ports
     }
 
+    /**
+     *
+     * @param {NodeDescription} other
+     * @returns {boolean}
+     */
+    equals(other) {
+        return this.id === other.id
+            && this.name === other.name
+            && isArrayEqual(this.ports, other.ports)
+            ;
+    }
+
     toJSON() {
         return {
             id: this.id,

package/src/core/model/node-graph/node/NodeRegistry.js

@@ -49,7 +49,7 @@ export class NodeRegistry {
 
         if (existing_node !== undefined) {
 
-            if (existing_node !== node) {
+            if (existing_node !== node && !existing_node.equals(node)) {
                 // node with the same ID exists and is not the same node
                 throw new Error(`A different node with the same ID ${node.id} is already registered. IDs of all nodes in the registry must be unique`);
             }

package/src/core/model/object/objectDeepEquals.js

@@ -1,3 +1,6 @@
+import { isArraysEqualWithComparator } from "../../collection/array/isArraysEqualWithComparator.js";
+import { isArrayEqualStrict } from "../../collection/array/isArrayEqualStrict.js";
+
 /**
  * @template A,B
  * @param {A} a
@@ -13,16 +16,29 @@ export function objectDeepEquals(a, b) {
     }
 
     if (tA === "object") {
-        //one way
-        for (let pA in a) {
-            if (!objectDeepEquals(a[pA], b[pA])) {
+        if (Array.isArray(a)) {
+            // special fast path for arrays
+            if (!Array.isArray(b)) {
+                // one is an array, the other is not
                 return false;
             }
+            return isArraysEqualWithComparator(a, b, objectDeepEquals);
+        }
+
+        const keys_a = Object.keys(a);
+        const keys_b = Object.keys(b);
+
+        if (!isArrayEqualStrict(keys_a, keys_b)) {
+            // different fields
+            return false;
         }
 
-        //other way
-        for (let pB in b) {
-            if (!objectDeepEquals(a[pB], b[pB])) {
+        const key_count = keys_a.length;
+
+        for (let i = 0; i < key_count; i++) {
+            const key = keys_a[i];
+
+            if (!objectDeepEquals(a[key], b[key])) {
                 return false;
             }
         }