@bhsd/codemirror-mediawiki 2.1.11 → 2.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bhsd/codemirror-mediawiki",
-	"version": "2.1.11",
+	"version": "2.1.13",
 	"description": "Modified CodeMirror mode based on wikimedia/mediawiki-extensions-CodeMirror",
 	"keywords": [
 		"mediawiki",
@@ -16,9 +16,10 @@
 		"!/src/gh-page.ts",
 		"!/src/plugins.ts",
 		"!/src/*.d.ts",
+		"/mw/*.ts",
+		"!/mw/*.d.ts",
 		"/dist/",
-		"/mediawiki.css",
-		"/mw/dist/"
+		"/mediawiki.css"
 	],
 	"browser": "dist/main.min.js",
 	"main": "./dist/main.min.js",
@@ -29,13 +30,13 @@
 	},
 	"scripts": {
 		"build:core": "esbuild ./src/codemirror.ts --bundle --minify --target=es2018 --format=esm --sourcemap --outfile=dist/main.min.js && tsc --emitDeclarationOnly && rm dist/gh-page.d.ts",
-		"build:mw": "bash build.sh mw/base.ts mw/dist/base.js",
+		"build:mw": "esbuild ./mw/base.ts --bundle --minify --target=es2018 --format=esm --sourcemap --outfile=dist/mw.min.js",
 		"build:gh-page": "bash build.sh src/gh-page.ts gh-page.js",
 		"build": "npm run build:core && npm run build:mw",
 		"lint:ts": "tsc --noEmit && tsc --project mw/tsconfig.json --noEmit && eslint --cache .",
 		"lint:css": "stylelint *.css",
 		"lint": "npm run lint:ts && npm run lint:css",
-		"server": "http-server .. -c-1 --cors &",
+		"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"
 	},
@@ -52,24 +53,24 @@
 		"@codemirror/state": "^6.3.3",
 		"@codemirror/view": "^6.22.2",
 		"@lezer/highlight": "^1.2.0",
-		"@stylistic/eslint-plugin": "^1.5.3",
+		"@stylistic/eslint-plugin": "^1.5.4",
 		"@stylistic/stylelint-plugin": "^2.0.0",
 		"@types/jquery": "^3.5.29",
 		"@types/oojs-ui": "^0.47.6",
-		"@typescript-eslint/eslint-plugin": "^6.12.0",
-		"@typescript-eslint/parser": "^6.12.0",
-		"esbuild": "^0.19.7",
+		"@typescript-eslint/eslint-plugin": "^6.19.1",
+		"@typescript-eslint/parser": "^6.19.1",
+		"esbuild": "^0.19.12",
 		"eslint": "^8.56.0",
-		"eslint-plugin-es-x": "^7.3.0",
+		"eslint-plugin-es-x": "^7.5.0",
 		"eslint-plugin-eslint-comments": "^3.2.0",
 		"eslint-plugin-promise": "^6.1.1",
-		"eslint-plugin-regexp": "^2.1.2",
+		"eslint-plugin-regexp": "^2.2.0",
 		"eslint-plugin-unicorn": "^50.0.1",
 		"http-server": "^14.1.0",
 		"stylelint": "^16.1.0",
 		"stylelint-config-recommended": "^14.0.0",
 		"types-mediawiki": "^1.4.0",
-		"typescript": "^5.1.6",
-		"wikilint": "^2.3.2"
+		"typescript": "^5.3.3",
+		"wikilint": "^2.4.1"
 	}
 }

package/src/codemirror.ts

@@ -61,19 +61,20 @@ const avail: Record<string, [(config?: any) => Extension, Record<string, unknown
 		{},
 	],
 };
+const CDN = 'https://testingcf.jsdelivr.net';
 
 /**
  * 使用传统方法加载脚本
  * @param src 脚本地址
- * @param target 脚本全局变量名
+ * @param globalConst 脚本全局变量名
  */
