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

package/README.md

@@ -4,13 +4,7 @@ TypeScript implementation of the Duet3D Object Model.
 
 ## Installation
 
-Install via `npm install @duet3d/objectmodel`. Users of Vue 2 must also run this command after the first import:
-
-```
-globalThis._duetModelSetArray = (array, index, value) => Vue.set(array, index, value);
-```
-
-This is required to make sure that change events for arrays are correctly fired.
+Install via `npm install @duet3d/objectmodel`.
 
 ## Bug reports
 

package/dist/ModelCollection.d.ts

@@ -18,9 +18,10 @@ export declare class ModelCollection<T extends IModelObject | null> extends Arra
     /**
      * Update this instance from the given data
      * @param jsonElement JSON data to upgrade this instance from
+     * @param authoritative Whether the given data is a complete snapshot of the items and everything below them
      * @returns Updated instance
      */
-    update(jsonElement: any): IModelObject | null;
+    update(jsonElement: any, authoritative?: boolean): IModelObject | null;
 }
 export default ModelCollection;
 /**

package/dist/ModelCollection.js

@@ -1,5 +1,4 @@
 import { isModelObject } from "./ModelObject";
-import { setArrayItem } from "./index";
 /**
  * Class for storing model object items in an array
  */
@@ -34,9 +33,10 @@ export class ModelCollection extends Array {
     /**
      * Update this instance from the given data
      * @param jsonElement JSON data to upgrade this instance from
+     * @param authoritative Whether the given data is a complete snapshot of the items and everything below them
      * @returns Updated instance
      */
-    update(jsonElement) {
+    update(jsonElement, authoritative = false) {
         if (jsonElement === null) {
             return null;
         }
@@ -52,23 +52,23 @@ export class ModelCollection extends Array {
             if (currentItem === null) {
                 const newItem = jsonElement[i];
                 if (newItem instanceof that.$itemConstructor) {
-                    setArrayItem(this, i, jsonElement[i]);
+                    this[i] = jsonElement[i];
                 }
                 else {
                     const refItem = new that.$itemConstructor();
-                    setArrayItem(this, i, refItem.update(newItem));
+                    this[i] = refItem.update(newItem, authoritative);
                 }
             }
             else if (isModelObject(currentItem)) {
-                const newItem = currentItem.update(jsonElement[i]);
+                const newItem = currentItem.update(jsonElement[i], authoritative);
                 if (currentItem !== newItem) {
-                    setArrayItem(this, i, newItem);
+                    this[i] = newItem;
                 }
             }
             else {
                 const newItem = jsonElement[i];
                 if (currentItem !== newItem) {
-                    setArrayItem(this, i, newItem);
+                    this[i] = newItem;
                 }
             }
         }
@@ -80,7 +80,7 @@ export class ModelCollection extends Array {
             }
             else {
                 const newItem = new that.$itemConstructor();
-                super.push(newItem.update(itemToAdd));
+                super.push(newItem.update(itemToAdd, authoritative));
             }
         }
         return this;

package/dist/ModelDictionary.d.ts

@@ -15,14 +15,16 @@ export declare class ModelDictionary<T> extends Map<string, T | null> implements
      * Overridden set method to perform type-checks and update
      * @param key Key to set
      * @param value Value to set
+     * @param authoritative Whether the given value is a complete snapshot of the item and everything below it
      */
-    set(key: string, value: T | null): this;
+    set(key: string, value: T | null, authoritative?: boolean): this;
     /**
      * Update this instance from the given data
      * @param jsonElement JSON data to upgrade this instance from
+     * @param authoritative Whether the given data is a complete snapshot of the items and everything below them
      * @returns Updated instance
      */
-    update(jsonElement: any): IModelObject | null;
+    update(jsonElement: any, authoritative?: boolean): IModelObject | null;
     /**
      * Convert this object to JSON
      * @returns JSON object

package/dist/ModelDictionary.js

@@ -18,8 +18,9 @@ export class ModelDictionary extends Map {
      * Overridden set method to perform type-checks and update
      * @param key Key to set
      * @param value Value to set
+     * @param authoritative Whether the given value is a complete snapshot of the item and everything below it
      */
-    set(key, value) {
+    set(key, value, authoritative = false) {
         const that = this;
         if (value === null) {
             if (that.$nullDeletesKeys) {
@@ -33,13 +34,13 @@ export class ModelDictionary extends Map {
             if (that.$itemConstructor !== null && !(value instanceof that.$itemConstructor)) {
                 const newItem = new that.$itemConstructor();
                 if (isModelObject(newItem)) {
-                    const updatedItem = newItem.update(value);
+                    const updatedItem = newItem.update(value, authoritative);
                     return super.set(key, updatedItem);
                 }
             }
         }
         else if (isModelObject(currentItem)) {
-            const newItem = currentItem.update(value);
+            const newItem = currentItem.update(value, authoritative);
             if (currentItem !== newItem) {
                 return super.set(key, value);
             }
@@ -50,20 +51,21 @@ export class ModelDictionary extends Map {
     /**
      * Update this instance from the given data
      * @param jsonElement JSON data to upgrade this instance from
+     * @param authoritative Whether the given data is a complete snapshot of the items and everything below them
      * @returns Updated instance
      */
-    update(jsonElement) {
+    update(jsonElement, authoritative = false) {
         if (jsonElement === null) {
             this.clear();
         }
         else if (jsonElement instanceof Map) {
             for (const [key, value] of jsonElement.entries()) {
-                this.set(key, value);
+                this.set(key, value, authoritative);
             }
         }
         else {
             for (const [key, value] of Object.entries(jsonElement)) {
-                this.set(key, value);
+                this.set(key, value, authoritative);
             }
         }
         return this;

package/dist/ModelObject.d.ts

@@ -5,9 +5,12 @@ export interface IModelObject {
     /**
      * Update this instance from the given data
      * @param jsonElement JSON data to upgrade this instance from
+     * @param authoritative Whether the given data is a complete snapshot of this instance and everything below it,
+     * so that properties missing from it are known to be null. Set this only for responses that were not filtered
+     * by the sender, i.e. full object model key queries but never live/patch updates
      * @returns Updated instance (may not equal the original instance)
      */
-    update(jsonElement: any): IModelObject | null;
+    update(jsonElement: any, authoritative?: boolean): IModelObject | null;
 }
 /**
  * Check whether a given value provides model update functionality
@@ -18,12 +21,20 @@ export declare function isModelObject(value: any): value is IModelObject;
  * Base class for object model classes
  */
 export declare abstract class ModelObject implements IModelObject {
+    /**
+     * Whether an authoritative update may reset the properties of this class that are missing from it.
+     * Set to false where an instance never receives a complete snapshot of itself. Deliberately static
+     * because an instance member would become part of the structural type and break consumers that hold
+     * a mapped version of the model, such as a Pinia store
+     */
+    static readonly resetsMissingProperties: boolean;
     /**
      * Update this instance from the given data
      * @param jsonElement JSON data to upgrade this instance from
+     * @param authoritative Whether the given data is a complete snapshot of this instance and everything below it
      * @returns Updated instance (may not equal the original instance)
      */
-    update(jsonElement: any): IModelObject | null;
+    update(jsonElement: any, authoritative?: boolean): IModelObject | null;
     /**
      * Wrap a nullable model object property so that type checks can be performed
      * @param key Property key of the derived class

package/dist/ModelObject.js

@@ -1,4 +1,34 @@
-import { ModelCollection, setArrayItem } from "./index";
+import { ModelCollection } from "./index";
+/**
+ * Names of the properties that default to null, per model object class. Queried from a pristine instance because
+ * TS types are gone at runtime, so a null default is the only remaining evidence that a property may hold null
+ */
+const nullableProperties = new WeakMap();
+/**
+ * Get the names of the properties of the given instance's class that may hold null
+ * @param instance Instance to inspect the class of
+ */
+function getNullableProperties(instance) {
+    let result = nullableProperties.get(instance.constructor);
+    if (result === undefined) {
+        result = new Set();
+        try {
+            for (const [key, value] of Object.entries(new instance.constructor())) {
+                if (value === null) {
+                    result.add(key);
+                }
+            }
+        }
+        catch (e) {
+            // A class that cannot be constructed without arguments simply opts out of null reconstruction
+            if (process.env.NODE_ENV !== "production") {
+                console.warn(`Failed to determine nullable properties of ${instance.constructor.name}`, e);
+            }
+        }
+        nullableProperties.set(instance.constructor, result);
+    }
+    return result;
+}
 /**
  * Check whether a given value provides model update functionality
  * @param value Value to check
@@ -13,19 +43,27 @@ export class ModelObject {
     /**
      * Update this instance from the given data
      * @param jsonElement JSON data to upgrade this instance from
+     * @param authoritative Whether the given data is a complete snapshot of this instance and everything below it
      * @returns Updated instance (may not equal the original instance)
      */
-    update(jsonElement) {
+    update(jsonElement, authoritative = false) {
         if (jsonElement === null) {
             return null;
         }
+        if (authoritative && this.constructor.resetsMissingProperties) {
+            for (const key of getNullableProperties(this)) {
+                if (!(key in jsonElement)) {
+                    this[key] = null;
+                }
+            }
+        }
         for (const [key, value] of Object.entries(jsonElement)) {
             if (key in this) {
                 const ownKey = key;
                 const prop = this[ownKey];
                 if (isModelObject(prop)) {
                     // Update model objects
-                    const updatedObject = prop.update(value);
+                    const updatedObject = prop.update(value, authoritative);
                     if (prop !== updatedObject) {
                         const propDescriptor = Object.getOwnPropertyDescriptor(this, key);
                         if (propDescriptor !== undefined) {
@@ -49,12 +87,12 @@ export class ModelObject {
                         for (let i = 0; i < Math.min(prop.length, value.length); i++) {
                             const propItem = prop[i];
                             if (propItem === null) {
-                                setArrayItem(prop, i, value[i]);
+                                prop[i] = value[i];
                             }
                             else {
                                 const newItem = value[i];
                                 if (propItem !== newItem) {
-                                    setArrayItem(prop, i, newItem);
+                                    prop[i] = newItem;
                                 }
                             }
                         }
@@ -219,6 +257,13 @@ export class ModelObject {
         });
     }
 }
+/**
+ * Whether an authoritative update may reset the properties of this class that are missing from it.
+ * Set to false where an instance never receives a complete snapshot of itself. Deliberately static
+ * because an instance member would become part of the structural type and break consumers that hold
+ * a mapped version of the model, such as a Pinia store
+ */
+ModelObject.resetsMissingProperties = true;
 export default ModelObject;
 /**
  * Initialize a model object from the given data

package/dist/ObjectModel.d.ts

@@ -24,6 +24,11 @@ import LedStrip from "./ledStrips";
  */
 export declare class ObjectModel extends ModelObject {
     constructor();
+    /**
+     * A payload handed to the root always covers a subset of the top-level keys rather than the whole model,
+     * so authoritative reconstruction has to start one level below it
+     */
+    static readonly resetsMissingProperties: boolean;
     readonly boards: ModelCollection<Board>;
     readonly directories: Directories;
     readonly fans: ModelCollection<Fan | null>;

package/dist/ObjectModel.js

@@ -47,4 +47,9 @@ export class ObjectModel extends ModelObject {
         ModelObject.wrapModelProperty(this, "sbc", SBC);
     }
 }
+/**
+ * A payload handed to the root always covers a subset of the top-level keys rather than the whole model,
+ * so authoritative reconstruction has to start one level below it
+ */
+ObjectModel.resetsMissingProperties = false;
 export default ObjectModel;

package/dist/boards/index.d.ts

@@ -48,6 +48,7 @@ export declare class Board extends ModelObject {
     shortName: string;
     state: BoardState;
     supportsDirectDisplay: boolean;
+    timeout: number;
     uniqueId: string | null;
     v12: MinMaxCurrent | null;
     vIn: MinMaxCurrent | null;

package/dist/boards/index.js

@@ -59,6 +59,7 @@ export class Board extends ModelObject {
         this.shortName = "";
         this.state = BoardState.unknown;
         this.supportsDirectDisplay = false;
+        this.timeout = 10;
         this.uniqueId = null;
         this.v12 = null;
         this.vIn = null;

package/dist/documentation.json

@@ -18,6 +18,7 @@
 	"boards[].directDisplay.encoder": "Encoder of this screen or null if none",
 	"boards[].directDisplay.encoder.pulsesPerClick": "Number of pulses per click of the rotary encoder",
 	"boards[].directDisplay.screen": "Screen information",
+	"boards[].directDisplay.screen.contrast": "Configured contrast",
 	"boards[].directDisplay.screen.controller": {
 		"values": {
 			"ST7920": "ST7920 controller",
@@ -25,6 +26,7 @@
 			"ILI9488": "ILI9488 controller"
 		}
 	},
+	"boards[].directDisplay.screen.resistorRatio": "Configured resistor ratio",
 	"boards[].drivers": "Drivers of this board",
 	"boards[].drivers[].closedLoop.currentFraction": "Current fraction of the configured motor current used",
 	"boards[].drivers[].closedLoop.positionError": "Position error in full steps of the motor",
@@ -74,6 +76,7 @@
 		}
 	},
 	"boards[].supportsDirectDisplay": "Indicates if this board supports external displays",
+	"boards[].timeout": "Connection timeout of this board (in s)",
 	"boards[].uniqueId": "Unique identifier of the board or null if unknown",
 	"boards[].v12": "Minimum, maximum, and current voltages on the 12V rail or null if unknown",
 	"boards[].v12.current": "Current value",
@@ -498,6 +501,7 @@
 	"move.currentMove.distance": "Total distance of the current move (in mm)",
 	"move.currentMove.duration": "Duration of the current move (in s)",
 	"move.currentMove.extrusionRate": "Current extrusion rate (in mm/s)",
+	"move.currentMove.filePosition": "Position in the job file of the move being executed (in bytes or null)",
 	"move.currentMove.laserPwm": "Laser PWM of the current move (0..1) or null if not applicable",
 	"move.currentMove.requestedSpeed": "Requested speed of the current move (in mm/s)",
 	"move.currentMove.topSpeed": "Top speed of the current move (in mm/s)",
@@ -536,6 +540,14 @@
 	"move.keepout[].coords[].max": "Maximum axis coordinate",
 	"move.keepout[].coords[].min": "Minimum axis coordinate",
 	"move.kinematics": "Configured kinematics options",
+	"move.kinematics.anchors": "Anchor configurations for A, B, C, Dz",
+	"move.kinematics.crosstalk": "Proximal to distal, proximal to Z and distal to Z crosstalk",
+	"move.kinematics.deltaRadius": "Delta radius (in mm)",
+	"move.kinematics.distalLength": "Distal arm length (in mm)",
+	"move.kinematics.forwardMatrix": "Forward matrix",
+	"move.kinematics.homedHeight": "Homed height of a delta printer in mm",
+	"move.kinematics.inverseMatrix": "Inverse matrix",
+	"move.kinematics.minRadius": "Requested minimum radius (in mm)",
 	"move.kinematics.name": {
 		"summary": "Name of the configured kinematics",
 		"values": {
@@ -554,9 +566,35 @@
 			"unknown": "Unknown"
 		}
 	},
+	"move.kinematics.printRadius": "Print radius for Hangprinter and Delta geometries (in mm)",
+	"move.kinematics.proximalLength": "Proximal arm length (in mm)",
+	"move.kinematics.psiLimits": "Psi limits (in degrees)",
+	"move.kinematics.radiusHomed": "Homed radius (in mm)",
+	"move.kinematics.radiusMax": "Maximum radius (in mm)",
+	"move.kinematics.radiusMin": "Minimum radius (in mm)",
 	"move.kinematics.segmentation": "Segmentation parameters or null if not configured",
 	"move.kinematics.segmentation.minSegLength": "Minimum length of a segment (in mm)",
 	"move.kinematics.segmentation.segmentsPerSec": "Number of segments per second",
+	"move.kinematics.thetaLimits": "Theta limits (in degrees)",
+	"move.kinematics.tiltCorrection": "Parameters describing the tilt correction",
+	"move.kinematics.tiltCorrection.correctionFactor": "Correction factor",
+	"move.kinematics.tiltCorrection.lastCorrections": "Last corrections (in mm)",
+	"move.kinematics.tiltCorrection.maxCorrection": "Maximum Z correction (in mm)",
+	"move.kinematics.tiltCorrection.screwPitch": "Pitch of the Z leadscrews (in mm)",
+	"move.kinematics.tiltCorrection.screwX": "X positions of the leadscrews (in mm)",
+	"move.kinematics.tiltCorrection.screwY": "Y positions of the leadscrews (in mm)",
+	"move.kinematics.towers": "Delta tower properties",
+	"move.kinematics.towers[].angleCorrection": "Tower position corrections (in degrees)",
+	"move.kinematics.towers[].diagonal": "Diagonal rod length (in mm)",
+	"move.kinematics.towers[].endstopAdjustment": "Deviation of the ideal endstop position (in mm)",
+	"move.kinematics.towers[].xPos": "X coordinate of this tower (in mm)",
+	"move.kinematics.towers[].yPos": "Y coordinate of this tower (in mm)",
+	"move.kinematics.ttAccMax": "Maximum turntable acceleration (in mm/s^2)",
+	"move.kinematics.ttSpeedMax": "Maximum turntable speed (in mm/s)",
+	"move.kinematics.xOffset": "X offset (in mm)",
+	"move.kinematics.xTilt": "How much Z needs to be raised for each unit of movement in the +X direction",
+	"move.kinematics.yOffset": "Y offset (in mm)",
+	"move.kinematics.yTilt": "How much Z needs to be raised for each unit of movement in the +Y direction",
 	"move.limitAxes": "Limit axis positions by their minima and maxima",
 	"move.motionSystems": "List of configured motion systems",
 	"move.motionSystems[].currentMove": "Information about the current move",
@@ -565,6 +603,7 @@
 	"move.motionSystems[].currentMove.distance": "Total distance of the current move (in mm)",
 	"move.motionSystems[].currentMove.duration": "Duration of the current move (in s)",
 	"move.motionSystems[].currentMove.extrusionRate": "Current extrusion rate (in mm/s)",
+	"move.motionSystems[].currentMove.filePosition": "Position in the job file of the move being executed (in bytes or null)",
 	"move.motionSystems[].currentMove.laserPwm": "Laser PWM of the current move (0..1) or null if not applicable",
 	"move.motionSystems[].currentMove.requestedSpeed": "Requested speed of the current move (in mm/s)",
 	"move.motionSystems[].currentMove.topSpeed": "Top speed of the current move (in mm/s)",
@@ -578,7 +617,7 @@
 	"move.motionSystems[].restorePoints[].extruderPos": "The virtual extruder position at the start of this move",
 	"move.motionSystems[].restorePoints[].fanPwm": "PWM value of the tool fan (0..1)",
 	"move.motionSystems[].restorePoints[].feedRate": "Requested feedrate (in mm/s)",
-	"move.motionSystems[].restorePoints[].gCommandNumber": "Which of G0/G1/G2/G3 generated the move at this restore point",
+	"move.motionSystems[].restorePoints[].gCommandNumber": "Which of G0/G1/G2/G3 generated the move at this restore point, or -1 if unknown",
 	"move.motionSystems[].restorePoints[].ioBits": "The output port bits setting for this move or null if not applicable",
 	"move.motionSystems[].restorePoints[].laserPwm": "Laser PWM value (0..1) or null if not applicable",
 	"move.motionSystems[].restorePoints[].toolNumber": "The tool number that was active",
@@ -782,6 +821,9 @@
 	"sbc.memory.total": "Total memory (in bytes)",
 	"sbc.model": "SBC model or null if unknown",
 	"sbc.serial": "Serial of the SBC or null if unknown",
+	"sbc.upgrade": "Details about a software upgrade in progress or null if no upgrade is running",
+	"sbc.upgrade.message": "Description of the current upgrade step",
+	"sbc.upgrade.progress": "Progress of the current upgrade step (0..1) or null if indeterminate",
 	"sbc.uptime": "Uptime of the running system (in s)",
 	"sensors": "Information about connected sensors including Z-probes and endstops",
 	"sensors.analog": "List of analog sensors",
@@ -874,6 +916,23 @@
 		}
 	},
 	"sensors.filamentMonitors": "List of configured filament monitors",
+	"sensors.filamentMonitors[].agc": "AGC reading of this filament monitor (null if unknown)",
+	"sensors.filamentMonitors[].avgPercentage": "Average ratio of measured vs. commanded movement",
+	"sensors.filamentMonitors[].calibrated": "Calibrated properties of this filament monitor",
+	"sensors.filamentMonitors[].calibrated.mmPerPulse": "Extruded distance per pulse (in mm)",
+	"sensors.filamentMonitors[].calibrated.mmPerRev": "Extruded distance per revolution (in mm)",
+	"sensors.filamentMonitors[].calibrated.percentMax": "Maximum percentage (0..1 or greater)",
+	"sensors.filamentMonitors[].calibrated.percentMin": "Minimum percentage (0..1)",
+	"sensors.filamentMonitors[].calibrated.sensitivity": "Calibrated sensitivity",
+	"sensors.filamentMonitors[].calibrated.totalDistance": "Total extruded distance (in mm)",
+	"sensors.filamentMonitors[].configured": "Configured properties of this filament monitor",
+	"sensors.filamentMonitors[].configured.allMoves": "Whether all moves and not only printing moves are supposed to be checked",
+	"sensors.filamentMonitors[].configured.calibrationFactor": "Calibration factor of this sensor",
+	"sensors.filamentMonitors[].configured.mmPerPulse": "Extruded distance per pulse (in mm)",
+	"sensors.filamentMonitors[].configured.mmPerRev": "Extruded distance per revolution (in mm)",
+	"sensors.filamentMonitors[].configured.percentMax": "Maximum percentage (0..1 or greater)",
+	"sensors.filamentMonitors[].configured.percentMin": "Minimum percentage (0..1)",
+	"sensors.filamentMonitors[].configured.sampleDistance": "Sample distance (in mm)",
 	"sensors.filamentMonitors[].enableMode": {
 		"summary": "Enable mode of this filament monitor",
 		"values": {
@@ -883,6 +942,11 @@
 		}
 	},
 	"sensors.filamentMonitors[].enabled": "Whether this filament monitor is enabled",
+	"sensors.filamentMonitors[].filamentPresent": "Indicates if filament is present in this filament monitor (null if unknown)",
+	"sensors.filamentMonitors[].lastPercentage": "Last ratio of measured vs. commanded movement",
+	"sensors.filamentMonitors[].maxPercentage": "Maximum ratio of measured vs. commanded movement",
+	"sensors.filamentMonitors[].minPercentage": "Minimum ratio of measured vs. commanded movement",
+	"sensors.filamentMonitors[].position": "Reported sensor position of this filament monitor. The maximum value depends on the type of the sensor, e.g. 0..1023 for a Duet3D MFM.",
 	"sensors.filamentMonitors[].status": {
 		"summary": "Last reported status of this filament monitor",
 		"values": {
@@ -895,6 +959,7 @@
 			"sensorError": "Sensor encountered an error"
 		}
 	},
+	"sensors.filamentMonitors[].totalExtrusion": "Total extrusion commanded (in mm)",
 	"sensors.filamentMonitors[].type": {
 		"summary": "Type of this filament monitor",
 		"values": {
@@ -1047,7 +1112,7 @@
 	"state.restorePoints[].extruderPos": "The virtual extruder position at the start of this move",
 	"state.restorePoints[].fanPwm": "PWM value of the tool fan (0..1)",
 	"state.restorePoints[].feedRate": "Requested feedrate (in mm/s)",
-	"state.restorePoints[].gCommandNumber": "Which of G0/G1/G2/G3 generated the move at this restore point",
+	"state.restorePoints[].gCommandNumber": "Which of G0/G1/G2/G3 generated the move at this restore point, or -1 if unknown",
 	"state.restorePoints[].ioBits": "The output port bits setting for this move or null if not applicable",
 	"state.restorePoints[].laserPwm": "Laser PWM value (0..1) or null if not applicable",
 	"state.restorePoints[].toolNumber": "The tool number that was active",

package/dist/index.d.ts

@@ -23,4 +23,3 @@ export * from "./volumes";
 export * from "./ObjectModel";
 import ObjectModel from "./ObjectModel";
 export default ObjectModel;
-export declare function setArrayItem(array: Array<any>, index: number, value: any): void;

package/dist/index.js

@@ -25,13 +25,3 @@ export * from "./ObjectModel";
 // Expose ObjectModel as default export
 import ObjectModel from "./ObjectModel";
 export default ObjectModel;
-// Unfortunately we need to define a way to update arrays to remain compatible with Vue 2 (due to IE11).
-// This will become obsolete as soon as DWC is upgraded to Vue 3, but that isn't going to happen anytime soon.
-// Until then a Vue 2 user would have to call something like this on initialization to work around this limitation:
-// globalThis._duetModelSetArray = (array, index, value) => Vue.set(array, index, value);
-// or in TypeScript
-// (globalThis as any)._duetModelSetArray = (array: object, index: string | number, value: any) => Vue.set(array, index, value);
-globalThis._duetModelSetArray = (array, index, value) => array[index] = value;
-export function setArrayItem(array, index, value) {
-    globalThis._duetModelSetArray(array, index, value);
-}

package/dist/move/index.d.ts

@@ -14,6 +14,7 @@ export declare class CurrentMove extends ModelObject {
     distance: number;
     duration: number;
     extrusionRate: number;
+    filePosition: number | null;
     laserPwm: number | null;
     requestedSpeed: number;
     topSpeed: number;

package/dist/move/index.js

@@ -16,6 +16,7 @@ export class CurrentMove extends ModelObject {
         this.distance = 0;
         this.duration = 0;
         this.extrusionRate = 0;
+        this.filePosition = null;
         this.laserPwm = null;
         this.requestedSpeed = 0;
         this.topSpeed = 0;

package/dist/sbc/Upgrade.d.ts

@@ -0,0 +1,6 @@
+import ModelObject from "../ModelObject";
+export declare class Upgrade extends ModelObject {
+    message: string;
+    progress: number | null;
+}
+export default Upgrade;

package/dist/sbc/Upgrade.js

@@ -0,0 +1,9 @@
+import ModelObject from "../ModelObject";
+export class Upgrade extends ModelObject {
+    constructor() {
+        super(...arguments);
+        this.message = "";
+        this.progress = null;
+    }
+}
+export default Upgrade;

package/dist/sbc/index.d.ts

@@ -2,7 +2,9 @@ import ModelObject from "../ModelObject";
 import DSF from "./dsf";
 import CPU from "./CPU";
 import Memory from "./Memory";
+import Upgrade from "./Upgrade";
 export declare class SBC extends ModelObject {
+    constructor();
     appArmor: boolean;
     readonly cpu: CPU;
     readonly dsf: DSF;
@@ -11,9 +13,11 @@ export declare class SBC extends ModelObject {
     readonly memory: Memory;
     model: string | null;
     serial: string | null;
+    upgrade: Upgrade | null;
     uptime: number | null;
 }
 export default SBC;
 export * from "./dsf";
 export * from "./CPU";
 export * from "./Memory";
+export * from "./Upgrade";

package/dist/sbc/index.js

@@ -2,9 +2,10 @@ import ModelObject from "../ModelObject";
 import DSF from "./dsf";
 import CPU from "./CPU";
 import Memory from "./Memory";
+import Upgrade from "./Upgrade";
 export class SBC extends ModelObject {
     constructor() {
-        super(...arguments);
+        super();
         this.appArmor = false;
         this.cpu = new CPU();
         this.dsf = new DSF();
@@ -13,10 +14,13 @@ export class SBC extends ModelObject {
         this.memory = new Memory();
         this.model = null;
         this.serial = null;
+        this.upgrade = null;
         this.uptime = null;
+        ModelObject.wrapModelProperty(this, "upgrade", Upgrade);
     }
 }
 export default SBC;
 export * from "./dsf";
 export * from "./CPU";
 export * from "./Memory";
+export * from "./Upgrade";

package/dist/sensors/FilamentMonitors/FilamentMonitorBase.d.ts

@@ -26,6 +26,7 @@ export declare class FilamentMonitorBase extends ModelObject {
      */
     enabled: boolean;
     enableMode: FilamentMonitorEnableMode;
+    filamentPresent: boolean | null;
     status: FilamentMonitorStatus;
     type: FilamentMonitorType;
     constructor(type?: FilamentMonitorType);

package/dist/sensors/FilamentMonitors/FilamentMonitorBase.js

@@ -31,6 +31,7 @@ export class FilamentMonitorBase extends ModelObject {
          */
         this.enabled = false;
         this.enableMode = FilamentMonitorEnableMode.disabled;
+        this.filamentPresent = null;
         this.status = FilamentMonitorStatus.noDataReceived;
         this.type = type;
     }

package/dist/sensors/FilamentMonitors/RotatingMagnetFilamentMonitor.d.ts

@@ -16,6 +16,7 @@ export declare class RotatingMagnetFilamentMonitorConfigured extends ModelObject
 }
 export declare class RotatingMagnetFilamentMonitor extends Duet3DFilamentMonitor {
     constructor();
+    agc: number | null;
     calibrated: RotatingMagnetFilamentMonitorCalibrated | null;
     readonly configured: RotatingMagnetFilamentMonitorConfigured;
     update(jsonElement: any): IModelObject | null;

package/dist/sensors/FilamentMonitors/RotatingMagnetFilamentMonitor.js

@@ -24,6 +24,7 @@ export class RotatingMagnetFilamentMonitorConfigured extends ModelObject {
 export class RotatingMagnetFilamentMonitor extends Duet3DFilamentMonitor {
     constructor() {
         super(FilamentMonitorType.rotatingMagnet);
+        this.agc = null;
         this.calibrated = new RotatingMagnetFilamentMonitorCalibrated();
         this.configured = new RotatingMagnetFilamentMonitorConfigured();
         ModelObject.wrapModelProperty(this, "calibrated", RotatingMagnetFilamentMonitorCalibrated);

package/dist/state/RestorePoint.js

@@ -6,7 +6,7 @@ export class RestorePoint extends ModelObject {
         this.extruderPos = 0;
         this.fanPwm = 0;
         this.feedRate = 0;
-        this.gCommandNumber = 0;
+        this.gCommandNumber = -1;
         this.ioBits = null;
         this.laserPwm = null;
         this.toolNumber = -1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duet3d/objectmodel",
-  "version": "3.7.0-beta.1",
+  "version": "3.7.0-beta.10",
   "description": "TypeScript implementation of the Duet3D Object Model",
   "type": "module",
   "main": "dist/index.js",
@@ -15,10 +15,10 @@
     "./documentation.json": "./dist/documentation.json"
   },
   "scripts": {
-    "test": "jest --config jestconfig.json",
-    "build": "tsc && tsx scripts/extract-metadata.ts",
+    "test": "tsc -p tsconfig.test.json --noEmit && jest --config jestconfig.json",
+    "build": "tsc && node scripts/extract-metadata.ts",
     "prepare": "npm run build",
-    "prepublishOnly": "npm test"
+    "prepublishOnly": "npm test && node scripts/check-metadata.ts"
   },
   "repository": {
     "type": "git",
@@ -31,12 +31,12 @@
   },
   "homepage": "https://github.com/Duet3D/ObjectModel#readme",
   "devDependencies": {
+    "@swc/core": "^1.15.43",
+    "@swc/jest": "^0.2.39",
     "@types/jest": "^30.0.0",
-    "@types/node": "^25.0.0",
-    "jest": "^30.2.0",
-    "ts-jest": "^29.1.2",
-    "tsx": "^4.20.0",
-    "typescript": "^6.0.3"
+    "@types/node": "^26.1.1",
+    "jest": "^30.4.2",
+    "typescript": "^7.0.2"
   },
   "files": [
     "/dist"