@woosh/meep-engine 2.47.16 → 2.47.17

package/package.json

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

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

@@ -48,6 +48,19 @@ export class DataType {
         this.name = name;
     }
 
+    /**
+     *
+     * @param {*} j
+     * @returns {DataType}
+     */
+    static fromJSON(j){
+        const r = new DataType();
+
+        r.fromJSON(j);
+
+        return r;
+    }
+
     /**
      *
      * @param {number} id

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

@@ -4,6 +4,7 @@ import { NodeParameterDescription } from "./parameter/NodeParameterDescription.j
 import { Port } from "./Port.js";
 import { PortDirection } from "./PortDirection.js";
 import Signal from "../../../events/signal/Signal.js";
+import { invokeObjectToJSON } from "../../object/invokeObjectToJSON.js";
 
 
 /**
@@ -317,14 +318,29 @@ export class NodeDescription {
     }
 
     toJSON() {
-        throw new Error('Not Implemented');
+        return {
+            id: this.id,
+            name: this.name,
+            ports: this.ports.map(invokeObjectToJSON),
+        }
     }
 
-    fromJSON() {
-        throw new Error('Not Implemented');
+    /**
+     *
+     * @param ports
+     * @param id
+     * @param name
+     * @param {NodeRegistry} registry
+     */
+    fromJSON({ ports, id, name }, registry) {
+        this.id = id;
+        this.name = name;
+        this.ports = ports.map(p => Port.fromJSON(p, registry));
     }
 }
 
+NodeDescription.typeName = "NodeDescription";
+
 /**
  * @readonly
  * @type {boolean}

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

@@ -154,6 +154,14 @@ export class NodeRegistry {
         return this.types.has(type.id);
     }
 
+    /**
+     * @param {number} id
+     * @returns {DataType|undefined}
+     */
+    getTypeById(id) {
+        return this.types.get(id);
+    }
+
     /**
      *
      * @returns {number}

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

@@ -1,6 +1,8 @@
 import { computeStringHash } from "../../../primitives/strings/computeStringHash.js";
 import { PortDirection } from "./PortDirection.js";
 import { computeHashIntegerArray } from "../../../collection/array/computeHashIntegerArray.js";
+import { objectKeyByValue } from "../../object/objectKeyByValue.js";
+import { DataType } from "../DataType.js";
 
 /**
  * @type {number}
@@ -65,6 +67,68 @@ export class Port {
     toString() {
         return `Port{ id=${this.id}, direction=${this.direction}, name=${this.name}, type=${this.dataType} }`;
     }
+
+    toJSON() {
+        return {
+            id: this.id,
+            name: this.name,
+            direction: objectKeyByValue(PortDirection, this.direction),
+            dataType: this.dataType !== null ? this.dataType.toJSON() : null
+        };
+    }
+
+    /**
+     *
+     * @param {number} id
+     * @param {string} name
+     * @param {string} direction
+     * @param {*} dataType
+     * @param {NodeRegistry} [registry] to avoid creating copies of data types
+     */
+    fromJSON({
+                 id, name, direction, dataType
+             }, registry) {
+
+        this.id = id;
+        this.name = name;
+        this.direction = PortDirection[direction];
+
+        let _type = dataType !== null ? DataType.fromJSON(dataType) : null;
+
+        if (registry !== undefined && _type !== null) {
+            // attempt to re-write data type with one from the registry
+            const match = registry.getTypeById(_type.id);
+
+            if (match !== undefined) {
+
+                if (match.equals(_type)) {
+                    throw new Error(`Loaded type ${_type} does not match one in the registry ${match}`)
+                }
+
+                // re-write type
+                _type = match;
+            } else {
+                throw new Error(`Loaded type ${_type} was not found in the registry`);
+            }
+        }
+
+        this.dataType = _type;
+
+    }
+
+    /**
+     *
+     * @param j
+     * @param {NodeRegistry} registry
+     * @returns {Port}
+     */
+    static fromJSON(j, registry) {
+        const r = new Port();
+
+        r.fromJSON(j, registry);
+
+        return r;
+    }
 }
 
 /**

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

@@ -0,0 +1,3 @@
+export function invokeObjectToJSON(o){
+    return o.toJSON();
+}