@woosh/meep-engine 2.47.13 → 2.47.15

package/build/meep.module.js

@@ -117652,12 +117652,21 @@ function IdPool() {
     this.bitSet = new BitSet();
 }
 
+/**
+ * Looks up next available ID without reserving it
+ * If you want to also reserve the ID - use {@link get} instead
+ * @returns {number}
+ */
+IdPool.prototype.peek = function () {
+    return this.bitSet.nextClearBit(0);
+};
+
 /**
  *
  * @returns {number}
  */
 IdPool.prototype.get = function () {
-    const bitIndex = this.bitSet.nextClearBit(0);
+    const bitIndex = this.peek();
 
     this.bitSet.set(bitIndex, true);
 

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.47.13",
+  "version": "2.47.15",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/core/IdPool.js

@@ -18,12 +18,21 @@ function IdPool() {
     this.bitSet = new BitSet();
 }
 
+/**
+ * Looks up next available ID without reserving it
+ * If you want to also reserve the ID - use {@link get} instead
+ * @returns {number}
+ */
+IdPool.prototype.peek = function () {
+    return this.bitSet.nextClearBit(0);
+}
+
 /**
  *
  * @returns {number}
  */
 IdPool.prototype.get = function () {
-    const bitIndex = this.bitSet.nextClearBit(0);
+    const bitIndex = this.peek();
 
     this.bitSet.set(bitIndex, true);
 

package/src/core/json/abstractJSONSerializer.js

@@ -24,7 +24,7 @@ export function abstractJSONSerializer(source, serializers, classNames) {
         }
 
         if (typeName === undefined) {
-            throw new Error(`Failed to resolve type name for parameter '${key}'. No name found in classNames registry and no .typeName field on the constructor`);
+            throw new Error(`Failed to resolve type name. No name found in classNames registry and no .typeName field on the constructor`);
         }
 
         let serializer = serializers.get(typeName);

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

@@ -127,6 +127,7 @@ export class NodeGraph {
      * Merge foreign nodes and associated connections into this graph
      * New node instances and connections will be created to reflect these inside this graph
      * NOTE: parameters on merged nodes are shallow copies
+     * NOTE: if IDs are available - copied nodes will have the same IDs as the originals
      * @param {NodeInstance[]} nodes
      * @param {Connection[]} [connections]
      * @returns {{connections:Connection[], nodes:NodeInstance[]}} local created instances
@@ -147,12 +148,28 @@ export class NodeGraph {
         for (let i = 0; i < additional_node_count; i++) {
             const other_node = nodes[i];
 
-            const this_node_id = this.createNode(other_node.description);
-            this_nodes[other_node.id] = this_node_id;
+            const other_node_id = other_node.id;
 
-            // copy parameters
-            const this_node = this.getNode(this_node_id);
+            const this_node = new NodeInstance();
+            this_node.setDescription(other_node.description);
+
+
+            // attempt to gain the same ID
+            const can_use_same_id = this.__idpNodes.isUsed(other_node_id);
+
+            let this_node_id;
+            if (can_use_same_id) {
+                this_node_id = other_node_id;
+            } else {
+                this_node_id = this.__idpNodes.peek();
+            }
 
+            this.addNode(this_node);
+
+
+            this_nodes[other_node_id] = this_node_id;
+
+            // copy parameters
             this_node.setParameters(other_node.parameters);
 
         }
@@ -376,13 +393,13 @@ export class NodeGraph {
     createNode(node) {
         const nodeInstance = new NodeInstance();
 
-        const id = this.__idpNodes.get();
+        const id = this.__idpNodes.peek();
 
         nodeInstance.id = id;
         nodeInstance.setDescription(node);
 
         //record the node
-        this.nodes.add(nodeInstance);
+        this.addNode(nodeInstance);
 
         return id;
     }

package/src/core/model/node-graph/node/NodeInstance.d.ts

@@ -11,4 +11,8 @@ export class NodeInstance {
     readonly endpoints: NodeInstancePortReference[]
 
     readonly connections: List<Connection>
+
+    setDescription(d: NodeDescription): void
+
+    setParameters(hash: { [key: string]: any }): void
 }