@duet3d/objectmodel 3.5.0-beta.20 → 3.5.0-beta.22

package/dist/ModelObject.d.ts

@@ -24,15 +24,6 @@ export declare abstract class ModelObject implements IModelObject {
      * @returns Updated instance (may not equal the original instance)
      */
     update(jsonElement: any): IModelObject | null;
-    /**
-     * Called to check if a diverging property type may be set.
-     * Note that this is not applicable to null values; null is always legit
-     * @param key Property key
-     * @param oldValue Old member value
-     * @param newValue New member value
-     * @returns True if the value can be set by the update call
-     */
-    protected checkDivergingDataType<K extends keyof this>(key: K, oldValue: typeof this[K], newValue: any): boolean;
     /**
      * Wrap a nullable model object property so that type checks can be performed
      * @param key Property key of the derived class

package/dist/ModelObject.js

@@ -113,7 +113,7 @@ class ModelObject {
                         if (typeof value === "boolean") {
                             this[ownKey] = value;
                         }
-                        else if (typeof value === "number" || this.checkDivergingDataType(ownKey, prop, value)) {
+                        else if (typeof value === "number") {
                             // RRF used to report booleans as integers so convert them if necessary
                             this[ownKey] = Boolean(value);
                         }
@@ -122,7 +122,7 @@ class ModelObject {
                         }
                     }
                     else if (propType === "number") {
-                        if (typeof value === "number" || typeof value === "bigint" || this.checkDivergingDataType(ownKey, prop, value)) {
+                        if (typeof value === "number" || typeof value === "bigint") {
                             this[ownKey] = value;
                         }
                         else if (process.env.NODE_ENV !== "production") {
@@ -130,7 +130,7 @@ class ModelObject {
                         }
                     }
                     else if (propType === "bigint") {
-                        if (typeof value === "number" || typeof value === "bigint" || this.checkDivergingDataType(ownKey, prop, value)) {
+                        if (typeof value === "number" || typeof value === "bigint") {
                             this[ownKey] = value;
                         }
                         else if (process.env.NODE_ENV !== "production") {
@@ -138,7 +138,7 @@ class ModelObject {
                         }
                     }
                     else if (propType === "string") {
-                        if (typeof value === "string" || this.checkDivergingDataType(ownKey, prop, value)) {
+                        if (typeof value === "string") {
                             this[ownKey] = value;
                         }
                         else if (process.env.NODE_ENV !== "production") {
@@ -146,7 +146,7 @@ class ModelObject {
                         }
                     }
                     else if (propType === "function") {
-                        if (typeof value === "function" || this.checkDivergingDataType(ownKey, prop, value)) {
+                        if (typeof value === "function") {
                             this[ownKey] = value;
                         }
                         else if (process.env.NODE_ENV !== "production") {
@@ -154,7 +154,7 @@ class ModelObject {
                         }
                     }
                     else if (propType === "object") {
-                        if (typeof value === "object" || this.checkDivergingDataType(ownKey, prop, value)) {
+                        if (typeof value === "object") {
                             this[ownKey] = value;
                         }
                         else if (process.env.NODE_ENV !== "production") {
@@ -169,17 +169,6 @@ class ModelObject {
         }
         return this;
     }
-    /**
-     * Called to check if a diverging property type may be set.
-     * Note that this is not applicable to null values; null is always legit
-     * @param key Property key
-     * @param oldValue Old member value
-     * @param newValue New member value
-     * @returns True if the value can be set by the update call
-     */
-    checkDivergingDataType(key, oldValue, newValue) {
-        return false;
-    }
     /**
      * Wrap a nullable model object property so that type checks can be performed
      * @param key Property key of the derived class

package/dist/ModelSet.d.ts

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

package/dist/ModelSet.js

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

package/dist/state/MessageBox.d.ts

@@ -1,4 +1,4 @@
-import ModelObject from "../ModelObject";
+import ModelObject, { IModelObject } from "../ModelObject";
 export declare enum MessageBoxMode {
     noButtons = 0,
     closeOnly = 1,
@@ -21,6 +21,6 @@ export declare class MessageBox extends ModelObject {
     seq: number;
     timeout: number;
     title: string;
-    protected checkDivergingDataType<K extends keyof this>(key: K, oldValue: this[K], newValue: any): boolean;
+    update(jsonElement: any): IModelObject | null;
 }
 export default MessageBox;

package/dist/state/MessageBox.js

@@ -28,8 +28,11 @@ class MessageBox extends ModelObject_1.default {
         this.timeout = 0;
         this.title = "";
     }
-    checkDivergingDataType(key, oldValue, newValue) {
-        return key === "default" && (typeof newValue === "number" || typeof newValue === "string");
+    update(jsonElement) {
+        if (jsonElement instanceof Object && (typeof jsonElement.default === "number" || typeof jsonElement.default === "string")) {
+            this.default = jsonElement;
+        }
+        return super.update(jsonElement);
     }
 }
 exports.MessageBox = MessageBox;

package/package.json

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