@fieldia/code 0.13.1 → 0.14.1

package/README.md

@@ -1,8 +1,9 @@
 # @fieldia/code
 
-A [Fieldia](https://fieldia.dev) JSON field in a code editor: CodeMirror 6,
-bundled with the package, so it works offline and loads only on pages that
-use it.
+[Fieldia](https://fieldia.dev) fields in a code editor: JSON, and text in
+any of 44 languages, coloured as you type. CodeMirror 6, installed with the
+package, so it works offline; each language's grammar loads only when a
+field uses it.
 
 ```sh
 npm install @fieldia/code
@@ -15,13 +16,51 @@ import { codeWidgets } from '@fieldia/code';
 mountViewer(host, { page, dataSource, widgets: codeWidgets });
 ```
 
-A json node opts in with `"widget": "code"`; others keep the plain JSON box.
+A node opts in with `"widget": "code"`; others keep their plain box.
 In React pass `widgets={codeWidgets}`, in Vue `:widgets="codeWidgets"`, in
 Angular `[widgets]="codeWidgets"` (spread it beside `gridWidgets` to use both).
 
-- JSON highlighting, line numbers, bracket matching, undo.
-- Valid JSON reaches the form as it is typed; text that is not valid is said
-  so, and the last good value stays.
-- Tab still moves to the next field.
+## Code in a language
+
+On a `text` field (or a `char` field, kept to one line), name the language:
+
+```json
+{ "type": "field", "field": "script", "widget": "code", "options": { "language": "python" } }
+```
+
+- JavaScript, TypeScript (and either with JSX), Python, SQL (and the
+  PostgreSQL, MySQL, SQLite and SQL Server dialects), HTML, CSS, XML, YAML,
+  Markdown, JSON, Java, C, C++, PHP, Rust and Go; and shell, PowerShell,
+  Ruby, Perl, Lua, R, Swift, Kotlin, C#, Scala, Dart, Dockerfile, TOML, INI,
+  diff, nginx, Protocol Buffers, Haskell, Clojure, Erlang, Groovy and Julia.
+  `CODE_LANGUAGES` lists them, each with its other names (`py`, `bash`,
+  `yml`, `c++`…); a name is read in any case.
+- Each grammar is a dynamic import of its own, so your bundler makes it a
+  file of its own: a page with one Python field loads Python's grammar and no
+  other.
+- A language not on the list, or none, is plain text.
+- What is typed reaches the form as text; an empty editor as nothing (null).
+
+## JSON
+
+On a `json` field, `"widget": "code"` edits the value as JSON: valid JSON
+reaches the form as it is typed; text that is not valid is said so, and the
+last good value stays.
+
+## Every editor
+
+- Line numbers, bracket matching, undo.
+- Tab moves to the next field, as in every field; Ctrl+] and Ctrl+[ indent.
+- Read-only when the field is; required, invalid and its messages said to
+  assistive technology, and named by the field's label.
+- Code reads left to right, on an Arabic page too.
+- Coloured in Fieldia's tokens: the box on the form's surface, comments in
+  its quiet words; keywords, strings and the rest in colours that read at
+  4.5:1 or more on every theme's surface, light and dark. Set your own with
+  the `--fd-code-keyword`, `--fd-code-string`, `--fd-code-literal`,
+  `--fd-code-function`, `--fd-code-type`, `--fd-code-tag` and
+  `--fd-code-property` tokens.
+
+For VS Code's editor instead, see `@fieldia/monaco`.
 
 MIT. CodeMirror is MIT too.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fieldia/code",
-  "version": "0.13.1",
-  "description": "Fieldia's JSON fields in a code editor: CodeMirror 6, bundled, so it works offline.",
+  "version": "0.14.1",
+  "description": "Fieldia fields in a code editor: JSON, and text in 44 languages from Python to SQL. CodeMirror 6, each grammar loaded only when a field uses it.",
   "license": "MIT",
   "homepage": "https://fieldia.dev",
   "type": "commonjs",
@@ -22,13 +22,28 @@
   },
   "dependencies": {
     "@codemirror/commands": "^6.11.1",
+    "@codemirror/lang-cpp": "^6.0.3",
+    "@codemirror/lang-css": "^6.3.1",
+    "@codemirror/lang-go": "^6.0.1",
+    "@codemirror/lang-html": "^6.4.12",
+    "@codemirror/lang-java": "^6.0.2",
+    "@codemirror/lang-javascript": "^6.2.5",
     "@codemirror/lang-json": "^6.0.2",
+    "@codemirror/lang-markdown": "^6.5.2",
+    "@codemirror/lang-php": "^6.0.2",
+    "@codemirror/lang-python": "^6.2.1",
+    "@codemirror/lang-rust": "^6.0.2",
+    "@codemirror/lang-sql": "^6.10.0",
+    "@codemirror/lang-xml": "^6.1.0",
+    "@codemirror/lang-yaml": "^6.1.3",
     "@codemirror/language": ">=6.12.4 <6.13.0 || >=6.13.1 <7.0.0",
+    "@codemirror/legacy-modes": "^6.5.4",
     "@codemirror/lint": "^6.9.7",
     "@codemirror/state": "^6.7.6",
     "@codemirror/view": "^6.43.13",
-    "@fieldia/core": "0.13.1",
-    "@fieldia/widgets": "0.13.1",
+    "@fieldia/core": "0.14.1",
+    "@fieldia/widgets": "0.14.1",
+    "@lezer/highlight": "^1.2.5",
     "tslib": "^2.8.1"
   },
   "sideEffects": false,

package/src/index.d.mts

@@ -1,2 +1,4 @@
 export * from './lib/code.mjs';
 export * from './lib/styles.mjs';
+export * from './lib/languages.mjs';
+export * from './lib/palette.mjs';

package/src/index.d.ts

@@ -1,2 +1,4 @@
 export * from './lib/code';
 export * from './lib/styles';
+export * from './lib/languages';
+export * from './lib/palette';

package/src/index.js

@@ -3,4 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./lib/code"), exports);
 tslib_1.__exportStar(require("./lib/styles"), exports);
+tslib_1.__exportStar(require("./lib/languages"), exports);
+tslib_1.__exportStar(require("./lib/palette"), exports);
 //# sourceMappingURL=index.js.map

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/code/src/index.ts"],"names":[],"mappings":";;;AAAA,qDAA2B;AAC3B,uDAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/code/src/index.ts"],"names":[],"mappings":";;;AAAA,qDAA2B;AAC3B,uDAA6B;AAC7B,0DAAgC;AAChC,wDAA8B"}

package/src/index.mjs

@@ -1,3 +1,5 @@
 export * from './lib/code.mjs';
 export * from './lib/styles.mjs';
+export * from './lib/languages.mjs';
+export * from './lib/palette.mjs';
 //# sourceMappingURL=index.mjs.map

package/src/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../../../libs/code/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../../../libs/code/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC"}

package/src/lib/code.d.mts

@@ -1,4 +1,9 @@
 import { type WidgetFactory } from '@fieldia/widgets';
+export { textCodeWidget } from './text-code.mjs';
 export declare const codeWidget: WidgetFactory;
-/** Pass these to the viewer (`widgets`) to show json nodes marked `"widget": "code"` in the editor. */
+/**
+ * Pass these to the viewer (`widgets`) to show nodes marked `"widget": "code"`
+ * in the editor: json as JSON, text and char in the language the node names
+ * (`"options": { "language": "python" }`).
+ */
 export declare const codeWidgets: Record<string, WidgetFactory>;

package/src/lib/code.d.ts

@@ -1,4 +1,9 @@
 import { type WidgetFactory } from '@fieldia/widgets';
+export { textCodeWidget } from './text-code';
 export declare const codeWidget: WidgetFactory;
-/** Pass these to the viewer (`widgets`) to show json nodes marked `"widget": "code"` in the editor. */
+/**
+ * Pass these to the viewer (`widgets`) to show nodes marked `"widget": "code"`
+ * in the editor: json as JSON, text and char in the language the node names
+ * (`"options": { "language": "python" }`).
+ */
 export declare const codeWidgets: Record<string, WidgetFactory>;

package/src/lib/code.js

@@ -1,13 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.codeWidgets = exports.codeWidget = void 0;
+exports.codeWidgets = exports.codeWidget = exports.textCodeWidget = void 0;
 const commands_1 = require("@codemirror/commands");
 const lang_json_1 = require("@codemirror/lang-json");
 const language_1 = require("@codemirror/language");
 const state_1 = require("@codemirror/state");
 const view_1 = require("@codemirror/view");
 const widgets_1 = require("@fieldia/widgets");
+const palette_1 = require("./palette");
 const styles_1 = require("./styles");
+const text_code_1 = require("./text-code");
+var text_code_2 = require("./text-code");
+Object.defineProperty(exports, "textCodeWidget", { enumerable: true, get: function () { return text_code_2.textCodeWidget; } });
 /**
  * A JSON field in a code editor: CodeMirror 6, bundled with the package, so it
  * works offline and loads only on pages that ask for it (`"widget": "code"` on
@@ -27,15 +31,50 @@ function read(text) {
         return undefined;
     }
 }
+/** Where the JSON went wrong, marked: its line shaded, the character that cannot be there underlined. Null takes the marks away. */
+const markProblem = state_1.StateEffect.define();
+const problemMarks = state_1.StateField.define({
+    create: () => view_1.Decoration.none,
+    update(marks, tr) {
+        let next = marks.map(tr.changes);
+        for (const effect of tr.effects) {
+            if (!effect.is(markProblem))
+                continue;
+            if (effect.value === null) {
+                next = view_1.Decoration.none;
+                continue;
+            }
+            const at = Math.min(effect.value, tr.state.doc.length);
+            const line = tr.state.doc.lineAt(at);
+            const ranges = [view_1.Decoration.line({ class: 'fd-code-bad-line' }).range(line.from)];
+            if (at < line.to)
+                ranges.push(view_1.Decoration.mark({ class: 'fd-code-bad-spot' }).range(at, at + 1));
+            next = view_1.Decoration.set(ranges, true);
+        }
+        return next;
+    },
+    provide: (field) => view_1.EditorView.decorations.from(field),
+});
+/** How long typing pauses before a problem is said: not at every key of a word half typed. */
+const SETTLE_MS = 500;
 const codeWidget = ({ form, name, id, document, labels = widgets_1.WIDGET_LABELS.en }) => {
     (0, styles_1.installCodeStyles)(document);
     const element = document.createElement('div');
     element.className = 'fd-code';
+    // JSON reads left to right, on an Arabic page too: drawn right to left, its punctuation moves.
+    element.dir = 'ltr';
     const error = document.createElement('div');
     error.className = 'fd-error fd-code-error';
+    error.id = `${id}-json-problem`;
+    // In the page's language, though the code above it reads left to right: an Arabic message reads right to left.
+    error.dir = 'auto';
     error.setAttribute('role', 'alert');
     error.textContent = labels.invalidJson;
     error.hidden = true;
+    /** The field's own help and error, from the form. */
+    let described = '';
+    let invalidByForm = false;
+    let saying;
     const editable = new state_1.Compartment();
     /** What the form holds, as last written or shown: an echo of it is not a change. */
     let known = JSON.stringify(form.getState().values[name] ?? null);
@@ -49,8 +88,10 @@ const codeWidget = ({ form, name, id, document, labels = widgets_1.WIDGET_LABELS
                 (0, commands_1.history)(),
                 (0, language_1.bracketMatching)(),
                 (0, language_1.indentOnInput)(),
-                (0, language_1.syntaxHighlighting)(language_1.defaultHighlightStyle, { fallback: true }),
+                // The code colours, light or dark with the page: CodeMirror's own are for light pages only.
+                (0, language_1.syntaxHighlighting)(palette_1.codeHighlightStyle),
                 (0, lang_json_1.json)(),
+                problemMarks,
                 view_1.keymap.of([...commands_1.defaultKeymap, ...commands_1.historyKeymap]),
                 editable.of([view_1.EditorView.editable.of(true), state_1.EditorState.readOnly.of(false)]),
                 // Named by the field's label, like every other field.
@@ -58,12 +99,15 @@ const codeWidget = ({ form, name, id, document, labels = widgets_1.WIDGET_LABELS
                 view_1.EditorView.updateListener.of((update) => {
                     if (!update.docChanged || writing)
                         return;
-                    const parsed = read(update.state.doc.toString());
-                    const valid = parsed !== undefined;
-                    error.hidden = valid;
-                    view.contentDOM.setAttribute('aria-invalid', String(!valid));
-                    if (!valid)
+                    const text = update.state.doc.toString();
+                    const parsed = read(text);
+                    clearTimeout(saying);
+                    if (parsed === undefined) {
+                        // Said, and marked where it breaks, once typing pauses.
+                        saying = setTimeout(() => say((0, widgets_1.jsonProblem)(text)), SETTLE_MS);
                         return;
+                    }
+                    queueMicrotask(() => say(null));
                     known = JSON.stringify(parsed);
                     form.setValue(name, parsed);
                 }),
@@ -71,14 +115,38 @@ const codeWidget = ({ form, name, id, document, labels = widgets_1.WIDGET_LABELS
         }),
     });
     element.append(error);
+    /** Says where the JSON goes wrong, or that nothing does: under the editor, in it, and to assistive technology. */
+    function say(problem) {
+        error.hidden = !problem;
+        if (problem)
+            error.textContent = labels.invalidJsonAt.replace('{line}', String(problem.line)).replace('{column}', String(problem.column));
+        view.dispatch({ effects: markProblem.of(problem ? problem.offset : null) });
+        describe();
+    }
+    function describe() {
+        const content = view.contentDOM;
+        content.setAttribute('aria-invalid', String(invalidByForm || !error.hidden));
+        const ids = [described, error.hidden ? '' : error.id].filter(Boolean).join(' ');
+        if (ids)
+            content.setAttribute('aria-describedby', ids);
+        else
+            content.removeAttribute('aria-describedby');
+    }
     return {
         element,
         focus: () => view.focus(),
-        destroy: () => view.destroy(),
+        destroy: () => {
+            clearTimeout(saying);
+            view.destroy();
+        },
         update(state) {
             view.dispatch({
                 effects: editable.reconfigure([view_1.EditorView.editable.of(!state.readonly), state_1.EditorState.readOnly.of(state.readonly)]),
             });
+            described = state.describedBy ?? '';
+            invalidByForm = state.invalid;
+            view.contentDOM.setAttribute('aria-required', String(state.required));
+            describe();
             // A value from elsewhere (loaded, discarded) replaces the text; the echo of what was typed does not.
             const incoming = JSON.stringify(state.value ?? null);
             if (incoming === known)
@@ -87,12 +155,16 @@ const codeWidget = ({ form, name, id, document, labels = widgets_1.WIDGET_LABELS
             writing = true;
             view.dispatch({ changes: { from: 0, to: view.state.doc.length, insert: show(state.value) } });
             writing = false;
-            error.hidden = true;
-            view.contentDOM.setAttribute('aria-invalid', 'false');
+            clearTimeout(saying);
+            say(null);
         },
     };
 };
 exports.codeWidget = codeWidget;
-/** Pass these to the viewer (`widgets`) to show json nodes marked `"widget": "code"` in the editor. */
-exports.codeWidgets = { 'json.code': exports.codeWidget };
+/**
+ * Pass these to the viewer (`widgets`) to show nodes marked `"widget": "code"`
+ * in the editor: json as JSON, text and char in the language the node names
+ * (`"options": { "language": "python" }`).
+ */
+exports.codeWidgets = { 'json.code': exports.codeWidget, 'text.code': text_code_1.textCodeWidget, 'char.code': text_code_1.textCodeWidget };
 //# sourceMappingURL=code.js.map

package/src/lib/code.js.map

@@ -1 +1 @@
-{"version":3,"file":"code.js","sourceRoot":"","sources":["../../../../../libs/code/src/lib/code.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"code.js","sourceRoot":"","sources":["../../../../../libs/code/src/lib/code.ts"],"names":[],"mappings":"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"}

package/src/lib/code.mjs

@@ -1,10 +1,13 @@
 import { defaultKeymap, history, historyKeymap } from '@codemirror/commands';
 import { json } from '@codemirror/lang-json';
-import { bracketMatching, defaultHighlightStyle, indentOnInput, syntaxHighlighting } from '@codemirror/language';
-import { Compartment, EditorState } from '@codemirror/state';
-import { EditorView, keymap, lineNumbers } from '@codemirror/view';
-import { WIDGET_LABELS } from '@fieldia/widgets';
+import { bracketMatching, indentOnInput, syntaxHighlighting } from '@codemirror/language';
+import { Compartment, EditorState, StateEffect, StateField } from '@codemirror/state';
+import { Decoration, EditorView, keymap, lineNumbers } from '@codemirror/view';
+import { jsonProblem, WIDGET_LABELS } from '@fieldia/widgets';
+import { codeHighlightStyle } from './palette.mjs';
 import { installCodeStyles } from './styles.mjs';
+import { textCodeWidget } from './text-code.mjs';
+export { textCodeWidget } from './text-code.mjs';
 /**
  * A JSON field in a code editor: CodeMirror 6, bundled with the package, so it
  * works offline and loads only on pages that ask for it (`"widget": "code"` on
@@ -24,15 +27,50 @@ function read(text) {
         return undefined;
     }
 }
+/** Where the JSON went wrong, marked: its line shaded, the character that cannot be there underlined. Null takes the marks away. */
+const markProblem = StateEffect.define();
+const problemMarks = StateField.define({
+    create: () => Decoration.none,
+    update(marks, tr) {
+        let next = marks.map(tr.changes);
+        for (const effect of tr.effects) {
+            if (!effect.is(markProblem))
+                continue;
+            if (effect.value === null) {
+                next = Decoration.none;
+                continue;
+            }
+            const at = Math.min(effect.value, tr.state.doc.length);
+            const line = tr.state.doc.lineAt(at);
+            const ranges = [Decoration.line({ class: 'fd-code-bad-line' }).range(line.from)];
+            if (at < line.to)
+                ranges.push(Decoration.mark({ class: 'fd-code-bad-spot' }).range(at, at + 1));
+            next = Decoration.set(ranges, true);
+        }
+        return next;
+    },
+    provide: (field) => EditorView.decorations.from(field),
+});
+/** How long typing pauses before a problem is said: not at every key of a word half typed. */
+const SETTLE_MS = 500;
 export const codeWidget = ({ form, name, id, document, labels = WIDGET_LABELS.en }) => {
     installCodeStyles(document);
     const element = document.createElement('div');
     element.className = 'fd-code';
+    // JSON reads left to right, on an Arabic page too: drawn right to left, its punctuation moves.
+    element.dir = 'ltr';
     const error = document.createElement('div');
     error.className = 'fd-error fd-code-error';
+    error.id = `${id}-json-problem`;
+    // In the page's language, though the code above it reads left to right: an Arabic message reads right to left.
+    error.dir = 'auto';
     error.setAttribute('role', 'alert');
     error.textContent = labels.invalidJson;
     error.hidden = true;
+    /** The field's own help and error, from the form. */
+    let described = '';
+    let invalidByForm = false;
+    let saying;
     const editable = new Compartment();
     /** What the form holds, as last written or shown: an echo of it is not a change. */
     let known = JSON.stringify(form.getState().values[name] ?? null);
@@ -46,8 +84,10 @@ export const codeWidget = ({ form, name, id, document, labels = WIDGET_LABELS.en
                 history(),
                 bracketMatching(),
                 indentOnInput(),
-                syntaxHighlighting(defaultHighlightStyle, { fallback: true }),
+                // The code colours, light or dark with the page: CodeMirror's own are for light pages only.
+                syntaxHighlighting(codeHighlightStyle),
                 json(),
+                problemMarks,
                 keymap.of([...defaultKeymap, ...historyKeymap]),
                 editable.of([EditorView.editable.of(true), EditorState.readOnly.of(false)]),
                 // Named by the field's label, like every other field.
@@ -55,12 +95,15 @@ export const codeWidget = ({ form, name, id, document, labels = WIDGET_LABELS.en
                 EditorView.updateListener.of((update) => {
                     if (!update.docChanged || writing)
                         return;
-                    const parsed = read(update.state.doc.toString());
-                    const valid = parsed !== undefined;
-                    error.hidden = valid;
-                    view.contentDOM.setAttribute('aria-invalid', String(!valid));
-                    if (!valid)
+                    const text = update.state.doc.toString();
+                    const parsed = read(text);
+                    clearTimeout(saying);
+                    if (parsed === undefined) {
+                        // Said, and marked where it breaks, once typing pauses.
+                        saying = setTimeout(() => say(jsonProblem(text)), SETTLE_MS);
                         return;
+                    }
+                    queueMicrotask(() => say(null));
                     known = JSON.stringify(parsed);
                     form.setValue(name, parsed);
                 }),
@@ -68,14 +111,38 @@ export const codeWidget = ({ form, name, id, document, labels = WIDGET_LABELS.en
         }),
     });
     element.append(error);
+    /** Says where the JSON goes wrong, or that nothing does: under the editor, in it, and to assistive technology. */
+    function say(problem) {
+        error.hidden = !problem;
+        if (problem)
+            error.textContent = labels.invalidJsonAt.replace('{line}', String(problem.line)).replace('{column}', String(problem.column));
+        view.dispatch({ effects: markProblem.of(problem ? problem.offset : null) });
+        describe();
+    }
+    function describe() {
+        const content = view.contentDOM;
+        content.setAttribute('aria-invalid', String(invalidByForm || !error.hidden));
+        const ids = [described, error.hidden ? '' : error.id].filter(Boolean).join(' ');
+        if (ids)
+            content.setAttribute('aria-describedby', ids);
+        else
+            content.removeAttribute('aria-describedby');
+    }
     return {
         element,
         focus: () => view.focus(),
-        destroy: () => view.destroy(),
+        destroy: () => {
+            clearTimeout(saying);
+            view.destroy();
+        },
         update(state) {
             view.dispatch({
                 effects: editable.reconfigure([EditorView.editable.of(!state.readonly), EditorState.readOnly.of(state.readonly)]),
             });
+            described = state.describedBy ?? '';
+            invalidByForm = state.invalid;
+            view.contentDOM.setAttribute('aria-required', String(state.required));
+            describe();
             // A value from elsewhere (loaded, discarded) replaces the text; the echo of what was typed does not.
             const incoming = JSON.stringify(state.value ?? null);
             if (incoming === known)
@@ -84,11 +151,15 @@ export const codeWidget = ({ form, name, id, document, labels = WIDGET_LABELS.en
             writing = true;
             view.dispatch({ changes: { from: 0, to: view.state.doc.length, insert: show(state.value) } });
             writing = false;
-            error.hidden = true;
-            view.contentDOM.setAttribute('aria-invalid', 'false');
+            clearTimeout(saying);
+            say(null);
         },
     };
 };
-/** Pass these to the viewer (`widgets`) to show json nodes marked `"widget": "code"` in the editor. */
-export const codeWidgets = { 'json.code': codeWidget };
+/**
+ * Pass these to the viewer (`widgets`) to show nodes marked `"widget": "code"`
+ * in the editor: json as JSON, text and char in the language the node names
+ * (`"options": { "language": "python" }`).
+ */
+export const codeWidgets = { 'json.code': codeWidget, 'text.code': textCodeWidget, 'char.code': textCodeWidget };
 //# sourceMappingURL=code.mjs.map

package/src/lib/code.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"code.mjs","sourceRoot":"","sources":["../../../../../libs/code/src/lib/code.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"code.mjs","sourceRoot":"","sources":["../../../../../libs/code/src/lib/code.ts"],"names":[],"mappings":"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"}

package/src/lib/languages.d.mts

@@ -0,0 +1,25 @@
+import type { Extension } from '@codemirror/state';
+/**
+ * The languages a code field can be written in (`options.language`), each
+ * grammar loaded only when a field asks for it: a dynamic import of its own,
+ * so a bundler splits it off and a page with one Python field carries
+ * Python's grammar alone. A name this list does not know is plain text.
+ */
+export interface CodeLanguage {
+    /** The name a page gives it: `{ "widget": "code", "options": { "language": "python" } }`. */
+    id: string;
+    /** Its name as people know it. */
+    name: string;
+    /** Other names a page may give it: `py`, `bash`, `yml`. */
+    aliases: readonly string[];
+}
+/** Every language a code field can be written in, in the order a person picking one reads them. */
+export declare const CODE_LANGUAGES: readonly CodeLanguage[];
+/** The language a page names, by its id or another of its names, in any case; null for one not on the list. */
+export declare function codeLanguage(name: unknown): CodeLanguage | null;
+/**
+ * The grammar of the language a page names, ready for an editor: loaded the
+ * first time a field asks for it. Null for a language not on the list, and
+ * for one whose file could not be fetched — the field stays plain text.
+ */
+export declare function loadCodeLanguage(name: unknown): Promise<Extension | null>;

package/src/lib/languages.d.ts

@@ -0,0 +1,25 @@
+import type { Extension } from '@codemirror/state';
+/**
+ * The languages a code field can be written in (`options.language`), each
+ * grammar loaded only when a field asks for it: a dynamic import of its own,
+ * so a bundler splits it off and a page with one Python field carries
+ * Python's grammar alone. A name this list does not know is plain text.
+ */
+export interface CodeLanguage {
+    /** The name a page gives it: `{ "widget": "code", "options": { "language": "python" } }`. */
+    id: string;
+    /** Its name as people know it. */
+    name: string;
+    /** Other names a page may give it: `py`, `bash`, `yml`. */
+    aliases: readonly string[];
+}
+/** Every language a code field can be written in, in the order a person picking one reads them. */
+export declare const CODE_LANGUAGES: readonly CodeLanguage[];
+/** The language a page names, by its id or another of its names, in any case; null for one not on the list. */
+export declare function codeLanguage(name: unknown): CodeLanguage | null;
+/**
+ * The grammar of the language a page names, ready for an editor: loaded the
+ * first time a field asks for it. Null for a language not on the list, and
+ * for one whose file could not be fetched — the field stays plain text.
+ */
+export declare function loadCodeLanguage(name: unknown): Promise<Extension | null>;