@duet3d/objectmodel 3.4.0 → 3.5.0-b10

package/{lib → dist}/state/index.d.ts

@@ -21,7 +21,7 @@ export declare enum MachineMode {
     cnc = "CNC",
     laser = "Laser"
 }
-export default class State extends ModelObject {
+export declare class State extends ModelObject {
     constructor();
     atxPower: boolean | null;
     atxPowerPort: string | null;
@@ -32,7 +32,7 @@ export default class State extends ModelObject {
     dsfVersion: string | null;
     dsfPluginSupport: boolean;
     dsfRootPluginSupport: boolean;
-    readonly gpOut: ModelCollection<GpOutputPort>;
+    readonly gpOut: ModelCollection<GpOutputPort | null>;
     laserPwm: number | null;
     logFile: string | null;
     logLevel: LogLevel;
@@ -50,3 +50,7 @@ export default class State extends ModelObject {
     time: string | null;
     upTime: number;
 }
+export default State;
+export * from "./MachineStatus";
+export * from "./MessageBox";
+export * from "./RestorePoint";

package/{lib → dist}/state/index.js

@@ -1,6 +1,20 @@
 "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.MachineMode = exports.LogLevel = exports.GpOutputPort = exports.BeepRequest = void 0;
+exports.State = 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");
@@ -67,4 +81,8 @@ class State extends ModelObject_1.default {
         this.wrapModelProperty("messageBox", MessageBox_1.default);
     }
 }
+exports.State = State;
 exports.default = State;
+__exportStar(require("./MachineStatus"), exports);
+__exportStar(require("./MessageBox"), exports);
+__exportStar(require("./RestorePoint"), exports);

package/{lib → dist}/tools/index.d.ts

@@ -4,7 +4,7 @@ export declare enum ToolState {
     active = "active",
     standby = "standby"
 }
-export default class Tool extends ModelObject {
+export declare class Tool extends ModelObject {
     active: Array<number>;
     axes: Array<Array<number>>;
     extruders: Array<number>;
@@ -23,3 +23,4 @@ export default class Tool extends ModelObject {
     standby: Array<number>;
     state: ToolState;
 }
+export default Tool;

package/{lib → dist}/tools/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ToolState = void 0;
+exports.Tool = exports.ToolState = void 0;
 const ModelObject_1 = require("../ModelObject");
 var ToolState;
 (function (ToolState) {
@@ -30,4 +30,5 @@ class Tool extends ModelObject_1.default {
         this.state = ToolState.off;
     }
 }
+exports.Tool = Tool;
 exports.default = Tool;

package/{lib → dist}/userSessions/index.d.ts

@@ -8,10 +8,11 @@ export declare enum SessionType {
     http = "http",
     telnet = "telnet"
 }
-export default class UserSession extends ModelObject {
+export declare class UserSession extends ModelObject {
     accessLevel: AccessLevel;
     id: number;
     origin: string | null;
     originId: number;
     sessionType: SessionType;
 }
+export default UserSession;

package/{lib → dist}/userSessions/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SessionType = exports.AccessLevel = void 0;
+exports.UserSession = exports.SessionType = exports.AccessLevel = void 0;
 const ModelObject_1 = require("../ModelObject");
 var AccessLevel;
 (function (AccessLevel) {
@@ -23,4 +23,5 @@ class UserSession extends ModelObject_1.default {
         this.sessionType = SessionType.local;
     }
 }
+exports.UserSession = UserSession;
 exports.default = UserSession;

package/{lib → dist}/volumes/index.d.ts

@@ -1,10 +1,11 @@
 import ModelObject from "../ModelObject";
-export default class Volume extends ModelObject {
-    capacity: bigint | null;
-    freeSpace: bigint | null;
+export declare class Volume extends ModelObject {
+    capacity: number | bigint | null;
+    freeSpace: number | bigint | null;
     mounted: boolean;
     name: string | null;
     openFiles: number | null;
     path: string | null;
     speed: number | null;
 }
+export default Volume;

package/{lib → dist}/volumes/index.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Volume = void 0;
 const ModelObject_1 = require("../ModelObject");
 class Volume extends ModelObject_1.default {
     constructor() {
@@ -13,4 +14,5 @@ class Volume extends ModelObject_1.default {
         this.speed = null;
     }
 }
+exports.Volume = Volume;
 exports.default = Volume;

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@duet3d/objectmodel",
-  "version": "3.4.0",
+  "version": "3.5.0-b10",
   "description": "TypeScript implementation of the Duet3D Object Model",
-  "main": "index.js",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
     "test": "jest --config jestconfig.json",
     "build": "tsc",
-    "prepare" : "npm run build",
-    "prepublishOnly" : "npm test"
+    "prepare": "npm run build",
+    "prepublishOnly": "npm test"
   },
   "repository": {
     "type": "git",
@@ -20,10 +21,12 @@
   },
   "homepage": "https://github.com/Duet3D/ObjectModel#readme",
   "devDependencies": {
-    "@types/jest": "^27.0.3",
-    "jest": "^27.4.5",
-    "ts-jest": "^27.1.2",
-    "typescript": "^4.5.2"
+    "@types/jest": "^27.5.0",
+    "jest": "^27.5.1",
+    "ts-jest": "^27.1.4",
+    "typescript": "^4.6.4"
   },
-  "files": ["lib/**"]
+  "files": [
+    "/dist"
+  ]
 }

package/lib/heat/index.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const ModelCollection_1 = require("../ModelCollection");
-const Heater_1 = require("./Heater");
-const ModelObject_1 = require("../ModelObject");
-class Heat extends ModelObject_1.default {
-    constructor() {
-        super(...arguments);
-        this.bedHeaters = new Array();
-        this.chamberHeaters = new Array();
-        this.coldExtrudeTemperature = 160;
-        this.coldRetractTemperature = 90;
-        this.heaters = new ModelCollection_1.default(Heater_1.default);
-    }
-}
-exports.default = Heat;

package/lib/move/DriverId.d.ts

@@ -1,7 +0,0 @@
-import ModelObject, { IModelObject } from "../ModelObject";
-export default class DriverId extends ModelObject {
-    board: number;
-    driver: number;
-    update(jsonElement: any): IModelObject | null;
-    toString(): string;
-}

package/lib/move/DriverId.js

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const ModelObject_1 = require("../ModelObject");
-class DriverId extends ModelObject_1.default {
-    constructor() {
-        super(...arguments);
-        this.board = 0;
-        this.driver = 0;
-    }
-    update(jsonElement) {
-        if (typeof jsonElement === "string") {
-            const matches = /(\d+)\.(\d+)/.exec(jsonElement);
-            if (matches !== null) {
-                this.board = Number(matches[1]);
-                this.driver = Number(matches[2]);
-            }
-            else {
-                this.board = 0;
-                this.driver = Number(jsonElement);
-            }
-            return this;
-        }
-        return null;
-    }
-    toString() {
-        return `${this.board}.${this.driver}`;
-    }
-}
-exports.default = DriverId;

package/lib/move/Microstepping.d.ts

@@ -1,5 +0,0 @@
-import ModelObject from "../ModelObject";
-export default class Microstepping extends ModelObject {
-    interpolated: boolean;
-    value: number;
-}

package/lib/move/kinematics/index.d.ts

@@ -1,7 +0,0 @@
-import { IModelObject } from "../../ModelObject";
-import KinematicsBase, { KinematicsName } from "./KinematicsBase";
-export default class Kinematics extends KinematicsBase {
-    constructor();
-    update(jsonElement: any): IModelObject | null;
-}
-export declare function getKinematics(name: KinematicsName): KinematicsBase;

package/lib/network/index.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultPassword = exports.DefaultHostname = exports.DefaultName = void 0;
-const ModelObject_1 = require("../ModelObject");
-const ModelCollection_1 = require("../ModelCollection");
-const NetworkInterface_1 = require("./NetworkInterface");
-exports.DefaultName = "My Duet";
-exports.DefaultHostname = "duet";
-exports.DefaultPassword = "reprap";
-class Network extends ModelObject_1.default {
-    constructor() {
-        super(...arguments);
-        this.corsSite = null;
-        this.hostname = exports.DefaultHostname;
-        this.interfaces = new ModelCollection_1.default(NetworkInterface_1.default);
-        this.name = exports.DefaultName;
-    }
-}
-exports.default = Network;

package/lib/plugins/index.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const PluginManifest_1 = require("./PluginManifest");
-class Plugin extends PluginManifest_1.default {
-    constructor() {
-        super(...arguments);
-        this.dsfFiles = [];
-        this.dwcFiles = [];
-        this.sdFiles = [];
-        this.pid = -1;
-    }
-}
-exports.default = Plugin;

package/lib/sensors/AnalogSensor.d.ts

@@ -1,23 +0,0 @@
-import ModelObject from "../ModelObject";
-export declare enum AnalogSensorType {
-    thermistor = "thermistor",
-    pt1000 = "pt1000",
-    max31865 = "rtdmax31865",
-    max31855 = "thermocouplemax31855",
-    max31856 = "thermocouplemax31856",
-    linearAnalog = "linearanalog",
-    dht11 = "dht11",
-    dht21 = "dht21",
-    dht22 = "dht22",
-    dhtHumidity = "dhthumidity",
-    currentLoop = "currentloooppyro",
-    mcuTemp = "mcutemp",
-    drivers = "drivers",
-    driversDuex = "driversduex",
-    unknown = "unknown"
-}
-export default class AnalogSensor extends ModelObject {
-    lastReading: number | null;
-    name: string | null;
-    type: AnalogSensorType;
-}

package/lib/sensors/AnalogSensor.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AnalogSensorType = void 0;
-const ModelObject_1 = require("../ModelObject");
-var AnalogSensorType;
-(function (AnalogSensorType) {
-    AnalogSensorType["thermistor"] = "thermistor";
-    AnalogSensorType["pt1000"] = "pt1000";
-    AnalogSensorType["max31865"] = "rtdmax31865";
-    AnalogSensorType["max31855"] = "thermocouplemax31855";
-    AnalogSensorType["max31856"] = "thermocouplemax31856";
-    AnalogSensorType["linearAnalog"] = "linearanalog";
-    AnalogSensorType["dht11"] = "dht11";
-    AnalogSensorType["dht21"] = "dht21";
-    AnalogSensorType["dht22"] = "dht22";
-    AnalogSensorType["dhtHumidity"] = "dhthumidity";
-    AnalogSensorType["currentLoop"] = "currentloooppyro";
-    AnalogSensorType["mcuTemp"] = "mcutemp";
-    AnalogSensorType["drivers"] = "drivers";
-    AnalogSensorType["driversDuex"] = "driversduex";
-    AnalogSensorType["unknown"] = "unknown";
-})(AnalogSensorType = exports.AnalogSensorType || (exports.AnalogSensorType = {}));
-class AnalogSensor extends ModelObject_1.default {
-    constructor() {
-        super(...arguments);
-        this.lastReading = null;
-        this.name = null;
-        this.type = AnalogSensorType.unknown;
-    }
-}
-exports.default = AnalogSensor;

package/lib/sensors/index.d.ts

@@ -1,16 +0,0 @@
-import ModelObject from "../ModelObject";
-import ModelCollection from "../ModelCollection";
-import AnalogSensor from "./AnalogSensor";
-import Endstop from "./Endstop";
-import FilamentMonitor from "./FilamentMonitors";
-import Probe from "./Probe";
-export declare class GpInputPort extends ModelObject {
-    value: number;
-}
-export default class Sensors extends ModelObject {
-    readonly analog: ModelCollection<AnalogSensor>;
-    readonly endstops: ModelCollection<Endstop>;
-    readonly filamentMonitors: ModelCollection<FilamentMonitor>;
-    readonly gpIn: ModelCollection<GpInputPort>;
-    readonly probes: ModelCollection<Probe>;
-}

package/lib/state/MessageBox.d.ts

@@ -1,15 +0,0 @@
-import ModelObject from "../ModelObject";
-export declare enum MessageBoxMode {
-    noButtons = 0,
-    closeOnly = 1,
-    okOnly = 2,
-    okCancel = 3
-}
-export default class MessageBox extends ModelObject {
-    axisControls: number;
-    message: string;
-    mode: MessageBoxMode;
-    seq: number;
-    timeout: number;
-    title: string;
-}