@bhsd/codemirror-mediawiki 2.28.2 → 2.29.0

package/i18n/en.json

@@ -1,5 +1,5 @@
 {
-	"version": "2.28.2",
+	"version": "2.29.0",
 	"lang": "en",
 	"title": "CodeMirror Addons",
 	"label": "Please select the addons you wish to load",

package/i18n/zh-hans.json

@@ -1,5 +1,5 @@
 {
-	"version": "2.28.2",
+	"version": "2.29.0",
 	"lang": "zh-hans",
 	"title": "CodeMirror插件",
 	"label": "请选择您希望加载的插件",

package/i18n/zh-hant.json

@@ -1,5 +1,5 @@
 {
-	"version": "2.28.2",
+	"version": "2.29.0",
 	"lang": "zh-hant",
 	"title": "CodeMirror外掛程式",
 	"label": "請選擇您希望載入的外掛程式",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bhsd/codemirror-mediawiki",
-	"version": "2.28.2",
+	"version": "2.29.0",
 	"description": "Modified CodeMirror mode based on wikimedia/mediawiki-extensions-CodeMirror",
 	"keywords": [
 		"mediawiki",
@@ -16,13 +16,12 @@
 		"/i18n/",
 		"/dist/*.js",
 		"/dist/*.d.ts",
-		"/dist/*.mjs",
-		"/dist/*.d.mts",
 		"/mediawiki.css"
 	],
 	"browser": "dist/main.min.js",
-	"main": "./dist/main.min.js",
+	"main": "./dist/codemirror.js",
 	"types": "./dist/codemirror.d.ts",
+	"type": "module",
 	"sideEffects": false,
 	"repository": {
 		"type": "git",
@@ -30,13 +29,15 @@
 	},
 	"scripts": {
 		"prepublishOnly": "npm run build",
+		"bundle:core": "esbuild ./src/codemirror.ts --charset=utf8 --bundle --format=esm --outfile=build/main.js",
+		"bundle:wiki": "esbuild ./mw/index.ts --charset=utf8 --bundle --format=esm --outfile=build/wiki.js",
 		"build:css": "esbuild ./css/index.css --bundle --minify --outfile=mediawiki.css",
-		"build:core": "esbuild ./src/codemirror.ts --charset=utf8 --bundle --minify --target=es2019 --format=esm --sourcemap --outfile=dist/main.min.js && esbuild ./src/linter.ts ./src/keybindings.ts --charset=utf8 --target=es2019 --format=esm --outdir=dist --out-extension:.js=.mjs && tsc --emitDeclarationOnly && cp dist/linter.d.ts dist/linter.d.mts && cp dist/keybindings.d.ts dist/keybindings.d.mts && mv dist/mwConfig.d.ts dist/mwConfig.d.mts && rm dist/*-page.d.ts",
-		"build:mw": "esbuild ./mw/index.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/index.ts --charset=utf8 --bundle --minify --target=es2019 --format=iife --sourcemap --outfile=dist/wiki.min.js",
+		"build:core": "npm run bundle:core && esbuild ./build/main.js --charset=utf8 --minify --target=es2019 --format=esm --sourcemap --outfile=dist/main.min.js && tsc && rm dist/*-page.{js,d.ts}",
+		"build:mw": "esbuild ./build/wiki.js --charset=utf8 --minify --target=es2019 --format=esm --outfile=dist/mw.min.js && esbuild ./mw/config.ts --charset=utf8 --bundle --target=es2019 --format=esm --outfile=dist/mwConfig.js",
+		"build:wiki": "npm run bundle:wiki && esbuild ./build/wiki.js --charset=utf8 --minify --target=es2019 --format=iife --sourcemap --outfile=dist/wiki.min.js",
 		"build:gh-page": "bash build.sh",
 		"build:test": "tsc --project test/tsconfig.json && npm test",
-		"build": "npm run build:css && rm -rf dist/ && npm run build:core && npm run build:mw && npm run build:wiki && eslint --no-eslintrc -c .eslintrc.dist.cjs dist/*.js",
+		"build": "npm run build:css && rm -rf dist/ && npm run build:core && npm run build:wiki && npm run build:mw && eslint --no-eslintrc -c .eslintrc.dist.cjs dist/*.min.js",
 		"lint:ts": "tsc --noEmit && tsc --project mw/tsconfig.json --noEmit && tsc --project test/tsconfig.json --noEmit && eslint --cache .",
 		"lint:css": "stylelint **/*.css",
 		"lint": "npm run lint:ts && npm run lint:css",
@@ -47,24 +48,24 @@
 		"test:real": "node test/dist/test/real.js"
 	},
 	"dependencies": {
-		"@bhsd/common": "^0.13.0",
-		"@codemirror/lint": "^6.8.5",
-		"@codemirror/state": "^6.5.2",
-		"@codemirror/view": "^6.36.8",
-		"@lezer/common": "^1.2.3",
-		"wikiparser-node": "^1.21.2"
-	},
-	"devDependencies": {
 		"@bhsd/codemirror-css-color-picker": "^6.3.0",
+		"@bhsd/common": "^0.13.1",
 		"@codemirror/autocomplete": "^6.18.6",
 		"@codemirror/commands": "^6.8.1",
+		"@codemirror/language": "^6.11.0",
 		"@codemirror/lang-css": "^6.3.1",
 		"@codemirror/lang-javascript": "^6.2.2",
 		"@codemirror/lang-json": "^6.0.1",
-		"@codemirror/language": "^6.11.0",
 		"@codemirror/legacy-modes": "^6.4.2",
+		"@codemirror/lint": "^6.8.5",
 		"@codemirror/search": "^6.5.11",
+		"@codemirror/state": "^6.5.2",
+		"@codemirror/view": "^6.36.8",
+		"@lezer/common": "^1.2.3",
 		"@lezer/highlight": "^1.2.1",
+		"wikiparser-node": "^1.21.2"
+	},
+	"devDependencies": {
 		"@stylistic/eslint-plugin": "^3.1.0",
 		"@stylistic/stylelint-plugin": "^3.1.2",
 		"@types/eslint": "^8.56.10",
@@ -85,7 +86,7 @@
 		"eslint-plugin-regexp": "^2.7.0",
 		"eslint-plugin-unicorn": "^56.0.1",
 		"http-server": "^14.1.1",
-		"luacheck-browserify": "^0.5.2",
+		"luacheck-browserify": "^0.7.0",
 		"mocha": "^11.1.0",
 		"monaco-editor": "^0.52.2",
 		"stylelint": "^16.20.0",

package/dist/keybindings.d.mts

@@ -1,15 +0,0 @@
-export interface KeymapConfig {
-    key: string;
-    desc: string;
-    pre?: string;
-    post?: string;
-    splitlines?: boolean;
-}
-export declare const keybindings: KeymapConfig[];
-/**
- * 将文本各行包裹在指定的前后缀中
- * @param text 跨行文本
- * @param pre 前缀
- * @param post 后缀
- */
-export declare const encapsulateLines: (text: string, pre: string, post: string) => string;

package/dist/keybindings.mjs

@@ -1,34 +0,0 @@
-const keybindings = [
-  { key: "Ctrl-8", pre: "<blockquote>", post: "</blockquote>", desc: "blockquote" },
-  { key: "Mod-.", pre: "<sup>", post: "</sup>", desc: "sup" },
-  { key: "Mod-,", pre: "<sub>", post: "</sub>", desc: "sub" },
-  { key: "Mod-Shift-6", pre: "<code>", post: "</code>", desc: "code" },
-  { key: "Ctrl-Shift-5", pre: "<s>", post: "</s>", desc: "s" },
-  { key: "Mod-u", pre: "<u>", post: "</u>", desc: "u" },
-  { key: "Mod-k", pre: "[[", post: "]]", desc: "link" },
-  { key: "Mod-i", pre: "''", post: "''", desc: "italic" },
-  { key: "Mod-b", pre: "'''", post: "'''", desc: "bold" },
-  { key: "Mod-Shift-k", pre: "<ref>", post: "</ref>", desc: "ref" },
-  { key: "Mod-/", pre: "<!-- ", post: " -->", desc: "comment" },
-  { key: "Ctrl-0", splitlines: true, desc: "heading 0" },
-  ...new Array(6).fill(0).map((_, i) => ({
-    key: `Ctrl-${i + 1}`,
-    pre: `${"=".repeat(i + 1)} `,
-    post: ` ${"=".repeat(i + 1)}`,
-    splitlines: true,
-    desc: `heading ${i + 1}`
-  })),
-  { key: "Ctrl-7", pre: " ", splitlines: true, desc: "pre" }
-];
-const encapsulateLines = (text, pre, post) => {
-  const lines = text.split("\n");
-  return lines.map((line) => {
-    var _a, _b;
-    const str = ((_b = (_a = /^(={1,6})(.+)\1\s*$/u.exec(line)) == null ? void 0 : _a[2]) != null ? _b : line).trim();
-    return pre === " " || lines.length === 1 || line.trim() ? pre + str + post : str;
-  }).join("\n");
-};
-export {
-  encapsulateLines,
-  keybindings
-};

package/dist/linter.d.mts

@@ -1,43 +0,0 @@
-import type { Diagnostic as DiagnosticBase, Range } from 'vscode-languageserver-types';
-import type { Linter } from 'eslint';
-import type { Warning } from 'stylelint';
-import type { Diagnostic } from 'luacheck-browserify';
-export type Option = Record<string, unknown> | null | undefined;
-export type LiveOption = (runtime?: boolean) => Option;
-declare type getLinter<T> = () => (text: string) => T;
-declare type asyncLinter<T, S = Record<string, unknown>> = ((text: string, config?: Option) => T) & {
-    config?: S;
-    fixer?: (code: string, rule?: string) => string | Promise<string>;
-};
-/**
- * @param opt 初始化选项
- * @param obj 仅用于wikiparse.LanguageService
- */
-declare type getAsyncLinter<T, S = never, R = never> = (opt?: S, obj?: R) => Promise<asyncLinter<T>>;
-declare interface MixedDiagnostic extends Omit<DiagnosticBase, 'range'> {
-    range?: Range;
-    from?: number;
-    to?: number;
-}
-declare interface JsonError {
-    message: string;
-    severity: 'error';
-    line: string | undefined;
-    column: string | undefined;
-    position: string | undefined;
-}
-/**
- * 获取 Wikitext LSP
- * @param opt 选项
- * @param obj 对象
- */
-export declare const getWikiLinter: getAsyncLinter<Promise<MixedDiagnostic[]>, Option, object>;
-/** 获取 ESLint */
-export declare const getJsLinter: getAsyncLinter<Linter.LintMessage[]>;
-/** 获取 Stylelint */
-export declare const getCssLinter: getAsyncLinter<Promise<Warning[]>>;
-/** 获取 Luacheck */
-export declare const getLuaLinter: getAsyncLinter<Promise<Diagnostic[]>>;
-/** JSON.parse */
-export declare const getJsonLinter: getLinter<JsonError[]>;
-export {};

package/dist/linter.mjs

@@ -1,132 +0,0 @@
-import { loadScript, getWikiparse, getLSP, sanitizeInlineStyle } from "@bhsd/common";
-import { styleLint } from "@bhsd/common/dist/stylelint";
-const offsetAt = (range, line, column) => {
-  if (line === -2) {
-    return range[0];
-  }
-  return line === 0 ? range[1] : range[0] + column;
-};
-const getWikiLinter = async (opt, obj) => {
-  await getWikiparse(
-    opt == null ? void 0 : opt["getConfig"],
-    opt == null ? void 0 : opt["i18n"]
-  );
-  const lsp = getLSP(obj, opt == null ? void 0 : opt["include"]);
-  return async (text, config) => {
-    const diagnostics = (await lsp.provideDiagnostics(text)).filter(
-      ({ code, severity }) => {
-        var _a;
-        return Number((_a = config == null ? void 0 : config[code]) != null ? _a : 2) > Number(severity === 2);
-      }
-    ), tokens = "findStyleTokens" in lsp && (config == null ? void 0 : config["invalid-css"]) !== "0" ? await lsp.findStyleTokens() : [];
-    if (tokens.length === 0) {
-      return diagnostics;
-    }
-    const cssLint = await getCssLinter();
-    return [
-      ...diagnostics,
-      ...(await cssLint(
-        tokens.map(({ childNodes, type, tag }, i) => `${type === "ext-attr" ? "div" : tag}#${i}{
-${sanitizeInlineStyle(childNodes[1].childNodes[0].data).replace(/\n/gu, " ")}
-}`).join("\n")
-      )).map(({ line, column, endLine, endColumn, rule, severity, text: message }) => {
-        const i = Math.ceil(line / 3), { range } = tokens[i - 1].childNodes[1].childNodes[0], from = offsetAt(range, line - 3 * i, column - 1);
-        return {
-          from,
-          to: endLine === void 0 ? from : offsetAt(range, endLine - 3 * i, endColumn - 1),
-          severity: severity === "error" ? 1 : 2,
-          source: "Stylelint",
-          code: rule,
-          message
-        };
-      })
-    ];
-  };
-};
-const getJsLinter = async () => {
-  var _a;
-  await loadScript("npm/@bhsd/eslint-browserify", "eslint");
-  const esLinter = new eslint.Linter(), conf = {
-    env: { browser: true, es2024: true },
-    parserOptions: { ecmaVersion: 15, sourceType: "module" }
-  }, recommended = {};
-  for (const [name, { meta }] of esLinter.getRules()) {
-    if ((_a = meta == null ? void 0 : meta.docs) == null ? void 0 : _a.recommended) {
-      recommended[name] = 2;
-    }
-  }
-  const linter = (text, opt) => {
-    const config = { ...conf, ...opt };
-    if (!("rules" in config) || config.extends === "eslint:recommended" || Array.isArray(config.extends) && config.extends.includes("eslint:recommended")) {
-      config.rules = { ...recommended, ...config.rules };
-    }
-    delete config.extends;
-    linter.config = config;
-    return esLinter.verify(text, config);
-  };
-  linter.fixer = (code, rule) => {
-    var _a2, _b;
-    return esLinter.verifyAndFix(
-      code,
-      rule ? { ...linter.config, rules: { [rule]: (_b = (_a2 = linter.config.rules) == null ? void 0 : _a2[rule]) != null ? _b : 2 } } : linter.config
-    ).output;
-  };
-  return linter;
-};
-const getCssLinter = async () => {
-  await loadScript("npm/@bhsd/stylelint-browserify", "stylelint");
-  const linter = async (code, opt) => {
-    const warnings = await styleLint(stylelint, code, opt);
-    if (opt && "rules" in opt) {
-      linter.config = opt;
-    }
-    return warnings;
-  };
-  linter.fixer = (code, rule) => {
-    var _a, _b;
-    if (!linter.config) {
-      throw new Error("Fixer unavailable!");
-    }
-    return styleLint(
-      stylelint,
-      code,
-      rule ? { extends: [], rules: { [rule]: (_b = (_a = linter.config.rules) == null ? void 0 : _a[rule]) != null ? _b : true } } : linter.config,
-      true
-    );
-  };
-  return linter;
-};
-const getLuaLinter = async () => {
-  await loadScript("npm/luacheck-browserify", "luacheck");
-  const luachecker = await luacheck(void 0);
-  return async (text) => (await luachecker.queue(text)).filter(({ severity }) => severity);
-};
-const getJsonLinter = () => (str) => {
-  var _a, _b, _c;
-  try {
-    if (str.trim()) {
-      JSON.parse(str);
-    }
-  } catch (e) {
-    if (e instanceof SyntaxError) {
-      const { message } = e, line = (_a = /\bline (\d+)/u.exec(message)) == null ? void 0 : _a[1], column = (_b = /\bcolumn (\d+)/u.exec(message)) == null ? void 0 : _b[1], position = (_c = /\bposition (\d+)/u.exec(message)) == null ? void 0 : _c[1];
-      return [
-        {
-          message,
-          severity: "error",
-          line,
-          column,
-          position
-        }
-      ];
-    }
-  }
-  return [];
-};
-export {
-  getCssLinter,
-  getJsLinter,
-  getJsonLinter,
-  getLuaLinter,
-  getWikiLinter
-};