@bhsd/codemirror-mediawiki 2.22.1 → 2.23.1

package/dist/codemirror.d.ts

@@ -6,6 +6,7 @@ import type { Diagnostic } from '@codemirror/lint';
 import type { Config } from 'wikiparser-node';
 import type { MwConfig } from './token';
 import type { DocRange } from './fold';
+import type { Option, LiveOption } from './linter';
 export type { MwConfig };
 export type LintSource = (doc: Text) => Diagnostic[] | Promise<Diagnostic[]>;
 export type Addon<T> = [(config?: T, cm?: CodeMirror6) => Extension, Record<string, T>];
@@ -56,7 +57,7 @@ export declare class CodeMirror6 {
      * 获取默认linter
      * @param opt 选项
      */
-    getLinter(opt?: Record<string, unknown>): Promise<LintSource | undefined>;
+    getLinter(opt?: Option | LiveOption): Promise<LintSource | undefined>;
     /**
      * 重设编辑器内容
      * @param insert 新内容

package/dist/hover.d.ts

@@ -1,12 +1,6 @@
-import type { Tooltip, EditorView } from '@codemirror/view';
+import type { Tooltip } from '@codemirror/view';
 import type { Text } from '@codemirror/state';
-import type { LanguageServiceBase } from 'wikiparser-node/extensions/typings';
 import type { Position } from 'vscode-languageserver-types';
-/**
- * 获取当前编辑器的语言服务
- * @param view EditorView 实例
- */
-export declare const getLSP: (view: EditorView) => LanguageServiceBase | undefined;
 /**
  * 将索引转换为位置
  * @param doc Text 实例

package/dist/linter.d.ts

@@ -1,26 +1,33 @@
-import type { LinterBase } from 'wikiparser-node/extensions/typings';
+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';
-declare type getLinter<T> = (opt?: Record<string, unknown>) => T;
-declare type getAsyncLinter<T> = (opt?: Record<string, unknown>) => Promise<T>;
+export type Option = Record<string, unknown> | null | undefined;
+export type LiveOption = (runtime?: true) => Option;
+declare type getLinter<T> = () => (text: string) => T;
 /**
- * 获取 WikiLint
- * @param opt 选项
+ * @param opt 初始化选项
+ * @param obj 仅用于wikiparse.LanguageService
+ * @param config runtime设置
  */
-export declare const getWikiLinter: getAsyncLinter<LinterBase>;
-/**
- * 获取 ESLint
- * @param opt 选项
- */
-export declare const getJsLinter: getAsyncLinter<(text: string) => Linter.LintMessage[]>;
+declare type getAsyncLinter<T, S = never, R = never> = (opt?: S, obj?: R) => Promise<(text: string, config?: Option) => T>;
+declare interface MixedDiagnostic extends Omit<DiagnosticBase, 'range'> {
+    range?: Range;
+    from?: number;
+    to?: number;
+}
 /**
- * 获取 Stylelint
+ * 获取 Wikitext LSP
  * @param opt 选项
+ * @param obj 对象
  */
-export declare const getCssLinter: getAsyncLinter<(text: string) => Promise<Warning[]>>;
+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<(text: string) => Promise<Diagnostic[]>>;
+export declare const getLuaLinter: getAsyncLinter<Promise<Diagnostic[]>>;
 declare interface JsonError {
     message: string;
     severity: 'error';
@@ -29,5 +36,5 @@ declare interface JsonError {
     position: string | undefined;
 }
 /** JSON.parse */
-export declare const getJsonLinter: getLinter<(text: string) => JsonError[]>;
+export declare const getJsonLinter: getLinter<JsonError[]>;
 export {};

package/dist/linter.mjs

@@ -1,84 +1,72 @@
-import { CDN, loadScript } from "@bhsd/common";
-const getWikiLinter = async (opt) => {
-  const REPO = "npm/wikiparser-node", DIR = `${REPO}/extensions/dist`, lang = opt == null ? void 0 : opt["i18n"];
+import { loadScript, 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) => {
+  const DIR = "npm/wikiparser-node/extensions/dist", lang = opt == null ? void 0 : opt["i18n"];
   await loadScript(`${DIR}/base.min.js`, "wikiparse");
-  await loadScript(`${DIR}/lint.min.js`, "wikiparse.Linter");
+  await loadScript(`${DIR}/lsp.min.js`, "wikiparse.LanguageService");
   if (typeof lang === "string") {
     try {
-      const i18n = await (await fetch(`${CDN}/${REPO}/i18n/${lang.toLowerCase()}.json`)).json();
+      const i18n = await (await fetch(`${wikiparse.CDN}/i18n/${lang.toLowerCase()}.json`)).json();
       wikiparse.setI18N(i18n);
     } catch {
     }
   }
-  return new wikiparse.Linter(opt == null ? void 0 : opt["include"]);
+  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 (opt) => {
-  var _a, _b, _c;
+const getJsLinter = async () => {
+  var _a;
   await loadScript("npm/eslint-linter-browserify@8.57.0/linter.min.js", "eslint", true);
   const esLinter = new eslint.Linter(), conf = {
     env: { browser: true, es2024: true },
     parserOptions: { ecmaVersion: 15, sourceType: "module" },
-    rules: {},
-    ...opt
+    rules: {}
   };
   for (const [name, { meta }] of esLinter.getRules()) {
     if ((_a = meta == null ? void 0 : meta.docs) == null ? void 0 : _a.recommended) {
-      (_c = (_b = conf.rules)[name]) != null ? _c : _b[name] = 2;
+      conf.rules[name] = 2;
     }
   }
-  return (text) => esLinter.verify(text, conf);
+  return (text, opt) => esLinter.verify(text, { ...conf, ...opt });
 };
-const getCssLinter = async (opt) => {
+const getCssLinter = async () => {
   await loadScript("npm/stylelint-bundle", "stylelint");
-  const config = {
-    rules: {
-      "annotation-no-unknown": true,
-      "at-rule-no-unknown": true,
-      "block-no-empty": true,
-      "color-no-invalid-hex": true,
-      "comment-no-empty": true,
-      "custom-property-no-missing-var-function": true,
-      "declaration-block-no-duplicate-custom-properties": true,
-      "declaration-block-no-duplicate-properties": [
-        true,
-        {
-          ignore: ["consecutive-duplicates-with-different-syntaxes"]
-        }
-      ],
-      "declaration-block-no-shorthand-property-overrides": true,
-      "font-family-no-duplicate-names": true,
-      "font-family-no-missing-generic-family-keyword": true,
-      "function-calc-no-unspaced-operator": true,
-      "function-linear-gradient-no-nonstandard-direction": true,
-      "function-no-unknown": true,
-      "keyframe-block-no-duplicate-selectors": true,
-      "keyframe-declaration-no-important": true,
-      "media-feature-name-no-unknown": true,
-      "media-query-no-invalid": true,
-      "named-grid-areas-no-invalid": true,
-      "no-descending-specificity": true,
-      "no-duplicate-at-import-rules": true,
-      "no-duplicate-selectors": true,
-      "no-empty-source": true,
-      "no-invalid-double-slash-comments": true,
-      "no-invalid-position-at-import-rule": true,
-      "no-irregular-whitespace": true,
-      "property-no-unknown": true,
-      "selector-anb-no-unmatchable": true,
-      "selector-pseudo-class-no-unknown": true,
-      "selector-pseudo-element-no-unknown": true,
-      "selector-type-no-unknown": [
-        true,
-        {
-          ignore: ["custom-elements"]
-        }
-      ],
-      "string-no-newline": true,
-      "unit-no-unknown": true,
-      ...opt == null ? void 0 : opt["rules"]
-    }
-  };
-  return async (code) => (await stylelint.lint({ code, config })).results.flatMap(({ warnings }) => warnings);
+  return (code, opt) => styleLint(stylelint, code, opt == null ? void 0 : opt["rules"]);
 };
 const getLuaLinter = async () => {
   await loadScript("npm/luacheck-browserify/dist/index.min.js", "luacheck");