@bhsd/codemirror-mediawiki 2.30.2 → 2.31.0

package/README.md

@@ -396,6 +396,7 @@ cm.scrollTo();
 *version added: 2.1.8*
 
 **param**: `string` new content  
+**param**: `boolean` whether to force the content to be set in the read-only mode, default as false  
 Reset the content of the editor. Need initialization first.
 
 ```js
@@ -654,18 +655,17 @@ Matched or unmatched tags are highlighted in cyan or dark red when the cursor is
 
 ### Transclusion
 
-1. Substitution is not correctly highlighted ([Example](http://bhsd-harry.github.io/monaco-wiki/tests.html#Scribunto%3A%20isSubsting%20during%20PST)).
 1. Non-existing parser functions starting with `#` are highlighted as parser functions ([Example](http://bhsd-harry.github.io/codemirror-mediawiki/tests.html#Parsoid%3A%20unknown%20parser%20function%20(T314524))).
 1. Wikitext in template parameter names is not highlighted ([Example](http://bhsd-harry.github.io/codemirror-mediawiki/tests.html#Templates%3A%20Other%20wikitext%20in%20parameter%20names%20(T69657))).
 1. Template parameter names followed by a newline are not recognized ([Example](http://bhsd-harry.github.io/codemirror-mediawiki/tests.html#Templates%3A%20Handle%20comments%20in%20parameter%20names%20(T69657))).
 
 ### Heading
 
-1. Comments at the SOL break section headings ([Example](https://bhsd-harry.github.io/codemirror-mediawiki/tests.html#Section%20extraction%20prefixed%20by%20comment%20(section%201))).
+1. Comments at the SOL should not break section headings ([Example](https://bhsd-harry.github.io/codemirror-mediawiki/tests.html#Section%20extraction%20prefixed%20by%20comment%20(section%201))).
 
 ### Table
 
-1. Comments at the SOL break table syntax ([Example](https://bhsd-harry.github.io/codemirror-mediawiki/tests.html#3c.%20Table%20cells%20without%20escapable%20prefixes%20after%20edits)).
+1. Comments at the SOL should not break table syntax ([Example](https://bhsd-harry.github.io/codemirror-mediawiki/tests.html#3c.%20Table%20cells%20without%20escapable%20prefixes%20after%20edits)).
 
 ### External link
 
@@ -676,3 +676,7 @@ Matched or unmatched tags are highlighted in cyan or dark red when the cursor is
 
 1. Comments at the SOL break the highlighting ([Example](https://bhsd-harry.github.io/codemirror-mediawiki/tests.html#1.%20Lists%20with%20start-of-line-transparent%20tokens%20before%20bullets%3A%20Comments)).
 1. False positives of preformatted text when there are categories ([Example](http://bhsd-harry.github.io/codemirror-mediawiki/tests.html#Category%20%2F%20paragraph%20interactions)) or HTML tags ([Example](http://bhsd-harry.github.io/codemirror-mediawiki/tests.html#Parsing%20optional%20HTML%20elements%20(T8171))).
+
+### Language conversion
+
+1. BCP 47 language codes are not supported in language conversion ([Example](https://bhsd-harry.github.io/wikiparser-node/tests.html#Explicit%20definition%20of%20language%20variant%20alternatives%20(BCP%2047%20codes))).

package/dist/bidi.d.ts

@@ -11,5 +11,5 @@ declare const _default: ViewPlugin<{
     tree: import("@lezer/common").Tree;
     dir: Direction;
     update({ docChanged, viewportChanged, state, view }: ViewUpdate): void;
-}>;
+}, undefined>;
 export default _default;

package/dist/codemirror.d.ts

@@ -40,7 +40,7 @@ export declare class CodeMirror6 {
      * @param lang 语言
      * @param config 语言设置
      */
-    setLanguage(lang?: string, config?: unknown): void | Promise<void>;
+    setLanguage(lang?: string, config?: unknown): Promise<void>;
     /**
      * 开始语法检查
      * @param lintSource 语法检查函数
@@ -71,8 +71,9 @@ export declare class CodeMirror6 {
     /**
      * 重设编辑器内容
      * @param insert 新内容
+     * @param force 是否强制
      */
-    setContent(insert: string): void;
+    setContent(insert: string, force?: boolean): void;
     /**
      * 在编辑器和文本框之间切换
      * @param show 是否显示编辑器

package/dist/codemirror.js

@@ -6,7 +6,7 @@ import { searchKeymap, highlightSelectionMatches } from '@codemirror/search';
 import { linter, lintGutter, lintKeymap } from '@codemirror/lint';
 import { closeBrackets, autocompletion, acceptCompletion, completionKeymap, startCompletion, } from '@codemirror/autocomplete';
 import { json } from '@codemirror/lang-json';
-import { getLSP } from '@bhsd/common';
+import { getLSP } from '@bhsd/browser';
 import colorPicker from './color';
 import { mediawiki, html } from './mediawiki';
 import escapeKeymap from './escape';
@@ -24,6 +24,7 @@ import toolKeymap from './keymap';
 import statusBar from './statusBar';
 import { detectIndent } from './indent';
 import bracketMatching from './matchBrackets';
+import wikitextLSP from './lsp';
 import javascript from './javascript';
 import css from './css';
 import lua from './lua';
@@ -249,11 +250,17 @@ export class CodeMirror6 {
      * @param lang 语言
      * @param config 语言设置
      */
-    setLanguage(lang = 'plain', config) {
+    async setLanguage(lang = 'plain', config) {
         this.#lang = lang;
         if (this.#view) {
+            let ext = languages[lang](config);
+            ws: { // eslint-disable-line no-unused-labels
+                if (lang === 'mediawiki') {
+                    ext = [ext, await wikitextLSP()];
+                }
+            }
             this.#effects([
-                this.#language.reconfigure(languages[lang](config)),
+                this.#language.reconfigure(ext),
                 this.#linter.reconfigure(linters[lang] ?? []),
             ]);
             this.#minHeight(Boolean(linters[lang]));
@@ -355,11 +362,11 @@ export class CodeMirror6 {
      * @param opt 选项
      */
     async getLinter(opt) {
-        const isFunc = typeof opt === 'function', getOpt = (runtime) => isFunc ? opt(runtime) : opt;
+        const isFunc = typeof opt === 'function', getOpt = runtime => isFunc ? opt(runtime) : opt;
         switch (this.#lang) {
             case 'mediawiki': {
-                const wikiLint = await getWikiLinter(getOpt(), this.#view);
-                return async (doc) => (await wikiLint(doc.toString(), getOpt(true)))
+                const wikiLint = await getWikiLinter(await getOpt(), this.#view);
+                return async (doc) => (await wikiLint(doc.toString(), await getOpt(true)))
                     .map(({ severity, code, message, range: r, from, to, data = [], source }) => ({
                     source: source,
                     from: from ?? posToIndex(doc, r.start),
@@ -382,7 +389,7 @@ export class CodeMirror6 {
             }
             case 'javascript': {
                 const esLint = await getJsLinter();
-                const lintSource = doc => esLint(doc.toString(), getOpt())
+                const lintSource = async (doc) => esLint(doc.toString(), await getOpt())
                     .map(({ ruleId, message, severity, line, column, endLine, endColumn, fix, suggestions = [] }) => {
                     const start = pos(doc, line, column), diagnostic = {
                         source: 'ESLint',
@@ -409,29 +416,10 @@ export class CodeMirror6 {
             }
             case 'css': {
                 const styleLint = await getCssLinter();
-                let option = getOpt() ?? {};
+                let option = await getOpt() ?? {};
                 if (!('extends' in option || 'rules' in option)) {
                     option = { rules: option };
                 }
-                if (this.dialect === 'sanitized-css') {
-                    const rules = option['rules'];
-                    option = {
-                        ...option,
-                        rules: {
-                            ...rules,
-                            'property-no-vendor-prefix': [
-                                true,
-                                {
-                                    ignoreProperties: ['user-select'],
-                                },
-                            ],
-                            'property-disallowed-list': [
-                                ...rules?.['property-disallowed-list'] ?? [],
-                                '/^--/',
-                            ],
-                        },
-                    };
-                }
                 const lintSource = async (doc) => (await styleLint(doc.toString(), option))
                     .map(({ text, severity, line, column, endLine, endColumn, fix }) => {
                     const diagnostic = {
@@ -494,11 +482,13 @@ export class CodeMirror6 {
     /**
      * 重设编辑器内容
      * @param insert 新内容
+     * @param force 是否强制
      */
-    setContent(insert) {
+    setContent(insert, force) {
         if (this.#view) {
             this.#view.dispatch({
                 changes: { from: 0, to: this.#view.state.doc.length, insert },
+                filter: !force,
             });
         }
     }

package/dist/config.js

@@ -68,8 +68,7 @@ var html = [
     "wbr",
     "hr",
     "meta",
-    "link",
-    "img"
+    "link"
   ]
 ];
 

package/dist/fold.js

@@ -10,11 +10,18 @@ const updateSelection = (pos, { to }) => Math.max(pos, to), updateAll = (pos, {
  * Check if a SyntaxNode is among the specified components
  * @param keys The keys of the tokens to check
  */
-const isComponent = (keys) => ({ name }) => keys.some(key => name.includes(tokens[key])), 
+const isComponent = (keys) => (node) => keys.some(key => node?.name.includes(tokens[key])), 
 /** Check if a SyntaxNode is a template bracket (`{{` or `}}`) */
 isTemplateBracket = isComponent(['templateBracket', 'parserFunctionBracket']), 
+/** Check if a SyntaxNode is a template name */
+isTemplateName = isComponent(['templateName', 'parserFunctionName']), 
 /** Check if a SyntaxNode is a template delimiter (`|` or `:`) */
 isDelimiter = isComponent(['templateDelimiter', 'parserFunctionDelimiter']), 
+/**
+ * Check if a SyntaxNode is a template delimiter (`|` or `:`), excluding `subst:` and `safesubst:`
+ * @param node SyntaxNode
+ */
+isTemplateDelimiter = (node) => isDelimiter(node) && !isTemplateName(node.nextSibling), 
 /**
  * Check if a SyntaxNode is part of a template, except for the brackets
  * @param node 语法树节点
@@ -88,7 +95,7 @@ export const foldable = (state, posOrNode, tree, refOnly = false) => {
     }
     let { prevSibling, nextSibling } = node, 
     /** The stack of opening (+) or closing (-) brackets */ stack = 1, 
-    /** The first delimiter */ delimiter = isDelimiter(node) ? node : null, 
+    /** The first delimiter */ delimiter = isTemplateDelimiter(node) ? node : null, 
     /** The start of the closing bracket */ to = 0;
     while (nextSibling) {
         if (isTemplateBracket(nextSibling)) {
@@ -103,7 +110,7 @@ export const foldable = (state, posOrNode, tree, refOnly = false) => {
             }
             stack += lbrace;
         }
-        else if (!delimiter && stack === 1 && isDelimiter(nextSibling)) {
+        else if (!delimiter && stack === 1 && isTemplateDelimiter(nextSibling)) {
             // The first delimiter of the current template so far
             delimiter = nextSibling;
         }
@@ -124,7 +131,7 @@ export const foldable = (state, posOrNode, tree, refOnly = false) => {
             }
             stack += rbrace;
         }
-        else if (stack === -1 && isDelimiter(prevSibling)) {
+        else if (stack === -1 && isTemplateDelimiter(prevSibling)) {
             // The first delimiter of the current template so far
             delimiter = prevSibling;
         }

package/dist/hover.js

@@ -1,6 +1,5 @@
 import { hoverTooltip } from '@codemirror/view';
-import { loadScript, getLSP } from '@bhsd/common';
-let md;
+import { loadScript, getLSP } from '@bhsd/browser';
 /**
  * 将索引转换为位置
  * @param doc Text 实例
@@ -36,15 +35,14 @@ export default (cm) => hoverTooltip(async (view, pos) => {
     const { state: { doc } } = view, hover = await getLSP(view, false, cm.getWikiConfig)
         ?.provideHover(doc.toString(), indexToPos(doc, pos));
     if (hover) {
-        await loadScript('npm/markdown-it/dist/markdown-it.min.js', 'markdownit', true);
-        md ??= markdownit();
+        await loadScript('npm/marked/lib/marked.umd.js', 'marked', true);
         const { end } = hover.range;
         return {
             pos,
             end: posToIndex(doc, end),
             above: true,
             create() {
-                return createTooltipView(view, md.render(hover.contents.value));
+                return createTooltipView(view, marked.parse(hover.contents.value));
             },
         };
     }

package/dist/inlay.js

@@ -1,6 +1,6 @@
 import { StateField, StateEffect } from '@codemirror/state';
 import { Decoration, EditorView, WidgetType, ViewPlugin } from '@codemirror/view';
-import { getLSP } from '@bhsd/common';
+import { getLSP } from '@bhsd/browser';
 import { posToIndex } from './hover';
 class InlayHintWidget extends WidgetType {
     constructor(label) {

package/dist/linter.d.ts

@@ -3,7 +3,7 @@ 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;
+export type LiveOption = (runtime?: boolean) => Option | Promise<Option>;
 declare type getLinter<T> = () => (text: string) => T;
 declare type asyncLinter<T, S = Record<string, unknown>> = ((text: string, config?: Option) => T) & {
     config?: S;

package/dist/linter.js

@@ -1,6 +1,7 @@
 /* eslint-disable unicorn/no-unreadable-iife */
-import { loadScript, getWikiparse, getLSP, sanitizeInlineStyle } from '@bhsd/common';
-import { styleLint } from '@bhsd/common/dist/stylelint';
+import { sanitizeInlineStyle } from '@bhsd/common';
+import { loadScript, getWikiparse, getLSP } from '@bhsd/browser';
+import { styleLint } from '@bhsd/stylelint-util';
 /**
  * 计算位置
  * @param range 范围
@@ -22,7 +23,7 @@ export const getWikiLinter = async (opt, obj) => {
     await getWikiparse(opt?.['getConfig'], opt?.['i18n']);
     const lsp = getLSP(obj, opt?.['include']);
     return async (text, config) => {
-        const diagnostics = (await lsp.provideDiagnostics(text)).filter(({ code, severity }) => Number(config?.[code] ?? 2) > Number(severity === 2)), tokens = 'findStyleTokens' in lsp && config?.['invalid-css'] !== '0' ? await lsp.findStyleTokens() : [];
+        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;
         }
@@ -30,7 +31,7 @@ export const getWikiLinter = async (opt, obj) => {
         return [
             ...diagnostics,
             ...(await cssLint(tokens.map(({ childNodes, type, tag }, i) => `${type === 'ext-attr' ? 'div' : tag}#${i}{\n${sanitizeInlineStyle(childNodes[1].childNodes[0].data)
-                .replace(/\n/gu, ' ')}\n}`).join('\n'))).map(({ line, column, endLine, endColumn, rule, severity, text: message }) => {
+                .replace(/\n/gu, ' ')}\n}`).join('\n'), config?.['css'])).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,

package/dist/lsp.d.ts

@@ -0,0 +1,3 @@
+import type { Extension } from '@codemirror/state';
+declare const _default: () => Promise<Extension>;
+export default _default;

package/dist/lsp.js

@@ -0,0 +1,34 @@
+import { LSPClient, languageServerSupport } from '@codemirror/lsp-client';
+let promise, file = 0;
+export default async () => {
+    if (location.hostname !== 'localhost') {
+        return [];
+    }
+    promise ??= new Promise(resolve => {
+        let handlers = [];
+        const ws = new WebSocket('ws://localhost:3000/wikitext');
+        ws.onmessage = ({ data }) => {
+            for (const handler of handlers) {
+                handler(String(data));
+            }
+        };
+        ws.onopen = () => {
+            resolve({
+                send(message) {
+                    ws.send(message);
+                },
+                subscribe(handler) {
+                    handlers.push(handler);
+                },
+                unsubscribe(handler) {
+                    handlers = handlers.filter(h => h !== handler);
+                },
+            });
+        };
+        ws.onerror = () => {
+            resolve(null);
+        };
+    });
+    const transport = await promise;
+    return transport ? languageServerSupport(new LSPClient().connect(transport), `file:///${file++}.wiki`) : [];
+};