@bhsd/codemirror-mediawiki 3.10.2 → 3.11.1

package/dist/mwConfig.js

@@ -1,84 +1,16 @@
-// ../browser/dist/index.js
-var CDN = "https://testingcf.jsdelivr.net";
-var getObject = (key) => JSON.parse(String(localStorage.getItem(key)));
-var setObject = (key, value) => {
-  localStorage.setItem(key, JSON.stringify(value));
-};
-
-// ../cm-util/dist/index.mjs
-var otherParserFunctions = /* @__PURE__ */ new Set(["msg", "raw", "subst", "safesubst"]);
-var isUnderscore = (s) => !/^＿{2}.+＿{2}$/u.test(s);
-var cleanAliases = (aliases) => {
-  for (const key in aliases) {
-    if (/^[^#＃].*：$/u.test(key)) {
-      delete aliases[key];
-    }
-  }
-};
-var getConfig = (magicWords, rule, flip) => {
-  const words = magicWords.filter(rule);
-  return Object.fromEntries(
-    (flip === void 0 ? words : words.filter(({ "case-sensitive": i }) => i !== flip)).flatMap(({ aliases, name: n, "case-sensitive": i }) => aliases.map((alias) => ({
-      alias: (i ? alias : alias.toLowerCase()).replace(/:$/u, ""),
-      name: n
-    }))).map(({ alias, name: n }) => [alias, n])
-  );
-};
-var getParserConfig = (minConfig, mwConfig) => {
-  const {
-    tags,
-    doubleUnderscore,
-    urlProtocols,
-    functionSynonyms,
-    variableIDs,
-    functionHooks,
-    redirection
-  } = mwConfig, [insensitive, sensitive] = functionSynonyms, behaviorSwitch = doubleUnderscore.map(
-    (obj, i) => Object.entries(obj).map(([k, v]) => [
-      isUnderscore(k) ? k.slice(2, -2) : k,
-      i && typeof v === "string" ? v.toUpperCase() : v
-    ])
-  );
-  cleanAliases(insensitive);
-  cleanAliases(sensitive);
-  for (const [k, v] of Object.entries(insensitive)) {
-    if (k in sensitive) {
-      delete insensitive[k];
-    } else {
-      insensitive[k] = v.toLowerCase();
-    }
-  }
-  return {
-    ...minConfig,
-    ext: Object.keys(tags),
-    parserFunction: [{ ...insensitive }, { ...sensitive, "=": "=" }, [], []],
-    doubleUnderscore: [
-      ...behaviorSwitch.map(
-        (entries) => entries.filter(([k]) => isUnderscore(k)).map(([k]) => k)
-      ),
-      ...behaviorSwitch.map(Object.fromEntries)
-    ],
-    protocol: urlProtocols.replace(/\|\\?\/\\?\/$|\\(?=[:/])/gu, ""),
-    ...variableIDs && { variable: [.../* @__PURE__ */ new Set([...variableIDs, "="])] },
-    ...functionHooks && { functionHook: [.../* @__PURE__ */ new Set([...functionHooks.map((s) => s.toLowerCase()), "msgnw"])] },
-    ...redirection && { redirection: redirection.map((s) => s.toLowerCase()) }
-  };
-};
-var getVariants = (variants) => {
-  var _a;
-  return (_a = variants == null ? void 0 : variants.map(({ code }) => code)) != null ? _a : [];
-};
-var getKeywords = (magicwords, web) => ({
-  img: Object.fromEntries(
-    magicwords.filter(({ name: n }) => n.startsWith("img_") && n !== "img_lossy").flatMap(({ name: n, aliases }) => {
-      const k = web ? n : n.slice(4).replace(/_/gu, "-");
-      return (n === "img_alt" ? aliases.filter((alias) => alias.includes("$1")) : aliases).map((alias) => [alias, k]);
-    })
-  ),
-  redirection: magicwords.find(({ name: n }) => n === "redirect").aliases.map((s) => s.toLowerCase())
-});
+// mw/config.ts
+import { CDN, setObject, getObject } from "@bhsd/browser";
+import {
+  cleanAliases,
+  getParserConfig as getParserConfigBase,
+  getConfig,
+  getVariants,
+  getKeywords,
+  otherParserFunctions
+} from "@bhsd/cm-util";
 
 // src/static.ts
+import { isUnderscore } from "@bhsd/cm-util";
 var getStaticMwConfig = ({
   variable,
   parserFunction: [p0, p1, ...p2],
@@ -199,14 +131,14 @@ var getMwConfig = async (modes) => {
   setObject("InPageEditMwConfig", ALL_SETTINGS_CACHE);
   return { ...config, nsid };
 };
-var getParserConfig2 = (minConfig, mwConfig) => {
+var getParserConfig = (minConfig, mwConfig) => {
   let config = getObject("wikilintConfig");
   if (config) {
     return config;
   }
   const { nsid, variants, functionSynonyms, img } = mwConfig, [insensitive] = functionSynonyms;
   config = {
-    ...getParserConfig(minConfig, mwConfig),
+    ...getParserConfigBase(minConfig, mwConfig),
     namespaces: mw.config.get("wgFormattedNamespaces"),
     nsid,
     variants,
@@ -228,5 +160,5 @@ var getParserConfig2 = (minConfig, mwConfig) => {
 };
 export {
   getMwConfig,
-  getParserConfig2 as getParserConfig
+  getParserConfig
 };

package/dist/openLinks.js

@@ -48,7 +48,7 @@ export const mouseEventListener = (e, view, isbnParser, titleParser) => {
     if (node.name.includes(tokens.linkToSection)) {
         node = node.prevSibling;
     }
-    else if (!hasTag(new Set(node.name.split('_')), tags)) {
+    else if (node.to === position && !hasTag(new Set(node.name.split('_')), tags)) {
         node = tree.resolve(position, 1);
     }
     const { name, from, to } = node;

package/dist/ref.js

@@ -72,7 +72,7 @@ export default (articlePath) => (cm) => {
     return [
         hoverTooltip(async (view, pos, side) => {
             const { state } = view, node = ensureSyntaxTree(state, pos)?.resolve(pos, side);
-            if (node && node.name.includes('-exttag-')) {
+            if (node?.name.includes('-exttag-')) {
                 const tag = getTag(state, node);
                 if (tag && needHover(state, tag)) {
                     const { doc } = state, ref = await getLSP(view, false, toConfigGetter(cm.getWikiConfig, articlePath), base.CDN)?.provideDefinition(doc.toString(), indexToPos(doc, tag.first.to));

package/dist/signature.d.ts

@@ -1,6 +1,9 @@
 import type { Extension } from '@codemirror/state';
-import type { SignatureHelp } from 'vscode-languageserver-types';
+import type { SignatureHelp as SignatureHelpBase, SignatureInformation } from 'vscode-languageserver-types';
 import type { CodeMirror6 } from './codemirror';
+interface SignatureHelp extends Omit<SignatureHelpBase, 'signatures'> {
+    signatures: SignatureInformation[] | string[];
+}
 /**
  * @ignore
  * @test

package/dist/signature.js

@@ -1,8 +1,9 @@
 import { EditorView, showTooltip } from '@codemirror/view';
 import { StateField, StateEffect } from '@codemirror/state';
+import { syntaxTree } from '@codemirror/language';
 import { getLSP } from '@bhsd/browser';
 import { base } from './constants.js';
-import { createTooltipView, indexToPos, escHTML, toConfigGetter, } from './util.js';
+import { createTooltipView, indexToPos, escHTML, toConfigGetter, findTemplateName, isTemplate, } from './util.js';
 const stateEffect = StateEffect.define(), field = StateField.define({
     create() {
         return undefined;
@@ -24,8 +25,12 @@ const stateEffect = StateEffect.define(), field = StateField.define({
  * @ignore
  * @test
  */
-export const getSignatureHelp = ({ signatures, activeParameter: active }) => signatures.map(({ label, parameters, activeParameter = active }) => {
-    const safeLabel = escHTML(label);
+export const getSignatureHelp = ({ signatures, activeParameter: active }) => signatures.map(signature => {
+    if (typeof signature === 'string') {
+        const safeLabel = escHTML(signature), pipe = safeLabel.indexOf('|'), equal = safeLabel.indexOf('=', pipe);
+        return `${safeLabel.slice(0, pipe)}|<b>${safeLabel.slice(pipe + 1, equal)}</b>${safeLabel.slice(equal)}`;
+    }
+    const { label, parameters, activeParameter = active } = signature, safeLabel = escHTML(label);
     if (activeParameter < 0 || activeParameter >= parameters.length) {
         return safeLabel;
     }
@@ -46,22 +51,42 @@ export default (articlePath) => (cm) => {
                     return;
                 }
                 (async () => {
+                    let signatureHelp = await getLSP(view, false, toConfigGetter(cm.getWikiConfig, articlePath), base.CDN)?.provideSignatureHelp(text, indexToPos(doc, cursor));
+                    if (!signatureHelp && typeof cm.langConfig?.templateSignature === 'function') {
+                        const tree = syntaxTree(state);
+                        let node = tree.resolve(cursor, -1);
+                        if (node.to === cursor && !isTemplate(node)) {
+                            node = tree.resolve(cursor, 1);
+                        }
+                        if (isTemplate(node)) {
+                            const [templateName, parameterName] = findTemplateName(state, node), tooltip = cm.langConfig.templateSignature(templateName, parameterName);
+                            if (tooltip) {
+                                signatureHelp = { signatures: [tooltip] };
+                            }
+                        }
+                    }
                     view.dispatch({
-                        effects: stateEffect.of({
-                            text,
-                            cursor,
-                            signatureHelp: await getLSP(view, false, toConfigGetter(cm.getWikiConfig, articlePath), base.CDN)?.provideSignatureHelp(text, indexToPos(doc, cursor)),
-                        }),
+                        effects: stateEffect.of({ text, cursor, signatureHelp }),
                     });
                 })();
             }
         }),
+        EditorView.domEventHandlers({
+            keydown({ key }, view) {
+                if (key === 'Escape') {
+                    const { doc, selection: { main: { head } } } = view.state;
+                    view.dispatch({
+                        effects: stateEffect.of({ text: doc.toString(), cursor: head }),
+                    });
+                }
+            },
+        }),
         showTooltip.from(field, (value) => {
             if (!value) {
                 return null;
             }
             const { cursor, signatureHelp } = value;
-            return signatureHelp && signatureHelp.signatures.length > 0
+            return signatureHelp?.signatures.length
                 ? {
                     pos: cursor,
                     above: true,

package/dist/token.d.ts

@@ -70,6 +70,7 @@ export interface MwConfig extends MwConfigBase {
     linkSuggest?: ApiSuggest<string>;
     paramSuggest?: ApiSuggest;
     titleParser?: (state: EditorState, node: SyntaxNode) => string | undefined;
+    templateSignature?: (templateName: string | null, parameterName: string) => string | undefined;
 }
 declare class MediaWikiData {
     /** 已解析的节点 */

package/dist/util.d.ts

@@ -45,12 +45,17 @@ export declare const sliceDoc: (state: EditorState, node: SyntaxNode | Selection
  */
 export declare const braceStackUpdate: (state: EditorState, node: SyntaxNode) => [number, number];
 /**
- * Find the current template name
+ * Check if the node is a template parameter value
+ * @param node 语法树节点
+ */
+export declare const isTemplate: (node: SyntaxNode) => boolean;
+/**
+ * Find the current template name and parameter name
  * @param state
  * @param node 语法树节点
  * @test
  */
-export declare const findTemplateName: (state: EditorState, node: SyntaxNode) => string | null;
+export declare const findTemplateName: (state: EditorState, node: SyntaxNode) => [string | null, string];
 /**
  * 判断节点是否包含指定类型
  * @param types 节点类型

package/dist/util.js

@@ -57,17 +57,26 @@ export const braceStackUpdate = (state, node) => {
     return [brackets.split('{{').length - 1, 1 - brackets.split('}}').length];
 };
 /**
- * Find the current template name
+ * Check if the node is a template parameter value
+ * @param node 语法树节点
+ */
+export const isTemplate = (node) => node.name.split('_').includes(tokens.template);
+/**
+ * Find the current template name and parameter name
  * @param state
  * @param node 语法树节点
  * @test
  */
 export const findTemplateName = (state, node) => {
     let stack = -1, { prevSibling } = node, 
-    /** 可包含`_`、`:`等 */ page = '';
+    /** 可包含`_`、`:`等 */ page = '', parameter = '', need = isTemplate(node);
     while (prevSibling) {
         const { name } = prevSibling;
         if (name.includes(tokens.templateBracket)) {
+            if (need && parameter) {
+                need = false;
+                parameter = '';
+            }
             const [lbrace, rbrace] = braceStackUpdate(state, prevSibling);
             stack += lbrace;
             if (stack >= 0) {
@@ -75,8 +84,22 @@ export const findTemplateName = (state, node) => {
             }
             stack += rbrace;
         }
-        else if (stack === -1 && name.includes(tokens.templateName)) {
-            page = sliceDoc(state, prevSibling) + page;
+        else if (stack === -1) {
+            if (name.includes(tokens.templateName)) {
+                page = sliceDoc(state, prevSibling) + page;
+            }
+            else if (need) {
+                if (name.includes(tokens.templateDelimiter)) {
+                    need = false;
+                }
+                else if (name.includes(tokens.templateArgumentName)) {
+                    parameter = sliceDoc(state, prevSibling) + parameter;
+                }
+                else if (parameter && !name.includes(tokens.comment)) {
+                    need = false;
+                    parameter = '';
+                }
+            }
         }
         else if (page && !name.includes(tokens.comment)) {
             prevSibling = null;
@@ -84,7 +107,7 @@ export const findTemplateName = (state, node) => {
         }
         ({ prevSibling } = prevSibling);
     }
-    return prevSibling && page;
+    return [prevSibling && page, parameter];
 };
 /**
  * 判断节点是否包含指定类型

package/dist/vue.d.ts

@@ -1,3 +1,4 @@
 import { LanguageSupport } from '@codemirror/language';
-declare const _default: () => LanguageSupport;
+import type { CodeMirror6 } from './codemirror';
+declare const _default: (_?: unknown, cm?: CodeMirror6) => LanguageSupport;
 export default _default;

package/dist/vue.js

@@ -3,12 +3,13 @@ import { htmlLanguage, htmlCompletionSource } from '@codemirror/lang-html';
 import { javascript } from '@codemirror/lang-javascript';
 import { LanguageSupport } from '@codemirror/language';
 import { cssCompletion } from './css.js';
-import { jsCompletion } from './javascript.js';
-export default () => vue({
+import { jsCompletion, markGlobalsPlugin } from './javascript.js';
+export default (_, cm) => vue({
     base: new LanguageSupport(htmlLanguage, [
         htmlLanguage.data.of({ autocomplete: htmlCompletionSource }),
         javascript().support,
         jsCompletion,
         cssCompletion(),
+        markGlobalsPlugin(cm),
     ]),
 });