@duet3d/objectmodel 3.7.0-alpha.1 → 3.7.0-alpha.10

package/dist/state/index.js

@@ -1,55 +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);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.State = exports.StartupError = exports.MachineMode = exports.LogLevel = exports.GpOutputPort = exports.BeepRequest = void 0;
-const ModelObject_1 = require("../ModelObject");
-const ModelCollection_1 = require("../ModelCollection");
-const MessageBox_1 = require("./MessageBox");
-const RestorePoint_1 = 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 = "";
@@ -57,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;
@@ -67,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;
@@ -75,23 +55,31 @@ class State extends ModelObject_1.default {
         this.machineMode = MachineMode.fff;
         this.macroRestarted = false;
         this.msUpTime = 0;
+        /**
+         * @deprecated use move.motionSystems[].nextTool instead
+         */
         this.nextTool = -1;
         this.pluginsStarted = false;
         this.powerFailScript = "";
+        /**
+         * @deprecated use move.motionSystems[].previousTool instead
+         */
         this.previousTool = -1;
-        this.restorePoints = new ModelCollection_1.default(RestorePoint_1.default);
+        /**
+         * @deprecated use move.motionSystems[].restorePoints instead
+         */
+        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,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ToolRetraction = void 0;
-const ModelObject_1 = require("../ModelObject");
-class ToolRetraction extends ModelObject_1.default {
+import ModelObject from "../ModelObject";
+export class ToolRetraction extends ModelObject {
     constructor() {
         super(...arguments);
         this.extraRestart = 0;
@@ -12,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.d.ts

@@ -10,7 +10,7 @@ export declare class Tool extends ModelObject {
     axes: Array<Array<number>>;
     extruders: Array<number>;
     fans: Array<number>;
-    /** @deprecated Use feedForwardPwm instead */
+    /** @deprecated use feedForwardPwm instead */
     feedForward: Array<number>;
     feedForwardAdvance: number;
     feedForwardPwm: Array<number>;

package/dist/tools/index.js

@@ -1,22 +1,19 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Tool = exports.ToolState = void 0;
-const ModelObject_1 = require("../ModelObject");
-const ToolRetraction_1 = 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 = [];
         this.axes = [];
         this.extruders = [];
         this.fans = [];
-        /** @deprecated Use feedForwardPwm instead */
+        /** @deprecated use feedForwardPwm instead */
         this.feedForward = [];
         this.feedForwardAdvance = 0;
         this.feedForwardPwm = [];
@@ -29,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,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Volume = void 0;
-const ModelObject_1 = require("../ModelObject");
-class Volume extends ModelObject_1.default {
+import ModelObject from "../ModelObject";
+export class Volume extends ModelObject {
     constructor() {
         super(...arguments);
         this.capacity = null;
@@ -14,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.1",
+  "version": "3.7.0-alpha.10",
   "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",
+    "build": "tsc && tsx scripts/extract-metadata.ts",
     "prepare": "npm run build",
     "prepublishOnly": "npm test"
   },
@@ -21,10 +30,12 @@
   },
   "homepage": "https://github.com/Duet3D/ObjectModel#readme",
   "devDependencies": {
-    "@types/jest": "^29.5.12",
-    "jest": "^29.7.0",
+    "@types/jest": "^30.0.0",
+    "@types/node": "^25.0.0",
+    "jest": "^30.2.0",
     "ts-jest": "^29.1.2",
-    "typescript": "^5.4.5"
+    "tsx": "^4.20.0",
+    "typescript": "^6.0.3"
   },
   "files": [
     "/dist"