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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (52) hide show
  1. package/README.md +1 -7
  2. package/dist/ModelCollection.d.ts +8 -2
  3. package/dist/ModelCollection.js +25 -12
  4. package/dist/ModelDictionary.d.ts +4 -2
  5. package/dist/ModelDictionary.js +8 -6
  6. package/dist/ModelObject.d.ts +13 -2
  7. package/dist/ModelObject.js +50 -5
  8. package/dist/ObjectModel.d.ts +5 -0
  9. package/dist/ObjectModel.js +7 -2
  10. package/dist/boards/directDisplay/DirectDisplayScreen.d.ts +1 -1
  11. package/dist/boards/directDisplay/DirectDisplayScreen.js +3 -3
  12. package/dist/boards/directDisplay/DirectDisplayScreenST7567.d.ts +1 -1
  13. package/dist/boards/directDisplay/DirectDisplayScreenST7567.js +3 -3
  14. package/dist/boards/index.d.ts +23 -9
  15. package/dist/boards/index.js +33 -13
  16. package/dist/documentation.json +66 -18
  17. package/dist/index.d.ts +0 -1
  18. package/dist/index.js +0 -10
  19. package/dist/move/index.d.ts +1 -0
  20. package/dist/move/index.js +1 -0
  21. package/dist/move/kinematics/CoreKinematics.d.ts +1 -1
  22. package/dist/move/kinematics/CoreKinematics.js +3 -3
  23. package/dist/move/kinematics/DeltaKinematics.d.ts +1 -1
  24. package/dist/move/kinematics/DeltaKinematics.js +3 -3
  25. package/dist/move/kinematics/HangprinterKinematics.d.ts +1 -1
  26. package/dist/move/kinematics/HangprinterKinematics.js +3 -3
  27. package/dist/move/kinematics/PolarKinematics.d.ts +1 -1
  28. package/dist/move/kinematics/PolarKinematics.js +3 -3
  29. package/dist/move/kinematics/ScaraKinematics.d.ts +1 -1
  30. package/dist/move/kinematics/ScaraKinematics.js +3 -3
  31. package/dist/move/kinematics/index.d.ts +1 -1
  32. package/dist/move/kinematics/index.js +3 -3
  33. package/dist/plugins/PluginManifest.d.ts +1 -1
  34. package/dist/plugins/PluginManifest.js +2 -2
  35. package/dist/sbc/Upgrade.d.ts +6 -0
  36. package/dist/sbc/Upgrade.js +9 -0
  37. package/dist/sbc/index.d.ts +4 -0
  38. package/dist/sbc/index.js +5 -1
  39. package/dist/sensors/FilamentMonitors/FilamentMonitorBase.d.ts +1 -0
  40. package/dist/sensors/FilamentMonitors/FilamentMonitorBase.js +1 -0
  41. package/dist/sensors/FilamentMonitors/LaserFilamentMonitor.d.ts +1 -1
  42. package/dist/sensors/FilamentMonitors/LaserFilamentMonitor.js +3 -3
  43. package/dist/sensors/FilamentMonitors/PulsedFilamentMonitor.d.ts +1 -1
  44. package/dist/sensors/FilamentMonitors/PulsedFilamentMonitor.js +3 -3
  45. package/dist/sensors/FilamentMonitors/RotatingMagnetFilamentMonitor.d.ts +2 -1
  46. package/dist/sensors/FilamentMonitors/RotatingMagnetFilamentMonitor.js +4 -3
  47. package/dist/sensors/FilamentMonitors/index.d.ts +1 -1
  48. package/dist/sensors/FilamentMonitors/index.js +3 -3
  49. package/dist/state/MessageBox.d.ts +1 -1
  50. package/dist/state/MessageBox.js +2 -2
  51. package/dist/state/RestorePoint.js +1 -1
  52. package/package.json +9 -9
package/dist/sensors/FilamentMonitors/index.js CHANGED
@@ -3,14 +3,14 @@ import LaserFilamentMonitor from "./LaserFilamentMonitor";
3
3
  import PulsedFilamentMonitor from "./PulsedFilamentMonitor";
