@bhsd/codemirror-mediawiki 3.9.2 → 3.10.1

package/dist/lintsource.d.ts

@@ -3,10 +3,11 @@ 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';
-export type LintSource = ((state: EditorState) => Diagnostic[] | Promise<Diagnostic[]>) & {
+import type { DocRange } from './fold';
+export type LintSource = ((state: EditorState) => readonly Diagnostic[] | Promise<readonly Diagnostic[]>) & {
     fixer?: (doc: Text, rule?: string) => string | Promise<string>;
 };
-export type LintSources = LintSource | [LintSource] | [LintSource, LintSource];
+export type LintSources = LintSource | [LintSource, ...LintSource[]];
 export type LintSourceGetter = (opt?: Option | LiveOption, view?: EditorView, nestedMWLanguage?: Language) => LintSource | Promise<LintSource>;
 export interface ExtendedAction extends Action {
     tooltip: string | undefined;
@@ -17,10 +18,53 @@ export interface ExtendedAction extends Action {
  * @param runtime 是否为运行时选项
  */
 export declare const getOpt: (opt: Option | LiveOption, runtime?: boolean) => Option | Promise<Option>;
-export declare const getWikiLintSource: LintSourceGetter;
+/**
+ * 获取指定行列的位置
+ * @param doc 文档
+ * @param line 行号
+ * @param column 列号
+ * @param from 子语言起始位置
+ * @test
+ */
+export declare const pos: (doc: Text, line: number, column: number, from?: number) => 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

@@ -3,7 +3,7 @@ import { cssLanguage } from '@codemirror/lang-css';
 import { javascriptLanguage } from '@codemirror/lang-javascript';
 import { sanitizeInlineStyle, lintJSON } from '@bhsd/common';
 import { getWikiLinter, getJsLinter, getCssLinter, getLuaLinter, stylelintRepo, eslintRepo, luacheckRepo, } from './linter.js';
-import { posToIndex, } from './util.js';
+import { posToIndex, toConfigGetter, } from './util.js';
 import { base } from './constants.js';
 /**
  * 获取Linter选项
@@ -17,8 +17,9 @@ export const getOpt = (opt, runtime) => typeof opt === 'function' ? opt(runtime)
  * @param line 行号
  * @param column 列号
  * @param from 子语言起始位置
+ * @test
  */
-const pos = (doc, line, column, from = 0) => {
+export const pos = (doc, line, column, from = 0) => {
     if (from === 0) {
         return posToIndex(doc, { line: line - 1, character: column - 1 });
     }
@@ -28,7 +29,12 @@ const pos = (doc, line, column, from = 0) => {
         character: (line === 1 ? from - lineDesc.from : 0) + column - 1,
     });
 };
-const getRange = (doc, line, column, endLine, endColumn, f = 0, t = Infinity) => {
+/**
+ * 将行列范围转换为位置范围
+ * @ignore
+ * @test
+ */
+export const getRange = (doc, line, column, endLine, endColumn, f = 0, t = Infinity) => {
     const start = pos(doc, line, column, f);
     return {
         from: start,
@@ -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,9 +61,19 @@ 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 },
 }));
-export const getWikiLintSource = async (opt, v) => {
-    const wikiLint = await getWikiLinter({ ...await getOpt(opt), cdn: base.CDN }, v);
-    const lintSource = async ({ doc }) => wikiLintSource(wikiLint, doc.toString(), await getOpt(opt, true), doc);
+/**
+ * @implements
+ * @test
+ */
+export const getWikiLintSource = (articlePath) => async (opt, v) => {
+    const options = { ...await getOpt(opt), cdn: base.CDN };
+    if (articlePath) {
+        options.getConfig = toConfigGetter(options.getConfig, articlePath);
+    }
+    const wikiLint = await getWikiLinter(options, v);
+    const lintSource = async ({ doc }) => {
+        return wikiLintSource(wikiLint, doc.toString(), await getOpt(opt, true), doc);
+    };
     if (wikiLint.fixer) {
         lintSource.fixer = (_, rule) => wikiLint.fixer('', rule);
     }
@@ -92,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);
@@ -126,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) => {
@@ -154,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) => {
@@ -165,16 +196,24 @@ export const getHTMLLintSource = async (opt, view, language) => {
         ];
     };
 };
+/**
+ * @implements
+ * @test
+ */
 export const getJsonLintSource = () => ({ doc }) => lintJSON(doc.toString())
-    .map(({ message, position, severity }) => ({ message, severity, from: position, to: position }));
+    .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.d.ts

@@ -1,5 +1,3 @@
-import { lua } from '@codemirror/legacy-modes/mode/lua';
 import { LanguageSupport } from '@codemirror/language';
 declare const _default: () => LanguageSupport;
 export default _default;
-export { lua };

package/dist/lua.js

@@ -1,8 +1,10 @@
 /* eslint-disable no-template-curly-in-string */
 import { lua } from '@codemirror/legacy-modes/mode/lua';
-import { syntaxTree, LanguageSupport, StreamLanguage, foldService } from '@codemirror/language';
+import { syntaxTree, LanguageSupport, StreamLanguage, foldService, HighlightStyle, syntaxHighlighting, } from '@codemirror/language';
 import { snippetCompletion } from '@codemirror/autocomplete';
-import { leadingSpaces } from './util.js';
+import { tags } from '@lezer/highlight';
+import { leadingSpaces, sliceDoc } from './util.js';
+import { getLightHighlightStyle } from './theme.js';
 const map = {
     1: 'constant',
     2: 'function',
@@ -84,7 +86,9 @@ const map = {
         addWarning: 2,
         allToString: 2,
         clone: 2,
+        getContentLanguage: 2,
         getCurrentFrame: 2,
+        getLanguage: 2,
         incrementExpensiveFunctionCount: 2,
         isSubsting: 2,
         loadData: 2,
@@ -300,8 +304,12 @@ const map = {
         detail: 'in loop',
         type: 'keyword',
     }),
-], types = new Set(['variableName', 'variableName.standard', 'keyword']);
-lua.languageData['autocomplete'] = (context => {
+], 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)) {
         return null;
@@ -396,7 +404,7 @@ lua.languageData['autocomplete'] = (context => {
                 return {
                     from,
                     options: prevSibling?.name !== 'keyword'
-                        || builtin.includes(state.sliceDoc(prevSibling.from, prevSibling.to))
+                        || builtin.includes(sliceDoc(state, prevSibling))
                         ? [...binary, ...blocks]
                         : [...builtins, ...constants, ...tables, ...unary, ...blocks],
                     validFor,
@@ -404,8 +412,12 @@ lua.languageData['autocomplete'] = (context => {
             }
     }
     return null;
-});
-const support = foldService.of(({ doc, tabSize }, start, from) => {
+};
+/**
+ * @implements
+ * @test
+ */
+const fold = ({ doc, tabSize }, start, from) => {
     const { text, number } = doc.lineAt(start);
     if (!text.trim()) {
         return null;
@@ -424,6 +436,11 @@ const support = foldService.of(({ doc, tabSize }, start, from) => {
         }
     }
     return empty || j === number ? null : { from, to: doc.line(j).to };
-});
-export default () => new LanguageSupport(StreamLanguage.define(lua), support);
-export { lua };
+};
+const support = [
+    getLightHighlightStyle(),
+    syntaxHighlighting(HighlightStyle.define([{ tag: tags.standard(tags.variableName), class: 'cm-globals' }])),
+    lang.data.of({ autocomplete: source }),
+    foldService.of(fold),
+];
+export default () => new LanguageSupport(lang, support);