@bhsd/codemirror-mediawiki 3.12.1 → 3.12.2

package/dist/ref.d.ts

@@ -1,6 +1,6 @@
 import type { EditorState, Extension } from '@codemirror/state';
 import type { CodeMirror6 } from './codemirror';
-import type { Tag } from './matchTag';
+import type { WikiTag } from './matchTag';
 /**
  * 高亮<ref>内容
  * @param state 编辑器EditorState
@@ -13,6 +13,6 @@ export declare const highlightRef: (state: EditorState, text: string) => string;
  * @ignore
  * @test
  */
-export declare const needHover: (state: EditorState, { name, selfClosing, first, last }: Tag) => boolean;
+export declare const needHover: (state: EditorState, { name, selfClosing, first, last }: WikiTag) => boolean;
 declare const _default: (articlePath?: string) => (cm: CodeMirror6) => Extension;
 export default _default;

package/dist/ref.js

@@ -3,7 +3,7 @@ import { ensureSyntaxTree, language, highlightingFor } from '@codemirror/languag
 import { highlightCode } from '@lezer/highlight';
 import { getLSP } from '@bhsd/browser';
 import elt from 'crelt';
-import { base } from './constants.js';
+import { baseData } from './constants.js';
 import { tokens } from './config.js';
 import { getTag } from './matchTag.js';
 import { sliceDoc, indexToPos, posToIndex, escHTML, toConfigGetter, } from './util.js';
@@ -13,7 +13,7 @@ const trees = new WeakMap(), selector = '.cm-tooltip-ref', noDef = '.cm-tooltip-
  * @param state
  * @param node 语法树节点
  */
