@duet3d/objectmodel 3.5.0-beta.15 → 3.5.0-beta.17

package/dist/ModelCollection.js

@@ -96,8 +96,7 @@ function initCollection(itemType, data) {
     const result = new ModelCollection(itemType);
     for (let presetItem of data) {
         const item = new itemType();
-        item.update(presetItem);
-        result.push(item);
+        result.push(item.update(presetItem));
     }
     return result;
 }

package/dist/ModelDictionary.js

@@ -45,6 +45,7 @@ class ModelDictionary extends Map {
             if (currentItem !== newItem) {
                 return super.set(key, value);
             }
+            return this;
         }
         return super.set(key, value);
     }

package/dist/ModelObject.js

@@ -218,33 +218,6 @@ exports.default = ModelObject;
  * @returns Initialized model instance
  */
 function initObject(itemType, data) {
-    const result = new itemType();
-    for (let key in data) {
-        const resultKey = result[key];
-        if (isModelObject(resultKey)) {
-            const updatedObject = resultKey.update(data[key]);
-            if (resultKey !== updatedObject) {
-                const propDescriptor = Object.getOwnPropertyDescriptor(result, key);
-                if (propDescriptor !== undefined) {
-                    if (propDescriptor.writable) {
-                        result[key] = updatedObject;
-                    }
-                    else if (propDescriptor.set !== undefined) {
-                        propDescriptor.set(updatedObject);
-                    }
-                    else if (process.env.NODE_ENV !== "production") {
-                        console.warn(`Model object ${key} changed but it could not be set due to missing setter`);
-                    }
-                }
-                else if (process.env.NODE_ENV !== "production") {
-                    console.warn(`Model object ${key} changed but it lacks the property descriptor`);
-                }
-            }
-        }
-        else {
-            result[key] = data[key];
-        }
-    }
-    return result;
+    return new itemType().update(data);
 }
 exports.initObject = initObject;

package/dist/ModelSet.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Wrapper around a standard set to make sure it serializes to an array
+ */
+export default class ModelSet<T> extends Set<T> {
+    /**
+     * Convert this object to JSON
+     * @returns JSON object
+     */
+    toJSON(): T[];
+}

package/dist/ModelSet.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * Wrapper around a standard set to make sure it serializes to an array
+ */
+class ModelSet extends Set {
+    /**
+     * Convert this object to JSON
+     * @returns JSON object
+     */
+    toJSON() { return Array.from(this); }
+}
+exports.default = ModelSet;

package/dist/network/NetworkInterface.d.ts

@@ -1,4 +1,5 @@
 import ModelObject from "../ModelObject";
+import ModelSet from "../ModelSet";
 export declare enum NetworkProtocol {
     HTTP = "http",
     HTTPS = "https",
@@ -23,7 +24,7 @@ export declare enum NetworkInterfaceType {
     wifi = "wifi"
 }
 export declare class NetworkInterface extends ModelObject {
-    activeProtocols: Set<NetworkProtocol>;
+    activeProtocols: ModelSet<NetworkProtocol>;
     actualIP: string | null;
     configuredIP: string | null;
     dnsServer: string | null;

package/dist/network/NetworkInterface.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NetworkInterface = exports.NetworkInterfaceType = exports.NetworkInterfaceState = exports.NetworkProtocol = void 0;
 const ModelObject_1 = require("../ModelObject");
+const ModelSet_1 = require("../ModelSet");
 var NetworkProtocol;
 (function (NetworkProtocol) {
     NetworkProtocol["HTTP"] = "http";
@@ -31,7 +32,7 @@ var NetworkInterfaceType;
 class NetworkInterface extends ModelObject_1.default {
     constructor() {
         super(...arguments);
-        this.activeProtocols = new Set();
+        this.activeProtocols = new ModelSet_1.default();
         this.actualIP = null;
         this.configuredIP = null;
         this.dnsServer = null;

package/dist/plugins/PluginManifest.d.ts

@@ -1,4 +1,5 @@
 import ModelObject from "../ModelObject";
+import ModelSet from "../ModelSet";
 export declare enum SbcPermission {
     none = "none",
     commandExecution = "commandExecution",
@@ -52,7 +53,7 @@ export declare class PluginManifest extends ModelObject {
     sbcExecutableArguments: string | null;
     sbcExtraExecutables: Array<string>;
     sbcOutputRedirected: boolean;
-    sbcPermissions: Set<SbcPermission>;
+    sbcPermissions: ModelSet<SbcPermission>;
     sbcPackageDependencies: Array<string>;
     sbcPluginDependencies: Array<string>;
     sbcPythonDependencies: Array<string>;

package/dist/plugins/PluginManifest.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PluginManifest = exports.SbcPermission = void 0;
 const ModelObject_1 = require("../ModelObject");
+const ModelSet_1 = require("../ModelSet");
 var SbcPermission;
 (function (SbcPermission) {
     SbcPermission["none"] = "none";
@@ -57,7 +58,7 @@ class PluginManifest extends ModelObject_1.default {
         this.sbcExecutableArguments = null;
         this.sbcExtraExecutables = [];
         this.sbcOutputRedirected = true;
-        this.sbcPermissions = new Set();
+        this.sbcPermissions = new ModelSet_1.default();
         this.sbcPackageDependencies = [];
         this.sbcPluginDependencies = [];
         this.sbcPythonDependencies = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duet3d/objectmodel",
-  "version": "3.5.0-beta.15",
+  "version": "3.5.0-beta.17",
   "description": "TypeScript implementation of the Duet3D Object Model",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",