@bhsd/codemirror-mediawiki 3.9.2 → 3.10.0

package/dist/token.d.ts

@@ -18,7 +18,7 @@ declare interface Nesting extends Record<NestCount, number> {
     extName: string | false;
     extState: object | false;
 }
-declare interface State extends Nesting {
+export interface State extends Nesting {
     readonly stack: Tokenizer[];
     readonly inHtmlTag: string[];
     tokenize: Tokenizer;
@@ -44,11 +44,12 @@ declare interface Token {
     pos: number;
     style: Style;
 }
-declare interface StringStream extends StringStreamBase {
+export interface StringStream extends StringStreamBase {
     match(pattern: string, consume?: boolean, caseInsensitive?: boolean): true | null;
     match(pattern: RegExp, consume?: boolean): RegExpMatchArray | null;
 }
-export type ApiSuggestions = [string, string?][] & {
+export type CompletionSectionName = 'Required' | 'Suggested' | 'Optional' | 'Deprecated';
+export type ApiSuggestions<T = string[]> = [T, string?, string?, CompletionSectionName?][] & {
     description?: string;
 };
 /**
@@ -57,17 +58,17 @@ export type ApiSuggestions = [string, string?][] & {
  * @param subpage 是否为子页面
  * @param namespace 命名空间
  */
-export type ApiSuggest = (search: string, subpage?: boolean, namespace?: number) => ApiSuggestions | Promise<ApiSuggestions>;
+export type ApiSuggest<T = string[]> = (search: string, subpage?: boolean, namespace?: number) => ApiSuggestions<T> | Promise<ApiSuggestions<T>>;
 export interface MwConfig extends MwConfigBase {
     nsid: Record<string, number>;
     variants?: string[];
     img?: Record<string, string>;
     permittedHtmlTags?: string[];
     implicitlyClosedHtmlTags?: string[];
-    linkSuggest?: ApiSuggest;
+    articlePath?: string;
+    linkSuggest?: ApiSuggest<string>;
     paramSuggest?: ApiSuggest;
     titleParser?: (state: EditorState, node: SyntaxNode) => string | undefined;
-    isbnParser?: (link: string) => string;
 }
 declare class MediaWikiData {
     /** 已解析的节点 */
@@ -83,6 +84,19 @@ declare class MediaWikiData {
     readonly urlProtocols: RegExp;
     constructor(tags: string[], urlProtocols: string);
 }
+/**
+ * 是否为行首语法
+ * @param stream
+ * @param table 是否允许表格
+ * @param file 是否为文件
+ */
+export declare const isSolSyntax: (stream: StringStream, table?: boolean, file?: boolean) => unknown;
+/**
+ * 获取负向先行断言
+ * @param chars
+ * @param comment 是否仅排除注释
+ */
+export declare const lookahead: (chars: string, comment?: boolean | State) => string;
 /** Adapted from the original CodeMirror 5 stream parser by Pavel Astakhov */
 export declare class MediaWiki {
     readonly config: MwConfig;

package/dist/token.js

@@ -154,7 +154,7 @@ const pop = (state) => {
  * @param table 是否允许表格
  * @param file 是否为文件
  */
-const isSolSyntax = (stream, table, file) => stream.sol() && (table && stream.match(/^\s*(?::+\s*)?\{\|/u, false)
+export const isSolSyntax = (stream, table, file) => stream.sol() && (table && stream.match(/^\s*(?::+\s*)?\{\|/u, false)
     || stream.match(/^(?:-{4}|=)/u, false)
     || !file && /[*#;:]/u.test(stream.peek() || ''));
 /**
@@ -162,7 +162,7 @@ const isSolSyntax = (stream, table, file) => stream.sol() && (table && stream.ma
  * @param chars
  * @param comment 是否仅排除注释
  */
-const lookahead = (chars, comment) => {
+export const lookahead = (chars, comment) => {
     const table = {
         "'": "'(?!')",
         '{': String.raw `\{(?!\{)`,
@@ -305,6 +305,11 @@ const getQuote = (stream) => {
  * @param t Tokenizer
  */
 const getEqual = (t) => t.name === 'inTemplateArgument' && t.args[0] ? '=' : '';
+/**
+ * 转义字符类中的特殊字符
+ * @param chars 字符类
+ */
+const escapeCharClass = (chars) => chars.replace(/[\]-]/gu, String.raw `\$&`);
 /**
  * 下一个字符是否为空白字符
  * @param stream StringStream
@@ -329,21 +334,21 @@ const syntaxHighlight = new Set(['syntaxhighlight', 'source', 'pre']), pageFunct
     'canonicalurle',
     'int',
     'msgnw',
-]), substs = new Set(['subst', 'safesubst']), headerRegex = new RegExp(`^(?:[^&[<{~'-]|${lookahead("<{~'-")})+`, 'iu'), templateRegex = new RegExp(`^(?:[^|{}<]|${lookahead('{}<', true)})+`, 'u'), argumentRegex = new RegExp(`^(?:[^|[&:}{<~'_＿-]|${lookahead("}{<~'_＿-")})+`, 'iu'), styleRegex = new RegExp(`^(?:[^|[&}{<~'_＿-]|${lookahead("}{<~'_＿-")})+`, 'iu'), wikiRegex = new RegExp(`^(?:[^&'{[<~_＿:-]|${lookahead("'{[<~_＿-")})+`, 'iu'), tableDefinitionRegex = new RegExp(`^(?:[^&={<]|${lookahead('{<')})+`, 'iu'), tableCellRegex = /^\s*(?:[|!]|\{\{\s*![!)+-]?\s*\}\})/u, extLinkChars = "[{'<-", tableDefinitionChars = '{<', tableCellChars = "'<~_＿{-", htmlAttrChars = '{/', freeRegex = [false, true].map(lpar => {
+]), substs = new Set(['subst', 'safesubst']), headerRegex = new RegExp(String.raw `^(?:[^&[<{~'\-]|${lookahead("<{~'-")})+`, 'iu'), templateRegex = new RegExp(`^(?:[^|{}<]|${lookahead('{}<', true)})+`, 'u'), argumentRegex = new RegExp(String.raw `^(?:[^|[&:}{<~'_＿\-]|${lookahead("}{<~'_＿-")})+`, 'iu'), styleRegex = new RegExp(String.raw `^(?:[^|[&}{<~'_＿\-]|${lookahead("}{<~'_＿-")})+`, 'iu'), wikiRegex = new RegExp(String.raw `^(?:[^&:'{[<~_＿\-]|${lookahead("'{[<~_＿-")})+`, 'iu'), tableDefinitionRegex = new RegExp(`^(?:[^&={<]|${lookahead('{<')})+`, 'iu'), tableCellRegex = /^\s*(?:[|!]|\{\{\s*![!)\-+]?\s*\}\})/u, extLinkChars = "[{'<-", tableDefinitionChars = '{<', tableCellChars = "'<~_＿{-", htmlAttrChars = '{/', freeRegex = [false, true].map(lpar => {
     const punctuations = getPunctuations(lpar), source = getUrlRegex(punctuations);
     return new RegExp(`^(?:${source}|[${punctuations}]+(?=${source}))*`, 'u');
 }), indentedTableRegex = [false, true].map(isTemplate => new RegExp(String.raw `^:*\s*(?=\{${getPipe(isTemplate)})`, 'u')), tableRegex = [false, true]
     .map(isTemplate => new RegExp(String.raw `^${getPipe(isTemplate)}\s*`, 'u')), spacedTableRegex = [false, true].map(isTemplate => new RegExp(String.raw `^\s*(:+\s*)?(?=\{${getPipe(isTemplate)})`, 'u')), linkTextRegex = [false, true].map(file => {
     const chars = `]'{<${file ? '~' : '['}-`;
-    return new RegExp(`^(?:[^&${file ? '[|' : ''}\\${chars}]|${lookahead(chars)})+`, 'iu');
+    return new RegExp(`^(?:[^&${file ? '[|' : ''}${escapeCharClass(chars)}]|${lookahead(chars)})+`, 'iu');
 }), linkErrorRegex = [
     new RegExp(String.raw `^(?:[<>{}]|%(?:3[ce]|[57][bd])|${lookahead('[]')})+`, 'iu'),
     new RegExp(String.raw `^(?:\}|${lookahead('[]{')})+`, 'u'),
     new RegExp(String.raw `^(?:[>}]|%(?:3[ce]|[57][bd])|${lookahead('[]{<')})+`, 'iu'),
-], tableDefinitionValueRegex = ['', '='].map(equal => new RegExp(String.raw `^(?:[^\s&${tableDefinitionChars}${equal}]|${lookahead(tableDefinitionChars)})+`, 'iu')), variableRegex = [false, true].map(isDefault => new RegExp(String.raw `^(?:[^|{}<${isDefault ? "[&~'_＿:-" : ''}]|\}(?!\}\})|${isDefault ? lookahead("{<~'_＿-") : lookahead('{<', true)})+`, 'iu')), parserFunctionRegex = ['', '[&', '[&:'].map(s => getRegex(chars => new RegExp(`^(?:[^|${s}${chars}]|${lookahead(chars)})+`, 'iu'))), doubleUnderscoreRegex = {
+], tableDefinitionValueRegex = ['', '='].map(equal => new RegExp(String.raw `^(?:[^\s&${tableDefinitionChars}${equal}]|${lookahead(tableDefinitionChars)})+`, 'iu')), variableRegex = [false, true].map(isDefault => new RegExp(String.raw `^(?:[^|{}<${isDefault ? String.raw `[&~'_＿:\-` : ''}]|\}(?!\}\})|${isDefault ? lookahead("{<~'_＿-") : lookahead('{<', true)})+`, 'iu')), parserFunctionRegex = ['', '[&', '[&:'].map(s => getRegex(chars => new RegExp(`^(?:[^|${s}${escapeCharClass(chars)}]|${lookahead(chars)})+`, 'iu'))), doubleUnderscoreRegex = {
     _: /^[\p{L}\p{N}_]+?__/u,
     '＿': /^[\p{L}\p{N}_＿]+?＿{2}/u,
-}, getExtLinkTextRegex = getRegex(pipe => new RegExp(String.raw `^(?:[^\]&${pipe}${extLinkChars}]|${lookahead(extLinkChars)})+`, 'iu')), getExtLinkRegex = getRegex(pipe => new RegExp(`^(?:${getUrlRegex(pipe)})+`, 'u')), getTableDefinitionRegex = getRegex(s => new RegExp(`^(?:[^&${tableDefinitionChars}${s}]|${lookahead(tableDefinitionChars)})+`, 'iu')), getTableCellRegex = getRegex(s => new RegExp(`^(?:[^[&${s}${tableCellChars}]|${lookahead(tableCellChars)})+`, 'iu')), getHtmlAttrRegex = getRegex(s => new RegExp(`^(?:[^<>&${htmlAttrChars}${s}]|${lookahead(htmlAttrChars)})+`, 'u')), getHtmlAttrKeyRegex = getRegex(pipe => new RegExp(`^(?:[^<>&={/${pipe}]|${lookahead('{/')})+`, 'u')), getExtAttrRegex = getRegex(s => new RegExp(`^(?:[^>/${s}]|${lookahead('/')})+`, 'u')), getExtTagCloseRegex = getRegex(name => name === 'onlyinclude'
+}, getExtLinkTextRegex = getRegex(pipe => new RegExp(String.raw `^(?:[^\]&${pipe}${escapeCharClass(extLinkChars)}]|${lookahead(extLinkChars)})+`, 'iu')), getExtLinkRegex = getRegex(pipe => new RegExp(`^(?:${getUrlRegex(pipe)})+`, 'u')), getTableDefinitionRegex = getRegex(s => new RegExp(`^(?:[^&${tableDefinitionChars}${s}]|${lookahead(tableDefinitionChars)})+`, 'iu')), getTableCellRegex = getRegex(s => new RegExp(`^(?:[^[&${s}${escapeCharClass(tableCellChars)}]|${lookahead(tableCellChars)})+`, 'iu')), getHtmlAttrRegex = getRegex(s => new RegExp(`^(?:[^<>&${htmlAttrChars}${s}]|${lookahead(htmlAttrChars)})+`, 'u')), getHtmlAttrKeyRegex = getRegex(pipe => new RegExp(`^(?:[^<>&={/${pipe}]|${lookahead('{/')})+`, 'u')), getExtAttrRegex = getRegex(s => new RegExp(`^(?:[^>/${s}]|${lookahead('/')})+`, 'u')), getExtTagCloseRegex = getRegex(name => name === 'onlyinclude'
     ? /<\/onlyinclude(?:>|$)/u
     : new RegExp(String.raw `</${name}\s*(?:>|$)`, 'iu')), getNestedRegex = getRegex(tag => new RegExp(String.raw `^(?:[^<]|<(?!${tag}(?:[\s/>]|$)))+`, 'iu'));
 /** Adapted from the original CodeMirror 5 stream parser by Pavel Astakhov */
@@ -463,15 +468,18 @@ let MediaWiki = (() => {
             this.fileRegex = new RegExp(String.raw `^(?:${Object.entries(nsid).filter(([, id]) => id === 6).map(([ns]) => ns).join('|')})\s*:`, 'iu');
             this.redirectRegex = new RegExp(String.raw `^\s*(?:${redirection.join('|')})(\s*:)?\s*(?=\[\[|$)`, 'iu');
             this.img = Object.keys(img).filter(word => !/\$1./u.test(word));
+            const spImgKeys = Object.keys(img).filter(word => word.startsWith('$1'));
             this.imgRegex = new RegExp(String.raw `^(?:${this.img.filter(word => word.endsWith('$1')).map(word => word.slice(0, -2))
-                .join('|')}|(?:${this.img.filter(word => !word.endsWith('$1')).join('|')}|(?:\d+x?|\d*x\d+)\s*(?:px)?px)\s*(?=\||\]\]|$))`, 'u');
+                .join('|')}|(?:${this.img.filter(word => !word.endsWith('$1')).join('|')}|(?:(?:\d+x?|\d*x\d+)\s*(?:px)?(?:${spImgKeys.filter(word => img[word] === 'img_width').map(word => word.slice(2))
+                .join('|')}))|\d+\s*(?:${spImgKeys.filter(word => img[word] !== 'img_width').map(word => word.slice(2))
+                .join('|')}))\s*(?=\||\]\]|$))`, 'u');
             this.tags = [...Object.keys(tags), 'includeonly', 'noinclude', 'onlyinclude'];
-            this.convertRegex = new RegExp(String.raw `^(?:[^}|;&='{[<~_＿-]|\}(?!-)|=(?!>)|\[(?!\[|${urlProtocols})|${lookahead("'{<~_＿-")})+`, 'iu');
+            this.convertRegex = new RegExp(String.raw `^(?:[^}|;&='{[<~_＿\-]|\}(?!-)|=(?!>)|\[(?!\[|${urlProtocols})|${lookahead("'{<~_＿-")})+`, 'iu');
             this.convertSemicolon = variants && new RegExp(String.raw `^;\s*(?=(?:[^;]*?=>\s*)?(?:${variants.join('|')})\s*:|(?:$|\}-))`, 'iu');
             this.convertLang = variants
                 && new RegExp(String.raw `^(?:=>\s*)?(?:${variants.join('|')})\s*:`, 'iu');
             this.hasVariants = Boolean(variants?.length);
-            this.preRegex = [false, true].map(begin => new RegExp(String.raw `^(?:[^<&-]|-${this.hasVariants ? String.raw `(?!\{)` : ''}|<(?!${begin ? '/' : ''}nowiki>))+`, 'iu'));
+            this.preRegex = [false, true].map(begin => new RegExp(String.raw `^(?:[^<&\-]|-${this.hasVariants ? String.raw `(?!\{)` : ''}|<(?!${begin ? '/' : ''}nowiki>))+`, 'iu'));
             this.substRegex = new RegExp(String.raw `^\s*(?:(${Object.entries(insensitive).filter(([, v]) => substs.has(v))
                 .map(([k]) => k + (k.endsWith('：') ? '' : ':'))
                 .join('|')})\s*)?`, 'iu');
@@ -775,7 +783,7 @@ let MediaWiki = (() => {
                             stream.backUp(1);
                         }
                         else {
-                            stream.eatWhile(/[^\p{L}\p{N}_＿&'{[<~:-]/u);
+                            stream.eatWhile(/[^\p{L}\p{N}_＿&'{[<\-~:]/u);
                         }
                         const mt = stream.match(this.urlProtocols, false);
                         if (mt) {
@@ -1046,7 +1054,7 @@ let MediaWiki = (() => {
             return (stream, state) => {
                 if (stream.sol()) {
                     stream.eatSpace();
-                    const mt = stream.match(/^(?:\||\{\{\s*!([!)+-])?\s*\}\})/u);
+                    const mt = stream.match(/^(?:\||\{\{\s*!([!)\-+])?\s*\}\})/u);
                     if (mt) {
                         if (mt[1] === '-' || !mt[1] && stream.eat('-')) {
                             stream.match(/^-*\s*/u);
@@ -1648,7 +1656,7 @@ let MediaWiki = (() => {
                 if (expectName
                     && stream.match(new RegExp(`^(?:[^=|}{[<]|${lookahead('}{[<', state)})*=`, 'iu'))) {
                     state.tokenize = this.inTemplateArgument(false, parserFunction);
-                    return makeLocalTagStyle('templateArgumentName', state);
+                    return makeLocalTagStyle(parserFunction ? 'parserFunctionArgumentName' : 'templateArgumentName', state);
                 }
                 else if (isSolSyntax(stream) && stream.peek() !== '=') {
                     return this.eatWikiText(tag)(stream, state);
@@ -1684,7 +1692,7 @@ let MediaWiki = (() => {
                     if (stream.match('-{', false)) {
                         return this.eatWikiText(style)(stream, state);
                     }
-                    stream.match(/^(?:(?:[^};=-]|\}(?!-)|=(?!>)|-(?!\{))+|;|=>)/u);
+                    stream.match(/^(?:(?:[^}\-;=]|\}(?!-)|=(?!>)|-(?!\{))+|;|=>)/u);
                     return makeStyle(style, state);
                 }
                 return !isSolSyntax(stream, true) && stream.match(this.convertRegex) || space
@@ -1782,16 +1790,17 @@ let MediaWiki = (() => {
                         // get token style
                         stream.start = stream.pos;
                         const char = stream.peek(), style = state.tokenize(stream, state);
-                        if (typeof style === 'string' && style.includes(tokens.templateArgumentName)) {
+                        if (typeof style === 'string' && style.includes('-argument-name')) {
+                            const isTemplate = style.includes(tokens.templateArgumentName), argument = tokens[isTemplate ? 'template' : 'parserFunction'], argumentName = tokens[isTemplate ? 'templateArgumentName' : 'parserFunctionArgumentName'], delimiter = tokens[isTemplate ? 'templateDelimiter' : 'parserFunctionDelimiter'];
                             for (let i = readyTokens.length - 1; i >= 0; i--) {
                                 const token = readyTokens[i];
                                 if (cmpNesting(state, token.state, true)) {
-                                    const types = typeof token.style === 'string' && token.style.split(' '), j = types && types.indexOf(tokens.template);
+                                    const types = typeof token.style === 'string' && token.style.split(' '), j = types && types.indexOf(argument);
                                     if (j !== false && j !== -1) {
-                                        types[j] = tokens.templateArgumentName;
+                                        types[j] = argumentName;
                                         token.style = types.join(' ');
                                     }
-                                    else if (types && types.includes(tokens.templateDelimiter)) {
+                                    else if (types && types.includes(delimiter)) {
                                         break;
                                     }
                                 }

package/dist/util.d.ts

@@ -1,7 +1,9 @@
 import type { EditorView, TooltipView } from '@codemirror/view';
-import type { Text, EditorState } from '@codemirror/state';
+import type { Text, EditorState, SelectionRange } from '@codemirror/state';
 import type { SyntaxNode } from '@lezer/common';
 import type { Position } from 'vscode-languageserver-types';
+import type { ConfigGetter } from '@bhsd/browser';
+import type { TagName } from './config';
 /**
  * 转义HTML字符串
  * @param text 原字符串
@@ -25,18 +27,31 @@ export declare const posToIndex: (doc: Text, pos: Position) => number;
  * @param innerHTML 提示内容
  */
 export declare const createTooltipView: (view: EditorView, innerHTML: string) => TooltipView;
+/**
+ * 获取节点对应的字符串
+ * @param state EditorState 实例
+ * @param node 语法树节点
+ */
+export declare const sliceDoc: (state: EditorState, node: SyntaxNode | SelectionRange) => string;
 /**
  * Update the stack of opening (+) or closing (-) brackets
  * @param state
  * @param node 语法树节点
  */
 export declare const braceStackUpdate: (state: EditorState, node: SyntaxNode) => [number, number];
+/**
+ * Find the current template name
+ * @param state
+ * @param node 语法树节点
+ */
+export declare const findTemplateName: (state: EditorState, node: SyntaxNode) => string | null;
 /**
  * 判断节点是否包含指定类型
  * @param types 节点类型
  * @param names 指定类型
  */
-export declare const hasTag: (types: Set<string>, names: string | string[]) => boolean;
+export declare const hasTag: (types: Set<string>, names: TagName | TagName[]) => boolean;
+export declare const toConfigGetter: (configGetter?: ConfigGetter, articlePath?: string) => ConfigGetter | undefined;
 /**
  * 获取字符串开头的空白字符
  * @param str 字符串

package/dist/util.js

@@ -36,21 +36,59 @@ export const createTooltipView = (view, innerHTML) => {
     inner.innerHTML = innerHTML;
     return { dom };
 };
+/**
+ * 获取节点对应的字符串
+ * @param state EditorState 实例
+ * @param node 语法树节点
+ */
+export const sliceDoc = (state, node) => state.sliceDoc(node.from, node.to);
 /**
  * Update the stack of opening (+) or closing (-) brackets
  * @param state
  * @param node 语法树节点
  */
 export const braceStackUpdate = (state, node) => {
-    const brackets = state.sliceDoc(node.from, node.to);
+    const brackets = sliceDoc(state, node);
     return [brackets.split('{{').length - 1, 1 - brackets.split('}}').length];
 };
+/**
+ * Find the current template name
+ * @param state
+ * @param node 语法树节点
+ */
+export const findTemplateName = (state, node) => {
+    let stack = -1, { prevSibling } = node, 
+    /** 可包含`_`、`:`等 */ page = '';
+    while (prevSibling) {
+        const { name } = prevSibling;
+        if (name.includes(tokens.templateBracket)) {
+            const [lbrace, rbrace] = braceStackUpdate(state, prevSibling);
+            stack += lbrace;
+            if (stack >= 0) {
+                break;
+            }
+            stack += rbrace;
+        }
+        else if (stack === -1 && name.includes(tokens.templateName)) {
+            page = sliceDoc(state, prevSibling) + page;
+        }
+        else if (page && !name.includes(tokens.comment)) {
+            prevSibling = null;
+            break;
+        }
+        ({ prevSibling } = prevSibling);
+    }
+    return prevSibling && page;
+};
 /**
  * 判断节点是否包含指定类型
  * @param types 节点类型
  * @param names 指定类型
  */
 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
+    ? async () => Object.assign(await (configGetter ?? wikiparse.getConfig)(), { articlePath })
+    : configGetter;
 /**
  * 获取字符串开头的空白字符
  * @param str 字符串