@bhsd/codemirror-mediawiki 2.19.10 → 2.20.0

package/i18n/en.json

@@ -1,5 +1,5 @@
 {
-	"version": "2.19.10",
+	"version": "2.20.0",
 	"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.19.10",
+	"version": "2.20.0",
 	"lang": "zh-hans",
 	"i18n-failed": "获取 $1 的语言文件失败。",
 	"title": "CodeMirror插件",

package/i18n/zh-hant.json

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

package/mediawiki.css

@@ -1,6 +1,9 @@
 .cm-editor {
 	background-color: #fff;
 }
+.cm-editor .cm-lineNumbers .cm-gutterElement {
+	text-align: end;
+}
 .cm-panel .cm-textfield,
 .cm-panel .cm-button,
 .cm-panels > .cm-search.cm-panel label,

package/mw/config.ts

@@ -67,13 +67,13 @@ export const getMwConfig = async (modes: Record<string, string>): Promise<MwConf
 	const isIPE = config && Object.values(config.functionSynonyms[0]).includes(true as unknown as string),
 		nsid = mw.config.get('wgNamespaceIds');
 	// 情形1：config已更新，可能来自localStorage
-	if (config?.img && config.redirection && config.variants && !isIPE) {
+	if (config?.img && config.redirection && config.variants && config.variableIDs && !isIPE) {
 		config.urlProtocols = config.urlProtocols.replace(/\\:/gu, ':');
 		config.tagModes = modes;
 		return {...config, nsid};
 	} else if (location.hostname.endsWith('.moegirl.org.cn')) {
 		const parserConfig: Config = await (await fetch(
-			`${CDN}/npm/wikiparser-node@browser/config/moegirl.json`,
+			`${CDN}/npm/wikiparser-node/config/moegirl.json`,
 		)).json();
 		setObject('wikilintConfig', parserConfig);
 		config = getStaticMwConfig(parserConfig, modes);
@@ -96,7 +96,8 @@ export const getMwConfig = async (modes: Record<string, string>): Promise<MwConf
 			siprop: [
 				'general',
 				'magicwords',
-				...config && !isIPE ? [] : ['extensiontags', 'functionhooks', 'variables'],
+				...config && !isIPE ? [] : ['extensiontags', 'functionhooks'],
+				...config?.variableIDs && !isIPE ? [] : ['variables'],
 			],
 			formatversion: '2',
 		}) as any; // eslint-disable-line @typescript-eslint/no-explicit-any
@@ -129,6 +130,7 @@ export const getMwConfig = async (modes: Record<string, string>): Promise<MwConf
 		config!.variants = variants ? variants.map(({code}) => code) : [];
 		config!.redirection = magicwords.find(({name}) => name === 'redirect')!.aliases;
 		config!.urlProtocols = mw.config.get('wgUrlProtocols').replace(/\\:/gu, ':');
+		config!.variableIDs ??= variables;
 	}
 	setConfig(config!);
 	ALL_SETTINGS_CACHE[SITE_ID] = {config: config!, time: Date.now()};
@@ -146,34 +148,35 @@ export const getParserConfig = (minConfig: Config, mwConfig: MwConfig): Config =
 	if (config) {
 		return config;
 	}