-const getName = (state, node) => sliceDoc(state, node).trim();
+const getRefName = (state, node) => sliceDoc(state, node).trim();
 /**
  * 高亮<ref>内容
  * @param state 编辑器EditorState
@@ -45,7 +45,7 @@ export const needHover = (state, { name, selfClosing, first, last }) => {
     if (name === 'ref' && selfClosing) {
         let prevSibling = last, nextSibling = null;
         while (prevSibling && prevSibling.from > first.to) {
-            const key = getName(state, prevSibling);
+            const key = getRefName(state, prevSibling);
             if (prevSibling.name.split('_').includes(tokens.extTagAttribute)
                 && /(?:^|\s)name(?:$|[\s=])/iu.test(key)) {
                 if (/(?:^|\s)name\s*=/iu.test(key)) {
@@ -56,7 +56,7 @@ export const needHover = (state, { name, selfClosing, first, last }) => {
             ({ prevSibling } = prevSibling);
         }
         if (nextSibling?.name.includes(tokens.extTagAttributeValue)) {
-            let target = getName(state, nextSibling);
+            let target = getRefName(state, nextSibling);
             const quote = target.charAt(0);
             if (quote === '"' || quote === "'") {
                 target = target.slice(1, target.slice(-1) === quote ? -1 : undefined).trim();
@@ -75,7 +75,7 @@ export default (articlePath) => (cm) => {
             if (node?.name.includes('-exttag-')) {
                 const tag = getTag(state, node);
                 if (tag && needHover(state, tag)) {
-                    const { doc } = state, ref = await getLSP(view, false, toConfigGetter(cm.getWikiConfig, articlePath), base.CDN)?.provideDefinition(doc.toString(), indexToPos(doc, tag.first.to));
+                    const { doc } = state, ref = await getLSP(view, false, toConfigGetter(cm.getWikiConfig, articlePath), baseData.CDN)?.provideDefinition(doc.toString(), indexToPos(doc, tag.first.to));
                     return {
                         pos,
                         end: tag.to,

package/dist/signature.js

@@ -2,16 +2,16 @@ import { EditorView, showTooltip } from '@codemirror/view';
 import { StateField, StateEffect } from '@codemirror/state';
 import { syntaxTree } from '@codemirror/language';
 import { getLSP } from '@bhsd/browser';
-import { base } from './constants.js';
-import { createTooltipView, indexToPos, escHTML, toConfigGetter, findTemplateName, isTemplate, } from './util.js';
-const stateEffect = StateEffect.define(), field = StateField.define({
+import { baseData } from './constants.js';
+import { createTooltipView, indexToPos, escHTML, toConfigGetter, findTemplateName, isTemplateParam, } from './util.js';
+const signatureEffect = StateEffect.define(), signatureField = StateField.define({
     create() {
         return undefined;
     },
     update(oldValue, { state: { doc, selection: { main: { head } } }, effects }) {
         const text = doc.toString();
         for (const effect of effects) {
-            if (effect.is(stateEffect)) {
+            if (effect.is(signatureEffect)) {
                 const { value } = effect;
                 if (head === value.cursor && text === value.text) {
                     return value;
@@ -40,25 +40,25 @@ export const getSignatureHelp = ({ signatures, activeParameter: active }) => sig
 }).join('<br>');
 export default (articlePath) => (cm) => {
     return [
-        field,
+        signatureField,
         EditorView.updateListener.of(({ view, state, docChanged, selectionSet }) => {
-            if (docChanged || selectionSet && state.field(field)?.signatureHelp?.signatures.length) {
+            if (docChanged || selectionSet && state.field(signatureField)?.signatureHelp?.signatures.length) {
                 const { doc, selection: { main } } = state, { head: cursor } = main, text = doc.toString();
                 if (!main.empty) {
                     view.dispatch({
-                        effects: stateEffect.of({ text, cursor }),
+                        effects: signatureEffect.of({ text, cursor }),
                     });
                     return;
                 }
                 (async () => {
-                    let signatureHelp = await getLSP(view, false, toConfigGetter(cm.getWikiConfig, articlePath), base.CDN)?.provideSignatureHelp(text, indexToPos(doc, cursor));
+                    let signatureHelp = await getLSP(view, false, toConfigGetter(cm.getWikiConfig, articlePath), baseData.CDN)?.provideSignatureHelp(text, indexToPos(doc, cursor));
                     if (!signatureHelp && typeof cm.langConfig?.templateSignature === 'function') {
                         const tree = syntaxTree(state);
                         let node = tree.resolve(cursor, -1);
-                        if (node.to === cursor && !isTemplate(node)) {
+                        if (node.to === cursor && !isTemplateParam(node)) {
                             node = tree.resolve(cursor, 1);
                         }
-                        if (isTemplate(node)) {
+                        if (isTemplateParam(node)) {
                             const [templateName, parameterName] = findTemplateName(state, node), tooltip = cm.langConfig.templateSignature(templateName, parameterName);
                             if (tooltip) {
                                 signatureHelp = { signatures: [tooltip] };
@@ -66,7 +66,7 @@ export default (articlePath) => (cm) => {
                         }
                     }
                     view.dispatch({
-                        effects: stateEffect.of({ text, cursor, signatureHelp }),
+                        effects: signatureEffect.of({ text, cursor, signatureHelp }),
                     });
                 })();
             }
@@ -76,12 +76,12 @@ export default (articlePath) => (cm) => {
                 if (key === 'Escape') {
                     const { doc, selection: { main: { head } } } = view.state;
                     view.dispatch({
-                        effects: stateEffect.of({ text: doc.toString(), cursor: head }),
+                        effects: signatureEffect.of({ text: doc.toString(), cursor: head }),
                     });
                 }
             },
         }),
-        showTooltip.from(field, (value) => {
+        showTooltip.from(signatureField, (value) => {
             if (!value) {
                 return null;
             }

package/dist/static.d.ts

@@ -21,6 +21,9 @@ export declare const tagModes: {
     combobox: string;
     combooption: string;
     inputbox: string;
+    templatedata: string;
+    maplink: string;
+    mapframe: string;
 };
 /**
  * @ignore

package/dist/static.js

@@ -20,6 +20,9 @@ export const tagModes = {
     combobox: 'text/combobox',
     combooption: 'mediawiki',
     inputbox: 'text/inputbox',
+    templatedata: 'json',
+    maplink: 'jsonc',
+    mapframe: 'jsonc',
 };
 /**
  * @ignore

package/dist/theme.d.ts

@@ -6,4 +6,4 @@ export declare const light: Extension,
  * @author Bhsd
  * @see https://zh.moegirl.org.cn/User:%E9%AC%BC%E5%BD%B1233/nord-moeskin.css
  */
-nord: Extension;
+nordDark: Extension;

package/dist/theme.js

@@ -1,6 +1,6 @@
 import { EditorView } from '@codemirror/view';
 import { syntaxHighlighting, HighlightStyle, defaultHighlightStyle } from '@codemirror/language';
