@duet3d/objectmodel 3.5.0-beta.13 → 3.5.0-beta.15

package/dist/ModelDictionary.d.ts

@@ -25,6 +25,11 @@ export declare class ModelDictionary<T> extends Map<string, T | null> implements
      * @returns Updated instance
      */
     update(jsonElement: any): IModelObject | null;
+    /**
+     * Convert this object to JSON
+     * @returns JSON object
+     */
+    toJSON(): Record<string, T | null>;
 }
 export default ModelDictionary;
 /**

package/dist/ModelDictionary.js

@@ -69,6 +69,17 @@ class ModelDictionary extends Map {
         }
         return this;
     }
+    /**
+     * Convert this object to JSON
+     * @returns JSON object
+     */
+    toJSON() {
+        const json = {};
+        for (const [key, value] of this) {
+            json[key] = value;
+        }
+        return json;
+    }
 }
 exports.ModelDictionary = ModelDictionary;
 exports.default = ModelDictionary;

package/dist/job/index.d.ts

@@ -25,6 +25,7 @@ export declare class Job extends ModelObject {
     lastFileAborted: boolean;
     lastFileCancelled: boolean;
     lastFileSimulated: boolean;
+    lastWarmUpDuration: number | null;
     layer: number | null;
     readonly layers: ModelCollection<Layer>;
     layerTime: number | null;

package/dist/job/index.js

@@ -51,6 +51,7 @@ class Job extends ModelObject_1.default {
         this.lastFileAborted = false;
         this.lastFileCancelled = false;
         this.lastFileSimulated = false;
+        this.lastWarmUpDuration = null;
         this.layer = null;
         this.layers = new ModelCollection_1.default(Layer);
         this.layerTime = null;

package/dist/plugins/PluginManifest.d.ts

@@ -32,11 +32,13 @@ export declare enum SbcPermission {
     superUser = "superUser"
 }
 export declare class PluginManifest extends ModelObject {
-    #private;
-    get id(): string;
-    set id(value: string);
-    get name(): string;
-    set name(value: string);
+    /**
+     * Constructor of this class
+     * @param itemConstructor Item constructor type that items must derive from
+     */
+    constructor();
+    id: string;
+    name: string;
     author: string;
     version: string;
     license: string;

package/dist/plugins/PluginManifest.js

@@ -1,16 +1,4 @@
 "use strict";
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var _PluginManifest_id, _PluginManifest_name;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PluginManifest = exports.SbcPermission = void 0;
 const ModelObject_1 = require("../ModelObject");
@@ -48,10 +36,14 @@ var SbcPermission;
     SbcPermission["superUser"] = "superUser";
 })(SbcPermission = exports.SbcPermission || (exports.SbcPermission = {}));
 class PluginManifest extends ModelObject_1.default {
+    /**
+     * Constructor of this class
+     * @param itemConstructor Item constructor type that items must derive from
+     */
     constructor() {
-        super(...arguments);
-        _PluginManifest_id.set(this, "");
-        _PluginManifest_name.set(this, "");
+        super();
+        this.id = "";
+        this.name = "";
         this.author = "";
         this.version = "1.0.0";
         this.license = "LGPL-3.0-or-later";
@@ -71,30 +63,38 @@ class PluginManifest extends ModelObject_1.default {
         this.sbcPythonDependencies = [];
         this.rrfVersion = null;
         this.data = new Map();
-    }
-    get id() { return __classPrivateFieldGet(this, _PluginManifest_id, "f"); }
-    set id(value) {
-        if (!value || value.length > 32) {
-            throw new Error("Invalid plugin identifier");
-        }
-        for (const c in value.split("")) {
-            if (!/\w/.test(c)) {
-                throw new Error("Illegal plugin identifier");
+        let id = "";
+        Object.defineProperty(this, "id", {
+            enumerable: true,
+            get() { return id; },
+            set(value) {
+                if (!value || value.length > 32) {
+                    throw new Error("Invalid plugin identifier");
+                }
+                for (const c in value.split("")) {
+                    if (!/\w/.test(c)) {
+                        throw new Error("Illegal plugin identifier");
+                    }
+                }
+                id = value;
             }
-        }
-        __classPrivateFieldSet(this, _PluginManifest_id, value, "f");
-    }
-    get name() { return __classPrivateFieldGet(this, _PluginManifest_name, "f"); }
-    set name(value) {
-        if (!value || value.length > 64) {
-            throw new Error("Invalid plugin name");
-        }
-        for (const c in value.split("")) {
-            if (!/[\w -_]/.test(c)) {
-                throw new Error("Illegal plugin name");
+        });
+        let name = "";
+        Object.defineProperty(this, "name", {
+            enumerable: true,
+            get() { return name; },
+            set(value) {
+                if (!value || value.length > 64) {
+                    throw new Error("Invalid plugin name");
+                }
+                for (const c in value.split("")) {
+                    if (!/[\w -_]/.test(c)) {
+                        throw new Error("Illegal plugin name");
+                    }
+                }
+                name = value;
             }
-        }
-        __classPrivateFieldSet(this, _PluginManifest_name, value, "f");
+        });
     }
     static checkVersion(actual, required) {
         if (required) {
@@ -110,5 +110,4 @@ class PluginManifest extends ModelObject_1.default {
     }
 }
 exports.PluginManifest = PluginManifest;
-_PluginManifest_id = new WeakMap(), _PluginManifest_name = new WeakMap();
 exports.default = PluginManifest;

package/package.json

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