@duet3d/objectmodel 3.4.0-b14 → 3.4.0-b17

package/dist/ModelCollection.js

@@ -72,7 +72,14 @@ class ModelCollection extends Array {
         }
         // Add new items
         for (let i = this.length; i < jsonElement.length; i++) {
-            this.push(jsonElement[i]);
+            const itemToAdd = jsonElement[i];
+            if (itemToAdd === null) {
+                super.push(itemToAdd);
+            }
+            else {
+                const newItem = new this.itemConstructor();
+                super.push(newItem.update(itemToAdd));
+            }
         }
         return this;
     }

package/dist/ModelObject.js

@@ -43,6 +43,9 @@ class ModelObject {
                                 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 if (prop instanceof Array) {
@@ -184,7 +187,24 @@ function initObject(itemType, data) {
     for (let key in data) {
         const resultKey = result[key];
         if (isModelObject(resultKey)) {
-            resultKey.update(data[key]);
+            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];

package/dist/move/DriverId.js

@@ -19,6 +19,7 @@ class DriverId extends ModelObject_1.default {
         if (isDriverId(jsonElement)) {
             this.board = jsonElement.board;
             this.driver = jsonElement.driver;
+            return this;
         }
         if (typeof jsonElement === "string") {
             const matches = /(\d+)\.(\d+)/.exec(jsonElement);

package/package.json

@@ -1,30 +1,32 @@
-{
-  "name": "@duet3d/objectmodel",
-  "version": "3.4.0-b14",
-  "description": "TypeScript implementation of the Duet3D Object Model",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "scripts": {
-    "test": "jest --config jestconfig.json",
-    "build": "tsc",
-    "prepare" : "npm run build",
-    "prepublishOnly" : "npm test"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Duet3D/ObjectModel.git"
-  },
-  "author": "Christian Hammacher",
-  "license": "LGPL-2.1",
-  "bugs": {
-    "url": "https://github.com/Duet3D/ObjectModel/issues"
-  },
-  "homepage": "https://github.com/Duet3D/ObjectModel#readme",
-  "devDependencies": {
-    "@types/jest": "^27.0.3",
-    "jest": "^27.4.5",
-    "ts-jest": "^27.1.2",
-    "typescript": "^4.5.2"
-  },
-  "files": ["/dist"]
-}
+{
+  "name": "@duet3d/objectmodel",
+  "version": "3.4.0-b17",
+  "description": "TypeScript implementation of the Duet3D Object Model",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "scripts": {
+    "test": "jest --config jestconfig.json",
+    "build": "tsc",
+    "prepare": "npm run build",
+    "prepublishOnly": "npm test"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Duet3D/ObjectModel.git"
+  },
+  "author": "Christian Hammacher",
+  "license": "LGPL-2.1",
+  "bugs": {
+    "url": "https://github.com/Duet3D/ObjectModel/issues"
+  },
+  "homepage": "https://github.com/Duet3D/ObjectModel#readme",
+  "devDependencies": {
+    "@types/jest": "^27.5.0",
+    "jest": "^27.5.1",
+    "ts-jest": "^27.1.4",
+    "typescript": "^4.6.4"
+  },
+  "files": [
+    "/dist"
+  ]
+}