-import { nord as nordBase } from 'cm6-theme-nord';
+import { nord } from 'cm6-theme-nord';
 import { matchingCls, nonmatchingCls, actionSelector, panelsSelector, bgDark, } from './constants.js';
 const focused = '&.cm-focused', matching = `${focused} .${matchingCls}`, nonmatching = `${focused} .${nonmatchingCls}`;
 export const lightHighlightStyle = /* @__PURE__ */ (() => syntaxHighlighting(HighlightStyle.define(defaultHighlightStyle.specs, { themeType: 'light' })))();
@@ -36,6 +36,9 @@ export const light = /* @__PURE__ */ EditorView.theme({
     '.cm-doctag-type>*': {
         color: '#085',
     },
+    '.cm-doctag-var>*': {
+        color: '#00f',
+    },
     [matching]: {
         backgroundColor: 'rgb(50,140,130,.32)',
     },
@@ -48,8 +51,8 @@ export const light = /* @__PURE__ */ EditorView.theme({
  * @author Bhsd
  * @see https://zh.moegirl.org.cn/User:%E9%AC%BC%E5%BD%B1233/nord-moeskin.css
  */
-nord = /* @__PURE__ */ (() => [
-    nordBase,
+nordDark = /* @__PURE__ */ (() => [
+    nord,
     EditorView.theme({
         '&': {
             '--cm-arg': '#9f78a5',
@@ -81,6 +84,9 @@ nord = /* @__PURE__ */ (() => [
         '.cm-doctag-type>*': {
             color: '#ebcb8b',
         },
+        '.cm-doctag-var>*': {
+            color: '#8fbcbb',
+        },
         'div.cm-activeLine': {
             backgroundColor: 'rgb(76,86,106,.27)',
         },

package/dist/token.d.ts

@@ -4,6 +4,7 @@
  * @see https://gerrit.wikimedia.org/g/mediawiki/extensions/CodeMirror
  */
 import { Tag } from '@lezer/highlight';
+import { jsonBasic, jsonc } from './json.js';
 import type { MwConfig as MwConfigBase } from '@bhsd/cm-util';
 import type { EditorState } from '@codemirror/state';
 import type { StreamParser, StringStream as StringStreamBase } from '@codemirror/language';
@@ -21,21 +22,21 @@ declare interface Nesting extends Record<NestCount, number> {
 export interface State extends Nesting {
     readonly stack: Tokenizer[];
     readonly inHtmlTag: string[];
+    readonly dt: Partial<Nesting> & {
+        n: number;
+        html: number;
+    };
+    readonly data: MediaWikiData;
     tokenize: Tokenizer;
     extMode: StreamParser<object> | false;
     lbrack: boolean | undefined;
     bold: boolean;
     italic: boolean;
-    dt: Partial<Nesting> & {
-        n: number;
-        html: number;
-    };
     sof: boolean;
     redirect: {
         colon: boolean;
     } | false;
     imgLink: boolean;
-    data: MediaWikiData;
 }
 declare type ExtState = Omit<State, 'dt'> & Partial<Pick<State, 'dt'>>;
 declare interface Token {
@@ -206,5 +207,7 @@ export declare class MediaWiki {
     'text/inputbox'(): StreamParser<State>;
     inGallery(section?: boolean): Tokenizer;
     'text/gallery'(tags: string[]): StreamParser<State>;
+    json(): typeof jsonBasic;
+    jsonc(): typeof jsonc;
 }
 export {};

package/dist/token.js

@@ -43,6 +43,7 @@ import { getRegex } from '@bhsd/common';
 import { decodeHTML } from '@bhsd/browser';
 import { otherParserFunctions } from '@bhsd/cm-util';
 import { htmlTags, voidHtmlTags, selfClosingTags, tokenTable, tokens } from './config.js';
+import { jsonBasic, jsonc } from './json.js';
 class MediaWikiData {
     constructor(tags, urlProtocols) {
         this.tags = tags.includes('translate') ? tags.filter(tag => tag !== 'tvar') : tags;
@@ -1229,7 +1230,7 @@ let MediaWiki = (() => {
                 }
                 const t = state.stack[0], pipe = (['inTemplateArgument', 'inParserFunctionArgument', 'inVariable'].includes(t.name) ? '|' : '')
                     + getEqual(t);
-                if (pipe.includes(stream.peek() ?? '')) {
+                if (pipe.includes(stream.peek() || '')) {
                     pop(state);
                     return '';
                 }
@@ -1267,8 +1268,8 @@ let MediaWiki = (() => {
                 const mt = stream.match(re);
                 if (isLang) {
                     let lang = mt[0].trim().toLowerCase();
-                    if (lang === 'js') {
-                        lang = 'javascript';
+                    if (lang === 'wiki' || lang === 'wikitext') {
+                        lang = 'mediawiki';
                     }
                     if (lang in this) {
                         state.extMode = this[lang]();
@@ -1877,6 +1878,12 @@ let MediaWiki = (() => {
                         ? state.extMode.indent(state.extState, textAfter, context)
                         : null;
                 },
+                languageData: {
+                    closeBrackets: {
+                        brackets: ['(', '[', '{', '"'],
+                        before: ')]}>',
+                    },
+                },
                 ...tags
                     ? undefined
                     : {
@@ -2021,6 +2028,12 @@ let MediaWiki = (() => {
                 },
             };
         }
+        json() {
+            return jsonBasic;
+        }
+        jsonc() {
+            return jsonc;
+        }
     };
 })();
 export { MediaWiki };

package/dist/util.d.ts

@@ -57,14 +57,15 @@ export declare const pushDecoration: (decorations: Range<Decoration>[], decorati
  * @param decorations
  * @param from 起始位置
  * @param mt 正则表达式匹配结果，第1个捕获组为标签，第2个捕获组为类型的起始括号`{`
+ * @param offset Decoration 向外扩展的大小，默认为0
  * @test
  */
-export declare const markDocTagType: (decorations: Range<Decoration>[], from: number, mt: RegExpExecArray) => Range<Decoration>[];
+export declare const markDocTagType: (decorations: Range<Decoration>[], from: number, mt: RegExpExecArray, offset?: number) => number;
 /**
  * Check if the node is a template parameter value
  * @param node 语法树节点
  */
-export declare const isTemplate: (node: SyntaxNode) => boolean;
+export declare const isTemplateParam: (node: SyntaxNode) => boolean;
 /**
  * Find the current template name and parameter name
  * @param state

package/dist/util.js

@@ -76,9 +76,10 @@ export const pushDecoration = (decorations, decoration, from, to) => {
  * @param decorations
  * @param from 起始位置
  * @param mt 正则表达式匹配结果，第1个捕获组为标签，第2个捕获组为类型的起始括号`{`
+ * @param offset Decoration 向外扩展的大小，默认为0
  * @test
  */
-export const markDocTagType = (decorations, from, mt) => {
+export const markDocTagType = (decorations, from, mt, offset = 0) => {
     const { input, indices } = mt, [start, end] = indices[1];
     pushDecoration(decorations, doctagMark, from + start, from + end);
     if (mt[2]) {
@@ -88,19 +89,19 @@ export const markDocTagType = (decorations, from, mt) => {
         while (m) {
             balance += m[0] === '{' ? 1 : -1;
             if (balance === 0) {
-                pushDecoration(decorations, typeMark, from + left, from + m.index);
-                break;
+                pushDecoration(decorations, typeMark, from + left - offset, from + m.index + offset);
+                return m.index + 1;
             }
             m = re.exec(input);
         }
     }
-    return decorations;
+    return end;
 };
 /**
  * Check if the node is a template parameter value
  * @param node 语法树节点
  */
-export const isTemplate = (node) => node.name.split('_').includes(tokens.template);
+export const isTemplateParam = (node) => node.name.split('_').includes(tokens.template);
 /**
  * Find the current template name and parameter name
  * @param state
@@ -109,7 +110,7 @@ export const isTemplate = (node) => node.name.split('_').includes(tokens.templat
  */
 export const findTemplateName = (state, node) => {
     let stack = -1, { prevSibling } = node, 
-    /** 可包含`_`、`:`等 */ page = '', parameter = '', need = isTemplate(node);
+    /** 可包含`_`、`:`等 */ page = '', parameter = '', need = isTemplateParam(node);
     while (prevSibling) {
         const { name } = prevSibling;
         if (name.includes(tokens.templateBracket)) {