@bhsd/codemirror-mediawiki 2.31.0 → 3.0.1

package/dist/fold.d.ts

@@ -1,11 +1,14 @@
-import { StateField } from '@codemirror/state';
-import type { EditorView, Tooltip, Command } from '@codemirror/view';
-import type { EditorState, Extension } from '@codemirror/state';
+import { GutterMarker, ViewPlugin } from '@codemirror/view';
+import { RangeSet } from '@codemirror/state';
+import type { EditorView, Tooltip, ViewUpdate, BlockInfo, Command } from '@codemirror/view';
+import type { EditorState, StateEffect, Extension } from '@codemirror/state';
 import type { SyntaxNode, Tree } from '@lezer/common';
 export interface DocRange {
     from: number;
     to: number;
 }
+declare type AnchorUpdate = (pos: number, range: DocRange) => number;
+export declare const updateSelection: AnchorUpdate;
 /**
  * Update the stack of opening (+) or closing (-) brackets
  * @param state
@@ -20,12 +23,56 @@ export declare const braceStackUpdate: (state: EditorState, node: SyntaxNode) =>
  * @param refOnly 是否仅检查`<ref>`标签
  */
 export declare const foldable: (state: EditorState, posOrNode: number | SyntaxNode, tree?: Tree | null, refOnly?: boolean) => DocRange | false;
+/**
+ * 创建折叠提示
+ * @param state
+ */
+export declare const create: (state: EditorState) => Tooltip | null;
+/**
+ * 执行折叠
+ * @param view
+ * @param effects 折叠
+ * @param anchor 光标位置
+ */
+export declare const execute: (view: EditorView, effects: StateEffect<DocRange>[], anchor: number) => boolean;
+/**
+ * The rightmost position of all selections, to be updated with folding
+ * @param state
+ */
+export declare const getAnchor: (state: EditorState) => number;
+/**
+ * 折叠所有模板
+ * @param state
+ * @param tree 语法树
+ * @param effects 折叠
+ * @param node 语法树节点
+ * @param end 终止位置
+ * @param anchor 光标位置
+ * @param update 更新光标位置
+ * @param refOnly 是否仅检查`<ref>`标签
+ */
+export declare const traverse: (state: EditorState, tree: Tree, effects: StateEffect<DocRange>[], node: SyntaxNode | null, end: number, anchor: number, update: AnchorUpdate, refOnly?: boolean) => number;
+export declare class FoldMarker extends GutterMarker {
+    readonly open: boolean;
+    constructor(open: boolean);
+    eq(other: this): boolean;
+    toDOM({ state }: EditorView): HTMLSpanElement;
+}
+export declare const findFold: ({ state }: EditorView, line: BlockInfo) => DocRange | undefined;
 export declare const foldableLine: ({ state, viewport: { to: end }, viewportLineBlocks }: EditorView, { from: f, to: t }: DocRange) => DocRange | false;
+export declare const markers: ViewPlugin<{
+    markers: RangeSet<FoldMarker>;
+    update({ docChanged, viewportChanged, startState, state, view }: ViewUpdate): void;
+}, undefined>;
+/**
+ * 生成折叠命令
+ * @param refOnly 是否仅检查`<ref>`标签
+ */
+export declare const foldCommand: (refOnly?: boolean) => Command;
 export declare const foldRef: Command;
-declare const _default: [(e?: Extension | undefined) => Extension, {
-    mediawiki: (Extension | StateField<Tooltip | null>)[];
-}];
+declare const _default: [(e?: Extension | undefined) => Extension];
 export default _default;
