@bhsd/codemirror-mediawiki 3.11.1 → 3.11.3

package/dist/codemirror.js

@@ -2,7 +2,7 @@ import { EditorView, lineNumbers, keymap, highlightActiveLineGutter } from '@cod
 import { EditorSelection, Compartment, EditorState, SelectionRange, } from '@codemirror/state';
 import { syntaxHighlighting, defaultHighlightStyle, indentOnInput, indentUnit, ensureSyntaxTree, syntaxTree, } from '@codemirror/language';
 import { defaultKeymap, historyKeymap, history, redo, indentWithTab, insertNewlineKeepIndent, deleteCharBackwardStrict, } from '@codemirror/commands';
-import { search, searchKeymap } from '@codemirror/search';
+import { searchKeymap } from '@codemirror/search';
 import { linter, lintGutter, nextDiagnostic } from '@codemirror/lint';
 import elt from 'crelt';
 import { base, panelSelector, panelsSelector, diagnosticSelector, noDetectionLangs } from './constants.js';
@@ -155,13 +155,6 @@ export class CodeMirror6 {
             EditorView.editorAttributes.of({ lang: l }),
             lineNumbers(),
             highlightActiveLineGutter(),
-            search({
-                scrollToMatch(range, view) {
-                    const scrollRect = view.scrollDOM.getBoundingClientRect(), startCoords = view.coordsAtPos(range.from), endCoords = view.coordsAtPos(range.to), isInViewport = startCoords && startCoords.top >= scrollRect.top
-                        && endCoords && endCoords.bottom <= scrollRect.bottom;
-                    return EditorView.scrollIntoView(range, { y: isInViewport ? 'nearest' : 'center' });
-                },
-            }),
             keymap.of([
                 ...defaultKeymap,
                 ...searchKeymap,
@@ -260,10 +253,6 @@ export class CodeMirror6 {
     #minHeight(linting) {
         this.#view.dom.style.minHeight = linting ? 'calc(100px + 2em)' : '2em';
     }
-    /** 获取语法检查扩展 */
-    #getLintExtension() {
-        return this.#linter.get(this.#view.state)[0];
-    }
     /**
      * Set language
      * @param lang language
@@ -332,7 +321,7 @@ export class CodeMirror6 {
     /** Update syntax checking immediately */
     update() {
         if (this.#view) {
-            const extension = this.#getLintExtension();
+            const [extension] = this.#linter.get(this.#view.state);
             if (extension) {
                 const plugin = this.#view.plugin(extension[1]);
                 plugin.set = true;
@@ -354,11 +343,11 @@ export class CodeMirror6 {
      */
     prefer(names) {
         if (Array.isArray(names)) {
-            this.#preferred = new Set(names.filter(name => Object.prototype.hasOwnProperty.call(avail, name)));
+            this.#preferred = new Set(names.filter(name => Object.hasOwn(avail, name)));
         }
         else {
             for (const [name, enable] of Object.entries(names)) {
-                if (enable && Object.prototype.hasOwnProperty.call(avail, name)) {
+                if (enable && Object.hasOwn(avail, name)) {
                     this.#preferred.add(name);
                 }
                 else {

package/dist/javascript-globals.d.ts

@@ -1 +1 @@
-export { builtin } from 'globals';
+export { builtin, vue } from 'globals';

package/dist/javascript-globals.js

@@ -63,6 +63,16 @@ var builtin = {
   WeakRef: false,
   WeakSet: false
 };
+var vue = {
+  defineEmits: false,
+  defineExpose: false,
+  defineModel: false,
+  defineOptions: false,
+  defineProps: false,
+  defineSlots: false,
+  withDefaults: false
+};
 export {
-  builtin
+  builtin,
+  vue
 };

package/dist/javascript.js

@@ -4,7 +4,7 @@ import { syntaxTree } from '@codemirror/language';
 import { setDiagnosticsEffect } from '@codemirror/lint';
 import { builtin } from './javascript-globals.js';
 export const jsCompletion = javascriptLanguage.data.of({ autocomplete: scopeCompletionSource(globalThis) });
-const globals = Decoration.mark({ class: 'cm-globals' }), builtinGlobals = new Set(Object.keys(builtin));
+const globalsMark = Decoration.mark({ class: 'cm-globals' }), builtinGlobals = new Set(Object.keys(builtin));
 /**
  * 高亮显示全局变量
  * @ignore
@@ -14,17 +14,25 @@ export const markGlobals = (tree, visibleRanges, state, cm) => {
     const decorations = [];
     let allGlobals = builtinGlobals;
     if (cm?.lintSources.length && typeof eslint === 'object' && 'environments' in eslint) {
-        const env = cm.lintSources[0]?.config?.env;
-        if (env) {
+        const { env, globals } = cm.lintSources[0]?.config ?? {};
+        if (env || globals) {
             allGlobals = new Set(builtinGlobals);
-            for (const key of Object.keys(env)) {
-                const obj = eslint.environments.get(key)?.globals;
-                if (obj) {
-                    for (const k of Object.keys(obj)) {
-                        allGlobals.add(k);
+            if (env) {
+                for (const key of Object.keys(env)) {
+                    const obj = eslint.environments.get(key)
+                        ?.globals;
+                    if (obj) {
+                        for (const k of Object.keys(obj)) {
+                            allGlobals.add(k);
+                        }
                     }
                 }
             }
+            if (globals) {
+                for (const k of Object.keys(globals)) {
+                    allGlobals.add(k);
+                }
+            }
         }
     }
     for (const { from, to } of visibleRanges) {
@@ -36,7 +44,7 @@ export const markGlobals = (tree, visibleRanges, state, cm) => {
                 if (type.is('VariableName') && javascriptLanguage.isActiveAt(state, f) && allGlobals.has(name)) {
                     const completions = localCompletionSource({ state, pos: t, explicit: true });
                     if (!completions?.options.some(({ label }) => label === name)) {
-                        decorations.push(globals.range(f, t));
+                        decorations.push(globalsMark.range(f, t));
                     }
                 }
             },

package/dist/linter.d.ts

@@ -1,6 +1,6 @@
 import type { Diagnostic as DiagnosticBase, Range, Position } from 'vscode-languageserver-types';
 import type { Linter } from 'eslint';
-import type { Warning } from 'stylelint/types/stylelint';
+import type { Warning, Config } from 'stylelint/types/stylelint';
 import type { Diagnostic } from 'luacheck-browserify';
 import type { AST } from 'wikiparser-node';
 export type Option = Record<string, unknown> | null | undefined;
@@ -45,6 +45,11 @@ export declare const getPrefix: ({ type, tag }: AST, i: number) => string;
  * @test
  */
 export declare const indexToPos: (code: string, index: number) => Position;
+/**
+ * 判断是否为 Stylelint 设置
+ * @param config 设置
+ */
+export declare const isStylelintConfig: (config?: Config | Config["rules"]) => config is Config;
 /**
  * 获取 Wikitext LSP
  * @param opt 选项

package/dist/linter.js

@@ -42,7 +42,7 @@ export const indexToPos = (code, index) => {
  * 判断是否为 Stylelint 设置
  * @param config 设置
  */
-const isStylelintConfig = (config) => Boolean(config && ('extends' in config || 'rules' in config));
+export const isStylelintConfig = (config) => Boolean(config && ('extends' in config || 'rules' in config));
 /**
  * 获取 Wikitext LSP
  * @param opt 选项
@@ -108,8 +108,10 @@ export const getWikiLinter = async (opt, obj) => {
     }
     return linter;
 };
+// eslint-disable-next-line unicorn/no-unreadable-iife
+const jsEnv = /* #__PURE__ */ (() => ({ browser: true, es2024: true }))();
 export const jsConfig = /* #__PURE__ */ (() => ({
-    env: { browser: true, es2024: true, jquery: true },
+    env: { ...jsEnv, jquery: true },
     globals: {
         mw: 'readonly',
         mediaWiki: 'readonly',
@@ -130,7 +132,7 @@ export const getJsLinter = async (cdn = eslintRepo) => {
     await loadScript(cdn, 'eslint');
     /** @see https://www.npmjs.com/package/@codemirror/lang-javascript */
     const esLinter = new eslint.Linter(), conf = {
-        env: { browser: true, es2024: true },
+        env: jsEnv,
         parserOptions: { ecmaVersion: 15, sourceType: 'module' },
     }, recommended = {};
     for (const [name, { meta }] of esLinter.getRules()) {

package/dist/lintsource.js

@@ -2,9 +2,10 @@ import { ensureSyntaxTree } from '@codemirror/language';
 import { cssLanguage } from '@codemirror/lang-css';
 import { javascriptLanguage } from '@codemirror/lang-javascript';
 import { sanitizeInlineStyle, lintJSON } from '@bhsd/common';
-import { getWikiLinter, getJsLinter, getCssLinter, getLuaLinter, stylelintRepo, eslintRepo, luacheckRepo, } from './linter.js';
+import { getWikiLinter, getJsLinter, getCssLinter, getLuaLinter, stylelintRepo, eslintRepo, luacheckRepo, isStylelintConfig, } from './linter.js';
 import { posToIndex, toConfigGetter, } from './util.js';
 import { base } from './constants.js';
+import { vue } from './javascript-globals.js';
 /**
  * 获取Linter选项
  * @param opt Linter选项
@@ -166,13 +167,34 @@ export const getCssLintSource = async (opt) => {
     return lintSource;
 };
 /**
- * @implements
- * @test
+ * @author Yosuke Ota and others
+ * @license MIT
+ * @see https://github.com/ota-meshi/stylelint-config-recommended-vue/blob/main/lib/vue-specific-rules.js
  */
-export const getVueLintSource = async (opt) => {
+// eslint-disable-next-line unicorn/no-unreadable-iife
+const stylelintConfigVue = /* #__PURE__ */ (() => ({
+    'selector-pseudo-class-no-unknown': [true, { ignorePseudoClasses: ['deep', 'global', 'slotted'] }],
+    'selector-pseudo-element-no-unknown': [true, { ignorePseudoElements: ['v-deep', 'v-global', 'v-slotted'] }],
+    'declaration-property-value-no-unknown': [true, { ignoreProperties: { '/.*/': String.raw `/v-bind\(.+\)/` } }],
+    'function-no-unknown': [true, { ignoreFunctions: ['v-bind'] }],
+}))();
+/** @implements */
+const getVueOrHtmlLintSource = (rules, globals) => async (opt) => {
     const { CDN } = base, styleLint = await getCssLinter(CDN && `${CDN}/${stylelintRepo}`), esLint = await getJsLinter(CDN && `${CDN}/${eslintRepo}`);
     const lintSource = async (state) => {
-        const { doc } = state, option = await getOpt(opt, true) ?? {}, js = option['js'], css = option['css'];
+        const { doc } = state, option = await getOpt(opt, true) ?? {};
+        let js = option['js'], css = option['css'];
+        if (rules) {
+            css = isStylelintConfig(css)
+                ? {
+                    ...css,
+                    rules: { ...rules, ...css.rules },
+                }
+                : { ...rules, ...css };
+        }
+        if (globals) {
+            js = { ...js, globals: { ...globals, ...js?.globals } };
+        }
         return [
             ...(await Promise.all(cssLanguage.findRegions(state).map(async ({ from, to }) => {
                 const node = ensureSyntaxTree(state, from)?.resolve(from, 1);
@@ -186,8 +208,7 @@ export const getVueLintSource = async (opt) => {
                 }
                 return node ? cssLintSource(styleLint, state.sliceDoc(from, to), css, doc, from, to) : [];
             }))).flat(),
-            ...javascriptLanguage.findRegions(state)
-                .flatMap(({ from, to }) => jsLintSource(esLint, state.sliceDoc(from, to), js, doc, from, to)),
+            ...javascriptLanguage.findRegions(state).flatMap(({ from, to }) => jsLintSource(esLint, state.sliceDoc(from, to), js, doc, from, to)),
         ];
     };
     Object.defineProperty(lintSource, 'config', {
@@ -197,12 +218,17 @@ export const getVueLintSource = async (opt) => {
     });
     return lintSource;
 };
+/**
+ * @implements
+ * @test
+ */
+export const getVueLintSource = /* #__PURE__ */ getVueOrHtmlLintSource(stylelintConfigVue, vue);
 /**
  * @implements
  * @test
  */
 export const getHTMLLintSource = async (opt, view, language) => {
-    const vueLintSource = await getVueLintSource(opt), wikiLint = await getWikiLinter({ include: false, ...await getOpt(opt), cdn: base.CDN }, view);
+    const vueLintSource = await getVueOrHtmlLintSource()(opt), wikiLint = await getWikiLinter({ include: false, ...await getOpt(opt), cdn: base.CDN }, view);
     const lintSource = async (state) => {
         const { doc } = state, option = await getOpt(opt, true) ?? {}, wiki = option['wiki'];
         return [