@duet3d/objectmodel 3.7.0-alpha.7 → 3.7.0-alpha.8

package/dist/spindles/index.js

@@ -1,23 +1,17 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Spindle = exports.SpindleType = exports.SpindleState = void 0;
-const ModelObject_1 = __importDefault(require("../ModelObject"));
-var SpindleState;
+import ModelObject from "../ModelObject";
+export var SpindleState;
 (function (SpindleState) {
     SpindleState["unconfigured"] = "unconfigured";
     SpindleState["stopped"] = "stopped";
     SpindleState["forward"] = "forward";
     SpindleState["reverse"] = "reverse";
-})(SpindleState || (exports.SpindleState = SpindleState = {}));
-var SpindleType;
+})(SpindleState || (SpindleState = {}));
+export var SpindleType;
 (function (SpindleType) {
     SpindleType["enaDir"] = "enaDir";
     SpindleType["fwdRev"] = "fwdRev";
-})(SpindleType || (exports.SpindleType = SpindleType = {}));
-class Spindle extends ModelObject_1.default {
+})(SpindleType || (SpindleType = {}));
+export class Spindle extends ModelObject {
     constructor() {
         super(...arguments);
         this.active = null;
@@ -33,5 +27,4 @@ class Spindle extends ModelObject_1.default {
         this.type = null;
     }
 }
-exports.Spindle = Spindle;
-exports.default = Spindle;
+export default Spindle;

package/dist/state/MachineStatus.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MachineStatus = void 0;
-var MachineStatus;
+export var MachineStatus;
 (function (MachineStatus) {
     MachineStatus["disconnected"] = "disconnected";
     MachineStatus["starting"] = "starting";
@@ -17,5 +14,5 @@ var MachineStatus;
     MachineStatus["busy"] = "busy";
     MachineStatus["changingTool"] = "changingTool";
     MachineStatus["idle"] = "idle";
-})(MachineStatus || (exports.MachineStatus = MachineStatus = {}));
-exports.default = MachineStatus;
+})(MachineStatus || (MachineStatus = {}));
+export default MachineStatus;

package/dist/state/MessageBox.js

