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

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/dist/move/kinematics/PolarKinematics.d.ts

@@ -2,6 +2,11 @@ import { IModelObject } from "../../ModelObject";
 import KinematicsBase from "./KinematicsBase";
 export declare class PolarKinematics extends KinematicsBase {
     constructor();
+    radiusHomed: number;
+    radiusMax: number;
+    radiusMin: number;
+    ttAccMax: number;
+    ttSpeedMax: number;
     update(jsonElement: any): IModelObject | null;
 }
 export default PolarKinematics;

package/dist/move/kinematics/PolarKinematics.js

@@ -6,6 +6,11 @@ const index_1 = require("./index");
 class PolarKinematics extends KinematicsBase_1.default {
     constructor() {
         super(KinematicsBase_1.KinematicsName.polar);
+        this.radiusHomed = 0;
+        this.radiusMax = 0;
+        this.radiusMin = 0;
+        this.ttAccMax = 0;
+        this.ttSpeedMax = 0;
     }
     update(jsonElement) {
         if (jsonElement === null) {

package/dist/move/kinematics/ScaraKinematics.d.ts

@@ -1,6 +1,14 @@
 import { IModelObject } from "../../ModelObject";
 import { ZLeadscrewKinematics } from "./KinematicsBase";
 export declare class ScaraKinematics extends ZLeadscrewKinematics {
+    crosstalk: number[];
+    distalLength: number;
+    minRadius: number;
+    proximalLength: number;
+    psiLimits: number[];
+    thetaLimits: number[];
+    xOffset: number;
+    yOffset: number;
     update(jsonElement: any): IModelObject | null;
 }
 export default ScaraKinematics;

package/dist/move/kinematics/ScaraKinematics.js

@@ -4,6 +4,17 @@ exports.ScaraKinematics = void 0;
 const KinematicsBase_1 = require("./KinematicsBase");
 const index_1 = require("./index");
 class ScaraKinematics extends KinematicsBase_1.ZLeadscrewKinematics {
+    constructor() {
+        super(...arguments);
+        this.crosstalk = [0, 0, 0];
+        this.distalLength = 0;
+        this.minRadius = 0;
+        this.proximalLength = 0;
+        this.psiLimits = [0, 0];
+        this.thetaLimits = [0, 0];
+        this.xOffset = 0;
+        this.yOffset = 0;
+    }
     update(jsonElement) {
         if (jsonElement === null) {
             throw new Error("Kinematics must not be null");

package/package.json

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

package/dist/httpEndpoints/index.d.ts

@@ -1,19 +0,0 @@
-import ModelObject from "../ModelObject";
-export declare enum HttpEndpointType {
-    GET = "GET",
-    POST = "POST",
-    PUT = "PUT",
-    PATCH = "PATCH",
-    TRACE = "TRACE",
-    DELETE = "DELETE",
-    OPTIONS = "OPTIONS",
-    WebSocket = "WebSocket"
-}
-export declare class HttpEndpoint extends ModelObject {
-    endpointType: HttpEndpointType;
-    namespace: string;
-    path: string;
-    isUploadRequest: boolean;
-    unixSocket: string;
-}
-export default HttpEndpoint;

package/dist/httpEndpoints/index.js

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpEndpoint = exports.HttpEndpointType = void 0;
-const ModelObject_1 = require("../ModelObject");
-var HttpEndpointType;
-(function (HttpEndpointType) {
-    HttpEndpointType["GET"] = "GET";
-    HttpEndpointType["POST"] = "POST";
-    HttpEndpointType["PUT"] = "PUT";
-    HttpEndpointType["PATCH"] = "PATCH";
-    HttpEndpointType["TRACE"] = "TRACE";
-    HttpEndpointType["DELETE"] = "DELETE";
-    HttpEndpointType["OPTIONS"] = "OPTIONS";
-    HttpEndpointType["WebSocket"] = "WebSocket";
-})(HttpEndpointType = exports.HttpEndpointType || (exports.HttpEndpointType = {}));
-class HttpEndpoint extends ModelObject_1.default {
-    constructor() {
-        super(...arguments);
-        this.endpointType = HttpEndpointType.GET;
-        this.namespace = "";
-        this.path = "";
-        this.isUploadRequest = false;
-        this.unixSocket = "";
-    }
-}
-exports.HttpEndpoint = HttpEndpoint;
-exports.default = HttpEndpoint;

package/dist/userSessions/index.d.ts

@@ -1,18 +0,0 @@
-import ModelObject from "../ModelObject";
-export declare enum AccessLevel {
-    readOnly = "readOnly",
-    readWrite = "readWrite"
-}
-export declare enum SessionType {
-    local = "local",
-    http = "http",
-    telnet = "telnet"
-}
-export declare class UserSession extends ModelObject {
-    accessLevel: AccessLevel;
-    id: number;
-    origin: string | null;
-    originId: number;
-    sessionType: SessionType;
-}
-export default UserSession;

package/dist/userSessions/index.js

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserSession = exports.SessionType = exports.AccessLevel = void 0;
-const ModelObject_1 = require("../ModelObject");
-var AccessLevel;
-(function (AccessLevel) {
-    AccessLevel["readOnly"] = "readOnly";
-    AccessLevel["readWrite"] = "readWrite";
-})(AccessLevel = exports.AccessLevel || (exports.AccessLevel = {}));
-var SessionType;
-(function (SessionType) {
-    SessionType["local"] = "local";
-    SessionType["http"] = "http";
-    SessionType["telnet"] = "telnet";
-})(SessionType = exports.SessionType || (exports.SessionType = {}));
-class UserSession extends ModelObject_1.default {
-    constructor() {
-        super(...arguments);
-        this.accessLevel = AccessLevel.readOnly;
-        this.id = 0;
-        this.origin = null;
-        this.originId = -1;
-        this.sessionType = SessionType.local;
-    }
-}
-exports.UserSession = UserSession;
-exports.default = UserSession;