wikiplus-highlight 2.22.5 → 2.25.3

package/main.js

@@ -14,8 +14,8 @@
 	}
 	mw.libs.wphl = {}; // 开始加载
 
-	const version = '2.22.5',
-		newAddon = 0;
+	const version = '2.25.2',
+		newAddon = 1;
 
 	/** @type {typeof mw.storage} */
 	const storage = typeof mw.storage === 'object' && typeof mw.storage.getObject === 'function'
@@ -43,12 +43,7 @@
 			},
 		};
 
-	/**
-	 * polyfill for `Object.fromEntries`
-	 * @type {(entries: Iterable<[string, T]>) => Record<string, T>}
-	 * @template T
-	 */
-	const fromEntries = Object.fromEntries || (entries => { // eslint-disable-line es-x/no-object-fromentries
+	Object.fromEntries = Object.fromEntries || (entries => {
 		const /** @type {Record<string, T>} */ obj = {};
 		for (const [key, value] of entries) {
 			obj[key] = value;
@@ -58,15 +53,13 @@
 
 	/**
 	 * polyfill for `Array.prototype.flat`
-	 * @type {(arr: HTMLElement[][]) => HTMLElement[]}
+	 * @template {*} T
+	 * @param {(T|T[])[]} arr 任意数组
+	 * @returns {T[]}
 	 */
-	const flatten = arr => {
-		if (typeof arr.flat === 'function') {
-			return arr.flat();
-		}
-		// eslint-disable-next-line unicorn/no-array-reduce
-		return arr.reduce((acc, cur) => acc.concat(cur), []);
-	};
+	const flatten = arr => typeof arr.flat === 'function'
+		? arr.flat()
+		: arr.reduce((acc, cur) => acc.concat(cur), []); // eslint-disable-line unicorn/no-array-reduce
 
 	/**
 	 * 解析版本号
@@ -116,6 +109,7 @@
 	const CDN = '//fastly.jsdelivr.net',
 		CM_CDN = 'npm/codemirror@5.65.3',
 		MW_CDN = 'gh/bhsd-harry/codemirror-mediawiki@1.1.6',
+		PARSER_CDN = 'gh/bhsd-harry/wikiparser-node@0.5.4-b',
 		REPO_CDN = `npm/wikiplus-highlight@${majorVersion}`;
 
 	const {config: {values: {
@@ -176,6 +170,10 @@
 		fold: `${REPO_CDN}/fold.min.js`,
 		wikiEditor: 'ext.wikiEditor',
 		contextmenu: 'mediawiki.Title',
+		lint: `${CM_CDN}/addon/lint/lint.min.js`,
+		annotateScrollbar: `${CM_CDN}/addon/scroll/annotatescrollbar.min.js`,
+		parser: `${PARSER_CDN}/bundle/bundle.min.js`,
+		lintWikitext: `${REPO_CDN}/lint.min.js`,
 	};
 
 	/**
@@ -216,9 +214,9 @@
 	];
 
 	const defaultAddons = ['search'],
-		defaultIndent = 4;
-	let /** @type {Set<string>} */ addons = new Set(storage.getObject('Wikiplus-highlight-addons') || defaultAddons),
-		/** @type {number} */ indent = storage.getObject('Wikiplus-highlight-indent') || defaultIndent;
+		defaultIndent = 4,
+		/** @type {Set<string>} */ addons = new Set(storage.getObject('Wikiplus-highlight-addons') || defaultAddons);
+	let /** @type {number} */ indent = storage.getObject('Wikiplus-highlight-indent') || defaultIndent;
 
 	/** @type {Record<string, string>} */
 	const entity = {'"': 'quot', "'": 'apos', '<': 'lt', '>': 'gt', '&': 'amp', ' ': 'nbsp'},
@@ -303,10 +301,9 @@
 		});
 	};
 
-	let /** @type {Record<string, string>} */ i18n = storage.getObject('Wikiplus-highlight-i18n'),
-		/** @type {() => JQuery<HTMLElement>} */ welcome;
-	if (!i18n) { // 首次安装
-		i18n = {};
+	const /** @type {Record<string, string>} */ i18n = storage.getObject('Wikiplus-highlight-i18n') || {};
+	let /** @type {() => JQuery<HTMLElement>} */ welcome;
+	if (!i18n['wphl-version']) { // 首次安装
 		welcome = notify('welcome');
 	} else if (cmpVersion(i18n['wphl-version'], version)) { // 更新版本
 		welcome = notify(`welcome-${newAddon ? 'new-addon' : 'upgrade'}`, version, newAddon);
@@ -331,10 +328,10 @@
 	/** 加载 I18N */
 	const setI18N = async () => {
 		if (!isLatest || i18n['wphl-lang'] !== i18nLang) {
-			i18n = await $.ajax(`${I18N_CDN}`, { // eslint-disable-line require-atomic-updates
+			Object.assign(i18n, await $.ajax(`${I18N_CDN}`, { // eslint-disable-line require-atomic-updates
 				dataType: 'json',
 				cache: true,
-			});
+			}));
 			storage.setObject('Wikiplus-highlight-i18n', i18n);
 		}
 		mw.messages.set(i18n);
@@ -417,7 +414,9 @@
 		 * 代替`CodeMirror`的局部变量
 		 * @type {typeof CodeMirror}
 		 */
-		const CM = loaded ? window.CodeMirror : {modes: {}, prototype: {}, commands: {}, optionHandlers: {}};
+		const CM = loaded
+			? window.CodeMirror
+			: {modes: {}, prototype: {}, commands: {}, optionHandlers: {}, helpers: {}};
 
 		// lib
 		if (!loaded) {
@@ -451,9 +450,22 @@
 		if (!CM.prototype.getSearchCursor && addons.has('search') && !addons.has('wikiEditor')) {
 			scripts.push(ADDON_LIST.searchcursor);
 		}
+		if (!CM.prototype.annotateScrollbar && type === 'mediawiki' && addons.has('lint')) {
+			scripts.push(ADDON_LIST.annotateScrollbar);
+		}
 		if (!CM.commands.findForward && addons.has('search') && !addons.has('wikiEditor')) {
 			scripts.push(ADDON_LIST.search);
 		}
+		if (!window.Parser && type === 'mediawiki' && addons.has('lint')) {
+			scripts.push(ADDON_LIST.parser);
+		}
+		if (!CM.optionHandlers.lint && type === 'mediawiki' && addons.has('lint')) {
+			mw.loader.load(`${CDN}/${CM_CDN}/addon/lint/lint.min.css`, 'text/css');
+			scripts.push(ADDON_LIST.lint);
+		}
+		if (!(CM.helpers.lint && CM.helpers.lint.mediawiki) && type === 'mediawiki' && addons.has('lint')) {
+			scripts.push(ADDON_LIST.lintWikitext);
+		}
 		if (addons.has('wikiEditor')) {
 			const state = mw.loader.getState('ext.wikiEditor');
 			if (!state) {
@@ -482,18 +494,15 @@
 	/**
 	 * 展开别名列表
 	 * @param {{aliases: string[], name: string}[]} words 原名
-	 * @returns {{alias: string, name: string}[]}
 	 */
-	const getAliases = words => flatten(
-		words.map(({aliases, name}) => aliases.map(alias => ({alias, name}))),
-	);
+	const getAliases = words => flatten(words.map(({aliases, name}) => aliases.map(alias => ({alias, name}))));
 
 	/**
 	 * 将别名信息转换为CodeMirror接受的设置
 	 * @param {{alias: string, name: string}[]} aliases 别名
 	 * @returns {Record<string, string>}
 	 */
-	const getConfig = aliases => fromEntries(
+	const getConfig = aliases => Object.fromEntries(
 		aliases.map(({alias, name}) => [alias.replace(/:$/, ''), name]),
 	);
 
@@ -521,8 +530,6 @@
 		}
 		if (config && config.redirect && config.img) { // 情形1：config已更新，可能来自localStorage
 			return config;
-		} else if (config) { /** @todo 暂不需要`redirect`和`img`相关设置 */
-			return config;
 		}
 
 		/*
@@ -553,7 +560,7 @@
 					nowiki: 'mw-tag-nowiki',
 					ref: 'text/mediawiki',
 				},
-				tags: fromEntries(
+				tags: Object.fromEntries(
 					extensiontags.map(tag => [tag.slice(1, -1), true]),
 				),
 				urlProtocols: mw.config.get('wgUrlProtocols'),
@@ -588,17 +595,17 @@
 
 	/** 检查页面语言类型 */
 	const getPageMode = async () => {
-		if ((ns === 274 || ns === 828) && !page.endsWith('/doc')) {
-			const pageMode = ns === 274 ? 'Widget' : 'Lua';
-			await mw.loader.using(['oojs-ui-windows', 'oojs-ui.styles.icons-content']);
-			const bool = await OO.ui.confirm(msg('contentmodel'), {
-				actions: [{label: pageMode}, {label: 'Wikitext', action: 'accept'}],
-			});
-			return bool ? 'mediawiki' : pageMode.toLowerCase();
-		} else if (page.endsWith('/doc')) {
+		if (page.endsWith('/doc')) {
 			return 'mediawiki';
+		} else if (ns !== 274 && ns !== 828) {
+			return CONTENTMODEL[contentmodel];
 		}
-		return CONTENTMODEL[contentmodel];
+		const pageMode = ns === 274 ? 'Widget' : 'Lua';
+		await mw.loader.using(['oojs-ui-windows', 'oojs-ui.styles.icons-content']);
+		const bool = await OO.ui.confirm(msg('contentmodel'), {
+			actions: [{label: pageMode}, {label: 'Wikitext', action: 'accept'}],
+		});
+		return bool ? 'mediawiki' : pageMode.toLowerCase();
 	};
 
 	/**
@@ -631,10 +638,7 @@
 		/** @override */ getCaretPosition(option) {
 			const caretPos = cm.indexFromPos(cm.getCursor('from')),
 				endPos = cm.indexFromPos(cm.getCursor('to'));
-			if (option.startAndEnd) {
-				return [caretPos, endPos];
-			}
-			return caretPos;
+			return option.startAndEnd ? [caretPos, endPos] : caretPos;
 		},
 		/** @override */ scrollToCaretPosition() {
 			cm.scrollIntoView();
@@ -698,7 +702,7 @@
 				mwConfig,
 				json,
 			},
-			fromEntries(
+			Object.fromEntries(
 				options.map(({option, addon = option, modes, complex = mod => !modes || modes.includes(mod)}) => {
 					const mainAddon = Array.isArray(addon) ? addon[0] : addon;
 					return [option, addons.has(mainAddon) && complex(mode, json)];
@@ -772,9 +776,8 @@
 
 	// 监视 Wikiplus 编辑框
 	const observer = new MutationObserver(records => {
-		const $editArea = $(flatten(
-			records.map(({addedNodes}) => [...addedNodes]),
-		)).find('#Wikiplus-Quickedit, #Wikiplus-Setting-Input');
+		const $editArea = $(flatten(records.map(({addedNodes}) => [...addedNodes])))
+			.find('#Wikiplus-Quickedit, #Wikiplus-Setting-Input');
 		if ($editArea.length === 0) {
 			return;
 		}
@@ -851,6 +854,7 @@
 		/** @type {OOUI.CheckboxMultiselectInputWidget} */ widget,
 		/** @type {OOUI.CheckboxMultioptionWidget} */ searchWidget,
 		/** @type {OOUI.CheckboxMultioptionWidget} */ wikiEditorWidget,
+		/** @type {OOUI.CheckboxMultioptionWidget} */ lintWidget,
 		/** @type {OOUI.NumberInputWidget} */ indentWidget,
 		/** @type {OOUI.FieldLayout} */ field,
 		/** @type {OOUI.FieldLayout} */ indentField;
@@ -886,7 +890,7 @@
 						const mainAddon = Array.isArray(addon) ? addon[0] : addon;
 						return {data: mainAddon, label: htmlMsg(`addon-${mainAddon.toLowerCase()}`)};
 					}),
-					...['wikiEditor', 'escape', 'contextmenu', 'indentWithSpace', 'otherEditors']
+					...['wikiEditor', 'escape', 'contextmenu', 'lint', 'indentWithSpace', 'otherEditors']
 						.map(addon => ({data: addon, label: htmlMsg(`addon-${addon.toLowerCase()}`)})),
 				],
 				value: [...addons],
@@ -894,6 +898,7 @@
 			const {checkboxMultiselectWidget} = widget;
 			searchWidget = checkboxMultiselectWidget.findItemFromData('search');
 			wikiEditorWidget = checkboxMultiselectWidget.findItemFromData('wikiEditor');
+			lintWidget = checkboxMultiselectWidget.findItemFromData('lint');
 			indentWidget = new OO.ui.NumberInputWidget({min: 0, value: indent});
 			field = new OO.ui.FieldLayout(widget, {
 				label: msg('addon-label'),
@@ -907,6 +912,7 @@
 		const wikiplusLoaded = typeof window.Wikiplus === 'object' || typeof window.Pages === 'object';
 		searchWidget.setDisabled(!wikiplusLoaded);
 		wikiEditorWidget.setDisabled(!wikiplusLoaded || !mw.loader.getState('ext.wikiEditor'));
+		lintWidget.setDisabled(!wikiplusLoaded);
 		const data = await dialog.open({
 			title: msg('addon-title'),
 			message: field.$element.add(indentField.$element).add(
@@ -923,7 +929,10 @@
 		if (typeof data === 'object' && data.action === 'accept') {
 			/* eslint-disable require-atomic-updates */
 			const value = widget.getValue();
-			addons = new Set(value);
+			addons.clear();
+			for (const addon of value) {
+				addons.add(addon);
+			}
 			indent = Number(indentWidget.getValue());
 			storage.setObject('Wikiplus-highlight-addons', value);
 			storage.setObject('Wikiplus-highlight-indent', indent);
@@ -963,11 +972,11 @@
 				doc.setOption(option, complex(mode, json));
 			}
 		}
-		if (mode !== 'mediawiki' && addons.has('indentWithSpace')) {
+		if (mode === 'mediawiki' && addons.has('escape')) {
+			doc.addKeyMap(isPc(CodeMirror) ? extraKeysPc : extraKeysMac, true);
+		} else if (mode !== 'mediawiki' && addons.has('indentWithSpace')) {
 			doc.setOption('indentUnit', indent);
 			doc.setOption('indentWithTabs', false);
-		} else if (mode === 'mediawiki' && addons.has('escape')) {
-			doc.addKeyMap(isPc(CodeMirror) ? extraKeysPc : extraKeysMac, true);
 		}
 		handleContextMenu(doc, mode);
 	};
@@ -976,6 +985,11 @@
 		/** @param {{cm: CodeMirror.Editor}} */ ({cm: doc}) => handleOtherEditors(doc),
 	);
 	mw.hook('inspector').add(/** @param {CodeMirror.Editor} doc */ doc => handleOtherEditors(doc));
+	mw.hook('wiki-codemirror').add(/** @param {CodeMirror.Editor} doc */ doc => {
+		if (!doc.getTextArea || !isWikiplus(doc.getTextArea())) {
+			handleOtherEditors(doc);
+		}
+	});
 
 	mw.libs.wphl = {
 		version,

package/matchtags.js

@@ -72,10 +72,9 @@
 					return undefined;
 				}
 				this.ch = gt + 1;
-				if (!this.bracketAt(gt)) {
-					continue;
+				if (this.bracketAt(gt)) {
+					return this.text[gt - 1] === '/' ? 'selfClose' : 'regular';
 				}
-				return this.text[gt - 1] === '/' ? 'selfClose' : 'regular';
 			}
 		}
 
@@ -85,8 +84,7 @@
 				const lt = this.ch ? this.text.lastIndexOf('<', this.ch - 1) : -1;
 				if (lt === -1) {
 					return undefined;
-				}
-				if (!this.bracketAt(lt)) {
+				} else if (!this.bracketAt(lt)) {
 					this.ch = lt;
 					continue;
 				}
@@ -111,12 +109,10 @@
 						return undefined;
 					}
 				}
-				if (!this.bracketAt(found.index)) {
-					this.ch = found.index + found[0].length;
-					continue;
-				}
 				this.ch = found.index + found[0].length;
-				return found;
+				if (this.bracketAt(found.index)) {
+					return found;
+				}
 			}
 		}
 
@@ -131,14 +127,13 @@
 						return undefined;
 					}
 				}
-				if (!this.bracketAt(gt)) {
-					this.ch = gt;
-					continue;
+				if (this.bracketAt(gt)) {
+					const lastSlash = this.text.lastIndexOf('/', gt);
+					const selfClose = lastSlash > -1 && !/\S/u.test(this.text.slice(lastSlash + 1, gt));
+					this.ch = gt + 1;
+					return selfClose ? 'selfClose' : 'regular';
 				}
-				const lastSlash = this.text.lastIndexOf('/', gt);
-				const selfClose = lastSlash > -1 && !/\S/u.test(this.text.slice(lastSlash + 1, gt));
-				this.ch = gt + 1;
-				return selfClose ? 'selfClose' : 'regular';
+				this.ch = gt;
 			}
 		}
 
@@ -160,11 +155,9 @@
 					tagName = next[2].toLowerCase();
 				if (!end) {
 					return undefined;
-				}
-				if (end === 'selfClose' || voidTags.includes(tagName)) {
+				} else if (end === 'selfClose' || voidTags.includes(tagName)) {
 					continue;
-				}
-				if (next[1]) { // closing tag
+				} else if (next[1]) { // closing tag
 					let i = stack.length - 1;
 					for (; i >= 0; --i) {
 						if (stack[i] === tagName) {
@@ -202,8 +195,7 @@
 				const tagName = start[2].toLowerCase();
 				if (prev === 'selfClose' || voidTags.includes(tagName)) {
 					continue;
-				}
-				if (start[1]) { // closing tag
+				} else if (start[1]) { // closing tag
 					stack.push(tagName);
 				} else { // opening tag
 					let i = stack.length - 1;
@@ -272,10 +264,7 @@
 			}
 			const forward = new Iter(this, pos),
 				close = forward.findMatchingClose(open.tag);
-			if (close) {
-				return {open, close};
-			}
-			return undefined;
+			return close ? {open, close} : undefined;
 		},
 	);
 
@@ -324,8 +313,7 @@
 			const match = cm.findMatchingTag(cm.getCursor());
 			if (!match) {
 				return;
-			}
-			if (match.at === 'self') {
+			} else if (match.at === 'self') {
 				cm.state.tagHit = cm.markText(match.open.from, match.open.to, {className: 'cm-matchingtag'});
 				return;
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wikiplus-highlight",
-  "version": "2.22.5",
+  "version": "2.25.3",
   "description": "A plugin for the MediaWiki front-end add-on \"Wikiplus\"",
   "keywords": [
     "mediawiki",
@@ -13,7 +13,12 @@
   },
   "license": "GPL-3.0",
   "author": "Bhsd",
-  "browser": "main.js",
+  "files": [
+    "/dist/",
+    "/i18n/",
+    "/*.js"
+  ],
+  "browser": "/main.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/bhsd-harry/Wikiplus-highlight.git"