@woosh/meep-engine 2.46.15 → 2.46.17

package/package.json

@@ -4,7 +4,7 @@
   "productName": "Meep",
   "description": "production-ready JavaScript game engine based on Entity Component System Architecture",
   "author": "Alexander Goldring",
-  "version": "2.46.15",
+  "version": "2.46.17",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "scripts": {

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

@@ -103,15 +103,17 @@ export class NodeGraph {
     /**
      * Merge another graph into this one
      * Supplied graph does not change as a result
+     * @see {@link #mergeFragment}
      * @param {NodeGraph} other
+     * @returns {{connections:Connection[], nodes:NodeInstance[]}}
      */
     merge(other) {
         if (other === this) {
-            // can't merge with self, operation is pointless
-            return;
+            // can't merge with self, invalid operation
+            throw new Error("Can't merge with self, invalid operation");
         }
 
-        this.mergeFragment({
+        return this.mergeFragment({
             nodes: other.nodes.asArray(),
             connections: other.connections.asArray()
         });
@@ -122,11 +124,14 @@ export class NodeGraph {
      * New node instances and connections will be created to reflect these inside this graph
      * @param {NodeInstance[]} nodes
      * @param {Connection[]} [connections]
+     * @returns {{connections:Connection[], nodes:NodeInstance[]}} local created instances
      */
     mergeFragment({ nodes, connections = [] }) {
 
-        const other_nodes = nodes;
-        const node_count = other_nodes.length;
+        const previous_node_count = this.nodes.length;
+        const previous_connection_count = this.connections.length;
+
+        const additional_node_count = nodes.length;
 
         /**
          * Mapping from original IDs to IDs in this graph
@@ -134,27 +139,26 @@ export class NodeGraph {
          */
         const this_nodes = {};
 
-        for (let i = 0; i < node_count; i++) {
-            const other_node = other_nodes[i];
+        for (let i = 0; i < additional_node_count; i++) {
+            const other_node = nodes[i];
             this_nodes[other_node.id] = this.createNode(other_node.description);
         }
 
         // create connections
-        const other_connections = connections;
-        const connection_count = other_connections.length;
+        const additional_connection_count = connections.length;
 
-        for (let i = 0; i < connection_count; i++) {
-            const other_connection = other_connections[i];
+        for (let i = 0; i < additional_connection_count; i++) {
+            const other_connection = connections[i];
 
             const other_source = other_connection.source;
 
             const this_source_node_id = this_nodes[other_source.instance.id];
-            const this_source_port_id = this.getNode(this_source_node_id).getEndpoint(other_source.port.id).id;
+            const this_source_port_id = other_source.port.id;
 
             const other_target = other_connection.target;
 
             const this_target_node_id = this_nodes[other_target.instance.id];
-            const this_target_port_id = this.getNode(this_target_node_id).getEndpoint(other_target.port.id).id;
+            const this_target_port_id = other_target.port.id;
 
             this.createConnection(
                 this_source_node_id, this_source_port_id,
@@ -162,6 +166,10 @@ export class NodeGraph {
             );
         }
 
+        return {
+            connections: this.connections.asArray().slice(previous_connection_count, previous_connection_count + additional_connection_count),
+            nodes: this.nodes.asArray().slice(previous_node_count, previous_node_count + additional_node_count)
+        };
     }
 
     /**
@@ -562,6 +570,11 @@ export class NodeGraph {
      * @returns {number} number of found connections
      */
     getConnectionsAttachedToNode(id, result) {
+        assert.isNonNegativeInteger(id, 'id');
+
+        assert.defined(result, 'result');
+        assert.isArray(result, 'result');
+
         let count = 0;
 
         const connections = this.connections;