@duet3d/monacotokens 3.7.0-alpha.6 → 3.7.0-alpha.8

package/dist/expressions/index.js

@@ -1,8 +1,2 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.expressionData = void 0;
-const expressions_json_1 = __importDefault(require("./expressions.json"));
-exports.expressionData = expressions_json_1.default;
+import data from "./expressions.json";
+export const expressionData = data;

package/dist/gcodes/index.js

@@ -1,24 +1,17 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.gcodeData = void 0;
-exports.findGcode = findGcode;
-const gcodes_json_1 = __importDefault(require("./gcodes.json"));
+import gcodeDataJson from "./gcodes.json";
 /**
  * Curated dataset of G/M/T-codes used to drive Monaco completion and hover providers.
  * Sourced from gcode-data.json so it can be regenerated automatically from an upstream reference (docs.duet3d.com or DuetScreen) without touching TypeScript.
  */
-exports.gcodeData = gcodes_json_1.default;
+export const gcodeData = gcodeDataJson;
 /**
  * Look up an entry by code. Accepts mixed-case ("g1", "M104", ...) by upper-casing the leading letter
  * before matching against the canonical "G1" / "M104" / "T" form stored in gcodeData.
  */
-function findGcode(code) {
+export function findGcode(code) {
     if (!code) {
         return undefined;
     }
     const canonical = code[0].toUpperCase() + code.substring(1);
-    return exports.gcodeData.find(g => g.code === canonical);
+    return gcodeData.find(g => g.code === canonical);
 }

package/dist/gcodes/local-variables.d.ts

@@ -1,4 +1,4 @@
-import type * as monaco from "monaco-editor/esm/vs/editor/editor.api";
+import type * as monaco from "monaco-editor/esm/vs/editor/editor.api.js";
 /**
  * Names declared inside the currently-edited model via RRF's meta language (`var foo = ...`, `global bar = ...`).
  * Populated by `attachLocalVariableScanner(editor)` and consulted by the expression completion provider when

package/dist/gcodes/local-variables.js

@@ -1,7 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.attachLocalVariableScanner = attachLocalVariableScanner;
-exports.getLocalVariables = getLocalVariables;
 /** Debounce delay for rescanning a model's `var` / `global` declarations on content change (ms). */
 const LOCAL_VARIABLE_RESCAN_DEBOUNCE_MS = 250;
 const empty = { vars: new Set(), globals: new Set() };
@@ -30,7 +26,7 @@ function scan(model, maxLines) {
  * Scans up to `maxLines` lines (default 5000) - well beyond typical macro size but bounded for generated
  * G-code exports that would otherwise pay a per-keystroke cost.
  */
-function attachLocalVariableScanner(editor, maxLines = 5000) {
+export function attachLocalVariableScanner(editor, maxLines = 5000) {
     let timeout = null;
     const rescan = () => {
         const model = editor.getModel();
@@ -61,6 +57,6 @@ function attachLocalVariableScanner(editor, maxLines = 5000) {
  * Return the most recently scanned `var`/`global` declarations for the given model, or empty sets if no
  * scanner is attached (or the first scan hasn't completed yet).
  */
-function getLocalVariables(model) {
+export function getLocalVariables(model) {
     return scans.get(model) ?? empty;
 }

package/dist/gcodes/search.d.ts

@@ -1,4 +1,4 @@
-import type * as monaco from "monaco-editor/esm/vs/editor/editor.api";
+import type * as monaco from "monaco-editor/esm/vs/editor/editor.api.js";
 /**
  * Open the gcode search overlay anchored to the current cursor position, styled like the F2 rename widget.
  */

package/dist/gcodes/search.js

@@ -1,19 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.showGcodeSearch = showGcodeSearch;
-exports.showObjectModelSearch = showObjectModelSearch;
-exports.addGcodeSearchAction = addGcodeSearchAction;
-const _1 = require(".");
-const machine_context_1 = require("../objectmodel/machine-context");
-const local_variables_1 = require("./local-variables");
-const deprecations_1 = require("../objectmodel/deprecations");
-const providers_1 = require("../providers");
+import { gcodeData } from ".";
+import { getMachineContext } from "../objectmodel/machine-context";
+import { getLocalVariables } from "./local-variables";
+import { getPathDeprecation } from "../objectmodel/deprecations";
+import { flattenObjectModel, isInsideExpression } from "../providers";
 const widgetId = "duet.gcodeSearchWidget";
 let activeWidget = null;
 /**
  * Open the gcode search overlay anchored to the current cursor position, styled like the F2 rename widget.
  */
-function showGcodeSearch(monacoInstance, editor) {
+export function showGcodeSearch(monacoInstance, editor) {
     if (activeWidget) {
         activeWidget.dispose();
     }
@@ -144,8 +139,8 @@ function showGcodeSearch(monacoInstance, editor) {
     function render(query) {
         const q = query.trim().toLowerCase();
         entries = q.length === 0
-            ? _1.gcodeData.slice()
-            : _1.gcodeData.filter(g => g.code.toLowerCase().includes(q) || g.summary.toLowerCase().includes(q));
+            ? gcodeData.slice()
+            : gcodeData.filter(g => g.code.toLowerCase().includes(q) || g.summary.toLowerCase().includes(q));
         selectedIndex = 0;
         list.innerHTML = "";
         rowEls = [];
@@ -323,7 +318,7 @@ function showGcodeSearch(monacoInstance, editor) {
  * are represented by their first element with an `[0]` placeholder. Local `var` / `global` declarations
  * scanned from the current editor model are folded in as `var.<name>` / `global.<name>` entries.
  */
-function showObjectModelSearch(monacoInstance, editor) {
+export function showObjectModelSearch(monacoInstance, editor) {
     if (activeWidget) {
         activeWidget.dispose();
     }
@@ -361,15 +356,15 @@ function showObjectModelSearch(monacoInstance, editor) {
     const pathColor = isDarkTheme ? "#9CDCFE" : "#001080";
     // Collect all paths once - model-derived paths plus the local scanner's var/global declarations
     const allPaths = new Set();
-    const ctx = (0, machine_context_1.getMachineContext)();
+    const ctx = getMachineContext();
     if (ctx?.model) {
-        for (const p of (0, providers_1.flattenObjectModel)(ctx.model)) {
+        for (const p of flattenObjectModel(ctx.model)) {
             allPaths.add(p);
         }
     }
     const model = editor.getModel();
     if (model) {
-        const locals = (0, local_variables_1.getLocalVariables)(model);
+        const locals = getLocalVariables(model);
         for (const n of locals.vars) {
             allPaths.add(`var.${n}`);
         }
@@ -408,7 +403,7 @@ function showObjectModelSearch(monacoInstance, editor) {
             const pathSpan = document.createElement("span");
             pathSpan.textContent = path;
             pathSpan.style.cssText = `color: ${pathColor}; flex: 1; overflow: hidden; text-overflow: ellipsis`;
-            const deprecation = ctxModel ? (0, deprecations_1.getPathDeprecation)(path) : null;
+            const deprecation = ctxModel ? getPathDeprecation(path) : null;
             if (deprecation !== null) {
                 pathSpan.style.textDecoration = "line-through";
                 pathSpan.style.opacity = "0.7";
@@ -568,7 +563,7 @@ function showObjectModelSearch(monacoInstance, editor) {
  * Register the F4 search action on a freshly created editor instance.
  * Call this once per editor right after `monaco.editor.create(...)`.
  */
-function addGcodeSearchAction(monacoInstance, editor) {
+export function addGcodeSearchAction(monacoInstance, editor) {
     return editor.addAction({
         id: "duet.searchGcode",
         label: "Search G/M-code or object-model path",
@@ -583,7 +578,7 @@ function addGcodeSearchAction(monacoInstance, editor) {
             if (model && position) {
                 const lineContent = model.getLineContent(position.lineNumber);
                 const beforeCursor = lineContent.substring(0, position.column - 1);
-                if ((0, providers_1.isInsideExpression)(beforeCursor)) {
+                if (isInsideExpression(beforeCursor)) {
                     showObjectModelSearch(monacoInstance, editor);
                     return;
                 }

package/dist/index.js

@@ -1,28 +1,12 @@
-"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 });
-__exportStar(require("./monaco-gcode"), exports);
-__exportStar(require("./monaco-stm32"), exports);
-__exportStar(require("./monaco-menu"), exports);
-__exportStar(require("./gcodes"), exports);
-__exportStar(require("./expressions"), exports);
-__exportStar(require("./objectmodel/machine-context"), exports);
-__exportStar(require("./gcodes/local-variables"), exports);
-__exportStar(require("./objectmodel/deprecations"), exports);
-__exportStar(require("./objectmodel/enums"), exports);
-__exportStar(require("./providers"), exports);
-__exportStar(require("./gcodes/search"), exports);
-__exportStar(require("./register"), exports);
+export * from "./monaco-gcode";
+export * from "./monaco-stm32";
+export * from "./monaco-menu";
+export * from "./gcodes";
+export * from "./expressions";
+export * from "./objectmodel/machine-context";
+export * from "./gcodes/local-variables";
+export * from "./objectmodel/deprecations";
+export * from "./objectmodel/enums";
+export * from "./providers";
+export * from "./gcodes/search";
+export * from "./register";

package/dist/monaco-gcode.d.ts

@@ -1,4 +1,4 @@
-import type * as monaco from "monaco-editor/esm/vs/editor/editor.api";
+import type * as monaco from "monaco-editor/esm/vs/editor/editor.api.js";
 export declare const gcodeFDMLanguage: monaco.languages.IMonarchLanguage;
 export declare const gcodeCNCLanguage: monaco.languages.IMonarchLanguage;
 export declare const gcodeLanguageConfiguration: monaco.languages.LanguageConfiguration;

package/dist/monaco-gcode.js

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.gcodeLanguageConfiguration = exports.gcodeCNCLanguage = exports.gcodeFDMLanguage = void 0;
 /**
  * Generate a Monarch language for RRF-style G-code
  * @param cncMode If true, comments in parentheses are allowed
@@ -186,9 +183,9 @@ function generateMonarchLanguage(fdmMode) {
         }
     };
 }
-exports.gcodeFDMLanguage = generateMonarchLanguage(true);
-exports.gcodeCNCLanguage = generateMonarchLanguage(false);
-exports.gcodeLanguageConfiguration = {
+export const gcodeFDMLanguage = generateMonarchLanguage(true);
+export const gcodeCNCLanguage = generateMonarchLanguage(false);
+export const gcodeLanguageConfiguration = {
     comments: {
         lineComment: ";"
     },

package/dist/monaco-menu.d.ts

@@ -1,3 +1,3 @@
-import type * as monaco from "monaco-editor/esm/vs/editor/editor.api";
+import type * as monaco from "monaco-editor/esm/vs/editor/editor.api.js";
 export declare const menuLanguage: monaco.languages.IMonarchLanguage;
 export declare const menuLanguageConfiguration: monaco.languages.LanguageConfiguration;

package/dist/monaco-menu.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.menuLanguageConfiguration = exports.menuLanguage = void 0;
-exports.menuLanguage = {
+export const menuLanguage = {
     keywords: ["image", "text", "button", "value", "alter", "files"],
     symbols: /[=><!~?:&|+\-*#\/\^%]+/,
     operators: ['*', '/', '+', '-', "==", "!=", '=', "<=", '<', ">=", ">>>", ">>", '>', '!', "&&", '&', "||", '|', '^', '?', ':'],
@@ -28,7 +25,7 @@ exports.menuLanguage = {
         ]
     }
 };
-exports.menuLanguageConfiguration = {
+export const menuLanguageConfiguration = {
     comments: {
         lineComment: ";"
     }

package/dist/monaco-stm32.d.ts

@@ -1,3 +1,3 @@
-import type * as monaco from "monaco-editor/esm/vs/editor/editor.api";
+import type * as monaco from "monaco-editor/esm/vs/editor/editor.api.js";
 export declare const stm32Language: monaco.languages.IMonarchLanguage;
 export declare const stm32LanguageConfiguration: monaco.languages.LanguageConfiguration;

package/dist/monaco-stm32.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.stm32LanguageConfiguration = exports.stm32Language = void 0;
-exports.stm32Language = {
+export const stm32Language = {
     keywordsPrimary: ["8266wifi", "accelerometer", "atx", "board", "heat", "lcd", "led", "leds", "pins", "power", "sbc", "sdCard", "serial", "SPI0", "SPI1", "SPI2", "SPI3", "SPI4", "SPI5", "SPI6", "SPI7", "SPI8", "stepper"],
     keywordsSecondary: ["clockReg", "csPin", "espDataReadyPin", "espResetPin", "TfrReadyPin", "serialRxTxPins", "spiChannel", "initialPowerOn", "powerPin", "powerPinInverted", "spiTempSensorChannel", "spiTempSensorCSPins", "tempSensePins", "thermistorSeriesResistor", "encoderPinA", "encoderPinB", "encoderPinSw", "lcdBeepPin", "lcdCSPin", "lcdDCPin", "panelButtonPin", "neopixelPin", "activity", "activityOn", "diagnostic", "diagnosticOn", "SetHigh", "SetLow", "VInDetectPin", "voltage", "loadConfig", "external", "internal", "aux", "aux2", "pins", "directionPins", "enablePins", "numSmartDrivers", "num5160Drivers", "stepPins", "TmcDiagPins", "TmcUartPins"],
     keywordsTertiary: ["cardDetectPin", "csPin", "spiChannel", "spiFrequencyHz", "spiFrequencyHz", "rxTxPins", "rxTxPins"],
@@ -66,7 +63,7 @@ exports.stm32Language = {
         ]
     }
 };
-exports.stm32LanguageConfiguration = {
+export const stm32LanguageConfiguration = {
     comments: {
         lineComment: ";"
     },

package/dist/objectmodel/deprecations.js

@@ -1,28 +1,21 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPathDeprecation = getPathDeprecation;
-exports.getMemberDeprecation = getMemberDeprecation;
-const deprecations_json_1 = __importDefault(require("@duet3d/objectmodel/dist/deprecations.json"));
-const paths_1 = require("./paths");
+import deprecationsJson from "@duet3d/objectmodel/deprecations.json";
+import { normalisePath } from "./paths";
 /**
  * Map of full object-model paths (with `[]` standing for any array index) to the deprecation message extracted
  * from the property's `@deprecated` JSDoc tag. Built by @duet3d/objectmodel's build script from its TS sources.
  */
-const deprecations = deprecations_json_1.default;
+const deprecations = deprecationsJson;
 /**
  * Look up the deprecation message for a full object-model path (with literal numeric indices) or any of its
  * prefixes. Returns the deprecation message when the path itself or a containing path is deprecated (the
  * shallowest match wins so the user sees the root cause, e.g. `move.rotation.angle` reports `move.rotation`
  * as deprecated). Returns null when neither the path nor any prefix is deprecated.
  */
-function getPathDeprecation(path) {
+export function getPathDeprecation(path) {
     if (!path) {
         return null;
     }
-    const key = (0, paths_1.normalisePath)(path);
+    const key = normalisePath(path);
     // Walk prefixes from shallowest to deepest; first hit wins
     let cursor = 0;
     while (cursor < key.length) {
@@ -43,7 +36,7 @@ function getPathDeprecation(path) {
  * Look up the deprecation message for `parentPath + "." + field`. `parentPath` is the dotted path of the parent
  * value from the root (e.g. `move.extruders[0]`), or empty for a top-level field. Returns null if not deprecated.
  */
-function getMemberDeprecation(parentPath, field) {
+export function getMemberDeprecation(parentPath, field) {
     const fullPath = parentPath ? `${parentPath}.${field}` : field;
     return getPathDeprecation(fullPath);
 }

package/dist/objectmodel/enums.js

@@ -1,23 +1,17 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEnumValuesForPath = getEnumValuesForPath;
-const enums_json_1 = __importDefault(require("@duet3d/objectmodel/dist/enums.json"));
-const paths_1 = require("./paths");
+import enumValuesJson from "@duet3d/objectmodel/enums.json";
+import { normalisePath } from "./paths";
 /**
  * Map of full object-model paths (with `[]` standing for any array index) to the list of valid enum / string-
  * literal values the field can take. Generated by @duet3d/objectmodel's build script from its TS sources.
  */
-const enumValues = enums_json_1.default;
+const enumValues = enumValuesJson;
 /**
  * Return the list of valid values for a given object-model path, or null if the path has no known enum values.
  */
-function getEnumValuesForPath(path) {
+export function getEnumValuesForPath(path) {
     if (!path) {
         return null;
     }
-    const key = (0, paths_1.normalisePath)(path);
+    const key = normalisePath(path);
     return Object.prototype.hasOwnProperty.call(enumValues, key) ? enumValues[key] : null;
 }

package/dist/objectmodel/machine-context.js

@@ -1,14 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setMachineContext = setMachineContext;
-exports.getMachineContext = getMachineContext;
-exports.onMachineContextChange = onMachineContextChange;
 let current = null;
 const listeners = new Set();
 /**
  * Set (or clear) the runtime machine context. Pass `null` when the machine is disconnected.
  */
-function setMachineContext(context) {
+export function setMachineContext(context) {
     current = context;
     for (const listener of listeners) {
         try {
@@ -23,13 +18,13 @@ function setMachineContext(context) {
 /**
  * Get the currently installed machine context, or null when no machine is connected.
  */
-function getMachineContext() {
+export function getMachineContext() {
     return current;
 }
 /**
  * Subscribe to machine-context changes. Returns an unsubscribe function.
  */
-function onMachineContextChange(listener) {
+export function onMachineContextChange(listener) {
     listeners.add(listener);
     return () => listeners.delete(listener);
 }

package/dist/objectmodel/paths.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalisePath = normalisePath;
 /** Normalise a runtime object-model path (with literal numeric indices) to the lookup form used by
  * the deprecations / enums maps, where `[]` stands in for any array index. */
-function normalisePath(path) {
+export function normalisePath(path) {
     return path.replace(/\[\d+\]/g, "[]");
 }

package/dist/providers.d.ts

@@ -1,4 +1,4 @@
-import type * as monaco from "monaco-editor/esm/vs/editor/editor.api";
+import type * as monaco from "monaco-editor/esm/vs/editor/editor.api.js";
 export { getMachineContext, onMachineContextChange } from "./objectmodel/machine-context";
 /**
  * Flatten a machine object-model snapshot into a list of dotted paths (with `[0]` placeholders for arrays).

package/dist/providers.js

@@ -1,25 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.onMachineContextChange = exports.getMachineContext = void 0;
-exports.flattenObjectModel = flattenObjectModel;
-exports.isInsideExpression = isInsideExpression;
-exports.findCodeAtCursor = findCodeAtCursor;
-exports.registerProvidersFor = registerProvidersFor;
-exports.registerDuetProviders = registerDuetProviders;
-exports.attachGcodeSignatureHelpWatcher = attachGcodeSignatureHelpWatcher;
-exports.attachGcodeDeprecationDecorations = attachGcodeDeprecationDecorations;
-exports.attachObjectModelDeprecationDecorations = attachObjectModelDeprecationDecorations;
-const gcodes_1 = require("./gcodes");
-const expressions_1 = require("./expressions");
-const machine_context_1 = require("./objectmodel/machine-context");
-const local_variables_1 = require("./gcodes/local-variables");
-const deprecations_1 = require("./objectmodel/deprecations");
-const enums_1 = require("./objectmodel/enums");
+import { gcodeData, findGcode } from "./gcodes";
+import { expressionData } from "./expressions";
+import { getMachineContext } from "./objectmodel/machine-context";
+import { getLocalVariables } from "./gcodes/local-variables";
+import { getMemberDeprecation, getPathDeprecation } from "./objectmodel/deprecations";
+import { getEnumValuesForPath } from "./objectmodel/enums";
 // Re-export the runtime-context helpers so consumers (Vue DWC, React DuetWebUI, ...) can install a context
 // without adding a separate import path
-var machine_context_2 = require("./objectmodel/machine-context");
-Object.defineProperty(exports, "getMachineContext", { enumerable: true, get: function () { return machine_context_2.getMachineContext; } });
-Object.defineProperty(exports, "onMachineContextChange", { enumerable: true, get: function () { return machine_context_2.onMachineContextChange; } });
+export { getMachineContext, onMachineContextChange } from "./objectmodel/machine-context";
 /**
  * Find the enclosing function call (if any) for the cursor position. Walks back from the end of `beforeCursor`
  * keeping track of paren depth so that `max(a, min(b,|` correctly reports `min` with argIndex 1, not `max`.
@@ -89,8 +76,8 @@ function resolveExpressionPath(path, model) {
         return null;
     }
     const root = String(tokens[0]);
-    const ctx = (0, machine_context_1.getMachineContext)();
-    const local = (0, local_variables_1.getLocalVariables)(model);
+    const ctx = getMachineContext();
+    const local = getLocalVariables(model);
     let current;
     if (root === "var") {
         // `var.<name>` resolves to a placeholder object carrying the locally-declared names; the value isn't
@@ -154,7 +141,7 @@ function listMemberKeys(value) {
  * Walks the entire reachable subtree; arrays contribute a single representative `[0]` entry so the list
  * doesn't explode on machines with many tools/axes. Cycles are guarded via a visited WeakSet.
  */
-function flattenObjectModel(root) {
+export function flattenObjectModel(root) {
     if (!root || typeof root !== "object") {
         return [];
     }
@@ -222,7 +209,7 @@ function isInsideLineComment(beforeCursor) {
  *   - after an `=` on a `set|var|global` line (whole line is expression territory), OR
  *   - after `if|elif|while` (condition is an expression).
  */
-function isInsideExpression(beforeCursor) {
+export function isInsideExpression(beforeCursor) {
     // Count unmatched `{` up to cursor - quick check first
     let depth = 0;
     let inString = false;
@@ -286,7 +273,7 @@ const metaKeywords = [
  * A bare `T` is only treated as its own code when it's the first code on the line; otherwise it's a parameter
  * letter of the preceding command (e.g. `M104 T1` - the T belongs to M104, not a separate `T` code).
  */
-function findCodeAtCursor(line, column) {
+export function findCodeAtCursor(line, column) {
     // Local regex so there's no shared lastIndex state to reset between calls. Matches G/M codes with their
     // numeric suffix (e.g. G1, G38.2, M104) or a bare T. Anything after T (tool number, sign, expression) is
     // treated as T's unprecedentedParameter
@@ -581,7 +568,7 @@ const deprecatedInlineHtml = "<span style=\"color:#cca700;\"><i>(deprecated)</i>
  * Build a Markdown documentation block for a code (used by both completion and hover).
  */
 function buildCodeDoc(code) {
-    const info = (0, gcodes_1.findGcode)(code);
+    const info = findGcode(code);
     if (!info) {
         return "";
     }
@@ -680,7 +667,7 @@ function installSuggestWidgetWidth() {
 /**
  * Register Duet-specific completion and hover providers for a language id.
  */
-function registerProvidersFor(monacoInstance, languageId) {
+export function registerProvidersFor(monacoInstance, languageId) {
     installSuggestWidgetWidth();
     const disposables = [];
     // Completion: codes when typing G/M/T at line start, parameter letters after a known code
@@ -701,7 +688,7 @@ function registerProvidersFor(monacoInstance, languageId) {
                 // general vocabulary. Runs ahead of the member-access branch so typed paths don't fall through
                 const eqMatch = /([A-Za-z_][\w]*(?:\.[A-Za-z_][\w]*|\[\d+\])*)\s*(?:==|!=)\s*"?([A-Za-z_][\w]*)?$/.exec(beforeCursor);
                 if (eqMatch) {
-                    const values = (0, enums_1.getEnumValuesForPath)(eqMatch[1]);
+                    const values = getEnumValuesForPath(eqMatch[1]);
                     if (values) {
                         const wordInfo = model.getWordUntilPosition(position);
                         const range = {
@@ -744,7 +731,7 @@ function registerProvidersFor(monacoInstance, languageId) {
                     const value = resolveExpressionPath(chainMatch[1], model);
                     const suggestions = [];
                     for (const name of listMemberKeys(value)) {
-                        const deprecation = (0, deprecations_1.getMemberDeprecation)(chainMatch[1], name);
+                        const deprecation = getMemberDeprecation(chainMatch[1], name);
                         // Using the structured label form puts the `deprecated - <reason>` string in the description
                         // column (right-aligned dim text) so it's visible on every row, not only the highlighted one
                         const deprecationLabel = deprecation === null
@@ -783,7 +770,7 @@ function registerProvidersFor(monacoInstance, languageId) {
                     endColumn: wordInfo.endColumn
                 };
                 const suggestions = [];
-                for (const f of expressions_1.expressionData.functions) {
+                for (const f of expressionData.functions) {
                     suggestions.push({
                         label: { label: f.name, description: f.syntax },
                         kind: monacoInstance.languages.CompletionItemKind.Function,
@@ -793,7 +780,7 @@ function registerProvidersFor(monacoInstance, languageId) {
                         range
                     });
                 }
-                for (const c of expressions_1.expressionData.constants) {
+                for (const c of expressionData.constants) {
                     suggestions.push({
                         label: { label: c.name, description: c.description },
                         kind: monacoInstance.languages.CompletionItemKind.Constant,
@@ -803,7 +790,7 @@ function registerProvidersFor(monacoInstance, languageId) {
                         range
                     });
                 }
-                for (const s of expressions_1.expressionData.scopes) {
+                for (const s of expressionData.scopes) {
                     suggestions.push({
                         label: { label: s.name, description: s.description },
                         kind: monacoInstance.languages.CompletionItemKind.Module,
@@ -813,7 +800,7 @@ function registerProvidersFor(monacoInstance, languageId) {
                         range
                     });
                 }
-                for (const ns of expressions_1.expressionData.objectModel) {
+                for (const ns of expressionData.objectModel) {
                     // No description here - sub-keys don't carry any either (see comment in listMemberKeys),
                     // so keep the top level consistent rather than teasing docs the deeper levels can't match
                     suggestions.push({
@@ -835,7 +822,7 @@ function registerProvidersFor(monacoInstance, languageId) {
                     endColumn: wordInfo.endColumn
                 };
                 const triggerHints = { id: "editor.action.triggerParameterHints", title: "Trigger Parameter Hints" };
-                const suggestions = gcodes_1.gcodeData.map(info => ({
+                const suggestions = gcodeData.map(info => ({
                     label: { label: info.code, description: info.summary },
                     kind: monacoInstance.languages.CompletionItemKind.Function,
                     detail: info.summary,
@@ -861,7 +848,7 @@ function registerProvidersFor(monacoInstance, languageId) {
             // Inside a code call: suggest parameter letters (excluding ones already present on the line)
             const code = findCodeAtCursor(lineContent, position.column - 1);
             if (code) {
-                const info = (0, gcodes_1.findGcode)(code.code);
+                const info = findGcode(code.code);
                 if (info && info.parameters.length > 0) {
                     const wordInfo = model.getWordUntilPosition(position);
                     const range = {
@@ -932,7 +919,7 @@ function registerProvidersFor(monacoInstance, languageId) {
             }
             // Function call inside an expression (e.g. `sin(|` or `atan2(y,|`) takes precedence
             if (fnCall) {
-                const fn = expressions_1.expressionData.functions.find(f => f.name === fnCall.name);
+                const fn = expressionData.functions.find(f => f.name === fnCall.name);
                 if (fn) {
                     const parsed = parseFunctionSyntax(fn.syntax);
                     const params = parsed.params.map(p => ({
@@ -976,7 +963,7 @@ function registerProvidersFor(monacoInstance, languageId) {
             if (!code) {
                 return null;
             }
-            const info = (0, gcodes_1.findGcode)(code.code);
+            const info = findGcode(code.code);
             if (!info || (info.parameters.length === 0 && !info.unprecedentedParameter)) {
                 return null;
             }
@@ -1106,7 +1093,7 @@ function registerProvidersFor(monacoInstance, languageId) {
                 // sits inside a known parameter's value range, show that parameter's doc
                 const enclosingCode = findCodeAtCursor(lineContent, position.column);
                 if (enclosingCode) {
-                    const info = (0, gcodes_1.findGcode)(enclosingCode.code);
+                    const info = findGcode(enclosingCode.code);
                     const paramAtCursor = info ? findParameterAtCursor(lineContent, enclosingCode.startColumn + enclosingCode.code.length - 1, position.column) : null;
                     if (info && paramAtCursor) {
                         const param = info.parameters.find(p => p.letter.toUpperCase() === paramAtCursor.letter.toUpperCase());
@@ -1154,7 +1141,7 @@ function registerProvidersFor(monacoInstance, languageId) {
             // recognised parameter letter AND the cursor sits in the direct-value segment, fall through to
             // the unprecedentedParameter hover instead of returning nothing
             if (enclosing && !wordIsCode) {
-                const info = (0, gcodes_1.findGcode)(enclosing.code);
+                const info = findGcode(enclosing.code);
                 // First try: cursor sits anywhere inside a parameter's expanded value range (e.g. on the
                 // `100` of `S100`, inside `{global.x}` of `E{global.x}`, inside `"foo.g"` of `P"foo.g"`, or
                 // inside `1:2:3` of `E1:2:3`). This covers hovers that don't land on the letter itself
@@ -1190,7 +1177,7 @@ function registerProvidersFor(monacoInstance, languageId) {
             // so the tooltip stays visible while the cursor moves anywhere inside the expression - useful for
             // multi-token values like `{global.tool}` or `"Hello World"`
             if (enclosing && !wordIsCode) {
-                const info = (0, gcodes_1.findGcode)(enclosing.code);
+                const info = findGcode(enclosing.code);
                 if (info?.unprecedentedParameter) {
                     const segment = findUnprecedentedParameterRange(lineContent, enclosing.startColumn + enclosing.code.length - 1);
                     if (segment && word.startColumn >= segment.startCol && word.endColumn <= segment.endCol) {
@@ -1237,7 +1224,7 @@ function registerProvidersFor(monacoInstance, languageId) {
                 const canonical = enclosing.code;
                 const doc = buildCodeDoc(canonical);
                 if (doc) {
-                    const info = (0, gcodes_1.findGcode)(canonical);
+                    const info = findGcode(canonical);
                     let endCol = word.endColumn;
                     if (info?.unprecedentedParameter) {
                         const segment = findUnprecedentedParameterRange(lineContent, enclosing.startColumn + enclosing.code.length - 1);
@@ -1255,14 +1242,14 @@ function registerProvidersFor(monacoInstance, languageId) {
             // when the cursor is inside an expression context. Checked before the OM chain so `sin` alone (no
             // `.` / `[n]`) is covered; `fans[0].max` stays on the OM chain path since that match wins anyway
             if (insideExpression) {
-                const fn = expressions_1.expressionData.functions.find(f => f.name === word.word);
+                const fn = expressionData.functions.find(f => f.name === word.word);
                 if (fn) {
                     return {
                         range: new monacoInstance.Range(position.lineNumber, word.startColumn, position.lineNumber, word.endColumn),
                         contents: [md(`**${fn.syntax}**\n\n${fn.description}`)]
                     };
                 }
-                const constant = expressions_1.expressionData.constants.find(c => c.name === word.word);
+                const constant = expressionData.constants.find(c => c.name === word.word);
                 if (constant) {
                     return {
                         range: new monacoInstance.Range(position.lineNumber, word.startColumn, position.lineNumber, word.endColumn),
@@ -1275,11 +1262,11 @@ function registerProvidersFor(monacoInstance, languageId) {
             // callback we surface the @deprecated note if one applies to the hovered prefix
             const omHover = findObjectModelHover(lineContent, position.column);
             if (omHover) {
-                const ctx = (0, machine_context_1.getMachineContext)();
+                const ctx = getMachineContext();
                 const description = ctx?.getObjectModelDescription
                     ? await Promise.resolve(ctx.getObjectModelDescription(omHover.normalized))
                     : null;
-                const deprecation = (0, deprecations_1.getPathDeprecation)(omHover.prefix);
+                const deprecation = getPathDeprecation(omHover.prefix);
                 if (description || deprecation !== null) {
                     let body = `\`${omHover.normalized}\``;
                     if (description) {
@@ -1302,7 +1289,7 @@ function registerProvidersFor(monacoInstance, languageId) {
 /**
  * Register Duet completion and hover providers for both gcode-fdm and gcode-cnc languages.
  */
-function registerDuetProviders(monacoInstance) {
+export function registerDuetProviders(monacoInstance) {
     return [
         ...registerProvidersFor(monacoInstance, "gcode-fdm"),
         ...registerProvidersFor(monacoInstance, "gcode-cnc")
@@ -1314,7 +1301,7 @@ function registerDuetProviders(monacoInstance) {
  * Monaco only re-invokes the signature-help provider on content changes, so this bridges arrow-key / click movement.
  * Call this once per editor right after `monaco.editor.create(...)`.
  */
-function attachGcodeSignatureHelpWatcher(editor) {
+export function attachGcodeSignatureHelpWatcher(editor) {
     // Close parameter hints when the suggest widget transitions from hidden to visible, so the two popups don't
     // overlap while the user is typing. We only react on the visible-edge and skip the action if parameter hints
     // is currently open because that means Monaco just invoked it (e.g. after Enter on a completion item) and we
@@ -1346,7 +1333,7 @@ function attachGcodeSignatureHelpWatcher(editor) {
             shouldDismiss = true;
         }
         else if (code) {
-            const info = (0, gcodes_1.findGcode)(code.code);
+            const info = findGcode(code.code);
             if (!info || (info.parameters.length === 0 && !info.unprecedentedParameter)) {
                 shouldDismiss = true;
             }
@@ -1414,9 +1401,9 @@ function attachGcodeSignatureHelpWatcher(editor) {
  * `M84 S`). Re-runs on every content change; hover tooltip carries the deprecation reason.
  * Call once per editor; the returned IDisposable removes the listener and clears the decorations.
  */
-function attachGcodeDeprecationDecorations(editor) {
+export function attachGcodeDeprecationDecorations(editor) {
     // Codes with `deprecated` flag: the code identifier itself gets struck through
-    const deprecatedCodes = gcodes_1.gcodeData.filter(g => !!g.deprecated);
+    const deprecatedCodes = gcodeData.filter(g => !!g.deprecated);
     const deprecatedCodeAlternation = deprecatedCodes.length > 0
         ? deprecatedCodes.map(g => g.code.replace(/[.\\$^*+?()[\]{}|]/g, "\\$&")).join("|")
         : null;
@@ -1471,7 +1458,7 @@ function attachGcodeDeprecationDecorations(editor) {
             for (let i = 0; i < codeOccurrences.length; i++) {
                 const occ = codeOccurrences[i];
                 const canonical = occ.code[0].toUpperCase() + occ.code.substring(1);
-                const info = (0, gcodes_1.findGcode)(canonical);
+                const info = findGcode(canonical);
                 if (!info) {
                     continue;
                 }
@@ -1566,7 +1553,7 @@ function installDeprecatedCodeStyle() {
  * the normalised path is present in the deprecations map shipped by @duet3d/objectmodel. Re-runs on every
  * content change; hover tooltip carries the deprecation reason.
  */
-function attachObjectModelDeprecationDecorations(editor) {
+export function attachObjectModelDeprecationDecorations(editor) {
     // Identifier chain with at least one `.` or `[n]` step. Non-greedy on boundaries so adjacent text
     // (e.g. trailing brackets / punctuation) isn't consumed
     const chainRegex = /[A-Za-z_][\w]*(?:\.[A-Za-z_][\w]*|\[\d+\])+/g;
@@ -1577,7 +1564,7 @@ function attachObjectModelDeprecationDecorations(editor) {
             chainRegex.lastIndex = 0;
             let m;
             while ((m = chainRegex.exec(text)) !== null) {
-                const deprecation = (0, deprecations_1.getPathDeprecation)(m[0]);
+                const deprecation = getPathDeprecation(m[0]);
                 if (deprecation === null) {
                     continue;
                 }

package/dist/register.d.ts

@@ -1,4 +1,4 @@
-import type * as monaco from "monaco-editor/esm/vs/editor/editor.api";
+import type * as monaco from "monaco-editor/esm/vs/editor/editor.api.js";
 /**
  * Register all Duet-specific languages (gcode-fdm, gcode-cnc, stm32, menu) with a Monaco instance,
  * attaching their tokenizers, language configurations, and (for gcode) completion + hover providers.

package/dist/register.js

@@ -1,13 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerDuetLanguages = registerDuetLanguages;
-exports.attachGcodeFeatures = attachGcodeFeatures;
-const monaco_gcode_1 = require("./monaco-gcode");
-const monaco_stm32_1 = require("./monaco-stm32");
-const monaco_menu_1 = require("./monaco-menu");
-const providers_1 = require("./providers");
-const local_variables_1 = require("./gcodes/local-variables");
-const search_1 = require("./gcodes/search");
+import { gcodeFDMLanguage, gcodeCNCLanguage, gcodeLanguageConfiguration } from "./monaco-gcode";
+import { stm32Language, stm32LanguageConfiguration } from "./monaco-stm32";
+import { menuLanguage, menuLanguageConfiguration } from "./monaco-menu";
+import { registerDuetProviders, attachGcodeSignatureHelpWatcher, attachGcodeDeprecationDecorations, attachObjectModelDeprecationDecorations } from "./providers";
+import { attachLocalVariableScanner } from "./gcodes/local-variables";
+import { addGcodeSearchAction } from "./gcodes/search";
 /**
  * Override Monaco's built-in `vs` and `vs-dark` themes to map the tokens our tokenizer emits to VSCode's
  * TextMate-scope colours (Monaco standalone's defaults otherwise lack a dedicated "function" colour). Called
@@ -37,21 +33,21 @@ function applyDuetThemeOverrides(monacoInstance) {
  * Register all Duet-specific languages (gcode-fdm, gcode-cnc, stm32, menu) with a Monaco instance,
  * attaching their tokenizers, language configurations, and (for gcode) completion + hover providers.
  */
-function registerDuetLanguages(monacoInstance) {
+export function registerDuetLanguages(monacoInstance) {
     monacoInstance.languages.register({ id: "gcode-fdm" });
-    monacoInstance.languages.setMonarchTokensProvider("gcode-fdm", monaco_gcode_1.gcodeFDMLanguage);
-    monacoInstance.languages.setLanguageConfiguration("gcode-fdm", monaco_gcode_1.gcodeLanguageConfiguration);
+    monacoInstance.languages.setMonarchTokensProvider("gcode-fdm", gcodeFDMLanguage);
+    monacoInstance.languages.setLanguageConfiguration("gcode-fdm", gcodeLanguageConfiguration);
     monacoInstance.languages.register({ id: "gcode-cnc" });
-    monacoInstance.languages.setMonarchTokensProvider("gcode-cnc", monaco_gcode_1.gcodeCNCLanguage);
-    monacoInstance.languages.setLanguageConfiguration("gcode-cnc", monaco_gcode_1.gcodeLanguageConfiguration);
+    monacoInstance.languages.setMonarchTokensProvider("gcode-cnc", gcodeCNCLanguage);
+    monacoInstance.languages.setLanguageConfiguration("gcode-cnc", gcodeLanguageConfiguration);
     monacoInstance.languages.register({ id: "stm32" });
-    monacoInstance.languages.setMonarchTokensProvider("stm32", monaco_stm32_1.stm32Language);
-    monacoInstance.languages.setLanguageConfiguration("stm32", monaco_stm32_1.stm32LanguageConfiguration);
+    monacoInstance.languages.setMonarchTokensProvider("stm32", stm32Language);
+    monacoInstance.languages.setLanguageConfiguration("stm32", stm32LanguageConfiguration);
     monacoInstance.languages.register({ id: "menu" });
-    monacoInstance.languages.setMonarchTokensProvider("menu", monaco_menu_1.menuLanguage);
-    monacoInstance.languages.setLanguageConfiguration("menu", monaco_menu_1.menuLanguageConfiguration);
+    monacoInstance.languages.setMonarchTokensProvider("menu", menuLanguage);
+    monacoInstance.languages.setLanguageConfiguration("menu", menuLanguageConfiguration);
     applyDuetThemeOverrides(monacoInstance);
-    return (0, providers_1.registerDuetProviders)(monacoInstance);
+    return registerDuetProviders(monacoInstance);
 }
 /**
  * Wire up every per-editor Gcode feature in one call: the search action, signature-help watcher, deprecation
@@ -59,13 +55,13 @@ function registerDuetLanguages(monacoInstance) {
  * replace the separate attach/add calls at the call site. Returns a single IDisposable that releases all of
  * them when disposed.
  */
-function attachGcodeFeatures(monacoInstance, editor) {
+export function attachGcodeFeatures(monacoInstance, editor) {
     const disposables = [
-        (0, search_1.addGcodeSearchAction)(monacoInstance, editor),
-        (0, providers_1.attachGcodeSignatureHelpWatcher)(editor),
-        (0, providers_1.attachGcodeDeprecationDecorations)(editor),
-        (0, providers_1.attachObjectModelDeprecationDecorations)(editor),
-        (0, local_variables_1.attachLocalVariableScanner)(editor)
+        addGcodeSearchAction(monacoInstance, editor),
+        attachGcodeSignatureHelpWatcher(editor),
+        attachGcodeDeprecationDecorations(editor),
+        attachObjectModelDeprecationDecorations(editor),
+        attachLocalVariableScanner(editor)
     ];
     return {
         dispose() {

package/package.json

@@ -1,9 +1,16 @@
 {
   "name": "@duet3d/monacotokens",
-  "version": "3.7.0-alpha.6",
+  "version": "3.7.0-alpha.8",
   "description": "TypeScript library that holds syntax highlighting files for the Monaco editor",
+  "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    }
+  },
   "scripts": {
     "build": "tsc",
     "prepublishOnly": "npm run build"
@@ -19,13 +26,13 @@
   },
   "homepage": "https://github.com/Duet3D/MonacoTokens#readme",
   "devDependencies": {
-    "typescript": "^5.9.3"
+    "typescript": "^6.0.3"
   },
   "files": [
     "/dist"
   ],
   "dependencies": {
-    "@duet3d/objectmodel": "~3.7.0-alpha.6",
+    "@duet3d/objectmodel": "~3.7.0-alpha.8",
     "monaco-editor": "^0.55.1"
   }
 }