@duet3d/objectmodel 3.6.0-beta.6 → 3.6.0-beta.7

package/dist/ModelCollection.d.ts

@@ -3,9 +3,6 @@ import { IModelObject } from "./ModelObject";
  * Class for storing model object items in an array
  */
 export declare class ModelCollection<T extends IModelObject | null> extends Array<T> implements IModelObject {
-    readonly itemConstructor: {
-        new (): T;
-    };
     /**
      * Constructor of this class
      * @param itemConstructor Item constructor type that items must derive from

package/dist/ModelCollection.js

@@ -14,8 +14,8 @@ class ModelCollection extends Array {
      */
     constructor(itemConstructor) {
         super();
-        this.itemConstructor = itemConstructor;
         Object.setPrototypeOf(this, ModelCollection.prototype);
+        Object.defineProperty(this, "$itemConstructor", { enumerable: false, value: itemConstructor });
     }
     // Unfortunately it isn't possible to override index operators in JS/TS
     /**
@@ -23,12 +23,13 @@ class ModelCollection extends Array {
      * @param items Items to add
      */
     push(...items) {
+        const that = this;
         for (const item of items) {
-            if (item === null || item instanceof this.itemConstructor) {
+            if (item === null || item instanceof that.$itemConstructor) {
                 super.push(item);
             }
             else {
-                const newItem = new this.itemConstructor();
+                const newItem = new that.$itemConstructor();
                 super.push(newItem.update(item));
             }
         }
@@ -46,6 +47,7 @@ class ModelCollection extends Array {
         if (!(jsonElement instanceof Array)) {
             throw new Error(`Invalid JSON element type for model collection ${typeof jsonElement}`);
         }
+        const that = this;
         // Remove deleted items
         this.splice(jsonElement.length);
         // Update existing items
@@ -53,11 +55,11 @@ class ModelCollection extends Array {
             const currentItem = this[i];
             if (currentItem === null) {
                 const newItem = jsonElement[i];
-                if (newItem instanceof this.itemConstructor) {
+                if (newItem instanceof that.$itemConstructor) {
                     (0, index_1.setArrayItem)(this, i, jsonElement[i]);
                 }
                 else {
-                    const refItem = new this.itemConstructor();
+                    const refItem = new that.$itemConstructor();
                     (0, index_1.setArrayItem)(this, i, refItem.update(newItem));
                 }
             }
@@ -81,7 +83,7 @@ class ModelCollection extends Array {
                 super.push(itemToAdd);
             }
             else {
-                const newItem = new this.itemConstructor();
+                const newItem = new that.$itemConstructor();
                 super.push(newItem.update(itemToAdd));
             }
         }

package/dist/ModelDictionary.d.ts

@@ -3,10 +3,6 @@ import { IModelObject } from "./ModelObject";
  * Dictionary class to map object model data
  */
 export declare class ModelDictionary<T> extends Map<string, T | null> implements IModelObject {
-    readonly nullDeletesKeys: boolean;
-    readonly itemConstructor: {
-        new (): T;
-    } | null;
     /**
      * Constructor of this class
      * @param nullDeletesKeys Whether setting null to items effectively deletes them

package/dist/ModelDictionary.js

@@ -14,9 +14,9 @@ class ModelDictionary extends Map {
      */
     constructor(nullDeletesKeys, itemConstructor = null) {
         super();
-        this.nullDeletesKeys = nullDeletesKeys;
-        this.itemConstructor = itemConstructor;
         Object.setPrototypeOf(this, ModelDictionary.prototype);
+        Object.defineProperty(this, "$nullDeletesKeys", { enumerable: false, value: nullDeletesKeys });
+        Object.defineProperty(this, "$itemConstructor", { enumerable: false, value: itemConstructor });
     }
     /**
      * Overridden set method to perform type-checks and update
@@ -24,8 +24,9 @@ class ModelDictionary extends Map {
      * @param value Value to set
      */
     set(key, value) {
+        const that = this;
         if (value === null) {
-            if (this.nullDeletesKeys) {
+            if (that.$nullDeletesKeys) {
                 this.delete(key);
                 return this;
             }
@@ -33,8 +34,8 @@ class ModelDictionary extends Map {
         }
         const currentItem = this.get(key);
         if (currentItem == null) {
-            if (this.itemConstructor !== null && !(value instanceof this.itemConstructor)) {
-                const newItem = new this.itemConstructor();
+            if (that.$itemConstructor !== null && !(value instanceof that.$itemConstructor)) {
+                const newItem = new that.$itemConstructor();
                 if ((0, ModelObject_1.isModelObject)(newItem)) {
                     const updatedItem = newItem.update(value);
                     return super.set(key, updatedItem);

package/package.json

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