@bhsd/codemirror-mediawiki 2.13.1 → 2.14.1

package/dist/static.d.ts

@@ -1,17 +1,23 @@
 import type { Config } from 'wikiparser-node';
-import type { MwConfig } from './mediawiki';
+import type { MwConfig } from './token';
 export declare const tagModes: {
-    tab: string;
-    tabs: string;
+    onlyinclude: string;
+    includeonly: string;
+    noinclude: string;
+    pre: string;
+    nowiki: string;
     indicator: string;
     poem: string;
     ref: string;
     references: string;
-    option: string;
+    gallery: string;
+    poll: string;
+    tabs: string;
+    tab: string;
     choose: string;
-    combooption: string;
+    option: string;
     combobox: string;
-    poll: string;
-    gallery: string;
+    combooption: string;
+    inputbox: string;
 };
 export declare const getStaticMwConfig: (config: Config) => MwConfig;

package/dist/token.d.ts

@@ -0,0 +1,244 @@
+/**
+ * @author pastakhov, MusikAnimal and others
+ * @license GPL-2.0-or-later
+ * @see https://gerrit.wikimedia.org/g/mediawiki/extensions/CodeMirror
+ */
+import { Tag } from '@lezer/highlight';
+import type { StreamParser, StringStream } from '@codemirror/language';
+declare const tokens: {
+    apostrophes: string;
+    comment: string;
+    convertBracket: string;
+    convertDelimiter: string;
+    convertFlag: string;
+    convertLang: string;
+    doubleUnderscore: string;
+    em: string;
+    error: string;
+    extLink: string;
+    extLinkBracket: string;
+    extLinkProtocol: string;
+    extLinkText: string;
+    extTag: string;
+    extTagAttribute: string;
+    extTagAttributeValue: string;
+    extTagBracket: string;
+    extTagName: string;
+    fileText: string;
+    freeExtLink: string; /** 已解析的节点 */
+    freeExtLinkProtocol: string;
+    hr: string;
+    htmlEntity: string;
+    htmlTagAttribute: string;
+    htmlTagAttributeValue: string;
+    htmlTagBracket: string;
+    htmlTagName: string;
+    imageParameter: string;
+    linkBracket: string;
+    linkDelimiter: string;
+    linkPageName: string;
+    linkText: string;
+    linkToSection: string;
+    list: string;
+    magicLink: string;
+    pageName: string;
+    parserFunction: string;
+    parserFunctionBracket: string;
+    parserFunctionDelimiter: string;
+    parserFunctionName: string;
+    redirect: string;
+    section: string;
+    sectionHeader: string;
+    signature: string;
+    skipFormatting: string;
+    strong: string;
+    tableBracket: string;
+    tableCaption: string;
+    tableDefinition: string;
+    tableDefinitionValue: string;
+    tableDelimiter: string;
+    tableDelimiter2: string;
+    tableTd: string;
+    tableTh: string;
+    template: string;
+    templateArgumentName: string;
+    templateBracket: string;
+    templateDelimiter: string;
+    templateName: string;
+    templateVariable: string;
+    templateVariableBracket: string;
+    templateVariableDelimiter: string;
+    templateVariableName: string;
+};
+declare type Style = string | [string];
+declare type Tokenizer<T = Style> = ((stream: StringStream, state: State) => T) & {
+    args?: unknown[];
+};
+declare type TagName = keyof typeof tokens;
+declare type NestCount = 'nTemplate' | 'nExt' | 'nVar' | 'nLink' | 'nExtLink';
+declare interface Nesting extends Record<NestCount, number> {
+    extName: string | false;
+    extState: object | false;
+}
+declare interface State extends Nesting {
+    tokenize: Tokenizer;
+    readonly stack: Tokenizer[];
+    readonly inHtmlTag: string[];
+    extMode: StreamParser<object> | false;
+    lbrack: boolean | undefined;
+    bold: boolean;
+    italic: boolean;
+    dt: Partial<Nesting> & {
+        n: number;
+    };
+    redirect: boolean;
+    data: MediaWikiData;
+}
+declare type ExtState = Omit<State, 'dt'> & Partial<Pick<State, 'dt'>>;
+declare interface Token {
+    pos: number;
+    readonly string: string;
+    style: Style;
+    readonly state: State;
+}
+export type ApiSuggestions = [string, string?][];
+/**
+ * 获取维基链接建议
+ * @param search 搜索字符串，开头不包含` `
+ * @param namespace 命名空间
+ * @param subpage 是否为子页面
+ */
+export type ApiSuggest = (search: string, namespace?: number, subpage?: boolean) => ApiSuggestions | Promise<ApiSuggestions>;
+export interface MwConfig {
+    readonly tags: Record<string, true>;
+    readonly tagModes: Record<string, string>;
+    urlProtocols: string;
+    functionSynonyms: [Record<string, string>, Record<string, unknown>];
+    doubleUnderscore: [Record<string, unknown>, Record<string, unknown>];
+    nsid: Record<string, number>;
+    variants?: string[];
+    img?: Record<string, string>;
+    redirection?: string[];
+    permittedHtmlTags?: string[];
+    implicitlyClosedHtmlTags?: string[];
+    linkSuggest?: ApiSuggest;
+    paramSuggest?: ApiSuggest;
+}
+declare class MediaWikiData {
+    /** 已解析的节点 */
+    readonly readyTokens: Token[];
+    /** 当前起始位置 */
+    oldToken: Token | null;
+    /** 可能需要回滚的`'''` */
+    mark: number | null;
+    firstSingleLetterWord: number | null;
+    firstMultiLetterWord: number | null;
+    firstSpace: number | null;
+    readonly tags: string[];
+    constructor(tags: string[]);
+}
+/** Adapted from the original CodeMirror 5 stream parser by Pavel Astakhov */
+export declare class MediaWiki {
+    readonly config: MwConfig;
+    readonly tokenTable: {
+        [x: string]: Tag;
+    };
+    readonly hiddenTable: Record<string, Tag>;
+    readonly permittedHtmlTags: Set<string>;
+    readonly implicitlyClosedHtmlTags: Set<string>;
+    readonly urlProtocols: RegExp;
+    readonly linkRegex: RegExp;
+    readonly inLinkRegex: RegExp;
+    readonly fileRegex: RegExp;
+    readonly redirectRegex: RegExp;
+    readonly img: string[];
+    readonly imgRegex: RegExp;
+    readonly headerRegex: RegExp;
+    readonly extAttrRegex: RegExp;
+    readonly templateRegex: RegExp;
+    readonly argumentRegex: RegExp;
+    readonly convertSemicolon: RegExp;
+    readonly convertLang: RegExp;
+    readonly convertRegex: RegExp;
+    readonly inputboxRegex: RegExp;
+    readonly wikiRegex: RegExp;
+    readonly tags: string[];
+    constructor(config: MwConfig);
+    /**
+     * Dynamically register a token in CodeMirror.
+     * This is solely for use by this.addTag() and CodeMirrorModeMediaWiki.makeLocalStyle().
+     *
+     * @param token
+     * @param hidden Whether the token is not highlighted
+     * @param parent
+     */
+    addToken(token: string, hidden?: boolean, parent?: Tag): void;
+    /**
+     * Register the ground tokens. These aren't referenced directly in the StreamParser, nor do
+     * they have a parent Tag, so we don't need them as constants like we do for other tokens.
+     * See this.makeLocalStyle() for how these tokens are used.
+     */
+    registerGroundTokens(): void;
+    makeFullStyle(style: Style, state: ExtState): string;
+    makeTagStyle(tag: TagName, state: State, endGround?: NestCount): [string];
+    makeStyle(style: string, state: ExtState, endGround?: NestCount): [string];
+    makeLocalTagStyle(tag: TagName, state: State, endGround?: NestCount): string;
+    makeLocalStyle(style: string, state: ExtState, endGround?: NestCount): string;
+    inStr(str: string, tag: TagName | false, errorTag?: TagName): Tokenizer;
+    eatWikiText(style: string): Tokenizer;
+    eatApostrophes(obj: Pick<State, 'bold' | 'italic'>): Tokenizer<string | false>;
+    eatExternalLinkProtocol(chars: string, free?: boolean): Tokenizer;
+    inExternalLink(text?: boolean): Tokenizer;
+    get eatFreeExternalLink(): Tokenizer;
+    inLink(file: boolean, section?: boolean): Tokenizer;
+    inLinkText(file: boolean, gallery?: boolean): Tokenizer;
+    toEatImageParameter(stream: StringStream, state: State): void;
+    eatList(stream: StringStream, state: State): string;
+    eatDoubleUnderscore(style: string, stream: StringStream, state: State): Style;
+    get eatStartTable(): Tokenizer;
+    inTableDefinition(tr?: boolean, quote?: string): Tokenizer;
+    get inTable(): Tokenizer;
+    inTableCell(style: string, needAttr?: boolean, firstLine?: boolean): Tokenizer;
+    inSectionHeader(str: string): Tokenizer;
+    get inComment(): Tokenizer;
+    eatTagName(name: string, isCloseTag?: boolean, isHtmlTag?: boolean): Tokenizer;
+    inHtmlTagAttribute(name: string, quote?: string): Tokenizer;
+    inExtTagAttribute(name: string, quote?: string): Tokenizer;
+    eatExtTagArea(name: string): Tokenizer;
+    inExtTokens(origString: string): Tokenizer;
+    inVariable(pos?: number): Tokenizer;
+    eatTransclusion(stream: StringStream, state: State): string;
+    inParserFunctionName(invoke?: boolean): Tokenizer;
+    inTemplatePageName(haveEaten?: boolean, anchor?: boolean): Tokenizer;
+    inParserFunctionArgument(module?: boolean): Tokenizer;
+    inTemplateArgument(expectName?: boolean): Tokenizer;
+    inConvert(style: string, needFlag?: boolean, needLang?: boolean): Tokenizer;
+    eatEntity(stream: StringStream, style: string): string;
+    /**
+     * Remembers position and status for rollbacking.
+     * It is needed for changing from bold to italic with apostrophes before it, if required.
+     *
+     * @see https://phabricator.wikimedia.org/T108455
+     * @param stream
+     * @param state
+     */
+    prepareItalicForCorrection(stream: StringStream, state: State): void;
+    /**
+     * main entry
+     *
+     * @see https://codemirror.net/docs/ref/#language.StreamParser
+     *
+     * @param tags
+     */
+    mediawiki(tags?: string[]): StreamParser<State>;
+    'text/nowiki'(): StreamParser<Record<string, never>>;
+    inReferences(tag: string, comment?: boolean): Tokenizer<string>;
+    'text/references'(tags: string[]): StreamParser<State>;
+    'text/choose'(tags: string[]): StreamParser<State>;
+    'text/combobox'(tags: string[]): StreamParser<State>;
+    get inInputbox(): Tokenizer<string>;
+    'text/inputbox'(tags: string[]): StreamParser<State>;
+    inGallery(section?: boolean): Tokenizer;
+    'text/gallery'(tags: string[]): StreamParser<State>;
+}
+export {};

