@bhsd/codemirror-mediawiki 3.8.1 → 3.9.1

package/dist/matchTag.js

@@ -1,8 +1,8 @@
 import { Decoration, EditorView } from '@codemirror/view';
 import { StateField } from '@codemirror/state';
 import { ensureSyntaxTree } from '@codemirror/language';
-import { voidHtmlTags, selfClosingTags } from './config';
-import { matchingCls, nonmatchingCls } from './constants';
+import { voidHtmlTags, selfClosingTags } from './config.js';
+import { matchingCls, nonmatchingCls } from './constants.js';
 class Tag {
     get closing() {
         return isClosing(this.first, this.type, this.state, true);

package/dist/mediawiki.d.ts

@@ -4,7 +4,7 @@
  * @see https://gerrit.wikimedia.org/g/mediawiki/extensions/CodeMirror
  */
 import { LanguageSupport } from '@codemirror/language';
-import { MediaWiki } from './token';
+import { MediaWiki } from './token.js';
 import type { StreamParser, TagStyle } from '@codemirror/language';
 import type { CompletionSource, Completion } from '@codemirror/autocomplete';
 import type { MwConfig } from './token';
@@ -40,4 +40,4 @@ export declare class FullMediaWiki extends MediaWiki {
  * Get a LanguageSupport instance for the MediaWiki mode.
  * @param config Configuration for the MediaWiki mode
  */
-export declare const mediawiki: (config: MwConfig) => LanguageSupport;
+export declare const mediawikiBase: (config: MwConfig) => LanguageSupport;

package/dist/mediawiki.js

@@ -3,15 +3,15 @@
  * @license GPL-2.0-or-later
  * @see https://gerrit.wikimedia.org/g/mediawiki/extensions/CodeMirror
  */
-import { HighlightStyle, LanguageSupport, StreamLanguage, syntaxHighlighting, syntaxTree, } from '@codemirror/language';
+import { StreamLanguage, syntaxTree, HighlightStyle, LanguageSupport, syntaxHighlighting, } from '@codemirror/language';
+import { EditorView } from '@codemirror/view';
 import { insertCompletionText, pickedCompletion } from '@codemirror/autocomplete';
 import { isUnderscore } from '@bhsd/cm-util';
 import { commonHtmlAttrs, htmlAttrs, extAttrs } from 'wikiparser-node/dist/util/sharable.mjs';
-import { htmlTags, tokens } from './config';
-import { isolateSelector, ltrSelector, isWMF } from './constants';
-import { MediaWiki } from './token';
-import { braceStackUpdate, hasTag } from './util';
-import { EditorView } from '@codemirror/view';
+import { htmlTags, tokens } from './config.js';
+import { isWMF, isolateSelector, ltrSelector } from './constants.js';
+import { MediaWiki } from './token.js';
+import { hasTag, braceStackUpdate, leadingSpaces, } from './util.js';
 /**
  * 是否是普通维基链接
  * @param name 节点名称
@@ -116,8 +116,7 @@ export class FullMediaWiki extends MediaWiki {
         }
         else {
             search = search.replace(/_/gu, ' ');
-            const mt = /^\s*/u.exec(search);
-            [{ length: offset }] = mt;
+            offset = leadingSpaces(search).length;
             search = search.slice(offset);
             if (search.startsWith(':')) {
                 const [{ length }] = /^:\s*/u.exec(search);
@@ -155,7 +154,7 @@ export class FullMediaWiki extends MediaWiki {
         const { config: { paramSuggest } } = this, result = await paramSuggest?.(page);
         return result?.length
             ? {
-                offset: /^\s*/u.exec(search)[0].length,
+                offset: leadingSpaces(search).length,
                 options: result.map(([key, detail]) => ({ type: 'variable', label: key + equal, detail })),
             }
             : undefined;
@@ -163,11 +162,15 @@ export class FullMediaWiki extends MediaWiki {
     /** 自动补全魔术字和标签名 */
     get completionSource() {
         return async (context) => {
-            const { state, pos, explicit } = context, node = syntaxTree(state).resolve(pos, -1), { name: n, from: f, to: t } = node, types = new Set(n.split('_')), isParserFunction = hasTag(types, 'parserFunctionName'), 
+            const { state, pos, explicit } = context, node = syntaxTree(state).resolve(pos, -1), { name: n, from: f, to: t, } = node, types = new Set(n.split('_')), isParserFunction = hasTag(types, 'parserFunctionName'), 
             /** 开头不包含` `，但可能包含`_` */ search = state.sliceDoc(f, pos).trimStart(), start = pos - search.length;
             let { prevSibling } = node;
             if (explicit || isParserFunction && search.includes('#') || isWMF) {
-                const validFor = isWMF ? null : { validFor: /^[^|{}<>[\]#]*$/u };
+                const obj = isWMF
+                    ? null
+                    : {
+                        validFor: /^[^|{}<>[\]#]*$/u,
+                    };
                 if (isParserFunction || hasTag(types, 'templateName')) {
                     const options = search.includes(':') ? [] : [...this.functionSynonyms], suggestions = await this.#linkSuggest(search, 10) ?? { offset: 0, options: [] };
                     options.push(...suggestions.options);
@@ -176,14 +179,14 @@ export class FullMediaWiki extends MediaWiki {
                         : {
                             from: start + suggestions.offset,
                             options,
-                            ...validFor,
+                            ...obj,
                         };
                 }
                 else if (explicit && hasTag(types, 'templateBracket') && context.matchBefore(/\{\{$/u)) {
                     return {
                         from: pos,
                         options: this.functionSynonyms,
-                        ...validFor,
+                        ...obj,
                     };
                 }
                 const isPage = hasTag(types, 'pageName') && hasTag(types, 'parserFunction') || 0;
@@ -212,7 +215,7 @@ export class FullMediaWiki extends MediaWiki {
                         // eslint-disable-next-line unicorn/explicit-length-check
                         from: start + suggestions.offset - (isPage && prefix.length),
                         options: suggestions.options,
-                        ...validFor,
+                        ...obj,
                     };
                 }
                 const isArgument = hasTag(types, 'templateArgumentName'), prevIsDelimiter = prevSibling?.name.includes(tokens.templateDelimiter), isDelimiter = hasTag(types, 'templateDelimiter')
@@ -516,7 +519,7 @@ const theme = /* @__PURE__ */ EditorView.theme({
  * Get a LanguageSupport instance for the MediaWiki mode.
  * @param config Configuration for the MediaWiki mode
  */
-export const mediawiki = (config) => {
-    const mode = new FullMediaWiki(config), lang = StreamLanguage.define(mode.mediawiki()), highlighter = syntaxHighlighting(HighlightStyle.define(mode.getTagStyles()));
-    return new LanguageSupport(lang, [highlighter, theme]);
+export const mediawikiBase = (config) => {
+    const mode = new FullMediaWiki(config), lang = StreamLanguage.define(mode.mediawiki());
+    return new LanguageSupport(lang, [syntaxHighlighting(HighlightStyle.define(mode.getTagStyles())), theme]);
 };