@bhsd/codemirror-mediawiki 3.10.0 → 3.10.2

package/dist/mwConfig.js

@@ -161,7 +161,7 @@ var getMwConfig = async (modes) => {
       formatversion: 2
     });
     if (config && !isIPE) {
-      const { functionSynonyms: [insensitive] } = config;
+      const [insensitive] = config.functionSynonyms;
       if (!("subst" in insensitive)) {
         cleanAliases(insensitive);
         Object.assign(insensitive, getConfig(magicwords, ({ name }) => others.has(name)));

package/dist/openLinks.d.ts

@@ -3,7 +3,15 @@ import type { Extension } from '@codemirror/state';
 import type { CodeMirror6 } from './codemirror';
 import type { MwConfig } from './token';
 declare type ISBNParser = (link: string) => string;
+/**
+ * @implements
+ * @test
+ */
 export declare const getISBNParser: (articlePath?: string) => ISBNParser | undefined;
+/**
+ * @ignore
+ * @test
+ */
 export declare const mouseEventListener: (e: MouseEvent, view: EditorView, isbnParser?: ISBNParser, titleParser?: MwConfig["titleParser"]) => string | undefined;
 declare const _default: (articlePath?: string) => ({ langConfig }: CodeMirror6) => Extension;
 export default _default;

package/dist/openLinks.js

@@ -14,6 +14,10 @@ const toggleOpenLinks = ({ contentDOM }, toggle) => {
     contentDOM.style[toggle ? 'setProperty' : 'removeProperty']('--codemirror-cursor', 'pointer');
 };
 const wrapURL = (url) => url.startsWith('//') ? location.protocol + url : url;
+/**
+ * @implements
+ * @test
+ */
 export const getISBNParser = (articlePath) => articlePath
     ? (link) => {
         const page = `Special:Booksources/${link.slice(4).replace(/[\p{Zs}\t-]/gu, '')
@@ -23,6 +27,10 @@ export const getISBNParser = (articlePath) => articlePath
             : articlePath + (articlePath.endsWith('/') ? '' : '/') + page;
     }
     : undefined;
+/**
+ * @ignore
+ * @test
+ */
 export const mouseEventListener = (e, view, isbnParser, titleParser) => {
     if (!e[modKey]
         || !(e.target instanceof Element && getComputedStyle(e.target).textDecorationLine === 'underline')) {

package/dist/ref.d.ts

@@ -1,4 +1,18 @@
-import type { Extension } from '@codemirror/state';
+import type { EditorState, Extension } from '@codemirror/state';
 import type { CodeMirror6 } from './codemirror';
+import type { Tag } from './matchTag';
+/**
+ * 高亮<ref>内容
+ * @param state 编辑器EditorState
+ * @param text <ref>内容
+ * @test
+ */
+export declare const highlightRef: (state: EditorState, text: string) => string;
+/**
+ * 判断是否需要显示悬停提示
+ * @ignore
+ * @test
+ */
+export declare const needHover: (state: EditorState, { name, selfClosing, first, last }: Tag) => boolean;
 declare const _default: (articlePath?: string) => (cm: CodeMirror6) => Extension;
 export default _default;

package/dist/ref.js

@@ -14,77 +14,93 @@ const trees = new WeakMap(), selector = '.cm-tooltip-ref', noDef = '.cm-tooltip-
  * @param node 语法树节点
  */
 const getName = (state, node) => sliceDoc(state, node).trim();
+/**
+ * 高亮<ref>内容
+ * @param state 编辑器EditorState
+ * @param text <ref>内容
+ * @test
+ */
+export const highlightRef = (state, text) => {
+    let result = '';
+    highlightCode(text, state.facet(language).parser.parse(text), {
+        style(tags) {
+            return highlightingFor(state, tags);
+        },
+    }, (code, classes) => {
+        const escaped = escHTML(code);
+        result += classes
+            ? `<span class="${classes}">${escaped}</span>`
+            : escaped;
+    }, () => {
+        result += '<br>';
+    });
+    return result;
+};
+/**
+ * 判断是否需要显示悬停提示
+ * @ignore
+ * @test
+ */
+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);
+            if (prevSibling.name.split('_').includes(tokens.extTagAttribute)
+                && /(?:^|\s)name(?:$|[\s=])/iu.test(key)) {
+                if (/(?:^|\s)name\s*=/iu.test(key)) {
+                    ({ nextSibling } = prevSibling);
+                }
+                break;
+            }
+            ({ prevSibling } = prevSibling);
+        }
+        if (nextSibling?.name.includes(tokens.extTagAttributeValue)) {
+            let target = getName(state, nextSibling);
+            const quote = target.charAt(0);
+            if (quote === '"' || quote === "'") {
+                target = target.slice(1, target.slice(-1) === quote ? -1 : undefined).trim();
+            }
+            if (target) {
+                return true;
+            }
+        }
+    }
+    return false;
+};
 export default (articlePath) => (cm) => {
     return [
         hoverTooltip(async (view, pos, side) => {
             const { state } = view, node = ensureSyntaxTree(state, pos)?.resolve(pos, side);
-            if (node && /-exttag-(?!bracket)/u.test(node.name)) {
+            if (node && node.name.includes('-exttag-')) {
                 const tag = getTag(state, node);
-                if (!tag) {
-                    return null;
-                }
-                const { name, selfClosing, first, last, to } = tag;
-                if (name === 'ref' && selfClosing) {
-                    let prevSibling = last, nextSibling = null;
-                    while (prevSibling && prevSibling.from > first.to) {
-                        const key = getName(state, prevSibling);
-                        if (prevSibling.name.split('_').includes(tokens.extTagAttribute)
-                            && /(?:^|\s)name(?:$|[\s=])/iu.test(key)) {
-                            if (/(?:^|\s)name\s*=/iu.test(key)) {
-                                ({ nextSibling } = prevSibling);
+                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));
+                    return {
+                        pos,
+                        end: tag.to,
+                        above: true,
+                        create() {
+                            const dom = elt('div', { class: selector.slice(1) });
+                            dom.style.font = getComputedStyle(view.contentDOM).font;
+                            if (ref) {
+                                const { start, end } = ref[0].range, anchor = posToIndex(doc, start), head = posToIndex(doc, end);
+                                dom.innerHTML = highlightRef(state, state.sliceDoc(anchor, head));
+                                dom.addEventListener('click', () => {
+                                    view.dispatch({
+                                        selection: { anchor, head },
+                                        scrollIntoView: true,
+                                    });
+                                    view.focus();
+                                });
+                            }
+                            else {
+                                dom.textContent = state.phrase('No definition found');
+                                dom.classList.add(noDef.slice(1));
                             }
-                            break;
-                        }
-                        ({ prevSibling } = prevSibling);
-                    }
-                    if (nextSibling?.name.includes(tokens.extTagAttributeValue)) {
-                        let target = getName(state, nextSibling);
-                        const quote = target.charAt(0);
-                        if (quote === '"' || quote === "'") {
-                            target = target.slice(1, target.slice(-1) === quote ? -1 : undefined).trim();
-                        }
-                        if (target) {
-                            const { doc } = state, ref = await getLSP(view, false, toConfigGetter(cm.getWikiConfig, articlePath), base.CDN)?.provideDefinition(doc.toString(), indexToPos(doc, first.to));
-                            return {
-                                pos,
-                                end: to,
-                                above: true,
-                                create() {
-                                    const dom = elt('div', { class: selector.slice(1) });
-                                    dom.style.font = getComputedStyle(view.contentDOM).font;
-                                    if (ref) {
-                                        const { range: { start, end } } = ref[0], anchor = posToIndex(doc, start), head = posToIndex(doc, end), text = state.sliceDoc(anchor, head);
-                                        let result = '';
-                                        highlightCode(text, state.facet(language).parser.parse(text), {
-                                            style(tags) {
-                                                return highlightingFor(state, tags);
-                                            },
-                                        }, (code, classes) => {
-                                            const escaped = escHTML(code);
-                                            result += classes
-                                                ? `<span class="${classes}">${escaped}</span>`
-                                                : escaped;
-                                        }, () => {
-                                            result += '<br>';
-                                        });
-                                        dom.innerHTML = result;
-                                        dom.addEventListener('click', () => {
-                                            view.dispatch({
-                                                selection: { anchor, head },
-                                                scrollIntoView: true,
-                                            });
-                                            view.focus();
-                                        });
-                                    }
-                                    else {
-                                        dom.textContent = state.phrase('No definition found');
-                                        dom.classList.add(noDef.slice(1));
-                                    }
-                                    return { dom };
-                                },
-                            };
-                        }
-                    }
+                            return { dom };
+                        },
+                    };
                 }
             }
             return null;

package/dist/signature.d.ts

@@ -1,4 +1,10 @@
 import type { Extension } from '@codemirror/state';
+import type { SignatureHelp } from 'vscode-languageserver-types';
 import type { CodeMirror6 } from './codemirror';
+/**
+ * @ignore
+ * @test
+ */
+export declare const getSignatureHelp: ({ signatures, activeParameter: active }: SignatureHelp) => string;
 declare const _default: (articlePath?: string) => (cm: CodeMirror6) => Extension;
 export default _default;

package/dist/signature.js

@@ -20,6 +20,19 @@ const stateEffect = StateEffect.define(), field = StateField.define({
         return oldValue;
     },
 });
+/**
+ * @ignore
+ * @test
+ */
+export const getSignatureHelp = ({ signatures, activeParameter: active }) => signatures.map(({ label, parameters, activeParameter = active }) => {
+    const safeLabel = escHTML(label);
+    if (activeParameter < 0 || activeParameter >= parameters.length) {
+        return safeLabel;
+    }
+    const colon = safeLabel.indexOf(':'), parts = safeLabel.slice(colon + 1, -2).split('|');
+    parts[activeParameter] = `<b>${parts[activeParameter]}</b>`;
+    return `${safeLabel.slice(0, colon)}:${parts.join('|')}}}`;
+}).join('<br>');
 export default (articlePath) => (cm) => {
     return [
         field,
@@ -48,25 +61,15 @@ export default (articlePath) => (cm) => {
                 return null;
             }
             const { cursor, signatureHelp } = value;
-            if (!signatureHelp || signatureHelp.signatures.length === 0) {
-                return null;
-            }
-            const { signatures, activeParameter: active } = signatureHelp;
-            return {
-                pos: cursor,
-                above: true,
-                create(view) {
-                    return createTooltipView(view, signatures.map(({ label, parameters, activeParameter = active }) => {
-                        const safeLabel = escHTML(label);
-                        if (activeParameter < 0 || activeParameter >= parameters.length) {
-                            return safeLabel;
-                        }
-                        const colon = safeLabel.indexOf(':'), parts = safeLabel.slice(colon + 1, -2).split('|');
-                        parts[activeParameter] = `<b>${parts[activeParameter]}</b>`;
-                        return `${safeLabel.slice(0, colon)}:${parts.join('|')}}}`;
-                    }).join('<br>'));
-                },
-            };
+            return signatureHelp && signatureHelp.signatures.length > 0
+                ? {
+                    pos: cursor,
+                    above: true,
+                    create(view) {
+                        return createTooltipView(view, getSignatureHelp(signatureHelp));
+                    },
+                }
+                : null;
         }),
     ];
 };

package/dist/static.d.ts

@@ -22,4 +22,8 @@ export declare const tagModes: {
     combooption: string;
     inputbox: string;
 };
+/**
+ * @ignore
+ * @test
+ */
 export declare const getStaticMwConfig: ({ variable, parserFunction: [p0, p1, ...p2], protocol, nsid, functionHook, variants, redirection, ext, doubleUnderscore: [d0, d1, d2, d3], img, }: ConfigData, modes: Record<string, string>) => MwConfig;

package/dist/static.js

@@ -21,6 +21,10 @@ export const tagModes = {
     combooption: 'mediawiki',
     inputbox: 'text/inputbox',
 };
+/**
+ * @ignore
+ * @test
+ */
 export const getStaticMwConfig = ({ variable, parserFunction: [p0, p1, ...p2], protocol, nsid, functionHook, variants, redirection, ext, doubleUnderscore: [d0, d1, d2, d3], img, }, modes) => ({
     tags: Object.fromEntries(ext.map(s => [s, true])),
     tagModes: modes,

package/dist/theme.d.ts

@@ -1,4 +1,5 @@
 import type { Extension } from '@codemirror/state';
+export declare const getLightHighlightStyle: () => Extension;
 export declare const light: Extension, 
 /**
  * @author 鬼影233

package/dist/theme.js

@@ -1,7 +1,9 @@
 import { EditorView } from '@codemirror/view';
+import { syntaxHighlighting, HighlightStyle, defaultHighlightStyle } from '@codemirror/language';
 import { nord as nordBase } 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 getLightHighlightStyle = () => syntaxHighlighting(HighlightStyle.define(defaultHighlightStyle.specs, { themeType: 'light' }));
 export const light = /* @__PURE__ */ EditorView.theme({
     '&': {
         backgroundColor: '#fff',
@@ -26,7 +28,7 @@ export const light = /* @__PURE__ */ EditorView.theme({
         '--cm-ref': 'rgb(223,242,235,.5)',
     },
     '.cm-globals, .cm-globals>*': {
-        color: '#256',
+        color: '#164',
     },
     [matching]: {
         backgroundColor: 'rgb(50,140,130,.32)',

package/dist/token.d.ts

@@ -13,7 +13,7 @@ declare type Style = string | [string];
 declare type Tokenizer<T = Style> = ((stream: StringStream, state: State) => T) & {
     args?: unknown[];
 };
-declare type NestCount = 'nTemplate' | 'nExt' | 'nVar' | 'nLink' | 'nExtLink';
+export type NestCount = 'nTemplate' | 'nExt' | 'nVar' | 'nLink' | 'nExtLink';
 declare interface Nesting extends Record<NestCount, number> {
     extName: string | false;
     extState: object | false;
@@ -37,6 +37,7 @@ export interface State extends Nesting {
     imgLink: boolean;
     data: MediaWikiData;
 }
+declare type ExtState = Omit<State, 'dt'> & Partial<Pick<State, 'dt'>>;
 declare interface Token {
     readonly char?: string | undefined;
     readonly string: string;
@@ -89,14 +90,21 @@ declare class MediaWikiData {
  * @param stream
  * @param table 是否允许表格
  * @param file 是否为文件
+ * @test
  */
 export declare const isSolSyntax: (stream: StringStream, table?: boolean, file?: boolean) => unknown;
 /**
  * 获取负向先行断言
  * @param chars
  * @param comment 是否仅排除注释
+ * @test
  */
 export declare const lookahead: (chars: string, comment?: boolean | State) => string;
+/**
+ * @ignore
+ * @test
+ */
+export declare const makeLocalStyle: (style: string, state: ExtState, endGround?: NestCount) => string;
 /** Adapted from the original CodeMirror 5 stream parser by Pavel Astakhov */
 export declare class MediaWiki {
     readonly config: MwConfig;

package/dist/token.js

@@ -153,6 +153,7 @@ const pop = (state) => {
  * @param stream
  * @param table 是否允许表格
  * @param file 是否为文件
+ * @test
  */
 export const isSolSyntax = (stream, table, file) => stream.sol() && (table && stream.match(/^\s*(?::+\s*)?\{\|/u, false)
     || stream.match(/^(?:-{4}|=)/u, false)
@@ -161,6 +162,7 @@ export const isSolSyntax = (stream, table, file) => stream.sol() && (table && st
  * 获取负向先行断言
  * @param chars
  * @param comment 是否仅排除注释
+ * @test
  */
 export const lookahead = (chars, comment) => {
     const table = {
@@ -177,7 +179,7 @@ export const lookahead = (chars, comment) => {
         '-': String.raw `-(?!\{(?!\{))`,
     };
     if (typeof comment === 'object') {
-        const { data: { tags } } = comment;
+        const { tags } = comment.data;
         table['<'] = String.raw `<(?!!--${tags.includes('onlyinclude') ? '|onlyinclude>' : ''}|(?:${tags.filter(tag => tag !== 'onlyinclude').join('|')})(?:[\s/>]|$))`;
     }
     return [...chars].map(ch => table[ch]).join('|');
@@ -212,7 +214,11 @@ const getTokenizer = (method, context) => function (...args) {
 const makeFullStyle = (style, state) => (typeof style === 'string'
     ? style
     : `${style[0]} ${state.bold || state.dt?.n ? tokens.strong : ''} ${state.italic ? tokens.em : ''}`).trim().replace(/\s{2,}/gu, ' ') || ' ';
-const makeLocalStyle = (style, state, endGround) => {
+/**
+ * @ignore
+ * @test
+ */
+export const makeLocalStyle = (style, state, endGround) => {
     let ground = '';
     switch (state.nTemplate) {
         case 0:
@@ -988,7 +994,7 @@ let MediaWiki = (() => {
             return makeLocalTagStyle('list', state);
         }
         eatDoubleUnderscore(style, ch, stream, state) {
-            const { config: { doubleUnderscore } } = this, underscore = ch.repeat(2), name = stream.match(doubleUnderscoreRegex[ch]);
+            const { doubleUnderscore } = this.config, underscore = ch.repeat(2), name = stream.match(doubleUnderscoreRegex[ch]);
             if (name) {
                 if (Object.prototype.hasOwnProperty.call(doubleUnderscore[0], underscore + name[0].toLowerCase())
                     || Object.prototype.hasOwnProperty.call(doubleUnderscore[1], underscore + name[0])) {
@@ -1277,7 +1283,7 @@ let MediaWiki = (() => {
                     return makeLocalTagStyle('extTagBracket', state);
                 }
                 else if (stream.eat('>')) {
-                    const { config: { tagModes } } = this;
+                    const { tagModes } = this.config;
                     state.extName = name;
                     state.extMode ||= name in tagModes && (tagModes[name]) in this
                         && this[tagModes[name]]([
@@ -1415,7 +1421,7 @@ let MediaWiki = (() => {
                 else if (delimiter !== ':') {
                     ff = f.trim();
                 }
-                const ffLower = ff.toLowerCase(), { config: { functionSynonyms, variableIDs, functionHooks } } = this, canonicalName = Object.prototype.hasOwnProperty.call(functionSynonyms[1], ff)
+                const ffLower = ff.toLowerCase(), { functionSynonyms, variableIDs, functionHooks } = this.config, canonicalName = Object.prototype.hasOwnProperty.call(functionSynonyms[1], ff)
                     && functionSynonyms[1][ff]
                     || Object.prototype.hasOwnProperty.call(functionSynonyms[0], ffLower)
                         && functionSynonyms[0][ffLower];
@@ -1482,7 +1488,7 @@ let MediaWiki = (() => {
                 }
                 const mt = stream.match(/^(?:[^:：}{|<>[\]\s]|\s(?![:：]))+/u);
                 if (mt) {
-                    const name = mt[0].trim().toLowerCase() + (stream.peek() === '：' ? '：' : ''), { config: { functionSynonyms: [insensitive] } } = this;
+                    const name = mt[0].trim().toLowerCase() + (stream.peek() === '：' ? '：' : ''), [insensitive] = this.config.functionSynonyms;
                     if (name.startsWith('#')) {
                         switch (insensitive[name] ?? insensitive[name.slice(1)]) {
                             case 'invoke':

package/dist/util.d.ts

@@ -7,18 +7,21 @@ import type { TagName } from './config';
 /**
  * 转义HTML字符串
  * @param text 原字符串
+ * @test
  */
 export declare const escHTML: (text: string) => string;
 /**
  * 将索引转换为位置
  * @param doc Text 实例
  * @param index 索引
+ * @test
  */
 export declare const indexToPos: (doc: Text, index: number) => Position;
 /**
  * 将位置转换为索引
  * @param doc Text 实例
  * @param pos 位置
+ * @test
  */
 export declare const posToIndex: (doc: Text, pos: Position) => number;
 /**
@@ -31,29 +34,34 @@ export declare const createTooltipView: (view: EditorView, innerHTML: string) =>
  * 获取节点对应的字符串
  * @param state EditorState 实例
  * @param node 语法树节点
+ * @test
  */
 export declare const sliceDoc: (state: EditorState, node: SyntaxNode | SelectionRange) => string;
 /**
  * Update the stack of opening (+) or closing (-) brackets
  * @param state
  * @param node 语法树节点
+ * @test
  */
 export declare const braceStackUpdate: (state: EditorState, node: SyntaxNode) => [number, number];
 /**
  * Find the current template name
  * @param state
  * @param node 语法树节点
+ * @test
  */
 export declare const findTemplateName: (state: EditorState, node: SyntaxNode) => string | null;
 /**
  * 判断节点是否包含指定类型
  * @param types 节点类型
  * @param names 指定类型
+ * @test
  */
 export declare const hasTag: (types: Set<string>, names: TagName | TagName[]) => boolean;
 export declare const toConfigGetter: (configGetter?: ConfigGetter, articlePath?: string) => ConfigGetter | undefined;
 /**
  * 获取字符串开头的空白字符
  * @param str 字符串
+ * @test
  */
 export declare const leadingSpaces: (str: string) => string;

package/dist/util.js

@@ -5,12 +5,14 @@ const dict = { '\n': '<br>', '&': '&amp;', '<': '&lt;' };
 /**
  * 转义HTML字符串
  * @param text 原字符串
+ * @test
  */
 export const escHTML = (text) => text.replace(/[\n<&]/gu, ch => dict[ch]);
 /**
  * 将索引转换为位置
  * @param doc Text 实例
  * @param index 索引
+ * @test
  */
 export const indexToPos = (doc, index) => {
     const line = doc.lineAt(index);
@@ -20,6 +22,7 @@ export const indexToPos = (doc, index) => {
  * 将位置转换为索引
  * @param doc Text 实例
  * @param pos 位置
+ * @test
  */
 export const posToIndex = (doc, pos) => {
     const line = doc.line(pos.line + 1);
@@ -40,12 +43,14 @@ export const createTooltipView = (view, innerHTML) => {
  * 获取节点对应的字符串
  * @param state EditorState 实例
  * @param node 语法树节点
+ * @test
  */
 export const sliceDoc = (state, node) => state.sliceDoc(node.from, node.to);
 /**
  * Update the stack of opening (+) or closing (-) brackets
  * @param state
  * @param node 语法树节点
+ * @test
  */
 export const braceStackUpdate = (state, node) => {
     const brackets = sliceDoc(state, node);
@@ -55,6 +60,7 @@ export const braceStackUpdate = (state, node) => {
  * Find the current template name
  * @param state
  * @param node 语法树节点
+ * @test
  */
 export const findTemplateName = (state, node) => {
     let stack = -1, { prevSibling } = node, 
@@ -84,6 +90,7 @@ export const findTemplateName = (state, node) => {
  * 判断节点是否包含指定类型
  * @param types 节点类型
  * @param names 指定类型
+ * @test
  */
 export const hasTag = (types, names) => (Array.isArray(names) ? names : [names]).some(name => types.has(name in tokens ? tokens[name] : name));
 export const toConfigGetter = (configGetter, articlePath) => articlePath
@@ -92,5 +99,6 @@ export const toConfigGetter = (configGetter, articlePath) => articlePath
 /**
  * 获取字符串开头的空白字符
  * @param str 字符串
+ * @test
  */
 export const leadingSpaces = (str) => /^\s*/u.exec(str)[0];