@bhsd/codemirror-mediawiki 3.12.1 → 3.12.2

package/dist/codemirror.js

@@ -5,7 +5,7 @@ import { defaultKeymap, historyKeymap, history, redo, indentWithTab, insertNewli
 import { search, searchKeymap } from '@codemirror/search';
 import { linter, lintGutter } from '@codemirror/lint';
 import elt from 'crelt';
-import { base, panelSelector, panelsSelector, diagnosticSelector, noDetectionLangs } from './constants.js';
+import { baseData, panelSelector, panelsSelector, diagnosticSelector, noDetectionLangs } from './constants.js';
 import { light } from './theme.js';
 import { nextDiagnostic } from './lint.js';
 export const plain = () => [
@@ -62,10 +62,10 @@ export const replaceSelections = (view, func) => {
 /** CodeMirror 6 editor */
 export class CodeMirror6 {
     static get CDN() {
-        return base.CDN;
+        return baseData.CDN;
     }
     static set CDN(url) {
-        base.CDN = url;
+        baseData.CDN = url;
     }
     #textarea;
     #language = new Compartment();
@@ -301,10 +301,10 @@ export class CodeMirror6 {
                     const diagnostics = (await source(state)).map((diagnostic) => ({
                         ...diagnostic,
                         renderMessage(view) {
-                            const span = elt('span', { class: diagnosticSelector.slice(1) }, diagnostic.renderMessage?.(view) ?? diagnostic.message);
+                            const span = elt('span', { class: diagnosticSelector.slice(1) }, diagnostic.renderMessage?.call(this, view) ?? this.message);
                             span.addEventListener('click', () => {
                                 view.dispatch({
-                                    selection: { anchor: diagnostic.from, head: diagnostic.to },
+                                    selection: { anchor: this.from, head: this.to },
                                 });
                                 view.focus();
                             });

package/dist/constants.d.ts

@@ -1,4 +1,4 @@
 import { Decoration } from '@codemirror/view';
-export declare const base: Record<'CDN', string | undefined>, hoverSelector = ".cm-tooltip-hover-mw", diagnosticSelector = ".cm-diagnosticText-clickable", panelSelector = ".cm-panel", panelsSelector = ".cm-panels", actionSelector = ".cm-diagnosticAction", doctagMark: Decoration, typeMark: Decoration, noDetectionLangs: Set<string>, bgDark = "#4c566a", matchingCls = "cm-matchingTag", nonmatchingCls = "cm-nonmatchingTag";
+export declare const baseData: Record<'CDN', string | undefined>, hoverSelector = ".cm-tooltip-hover-mw", diagnosticSelector = ".cm-diagnosticText-clickable", panelSelector = ".cm-panel", panelsSelector = ".cm-panels", actionSelector = ".cm-diagnosticAction", doctagMark: Decoration, typeMark: Decoration, noDetectionLangs: Set<string>, bgDark = "#4c566a", matchingCls = "cm-matchingTag", nonmatchingCls = "cm-nonmatchingTag";
 export declare const isWMF: boolean;
 export declare const isMac: boolean;

package/dist/constants.js

@@ -1,6 +1,6 @@
 import { Decoration } from '@codemirror/view';
 import { wmf } from '@bhsd/common';
-export const base = { CDN: undefined }, hoverSelector = '.cm-tooltip-hover-mw', diagnosticSelector = '.cm-diagnosticText-clickable', panelSelector = '.cm-panel', panelsSelector = '.cm-panels', actionSelector = '.cm-diagnosticAction', doctagMark = /* @__PURE__ */ Decoration.mark({ class: 'cm-doctag' }), typeMark = /* @__PURE__ */ Decoration.mark({ class: 'cm-doctag-type' }), noDetectionLangs = new Set(['plain', 'mediawiki']), bgDark = '#4c566a', matchingCls = 'cm-matchingTag', nonmatchingCls = 'cm-nonmatchingTag';
+export const baseData = { CDN: undefined }, hoverSelector = '.cm-tooltip-hover-mw', diagnosticSelector = '.cm-diagnosticText-clickable', panelSelector = '.cm-panel', panelsSelector = '.cm-panels', actionSelector = '.cm-diagnosticAction', doctagMark = /* @__PURE__ */ Decoration.mark({ class: 'cm-doctag' }), typeMark = /* @__PURE__ */ Decoration.mark({ class: 'cm-doctag-type' }), noDetectionLangs = new Set(['plain', 'mediawiki']), bgDark = '#4c566a', matchingCls = 'cm-matchingTag', nonmatchingCls = 'cm-nonmatchingTag';
 export const isWMF = /* @__PURE__ */ (() => typeof location === 'object'
     && new RegExp(String.raw `\.(?:${wmf})\.org$`, 'u').test(location.hostname))();
 export const isMac = /* @__PURE__ */ (() => {

package/dist/escape.js

@@ -3,7 +3,7 @@ import { EditorSelection } from '@codemirror/state';
 import { indentMore, indentLess } from '@codemirror/commands';
 import { getLSP } from '@bhsd/browser';
 import elt from 'crelt';
-import { base } from './constants.js';
+import { baseData } from './constants.js';
 import { replaceSelections, menuRegistry, } from './codemirror.js';
 import { sliceDoc, toConfigGetter, } from './util.js';
 const entity = { '"': 'quot', "'": 'apos', '<': 'lt', '>': 'gt', '&': 'amp', ' ': 'nbsp' };
@@ -70,7 +70,7 @@ escapeWiki = async (view, lsp) => {
     }));
 };
 const escapeWikiCommand = (view, getConfig) => {
-    const lsp = getLSP(view, false, getConfig, base.CDN);
+    const lsp = getLSP(view, false, getConfig, baseData.CDN);
     if (lsp && 'provideRefactoringAction' in lsp && view.state.selection.ranges.some(({ empty }) => !empty)) {
         void escapeWiki(view, lsp);
         return true;
@@ -99,7 +99,7 @@ menuRegistry.push({
                 handlerBase(view, e);
             });
             items = [btnHTML, btnURI];
-            const lsp = getLSP(view, false, cm.getWikiConfig, base.CDN);
+            const lsp = getLSP(view, false, cm.getWikiConfig, baseData.CDN);
             if (lsp && 'provideRefactoringAction' in lsp) {
                 const btnWiki = elt('div', 'Escape with magic words');
                 btnWiki.addEventListener('click', e => {

package/dist/fold.d.ts

@@ -17,7 +17,7 @@ export declare const updateSelection: AnchorUpdate, updateAll: AnchorUpdate;
  * @param refOnly 是否仅检查`<ref>`标签
  * @test
  */
-export declare const foldable: (state: EditorState, posOrNode: number | SyntaxNode, tree?: Tree | null, refOnly?: boolean) => DocRange | false;
+export declare const foldableInline: (state: EditorState, posOrNode: number | SyntaxNode, tree?: Tree | null, refOnly?: boolean) => DocRange | false;
 /**
  * 折叠所有模板
  * @param state
@@ -31,7 +31,7 @@ export declare const foldable: (state: EditorState, posOrNode: number | SyntaxNo
  * @test
  */
 export declare const traverse: (state: EditorState, tree: Tree, effects: StateEffect<DocRange>[], node: SyntaxNode | null, end: number, anchor: number, update: AnchorUpdate, refOnly?: boolean) => number;
-declare class FoldMarker extends GutterMarker {
+declare class MyFoldMarker extends GutterMarker {
     readonly open: boolean;
     constructor(open: boolean);
     eq(other: this): boolean;
@@ -48,7 +48,7 @@ export declare const foldableLine: ({ state, viewportLineBlocks }: EditorView, {
  * @param view
  * @test
  */
-export declare const buildMarkers: (view: EditorView) => RangeSet<FoldMarker>;
+export declare const buildMarkers: (view: EditorView) => RangeSet<MyFoldMarker>;
 /**
  * 生成折叠命令
  * @param refOnly 是否仅检查`<ref>`标签
@@ -62,7 +62,7 @@ export declare const unfoldRef: Command;
  * @param view
  * @test
  */
-export declare const selectedLines: (view: EditorView) => BlockInfo[];
+export declare const mySelectedLines: (view: EditorView) => BlockInfo[];
 /**
  * Fold the template at the selection/cursor
  * @param view

package/dist/fold.js

@@ -47,7 +47,7 @@ const refNames = new Set(['ref', 'references']);
  * @param refOnly 是否仅检查`<ref>`标签
  * @test
  */
-export const foldable = (state, posOrNode, tree, refOnly = false) => {
+export const foldableInline = (state, posOrNode, tree, refOnly = false) => {
     if (typeof posOrNode === 'number') {
         tree = ensureSyntaxTree(state, posOrNode);
     }
@@ -141,7 +141,7 @@ const foldSelector = '.cm-tooltip-fold';
  * @param state
  */
 const create = (state) => {
-    const { head } = state.selection.main, range = foldable(state, head);
+    const { head } = state.selection.main, range = foldableInline(state, head);
     if (range) {
         const { from, to } = range;
         let folded = false;
@@ -207,7 +207,7 @@ export const traverse = (state, tree, effects, node, end, anchor, update, refOnl
     while (node && (node.from < end
         || node.from === end
             && !(isTemplateBracket(node) && sliceDoc(state, node).startsWith('}}')))) {
-        const range = foldable(state, node, tree, refOnly);
+        const range = foldableInline(state, node, tree, refOnly);
         if (range) {
             effects.push(foldEffect.of(range));
             node = tree.resolve(range.to, 1);
@@ -219,7 +219,7 @@ export const traverse = (state, tree, effects, node, end, anchor, update, refOnl
     }
     return anchor;
 };
-class FoldMarker extends GutterMarker {
+class MyFoldMarker extends GutterMarker {
     constructor(open) {
         super();
         this.open = open;
@@ -231,8 +231,8 @@ class FoldMarker extends GutterMarker {
         return elt('span', { title: state.phrase(this.open ? 'Fold line' : 'Unfold line') }, this.open ? '⌄' : '›');
     }
 }
-const canFold = /* @__PURE__ */ new FoldMarker(true), canUnfold = /* @__PURE__ */ new FoldMarker(false);
-const findFold = ({ state }, line) => {
+const canFold = /* @__PURE__ */ new MyFoldMarker(true), canUnfold = /* @__PURE__ */ new MyFoldMarker(false);
+const myFindFold = ({ state }, line) => {
     let found;
     state.field(foldState, false)?.between(line.from, line.to, (from, to) => {
         if (!found && to === line.to) {
@@ -323,7 +323,7 @@ export const buildMarkers = (view) => {
     const builder = new RangeSetBuilder();
     for (const line of view.viewportLineBlocks) {
         let mark;
-        if (findFold(view, line)) {
+        if (myFindFold(view, line)) {
             mark = canUnfold;
         }
         else if (foldableLine(view, line)) {
@@ -393,7 +393,7 @@ export const unfoldRef = (view) => {
  * @param view
  * @test
  */
-export const selectedLines = (view) => {
+export const mySelectedLines = (view) => {
     const lines = [];
     for (const { head } of view.state.selection.ranges) {
         if (lines.some(({ from, to }) => from <= head && to >= head)) {
@@ -403,7 +403,7 @@ export const selectedLines = (view) => {
     }
     return lines;
 };
-const foldCode = (view, line) => {
+const myFoldCode = (view, line) => {
     const range = foldableLine(view, line);
     if (range) {
         view.dispatch({ effects: foldEffect.of(range) });
@@ -411,8 +411,8 @@ const foldCode = (view, line) => {
     }
     return false;
 };
-const unfoldCode = (view, line) => {
-    const folded = findFold(view, line);
+const myUnfoldCode = (view, line) => {
+    const folded = myFindFold(view, line);
     return folded && unfoldEffect.of(folded);
 };
 /**
@@ -437,8 +437,8 @@ export const foldAt = view => {
     if (effects.length > 0) {
         return execute(view, effects, anchor);
     }
-    for (const line of selectedLines(view)) {
-        if (foldCode(view, line)) {
+    for (const line of mySelectedLines(view)) {
+        if (myFoldCode(view, line)) {
             return true;
         }
     }
@@ -515,8 +515,8 @@ export const mediawikiFold = /* @__PURE__ */ (() => [
                     view.dispatch({ effects, selection });
                     return true;
                 }
-                for (const line of selectedLines(view)) {
-                    const effect = unfoldCode(view, line);
+                for (const line of mySelectedLines(view)) {
+                    const effect = myUnfoldCode(view, line);
                     if (effect) {
                         effects.push(effect);
                     }
@@ -537,16 +537,16 @@ export const mediawikiFold = /* @__PURE__ */ (() => [
             return view.plugin(markers)?.markers ?? RangeSet.empty;
         },
         initialSpacer() {
-            return new FoldMarker(false);
+            return new MyFoldMarker(false);
         },
         domEventHandlers: {
             click(view, line) {
-                const effects = unfoldCode(view, line);
+                const effects = myUnfoldCode(view, line);
                 if (effects) {
                     view.dispatch({ effects });
                     return true;
                 }
-                return foldCode(view, line);
+                return myFoldCode(view, line);
             },
         },
     }),

package/dist/hover.js

@@ -2,7 +2,7 @@ import { hoverTooltip, EditorView } from '@codemirror/view';
 import { ensureSyntaxTree } from '@codemirror/language';
 import { getLSP, loadScript, } from '@bhsd/browser';
 import { tokens } from './config.js';
-import { base, hoverSelector, bgDark } from './constants.js';
+import { baseData, hoverSelector, bgDark } from './constants.js';
 import { indexToPos, posToIndex, createTooltipView, toConfigGetter, escHTML, sliceDoc, findTemplateName, } from './util.js';
 const code = `${hoverSelector} code`;
 /**
@@ -58,13 +58,13 @@ export default (articlePath, templatedata) => (cm) => {
         hoverTooltip(async (view, pos, side) => {
             const { state } = view, { doc } = state;
             const { paramSuggest, tags } = cm.langConfig;
-            let hover = await getLSP(view, false, toConfigGetter(cm.getWikiConfig, articlePath), base.CDN)?.provideHover(doc.toString(), indexToPos(doc, pos));
+            let hover = await getLSP(view, false, toConfigGetter(cm.getWikiConfig, articlePath), baseData.CDN)?.provideHover(doc.toString(), indexToPos(doc, pos));
             if (!hover && paramSuggest && 'templatedata' in tags) {
                 // eslint-disable-next-line require-atomic-updates
                 hover = await getHoverFromApi(state, pos, side, paramSuggest, templatedata);
             }
             if (hover) {
-                const { CDN = '' } = base;
+                const { CDN = '' } = baseData;
                 await loadScript(`${CDN}${CDN && '/'}npm/marked/lib/marked.umd.js`, 'marked', true);
                 const { end } = hover.range;
                 return {

package/dist/index.d.ts

@@ -159,4 +159,4 @@ export declare const registerLanguage: (name: string, lang: (config?: unknown) =
  */
 export declare const registerLanguageCore: (name: string, lang: (config?: unknown) => LanguageSupport, lintSource?: LintSourceGetter) => void;
 export declare const registerTheme: (name: string, theme: Extension) => void;
-export { nord } from './theme.js';
+export { nordDark as nord } from './theme.js';

package/dist/index.js

@@ -422,4 +422,4 @@ export const registerLanguageCore = (name, lang, lintSource) => {
 export const registerTheme = (name, theme) => {
     themes[name] = theme;
 };
-export { nord } from './theme.js';
+export { nordDark as nord } from './theme.js';

package/dist/inlay.js

@@ -2,7 +2,7 @@ import { StateField, StateEffect } from '@codemirror/state';
 import { Decoration, EditorView, WidgetType, ViewPlugin } from '@codemirror/view';
 import { getLSP } from '@bhsd/browser';
 import elt from 'crelt';
-import { base } from './constants.js';
+import { baseData } from './constants.js';
 import { posToIndex, toConfigGetter, } from './util.js';
 const cls = 'cm-inlay-hint';
 class InlayHintWidget extends WidgetType {
@@ -54,7 +54,7 @@ export default (articlePath) => (cm) => {
         field,
         ViewPlugin.define(view => {
             const timer = setInterval(() => {
-                if (getLSP(view, false, toConfigGetter(cm.getWikiConfig, articlePath), base.CDN)) {
+                if (getLSP(view, false, toConfigGetter(cm.getWikiConfig, articlePath), baseData.CDN)) {
                     clearInterval(timer);
                     void update({ view, docChanged: true });
                 }

package/dist/javascript.js

@@ -6,7 +6,7 @@ import { builtin } from './javascript-globals.js';
 import { doctagMark } from './constants.js';
 import { markDocTagType, pushDecoration } from './util.js';
 export const jsCompletion = javascriptLanguage.data.of({ autocomplete: scopeCompletionSource(globalThis) });
-const globalsMark = Decoration.mark({ class: 'cm-globals' }), builtinGlobals = new Set(Object.keys(builtin));
+const globalsMark = Decoration.mark({ class: 'cm-globals' }), varMark = Decoration.mark({ class: 'cm-doctag-var' }), builtinGlobals = new Set(Object.keys(builtin));
 /**
  * 忽略JavaScript正则表达式中的括号匹配
  * @param state
@@ -61,14 +61,18 @@ export const markGlobalsAndDocTag = (tree, visibleRanges, state, cm) => {
                     }
                 }
                 else if (type.is('BlockComment') && /^\/\*{2}(?!\*)/u.test(name)) {
-                    const comment = name.slice(2), mtAll = comment.matchAll(/^[ \t]*\*\s*(@[a-z]+)(\s+\{(?!\}))?|\{(@[a-z]+)/dgimu);
+                    const comment = name.slice(2), pos = f + 2, mtAll = comment.matchAll(/^[ \t]*\*\s*(@[a-z]+)(\s+\{)?|\{(@[a-z]+)/dgimu);
                     for (const mt of mtAll) {
                         if (mt[3]) {
                             const [start, end] = mt.indices[3];
-                            pushDecoration(decorations, doctagMark, f + start + 2, f + end + 2);
+                            pushDecoration(decorations, doctagMark, pos + start, pos + end);
                         }
                         else {
-                            markDocTagType(decorations, f + 2, mt);
+                            const index = markDocTagType(decorations, pos, mt), m = /^\s+([a-z_]\w*)\s+-/diu.exec(comment.slice(index));
+                            if (m) {
+                                const [start, end] = m.indices[1];
+                                pushDecoration(decorations, varMark, pos + index + start, pos + index + end);
+                            }
                         }
                     }
                 }

package/dist/json.d.ts

@@ -0,0 +1,8 @@
+import type { StreamParser, StringStream } from '@codemirror/language';
+declare interface State {
+    tokenize: Tokenizer;
+    wb: boolean;
+}
+declare type Tokenizer = (stream: StringStream, state: State) => string;
+export declare const jsonBasic: StreamParser<State>, jsonc: StreamParser<State>;
+export {};

package/dist/json.js

@@ -0,0 +1,108 @@
+const tokenNumber = (stream, state) => {
+    if (stream.match(/^\d+(?:\.\d+)?(?:e[+-]?\d+)?/iu)) {
+        state.wb = false;
+        return 'number';
+    }
+    state.wb = true;
+    return '';
+};
+const mkJson = (jsoncMode) => {
+    // Tokenizer
+    const tokenComment = (stream, state) => {
+        if (stream.skipTo('*/')) {
+            stream.next();
+            stream.next();
+            state.tokenize = tokenBase;
+        }
+        else {
+            stream.skipToEnd();
+        }
+        return 'comment';
+    };
+    const tokenBase = (stream, state) => {
+        if (stream.eatSpace()) {
+            state.wb = true;
+            return '';
+        }
+        const ch = stream.next();
+        switch (ch) {
+            case '{':
+            case '}':
+                state.wb = true;
+                return 'brace';
+            case '[':
+            case ']':
+                state.wb = true;
+                return 'squareBracket';
+            case ':':
+            case ',':
+                state.wb = true;
+                return 'separator';
+            case '/':
+                state.wb = true;
+                if (jsoncMode) {
+                    if (stream.eat('/')) {
+                        stream.skipToEnd();
+                        return 'comment';
+                    }
+                    else if (stream.eat('*')) {
+                        state.tokenize = tokenComment;
+                        return tokenComment(stream, state);
+                    }
+                }
+                return '';
+            case '"': {
+                state.wb = true;
+                let escaped = false, next = stream.next();
+                while (next) {
+                    if (!escaped && next === '"') {
+                        break;
+                    }
+                    escaped = !escaped && next === '\\';
+                    next = stream.next();
+                }
+                return stream.match(/^\s*:/u, false) ? 'propertyName.definition' : 'string';
+            }
+            case '-':
+                if (state.wb) {
+                    return tokenNumber(stream, state);
+                }
+                state.wb = true;
+                return '';
+            default:
+                if (state.wb) {
+                    if (ch >= '0' && ch <= '9') {
+                        stream.backUp(1);
+                        return tokenNumber(stream, state);
+                    }
+                    else if (ch === 'n' && stream.match(/^ull\b/u)) {
+                        state.wb = false;
+                        return 'null';
+                    }
+                    else if (ch === 't' && stream.match(/^rue\b/u)
+                        || ch === 'f' && stream.match(/^alse\b/u)) {
+                        state.wb = false;
+                        return 'bool';
+                    }
+                }
+                state.wb = !/[\w$]/u.test(ch);
+                return '';
+        }
+    };
+    // Interface
+    return {
+        startState() {
+            return {
+                tokenize: tokenBase,
+                wb: true,
+            };
+        },
+        token(stream, state) {
+            if (stream.sol()) {
+                state.wb = true;
+            }
+            return state.tokenize(stream, state);
+        },
+    };
+};
+export const jsonBasic = mkJson(), jsonc = mkJson(true);

package/dist/keymap.d.ts

@@ -9,6 +9,6 @@ import type { KeymapConfig } from './keybindings';
  * @param opt.splitlines 是否分行
  * @test
  */
-export declare const getKeymap: ({ key, pre, post, splitlines }: KeymapConfig) => KeyBinding;
+export declare const getWikiKeymap: ({ key, pre, post, splitlines }: KeymapConfig) => KeyBinding;
 declare const _default: KeyBinding[];
 export default _default;

package/dist/keymap.js

@@ -1,5 +1,7 @@
 import { EditorSelection } from '@codemirror/state';
+import { syntaxTree } from '@codemirror/language';
 import { keybindings, encapsulateLines } from './keybindings.js';
+const reKartographer = /(?:^|_)mw-tag-map(?:link|frame)(?:$|_)/u;
 /**
  * 生成keymap
  * @param opt 快捷键设置
@@ -9,11 +11,24 @@ import { keybindings, encapsulateLines } from './keybindings.js';
  * @param opt.splitlines 是否分行
  * @test
  */
-export const getKeymap = ({ key, pre = '', post = '', splitlines }) => ({
+export const getWikiKeymap = ({ key, pre = '', post = '', splitlines }) => ({
     key,
     run(view) {
-        const { state } = view;
+        const { state } = view, tree = syntaxTree(state);
         view.dispatch(state.changeByRange(({ from, to }) => {
+            if (key === 'Mod-/'
+                && reKartographer.test(tree.resolveInner(from, 1).name)
+                && reKartographer.test(tree.resolveInner(to, -1).name)) {
+                // JSONC comment
+                if (from === to) {
+                    pre = '//';
+                    post = '';
+                }
+                else {
+                    pre = '/*';
+                    post = '*/';
+                }
+            }
             if (splitlines) {
                 const start = state.doc.lineAt(from).from, end = state.doc.lineAt(to).to, insert = encapsulateLines(state.sliceDoc(start, end), pre, post);
                 return {
@@ -31,4 +46,4 @@ export const getKeymap = ({ key, pre = '', post = '', splitlines }) => ({
     },
     preventDefault: true,
 });
-export default keybindings.map(getKeymap);
+export default keybindings.map(getWikiKeymap);

package/dist/lint.js

@@ -1,4 +1,4 @@
-const findDiagnostic = (deco, head, anchor = head) => {
+const myFindDiagnostic = (deco, head, anchor = head) => {
     let found;
     deco.between(head, Infinity, (_, __, { spec: { diagnostics } }) => {
         const next = diagnostics.sort((a, b) => a.from - b.from || a.to - b.to)
@@ -16,7 +16,7 @@ const findDiagnostic = (deco, head, anchor = head) => {
  * @param cm CodeMirror6 实例
  */
 export const nextDiagnostic = (cm) => {
-    const view = cm.view, { state } = view, { diagnostics } = state.field(cm.getLintExtension()[2][0]), { from, to } = state.selection.main, next = findDiagnostic(diagnostics, from, to) ?? findDiagnostic(diagnostics, 0);
+    const view = cm.view, { state } = view, { diagnostics } = state.field(cm.getLintExtension()[2][0]), { from, to } = state.selection.main, next = myFindDiagnostic(diagnostics, from, to) ?? myFindDiagnostic(diagnostics, 0);
     if (!next || next.from === from && next.to === to) {
         return false;
     }

package/dist/lintsource.js

@@ -4,7 +4,7 @@ import { javascriptLanguage } from '@codemirror/lang-javascript';
 import { sanitizeInlineStyle, lintJSON } from '@bhsd/common';
 import { getWikiLinter, getJsLinter, getCssLinter, getLuaLinter, stylelintRepo, eslintRepo, luacheckRepo, isStylelintConfig, } from './linter.js';
 import { posToIndex, toConfigGetter, } from './util.js';
-import { base } from './constants.js';
+import { baseData } from './constants.js';
 import { vue } from './javascript-globals.js';
 /**
  * 获取Linter选项
@@ -67,7 +67,7 @@ const wikiLintSource = async (wikiLint, text, opt, doc, f = 0, t) => (await wiki
  * @test
  */
 export const getWikiLintSource = (articlePath) => async (opt, v) => {
-    const options = { ...await getOpt(opt), cdn: base.CDN };
+    const options = { ...await getOpt(opt), cdn: baseData.CDN };
     if (articlePath) {
         options.getConfig = toConfigGetter(options.getConfig, articlePath);
     }
@@ -113,7 +113,7 @@ const jsLintSource = (esLint, code, opt, doc, f = 0, t) => esLint(code, opt)
  * @test
  */
 export const getJsLintSource = async (opt) => {
-    const { CDN } = base, esLint = await getJsLinter(CDN && `${CDN}/${eslintRepo}`);
+    const { CDN } = baseData, esLint = await getJsLinter(CDN && `${CDN}/${eslintRepo}`);
     const lintSource = async ({ doc }) => jsLintSource(esLint, doc.toString(), await getOpt(opt), doc);
     lintSource.fixer = (doc, rule) => esLint.fixer(doc.toString(), rule);
     Object.defineProperty(lintSource, 'config', {
@@ -156,7 +156,7 @@ const cssLintSource = async (styleLint, code, opt, doc, f = 0, t) => {
  * @test
  */
 export const getCssLintSource = async (opt) => {
-    const { CDN } = base, styleLint = await getCssLinter(CDN && `${CDN}/${stylelintRepo}`);
+    const { CDN } = baseData, 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);
     Object.defineProperty(lintSource, 'config', {
@@ -180,7 +180,7 @@ const stylelintConfigVue = /* #__PURE__ */ (() => ({
 }))();
 /** @implements */
 const getVueOrHtmlLintSource = (rules, globals) => async (opt) => {
-    const { CDN } = base, styleLint = await getCssLinter(CDN && `${CDN}/${stylelintRepo}`), esLint = await getJsLinter(CDN && `${CDN}/${eslintRepo}`);
+    const { CDN } = baseData, styleLint = await getCssLinter(CDN && `${CDN}/${stylelintRepo}`), esLint = await getJsLinter(CDN && `${CDN}/${eslintRepo}`);
     const lintSource = async (state) => {
         const { doc } = state, option = await getOpt(opt, true) ?? {};
         let js = option['js'], css = option['css'];
@@ -228,7 +228,7 @@ export const getVueLintSource = /* #__PURE__ */ getVueOrHtmlLintSource(stylelint
  * @test
  */
 export const getHTMLLintSource = async (opt, view, language) => {
-    const vueLintSource = await getVueOrHtmlLintSource()(opt), wikiLint = await getWikiLinter({ include: false, ...await getOpt(opt), cdn: base.CDN }, view);
+    const vueLintSource = await getVueOrHtmlLintSource()(opt), wikiLint = await getWikiLinter({ include: false, ...await getOpt(opt), cdn: baseData.CDN }, view);
     const lintSource = async (state) => {
         const { doc } = state, option = await getOpt(opt, true) ?? {}, wiki = option['wiki'];
         return [
@@ -255,7 +255,7 @@ export const getJsonLintSource = () => ({ doc }) => lintJSON(doc.toString())
  * @test
  */
 export const getLuaLintSource = async () => {
-    const { CDN } = base, luaLint = await getLuaLinter(CDN && `${CDN}/${luacheckRepo}`);
+    const { CDN } = baseData, luaLint = await getLuaLinter(CDN && `${CDN}/${luacheckRepo}`);
     return async ({ doc }) => (await luaLint(doc.toString()))
         .map(({ line, column, end_column, msg: message, severity }) => ({
         source: 'Luacheck',

package/dist/lua.js

@@ -218,7 +218,7 @@ const map = {
         },
         ext: 4,
     },
-}, builtin = ['false', 'nil', 'true'], builtins = builtin.map(label => ({ label, type: 'constant' })), tables = [
+}, luaBuiltin = ['false', 'nil', 'true'], luaBuiltins = luaBuiltin.map(label => ({ label, type: 'constant' })), tables = [
     '_G',
     ...Object.keys(globals),
 ].map(label => ({ label, type: 'namespace' })), constants = [
@@ -268,7 +268,7 @@ const map = {
     'do',
     'until',
     'goto',
-].map(label => ({ label, type: 'keyword' })), keywords = [
+].map(label => ({ label, type: 'keyword' })), luaKeywords = [
     ...[
         'if',
         'while',
@@ -306,14 +306,14 @@ const map = {
         detail: 'in loop',
         type: 'keyword',
     }),
-], types = new Set(['variableName', 'variableName.standard', 'keyword']), lang = StreamLanguage.define(lua);
+], excludedTypes = 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)) {
+    if (!excludedTypes.has(node.name)) {
         return null;
     }
     const match = context.matchBefore(/(?:(?:^|\S|\.\.)\s+|^|[^\w\s]|\.\.)\w+$|\.{1,2}$/u);
@@ -382,7 +382,7 @@ const source = context => {
         case ',':
             return {
                 from,
-                options: [...builtins, ...constants, ...tables, ...unary],
+                options: [...luaBuiltins, ...constants, ...tables, ...unary],
                 validFor,
             };
         case '}':
@@ -397,7 +397,7 @@ const source = context => {
         case '':
             return {
                 from,
-                options: [...keywords, ...blocks, ...unary, ...constants, ...tables, ...builtins],
+                options: [...luaKeywords, ...blocks, ...unary, ...constants, ...tables, ...luaBuiltins],
                 validFor,
             };
         default:
@@ -406,9 +406,9 @@ const source = context => {
                 return {
                     from,
                     options: prevSibling?.name !== 'keyword'
-                        || builtin.includes(sliceDoc(state, prevSibling))
+                        || luaBuiltin.includes(sliceDoc(state, prevSibling))
                         ? [...binary, ...blocks]
-                        : [...builtins, ...constants, ...tables, ...unary, ...blocks],
+                        : [...luaBuiltins, ...constants, ...tables, ...unary, ...blocks],
                     validFor,
                 };
             }
@@ -455,9 +455,9 @@ export const markDocTag = (tree, visibleRanges, state) => {
                     || firstLine.startsWith('---')
                         && !(firstLine.endsWith('--') && /[^-]/u.test(firstLine))) {
                     while (node.name === 'comment') {
-                        const comment = sliceDoc(state, node), mt = /^\s*(?:-{2,}\s*)?(@[a-z]+)(\s+\{(?!\}))?/diu.exec(comment);
+                        const comment = sliceDoc(state, node), mt = /^\s*(?:-{2,}\s*)?(@[a-z]+)(\s+\{)?/diu.exec(comment);
                         if (mt) {
-                            markDocTagType(decorations, node.from, mt);
+                            markDocTagType(decorations, node.from, mt, 1);
                         }
                         // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
                         const { nextSibling } = node;