@duet3d/objectmodel 3.4.0-b6 → 3.4.0-b7

package/dist/ModelCollection.d.ts

@@ -24,3 +24,14 @@ export declare class ModelCollection<T extends IModelObject> extends Array<T> im
     update(jsonElement: any): IModelObject | null;
 }
 export default ModelCollection;
+/**
+ * Initialize a model collection from the given data
+ * @param itemType Item type to create
+ * @param data Data to assign
+ * @returns Initialized model collection
+ */
+export declare function initCollection<T extends IModelObject>(itemType: {
+    new (): T;
+}, data: Array<{
+    [Property in keyof T]?: T[Property];
+}>): ModelCollection<T>;

package/dist/ModelCollection.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModelCollection = void 0;
+exports.initCollection = exports.ModelCollection = void 0;
 const ModelObject_1 = require("./ModelObject");
 const index_1 = require("./index");
 /**
@@ -79,3 +79,19 @@ class ModelCollection extends Array {
 }
 exports.ModelCollection = ModelCollection;
 exports.default = ModelCollection;
+/**
+ * Initialize a model collection from the given data
+ * @param itemType Item type to create
+ * @param data Data to assign
+ * @returns Initialized model collection
+ */
+function initCollection(itemType, data) {
+    const result = new ModelCollection(itemType);
+    for (let presetItem of data) {
+        const item = new itemType();
+        item.update(presetItem);
+        result.push(item);
+    }
+    return result;
+}
+exports.initCollection = initCollection;

package/dist/ModelDictionary.d.ts

@@ -27,3 +27,15 @@ export declare class ModelDictionary<T> extends Map<string, T | null> implements
     update(jsonElement: any): IModelObject | null;
 }
 export default ModelDictionary;
+/**
+ * Initialize a model dictionary from the given data
+ * @param nullDeletesKeys Defines whether setting values to null deletes the corresponding key
+ * @param itemConstructor Item constructor
+ * @param data Data to assign
+ * @returns Initialized model dictionary
+ */
+export declare function initDictionary<T>(nullDeletesKeys: boolean, itemConstructor: {
+    new (): T;
+}, data: Record<string, {
+    [Property in keyof T]?: T[Property];
+}>): ModelDictionary<T>;

package/dist/ModelDictionary.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModelDictionary = void 0;
+exports.initDictionary = exports.ModelDictionary = void 0;
 const ModelObject_1 = require("./ModelObject");
 /**
  * Dictionary class to map object model data
@@ -67,3 +67,25 @@ class ModelDictionary extends Map {
 }
 exports.ModelDictionary = ModelDictionary;
 exports.default = ModelDictionary;
+/**
+ * Initialize a model dictionary from the given data
+ * @param nullDeletesKeys Defines whether setting values to null deletes the corresponding key
+ * @param itemConstructor Item constructor
+ * @param data Data to assign
+ * @returns Initialized model dictionary
+ */
+function initDictionary(nullDeletesKeys, itemConstructor, data) {
+    const result = new ModelDictionary(nullDeletesKeys, itemConstructor);
+    for (let key in data) {
+        const item = new itemConstructor();
+        if ((0, ModelObject_1.isModelObject)(item)) {
+            item.update(data[key]);
+            result.set(key, item);
+        }
+        else {
+            result.set(key, data[key]);
+        }
+    }
+    return result;
+}
+exports.initDictionary = initDictionary;

package/dist/ModelObject.d.ts

@@ -33,15 +33,15 @@ export declare abstract class ModelObject implements IModelObject {
         new (): T;
     }): void;
 }
+export default ModelObject;
 /**
- * Initialize a class item from the given data
- * @param itemType Item type to create
+ * Initialize a model object from the given data
+ * @param itemType Model type to create
  * @param data Data to assign
- * @returns Initialized item instance
+ * @returns Initialized model instance
  */
-export declare function initItem<T>(itemType: {
+export declare function initObject<T>(itemType: {
     new (): T;
 }, data: {
     [Property in keyof T]?: T[Property];
 }): T;
-export default ModelObject;

package/dist/ModelObject.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initItem = exports.ModelObject = exports.isModelObject = void 0;
+exports.initObject = exports.ModelObject = exports.isModelObject = void 0;
 const index_1 = require("./index");
 /**
  * Check whether a given value provides model update functionality
@@ -153,18 +153,24 @@ class ModelObject {
     }
 }
 exports.ModelObject = ModelObject;
+exports.default = ModelObject;
 /**
- * Initialize a class item from the given data
- * @param itemType Item type to create
+ * Initialize a model object from the given data
+ * @param itemType Model type to create
  * @param data Data to assign
- * @returns Initialized item instance
+ * @returns Initialized model instance
  */
-function initItem(itemType, data) {
+function initObject(itemType, data) {
     const result = new itemType();
     for (let key in data) {
-        result[key] = data[key];
+        const resultKey = result[key];
+        if (isModelObject(resultKey)) {
+            resultKey.update(data[key]);
+        }
+        else {
+            result[key] = data[key];
+        }
     }
     return result;
 }
-exports.initItem = initItem;
-exports.default = ModelObject;
+exports.initObject = initObject;

package/package.json

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