package/i18n/en.json

@@ -1,5 +1,5 @@
 {
-	"version": "2.13.1",
+	"version": "2.14.1",
 	"lang": "en",
 	"i18n-failed": "Failed to fetch the translation file in $1.",
 	"title": "CodeMirror Addons",

package/i18n/zh-hans.json

@@ -1,5 +1,5 @@
 {
-	"version": "2.13.1",
+	"version": "2.14.1",
 	"lang": "zh-hans",
 	"i18n-failed": "获取 $1 的语言文件失败。",
 	"title": "CodeMirror插件",

package/i18n/zh-hant.json

@@ -1,5 +1,5 @@
 {
-	"version": "2.13.1",
+	"version": "2.14.1",
 	"lang": "zh-hant",
 	"i18n-failed": "取得 $1 的語言檔案失敗。",
 	"title": "CodeMirror外掛程式",

package/mediawiki.css

@@ -74,7 +74,8 @@
 .cm-mw-extlink-protocol,
 .cm-mw-extlink,
 .cm-mw-free-extlink-protocol,
-.cm-mw-free-extlink {
+.cm-mw-free-extlink,
+.cm-mw-magic-link {
 	text-decoration: underline;
 }
 
@@ -145,7 +146,8 @@
 .cm-mw-link-bracket,
 .cm-mw-link-delimiter,
 .cm-mw-extlink,
-.cm-mw-free-extlink {
+.cm-mw-free-extlink,
+.cm-mw-magic-link {
 	color: #000aaa;
 	font-weight: normal;
 }
@@ -181,6 +183,11 @@
 	color: #14866d;
 	font-weight: normal;
 }
+.cm-mw-exttag-attribute-value,
+.cm-mw-htmltag-attribute-value {
+	color: #179b1c;
+	font-weight: normal;
+}
 
 /* table */
 .cm-mw-table-bracket,
@@ -193,10 +200,26 @@
 	color: #d08;
 	font-weight: normal;
 }
+.cm-mw-table-definition-value {
+	color: #f500d4;
+	font-weight: normal;
+}
+.cm-mw-table-th,
 .cm-mw-table-caption {
 	font-weight: bold;
 }
 
+/* convert */
+.cm-mw-convert-bracket,
+.cm-mw-convert-delimiter {
+	color: #b68;
+	font-weight: bold;
+}
+.cm-mw-convert-flag,
+.cm-mw-convert-lang {
+	color: #b68;
+}
+
 /* HTML entity */
 .cm-mw-entity {
 	color: #00a1a1;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bhsd/codemirror-mediawiki",
-	"version": "2.13.1",
+	"version": "2.14.1",
 	"description": "Modified CodeMirror mode based on wikimedia/mediawiki-extensions-CodeMirror",
 	"keywords": [
 		"mediawiki",
@@ -16,7 +16,7 @@
 		"/dist/*.js",
 		"/dist/*.d.ts",
 		"!/dist/*-page.d.ts",
-		"!/dist/parserTests.js",
+		"!/dist/parser.*",
 		"/mediawiki.css"
 	],
 	"browser": "dist/main.min.js",
@@ -30,16 +30,18 @@
 		"build:core": "esbuild ./src/codemirror.ts --bundle --minify --target=es2018 --format=esm --sourcemap --outfile=dist/main.min.js && tsc --emitDeclarationOnly",
 		"build:mw": "esbuild ./mw/base.ts --bundle --minify --target=es2018 --format=esm --sourcemap --outfile=dist/mw.min.js",
 		"build:gh-page": "bash build.sh",
-		"build:test": "esbuild ./test/parserTests.ts --bundle --minify --platform=node --outfile=dist/parserTests.js && node dist/parserTests.js",
-		"build": "npm run build:core && npm run build:mw && npm run build:test",
+		"build:test": "tsc --project test/tsconfig.json && node test/dist/test/test.js",
+		"build": "npm run build:core && npm run build:mw",
 		"diff": "git diff --ignore-all-space --color-moved",
 		"diff:stat": "f() { git diff --stat --ignore-all-space --color=always $1 $2 -- . ':!dist/' ':!.github/'; }; f",
 		"lint:ts": "tsc --noEmit && tsc --project mw/tsconfig.json --noEmit && tsc --project test/tsconfig.json --noEmit && eslint --cache .",
 		"lint:css": "stylelint *.css",
 		"lint": "npm run lint:ts && npm run lint:css",
+		"prof": "node --prof test/dist/test/prof.js && node --prof-process isolate-0x*-v8.log > test/prof.txt && gsed -i '0,/Bottom up/d' test/prof.txt && rm isolate-0x*-v8.log",
 		"server": "npm run test:end; http-server .. -c-1 --cors &",
 		"test": "npm run build:core && npm run build:gh-page && npm run server",
-		"test:end": "pkill -x http-server"
+		"test:end": "pkill -x http-server",
+		"test:real": "node test/dist/test/real.js"
 	},
 	"engines": {
 		"node": "20.9.0"
@@ -49,8 +51,8 @@
 		"@codemirror/lint": "^6.5.0",
 		"@codemirror/state": "^6.4.1",
 		"@codemirror/view": "^6.24.1",
-		"@lezer/common": "^1.1.2",
-		"wikiparser-node": "^1.7.1"
+		"@lezer/common": "^1.2.1",
+		"wikiparser-node": "^1.9.0"
 	},
 	"devDependencies": {
 		"@codemirror/autocomplete": "^6.12.0",
@@ -65,22 +67,22 @@
 		"@stylistic/stylelint-plugin": "^2.0.0",
 		"@types/jquery": "^3.5.29",
 		"@types/oojs-ui": "^0.49.0",
-		"@typescript-eslint/eslint-plugin": "^7.1.0",
-		"@typescript-eslint/parser": "^7.1.0",
-		"esbuild": "^0.19.12",
+		"@typescript-eslint/eslint-plugin": "^7.10.0",
+		"@typescript-eslint/parser": "^7.10.0",
+		"esbuild": "^0.21.4",
 		"eslint": "^8.56.0",
 		"eslint-plugin-es-x": "^7.5.0",
 		"eslint-plugin-eslint-comments": "^3.2.0",
 		"eslint-plugin-jsdoc": "^48.0.2",
-		"eslint-plugin-json-es": "^1.5.7",
+		"eslint-plugin-json-es": "^1.6.0",
 		"eslint-plugin-promise": "^6.1.1",
 		"eslint-plugin-regexp": "^2.2.0",
 		"eslint-plugin-unicorn": "^52.0.0",
 		"http-server": "^14.1.0",
-		"monaco-editor": "^0.48.0",
+		"monaco-editor": "^0.49.0",
 		"stylelint": "^16.1.0",
 		"stylelint-config-recommended": "^14.0.0",
 		"types-mediawiki": "^1.6.0",
-		"typescript": "^5.3.3"
+		"typescript": "^5.4.5"
 	}
 }