npm - @bhsd/codemirror-mediawiki - Versions diffs - 2.1.7 → 2.1.8 - Mend

@bhsd/codemirror-mediawiki 2.1.7 → 2.1.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/mw/dist/base.js CHANGED Viewed

@@ -1,8 +1,9 @@
-import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror-mediawiki@2.1.7/dist/main.min.js';
+import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror-mediawiki@2.1.8/dist/main.min.js';
 (() => {
     var _a;
-    mw.loader.load('https://testingcf.jsdelivr.net/npm/@bhsd/codemirror-mediawiki@2.1.7/mediawiki.min.css', 'text/css');
+    mw.loader.load('https://testingcf.jsdelivr.net/npm/@bhsd/codemirror-mediawiki@2.1.8/mediawiki.min.css', 'text/css');
     const instances = new WeakMap();
+    const getInstance = ($ele) => instances.get($ele[0]);
     $.valHooks['textarea'] = {
         get(elem) {
             const cm = instances.get(elem);
@@ -11,9 +12,7 @@ import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror
         set(elem, value) {
             const cm = instances.get(elem);
             if (cm === null || cm === void 0 ? void 0 : cm.visible) {
-                cm.view.dispatch({
-                    changes: { from: 0, to: cm.view.state.doc.length, insert: value },
-                });
+                cm.setContent(value);
             }
             else {
                 elem.value = value;
@@ -21,26 +20,23 @@ import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror
         },
     };
     function getCaretPosition(option) {
-        const { view: { state: { selection: { main } } } } = instances.get(this[0]);
+        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 instances.get(this[0]).view.state.doc.toString();
+            return getInstance(this).view.state.doc.toString();
         },
         setContents(content) {
-            const { view } = instances.get(this[0]);
-            view.dispatch({
-                changes: { from: 0, to: view.state.doc.length, insert: content },
-            });
+            getInstance(this).setContent(content);
             return this;
         },
         getSelection() {
-            const { view: { state } } = instances.get(this[0]);
+            const { view: { state } } = getInstance(this);
             return state.sliceDoc(state.selection.main.from, state.selection.main.to);
         },
         setSelection({ start, end }) {
-            const { view } = instances.get(this[0]);
+            const { view } = getInstance(this);
             view.dispatch({
                 selection: { anchor: start, head: end !== null && end !== void 0 ? end : start },
             });
@@ -48,36 +44,44 @@ import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror
             return this;
         },
         replaceSelection(value) {
-            const { view } = instances.get(this[0]);
+            const { view } = getInstance(this);
             view.dispatch(view.state.replaceSelection(value));
             return this;
         },
         getCaretPosition,
         scrollToCaretPosition() {
-            instances.get(this[0]).view.dispatch({ scrollIntoView: true });
+            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], EXPIRED = !(SITE_SETTINGS && SITE_SETTINGS.time > Date.now() - 86400 * 1000 * 30);
-    const getAliases = (words) => words.flatMap(({ aliases, name }) => aliases.map(alias => ({ alias, name })));
-    const getConfig = (aliases) => {
-        const config = {};
-        for (const { alias, name } of aliases) {
-            config[alias.replace(/:$/u, '')] = name;
+    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 = (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 config;
+        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 && EXPIRED) {
+        if (USING_LOCAL && !VALID) {
             await mw.loader.using(DATA_MODULE);
         }
         let config = mw.config.get('extCodeMirrorConfig');
-        if (!config && !EXPIRED) {
+        if (!config && VALID) {
             ({ config } = SITE_SETTINGS);
-            mw.config.set('extCodeMirrorConfig', config);
+            setConfig(config);
         }
         const isIPE = config && Object.values(config.functionSynonyms[0]).includes(true);
-        if (config && config.img && config.variants && !isIPE) {
+        if ((config === null || config === void 0 ? void 0 : config.img) && config.variants && !isIPE) {
             return {
                 ...config,
                 nsid: mw.config.get('wgNamespaceIds'),
@@ -92,20 +96,25 @@ import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror
             ],
             formatversion: '2',
         });
-        const otherMagicwords = new Set(['msg', 'raw', 'msgnw', 'subst', 'safesubst']);
+        const others = new Set(['msg', 'raw', 'msgnw', 'subst', 'safesubst']);
         if (config && !isIPE) {
             const { functionSynonyms: [insensitive] } = config;
             if (!('subst' in insensitive)) {
-                const aliases = getAliases(magicwords.filter(({ name }) => otherMagicwords.has(name)));
-                for (const { alias, name } of aliases) {
-                    insensitive[alias.replace(/:$/u, '')] = name;
-                }
+                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'),
@@ -113,24 +122,18 @@ import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror
             for (const tag of extensiontags) {
                 config.tags[tag.slice(1, -1)] = true;
             }
-            const realMagicwords = new Set([
+            const functions = new Set([
                 ...functionhooks,
                 ...variables,
-                ...otherMagicwords,
-            ]), allMagicwords = magicwords.filter(({ name, aliases }) => aliases.some(alias => /^__.+__$/u.test(alias)) || realMagicwords.has(name)), sensitive = getAliases(allMagicwords.filter(word => word['case-sensitive'])), insensitive = getAliases(allMagicwords.filter(word => !word['case-sensitive'])).map(({ alias, name }) => ({ alias: alias.toLowerCase(), name }));
-            config.doubleUnderscore = [
-                getConfig(insensitive.filter(({ alias }) => /^__.+__$/u.test(alias))),
-                getConfig(sensitive.filter(({ alias }) => /^__.+__$/u.test(alias))),
-            ];
-            config.functionSynonyms = [
-                getConfig(insensitive.filter(({ alias }) => !/^__.+__|^#$/u.test(alias))),
-                getConfig(sensitive.filter(({ alias }) => !/^__.+__|^#$/u.test(alias))),
-            ];
+                ...others,
+            ]);
+            config.functionSynonyms = getConfigPair(magicwords, ({ name }) => functions.has(name));
+            config.doubleUnderscore = getConfigPair(magicwords, ({ aliases }) => aliases.some(alias => /^__.+__$/u.test(alias)));
         }
-        config.img = getConfig(getAliases(magicwords.filter(({ name }) => name.startsWith('img_'))));
+        config.img = getConfig(magicwords, ({ name }) => name.startsWith('img_'));
         config.variants = variants ? variants.map(({ code }) => code) : [];
         config.nsid = mw.config.get('wgNamespaceIds');
-        mw.config.set('extCodeMirrorConfig', config);
+        setConfig(config);
         ALL_SETTINGS_CACHE[SITE_ID] = { config: config, time: Date.now() };
         localStorage.setItem('InPageEditMwConfig', JSON.stringify(ALL_SETTINGS_CACHE));
         return config;
@@ -149,6 +152,11 @@ import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror
             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, opt) {
             if (!on) {
                 this.lint();
@@ -156,13 +164,13 @@ import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror
             }
             const { lang } = this;
             if (!(lang in linters)) {
-                linters[lang] = await this.getLinter(opt);
-                if (this.lang === 'mediawiki') {
+                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: mw.config.get('wgNamespaceIds'),
+                        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, ':'),
@@ -185,6 +193,9 @@ import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror
                     wikiparse.setConfig(config);
                 }
             }
+            else if (opt) {
+                await this.getLinter(opt);
+            }
             if (linters[lang]) {
                 this.lint(linters[lang]);
             }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "@bhsd/codemirror-mediawiki",
-	"version": "2.1.7",
+	"version": "2.1.8",
 	"description": "Modified CodeMirror mode based on wikimedia/mediawiki-extensions-CodeMirror",
 	"keywords": [
 		"mediawiki",

package/src/codemirror.ts CHANGED Viewed

@@ -70,6 +70,14 @@ const loadScript = (src: string, target: string): Promise<void> => new Promise(r
 	document.head.append(script);
 });
+/**
+ * 获取指定行列的位置
+ * @param doc 文档
+ * @param line 行号
+ * @param column 列号
+ */
+const pos = (doc: Text, line: number, column: number): number => doc.line(line).from + column - 1;
 export class CodeMirror6 {
 	readonly #textarea;
 	readonly #language;
@@ -143,12 +151,12 @@ export class CodeMirror6 {
 			extensions,
 			doc: textarea.value,
 		});
-		const {offsetHeight, selectionStart, selectionEnd, scrollTop} = textarea,
+		const {selectionStart, selectionEnd, scrollTop} = textarea,
 			{fontSize, lineHeight} = getComputedStyle(textarea),
 			hasFocus = document.activeElement === textarea;
 		textarea.parentNode!.insertBefore(this.#view.dom, textarea);
-		this.#view.dom.style.minHeight = '2em';
-		this.#view.dom.style.height = `${offsetHeight}px`;
+		this.#minHeight();
+		this.#refresh();
 		this.#view.dom.style.fontSize = fontSize;
 		this.#view.scrollDOM.style.lineHeight = lineHeight;
 		this.#view.requestMeasure();
@@ -164,6 +172,20 @@ export class CodeMirror6 {
 		});
 	}
+	/** 刷新编辑器高度 */
+	#refresh(): void {
+		const {offsetHeight} = this.#textarea;
+		this.#view.dom.style.height = offsetHeight ? `${offsetHeight}px` : this.#textarea.style.height;
+	}
+	/**
+	 * 设置编辑器最小高度
+	 * @param linting 是否启用语法检查
+	 */
+	#minHeight(linting?: boolean): void {
+		this.#view.dom.style.minHeight = linting ? 'calc(100px + 2em)' : '2em';
+	}
 	/**
 	 * 设置语言
 	 * @param lang 语言
@@ -193,8 +215,10 @@ export class CodeMirror6 {
 			: [];
 		if (lintSource) {
 			linters[this.#lang] = linterExtension;
+			this.#minHeight(true);
 		} else {
 			delete linters[this.#lang];
+			this.#minHeight();
 		}
 		this.#view.dispatch({
 			effects: [this.#linter.reconfigure(linterExtension)],
@@ -244,8 +268,8 @@ export class CodeMirror6 {
 	async getLinter(opt?: Record<string, unknown>): Promise<LintSource | undefined> {
 		switch (this.#lang) {
 			case 'mediawiki': {
-				const src = 'combine/npm/wikiparser-node@1.3.2-b/extensions/dist/base.min.js,'
-					+ 'npm/wikiparser-node@1.3.2-b/extensions/dist/lint.min.js';
+				const CDN = 'npm/wikiparser-node@1.3.4-b/extensions/dist',
+					src = `combine/${CDN}/base.min.js,${CDN}/lint.min.js`;
 				await loadScript(src, 'wikiparse');
 				const wikiLinter = new wikiparse.Linter(opt?.['include'] as boolean);
 				return doc => wikiLinter.codemirror(doc.toString());
@@ -267,18 +291,18 @@ export class CodeMirror6 {
 						...opt,
 					};
 				for (const [name, {meta}] of esLinter.getRules()) {
-					if (meta?.docs!.recommended) {
+					if (meta?.docs?.recommended) {
 						conf.rules![name] ??= 2;
 					}
 				}
 				return doc => esLinter.verify(doc.toString(), conf)
 					.map(({message, severity, line, column, endLine, endColumn}) => {
-						const from = doc.line(line).from + column - 1;
+						const from = pos(doc, line, column);
 						return {
 							message,
 							severity: severity === 1 ? 'warning' : 'error',
 							from,
-							to: endLine === undefined ? from + 1 : doc.line(endLine).from + endColumn! - 1,
+							to: endLine === undefined ? from + 1 : pos(doc, endLine, endColumn!),
 						};
 					});
 			}
@@ -339,8 +363,8 @@ export class CodeMirror6 {
 						.map(({text, severity, line, column, endLine, endColumn}) => ({
 							message: text,
 							severity,
-							from: doc.line(line).from + column - 1,
-							to: endLine === undefined ? doc.line(line).to : doc.line(endLine).from + endColumn! - 1,
+							from: pos(doc, line, column),
+							to: endLine === undefined ? doc.line(line).to : pos(doc, endLine, endColumn!),
 						}));
 				};
 			}
@@ -369,15 +393,24 @@ export class CodeMirror6 {
 		}
 	}
+	/**
+	 * 重设编辑器内容
+	 * @param content 新内容
+	 */
+	setContent(content: string): void {
+		this.#view.dispatch({
+			changes: {from: 0, to: this.#view.state.doc.length, insert: content},
+		});
+	}
 	/**
 	 * 在编辑器和文本框之间切换
 	 * @param show 是否显示编辑器
 	 */
 	toggle(show = !this.#visible): void {
 		if (show && !this.#visible) {
-			this.#view.dispatch({
-				changes: {from: 0, to: this.#view.state.doc.length, insert: this.#textarea.value},
-			});
+			this.setContent(this.#textarea.value);
+			this.#refresh();
 		}
 		this.#visible = show;
 		this.#view.dom.style.setProperty('display', show ? '' : 'none', 'important');