-const loadScript = (src: string, target: string): Promise<void> => new Promise(resolve => {
-	if (target in window) {
+const loadScript = (src: string, globalConst: string): Promise<void> => new Promise(resolve => {
+	if (globalConst in window) {
 		resolve();
 		return;
 	}
 	const script = document.createElement('script');
-	script.src = `https://testingcf.jsdelivr.net/${src}`;
+	script.src = `${CDN}/${src}`;
 	script.onload = (): void => {
 		resolve();
 	};
@@ -90,13 +91,14 @@ const pos = (doc: Text, line: number, column: number): number => doc.line(line).
 
 export class CodeMirror6 {
 	readonly #textarea;
-	readonly #language;
-	readonly #linter;
-	readonly #extensions;
-	readonly #indent;
 	readonly #view;
+	readonly #language = new Compartment();
+	readonly #linter = new Compartment();
+	readonly #extensions = new Compartment();
+	readonly #indent = new Compartment();
 	#lang;
-	#visible = true;
+	#visible = false;
+	#preferred = new Set<string>();
 
 	get textarea(): HTMLTextAreaElement {
 		return this.#textarea;
@@ -122,10 +124,6 @@ export class CodeMirror6 {
 	constructor(textarea: HTMLTextAreaElement, lang = 'plain', config?: unknown) {
 		this.#textarea = textarea;
 		this.#lang = lang;
-		this.#language = new Compartment();
-		this.#linter = new Compartment();
-		this.#extensions = new Compartment();
-		this.#indent = new Compartment();
 		let timer: number | undefined;
 		const extensions = [
 			this.#language.of(languages[lang]!(config)),
@@ -162,25 +160,12 @@ export class CodeMirror6 {
 			extensions,
 			doc: textarea.value,
 		});
-		const {selectionStart, selectionEnd, scrollTop} = textarea,
-			{fontSize, lineHeight} = getComputedStyle(textarea),
-			hasFocus = document.activeElement === textarea;
+		const {fontSize, lineHeight} = getComputedStyle(textarea);
 		textarea.parentNode!.insertBefore(this.#view.dom, textarea);
 		this.#minHeight();
-		this.#refresh();
-		this.#view.dom.style.fontSize = fontSize;
+		this.#view.scrollDOM.style.fontSize = fontSize;
 		this.#view.scrollDOM.style.lineHeight = lineHeight;
-		this.#view.requestMeasure();
-		this.#view.dispatch({
-			selection: {anchor: selectionStart, head: selectionEnd},
-		});
-		textarea.style.display = 'none';
-		if (hasFocus) {
-			this.#view.focus();
-		}
-		requestAnimationFrame(() => {
-			this.#view.scrollDOM.scrollTop = scrollTop;
-		});
+		this.toggle(true);
 	}
 
 	/** 刷新编辑器高度 */
@@ -264,16 +249,23 @@ export class CodeMirror6 {
 	 * 添加扩展
 	 * @param names 扩展名
 	 */
-	prefer(names: readonly string[]): void {
+	prefer(names: string[] | Record<string, boolean>): void {
+		if (Array.isArray(names)) {
+			this.#preferred = new Set(names.filter(name => avail[name]));
+		} else {
+			for (const [name, enable] of Object.entries(names)) {
+				if (enable && avail[name]) {
+					this.#preferred.add(name);
+				} else {
+					this.#preferred.delete(name);
+				}
+			}
+		}
 		this.#view.dispatch({
 			effects: [
-				this.#extensions.reconfigure(names.map(name => {
-					const option = avail[name];
-					if (option) {
-						const [extension, configs] = option;
-						return extension(configs[this.#lang]);
-					}
-					return [];
+				this.#extensions.reconfigure([...this.#preferred].map(name => {
+					const [extension, configs] = avail[name]!;
+					return extension(configs[this.#lang]);
 				})),
 			],
 		});
@@ -293,11 +285,21 @@ export class CodeMirror6 {
 	async getLinter(opt?: Record<string, unknown>): Promise<LintSource | undefined> {
 		switch (this.#lang) {
 			case 'mediawiki': {
-				const CDN = 'npm/wikiparser-node@1.3.4-b/extensions/dist',
-					src = `combine/${CDN}/base.min.js,${CDN}/lint.min.js`;
+				const REPO = 'npm/wikiparser-node@1.4.1-b',
+					DIR = `${REPO}/extensions/dist`,
+					src = `combine/${DIR}/base.min.js,${DIR}/lint.min.js`,
+					lang = opt?.['i18n'];
 				await loadScript(src, 'wikiparse');
-				const wikiLinter = new wikiparse.Linter(opt?.['include'] as boolean);
-				return doc => wikiLinter.codemirror(doc.toString());
+				if (typeof lang === 'string') {
+					try {
+						const i18n: Record<string, string>
+							= await (await fetch(`${CDN}/${REPO}/i18n/${lang.toLowerCase()}.json`)).json();
+						wikiparse.setI18N(i18n);
+					} catch {}
+				}
+				const wikiLinter = new wikiparse.Linter(opt?.['include'] as boolean | undefined);
+				return async doc =>
+					(await wikiLinter.codemirror(doc.toString())).filter(({severity}) => severity === 'error');
 			}
 			case 'javascript': {
 				await loadScript('npm/eslint-linter-browserify', 'eslint');
@@ -434,11 +436,39 @@ export class CodeMirror6 {
 	 */
 	toggle(show = !this.#visible): void {
 		if (show && !this.#visible) {
-			this.setContent(this.#textarea.value);
+			const {value, selectionStart, selectionEnd, scrollTop} = this.#textarea,
+				hasFocus = document.activeElement === this.#textarea;
+			this.setContent(value);
 			this.#refresh();
+			this.#view.dom.style.setProperty('display', '');
+			this.#textarea.style.display = 'none';
+			this.#view.requestMeasure();
+			this.#view.dispatch({
+				selection: {anchor: selectionStart, head: selectionEnd},
+			});
+			if (hasFocus) {
+				this.#view.focus();
+			}
+			requestAnimationFrame(() => {
+				this.#view.scrollDOM.scrollTop = scrollTop;
+			});
+		} else if (!show && this.#visible) {
+			const {state: {selection: {main: {from, to}}}, hasFocus} = this.#view,
+				{scrollDOM: {scrollTop}} = this.#view;
+			this.#view.dom.style.setProperty('display', 'none', 'important');
+			this.#textarea.style.display = '';
+			this.#textarea.setSelectionRange(
+				Math.min(from, to),
+				Math.max(from, to),
+				from > to ? 'backward' : 'forward',
+			);
+			if (hasFocus) {
+				this.#textarea.focus();
+			}
+			requestAnimationFrame(() => {
+				this.#textarea.scrollTop = scrollTop;
+			});
 		}
 		this.#visible = show;
-		this.#view.dom.style.setProperty('display', show ? '' : 'none', 'important');
-		this.#textarea.style.display = show ? 'none' : '';
 	}
 }

package/src/mediawiki.ts

@@ -951,7 +951,7 @@ class MediaWiki {
 					const isCloseTag = Boolean(stream.eat('/')),
 						mt = stream.match(/^[^>/\s.*,[\]{}$^+?|\\'`~<=!@#%&()-]+/u) as RegExpMatchArray | false;
 					if (mt) {
-						const tagname = mt[0]!.toLowerCase();
+						const tagname = mt[0].toLowerCase();
 						if (tagname in this.config.tags) {
 							// Parser function
 							state.stack.push(state.tokenize);

package/mw/dist/base.js

@@ -1,265 +0,0 @@
-import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror-mediawiki@2.1.11/dist/main.min.js';
-(() => {
-    var _a;
-    mw.loader.load('https://testingcf.jsdelivr.net/npm/@bhsd/codemirror-mediawiki@2.1.11/mediawiki.min.css', 'text/css');
-    mw.loader.addStyleTag('.wikiEditor-ui-toolbar{z-index:7}');
-    const instances = new WeakMap();
-    const getInstance = ($ele) => instances.get($ele[0]);
-    $.valHooks['textarea'] = {
-        get(elem) {
-            const cm = instances.get(elem);
-            return (cm === null || cm === void 0 ? void 0 : cm.visible) ? cm.view.state.doc.toString() : elem.value;
-        },
-        set(elem, value) {
-            const cm = instances.get(elem);
-            if (cm === null || cm === void 0 ? void 0 : cm.visible) {
-                cm.setContent(value);
-            }
-            else {
-                elem.value = value;
-            }
-        },
-    };
-    function getCaretPosition(option) {
-        const { view: { state: { selection: { main } } } } = getInstance(this);
-        return (option === null || option === void 0 ? void 0 : option.startAndEnd) ? [main.from, main.to] : main.head;
-    }
-    const textSelection = {
-        getContents() {
-            return getInstance(this).view.state.doc.toString();
-        },
-        setContents(content) {
-            getInstance(this).setContent(content);
-            return this;
-        },
-        getSelection() {
-            const { view: { state } } = getInstance(this);
-            return state.sliceDoc(state.selection.main.from, state.selection.main.to);
-        },
-        setSelection({ start, end }) {
-            const { view } = getInstance(this);
-            view.dispatch({
-                selection: { anchor: start, head: end !== null && end !== void 0 ? end : start },
-            });
-            view.focus();
-            return this;
-        },
-        replaceSelection(value) {
-            const { view } = getInstance(this);
-            view.dispatch(view.state.replaceSelection(value));
-            return this;
-        },
-        getCaretPosition,
-        scrollToCaretPosition() {
-            getInstance(this).view.dispatch({ scrollIntoView: true });
-            return this;
-        },
-    };
-    const USING_LOCAL = mw.loader.getState('ext.CodeMirror') !== null, DATA_MODULE = mw.loader.getState('ext.CodeMirror.data') ? 'ext.CodeMirror.data' : 'ext.CodeMirror', ALL_SETTINGS_CACHE = (_a = JSON.parse(localStorage.getItem('InPageEditMwConfig'))) !== null && _a !== void 0 ? _a : {}, SITE_ID = `${mw.config.get('wgServerName')}${mw.config.get('wgScriptPath')}`, SITE_SETTINGS = ALL_SETTINGS_CACHE[SITE_ID], VALID = Number(SITE_SETTINGS === null || SITE_SETTINGS === void 0 ? void 0 : SITE_SETTINGS.time) > Date.now() - 86400 * 1000 * 30;
-    const getConfig = (magicWords, rule, flip) => {
-        const words = magicWords.filter(rule).filter(({ 'case-sensitive': i }) => i !== flip)
-            .flatMap(({ aliases, name, 'case-sensitive': i }) => aliases.map(alias => ({
-            alias: (i ? alias : alias.toLowerCase()).replace(/:$/u, ''),
-            name,
-        }))), obj = {};
-        for (const { alias, name } of words) {
-            obj[alias] = name;
-        }
-        return obj;
-    };
-    const getConfigPair = (magicWords, rule) => [true, false]
-        .map(bool => getConfig(magicWords, rule, bool));
-    const setConfig = (config) => {
-        mw.config.set('extCodeMirrorConfig', config);
-    };
-    const getMwConfig = async () => {
-        if (USING_LOCAL && !VALID) {
-            await mw.loader.using(DATA_MODULE);
-        }
-        let config = mw.config.get('extCodeMirrorConfig');
-        if (!config && VALID) {
-            ({ config } = SITE_SETTINGS);
-            setConfig(config);
-        }
-        const isIPE = config && Object.values(config.functionSynonyms[0]).includes(true);
-        if ((config === null || config === void 0 ? void 0 : config.img) && config.variants && !isIPE) {
-            return {
-                ...config,
-                nsid: mw.config.get('wgNamespaceIds'),
-            };
-        }
-        const { query: { general: { variants }, magicwords, extensiontags, functionhooks, variables }, } = await new mw.Api().get({
-            meta: 'siteinfo',
-            siprop: [
-                'general',
-                'magicwords',
-                ...config && !isIPE ? [] : ['extensiontags', 'functionhooks', 'variables'],
-            ],
-            formatversion: '2',
-        });
-        const others = new Set(['msg', 'raw', 'msgnw', 'subst', 'safesubst']);
-        if (config && !isIPE) {
-            const { functionSynonyms: [insensitive] } = config;
-            if (!('subst' in insensitive)) {
-                Object.assign(insensitive, getConfig(magicwords, ({ name }) => others.has(name)));
-            }
-        }
-        else {
-            config = {
-                tagModes: {
-                    tab: 'text/mediawiki',
-                    indicator: 'text/mediawiki',
-                    poem: 'text/mediawiki',
-                    ref: 'text/mediawiki',
-                    option: 'text/mediawiki',
-                    combooption: 'text/mediawiki',
-                    tabs: 'text/mediawiki',
-                    poll: 'text/mediawiki',
-                    gallery: 'text/mediawiki',
-                },
-                tags: {},
-                urlProtocols: mw.config.get('wgUrlProtocols'),
-            };
-            for (const tag of extensiontags) {
-                config.tags[tag.slice(1, -1)] = true;
-            }
-            const functions = new Set([
-                ...functionhooks,
-                ...variables,
-                ...others,
-            ]);
-            config.functionSynonyms = getConfigPair(magicwords, ({ name }) => functions.has(name));
-            config.doubleUnderscore = getConfigPair(magicwords, ({ aliases }) => aliases.some(alias => /^__.+__$/u.test(alias)));
-        }
-        config.img = getConfig(magicwords, ({ name }) => name.startsWith('img_'));
-        config.variants = variants ? variants.map(({ code }) => code) : [];
-        config.nsid = mw.config.get('wgNamespaceIds');
-        setConfig(config);
-        ALL_SETTINGS_CACHE[SITE_ID] = { config: config, time: Date.now() };
-        localStorage.setItem('InPageEditMwConfig', JSON.stringify(ALL_SETTINGS_CACHE));
-        return config;
-    };
-    const linters = {};
-    class CodeMirror extends CodeMirror6 {
-        constructor(textarea, lang, config) {
-            super(textarea, lang, config);
-            instances.set(textarea, this);
-            if (mw.loader.getState('jquery.textSelection') === 'ready') {
-                $(textarea).data('jquery.textSelection', textSelection);
-            }
-            mw.hook('wiki-codemirror6').fire(this);
-        }
-        toggle(show = !this.visible) {
-            super.toggle(show);
-            $(this.textarea).data('jquery.textSelection', show && textSelection);
-        }
-        async getLinter(opt) {
-            const linter = await super.getLinter(opt);
-            linters[this.lang] = linter;
-            return linter;
-        }
-        async defaultLint(on, optOrNs) {
-            if (!on) {
-                this.lint();
-                return;
-            }
-            const { lang } = this;
-            let opt;
-            if (typeof optOrNs === 'number') {
-                if (lang === 'mediawiki' && (optOrNs === 10 || optOrNs === 828 || optOrNs === 2)) {
-                    opt = { include: true };
-                }
-                else if (lang === 'javascript' && (optOrNs === 8 || optOrNs === 2300)) {
-                    opt = {
-                        env: { browser: true, es6: true },
-                        parserOptions: { ecmaVersion: 6 },
-                    };
-                }
-            }
-            else {
-                opt = optOrNs;
-            }
-            if (!(lang in linters)) {
-                await this.getLinter(opt);
-                if (lang === 'mediawiki') {
-                    const mwConfig = await getMwConfig(), config = {
-                        ...await wikiparse.getConfig(),
-                        ext: Object.keys(mwConfig.tags),
-                        namespaces: mw.config.get('wgFormattedNamespaces'),
-                        nsid: mwConfig.nsid,
-                        doubleUnderscore: mwConfig.doubleUnderscore.map(obj => Object.keys(obj).map(s => s.slice(2, -2))),
-                        variants: mwConfig.variants,
-                        protocol: mwConfig.urlProtocols.replace(/\\:/gu, ':'),
-                    };
-                    [config.parserFunction[0]] = mwConfig.functionSynonyms;
-                    if (!USING_LOCAL) {
-                        for (const [key, val] of Object.entries(mwConfig.functionSynonyms[0])) {
-                            if (!key.startsWith('#')) {
-                                config.parserFunction[0][`#${key}`] = val;
-                            }
-                        }
-                    }
-                    config.parserFunction[1] = [
-                        ...Object.keys(mwConfig.functionSynonyms[1]),
-                        '=',
-                    ];
-                    for (const key of Object.keys(mwConfig.img)) {
-                        config.img[key] = mwConfig.img[key].slice(4);
-                    }
-                    wikiparse.setConfig(config);
-                }
-            }
-            else if (opt) {
-                await this.getLinter(opt);
-            }
-            if (linters[lang]) {
-                this.lint(linters[lang]);
-            }
-        }
-        static async fromTextArea(textarea, lang) {
-            const isWiki = lang === 'mediawiki' || lang === 'html', cm = new CodeMirror(textarea, isWiki ? undefined : lang);
-            if (isWiki) {
-                const config = await getMwConfig();
-                cm.setLanguage(lang, config);
-            }
-            return cm;
-        }
-    }
-    document.body.addEventListener('click', e => {
-        if (e.target instanceof HTMLTextAreaElement && e.shiftKey && !instances.has(e.target)) {
-            e.preventDefault();
-            (async () => {
-                var _a;
-                const { wgAction, wgNamespaceNumber, wgPageContentModel } = mw.config.get();
-                let lang;
-                if (wgAction !== 'edit' && wgAction !== 'submit') {
-                    await mw.loader.using('oojs-ui-windows');
-                    lang = (_a = (await OO.ui.prompt('Language:') || undefined)) === null || _a === void 0 ? void 0 : _a.toLowerCase();
-                }
-                else {
-                    switch (wgPageContentModel) {
-                        case 'css':
-                        case 'sanitized-css':
-                            lang = 'css';
-                            break;
-                        case 'javascript':
-                            lang = 'javascript';
-                            break;
-                        case 'json':
-                            lang = 'json';
-                            break;
-                        case 'Scribunto':
-                            lang = 'lua';
-                            break;
-                        case 'wikitext':
-                            lang = wgNamespaceNumber === 274 ? 'html' : 'mediawiki';
-                            break;
-                    }
-                }
-                const cm = await CodeMirror.fromTextArea(e.target, lang);
-                void cm.defaultLint(true, wgNamespaceNumber);
-            })();
-        }
-    });
-    Object.assign(window, { CodeMirror6: CodeMirror });
-})();