@@ -1,11 +1,5 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MessageBox = exports.MessageBoxMode = void 0;
-const ModelObject_1 = __importDefault(require("../ModelObject"));
-var MessageBoxMode;
+import ModelObject from "../ModelObject";
+export var MessageBoxMode;
 (function (MessageBoxMode) {
     MessageBoxMode[MessageBoxMode["noButtons"] = 0] = "noButtons";
     MessageBoxMode[MessageBoxMode["closeOnly"] = 1] = "closeOnly";
@@ -15,8 +9,8 @@ var MessageBoxMode;
     MessageBoxMode[MessageBoxMode["intInput"] = 5] = "intInput";
     MessageBoxMode[MessageBoxMode["floatInput"] = 6] = "floatInput";
     MessageBoxMode[MessageBoxMode["stringInput"] = 7] = "stringInput";
-})(MessageBoxMode || (exports.MessageBoxMode = MessageBoxMode = {}));
-class MessageBox extends ModelObject_1.default {
+})(MessageBoxMode || (MessageBoxMode = {}));
+export class MessageBox extends ModelObject {
     constructor() {
         super(...arguments);
         this.axisControls = null;
@@ -38,5 +32,4 @@ class MessageBox extends ModelObject_1.default {
         return super.update(jsonElement);
     }
 }
-exports.MessageBox = MessageBox;
-exports.default = MessageBox;
+export default MessageBox;

package/dist/state/RestorePoint.js

@@ -1,11 +1,5 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RestorePoint = void 0;
-const ModelObject_1 = __importDefault(require("../ModelObject"));
-class RestorePoint extends ModelObject_1.default {
+import ModelObject from "../ModelObject";
+export class RestorePoint extends ModelObject {
     constructor() {
         super(...arguments);
         this.coords = [];
@@ -17,5 +11,4 @@ class RestorePoint extends ModelObject_1.default {
         this.toolNumber = -1;
     }
 }
-exports.RestorePoint = RestorePoint;
-exports.default = RestorePoint;
+export default RestorePoint;

package/dist/state/index.js

@@ -1,58 +1,36 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.State = exports.StartupError = exports.MachineMode = exports.LogLevel = exports.GpOutputPort = exports.BeepRequest = void 0;
-const ModelObject_1 = __importDefault(require("../ModelObject"));
-const ModelCollection_1 = __importDefault(require("../ModelCollection"));
-const MessageBox_1 = __importDefault(require("./MessageBox"));
-const RestorePoint_1 = __importDefault(require("./RestorePoint"));
-const MachineStatus_1 = require("./MachineStatus");
-class BeepRequest extends ModelObject_1.default {
+import ModelObject from "../ModelObject";
+import ModelCollection from "../ModelCollection";
+import MessageBox from "./MessageBox";
+import RestorePoint from "./RestorePoint";
+import { MachineStatus } from "./MachineStatus";
+export class BeepRequest extends ModelObject {
     constructor() {
         super(...arguments);
         this.duration = 0;
         this.frequency = 0;
     }
 }
-exports.BeepRequest = BeepRequest;
-class GpOutputPort extends ModelObject_1.default {
+export class GpOutputPort extends ModelObject {
     constructor() {
         super(...arguments);
         this.freq = 0;
         this.pwm = 0;
     }
 }
-exports.GpOutputPort = GpOutputPort;
-var LogLevel;
+export var LogLevel;
 (function (LogLevel) {
     LogLevel["debug"] = "debug";
     LogLevel["info"] = "info";
     LogLevel["warn"] = "warn";
     LogLevel["off"] = "off";
-})(LogLevel || (exports.LogLevel = LogLevel = {}));
-var MachineMode;
+})(LogLevel || (LogLevel = {}));
+export var MachineMode;
 (function (MachineMode) {
     MachineMode["fff"] = "FFF";
     MachineMode["cnc"] = "CNC";
     MachineMode["laser"] = "Laser";
-})(MachineMode || (exports.MachineMode = MachineMode = {}));
-class StartupError extends ModelObject_1.default {
+})(MachineMode || (MachineMode = {}));
+export class StartupError extends ModelObject {
     constructor() {
         super(...arguments);
         this.file = "";
@@ -60,8 +38,7 @@ class StartupError extends ModelObject_1.default {
         this.message = "";
     }
 }
-exports.StartupError = StartupError;
-class State extends ModelObject_1.default {
+export class State extends ModelObject {
     constructor() {
         super();
         this.atxPower = null;
@@ -70,7 +47,7 @@ class State extends ModelObject_1.default {
         this.currentTool = -1;
         this.deferredPowerDown = null;
         this.displayMessage = "";
-        this.gpOut = new ModelCollection_1.default(GpOutputPort);
+        this.gpOut = new ModelCollection(GpOutputPort);
         this.laserPwm = null;
         this.logFile = null;
         this.logLevel = LogLevel.off;
@@ -91,19 +68,18 @@ class State extends ModelObject_1.default {
         /**
          * @deprecated use move.motionSystems[].restorePoints instead
          */
-        this.restorePoints = new ModelCollection_1.default(RestorePoint_1.default);
+        this.restorePoints = new ModelCollection(RestorePoint);
         this.startupError = null;
-        this.status = MachineStatus_1.MachineStatus.starting;
+        this.status = MachineStatus.starting;
         this.thisInput = null;
         this.time = null;
         this.upTime = 0;
-        ModelObject_1.default.wrapModelProperty(this, "beep", BeepRequest);
-        ModelObject_1.default.wrapModelProperty(this, "startupError", StartupError);
-        ModelObject_1.default.wrapModelProperty(this, "messageBox", MessageBox_1.default);
+        ModelObject.wrapModelProperty(this, "beep", BeepRequest);
+        ModelObject.wrapModelProperty(this, "startupError", StartupError);
+        ModelObject.wrapModelProperty(this, "messageBox", MessageBox);
     }
 }
-exports.State = State;
-exports.default = State;
-__exportStar(require("./MachineStatus"), exports);
-__exportStar(require("./MessageBox"), exports);
-__exportStar(require("./RestorePoint"), exports);
+export default State;
+export * from "./MachineStatus";
+export * from "./MessageBox";
+export * from "./RestorePoint";

package/dist/tools/ToolRetraction.js

@@ -1,11 +1,5 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ToolRetraction = void 0;
-const ModelObject_1 = __importDefault(require("../ModelObject"));
-class ToolRetraction extends ModelObject_1.default {
+import ModelObject from "../ModelObject";
+export class ToolRetraction extends ModelObject {
     constructor() {
         super(...arguments);
         this.extraRestart = 0;
@@ -15,5 +9,4 @@ class ToolRetraction extends ModelObject_1.default {
         this.zHop = 0;
     }
 }
-exports.ToolRetraction = ToolRetraction;
-exports.default = ToolRetraction;
+export default ToolRetraction;

package/dist/tools/index.js

@@ -1,18 +1,12 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Tool = exports.ToolState = void 0;
-const ModelObject_1 = __importDefault(require("../ModelObject"));
-const ToolRetraction_1 = __importDefault(require("./ToolRetraction"));
-var ToolState;
+import ModelObject from "../ModelObject";
+import ToolRetraction from "./ToolRetraction";
+export var ToolState;
 (function (ToolState) {
     ToolState["off"] = "off";
     ToolState["active"] = "active";
     ToolState["standby"] = "standby";
-})(ToolState || (exports.ToolState = ToolState = {}));
-class Tool extends ModelObject_1.default {
+})(ToolState || (ToolState = {}));
+export class Tool extends ModelObject {
     constructor() {
         super(...arguments);
         this.active = [];
@@ -32,12 +26,11 @@ class Tool extends ModelObject_1.default {
         this.number = 0;
         this.offsets = [];
         this.offsetsProbed = false;
-        this.retraction = new ToolRetraction_1.default();
+        this.retraction = new ToolRetraction();
         this.spindle = -1;
         this.spindleRpm = 0;
         this.standby = [];
         this.state = ToolState.off;
     }
 }
-exports.Tool = Tool;
-exports.default = Tool;
+export default Tool;

package/dist/volumes/index.js

@@ -1,11 +1,5 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Volume = void 0;
-const ModelObject_1 = __importDefault(require("../ModelObject"));
-class Volume extends ModelObject_1.default {
+import ModelObject from "../ModelObject";
+export class Volume extends ModelObject {
     constructor() {
         super(...arguments);
         this.capacity = null;
@@ -17,5 +11,4 @@ class Volume extends ModelObject_1.default {
         this.speed = null;
     }
 }
-exports.Volume = Volume;
-exports.default = Volume;
+export default Volume;

package/package.json

@@ -1,12 +1,21 @@
 {
   "name": "@duet3d/objectmodel",
-  "version": "3.7.0-alpha.7",
+  "version": "3.7.0-alpha.8",
   "description": "TypeScript implementation of the Duet3D Object Model",
+  "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    },
+    "./deprecations.json": "./dist/deprecations.json",
+    "./enums.json": "./dist/enums.json"
+  },
   "scripts": {
     "test": "jest --config jestconfig.json",
-    "build": "tsc && ts-node scripts/extract-metadata.ts",
+    "build": "tsc && tsx scripts/extract-metadata.ts",
     "prepare": "npm run build",
     "prepublishOnly": "npm test"
   },
@@ -25,7 +34,7 @@
     "@types/node": "^25.0.0",
     "jest": "^30.2.0",
     "ts-jest": "^29.1.2",
-    "ts-node": "^10.9.2",
+    "tsx": "^4.20.0",
     "typescript": "^6.0.3"
   },
   "files": [

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/src/ModelCollection.d.ts

@@ -1,36 +0,0 @@
-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 {
-    /**
-     * Constructor of this class
-     * @param itemConstructor Item constructor type that items must derive from
-     */
-    constructor(itemConstructor: {
-        new (): T;
-    });
-    /**
-     * Overridden push method to perform better type checks
-     * @param items Items to add
-     */
-    push(...items: T[]): number;
-    /**
-     * Update this instance from the given data
-     * @param jsonElement JSON data to upgrade this instance from
-     * @returns Updated instance
-     */
-    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/src/ModelCollection.js

@@ -1,108 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModelCollection = void 0;
-exports.initCollection = initCollection;
-const ModelObject_1 = require("./ModelObject");
-const index_1 = require("./index");
-/**
- * Class for storing model object items in an array
- */
-class ModelCollection extends Array {
-    /**
-     * Constructor of this class
-     * @param itemConstructor Item constructor type that items must derive from
-     */
-    constructor(itemConstructor) {
-        super();
-        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
-    /**
-     * Overridden push method to perform better type checks
-     * @param items Items to add
-     */
-    push(...items) {
-        const that = this;
-        for (const item of items) {
-            if (item === null || item instanceof that.$itemConstructor) {
-                super.push(item);
-            }
-            else {
-                const newItem = new that.$itemConstructor();
-                super.push(newItem.update(item));
-            }
-        }
-        return this.length;
-    }
-    /**
-     * Update this instance from the given data
-     * @param jsonElement JSON data to upgrade this instance from
-     * @returns Updated instance
-     */
-    update(jsonElement) {
-        if (jsonElement === null) {
-            return null;
-        }
-        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
-        for (let i = 0; i < Math.min(jsonElement.length, this.length); i++) {
-            const currentItem = this[i];
-            if (currentItem === null) {
-                const newItem = jsonElement[i];
-                if (newItem instanceof that.$itemConstructor) {
-                    (0, index_1.setArrayItem)(this, i, jsonElement[i]);
-                }
-                else {
-                    const refItem = new that.$itemConstructor();
-                    (0, index_1.setArrayItem)(this, i, refItem.update(newItem));
-                }
-            }
-            else if ((0, ModelObject_1.isModelObject)(currentItem)) {
-                const newItem = currentItem.update(jsonElement[i]);
-                if (currentItem !== newItem) {
-                    (0, index_1.setArrayItem)(this, i, newItem);
-                }
-            }
-            else {
-                const newItem = jsonElement[i];
-                if (currentItem !== newItem) {
-                    (0, index_1.setArrayItem)(this, i, newItem);
-                }
-            }
-        }
-        // Add new items
-        for (let i = this.length; i < jsonElement.length; i++) {
-            const itemToAdd = jsonElement[i];
-            if (itemToAdd === null) {
-                super.push(itemToAdd);
-            }
-            else {
-                const newItem = new that.$itemConstructor();
-                super.push(newItem.update(itemToAdd));
-            }
-        }
-        return this;
-    }
-}
-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();
-        result.push(item.update(presetItem));
-    }
-    return result;
-}

package/dist/src/ModelDictionary.d.ts

@@ -1,44 +0,0 @@
-import { IModelObject } from "./ModelObject";
-/**
- * Dictionary class to map object model data
- */
-export declare class ModelDictionary<T> extends Map<string, T | null> implements IModelObject {
-    /**
-     * Constructor of this class
-     * @param nullDeletesKeys Whether setting null to items effectively deletes them
-     * @param itemConstructor Item constructor type to use for type-checking
-     */
-    constructor(nullDeletesKeys: boolean, itemConstructor?: {
-        new (): T;
-    } | null);
-    /**
-     * Overridden set method to perform type-checks and update
-     * @param key Key to set
-     * @param value Value to set
-     */
-    set(key: string, value: T | null): this;
-    /**
-     * Update this instance from the given data
-     * @param jsonElement JSON data to upgrade this instance from
-     * @returns Updated instance
-     */
-    update(jsonElement: any): IModelObject | null;
-    /**
-     * Convert this object to JSON
-     * @returns JSON object
-     */
-    toJSON(): Record<string, T | 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>;