@duet3d/objectmodel 3.5.0-b1 → 3.5.0-b3

package/dist/ModelDictionary.js

@@ -57,6 +57,11 @@ class ModelDictionary extends Map {
         if (jsonElement === null) {
             this.clear();
         }
+        else if (jsonElement instanceof Map) {
+            for (const [key, value] of jsonElement.entries()) {
+                this.set(key, value);
+            }
+        }
         else {
             for (const [key, value] of Object.entries(jsonElement)) {
                 this.set(key, value);

package/dist/ModelObject.js

@@ -137,6 +137,22 @@ class ModelObject {
                             console.warn(`Incompatible string target type ${typeof value} for property ${key}`);
                         }
                     }
+                    else if (propType === "function") {
+                        if (typeof value === "function") {
+                            this[ownKey] = value;
+                        }
+                        else if (process.env.NODE_ENV !== "production") {
+                            console.warn(`Incompatible function target type ${typeof value} for property ${key}`);
+                        }
+                    }
+                    else if (propType === "object") {
+                        if (typeof value === "object") {
+                            this[ownKey] = value;
+                        }
+                        else if (process.env.NODE_ENV !== "production") {
+                            console.warn(`Incompatible object target type ${typeof value} for property ${key}`);
+                        }
+                    }
                     else if (process.env.NODE_ENV !== "production") {
                         console.warn(`Incompatible type ${propType} for property ${key} (${typeof value})`);
                     }

package/dist/index.d.ts

@@ -2,7 +2,6 @@ export * from "./ModelCollection";
 export * from "./ModelDictionary";
 export * from "./ModelObject";
 export * from "./boards";
-export * from "./state";
 export * from "./directories";
 export * from "./fans";
 export * from "./heat";
@@ -17,6 +16,7 @@ export * from "./plugins";
 export * from "./scanner";
 export * from "./sensors";
 export * from "./spindles";
+export * from "./state";
 export * from "./tools";
 export * from "./userSessions";
 export * from "./volumes";

package/dist/index.js

@@ -20,7 +20,6 @@ __exportStar(require("./ModelCollection"), exports);
 __exportStar(require("./ModelDictionary"), exports);
 __exportStar(require("./ModelObject"), exports);
 __exportStar(require("./boards"), exports);
-__exportStar(require("./state"), exports);
 __exportStar(require("./directories"), exports);
 __exportStar(require("./fans"), exports);
 __exportStar(require("./heat"), exports);
@@ -35,6 +34,7 @@ __exportStar(require("./plugins"), exports);
 __exportStar(require("./scanner"), exports);
 __exportStar(require("./sensors"), exports);
 __exportStar(require("./spindles"), exports);
+__exportStar(require("./state"), exports);
 __exportStar(require("./tools"), exports);
 __exportStar(require("./userSessions"), exports);
 __exportStar(require("./volumes"), exports);
@@ -46,6 +46,8 @@ exports.default = ObjectModel_1.default;
 // This will become obsolete as soon as DWC is upgraded to Vue 3, but that isn't going to happen anytime soon.
 // Until then a Vue 2 user would have to call something like this on initialization to work around this limitation:
 // globalThis._duetModelSetArray = (array, index, value) => Vue.set(array, index, value);
+// or in TypeScript
+// (globalThis as any)._duetModelSetArray = (array: object, index: string | number, value: any) => Vue.set(array, index, value);
 globalThis._duetModelSetArray = (array, index, value) => array[index] = value;
 function setArrayItem(array, index, value) {
     globalThis._duetModelSetArray(array, index, value);

package/package.json

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