@bhsd/codemirror-mediawiki 3.12.2 → 3.12.3

package/dist/static.d.ts

@@ -24,6 +24,10 @@ export declare const tagModes: {
     templatedata: string;
     maplink: string;
     mapframe: string;
+    math: string;
+    chem: string;
+    ce: string;
+    score: string;
 };
 /**
  * @ignore

package/dist/static.js

@@ -23,6 +23,10 @@ export const tagModes = {
     templatedata: 'json',
     maplink: 'jsonc',
     mapframe: 'jsonc',
+    math: 'text/math',
+    chem: 'text/math',
+    ce: 'text/math',
+    score: 'lilypond',
 };
 /**
  * @ignore

package/dist/token.d.ts

@@ -4,7 +4,6 @@
  * @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';
@@ -28,7 +27,7 @@ export interface State extends Nesting {
     };
     readonly data: MediaWikiData;
     tokenize: Tokenizer;
-    extMode: StreamParser<object> | false;
+    extMode: StreamParser<object> | boolean;
     lbrack: boolean | undefined;
     bold: boolean;
     italic: boolean;
@@ -207,7 +206,9 @@ export declare class MediaWiki {
     'text/inputbox'(): StreamParser<State>;
     inGallery(section?: boolean): Tokenizer;
     'text/gallery'(tags: string[]): StreamParser<State>;
-    json(): typeof jsonBasic;
-    jsonc(): typeof jsonc;
+    'text/math'(): StreamParser<object>;
+    json(): StreamParser<object>;
+    jsonc(): StreamParser<object>;
+    lilypond(): StreamParser<object>;
 }
 export {};

package/dist/token.js

@@ -44,6 +44,8 @@ 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';
+import { math } from './math.js';
+import { lilypond } from './lilypond.js';
 class MediaWikiData {
     constructor(tags, urlProtocols) {
         this.tags = tags.includes('translate') ? tags.filter(tag => tag !== 'tvar') : tags;
@@ -120,7 +122,10 @@ const copyState = (state) => {
             result[key] = [...val];
         }
         else if (key === 'extState') {
-            result[key] = (state.extName && state.extMode && state.extMode.copyState || copyState)(val);
+            const f = state.extName && typeof state.extMode !== 'boolean'
+                && state.extMode.copyState?.bind(state.extMode)
+                || copyState;
+            result[key] = f(val);
         }
         else if (key !== 'data' && key !== 'extMode' && val && typeof val === 'object') {
             // @ts-expect-error initial value
@@ -331,7 +336,7 @@ const peekSpace = (stream, sol) => {
     const peek = stream.peek();
     return Boolean(peek && !peek.trim());
 };
-const syntaxHighlight = new Set(['syntaxhighlight', 'source', 'pre']), pageFunctions = new Set([
+const syntaxHighlight = new Set(['syntaxhighlight', 'source', 'pre', 'score']), pageFunctions = new Set([
     'raw',
     'msg',
     'filepath',
@@ -343,7 +348,7 @@ const syntaxHighlight = new Set(['syntaxhighlight', 'source', 'pre']), pageFunct
     'canonicalurle',
     'int',
     'msgnw',
-]), 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 => {
+]), substs = new Set(['subst', 'safesubst']), extLinkChars = "[{'<-", tableDefinitionChars = '{<', tableCellChars = "'<~_＿{-", htmlAttrChars = '{/', tableDefinitionLookAhead = lookahead(tableDefinitionChars), htmlAttrLookAhead = lookahead(htmlAttrChars), tableCellLookAhead = lookahead(tableCellChars), argumentLookAhead = lookahead("}{<~'_＿-"), headerRegex = new RegExp(String.raw `^(?:[^&[<{~'\-]|${lookahead("<{~'-")})+`, 'iu'), templateRegex = new RegExp(`^(?:[^|{}<]|${lookahead('{}<', true)})+`, 'u'), argumentRegex = new RegExp(String.raw `^(?:[^|[&:}{<~'_＿\-]|${argumentLookAhead})+`, 'iu'), styleRegex = new RegExp(String.raw `^(?:[^|[&}{<~'_＿\-]|${argumentLookAhead})+`, 'iu'), wikiRegex = new RegExp(String.raw `^(?:[^&:'{[<~_＿\-]|${lookahead("'{[<~_＿-")})+`, 'iu'), tableDefinitionRegex = new RegExp(`^(?:[^&={<]|${tableDefinitionLookAhead})+`, 'iu'), tableCellRegex = /^\s*(?:[|!]|\{\{\s*![!)\-+]?\s*\}\})/u, 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]
@@ -354,10 +359,10 @@ const syntaxHighlight = new Set(['syntaxhighlight', 'source', 'pre']), pageFunct
     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 ? String.raw `[&~'_＿:\-` : ''}]|\}(?!\}\})|${isDefault ? lookahead("{<~'_＿-") : lookahead('{<', true)})+`, 'iu')), parserFunctionRegex = ['', '[&', '[&:'].map(s => getRegex(chars => new RegExp(`^(?:[^|${s}${escapeCharClass(chars)}]|${lookahead(chars)})+`, 'iu'))), doubleUnderscoreRegex = {
+], tableDefinitionValueRegex = ['', '='].map(equal => new RegExp(String.raw `^(?:[^\s&${tableDefinitionChars}${equal}]|${tableDefinitionLookAhead})+`, 'iu')), variableRegex = [false, true].map(isDefault => new RegExp(String.raw `^(?:[^|{}<${isDefault ? String.raw `[&~'_＿:\-` : ''}]|\}(?!\}\})|${isDefault ? tableCellLookAhead : lookahead(tableDefinitionChars, 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}${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'
+}, 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}]|${tableDefinitionLookAhead})+`, 'iu')), getTableCellRegex = getRegex(s => new RegExp(`^(?:[^[&${s}${escapeCharClass(tableCellChars)}]|${tableCellLookAhead})+`, 'iu')), getHtmlAttrRegex = getRegex(s => new RegExp(`^(?:[^<>&${htmlAttrChars}${s}]|${htmlAttrLookAhead})+`, 'u')), getHtmlAttrKeyRegex = getRegex(pipe => new RegExp(`^(?:[^<>&={/${pipe}]|${htmlAttrLookAhead})+`, '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 */
@@ -483,7 +488,7 @@ let MediaWiki = (() => {
                 .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})|${tableCellLookAhead})+`, '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');
@@ -560,6 +565,9 @@ let MediaWiki = (() => {
             }
             for (const tag of this.tags) {
                 this.addToken(`tag-${tag}`, tag !== 'nowiki' && tag !== 'pre' && tag !== 'ref');
+                if (tag === 'score') {
+                    this.addToken('tag-score-scheme');
+                }
                 this.addToken(`ext-${tag}`, true);
             }
             for (const tag of this.permittedHtmlTags) {
@@ -1267,12 +1275,17 @@ let MediaWiki = (() => {
             const advance = (stream, state, re) => {
                 const mt = stream.match(re);
                 if (isLang) {
-                    let lang = mt[0].trim().toLowerCase();
-                    if (lang === 'wiki' || lang === 'wikitext') {
-                        lang = 'mediawiki';
+                    if (name !== 'score') {
+                        let lang = mt[0].trim().toLowerCase();
+                        if (lang === 'wiki' || lang === 'wikitext') {
+                            lang = 'mediawiki';
+                        }
+                        if (lang in this.config.tagModes && lang in this) {
+                            state.extMode = this[lang]();
+                        }
                     }
-                    if (lang in this) {
-                        state.extMode = this[lang]();
+                    else if (mt[0].trim() === 'ABC') {
+                        state.extMode = true;
                     }
                 }
                 return makeLocalStyle(tokens.extTagAttributeValue + (isPage ? ` ${tokens.pageName}` : ''), state);
@@ -1295,7 +1308,7 @@ let MediaWiki = (() => {
                             ...state.data.tags.filter(tag => tag !== name),
                             ...name === 'translate' ? ['tvar'] : [],
                         ]);
-                    if (state.extMode) {
+                    if (typeof state.extMode !== 'boolean') {
                         state.extState = state.extMode.startState(0);
                     }
                     state.tokenize = this.eatExtTagArea(name);
@@ -1350,7 +1363,7 @@ let MediaWiki = (() => {
         inExtTokens(origString) {
             return (stream, state) => {
                 let ret;
-                if (state.extMode === false) {
+                if (typeof state.extMode === 'boolean') {
                     ret = `mw-tag-${state.extName} ${tokens.extTag}`;
                     stream.skipToEnd();
                 }
@@ -1710,7 +1723,7 @@ let MediaWiki = (() => {
             };
         }
         eatEntity(stream, style) {
-            const entity = stream.match(/^(?:#x[a-f\d]+|#\d+|[a-z\d]+);/iu);
+            const entity = stream.match(/^(?:#x[a-f\d]+|#\d+|[a-z][a-z\d]*);/iu);
             return entity && isHtmlEntity(entity[0]) ? tokens.htmlEntity : style;
         }
         /**
@@ -1746,7 +1759,7 @@ let MediaWiki = (() => {
                                 state[key] = other[key];
                             }
                         }
-                        if (!(state.extName && state.extMode)
+                        if (!(state.extName && typeof state.extMode !== 'boolean')
                             && state.nLink === 0
                             && typeof style === 'string'
                             && style.includes(tokens.apostrophes)) {
@@ -1869,12 +1882,12 @@ let MediaWiki = (() => {
                     return '';
                 },
                 blankLine(state) {
-                    if (state.extName && state.extMode && state.extMode.blankLine) {
+                    if (state.extName && typeof state.extMode !== 'boolean' && state.extMode.blankLine) {
                         state.extMode.blankLine(state.extState, 0);
                     }
                 },
                 indent(state, textAfter, context) {
-                    return state.extName && state.extMode && state.extMode.indent
+                    return state.extName && typeof state.extMode !== 'boolean' && state.extMode.indent
                         ? state.extMode.indent(state.extState, textAfter, context)
                         : null;
                 },
@@ -1985,8 +1998,10 @@ let MediaWiki = (() => {
                     chain(state, this.inComment);
                     return tokens.comment;
                 }
-                /** @todo braces should also be parsed */
-                stream.match(/^(?:[^<]|<(?!!--))+/u);
+                else if (stream.match(/^\{\{(?!\{)/u)) {
+                    return this.eatTransclusion(stream, state) ?? '';
+                }
+                stream.match(/^(?:[^<{]|<(?!!--)|\{(?!\{(?!\{)))+/u);
                 return '';
             };
         }
@@ -2028,12 +2043,18 @@ let MediaWiki = (() => {
                 },
             };
         }
+        'text/math'() {
+            return math;
+        }
         json() {
             return jsonBasic;
         }
         jsonc() {
             return jsonc;
         }
+        lilypond() {
+            return lilypond;
+        }
     };
 })();
 export { MediaWiki };

package/dist/util.d.ts

@@ -1,9 +1,14 @@
 import type { EditorView, TooltipView, Decoration } from '@codemirror/view';
 import type { Text, EditorState, SelectionRange, Range } from '@codemirror/state';
+import type { StringStream } from '@codemirror/language';
+import type { Completion } from '@codemirror/autocomplete';
 import type { SyntaxNode } from '@lezer/common';
 import type { Position } from 'vscode-languageserver-types';
 import type { ConfigGetter } from '@bhsd/browser';
-import type { DocRange } from './fold';
+export interface DocRange {
+    from: number;
+    to: number;
+}
 /**
  * 转义HTML字符串
  * @param text 原字符串
@@ -52,6 +57,32 @@ export declare const braceStackUpdate: (state: EditorState, node: SyntaxNode) =>
  * @param to 结束位置
  */
 export declare const pushDecoration: (decorations: Range<Decoration>[], decoration: Decoration, from: number | DocRange, to?: number) => void;
+export declare const toConfigGetter: (configGetter?: ConfigGetter, articlePath?: string) => ConfigGetter | undefined;
+/**
+ * Tokenizer for multiline comments
+ * @param parent 外层 Tokenizer
+ * @param end 注释结束标志
+ */
+export declare const inComment: <T extends {
+    tokenize(stream: StringStream, state: T): string;
+}>(parent: (stream: StringStream, state: T) => string, end: string) => (stream: StringStream, state: T) => string;
+/**
+ * 生成自动补全选项
+ * @param labels 选项标签列表
+ * @param type 选项类型
+ */
+export declare const getCompletions: (labels: string[], type?: string) => Completion[];
+/**
+ * 从Token类型中获取扩展标签名
+ * @param types Token类型列表
+ */
+export declare const getExtTags: (types: string[]) => string[];
+/**
+ * 获取字符串开头的空白字符
+ * @param str 字符串
+ * @test
+ */
+export declare const leadingSpaces: (str: string) => string;
 /**
  * Mark the type in a JSDoc/LDoc comment
  * @param decorations
@@ -73,10 +104,3 @@ export declare const isTemplateParam: (node: SyntaxNode) => boolean;
  * @test
  */
 export declare const findTemplateName: (state: EditorState, node: SyntaxNode) => [string | null, string];
-export declare const toConfigGetter: (configGetter?: ConfigGetter, articlePath?: string) => ConfigGetter | undefined;
-/**
- * 获取字符串开头的空白字符
- * @param str 字符串
- * @test
- */
-export declare const leadingSpaces: (str: string) => string;

package/dist/util.js

@@ -71,6 +71,42 @@ export const pushDecoration = (decorations, decoration, from, to) => {
         decorations.push(decoration.range(from, to));
     }
 };
+export const toConfigGetter = (configGetter, articlePath) => articlePath
+    ? async () => Object.assign(await (configGetter ?? wikiparse.getConfig)(), { articlePath })
+    : configGetter;
+/**
+ * Tokenizer for multiline comments
+ * @param parent 外层 Tokenizer
+ * @param end 注释结束标志
+ */
+export const inComment = (parent, end) => (stream, state) => {
+    if (stream.skipTo(end)) {
+        stream.next();
+        stream.next();
+        state.tokenize = parent;
+    }
+    else {
+        stream.skipToEnd();
+    }
+    return 'comment';
+};
+/**
+ * 生成自动补全选项
+ * @param labels 选项标签列表
+ * @param type 选项类型
+ */
+export const getCompletions = (labels, type = 'keyword') => labels.map((label) => ({ label, type }));
+/**
+ * 从Token类型中获取扩展标签名
+ * @param types Token类型列表
+ */
+export const getExtTags = (types) => types.filter(type => type.startsWith('mw-tag-')).map(type => type.slice(7));
+/**
+ * 获取字符串开头的空白字符
+ * @param str 字符串
+ * @test
+ */
+export const leadingSpaces = (str) => /^\s*/u.exec(str)[0];
 /**
  * Mark the type in a JSDoc/LDoc comment
  * @param decorations
@@ -150,12 +186,3 @@ export const findTemplateName = (state, node) => {
     }
     return [prevSibling && page, parameter];
 };
-export const toConfigGetter = (configGetter, articlePath) => articlePath
-    ? async () => Object.assign(await (configGetter ?? wikiparse.getConfig)(), { articlePath })
-    : configGetter;
-/**
- * 获取字符串开头的空白字符
- * @param str 字符串
- * @test
- */
-export const leadingSpaces = (str) => /^\s*/u.exec(str)[0];