@bhsd/codemirror-mediawiki 3.0.2 → 3.1.0

package/dist/linter.js

@@ -34,6 +34,11 @@ const indexToPos = (code, index) => {
     const lines = code.slice(0, index).split('\n');
     return { line: lines.length - 1, character: lines[lines.length - 1].length };
 };
+/**
+ * 判断是否为 Stylelint 设置
+ * @param config 设置
+ */
+const isStylelintConfig = (config) => Boolean(config && ('extends' in config || 'rules' in config));
 /**
  * 获取 Wikitext LSP
  * @param opt 选项
@@ -42,16 +47,21 @@ const indexToPos = (code, index) => {
 export const getWikiLinter = async (opt, obj) => {
     await getWikiparse(opt?.['getConfig'], opt?.['i18n']);
     const lsp = getLSP(obj, opt?.['include']), cssLint = await getCssLinter();
-    return async (text, config) => {
+    const linter = async (text, config) => {
         const defaultSeverity = config?.['defaultSeverity'] ?? 2, diagnostics = (await lsp.provideDiagnostics(text)).filter(({ code, severity }) => Number(config?.[code] ?? defaultSeverity) > Number(severity === 2)), tokens = 'findStyleTokens' in lsp && config?.['invalid-css'] !== '0' ? await lsp.findStyleTokens() : [];
         if (tokens.length === 0) {
             return diagnostics;
         }
         const lines = tokens.map((token, i) => `${getPrefix(token, i)}${sanitizeInlineStyle(token.childNodes[1].childNodes[0].data)
-            .replace(/\n/gu, ' ')}\n}`);
+            .replace(/\n/gu, ' ')}\n}`), cssConfig = config?.['css'], isConfig = isStylelintConfig(cssConfig), rules = {};
+        for (const [key, value] of Object.entries((isConfig ? cssConfig.rules : cssConfig) ?? {})) {
+            if (!value) {
+                rules[key] = value;
+            }
+        }
         return [
             ...diagnostics,
-            ...(await cssLint(lines.join('\n'), config?.['css']))
+            ...(await cssLint(lines.join('\n'), isConfig ? { ...cssConfig, rules } : rules))
                 .map(({ line, column, endLine, endColumn, rule, severity, text: message, fix }) => {
                 const i = Math.ceil(line / 3), { length } = getPrefix(tokens[i - 1], i), { range } = tokens[i - 1].childNodes[1].childNodes[0], from = offsetAt(range, line - 3 * i, column - 1), diagnostic = {
                     from,
@@ -79,6 +89,10 @@ export const getWikiLinter = async (opt, obj) => {
             }),
         ];
     };
+    if ('resolveCodeAction' in lsp) {
+        linter.fixer = async (_, rule) => (await lsp.resolveCodeAction(rule)).edit.changes[''][0].newText;
+    }
+    return linter;
 };
 export const jsConfig = /* #__PURE__ */ (() => ({
     env: { browser: true, es2024: true, jquery: true },
@@ -131,9 +145,7 @@ export const getCssLinter = async (cdn = 'npm/@bhsd/stylelint-browserify') => {
     await loadScript(cdn, 'stylelint');
     const linter = async (code, opt) => {
         const warnings = await styleLint(stylelint, code, opt);
-        if (opt && 'rules' in opt) {
-            linter.config = opt;
-        }
+        linter.config = opt && !isStylelintConfig(opt) ? { rules: opt } : opt;
         return warnings;
     };
     linter.fixer = (code, rule) => {

package/dist/lintsource.js

@@ -27,7 +27,7 @@ const pos = (doc, line, column, from = 0) => {
 };
 export const getWikiLintSource = async (opt, v) => {
     const wikiLint = await getWikiLinter(await getOpt(opt), v);
-    return async ({ doc }) => (await wikiLint(doc.toString(), await getOpt(opt, true)))
+    const lintSource = async ({ doc }) => (await wikiLint(doc.toString(), await getOpt(opt, true)))
         .map(({ severity, code, message, range: r, from, to, data = [], source }) => ({
         source: source,
         from: from ?? posToIndex(doc, r.start),
@@ -47,6 +47,10 @@ export const getWikiLintSource = async (opt, v) => {
             },
         })),
     }));
+    if (wikiLint.fixer) {
+        lintSource.fixer = (_, rule) => wikiLint.fixer('', rule);
+    }
+    return lintSource;
 };
 const getRange = (doc, line, column, endLine, endColumn, f = 0, t = Infinity) => {
     const start = pos(doc, line, column, f);