@bhsd/codemirror-mediawiki 3.7.0 → 3.8.0

package/README.md

@@ -53,6 +53,8 @@ Nonetheless, this repository also provides a customized version with additional
 	- [setTheme](#settheme)
 	- [toggle](#toggle)
 	- [update](#update)
+- [Static accessors](#static-accessors)
+	- [CDN](#cdn)
 - [Static methods](#static-methods)
 	- [getMwConfig](#getmwconfig)
 	- [replaceSelections](#replaceselections)
@@ -845,6 +847,24 @@ Refresh linting immediately.
 
 </details>
 
+# Static accessors
+
+## CDN
+
+<details>
+	<summary>Expand</summary>
+
+*version added: 3.8.0*
+
+**type**: `string`  
+By default, libraries such as [WikiParser-Node](https://www.npmjs.com/package/wikiparser-node) are loaded from `testingcf.jsdelivr.net`. You can change the [jsDelivr CDN](https://www.jsdelivr.com/network) by setting this property.
+
+```js
+CodeMirror6.CDN = 'https://cdn.jsdelivr.net';
+```
+
+</details>
+
 # Static methods
 
 ## getMwConfig

package/dist/codemirror.d.ts

@@ -2,6 +2,7 @@ import { EditorView } from '@codemirror/view';
 import type { KeyBinding } from '@codemirror/view';
 import type { Extension } from '@codemirror/state';
 import type { SyntaxNode } from '@lezer/common';
+import type { ConfigGetter } from '@bhsd/browser';
 import type { ConfigData } from 'wikiparser-node';
 import type { DocRange, foldHandler } from './fold';
 import type { detectIndent } from './indent';
@@ -34,9 +35,11 @@ export declare const optionalFunctions: OptionalFunctions;
 /** CodeMirror 6 editor */
 export declare class CodeMirror6 {
     #private;
+    static get CDN(): string | undefined;
+    static set CDN(url: string | undefined);
     /** only for sanitized-css */
     dialect: Dialect;
-    getWikiConfig?: () => Promise<ConfigData>;
+    getWikiConfig?: ConfigGetter;
     langConfig: MwConfig | undefined;
     /** textarea element */
     get textarea(): HTMLTextAreaElement;

package/dist/codemirror.js

@@ -2,7 +2,7 @@ import { EditorView, lineNumbers, keymap, highlightActiveLineGutter, } from '@co
 import { Compartment, EditorState, EditorSelection, SelectionRange } from '@codemirror/state';
 import { syntaxHighlighting, defaultHighlightStyle, indentOnInput, indentUnit, ensureSyntaxTree, } from '@codemirror/language';
 import { defaultKeymap, historyKeymap, history, redo, indentWithTab } from '@codemirror/commands';
-import { searchKeymap } from '@codemirror/search';
+import { search, searchKeymap } from '@codemirror/search';
 import { linter, lintGutter, lintKeymap } from '@codemirror/lint';
 import elt from 'crelt';
 import { panelSelector, panelsSelector, diagnosticSelector } from './constants';
@@ -32,6 +32,13 @@ const linters = {};
 const phrases = {};
 /** CodeMirror 6 editor */
 export class CodeMirror6 {
+    static #CDN;
+    static get CDN() {
+        return CodeMirror6.#CDN;
+    }
+    static set CDN(url) {
+        CodeMirror6.#CDN = url;
+    }
     #textarea;
     #language = new Compartment();
     #linter = new Compartment();
@@ -97,7 +104,7 @@ export class CodeMirror6 {
         let timer;
         const { textarea, lang } = this, { value, dir: d, accessKey, tabIndex, lang: l, readOnly } = textarea, extensions = [
             this.#language.of(this.#getLanguage(config)),
-            this.#linter.of(linters[lang] ?? []),
+            this.#linter.of(linters[lang]?.(this) ?? []),
             this.#extensions.of([]),
             this.#dir.of(EditorView.editorAttributes.of({ dir: d })),
             this.#extraKeys.of([]),
@@ -112,6 +119,13 @@ 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,
@@ -157,7 +171,7 @@ export class CodeMirror6 {
             ...readOnly
                 ? [
                     EditorState.readOnly.of(true),
-                    EditorState.transactionFilter.of(tr => tr.docChanged ? [] : tr),
+                    EditorState.changeFilter.of(({ docChanged }) => !docChanged),
                     EditorView.theme({
                         'input[type="color"]': {
                             pointerEvents: 'none',
@@ -219,9 +233,9 @@ export class CodeMirror6 {
             const ext = this.#getLanguage(config);
             this.#effects([
                 this.#language.reconfigure(ext),
-                this.#linter.reconfigure(linters[lang] ?? []),
+                this.#linter.reconfigure(linters[lang]?.(this) ?? []),
             ]);
-            this.#minHeight(Boolean(linters[lang]));
+            this.#minHeight(lang in linters);
             this.prefer({});
         }
     }
@@ -231,7 +245,7 @@ export class CodeMirror6 {
      */
     lint(lintSource) {
         const lintSources = typeof lintSource === 'function' ? [lintSource] : lintSource;
-        const linterExtension = lintSources
+        const linterExtension = (cm) => lintSources
             ? [
                 ...lintSources.map(source => linter(async ({ state }) => {
                     const diagnostics = (await source(state)).map((diagnostic) => ({
@@ -256,7 +270,7 @@ export class CodeMirror6 {
                 })),
                 lintGutter(),
                 keymap.of(lintKeymap),
-                optionalFunctions.statusBar(this, lintSources[0].fixer),
+                optionalFunctions.statusBar(cm, lintSources[0].fixer),
             ]
             : [];
         if (lintSource) {
@@ -266,7 +280,7 @@ export class CodeMirror6 {
             delete linters[this.#lang];
         }
         if (this.#view) {
-            this.#effects(this.#linter.reconfigure(linterExtension));
+            this.#effects(this.#linter.reconfigure(linterExtension(this)));
             this.#minHeight(Boolean(lintSource));
         }
     }
@@ -341,7 +355,7 @@ export class CodeMirror6 {
      * @param opt linter options
      */
     async getLinter(opt) {
-        return linterRegistry[this.#lang]?.(opt, this.#view, this.#nestedMWLanguage);
+        return linterRegistry[this.#lang]?.(CodeMirror6.CDN, opt, this.#view, this.#nestedMWLanguage);
     }
     /**
      * Set content

package/dist/escape.js

@@ -33,7 +33,7 @@ export const escapeHTML = (str) => [...str].map(c => {
     return encodeURIComponent(str);
 };
 const escapeWiki = (cm) => {
-    const view = cm.view, { state } = view, { ranges } = state.selection, lsp = getLSP(view, false, cm.getWikiConfig);
+    const view = cm.view, { state } = view, { ranges } = state.selection, lsp = getLSP(view, false, cm.getWikiConfig, CodeMirror6.CDN);
     if (lsp && 'provideRefactoringAction' in lsp && ranges.some(({ empty }) => !empty)) {
         (async () => {
             const replacements = new WeakMap();
@@ -79,7 +79,7 @@ menuRegistry.push({
                 handlerBase(view, e);
             });
             items = [btnHTML, btnURI];
-            const lsp = getLSP(view, false, cm.getWikiConfig);
+            const lsp = getLSP(view, false, cm.getWikiConfig, CodeMirror6.CDN);
             if (lsp && 'provideRefactoringAction' in lsp) {
                 const btnWiki = elt('div', 'Escape with magic words');
                 btnWiki.addEventListener('click', e => {

package/dist/hover.d.ts

@@ -1,4 +1,4 @@
+import { CodeMirror6 } from './codemirror';
 import type { Extension } from '@codemirror/state';
-import type { CodeMirror6 } from './codemirror';
 declare const _default: (cm: CodeMirror6) => Extension;
 export default _default;

package/dist/hover.js

@@ -3,11 +3,12 @@ import { ensureSyntaxTree } from '@codemirror/language';
 import { loadScript, getLSP } from '@bhsd/browser';
 import { tokens } from './config';
 import { hoverSelector } from './constants';
+import { CodeMirror6 } from './codemirror';
 import { escHTML, indexToPos, posToIndex, createTooltipView } from './util';
 export default (cm) => [
     hoverTooltip(async (view, pos, side) => {
         const { state } = view, { doc } = state, { paramSuggest, tags } = cm.langConfig;
-        let hover = await getLSP(view, false, cm.getWikiConfig)
+        let hover = await getLSP(view, false, cm.getWikiConfig, CodeMirror6.CDN)
             ?.provideHover(doc.toString(), indexToPos(doc, pos));
         if (!hover && paramSuggest && 'templatedata' in tags) {
             const node = ensureSyntaxTree(state, pos + Math.max(side, 0))?.resolve(pos, side);
@@ -28,7 +29,8 @@ export default (cm) => [
             }
         }
         if (hover) {
-            await loadScript('npm/marked/lib/marked.umd.js', 'marked', true);
+            const { CDN = '' } = CodeMirror6;
+            await loadScript(`${CDN}${CDN && '/'}npm/marked/lib/marked.umd.js`, 'marked', true);
             const { end } = hover.range;
             return {
                 pos,

package/dist/index.js

@@ -223,7 +223,11 @@ export const registerMediaWikiCore = () => {
         toolKeymap,
     ];
     registerLintSource('mediawiki', getWikiLintSource);
-    destroyListeners.push(view => getLSP(view)?.destroy());
+    destroyListeners.push(view => {
+        if (typeof wikiparse === 'object' && wikiparse.LanguageService) {
+            getLSP(view)?.destroy();
+        }
+    });
 };
 /** Register mixed MediaWiki-HTML language support */
 export const registerHTML = () => {

package/dist/inlay.d.ts

@@ -1,4 +1,4 @@
+import { CodeMirror6 } from './codemirror';
 import type { Extension } from '@codemirror/state';
-import type { CodeMirror6 } from './codemirror';
 declare const _default: (cm: CodeMirror6) => Extension;
 export default _default;

package/dist/inlay.js

@@ -3,6 +3,7 @@ import { Decoration, EditorView, WidgetType, ViewPlugin } from '@codemirror/view
 import { getLSP } from '@bhsd/browser';
 import elt from 'crelt';
 import { posToIndex } from './util';
+import { CodeMirror6 } from './codemirror';
 const cls = 'cm-inlay-hint';
 class InlayHintWidget extends WidgetType {
     constructor(label) {
@@ -54,7 +55,7 @@ export default (cm) => [
     ViewPlugin.fromClass(class {
         constructor(view) {
             const timer = setInterval(() => {
-                if (getLSP(view, false, cm.getWikiConfig)) {
+                if (getLSP(view, false, cm.getWikiConfig, CodeMirror6.CDN)) {
                     clearInterval(timer);
                     void updateField({ view, docChanged: true });
                 }

package/dist/linter.d.ts

@@ -26,6 +26,7 @@ declare interface JsonError {
     column: string | undefined;
     position: string | undefined;
 }
+export declare const stylelintRepo = "npm/@bhsd/stylelint-browserify", eslintRepo = "npm/@bhsd/eslint-browserify", luacheckRepo = "npm/luacheck-browserify", wikilintRepo = "npm/wikiparser-node";
 /**
  * 获取 Wikitext LSP
  * @param opt 选项

package/dist/linter.js

@@ -1,6 +1,7 @@
 import { sanitizeInlineStyle } from '@bhsd/common';
 import { loadScript, getWikiparse, getLSP } from '@bhsd/browser';
 import { styleLint } from '@bhsd/stylelint-util';
+export const stylelintRepo = 'npm/@bhsd/stylelint-browserify', eslintRepo = 'npm/@bhsd/eslint-browserify', luacheckRepo = 'npm/luacheck-browserify', wikilintRepo = 'npm/wikiparser-node';
 /**
  * 计算位置
  * @param range 范围
@@ -44,8 +45,9 @@ const isStylelintConfig = (config) => Boolean(config && ('extends' in config ||
  * @param obj 对象
  */
 export const getWikiLinter = async (opt, obj) => {
-    await getWikiparse(opt?.['getConfig'], opt?.['i18n']);
-    const lsp = getLSP(obj, opt?.['include']), cssLint = await getCssLinter();
+    const cdn = opt?.['cdn'];
+    await getWikiparse(opt?.['getConfig'], opt?.['i18n'], cdn && `${cdn}/${wikilintRepo}`);
+    const lsp = getLSP(obj, opt?.['include']), cssLint = await getCssLinter(cdn && `${cdn}/${stylelintRepo}`);
     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) {
@@ -110,7 +112,7 @@ export const jsConfig = /* #__PURE__ */ (() => ({
  * 获取 ESLint
  * @param cdn CDN 地址
  */
-export const getJsLinter = async (cdn = 'npm/@bhsd/eslint-browserify') => {
+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 = {
@@ -140,7 +142,7 @@ export const getJsLinter = async (cdn = 'npm/@bhsd/eslint-browserify') => {
  * 获取 Stylelint
  * @param cdn CDN 地址
  */
-export const getCssLinter = async (cdn = 'npm/@bhsd/stylelint-browserify') => {
+export const getCssLinter = async (cdn = stylelintRepo) => {
     await loadScript(cdn, 'stylelint');
     const linter = async (code, opt) => {
         const warnings = await styleLint(stylelint, code, opt);
@@ -159,7 +161,7 @@ export const getCssLinter = async (cdn = 'npm/@bhsd/stylelint-browserify') => {
  * 获取 Luacheck
  * @param cdn CDN 地址
  */
-export const getLuaLinter = async (cdn = 'npm/luacheck-browserify') => {
+export const getLuaLinter = async (cdn = luacheckRepo) => {
     await loadScript(cdn, 'luacheck');
     // eslint-disable-next-line @typescript-eslint/await-thenable
     const luachecker = await luacheck(undefined);

package/dist/lintsource.d.ts

@@ -7,7 +7,7 @@ export type LintSource = ((state: EditorState) => Diagnostic[] | Promise<Diagnos
     fixer?: (doc: Text, rule?: string) => string | Promise<string>;
 };
 export type LintSources = LintSource | [LintSource] | [LintSource, LintSource];
-export type LintSourceGetter = (opt?: Option | LiveOption, view?: EditorView, nestedMWLanguage?: Language) => LintSource | Promise<LintSource>;
+export type LintSourceGetter = (cdn?: string, opt?: Option | LiveOption, view?: EditorView, nestedMWLanguage?: Language) => LintSource | Promise<LintSource>;
 export interface ExtendedAction extends Action {
     tooltip: string | undefined;
 }

package/dist/lintsource.js

@@ -2,7 +2,7 @@ import { ensureSyntaxTree } from '@codemirror/language';
 import { cssLanguage } from '@codemirror/lang-css';
 import { javascriptLanguage } from '@codemirror/lang-javascript';
 import { sanitizeInlineStyle } from '@bhsd/common';
-import { getWikiLinter, getJsLinter, getCssLinter, getJsonLinter, getLuaLinter } from './linter';
+import { getWikiLinter, getJsLinter, getCssLinter, getJsonLinter, getLuaLinter, stylelintRepo, eslintRepo, luacheckRepo, } from './linter';
 import { posToIndex } from './util';
 /**
  * 获取Linter选项
@@ -55,8 +55,8 @@ const wikiLintSource = async (wikiLint, text, opt, doc, f = 0, t) => (await wiki
         ? getRange(doc, r.start.line + 1, r.start.character + 1, r.end.line + 1, r.end.character + 1, f, t)
         : { from: from + f, to: (to ?? from) + f },
 }));
-export const getWikiLintSource = async (opt, v) => {
-    const wikiLint = await getWikiLinter(await getOpt(opt), v);
+export const getWikiLintSource = async (cdn, opt, v) => {
+    const wikiLint = await getWikiLinter({ ...await getOpt(opt), cdn }, v);
     const lintSource = async ({ doc }) => wikiLintSource(wikiLint, doc.toString(), await getOpt(opt, true), doc);
     if (wikiLint.fixer) {
         lintSource.fixer = (_, rule) => wikiLint.fixer('', rule);
@@ -91,8 +91,8 @@ const jsLintSource = (esLint, code, opt, doc, f = 0, t) => esLint(code, opt)
     }
     return diagnostic;
 });
-export const getJsLintSource = async (opt) => {
-    const esLint = await getJsLinter();
+export const getJsLintSource = async (cdn, opt) => {
+    const esLint = await getJsLinter(cdn && `${cdn}/${eslintRepo}`);
     const lintSource = async ({ doc }) => jsLintSource(esLint, doc.toString(), await getOpt(opt), doc);
     lintSource.fixer = (doc, rule) => esLint.fixer(doc.toString(), rule);
     return lintSource;
@@ -125,14 +125,14 @@ const cssLintSource = async (styleLint, code, opt, doc, f = 0, t) => {
         return diagnostic;
     });
 };
-export const getCssLintSource = async (opt) => {
-    const styleLint = await getCssLinter();
+export const getCssLintSource = async (cdn, opt) => {
+    const styleLint = await getCssLinter(cdn && `${cdn}/${stylelintRepo}`);
     const lintSource = async ({ doc }) => cssLintSource(styleLint, doc.toString(), await getOpt(opt), doc);
     lintSource.fixer = async (doc, rule) => styleLint.fixer(doc.toString(), rule);
     return lintSource;
 };
-export const getVueLintSource = async (opt) => {
-    const styleLint = await getCssLinter(), esLint = await getJsLinter();
+export const getVueLintSource = async (cdn, opt) => {
+    const styleLint = await getCssLinter(cdn && `${cdn}/${stylelintRepo}`), esLint = await getJsLinter(cdn && `${cdn}/${eslintRepo}`);
     return async (state) => {
         const { doc } = state, option = await getOpt(opt, true) ?? {}, js = option['js'], css = option['css'];
         return [
@@ -153,8 +153,8 @@ export const getVueLintSource = async (opt) => {
         ];
     };
 };
-export const getHTMLLintSource = async (opt, view, language) => {
-    const vueLintSource = await getVueLintSource(opt), wikiLint = await getWikiLinter({ include: false, ...await getOpt(opt) }, view);
+export const getHTMLLintSource = async (cdn, opt, view, language) => {
+    const vueLintSource = await getVueLintSource(cdn, opt), wikiLint = await getWikiLinter({ include: false, ...await getOpt(opt), cdn }, view);
     return async (state) => {
         const { doc } = state, option = await getOpt(opt, true) ?? {}, wiki = option['wiki'];
         return [
@@ -182,8 +182,8 @@ export const getJsonLintSource = () => {
         return [];
     };
 };
-export const getLuaLintSource = async () => {
-    const luaLint = await getLuaLinter();
+export const getLuaLintSource = async (cdn) => {
+    const luaLint = await getLuaLinter(cdn && `${cdn}/${luacheckRepo}`);
     return async ({ doc }) => (await luaLint(doc.toString()))
         .map(({ line, column, end_column: endColumn, msg: message, severity }) => ({
         source: 'Luacheck',