@duet3d/monacotokens 3.7.0-alpha.1 → 3.7.0-alpha.2

package/dist/index.d.ts

@@ -1 +1,4 @@
 export * from "./monaco-gcode";
+export * from "./monaco-stm32";
+export * from "./monaco-menu";
+export * from "./register";

package/dist/index.js

@@ -15,3 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./monaco-gcode"), exports);
+__exportStar(require("./monaco-stm32"), exports);
+__exportStar(require("./monaco-menu"), exports);
+__exportStar(require("./register"), exports);

package/dist/monaco-gcode.d.ts

@@ -1,3 +1,4 @@
 import type * as monaco from "monaco-editor/esm/vs/editor/editor.api";
 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,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.gcodeCNCLanguage = exports.gcodeFDMLanguage = void 0;
+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
@@ -8,8 +8,8 @@ exports.gcodeCNCLanguage = exports.gcodeFDMLanguage = void 0;
 function generateMonarchLanguage(fdmMode) {
     return {
         consts: ["true", "false", "iterations", "line", "null", "pi", "result", "input"],
-        functions: ["abs", "acos", "asin", "atan", "atan2", "cos", "degrees", "exists", "fileexists", "fileread", "floor", "isnan", "max",
-            "min", "mod", "radians", "random", "sin", "square", "sqrt", "tan", "vector", "take", "drop", "find"],
+        functions: ["abs", "acos", "asin", "atan", "atan2", "ceil", "cos", "datetime", "degrees", "drop", "exists", "exp", "fileexists", "fileread",
+            "find", "floor", "isnan", "log", "max", "min", "mod", "pow", "radians", "random", "round", "sin", "sqrt", "square", "take", "tan", "vector"],
         keywords: ["abort", "echo", "if", "elif", "while", "set"],
         noArgKeywords: ["else", "break", "continue"],
         varKeywords: ["global", "var"],
@@ -18,6 +18,8 @@ function generateMonarchLanguage(fdmMode) {
         includeLF: true,
         tokenizer: {
             root: [
+                // line numbers
+                [/[nN]\d+/, "type"],
                 // G/M/T-codes
                 [/[gG][0123](?=\D)/, "keyword", fdmMode ? "normalGcode" : "moveGcode"],
                 [/[gGmM]\d+(\.\d+)?/, "keyword", "normalGcode"],
@@ -37,6 +39,7 @@ function generateMonarchLanguage(fdmMode) {
                 [/\d+/, "number"],
                 // strings
                 [/"(.|\"\")*?"/, "string"],
+                [/"[^"\n]*/, "invalid"],
                 // comments
                 [/;.*/, "comment"],
                 [/\(.*\)/, fdmMode ? "invalid" : "comment"]
@@ -47,8 +50,12 @@ function generateMonarchLanguage(fdmMode) {
                 [/[gGmM]\d+(\.\d*)?/, "keyword", "normalGcode"],
                 [/[tT](?=\{)/, "keyword", "normalGcodeWithT"],
                 [/[tT]-?\d+/, "keyword", "normalGcodeWithT"],
+                // checksums
+                [/\*\d+/, "type"],
                 // parameter letters
                 [/'?[a-zA-Z]/, "keyword"],
+                // unterminated expression (no closing brace before end of line)
+                [/\{(?![^\n]*\})/, "invalid", "@unterminatedCurly"],
                 // expressions
                 [/{/, "operator", "@curlyBracket"],
                 // enclosed comments
@@ -88,6 +95,9 @@ function generateMonarchLanguage(fdmMode) {
                             "@functions": "keyword"
                         }
                     }],
+                // unterminated nested expressions
+                [/\{(?![^\n]*\})/, "invalid", "@unterminatedCurly"],
+                [/\[(?![^\n]*\])/, "invalid", "@unterminatedSquare"],
                 // nested expressions
                 [/{/, "operator", "@curlyBracket"],
                 [/\[/, "operator", "@squareBracket"],
@@ -97,6 +107,7 @@ function generateMonarchLanguage(fdmMode) {
                 [/\d+/, "number"],
                 // strings and chars
                 [/"(.|\"\")*?"/, "string"],
+                [/"[^"\n]*/, "invalid"],
                 [/'.'/, "string"],
                 // operators
                 [/@symbols/, {
@@ -117,17 +128,30 @@ function generateMonarchLanguage(fdmMode) {
                 { include: "expression" }
             ],
             curlyBracket: [
+                // unterminated brace
+                [/\n/, "invalid", "@popall"],
                 // curly brackets contain expressions
                 { include: "expression" },
-                // terminate whern reaching a closing bracket
+                // terminate when reaching a closing bracket
                 [/}/, "operator", "@pop"],
             ],
             squareBracket: [
+                // unterminated bracket
+                [/\n/, "invalid", "@popall"],
                 // square brackets contain expressions
                 { include: "expression" },
-                // terminate whern reaching a closing bracket
+                // terminate when reaching a closing bracket
                 [/\]/, "operator", "@pop"],
             ],
+            unterminatedCurly: [
+                // color remainder of line as invalid, then pop
+                [/[^\n]+/, "invalid"],
+                [/\n/, "", "@popall"]
+            ],
+            unterminatedSquare: [
+                [/[^\n]+/, "invalid"],
+                [/\n/, "", "@popall"]
+            ],
             varName: [
                 // variable name
                 [/[a-zA-Z_$][\w$]*/, "variable.name", "@expression"],
@@ -139,3 +163,30 @@ function generateMonarchLanguage(fdmMode) {
 }
 exports.gcodeFDMLanguage = generateMonarchLanguage(true);
 exports.gcodeCNCLanguage = generateMonarchLanguage(false);
+exports.gcodeLanguageConfiguration = {
+    comments: {
+        lineComment: ";"
+    },
+    brackets: [
+        ["{", "}"],
+        ["[", "]"],
+        ["(", ")"]
+    ],
+    autoClosingPairs: [
+        { open: "{", close: "}" },
+        { open: "[", close: "]" },
+        { open: "(", close: ")" },
+        { open: "\"", close: "\"" }
+    ],
+    surroundingPairs: [
+        { open: "{", close: "}" },
+        { open: "[", close: "]" },
+        { open: "(", close: ")" },
+        { open: "\"", close: "\"" }
+    ],
+    // Python-style block indentation: pressing Enter after if/elif/else/while indents the next line one level deeper
+    indentationRules: {
+        increaseIndentPattern: /^\s*(if|elif|else|while)\b.*$/,
+        decreaseIndentPattern: /^\s*(break|continue)\b.*$/
+    }
+};

package/dist/monaco-menu.d.ts

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

package/dist/monaco-menu.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.menuLanguageConfiguration = exports.menuLanguage = void 0;
+exports.menuLanguage = {
+    keywords: ["image", "text", "button", "value", "alter", "files"],
+    symbols: /[=><!~?:&|+\-*#\/\^%]+/,
+    operators: ['*', '/', '+', '-', "==", "!=", '=', "<=", '<', ">=", ">>>", ">>", '>', '!', "&&", '&', "||", '|', '^', '?', ':'],
+    includeLF: true,
+    tokenizer: {
+        root: [
+            // keywords
+            [/[a-z_$][\w$]*/, {
+                    cases: {
+                        "@keywords": { token: "keyword" }
+                    }
+                }],
+            // numbers
+            [/\d*\.\d+([eE][\-+]?\d+)?/, "number.float"],
+            [/0[xX][0-9a-fA-F]+/, "number.hex"],
+            [/\d+/, "number"],
+            // strings
+            [/"(.|\"\")*?"/, "string"],
+            // comments
+            [/;.*/, "comment"],
+            // parameter letters
+            [/'?[A-Z]/, "keyword"],
+            [/'[a-z]/, "keyword"]
+        ]
+    }
+};
+exports.menuLanguageConfiguration = {
+    comments: {
+        lineComment: ";"
+    }
+};

package/dist/monaco-stm32.d.ts

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

package/dist/monaco-stm32.js

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stm32LanguageConfiguration = exports.stm32Language = void 0;
+exports.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"],
+    symbols: /[=><!~?:&|+\-*#\/\^%]+/,
+    operators: ['*', '/', '+', '-', "==", "!=", '=', "<=", '<', ">=", ">>>", ">>", '>', '!', "&&", '&', "||", '|', '^', '?', ':'],
+    includeLF: true,
+    tokenizer: {
+        root: [
+            // keywords
+            [/[a-zA-Z0-9_$][\w$]*/, {
+                    cases: {
+                        "@keywordsPrimary": { token: "keyword" },
+                        "@keywordsSecondary": { token: "keyword" },
+                        "@keywordsTertiary": { token: "keyword" }
+                    }
+                }],
+            // comments
+            [/\/\/.*/, "comment"],
+            [/;.*/, "comment"],
+            // expressions
+            [/{/, "operator", "@curlyBracket"],
+            // expressions
+            [/=/, "operator", "@equals"],
+        ],
+        expression: [
+            // numbers
+            [/\d+/, "number"],
+            // Pin Numbers
+            [/[a-iA-I]\.\d+/, "string"],
+            [/[a-iA-I]\_\d+/, "string"],
+            [/[a-iA-I]\d+/, "string"],
+            [/P[a-iA-I]\.\d+/, "string"],
+            [/P[a-iA-I]\_\d+/, "string"],
+            [/P[a-iA-I]\d+/, "string"],
+            [/NoPin/, "string"],
+            // strings
+            [/"(.|\"\")*?"/, "string"],
+            [/[a-zA-Z0-9_$][\w$]*/, "string"],
+            // operators
+            [/@symbols/, {
+                    cases: {
+                        "@operators": "operator",
+                        "@default": ""
+                    }
+                }],
+            // comments
+            [/;.*/, "comment"],
+            // EOL
+            [/\n/, "", "@popall"],
+        ],
+        curlyBracket: [
+            // curly brackets contain expressions
+            { include: "expression" },
+            // terminate when reaching a closing bracket
+            [/}/, "operator", "@pop"],
+        ],
+        equals: [
+            // curly brackets contain expressions
+            { include: "expression" },
+            // EOL
+            [/\n/, "", "@popall"],
+        ]
+    }
+};
+exports.stm32LanguageConfiguration = {
+    comments: {
+        lineComment: ";"
+    },
+    brackets: [
+        ["{", "}"]
+    ],
+    autoClosingPairs: [
+        { open: "{", close: "}" },
+        { open: "\"", close: "\"" }
+    ],
+    surroundingPairs: [
+        { open: "{", close: "}" },
+        { open: "\"", close: "\"" }
+    ]
+};

package/dist/register.d.ts

@@ -0,0 +1,6 @@
+import type * as monaco from "monaco-editor/esm/vs/editor/editor.api";
+/**
+ * Register all Duet-specific languages (gcode-fdm, gcode-cnc, STM32, menu)
+ * with a Monaco instance, attaching their tokenizers and language configurations.
+ */
+export declare function registerDuetLanguages(monacoInstance: typeof monaco): void;

package/dist/register.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerDuetLanguages = registerDuetLanguages;
+const monaco_gcode_1 = require("./monaco-gcode");
+const monaco_stm32_1 = require("./monaco-stm32");
+const monaco_menu_1 = require("./monaco-menu");
+/**
+ * Register all Duet-specific languages (gcode-fdm, gcode-cnc, STM32, menu)
+ * with a Monaco instance, attaching their tokenizers and language configurations.
+ */
+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.register({ id: "gcode-cnc" });
+    monacoInstance.languages.setMonarchTokensProvider("gcode-cnc", monaco_gcode_1.gcodeCNCLanguage);
+    monacoInstance.languages.setLanguageConfiguration("gcode-cnc", monaco_gcode_1.gcodeLanguageConfiguration);
+    monacoInstance.languages.register({ id: "STM32" });
+    monacoInstance.languages.setMonarchTokensProvider("STM32", monaco_stm32_1.stm32Language);
+    monacoInstance.languages.setLanguageConfiguration("STM32", monaco_stm32_1.stm32LanguageConfiguration);
+    monacoInstance.languages.register({ id: "menu" });
+    monacoInstance.languages.setMonarchTokensProvider("menu", monaco_menu_1.menuLanguage);
+    monacoInstance.languages.setLanguageConfiguration("menu", monaco_menu_1.menuLanguageConfiguration);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duet3d/monacotokens",
-  "version": "3.7.0-alpha.1",
+  "version": "3.7.0-alpha.2",
   "description": "TypeScript library that holds syntax highlighting files for the Monaco editor",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",