4
4
  import RotatingMagnetFilamentMonitor from "./RotatingMagnetFilamentMonitor";
5
5
  export class FilamentMonitor extends FilamentMonitorBase {
6
- update(jsonElement) {
6
+ update(jsonElement, authoritative = false) {
7
7
  if (jsonElement === null) {
8
8
  return null;
9
9
  }
10
10
  if (typeof jsonElement.type === "string" && jsonElement.type !== this.type) {
11
- return getFilamentMonitor(jsonElement.type).update(jsonElement);
11
+ return getFilamentMonitor(jsonElement.type).update(jsonElement, authoritative);
12
12
  }
13
- return super.update(jsonElement);
13
+ return super.update(jsonElement, authoritative);
14
14
  }
15
15
  }
16
16
  export default FilamentMonitor;
package/dist/state/MessageBox.d.ts CHANGED
@@ -22,6 +22,6 @@ export declare class MessageBox extends ModelObject {
22
22
  seq: number;
23
23
  timeout: number;
24
24
  title: string;
25
- update(jsonElement: any): IModelObject | null;
25
+ update(jsonElement: any, authoritative?: boolean): IModelObject | null;
26
26
  }
27
27
  export default MessageBox;
package/dist/state/MessageBox.js CHANGED
@@ -25,11 +25,11 @@ export class MessageBox extends ModelObject {
25
25
  this.timeout = 0;
26
26
  this.title = "";
27
27
  }
28
- update(jsonElement) {
28
+ update(jsonElement, authoritative = false) {
29
29
  if (jsonElement instanceof Object && (typeof jsonElement.default === "number" || typeof jsonElement.default === "string")) {
30
30
  this.default = jsonElement.default;
31
31
  }
32
- return super.update(jsonElement);
32
+ return super.update(jsonElement, authoritative);
33
33
  }
34
34
  }
35
35
  export default MessageBox;
package/dist/state/RestorePoint.js CHANGED
@@ -6,7 +6,7 @@ export class RestorePoint extends ModelObject {
6
6
  this.extruderPos = 0;
7
7
  this.fanPwm = 0;
8
8
  this.feedRate = 0;
9
- this.gCommandNumber = 0;
9
+ this.gCommandNumber = -1;
10
10
  this.ioBits = null;
11
11
  this.laserPwm = null;
12
12
  this.toolNumber = -1;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@duet3d/objectmodel",
3
- "version": "3.7.0-beta.1",
3
+ "version": "3.7.0-beta.11",
4
4
  "description": "TypeScript implementation of the Duet3D Object Model",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
@@ -15,10 +15,10 @@
15
15
  "./documentation.json": "./dist/documentation.json"
16
16
  },
17
17
  "scripts": {
18
- "test": "jest --config jestconfig.json",
19
- "build": "tsc && tsx scripts/extract-metadata.ts",
18
+ "test": "tsc -p tsconfig.test.json --noEmit && jest --config jestconfig.json",
19
+ "build": "tsc && node scripts/extract-metadata.ts",
20
20
  "prepare": "npm run build",
21
- "prepublishOnly": "npm test"
21
+ "prepublishOnly": "npm test && node scripts/check-metadata.ts"
22
22
  },
23
23
  "repository": {
24
24
  "type": "git",
@@ -31,12 +31,12 @@
31
31
  },
32
32
  "homepage": "https://github.com/Duet3D/ObjectModel#readme",
33
33
  "devDependencies": {
34
+ "@swc/core": "^1.15.43",
35
+ "@swc/jest": "^0.2.39",
34
36
  "@types/jest": "^30.0.0",
35
- "@types/node": "^25.0.0",
36
- "jest": "^30.2.0",
37
- "ts-jest": "^29.1.2",
38
- "tsx": "^4.20.0",
39
- "typescript": "^6.0.3"
37
+ "@types/node": "^26.1.1",
38
+ "jest": "^30.4.2",
39
+ "typescript": "^7.0.2"
40
40
  },
41
41
  "files": [
42
42
  "/dist"