+export declare const mediaWikiFold: Extension;
 /**
  * 点击提示折叠模板参数
  * @param view

package/dist/fold.js

@@ -4,19 +4,20 @@ import { syntaxTree, ensureSyntaxTree, foldEffect, unfoldEffect, foldedRanges, u
 import { getRegex } from '@bhsd/common';
 import { tokens } from './config';
 import { matchTag, getTag } from './matchTag';
-const getExtRegex = getRegex(tag => new RegExp(`mw-tag-${tag}(?![a-z])`, 'u'));
-const updateSelection = (pos, { to }) => Math.max(pos, to), updateAll = (pos, { from, to }) => from <= pos && to > pos ? to : pos;
+const getExtRegex = /* @__PURE__ */ getRegex(tag => new RegExp(`mw-tag-${tag}(?![a-z])`, 'u'));
+export const updateSelection = (pos, { to }) => Math.max(pos, to);
+const updateAll = (pos, { from, to }) => from <= pos && to > pos ? to : pos;
 /**
  * Check if a SyntaxNode is among the specified components
  * @param keys The keys of the tokens to check
  */
 const isComponent = (keys) => (node) => keys.some(key => node?.name.includes(tokens[key])), 
 /** Check if a SyntaxNode is a template bracket (`{{` or `}}`) */
-isTemplateBracket = isComponent(['templateBracket', 'parserFunctionBracket']), 
+isTemplateBracket = /* @__PURE__ */ isComponent(['templateBracket', 'parserFunctionBracket']), 
 /** Check if a SyntaxNode is a template name */
-isTemplateName = isComponent(['templateName', 'parserFunctionName']), 
+isTemplateName = /* @__PURE__ */ isComponent(['templateName', 'parserFunctionName']), 
 /** Check if a SyntaxNode is a template delimiter (`|` or `:`) */
-isDelimiter = isComponent(['templateDelimiter', 'parserFunctionDelimiter']), 
+isDelimiter = /* @__PURE__ */ isComponent(['templateDelimiter', 'parserFunctionDelimiter']), 
 /**
  * Check if a SyntaxNode is a template delimiter (`|` or `:`), excluding `subst:` and `safesubst:`
  * @param node SyntaxNode
@@ -28,7 +29,7 @@ isTemplateDelimiter = (node) => isDelimiter(node) && !isTemplateName(node.nextSi
  */
 isTemplate = (node) => /-(?:template|ext)[a-z\d-]+ground/u.test(node.name) && !isTemplateBracket(node), 
 /** Check if a SyntaxNode is an extension tag bracket (`<` or `>`) */
-isExtBracket = isComponent(['extTagBracket']), 
+isExtBracket = /* @__PURE__ */ isComponent(['extTagBracket']), 
 /**
  * Check if a SyntaxNode is part of a extension tag
  * @param node 语法树节点
@@ -144,7 +145,7 @@ export const foldable = (state, posOrNode, tree, refOnly = false) => {
  * 创建折叠提示
  * @param state
  */
