@duet3d/objectmodel 3.4.0 → 3.5.0-b1

package/{lib → dist}/sensors/AnalogSensor.d.ts

@@ -6,7 +6,6 @@ export declare enum AnalogSensorType {
     max31855 = "thermocouplemax31855",
     max31856 = "thermocouplemax31856",
     linearAnalog = "linearanalog",
-    dht11 = "dht11",
     dht21 = "dht21",
     dht22 = "dht22",
     dhtHumidity = "dhthumidity",
@@ -16,8 +15,9 @@ export declare enum AnalogSensorType {
     driversDuex = "driversduex",
     unknown = "unknown"
 }
-export default class AnalogSensor extends ModelObject {
+export declare class AnalogSensor extends ModelObject {
     lastReading: number | null;
     name: string | null;
     type: AnalogSensorType;
 }
+export default AnalogSensor;

package/{lib → dist}/sensors/AnalogSensor.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AnalogSensorType = void 0;
+exports.AnalogSensor = exports.AnalogSensorType = void 0;
 const ModelObject_1 = require("../ModelObject");
 var AnalogSensorType;
 (function (AnalogSensorType) {
@@ -10,7 +10,6 @@ var AnalogSensorType;
     AnalogSensorType["max31855"] = "thermocouplemax31855";
     AnalogSensorType["max31856"] = "thermocouplemax31856";
     AnalogSensorType["linearAnalog"] = "linearanalog";
-    AnalogSensorType["dht11"] = "dht11";
     AnalogSensorType["dht21"] = "dht21";
     AnalogSensorType["dht22"] = "dht22";
     AnalogSensorType["dhtHumidity"] = "dhthumidity";
@@ -28,4 +27,5 @@ class AnalogSensor extends ModelObject_1.default {
         this.type = AnalogSensorType.unknown;
     }
 }
+exports.AnalogSensor = AnalogSensor;
 exports.default = AnalogSensor;

package/{lib → dist}/sensors/Endstop.d.ts

@@ -6,8 +6,9 @@ export declare enum EndstopType {
     motorStallIndividual = "motorStallIndividual",
     unknown = "unknown"
 }
-export default class Endstop extends ModelObject {
+export declare class Endstop extends ModelObject {
     highEnd: boolean;
     triggered: boolean;
     type: EndstopType;
 }
+export default Endstop;

package/{lib → dist}/sensors/Endstop.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EndstopType = void 0;
+exports.Endstop = exports.EndstopType = void 0;
 const ModelObject_1 = require("../ModelObject");
 var EndstopType;
 (function (EndstopType) {
@@ -18,4 +18,5 @@ class Endstop extends ModelObject_1.default {
         this.type = EndstopType.unknown;
     }
 }
+exports.Endstop = Endstop;
 exports.default = Endstop;

package/{lib → dist}/sensors/FilamentMonitors/FilamentMonitorBase.d.ts

@@ -15,9 +15,10 @@ export declare enum FilamentMonitorType {
     rotatingMagnet = "rotatingMagnet",
     unknown = "unknown"
 }
-export default class FilamentMonitorBase extends ModelObject {
+export declare class FilamentMonitorBase extends ModelObject {
     enabled: boolean;
     status: FilamentMonitorStatus;
     type: FilamentMonitorType;
     constructor(type?: FilamentMonitorType);
 }
+export default FilamentMonitorBase;

package/{lib → dist}/sensors/FilamentMonitors/FilamentMonitorBase.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FilamentMonitorType = exports.FilamentMonitorStatus = void 0;
+exports.FilamentMonitorBase = exports.FilamentMonitorType = exports.FilamentMonitorStatus = void 0;
 const ModelObject_1 = require("../../ModelObject");
 var FilamentMonitorStatus;
 (function (FilamentMonitorStatus) {
@@ -28,4 +28,5 @@ class FilamentMonitorBase extends ModelObject_1.default {
         this.type = type;
     }
 }
+exports.FilamentMonitorBase = FilamentMonitorBase;
 exports.default = FilamentMonitorBase;

package/{lib → dist}/sensors/FilamentMonitors/LaserFilamentMonitor.d.ts

@@ -13,9 +13,10 @@ export declare class LaserFilamentMonitorConfigured extends ModelObject {
     percentMin: number;
     sampleDistance: number;
 }
-export default class LaserFilamentMonitor extends FilamentMonitorBase {
+export declare class LaserFilamentMonitor extends FilamentMonitorBase {
     constructor();
     calibrated: LaserFilamentMonitorCalibrated | null;
     readonly configured: LaserFilamentMonitorConfigured;
     update(jsonElement: any): IModelObject | null;
 }
+export default LaserFilamentMonitor;

package/{lib → dist}/sensors/FilamentMonitors/LaserFilamentMonitor.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LaserFilamentMonitorConfigured = exports.LaserFilamentMonitorCalibrated = void 0;
+exports.LaserFilamentMonitor = exports.LaserFilamentMonitorConfigured = exports.LaserFilamentMonitorCalibrated = void 0;
 const ModelObject_1 = require("../../ModelObject");
 const FilamentMonitorBase_1 = require("./FilamentMonitorBase");
 const index_1 = require("./index");
@@ -42,4 +42,5 @@ class LaserFilamentMonitor extends FilamentMonitorBase_1.default {
         return super.update(jsonElement);
     }
 }
+exports.LaserFilamentMonitor = LaserFilamentMonitor;
 exports.default = LaserFilamentMonitor;

package/{lib → dist}/sensors/FilamentMonitors/PulsedFilamentMonitor.d.ts

@@ -12,9 +12,10 @@ export declare class PulsedFilamentMonitorConfigured extends ModelObject {
     percentMin: number;
     sampleDistance: number;
 }
-export default class PulsedFilamentMonitor extends FilamentMonitorBase {
+export declare class PulsedFilamentMonitor extends FilamentMonitorBase {
     constructor();
     calibrated: PulsedFilamentMonitorCalibrated | null;
     readonly configured: PulsedFilamentMonitorConfigured;
     update(jsonElement: any): IModelObject | null;
 }
+export default PulsedFilamentMonitor;

package/{lib → dist}/sensors/FilamentMonitors/PulsedFilamentMonitor.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PulsedFilamentMonitorConfigured = exports.PulsedFilamentMonitorCalibrated = void 0;
+exports.PulsedFilamentMonitor = exports.PulsedFilamentMonitorConfigured = exports.PulsedFilamentMonitorCalibrated = void 0;
 const ModelObject_1 = require("../../ModelObject");
 const FilamentMonitorBase_1 = require("./FilamentMonitorBase");
 const index_1 = require("./index");
@@ -41,4 +41,5 @@ class PulsedFilamentMonitor extends FilamentMonitorBase_1.default {
         return super.update(jsonElement);
     }
 }
+exports.PulsedFilamentMonitor = PulsedFilamentMonitor;
 exports.default = PulsedFilamentMonitor;

package/{lib → dist}/sensors/FilamentMonitors/RotatingMagnetFilamentMonitor.d.ts

@@ -13,9 +13,10 @@ export declare class RotatingMagnetFilamentMonitorConfigured extends ModelObject
     percentMin: number;
     sampleDistance: number;
 }
-export default class RotatingMagnetFilamentMonitor extends FilamentMonitorBase {
+export declare class RotatingMagnetFilamentMonitor extends FilamentMonitorBase {
     constructor();
     calibrated: RotatingMagnetFilamentMonitorCalibrated | null;
     readonly configured: RotatingMagnetFilamentMonitorConfigured;
     update(jsonElement: any): IModelObject | null;
 }
+export default RotatingMagnetFilamentMonitor;

package/{lib → dist}/sensors/FilamentMonitors/RotatingMagnetFilamentMonitor.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RotatingMagnetFilamentMonitorConfigured = exports.RotatingMagnetFilamentMonitorCalibrated = void 0;
+exports.RotatingMagnetFilamentMonitor = exports.RotatingMagnetFilamentMonitorConfigured = exports.RotatingMagnetFilamentMonitorCalibrated = void 0;
 const ModelObject_1 = require("../../ModelObject");
 const FilamentMonitorBase_1 = require("./FilamentMonitorBase");
 const index_1 = require("./index");
@@ -42,4 +42,5 @@ class RotatingMagnetFilamentMonitor extends FilamentMonitorBase_1.default {
         return super.update(jsonElement);
     }
 }
+exports.RotatingMagnetFilamentMonitor = RotatingMagnetFilamentMonitor;
 exports.default = RotatingMagnetFilamentMonitor;

package/{lib → dist}/sensors/FilamentMonitors/index.d.ts

@@ -1,6 +1,11 @@
 import { IModelObject } from "../../ModelObject";
 import FilamentMonitorBase, { FilamentMonitorType } from "./FilamentMonitorBase";
-export default class FilamentMonitor extends FilamentMonitorBase {
+export declare class FilamentMonitor extends FilamentMonitorBase {
     update(jsonElement: any): IModelObject | null;
 }
+export default FilamentMonitor;
 export declare function getFilamentMonitor(type: FilamentMonitorType): FilamentMonitorBase;
+export * from "./FilamentMonitorBase";
+export * from "./LaserFilamentMonitor";
+export * from "./PulsedFilamentMonitor";
+export * from "./RotatingMagnetFilamentMonitor";

package/{lib → dist}/sensors/FilamentMonitors/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.getFilamentMonitor = void 0;
+exports.getFilamentMonitor = exports.FilamentMonitor = void 0;
 const FilamentMonitorBase_1 = require("./FilamentMonitorBase");
 const LaserFilamentMonitor_1 = require("./LaserFilamentMonitor");
 const PulsedFilamentMonitor_1 = require("./PulsedFilamentMonitor");
@@ -16,6 +30,7 @@ class FilamentMonitor extends FilamentMonitorBase_1.default {
         return super.update(jsonElement);
     }
 }
+exports.FilamentMonitor = FilamentMonitor;
 exports.default = FilamentMonitor;
 function getFilamentMonitor(type) {
     switch (type) {
@@ -30,3 +45,7 @@ function getFilamentMonitor(type) {
     }
 }
 exports.getFilamentMonitor = getFilamentMonitor;
+__exportStar(require("./FilamentMonitorBase"), exports);
+__exportStar(require("./LaserFilamentMonitor"), exports);
+__exportStar(require("./PulsedFilamentMonitor"), exports);
+__exportStar(require("./RotatingMagnetFilamentMonitor"), exports);

package/{lib → dist}/sensors/Probe.d.ts

@@ -12,7 +12,7 @@ export declare enum ProbeType {
     blTouch = 9,
     zMotorStall = 10
 }
-export default class Probe extends ModelObject {
+export declare class Probe extends ModelObject {
     calibrationTemperature: number;
     deployedByUser: boolean;
     disablesHeaters: boolean;
@@ -30,3 +30,4 @@ export default class Probe extends ModelObject {
     type: ProbeType;
     value: Array<number>;
 }
+export default Probe;

package/{lib → dist}/sensors/Probe.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProbeType = void 0;
+exports.Probe = exports.ProbeType = void 0;
 const ModelObject_1 = require("../ModelObject");
 var ProbeType;
 (function (ProbeType) {
@@ -37,4 +37,5 @@ class Probe extends ModelObject_1.default {
         this.value = [];
     }
 }
+exports.Probe = Probe;
 exports.default = Probe;

package/dist/sensors/index.d.ts

@@ -0,0 +1,21 @@
+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 declare class Sensors extends ModelObject {
+    readonly analog: ModelCollection<AnalogSensor | null>;
+    readonly endstops: ModelCollection<Endstop | null>;
+    readonly filamentMonitors: ModelCollection<FilamentMonitor | null>;
+    readonly gpIn: ModelCollection<GpInputPort | null>;
+    readonly probes: ModelCollection<Probe | null>;
+}
+export default Sensors;
+export * from "./FilamentMonitors";
+export * from "./AnalogSensor";
+export * from "./Endstop";
+export * from "./Probe";

package/{lib → dist}/sensors/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.GpInputPort = void 0;
+exports.Sensors = exports.GpInputPort = void 0;
 const ModelObject_1 = require("../ModelObject");
 const ModelCollection_1 = require("../ModelCollection");
 const AnalogSensor_1 = require("./AnalogSensor");
@@ -24,4 +38,9 @@ class Sensors extends ModelObject_1.default {
         this.probes = new ModelCollection_1.default(Probe_1.default);
     }
 }
+exports.Sensors = Sensors;
 exports.default = Sensors;
+__exportStar(require("./FilamentMonitors"), exports);
+__exportStar(require("./AnalogSensor"), exports);
+__exportStar(require("./Endstop"), exports);
+__exportStar(require("./Probe"), exports);

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

@@ -5,7 +5,7 @@ export declare enum SpindleState {
     forward = "forward",
     reverse = "reverse"
 }
-export default class Spindle extends ModelObject {
+export declare class Spindle extends ModelObject {
     active: number;
     canReverse: boolean;
     current: number;
@@ -14,3 +14,4 @@ export default class Spindle extends ModelObject {
     max: number;
     state: SpindleState;
 }
+export default Spindle;

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

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

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

@@ -3,14 +3,15 @@ export declare enum MachineStatus {
     starting = "starting",
     updating = "updating",
     off = "off",
-    Halted = "halted",
-    Pausing = "pausing",
+    halted = "halted",
+    pausing = "pausing",
     paused = "paused",
     resuming = "resuming",
     cancelling = "cancelling",
     processing = "processing",
-    simulating = "processing",
+    simulating = "simulating",
     busy = "busy",
     changingTool = "changingTool",
     idle = "idle"
 }
+export default MachineStatus;

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

@@ -7,14 +7,15 @@ var MachineStatus;
     MachineStatus["starting"] = "starting";
     MachineStatus["updating"] = "updating";
     MachineStatus["off"] = "off";
-    MachineStatus["Halted"] = "halted";
-    MachineStatus["Pausing"] = "pausing";
+    MachineStatus["halted"] = "halted";
+    MachineStatus["pausing"] = "pausing";
     MachineStatus["paused"] = "paused";
     MachineStatus["resuming"] = "resuming";
     MachineStatus["cancelling"] = "cancelling";
     MachineStatus["processing"] = "processing";
-    MachineStatus["simulating"] = "processing";
+    MachineStatus["simulating"] = "simulating";
     MachineStatus["busy"] = "busy";
     MachineStatus["changingTool"] = "changingTool";
     MachineStatus["idle"] = "idle";
 })(MachineStatus = exports.MachineStatus || (exports.MachineStatus = {}));
+exports.default = MachineStatus;

package/dist/state/MessageBox.d.ts

@@ -0,0 +1,25 @@
+import ModelObject from "../ModelObject";
+export declare enum MessageBoxMode {
+    noButtons = 0,
+    closeOnly = 1,
+    okOnly = 2,
+    okCancel = 3,
+    multipleChoice = 4,
+    intInput = 5,
+    floatInput = 6,
+    stringInput = 7
+}
+export declare class MessageBox extends ModelObject {
+    axisControls: number | null;
+    cancelButton: boolean;
+    choices: Array<string> | null;
+    default: number | string | null;
+    max: number | null;
+    message: string;
+    min: number | null;
+    mode: MessageBoxMode;
+    seq: number;
+    timeout: number;
+    title: string;
+}
+export default MessageBox;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MessageBoxMode = void 0;
+exports.MessageBox = exports.MessageBoxMode = void 0;
 const ModelObject_1 = require("../ModelObject");
 var MessageBoxMode;
 (function (MessageBoxMode) {
@@ -8,16 +8,26 @@ var MessageBoxMode;
     MessageBoxMode[MessageBoxMode["closeOnly"] = 1] = "closeOnly";
     MessageBoxMode[MessageBoxMode["okOnly"] = 2] = "okOnly";
     MessageBoxMode[MessageBoxMode["okCancel"] = 3] = "okCancel";
+    MessageBoxMode[MessageBoxMode["multipleChoice"] = 4] = "multipleChoice";
+    MessageBoxMode[MessageBoxMode["intInput"] = 5] = "intInput";
+    MessageBoxMode[MessageBoxMode["floatInput"] = 6] = "floatInput";
+    MessageBoxMode[MessageBoxMode["stringInput"] = 7] = "stringInput";
 })(MessageBoxMode = exports.MessageBoxMode || (exports.MessageBoxMode = {}));
 class MessageBox extends ModelObject_1.default {
     constructor() {
         super(...arguments);
-        this.axisControls = 0;
+        this.axisControls = null;
+        this.cancelButton = false;
+        this.choices = null;
+        this.default = null;
+        this.max = null;
         this.message = "";
+        this.min = null;
         this.mode = MessageBoxMode.okOnly;
         this.seq = -1;
         this.timeout = 0;
         this.title = "";
     }
 }
+exports.MessageBox = MessageBox;
 exports.default = MessageBox;

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

@@ -1,5 +1,5 @@
 import ModelObject from "../ModelObject";
-export default class RestorePoint extends ModelObject {
+export declare class RestorePoint extends ModelObject {
     coords: Array<number>;
     extruderPos: number;
     fanPwm: number;
@@ -9,3 +9,4 @@ export default class RestorePoint extends ModelObject {
     spindleSpeeds: Array<number>;
     toolNumber: number;
 }
+export default RestorePoint;

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

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

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-b1",
   "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"
+  ]
 }