@bhsd/codemirror-mediawiki 3.10.0 → 3.10.2

package/dist/keymap.d.ts

@@ -1,3 +1,14 @@
 import type { KeyBinding } from '@codemirror/view';
+import type { KeymapConfig } from './keybindings';
+/**
+ * 生成keymap
+ * @param opt 快捷键设置
+ * @param opt.key 键名
+ * @param opt.pre 前缀
+ * @param opt.post 后缀
+ * @param opt.splitlines 是否分行
+ * @test
+ */
+export declare const getKeymap: ({ key, pre, post, splitlines }: KeymapConfig) => KeyBinding;
 declare const _default: KeyBinding[];
 export default _default;

package/dist/keymap.js

@@ -7,8 +7,9 @@ import { keybindings, encapsulateLines } from './keybindings.js';
  * @param opt.pre 前缀
  * @param opt.post 后缀
  * @param opt.splitlines 是否分行
+ * @test
  */
-const getKeymap = ({ key, pre = '', post = '', splitlines }) => ({
+export const getKeymap = ({ key, pre = '', post = '', splitlines }) => ({
     key,
     run(view) {
         const { state } = view;
@@ -22,9 +23,7 @@ const getKeymap = ({ key, pre = '', post = '', splitlines }) => ({
             }
             const insert = pre + state.sliceDoc(from, to) + post, head = from + insert.length;
             return {
-                range: from === to
-                    ? EditorSelection.range(from + pre.length, head - post.length)
-                    : EditorSelection.range(head, head),
+                range: EditorSelection.cursor(from === to ? from + pre.length : head),
                 changes: { from, to, insert },
             };
         }));

package/dist/linter.d.ts

@@ -2,6 +2,7 @@ import type { Diagnostic as DiagnosticBase, Range, Position } from 'vscode-langu
 import type { Linter } from 'eslint';
 import type { Warning } from 'stylelint/types/stylelint';
 import type { Diagnostic } from 'luacheck-browserify';
+import type { AST } from 'wikiparser-node';
 export type Option = Record<string, unknown> | null | undefined;
 export type LiveOption = (runtime?: boolean) => Option | Promise<Option>;
 declare type asyncLinter<T, S = Record<string, unknown>> = ((text: string, config?: Option) => T) & {
@@ -25,12 +26,23 @@ export declare const eslintRepo = "npm/@bhsd/eslint-browserify", luacheckRepo =
  * @param range 范围
  * @param lineOrOffset 行号或相对位置
  * @param column 列号
+ * @test
  */
 export declare const offsetAt: (range: [number, number], lineOrOffset: number, column?: number) => number;
+/**
+ * 获取伪CSS代码块的前缀
+ * @param token AST 节点
+ * @param token.type 节点类型
+ * @param token.tag 节点标签
+ * @param i 节点序号
+ * @test
+ */
+export declare const getPrefix: ({ type, tag }: AST, i: number) => string;
 /**
  * 将偏移量转换为位置
  * @param code 代码字符串
  * @param index 偏移量
+ * @test
  */
 export declare const indexToPos: (code: string, index: number) => Position;
 /**
@@ -38,22 +50,26 @@ export declare const indexToPos: (code: string, index: number) => Position;
  * @param opt 选项
  * @param opt.cdn jsDelivr CDN，不含库名
  * @param obj 对象
+ * @test
  */
 export declare const getWikiLinter: getAsyncLinter<Promise<MixedDiagnostic[]>, Option, object>;
 export declare const jsConfig: Option;
 /**
  * 获取 ESLint
  * @param cdn CDN 地址
+ * @test
  */
 export declare const getJsLinter: getAsyncLinter<Linter.LintMessage[], string>;
 /**
  * 获取 Stylelint
  * @param cdn CDN 地址
+ * @test
  */
 export declare const getCssLinter: getAsyncLinter<Promise<Warning[]>, string>;
 /**
  * 获取 Luacheck
  * @param cdn CDN 地址
+ * @test
  */
 export declare const getLuaLinter: getAsyncLinter<Promise<Diagnostic[]>, string>;
 export {};

package/dist/linter.js

@@ -8,6 +8,7 @@ export const eslintRepo = 'npm/@bhsd/eslint-browserify', luacheckRepo = 'npm/lua
  * @param range 范围
  * @param lineOrOffset 行号或相对位置
  * @param column 列号
+ * @test
  */
 export const offsetAt = (range, lineOrOffset, column) => {
     if (column === undefined) {
@@ -24,12 +25,14 @@ export const offsetAt = (range, lineOrOffset, column) => {
  * @param token.type 节点类型
  * @param token.tag 节点标签
  * @param i 节点序号
+ * @test
  */
-const getPrefix = ({ type, tag }, i) => `${type === 'ext-attr' ? 'div' : tag}#${i}{\n`;
+export const getPrefix = ({ type, tag }, i) => `${type === 'ext-attr' ? 'div' : tag}#${i}{\n`;
 /**
  * 将偏移量转换为位置
  * @param code 代码字符串
  * @param index 偏移量
+ * @test
  */
 export const indexToPos = (code, index) => {
     const lines = code.slice(0, index).split('\n');
@@ -45,6 +48,7 @@ const isStylelintConfig = (config) => Boolean(config && ('extends' in config ||
  * @param opt 选项
  * @param opt.cdn jsDelivr CDN，不含库名
  * @param obj 对象
+ * @test
  */
 export const getWikiLinter = async (opt, obj) => {
     const cdn = opt?.['cdn'];
@@ -120,6 +124,7 @@ export const jsConfig = /* #__PURE__ */ (() => ({
 /**
  * 获取 ESLint
  * @param cdn CDN 地址
+ * @test
  */
 export const getJsLinter = async (cdn = eslintRepo) => {
     await loadScript(cdn, 'eslint');
@@ -151,6 +156,7 @@ export const getJsLinter = async (cdn = eslintRepo) => {
 /**
  * 获取 Stylelint
  * @param cdn CDN 地址
+ * @test
  */
 export const getCssLinter = async (cdn = stylelintRepo) => {
     await loadScript(cdn, 'stylelint');
@@ -170,6 +176,7 @@ export const getCssLinter = async (cdn = stylelintRepo) => {
 /**
  * 获取 Luacheck
  * @param cdn CDN 地址
+ * @test
  */
 export const getLuaLinter = async (cdn = luacheckRepo) => {
     await loadScript(cdn, 'luacheck');

package/dist/lintsource.d.ts

@@ -3,6 +3,7 @@ import type { Text, EditorState } from '@codemirror/state';
 import type { Language } from '@codemirror/language';
 import type { Diagnostic, Action } from '@codemirror/lint';
 import type { Option, LiveOption } from './linter';
+import type { DocRange } from './fold';
 export type LintSource = ((state: EditorState) => readonly Diagnostic[] | Promise<readonly Diagnostic[]>) & {
     fixer?: (doc: Text, rule?: string) => string | Promise<string>;
 };
@@ -23,16 +24,47 @@ export declare const getOpt: (opt: Option | LiveOption, runtime?: boolean) => Op
  * @param line 行号
  * @param column 列号
  * @param from 子语言起始位置
+ * @test
  */
 export declare const pos: (doc: Text, line: number, column: number, from?: number) => number;
-export declare const getRange: (doc: Text, line: number, column: number, endLine?: number, endColumn?: number, f?: number, t?: number) => {
-    from: number;
-    to: number;
-};
+/**
+ * 将行列范围转换为位置范围
+ * @ignore
+ * @test
+ */
+export declare const getRange: (doc: Text, line: number, column: number, endLine?: number, endColumn?: number, f?: number, t?: number) => DocRange;
+/**
+ * @implements
+ * @test
+ */
 export declare const getWikiLintSource: (articlePath?: string) => LintSourceGetter;
+/**
+ * @implements
+ * @test
+ */
 export declare const getJsLintSource: LintSourceGetter;
+/**
+ * @implements
+ * @test
+ */
 export declare const getCssLintSource: LintSourceGetter;
+/**
+ * @implements
+ * @test
+ */
 export declare const getVueLintSource: LintSourceGetter;
+/**
+ * @implements
+ * @test
+ */
 export declare const getHTMLLintSource: LintSourceGetter;
+/**
+ * @implements
+ * @test
+ */
 export declare const getJsonLintSource: LintSourceGetter;
+/**
+ * @implements
+ * @test
+ */
 export declare const getLuaLintSource: LintSourceGetter;

package/dist/lintsource.js

@@ -17,6 +17,7 @@ export const getOpt = (opt, runtime) => typeof opt === 'function' ? opt(runtime)
  * @param line 行号
  * @param column 列号
  * @param from 子语言起始位置
+ * @test
  */
 export const pos = (doc, line, column, from = 0) => {
     if (from === 0) {
@@ -28,6 +29,11 @@ export const pos = (doc, line, column, from = 0) => {
         character: (line === 1 ? from - lineDesc.from : 0) + column - 1,
     });
 };
+/**
+ * 将行列范围转换为位置范围
+ * @ignore
+ * @test
+ */
 export const getRange = (doc, line, column, endLine, endColumn, f = 0, t = Infinity) => {
     const start = pos(doc, line, column, f);
     return {
@@ -45,8 +51,7 @@ const wikiLintSource = async (wikiLint, text, opt, doc, f = 0, t) => (await wiki
         apply(view) {
             view.dispatch({
                 changes: {
-                    from: posToIndex(doc, range.start),
-                    to: posToIndex(doc, range.end),
+                    ...getRange(doc, range.start.line + 1, range.start.character + 1, range.end.line + 1, range.end.character + 1, f, t),
                     insert: newText,
                 },
             });
@@ -56,6 +61,10 @@ const wikiLintSource = async (wikiLint, text, opt, doc, f = 0, t) => (await wiki
         ? getRange(doc, r.start.line + 1, r.start.character + 1, r.end.line + 1, r.end.character + 1, f, t)
         : { from: from + f, to: (to ?? from) + f },
 }));
+/**
+ * @implements
+ * @test
+ */
 export const getWikiLintSource = (articlePath) => async (opt, v) => {
     const options = { ...await getOpt(opt), cdn: base.CDN };
     if (articlePath) {
@@ -98,6 +107,10 @@ const jsLintSource = (esLint, code, opt, doc, f = 0, t) => esLint(code, opt)
     }
     return diagnostic;
 });
+/**
+ * @implements
+ * @test
+ */
 export const getJsLintSource = async (opt) => {
     const { CDN } = base, esLint = await getJsLinter(CDN && `${CDN}/${eslintRepo}`);
     const lintSource = async ({ doc }) => jsLintSource(esLint, doc.toString(), await getOpt(opt), doc);
@@ -132,12 +145,20 @@ const cssLintSource = async (styleLint, code, opt, doc, f = 0, t) => {
         return diagnostic;
     });
 };
+/**
+ * @implements
+ * @test
+ */
 export const getCssLintSource = async (opt) => {
     const { CDN } = base, styleLint = await getCssLinter(CDN && `${CDN}/${stylelintRepo}`);
     const lintSource = async ({ doc }) => cssLintSource(styleLint, doc.toString(), await getOpt(opt), doc);
     lintSource.fixer = async (doc, rule) => styleLint.fixer(doc.toString(), rule);
     return lintSource;
 };
+/**
+ * @implements
+ * @test
+ */
 export const getVueLintSource = async (opt) => {
     const { CDN } = base, styleLint = await getCssLinter(CDN && `${CDN}/${stylelintRepo}`), esLint = await getJsLinter(CDN && `${CDN}/${eslintRepo}`);
     return async (state) => {
@@ -160,6 +181,10 @@ export const getVueLintSource = async (opt) => {
         ];
     };
 };
+/**
+ * @implements
+ * @test
+ */
 export const getHTMLLintSource = async (opt, view, language) => {
     const vueLintSource = await getVueLintSource(opt), wikiLint = await getWikiLinter({ include: false, ...await getOpt(opt), cdn: base.CDN }, view);
     return async (state) => {
@@ -171,16 +196,24 @@ export const getHTMLLintSource = async (opt, view, language) => {
         ];
     };
 };
+/**
+ * @implements
+ * @test
+ */
 export const getJsonLintSource = () => ({ doc }) => lintJSON(doc.toString())
     .map(({ message, from, to = from, severity }) => ({ message, severity, from, to }));
+/**
+ * @implements
+ * @test
+ */
 export const getLuaLintSource = async () => {
     const { CDN } = base, luaLint = await getLuaLinter(CDN && `${CDN}/${luacheckRepo}`);
     return async ({ doc }) => (await luaLint(doc.toString()))
-        .map(({ line, column, end_column: endColumn, msg: message, severity }) => ({
+        .map(({ line, column, end_column, msg: message, severity }) => ({
         source: 'Luacheck',
         message,
         severity: severity === 1 ? 'warning' : 'error',
         from: pos(doc, line, column),
-        to: pos(doc, line, endColumn + 1),
+        to: pos(doc, line, end_column + 1),
     }));
 };

package/dist/lua.js

@@ -4,6 +4,7 @@ import { syntaxTree, LanguageSupport, StreamLanguage, foldService, HighlightStyl
 import { snippetCompletion } from '@codemirror/autocomplete';
 import { tags } from '@lezer/highlight';
 import { leadingSpaces, sliceDoc } from './util.js';
+import { getLightHighlightStyle } from './theme.js';
 const map = {
     1: 'constant',
     2: 'function',
@@ -304,6 +305,10 @@ const map = {
         type: 'keyword',
     }),
 ], types = new Set(['variableName', 'variableName.standard', 'keyword']), lang = StreamLanguage.define(lua);
+/**
+ * @implements
+ * @test
+ */
 const source = context => {
     const { state, pos } = context, node = syntaxTree(state).resolveInner(pos, -1);
     if (!types.has(node.name)) {
@@ -408,28 +413,34 @@ const source = context => {
     }
     return null;
 };
+/**
+ * @implements
+ * @test
+ */
+const fold = ({ doc, tabSize }, start, from) => {
+    const { text, number } = doc.lineAt(start);
+    if (!text.trim()) {
+        return null;
+    }
+    const getIndent = (line) => leadingSpaces(line).replace(/\t/gu, ' '.repeat(tabSize)).length;
+    const indent = getIndent(text);
+    let j = number, empty = true;
+    for (; j < doc.lines; j++) {
+        const { text: next } = doc.line(j + 1);
+        if (next.trim()) {
+            const nextIndent = getIndent(next);
+            if (indent >= nextIndent) {
+                break;
+            }
+            empty = false;
+        }
+    }
+    return empty || j === number ? null : { from, to: doc.line(j).to };
+};
 const support = [
+    getLightHighlightStyle(),
     syntaxHighlighting(HighlightStyle.define([{ tag: tags.standard(tags.variableName), class: 'cm-globals' }])),
     lang.data.of({ autocomplete: source }),
-    foldService.of(({ doc, tabSize }, start, from) => {
-        const { text, number } = doc.lineAt(start);
-        if (!text.trim()) {
-            return null;
-        }
-        const getIndent = (line) => leadingSpaces(line).replace(/\t/gu, ' '.repeat(tabSize)).length;
-        const indent = getIndent(text);
-        let j = number, empty = true;
-        for (; j < doc.lines; j++) {
-            const { text: next } = doc.line(j + 1);
-            if (next.trim()) {
-                const nextIndent = getIndent(next);
-                if (indent >= nextIndent) {
-                    break;
-                }
-                empty = false;
-            }
-        }
-        return empty || j === number ? null : { from, to: doc.line(j).to };
-    }),
+    foldService.of(fold),
 ];
 export default () => new LanguageSupport(lang, support);