@bhsd/codemirror-mediawiki 3.8.0 → 3.9.0

package/dist/mwConfig.js

@@ -117,9 +117,6 @@ var getStaticMwConfig = ({
   redirection
 });
 
-// src/linter.ts
-var wikilintRepo = "npm/wikiparser-node";
-
 // mw/config.ts
 var others = /* @__PURE__ */ new Set([...otherParserFunctions, "msgnw"]);
 var getConfigPair = (magicWords, rule) => [true, false].map((bool) => getConfig(magicWords, rule, bool));
@@ -146,7 +143,7 @@ var getMwConfig = async (modes) => {
     return { ...config, nsid };
   } else if (location.hostname.endsWith(".moegirl.org.cn")) {
     const parserConfig = await (await fetch(
-      `${CDN}/${wikilintRepo}/config/moegirl.json`
+      `${CDN}/npm/wikiparser-node/config/moegirl.json`
     )).json();
     setObject("wikilintConfig", parserConfig);
     config = getStaticMwConfig(parserConfig, modes);
@@ -161,7 +158,7 @@ var getMwConfig = async (modes) => {
         ...(config == null ? void 0 : config.variableIDs) ? [] : ["variables"],
         ...(config == null ? void 0 : config.functionHooks) ? [] : ["functionhooks"]
       ],
-      formatversion: "2"
+      formatversion: 2
     });
     if (config && !isIPE) {
       const { functionSynonyms: [insensitive] } = config;
@@ -212,7 +209,8 @@ var getParserConfig2 = (minConfig, mwConfig) => {
     ...getParserConfig(minConfig, mwConfig),
     namespaces: mw.config.get("wgFormattedNamespaces"),
     nsid,
-    variants
+    variants,
+    articlePath: mw.config.get("wgArticlePath")
   };
   const noCM = mw.loader.getState("ext.CodeMirror") === null;
   for (const [key, val] of Object.entries(insensitive)) {

package/dist/openLinks.js

@@ -1,8 +1,8 @@
 import { EditorView } from '@codemirror/view';
 import { ensureSyntaxTree } from '@codemirror/language';
-import { tokens } from './config';
-import { isMac } from './constants';
-import { hasTag } from './util';
+import { tokens } from './config.js';
+import { isMac } from './constants.js';
+import { hasTag } from './util.js';
 const modKey = isMac ? 'metaKey' : 'ctrlKey', key = isMac ? 'Meta' : 'Control', tags = ['extLinkProtocol', 'extLink', 'freeExtLinkProtocol', 'freeExtLink', 'magicLink', 'pageName'], links = ['extlink-protocol', 'extlink', 'free-extlink-protocol', 'free-extlink', 'magic-link'], pagename = '.cm-mw-pagename', wikiLinks = [
     'template-name',
     'link-pagename',
@@ -59,12 +59,12 @@ export const mouseEventListener = (e, view, langConfig) => {
         node = tree.resolve(position, 1);
     }
     const { name, from, to } = node;
-    if (name.includes(tokens.pageName) && typeof langConfig?.titleParser === 'function') {
-        return langConfig.titleParser(state, node);
-    }
-    else if (name.includes('-extlink-protocol')) {
+    if (name.includes('-extlink-protocol')) {
         return wrapURL(state.sliceDoc(from, node.nextSibling.to));
     }
+    else if (name.includes(tokens.pageName) && typeof langConfig?.titleParser === 'function') {
+        return langConfig.titleParser(state, node);
+    }
     else if (/-extlink(?:_|$)/u.test(name)) {
         return wrapURL(state.sliceDoc(node.prevSibling.from, to));
     }
@@ -97,7 +97,8 @@ export default ({ langConfig }) => [
         },
     }),
     EditorView.theme({
-        [[...links, ...langConfig?.titleParser ? wikiLinks : []].map(type => `.cm-mw-${type}`).join()]: {
+        [[...links, ...langConfig?.titleParser ? wikiLinks : []]
+            .map(type => `.cm-mw-${type}`).join()]: {
             cursor: 'var(--codemirror-cursor)',
         },
     }),

package/dist/ref.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/ref.js

@@ -3,10 +3,10 @@ import { ensureSyntaxTree, language, highlightingFor } from '@codemirror/languag
 import { highlightCode } from '@lezer/highlight';
 import { getLSP } from '@bhsd/browser';
 import elt from 'crelt';
-import { tokens } from './config';
-import { getTag } from './matchTag';
-import { CodeMirror6 } from './codemirror';
-import { indexToPos, posToIndex, escHTML } from './util';
+import { base } from './constants.js';
+import { tokens } from './config.js';
+import { getTag } from './matchTag.js';
+import { indexToPos, posToIndex, escHTML, } from './util.js';
 const trees = new WeakMap(), selector = '.cm-tooltip-ref', noDef = '.cm-tooltip-no-def';
 /**
  * 获取节点内容
@@ -45,7 +45,7 @@ export default (cm) => [
                         target = target.slice(1, target.slice(-1) === quote ? -1 : undefined).trim();
                     }
                     if (target) {
-                        const { doc } = state, ref = await getLSP(view, false, cm.getWikiConfig, CodeMirror6.CDN)
+                        const { doc } = state, ref = await getLSP(view, false, cm.getWikiConfig, base.CDN)
                             ?.provideDefinition(doc.toString(), indexToPos(doc, first.to));
                         return {
                             pos,
@@ -63,7 +63,9 @@ export default (cm) => [
                                         },
                                     }, (code, classes) => {
                                         const escaped = escHTML(code);
-                                        result += classes ? `<span class="${classes}">${escaped}</span>` : escaped;
+                                        result += classes
+                                            ? `<span class="${classes}">${escaped}</span>`
+                                            : escaped;
                                     }, () => {
                                         result += '<br>';
                                     });

package/dist/signature.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/signature.js

@@ -1,8 +1,8 @@
 import { EditorView, showTooltip } from '@codemirror/view';
 import { StateField, StateEffect } from '@codemirror/state';
 import { getLSP } from '@bhsd/browser';
-import { createTooltipView, indexToPos, escHTML } from './util';
-import { CodeMirror6 } from './codemirror';
+import { base } from './constants.js';
+import { createTooltipView, indexToPos, escHTML, } from './util.js';
 const stateEffect = StateEffect.define(), field = StateField.define({
     create() {
         return undefined;
@@ -36,7 +36,7 @@ export default (cm) => [
                     effects: stateEffect.of({
                         text,
                         cursor,
-                        signatureHelp: await getLSP(view, false, cm.getWikiConfig, CodeMirror6.CDN)
+                        signatureHelp: await getLSP(view, false, cm.getWikiConfig, base.CDN)
                             ?.provideSignatureHelp(text, indexToPos(doc, cursor)),
                     }),
                 });

package/dist/statusBar.js

@@ -2,8 +2,8 @@ import { showPanel, EditorView } from '@codemirror/view';
 import { nextDiagnostic, setDiagnosticsEffect } from '@codemirror/lint';
 import { gotoLine } from '@codemirror/search';
 import elt from 'crelt';
-import { menuRegistry } from './codemirror';
-import { panelSelector, diagnosticSelector, menuSelector, messageSelector, actionSelector } from './constants';
+import { menuRegistry } from './codemirror.js';
+import { panelSelector, diagnosticSelector, menuSelector, messageSelector, actionSelector } from './constants.js';
 const statusSelector = '.cm-panel-status', workerSelector = '.cm-status-worker', errorSelector = '.cm-status-error', warningSelector = '.cm-status-warning', enabledSelector = '.cm-status-fix-enabled', disabledSelector = '.cm-status-fix-disabled', workerCls = 'cm-status-worker-enabled', lineCls = 'cm-status-line';
 function getLintMarker(view, severity, menu) {
     const marker = elt('div', { class: `cm-status-${severity}` }), icon = elt('div');
@@ -50,7 +50,12 @@ const updateDiagnosticMessage = (cm, allDiagnostics, main, msg) => {
     }
     else {
         const diagnostic = diagnostics.find(({ from, to }) => from <= main.head && to >= main.head) ?? diagnostics[0], view = cm.view;
-        msg.textContent = diagnostic.message;
+        if (diagnostic.renderMessage) {
+            msg.replaceChildren(diagnostic.renderMessage(view));
+        }
+        else {
+            msg.textContent = diagnostic.message;
+        }
         if (diagnostic.actions) {
             msg.append(...diagnostic.actions.map(({ name, tooltip, apply }) => {
                 const button = elt('button', { type: 'button', class: actionSelector.slice(1) }, name);

package/dist/theme.js

@@ -1,6 +1,6 @@
 import { EditorView } from '@codemirror/view';
 import { nord as nordBase } from 'cm6-theme-nord';
-import { foldSelector, hoverSelector, matchingCls, nonmatchingCls, menuSelector, messageSelector, actionSelector, panelsSelector, } from './constants';
+import { foldSelector, hoverSelector, matchingCls, nonmatchingCls, menuSelector, messageSelector, actionSelector, panelsSelector, } from './constants.js';
 const focused = '&.cm-focused', matching = `${focused} .${matchingCls}`, nonmatching = `${focused} .${nonmatchingCls}`, code = `${hoverSelector} code`, menuHover = `${menuSelector}>div:hover`;
 export const light = /* @__PURE__ */ EditorView.theme({
     '&': {

package/dist/token.d.ts

@@ -4,11 +4,11 @@
  * @see https://gerrit.wikimedia.org/g/mediawiki/extensions/CodeMirror
  */
 import { Tag } from '@lezer/highlight';
-import { tokens } from './config';
 import type { MwConfig as MwConfigBase } from '@bhsd/cm-util';
 import type { EditorState } from '@codemirror/state';
 import type { StreamParser, StringStream as StringStreamBase } from '@codemirror/language';
 import type { SyntaxNode } from '@lezer/common';
+import type { TagName } from './config';
 declare type Style = string | [string];
 declare type Tokenizer<T = Style> = ((stream: StringStream, state: State) => T) & {
     args?: unknown[];
@@ -48,7 +48,6 @@ declare interface StringStream extends StringStreamBase {
     match(pattern: string, consume?: boolean, caseInsensitive?: boolean): true | null;
     match(pattern: RegExp, consume?: boolean): RegExpMatchArray | null;
 }
-export type TagName = keyof typeof tokens;
 export type ApiSuggestions = [string, string?][] & {
     description?: string;
 };
@@ -134,7 +133,7 @@ export declare class MediaWiki {
     inStr(str: string, tag: TagName | false, errorTag?: TagName): Tokenizer<string>;
     eatWikiText(style: string): Tokenizer;
     eatApostrophes(obj: Pick<State, 'bold' | 'italic'>): Tokenizer<string | false>;
-    eatExternalLinkProtocol({ length }: string, free?: boolean): Tokenizer<string>;
+    eatExternalLinkProtocol({ length }: string, free?: boolean): Tokenizer;
     inExternalLink(text?: boolean): Tokenizer;
     eatFreeExternalLink(this: void, stream: StringStream, state: State): Style;
     inLink(file: boolean, section?: boolean): Tokenizer;

package/dist/token.js

@@ -42,7 +42,7 @@ import { Tag } from '@lezer/highlight';
 import { getRegex } from '@bhsd/common';
 import { decodeHTML } from '@bhsd/browser';
 import { otherParserFunctions } from '@bhsd/cm-util';
-import { htmlTags, voidHtmlTags, selfClosingTags, tokenTable, tokens } from './config';
+import { htmlTags, voidHtmlTags, selfClosingTags, tokenTable, tokens } from './config.js';
 class MediaWikiData {
     constructor(tags, urlProtocols) {
         this.tags = tags.includes('translate') ? tags.filter(tag => tag !== 'tvar') : tags;
@@ -386,7 +386,7 @@ let MediaWiki = (() => {
             _inStr_decorators = [(getTokenizer)];
             _eatWikiText_decorators = [getTokenizer];
             _eatApostrophes_decorators = [getTokenizer];
-            _eatExternalLinkProtocol_decorators = [(getTokenizer)];
+            _eatExternalLinkProtocol_decorators = [getTokenizer];
             _inExternalLink_decorators = [getTokenizer];
             _inLink_decorators = [getTokenizer];
             _inLinkText_decorators = [getTokenizer];
@@ -822,7 +822,9 @@ let MediaWiki = (() => {
             return (stream, state) => {
                 stream.pos += length;
                 state.tokenize = free ? this.eatFreeExternalLink : this.inExternalLink();
-                return makeLocalTagStyle(free ? 'freeExtLinkProtocol' : 'extLinkProtocol', state);
+                return free
+                    ? makeTagStyle('freeExtLinkProtocol', state)
+                    : makeLocalTagStyle('extLinkProtocol', state);
             };
         }
         inExternalLink(text) {

package/dist/util.d.ts

@@ -37,3 +37,8 @@ export declare const braceStackUpdate: (state: EditorState, node: SyntaxNode) =>
  * @param names 指定类型
  */
 export declare const hasTag: (types: Set<string>, names: string | string[]) => boolean;
+/**
+ * 获取字符串开头的空白字符
+ * @param str 字符串
+ */
+export declare const leadingSpaces: (str: string) => string;

package/dist/util.js

@@ -1,6 +1,6 @@
 import elt from 'crelt';
-import { tokens } from './config';
-import { hoverSelector } from './constants';
+import { tokens } from './config.js';
+import { hoverSelector, } from './constants.js';
 const dict = { '\n': '<br>', '&': '&amp;', '<': '&lt;' };
 /**
  * 转义HTML字符串
@@ -51,3 +51,8 @@ export const braceStackUpdate = (state, node) => {
  * @param names 指定类型
  */
 export const hasTag = (types, names) => (Array.isArray(names) ? names : [names]).some(name => types.has(name in tokens ? tokens[name] : name));
+/**
+ * 获取字符串开头的空白字符
+ * @param str 字符串
+ */
+export const leadingSpaces = (str) => /^\s*/u.exec(str)[0];

package/dist/vue.js

@@ -2,8 +2,8 @@ import { vue } from '@codemirror/lang-vue';
 import { htmlLanguage, htmlCompletionSource } from '@codemirror/lang-html';
 import { javascript } from '@codemirror/lang-javascript';
 import { LanguageSupport } from '@codemirror/language';
-import { cssCompletion } from './css';
-import { jsCompletion } from './javascript';
+import { cssCompletion } from './css.js';
+import { jsCompletion } from './javascript.js';
 export default () => vue({
     base: new LanguageSupport(htmlLanguage, [
         htmlLanguage.data.of({ autocomplete: htmlCompletionSource }),