@bhsd/codemirror-mediawiki 2.19.6 → 2.19.7

package/i18n/en.json

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

package/i18n/zh-hant.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bhsd/codemirror-mediawiki",
-	"version": "2.19.6",
+	"version": "2.19.7",
 	"description": "Modified CodeMirror mode based on wikimedia/mediawiki-extensions-CodeMirror",
 	"keywords": [
 		"mediawiki",
@@ -34,10 +34,10 @@
 	"scripts": {
 		"prepublishOnly": "npm run build",
 		"build:core": "esbuild ./src/codemirror.ts --charset=utf8 --bundle --minify --target=es2019 --format=esm --sourcemap --outfile=dist/main.min.js && esbuild ./src/linter.ts --charset=utf8 --target=es2019 --format=esm --outfile=dist/linter.mjs && tsc --emitDeclarationOnly",
-		"build:mw": "esbuild ./mw/base.ts --charset=utf8 --bundle --minify --target=es2019 --format=esm --sourcemap --outfile=dist/mw.min.js && esbuild ./mw/config.ts --charset=utf8 --bundle --target=es2019 --format=esm --outfile=dist/mwConfig.mjs",
+		"build:mw": "esbuild ./mw/base.ts --charset=utf8 --bundle --minify --target=es2019 --format=esm --outfile=dist/mw.min.js && esbuild ./mw/config.ts --charset=utf8 --bundle --target=es2019 --format=esm --outfile=dist/mwConfig.mjs",
 		"build:wiki": "esbuild ./mw/base.ts --charset=utf8 --bundle --minify --target=es2019 --format=iife --sourcemap --outfile=dist/wiki.min.js",
 		"build:gh-page": "bash build.sh",
-		"build:test": "tsc --project test/tsconfig.json && node test/dist/test/test.js",
+		"build:test": "tsc --project test/tsconfig.json && mocha",
 		"build": "npm run build:core && npm run build:mw && npm run build:wiki && eslint --no-eslintrc -c .eslintrc.dist.cjs dist/*.js",
 		"lint:ts": "tsc --noEmit && tsc --project mw/tsconfig.json --noEmit && tsc --project test/tsconfig.json --noEmit && eslint --cache .",
 		"lint:css": "stylelint *.css",
@@ -72,6 +72,7 @@
 		"@stylistic/stylelint-plugin": "^3.1.1",
 		"@types/eslint": "^8.56.10",
 		"@types/jquery": "^3.5.32",
+		"@types/mocha": "^10.0.10",
 		"@types/node": "^22.10.1",
 		"@types/oojs-ui": "^0.49.0",
 		"@typescript-eslint/eslint-plugin": "^8.16.0",
@@ -89,6 +90,7 @@
 		"eslint-plugin-unicorn": "^56.0.1",
 		"http-server": "^14.1.0",
 		"luacheck-browserify": "^0.2.0",
+		"mocha": "^10.8.2",
 		"monaco-editor": "^0.52.0",
 		"monaco-wiki": "^1.5.0",
 		"stylelint": "^16.11.0",

package/src/static.ts

@@ -26,41 +26,35 @@ export const tagModes = {
 	graph: 'json',
 };
 
-/**
- * Object.fromEntries polyfill
- * @param entries
- * @param obj
- * @param string 是否为字符串
- */
-const fromEntries = (entries: readonly string[], obj: Record<string, unknown>, string?: boolean): void => {
-	for (const entry of entries) {
-		obj[entry] = string ? entry : true;
-	}
-};
-
 export const getStaticMwConfig = (
-	{parserFunction, protocol, nsid, variants, redirection, ext, doubleUnderscore, img}: Config,
+	{
+		parserFunction: [p0, p1, ...p2],
+		protocol,
+		nsid,
+		variants,
+		redirection,
+		ext,
+		doubleUnderscore: [d0, d1, d2],
+		img,
+	}: Config,
 	modes: Record<string, string>,
-): MwConfig => {
-	const mwConfig: MwConfig = {
-			tags: {},
-			tagModes: modes,
-			doubleUnderscore: [{}, {}],
-			functionSynonyms: [parserFunction[0], {}],
-			urlProtocols: `${protocol}|//`,
-			nsid,
-			img: Object.fromEntries(Object.entries(img).map(([key, val]) => [key, `img_${val}`])),
-			variants,
-			redirection,
+): MwConfig => ({
+	tags: Object.fromEntries(ext.map(s => [s, true])),
+	tagModes: modes,
+	doubleUnderscore: [
+		Object.fromEntries((d2 && d0.length === 0 ? Object.keys(d2) : d0).map(s => [`__${s}__`, true])),
+		Object.fromEntries(d1.map(s => [`__${s}__`, true])),
+	],
+	functionSynonyms: [
+		{
+			...p0,
+			...Object.fromEntries(p2.flat().map(s => [s, s])),
 		},
-		[insensitive,, obj] = doubleUnderscore;
-	fromEntries(ext, mwConfig.tags);
-	fromEntries(
-		(obj && insensitive.length === 0 ? Object.keys(obj) : insensitive).map(s => `__${s}__`),
-		mwConfig.doubleUnderscore[0],
-	);
-	fromEntries(doubleUnderscore[1].map(s => `__${s}__`), mwConfig.doubleUnderscore[1]);
-	fromEntries((parserFunction.slice(2) as string[][]).flat(), mwConfig.functionSynonyms[0], true);
-	fromEntries(parserFunction[1], mwConfig.functionSynonyms[1]);
-	return mwConfig;
-};
+		Object.fromEntries(p1.map(s => [s, true])),
+	],
+	urlProtocols: `${protocol}|//`,
+	nsid,
+	img: Object.fromEntries(Object.entries(img).map(([k, v]) => [k, `img_${v}`])),
+	variants,
+	redirection,
+});