-const create = (state) => {
+export const create = (state) => {
     const { selection: { main: { head } } } = state, range = foldable(state, head);
     if (range) {
         const { from, to } = range;
@@ -178,7 +179,7 @@ const create = (state) => {
  * @param effects 折叠
  * @param anchor 光标位置
  */
-const execute = (view, effects, anchor) => {
+export const execute = (view, effects, anchor) => {
     if (effects.length > 0) {
         view.dom.querySelector('.cm-tooltip-fold')?.remove();
         // Fold the template(s) and update the cursor position
@@ -191,7 +192,7 @@ const execute = (view, effects, anchor) => {
  * The rightmost position of all selections, to be updated with folding
  * @param state
  */
-const getAnchor = (state) => Math.max(...state.selection.ranges.map(({ to }) => to));
+export const getAnchor = (state) => Math.max(...state.selection.ranges.map(({ to }) => to));
 /**
  * 折叠所有模板
  * @param state
@@ -203,7 +204,7 @@ const getAnchor = (state) => Math.max(...state.selection.ranges.map(({ to }) =>
  * @param update 更新光标位置
  * @param refOnly 是否仅检查`<ref>`标签
  */
-const traverse = (state, tree, effects, node, end, anchor, update, refOnly) => {
+export const traverse = (state, tree, effects, node, end, anchor, update, refOnly) => {
     while (node && node.from <= end) {
         /* eslint-disable no-param-reassign */
         const range = foldable(state, node, tree, refOnly);
@@ -219,7 +220,7 @@ const traverse = (state, tree, effects, node, end, anchor, update, refOnly) => {
     }
     return anchor;
 };
-class FoldMarker extends GutterMarker {
+export class FoldMarker extends GutterMarker {
     constructor(open) {
         super();
         this.open = open;
@@ -234,8 +235,8 @@ class FoldMarker extends GutterMarker {
         return span;
     }
 }
-const canFold = new FoldMarker(true), canUnfold = new FoldMarker(false);
-const findFold = ({ state }, line) => {
+const canFold = /* @__PURE__ */ new FoldMarker(true), canUnfold = /* @__PURE__ */ new FoldMarker(false);
+export const findFold = ({ state }, line) => {
     let found;
     state.field(foldState, false)?.between(line.from, line.to, (from, to) => {
         if (!found && to === line.to) {
@@ -309,7 +310,7 @@ const buildMarkers = (view) => {
     }
     return builder.finish();
 };
-const markers = ViewPlugin.fromClass(class {
+export const markers = /* @__PURE__ */ ViewPlugin.fromClass(class {
     constructor(view) {
         this.markers = buildMarkers(view);
     }
@@ -328,129 +329,125 @@ const defaultFoldExtension = [foldGutter(), keymap.of(foldKeymap)];
  * 生成折叠命令
  * @param refOnly 是否仅检查`<ref>`标签
  */
-const foldCommand = (refOnly) => view => {
+export const foldCommand = (refOnly) => view => {
     const { state } = view, tree = syntaxTree(state), effects = [], anchor = traverse(state, tree, effects, tree.topNode.firstChild, Infinity, getAnchor(state), updateAll, refOnly);
     return execute(view, effects, anchor);
 };
-export const foldRef = foldCommand(true);
-export default [
-    (e = defaultFoldExtension) => e,
-    {
-        mediawiki: [
-            codeFolding({
-                placeholderDOM(view) {
-                    const element = document.createElement('span');
-                    element.textContent = '…';
-                    element.setAttribute('aria-label', 'folded code');
-                    element.title = view.state.phrase('unfold');
-                    element.className = 'cm-foldPlaceholder';
-                    element.addEventListener('click', ({ target }) => {
-                        const pos = view.posAtDOM(target), { state } = view, { selection } = state;
-                        foldedRanges(state).between(pos, pos, (from, to) => {
-                            if (from === pos) {
-                                // Unfold the template and redraw the selections
-                                view.dispatch({ effects: unfoldEffect.of({ from, to }), selection });
-                            }
-                        });
-                    });
-                    return element;
-                },
-            }),
-            /** @see https://codemirror.net/examples/tooltip/ */
-            StateField.define({
-                create,
-                update(tooltip, { state, docChanged, selection }) {
-                    if (docChanged) {
-                        return null;
+export const foldRef = /* @__PURE__ */ foldCommand(true);
+export default [(e = defaultFoldExtension) => e];
+export const mediaWikiFold = /* @__PURE__ */ (() => [
+    codeFolding({
+        placeholderDOM(view) {
+            const element = document.createElement('span');
+            element.textContent = '…';
+            element.setAttribute('aria-label', 'folded code');
+            element.title = view.state.phrase('unfold');
+            element.className = 'cm-foldPlaceholder';
+            element.addEventListener('click', ({ target }) => {
+                const pos = view.posAtDOM(target), { state } = view, { selection } = state;
+                foldedRanges(state).between(pos, pos, (from, to) => {
+                    if (from === pos) {
+                        // Unfold the template and redraw the selections
+                        view.dispatch({ effects: unfoldEffect.of({ from, to }), selection });
                     }
-                    return selection ? create(state) : tooltip;
-                },
-                provide(f) {
-                    return showTooltip.from(f);
-                },
-            }),
-            keymap.of([
-                {
-                    // Fold the template at the selection/cursor
-                    key: 'Ctrl-Shift-[',
-                    mac: 'Cmd-Alt-[',
-                    run(view) {
-                        const { state } = view, tree = syntaxTree(state), effects = [];
-                        let anchor = getAnchor(state);
-                        for (const { from, to, empty } of state.selection.ranges) {
-                            let node;
-                            if (empty) {
-                                // No selection, try both sides of the cursor position
-                                node = tree.resolve(from, -1);
-                            }
-                            if (!node || node.name === 'Document') {
-                                node = tree.resolve(from, 1);
-                            }
-                            anchor = traverse(state, tree, effects, node, to, anchor, updateSelection);
-                        }
-                        return execute(view, effects, anchor);
-                    },
-                },
-                {
-                    // Fold all templates in the document
-                    key: 'Ctrl-Alt-[',
-                    run: foldCommand(),
-                },
-                {
-                    // Fold all `<ref>` tags in the document
-                    key: 'Mod-Alt-,',
-                    run: foldRef,
-                },
-                {
-                    // Unfold the template at the selection/cursor
-                    key: 'Ctrl-Shift-]',
-                    mac: 'Cmd-Alt-]',
-                    run(view) {
-                        const { state } = view, { selection } = state, effects = [], folded = foldedRanges(state);
-                        for (const { from, to } of selection.ranges) {
-                            // Unfold any folded range at the selection
-                            folded.between(from, to, (i, j) => {
-                                effects.push(unfoldEffect.of({ from: i, to: j }));
-                            });
-                        }
-                        if (effects.length > 0) {
-                            // Unfold the template(s) and redraw the selections
-                            view.dispatch({ effects, selection });
-                            return true;
-                        }
-                        return false;
-                    },
-                },
-                { key: 'Ctrl-Alt-]', run: unfoldAll },
-            ]),
-            markers,
-            gutter({
-                class: 'cm-foldGutter',
-                markers(view) {
-                    return view.plugin(markers)?.markers ?? RangeSet.empty;
-                },
-                initialSpacer() {
-                    return new FoldMarker(false);
-                },
-                domEventHandlers: {
-                    click(view, line) {
-                        const folded = findFold(view, line);
-                        if (folded) {
-                            view.dispatch({ effects: unfoldEffect.of(folded) });
-                            return true;
-                        }
-                        const range = foldableLine(view, line);
-                        if (range) {
-                            view.dispatch({ effects: foldEffect.of(range) });
-                            return true;
-                        }
-                        return false;
-                    },
-                },
-            }),
-        ],
-    },
-];
+                });
+            });
+            return element;
+        },
+    }),
+    /** @see https://codemirror.net/examples/tooltip/ */
+    StateField.define({
+        create,
+        update(tooltip, { state, docChanged, selection }) {
+            if (docChanged) {
+                return null;
+            }
+            return selection ? create(state) : tooltip;
+        },
+        provide(f) {
+            return showTooltip.from(f);
+        },
+    }),
+    keymap.of([
+        {
+            // Fold the template at the selection/cursor
+            key: 'Ctrl-Shift-[',
+            mac: 'Cmd-Alt-[',
+            run(view) {
+                const { state } = view, tree = syntaxTree(state), effects = [];
+                let anchor = getAnchor(state);
+                for (const { from, to, empty } of state.selection.ranges) {
+                    let node;
+                    if (empty) {
+                        // No selection, try both sides of the cursor position
+                        node = tree.resolve(from, -1);
+                    }
+                    if (!node || node.name === 'Document') {
+                        node = tree.resolve(from, 1);
+                    }
+                    anchor = traverse(state, tree, effects, node, to, anchor, updateSelection);
+                }
+                return execute(view, effects, anchor);
+            },
+        },
+        {
+            // Fold all templates in the document
+            key: 'Ctrl-Alt-[',
+            run: foldCommand(),
+        },
+        {
+            // Fold all `<ref>` tags in the document
+            key: 'Mod-Alt-,',
+            run: foldRef,
+        },
+        {
+            // Unfold the template at the selection/cursor
+            key: 'Ctrl-Shift-]',
+            mac: 'Cmd-Alt-]',
+            run(view) {
+                const { state } = view, { selection } = state, effects = [], folded = foldedRanges(state);
+                for (const { from, to } of selection.ranges) {
+                    // Unfold any folded range at the selection
+                    folded.between(from, to, (i, j) => {
+                        effects.push(unfoldEffect.of({ from: i, to: j }));
+                    });
+                }
+                if (effects.length > 0) {
+                    // Unfold the template(s) and redraw the selections
+                    view.dispatch({ effects, selection });
+                    return true;
+                }
+                return false;
+            },
+        },
+        { key: 'Ctrl-Alt-]', run: unfoldAll },
+    ]),
+    markers,
+    gutter({
+        class: 'cm-foldGutter',
+        markers(view) {
+            return view.plugin(markers)?.markers ?? RangeSet.empty;
+        },
+        initialSpacer() {
+            return new FoldMarker(false);
+        },
+        domEventHandlers: {
+            click(view, line) {
+                const folded = findFold(view, line);
+                if (folded) {
+                    view.dispatch({ effects: unfoldEffect.of(folded) });
+                    return true;
+                }
+                const range = foldableLine(view, line);
+                if (range) {
+                    view.dispatch({ effects: foldEffect.of(range) });
+                    return true;
+                }
+                return false;
+            },
+        },
+    }),
+])();
 /**
  * 点击提示折叠模板参数
  * @param view

package/dist/indent.d.ts

@@ -1,4 +1,8 @@
-import type { Text } from '@codemirror/state';
+import type { Text as TextBase } from '@codemirror/state';
+export interface Text extends TextBase {
+    children: readonly Text[] | null;
+    text?: string[];
+}
 /**
  * 检测文本的缩进方式
  * @param text 文本内容

package/dist/indent.js

@@ -1,4 +1,5 @@
 const noDetectionLangs = new Set(['plain', 'mediawiki', 'html']);
+const getLines = (text) => text.children?.flatMap(getLines) ?? text.text;
 /**
  * 检测文本的缩进方式
  * @param text 文本内容
@@ -9,7 +10,7 @@ export const detectIndent = (text, defaultIndent, lang) => {
     if (noDetectionLangs.has(lang)) {
         return defaultIndent;
     }
-    const lineSpaces = [], lines = typeof text === 'string' ? text.split('\n') : text.text;
+    const lineSpaces = [], lines = typeof text === 'string' ? text.split('\n') : getLines(text);
     let tabLines = 0;
     for (const line of lines) {
         if (!line.trim()) {

package/dist/javascript.d.ts

@@ -1,3 +1,4 @@
 import type { Extension } from '@codemirror/state';
+export declare const jsCompletion: Extension;
 declare const _default: () => Extension;
 export default _default;

package/dist/javascript.js

@@ -1,5 +1,3 @@
 import { javascript as js, javascriptLanguage, scopeCompletionSource } from '@codemirror/lang-javascript';
-export default () => [
-    js(),
-    javascriptLanguage.data.of({ autocomplete: scopeCompletionSource(globalThis) }),
-];
+export const jsCompletion = javascriptLanguage.data.of({ autocomplete: scopeCompletionSource(globalThis) });
+export default () => [js(), jsCompletion];

package/dist/keybindings.js

@@ -2,6 +2,7 @@ export const keybindings = [
     { key: 'Ctrl-8', pre: '<blockquote>', post: '</blockquote>', desc: 'blockquote' },
     { key: 'Mod-.', pre: '<sup>', post: '</sup>', desc: 'sup' },
     { key: 'Mod-,', pre: '<sub>', post: '</sub>', desc: 'sub' },
+    { key: 'Ctrl-,', pre: '<sub>', post: '</sub>', desc: 'sub' },
     { key: 'Mod-Shift-6', pre: '<code>', post: '</code>', desc: 'code' },
     { key: 'Ctrl-Shift-5', pre: '<s>', post: '</s>', desc: 's' },
     { key: 'Mod-u', pre: '<u>', post: '</u>', desc: 'u' },

package/dist/linter.js

@@ -5,14 +5,34 @@ import { styleLint } from '@bhsd/stylelint-util';
 /**
  * 计算位置
  * @param range 范围
- * @param line 行号
- * @param column 列号
+ * @param lineOrOffset 行号或相对位置
+ * @param columnOrPrefix 列号或前缀
  */
-const offsetAt = (range, line, column) => {
-    if (line === -2) {
+const offsetAt = (range, lineOrOffset, columnOrPrefix) => {
+    if (typeof columnOrPrefix === 'string') {
+        return Math.min(range[1], range[0] + Math.max(0, lineOrOffset - columnOrPrefix.length));
+    }
+    else if (lineOrOffset === -2) {
         return range[0];
     }
-    return line === 0 ? range[1] : range[0] + column;
+    return lineOrOffset === 0 ? range[1] : range[0] + columnOrPrefix;
+};
+/**
+ * 获取伪CSS代码块的前缀
+ * @param token AST 节点
+ * @param token.type 节点类型
+ * @param token.tag 节点标签
+ * @param i 节点序号
+ */
+const getPrefix = ({ type, tag }, i) => `${type === 'ext-attr' ? 'div' : tag}#${i}{\n`;
+/**
+ * 将偏移量转换为位置
+ * @param code 代码字符串
+ * @param index 偏移量
+ */
+const indexToPos = (code, index) => {
+    const lines = code.slice(0, index).split('\n');
+    return { line: lines.length - 1, character: lines[lines.length - 1].length };
 };
 /**
  * 获取 Wikitext LSP
@@ -30,9 +50,9 @@ export const getWikiLinter = async (opt, obj) => {
         const cssLint = await getCssLinter();
         return [
             ...diagnostics,
-            ...(await cssLint(tokens.map(({ childNodes, type, tag }, i) => `${type === 'ext-attr' ? 'div' : tag}#${i}{\n${sanitizeInlineStyle(childNodes[1].childNodes[0].data)
-                .replace(/\n/gu, ' ')}\n}`).join('\n'), config?.['css'])).map(({ line, column, endLine, endColumn, rule, severity, text: message }) => {
-                const i = Math.ceil(line / 3), { range } = tokens[i - 1].childNodes[1].childNodes[0], from = offsetAt(range, line - 3 * i, column - 1);
+            ...(await cssLint(tokens.map((token, i) => `${getPrefix(token, i)}${sanitizeInlineStyle(token.childNodes[1].childNodes[0].data)
+                .replace(/\n/gu, ' ')}\n}`).join('\n'), config?.['css'])).map(({ line, column, endLine, endColumn, rule, severity, text: message, fix }) => {
+                const i = Math.ceil(line / 3), prefix = getPrefix(tokens[i - 1], i), { range } = tokens[i - 1].childNodes[1].childNodes[0], from = offsetAt(range, line - 3 * i, column - 1);
                 return {
                     from,
                     to: endLine === undefined ? from : offsetAt(range, endLine - 3 * i, endColumn - 1),
@@ -40,6 +60,21 @@ export const getWikiLinter = async (opt, obj) => {
                     source: 'Stylelint',
                     code: rule,
                     message,
+                    ...fix
+                        ? {
+                            data: [
+                                {
+                                    range: {
+                                        start: indexToPos(text, offsetAt(range, fix.range[0], prefix)),
+                                        end: indexToPos(text, offsetAt(range, fix.range[1], prefix)),
+                                    },
+                                    newText: fix.text,
+                                    title: 'Fix: Stylelint',
+                                    fix: true,
+                                },
+                            ],
+                        }
+                        : {},
                 };
             }),
         ];

package/dist/lintsource.d.ts

@@ -0,0 +1,14 @@
+import type { EditorView } from '@codemirror/view';
+import type { EditorState, Text } from '@codemirror/state';
+import type { Diagnostic } from '@codemirror/lint';
+import type { Option, LiveOption } from './linter';
+export type LintSource = ((state: EditorState) => Diagnostic[] | Promise<Diagnostic[]>) & {
+    fixer?: (doc: Text, rule?: string) => string | Promise<string>;
+};
+export type LintSourceGetter = (opt?: Option | LiveOption, view?: EditorView) => LintSource | Promise<LintSource>;
+export declare const getWikiLintSource: LintSourceGetter;
+export declare const getJsLintSource: LintSourceGetter;
+export declare const getCssLintSource: LintSourceGetter;
+export declare const getVueLintSource: LintSourceGetter;
+export declare const getJsonLintSource: LintSourceGetter;
+export declare const getLuaLintSource: LintSourceGetter;