+	const {tags, nsid, doubleUnderscore, variants, urlProtocols, redirection, functionSynonyms, img} = mwConfig,
+		[insensitive, sensitive] = functionSynonyms;
 	config = {
 		...minConfig,
-		ext: Object.keys(mwConfig.tags),
+		ext: Object.keys(tags),
 		namespaces: mw.config.get('wgFormattedNamespaces'),
-		nsid: mwConfig.nsid,
-		doubleUnderscore: mwConfig.doubleUnderscore.map(
+		nsid,
+		doubleUnderscore: doubleUnderscore.map(
 			obj => Object.keys(obj).map(s => s.slice(2, -2)),
 		) as [string[], string[]],
-		variants: mwConfig.variants!,
-		protocol: mwConfig.urlProtocols.replace(/\|\\?\/\\?\//u, ''),
-		redirection: mwConfig.redirection ?? minConfig.redirection,
+		variants: variants!,
+		protocol: urlProtocols.replace(/\|\\?\/\\?\//u, ''),
+		redirection: redirection ?? minConfig.redirection,
 	};
 	if (location.hostname.endsWith('.moegirl.org.cn')) {
 		config.html[2].push('img');
 	}
-	[config.parserFunction[0]] = mwConfig.functionSynonyms;
+	config.parserFunction[0] = insensitive;
 	if (mw.loader.getState('ext.CodeMirror') === null) {
-		for (const [key, val] of Object.entries(mwConfig.functionSynonyms[0])) {
+		for (const [key, val] of Object.entries(insensitive)) {
 			if (!key.startsWith('#')) {
 				config.parserFunction[0][`#${key}`] = val;
 			}
 		}
 	}
-	config.parserFunction[1] = [
-		...Object.keys(mwConfig.functionSynonyms[1]),
-		'=',
-	];
-	for (const [key, val] of Object.entries(mwConfig.img!)) {
+	config.parserFunction[1] = Object.values(sensitive as Record<string, unknown>).includes(true)
+		? [...Object.keys(sensitive), '=']
+		: {...sensitive, '=': '='};
+	for (const [key, val] of Object.entries(img!)) {
 		config.img[key] = val.slice(4);
 	}
 	return config;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bhsd/codemirror-mediawiki",
-	"version": "2.19.10",
+	"version": "2.20.0",
 	"description": "Modified CodeMirror mode based on wikimedia/mediawiki-extensions-CodeMirror",
 	"keywords": [
 		"mediawiki",
@@ -56,7 +56,7 @@
 		"@codemirror/view": "^6.35.0",
 		"@lezer/common": "^1.2.3",
 		"style-mod": "^4.1.0",
-		"wikiparser-node": "^1.14.1"
+		"wikiparser-node": "^1.15.0"
 	},
 	"devDependencies": {
 		"@codemirror/autocomplete": "^6.18.3",

package/src/linter.ts

@@ -12,7 +12,7 @@ declare type getAsyncLinter<T> = (opt?: Record<string, unknown>) => Promise<T>;
  * @param opt 选项
  */
 export const getWikiLinter: getAsyncLinter<LinterBase> = async opt => {
-	const REPO = 'npm/wikiparser-node@browser',
+	const REPO = 'npm/wikiparser-node',
 		DIR = `${REPO}/extensions/dist`,
 		lang = opt?.['i18n'];
 	await loadScript(`${DIR}/base.min.js`, 'wikiparse');

package/src/static.ts

@@ -28,13 +28,14 @@ export const tagModes = {
 
 export const getStaticMwConfig = (
 	{
+		variable,
 		parserFunction: [p0, p1, ...p2],
 		protocol,
 		nsid,
 		variants,
 		redirection,
 		ext,
-		doubleUnderscore: [d0, d1, d2],
+		doubleUnderscore: [d0, d1, d2, d3],
 		img,
 	}: Config,
 	modes: Record<string, string>,
@@ -43,14 +44,15 @@ export const getStaticMwConfig = (
 	tagModes: modes,
 	doubleUnderscore: [
 		Object.fromEntries((d2 && d0.length === 0 ? Object.keys(d2) : d0).map(s => [`__${s}__`, true])),
-		Object.fromEntries(d1.map(s => [`__${s}__`, true])),
+		Object.fromEntries((d3 && d1.length === 0 ? Object.keys(d3) : d1).map(s => [`__${s}__`, true])),
 	],
+	variableIDs: variable,
 	functionSynonyms: [
 		{
 			...p0,
 			...Object.fromEntries(p2.flat().map(s => [s, s])),
 		},
-		Object.fromEntries(p1.map(s => [s, true])),
+		Array.isArray(p1) ? Object.fromEntries(p1.map(s => [s, s.toLowerCase()])) : {...p1},
 	],
 	urlProtocols: `${protocol}|//`,
 	nsid,