@bhsd/codemirror-mediawiki 2.23.0 → 2.23.2

package/dist/mwConfig.mjs

@@ -10,12 +10,64 @@ var compareVersion = (version, baseVersion) => {
   return major > baseMajor || major === baseMajor && minor >= baseMinor;
 };
 
+// ../code-standard/dist/cm.mjs
+var otherParserFunctions = /* @__PURE__ */ new Set(["msg", "raw", "subst", "safesubst"]);
+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 } = mwConfig, [insensitive, sensitive] = functionSynonyms, behaviorSwitch = doubleUnderscore.map(
+    (obj, i) => Object.entries(obj).map(([k, v]) => [
+      k.slice(2, -2),
+      i && typeof v === "string" ? v.toUpperCase() : v
+    ])
+  );
+  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.map(([k]) => k)),
+      ...behaviorSwitch.map(Object.fromEntries)
+    ],
+    protocol: urlProtocols.replace(/\|\\?\/\\?\/$|\\(?=[:/])/gu, ""),
+    ...variableIDs && { variable: [.../* @__PURE__ */ new Set([...variableIDs, "="])] }
+  };
+};
+var getVariants = (variants) => {
+  var _a2;
+  return (_a2 = variants == null ? void 0 : variants.map(({ code }) => code)) != null ? _a2 : [];
+};
+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())
+});
+
 // src/static.ts
 var getStaticMwConfig = ({
   variable,
   parserFunction: [p0, p1, ...p2],
   protocol,
   nsid,
+  functionHook,
   variants,
   redirection,
   ext,
@@ -28,6 +80,7 @@ var getStaticMwConfig = ({
     Object.fromEntries((d2 && d0.length === 0 ? Object.keys(d2) : d0).map((s) => [`__${s}__`, true])),
     Object.fromEntries((d3 && d1.length === 0 ? Object.keys(d3) : d1).map((s) => [`__${s}__`, true]))
   ],
+  functionHooks: functionHook,
   variableIDs: variable,
   functionSynonyms: [
     {
@@ -49,18 +102,13 @@ var ALL_SETTINGS_CACHE = (_a = getObject("InPageEditMwConfig")) != null ? _a : {
 var SITE_ID = typeof mw === "object" ? mw.config.get("wgServerName") + mw.config.get("wgScriptPath") : location.origin;
 var SITE_SETTINGS = ALL_SETTINGS_CACHE[SITE_ID];
 var VALID = Number(SITE_SETTINGS == null ? void 0 : SITE_SETTINGS.time) > Date.now() - 86400 * 1e3 * 30;
-var getConfig = (magicWords, rule, flip) => Object.fromEntries(
-  magicWords.filter(rule).filter(({ "case-sensitive": i }) => i !== flip).flatMap(({ aliases, name, "case-sensitive": i }) => aliases.map((alias) => ({
-    alias: (i ? alias : alias.toLowerCase()).replace(/:$/u, ""),
-    name
-  }))).map(({ alias, name }) => [alias, name])
-);
+var others = /* @__PURE__ */ new Set([...otherParserFunctions, "msgnw"]);
 var getConfigPair = (magicWords, rule) => [true, false].map((bool) => getConfig(magicWords, rule, bool));
 var setConfig = (config) => {
   mw.config.set("extCodeMirrorConfig", config);
 };
 var getMwConfig = async (modes) => {
-  var _a2;
+  var _a2, _b;
   if (mw.loader.getState("ext.CodeMirror") !== null && !VALID) {
     await mw.loader.using(
       mw.loader.getState("ext.CodeMirror.data") ? "ext.CodeMirror.data" : "ext.CodeMirror"
@@ -72,7 +120,7 @@ var getMwConfig = async (modes) => {
     setConfig(config);
   }
   const isIPE = config && Object.values(config.functionSynonyms[0]).includes(true), nsid = mw.config.get("wgNamespaceIds");
-  if ((config == null ? void 0 : config.img) && config.redirection && config.variants && config.variableIDs && !isIPE) {
+  if ((config == null ? void 0 : config.img) && config.redirection && config.variants && config.variableIDs && config.functionHooks && !isIPE) {
     config.urlProtocols = config.urlProtocols.replace(/\\:/gu, ":");
     config.tagModes = modes;
     return { ...config, nsid };
@@ -90,11 +138,11 @@ var getMwConfig = async (modes) => {
         "general",
         "magicwords",
         ...config && !isIPE ? [] : ["extensiontags", "functionhooks"],
-        ...(config == null ? void 0 : config.variableIDs) && !isIPE ? [] : ["variables"]
+        ...(config == null ? void 0 : config.variableIDs) && !isIPE ? [] : ["variables"],
+        ...config && !isIPE && !config.functionHooks ? ["functionhooks"] : []
       ],
       formatversion: "2"
     });
-    const others = /* @__PURE__ */ new Set(["msg", "raw", "msgnw", "subst", "safesubst"]);
     if (config && !isIPE) {
       const { functionSynonyms: [insensitive] } = config;
       if (!("subst" in insensitive)) {
@@ -115,65 +163,55 @@ var getMwConfig = async (modes) => {
         )
       };
     }
-    config.tagModes = modes;
-    config.img = getConfig(magicwords, ({ name }) => name.startsWith("img_"));
-    config.variants = variants ? variants.map(({ code }) => code) : [];
-    config.redirection = magicwords.find(({ name }) => name === "redirect").aliases;
-    config.urlProtocols = mw.config.get("wgUrlProtocols").replace(/\\:/gu, ":");
+    Object.assign(config, {
+      ...getKeywords(magicwords, true),
+      tagModes: modes,
+      variants: getVariants(variants),
+      urlProtocols: mw.config.get("wgUrlProtocols").replace(/\\:/gu, ":")
+    });
     (_a2 = config.variableIDs) != null ? _a2 : config.variableIDs = variables;
+    (_b = config.functionHooks) != null ? _b : config.functionHooks = [...functionhooks, "msgnw"];
   }
   setConfig(config);
   ALL_SETTINGS_CACHE[SITE_ID] = { config, time: Date.now() };
   setObject("InPageEditMwConfig", ALL_SETTINGS_CACHE);
   return { ...config, nsid };
 };
-var getParserConfig = (minConfig, mwConfig) => {
+var getParserConfig2 = (minConfig, mwConfig) => {
   let config = getObject("wikilintConfig");
   if (config) {
     return config;
   }
-  const {
-    tags,
-    nsid,
-    doubleUnderscore,
-    variants,
-    urlProtocols,
-    redirection,
-    functionSynonyms,
-    variableIDs,
-    img
-  } = mwConfig, [insensitive, sensitive] = functionSynonyms;
+  const { nsid, variants, redirection, functionSynonyms, functionHooks, img } = mwConfig, [insensitive, sensitive] = functionSynonyms;
   config = {
-    ...minConfig,
-    ext: Object.keys(tags),
+    ...getParserConfig(minConfig, mwConfig),
     namespaces: mw.config.get("wgFormattedNamespaces"),
     nsid,
-    doubleUnderscore: doubleUnderscore.map(
-      (obj) => Object.keys(obj).map((s) => s.slice(2, -2))
-    ),
     variants,
-    protocol: urlProtocols.replace(/\|\\?\/\\?\//u, ""),
     redirection: redirection != null ? redirection : minConfig.redirection,
-    ...variableIDs && { variable: variableIDs }
+    ...functionHooks && { functionHook: functionHooks }
   };
   if (location.hostname.endsWith(".moegirl.org.cn")) {
     config.html[2].push("img");
   }
-  config.parserFunction[0] = insensitive;
-  if (mw.loader.getState("ext.CodeMirror") === null) {
-    for (const [key, val] of Object.entries(insensitive)) {
-      if (!key.startsWith("#")) {
-        config.parserFunction[0][`#${key}`] = val;
-      }
+  const noCM = mw.loader.getState("ext.CodeMirror") === null;
+  for (const [key, val] of Object.entries(insensitive)) {
+    if (others.has(val) && val !== "msgnw") {
+      delete config.parserFunction[0][key];
+      config.parserFunction[val === "msg" || val === "raw" ? 2 : 3].push(key);
+    } else if (noCM && !key.startsWith("#")) {
+      config.parserFunction[0][`#${key}`] = val;
     }
   }
-  config.parserFunction[1] = typeof wikiparse === "object" && compareVersion(wikiparse.version, "1.15") && !Object.values(sensitive).includes(true) ? { ...sensitive, "=": "=" } : [...Object.keys(sensitive), "="];
+  if (typeof wikiparse !== "object" || !compareVersion(wikiparse.version, "1.15") || Object.values(sensitive).includes(true)) {
+    config.parserFunction[1] = Object.keys(config.parserFunction[1]);
+  }
   for (const [key, val] of Object.entries(img)) {
-    config.img[key] = val.slice(4);
+    config.img[key] = val.slice(4).replace(/_/gu, "-");
   }
   return config;
 };
 export {
   getMwConfig,
-  getParserConfig
+  getParserConfig2 as getParserConfig
 };

package/dist/static.d.ts

@@ -24,4 +24,4 @@ export declare const tagModes: {
     maplink: string;
     graph: string;
 };
-export declare const getStaticMwConfig: ({ variable, parserFunction: [p0, p1, ...p2], protocol, nsid, variants, redirection, ext, doubleUnderscore: [d0, d1, d2, d3], img, }: Config, modes: Record<string, string>) => MwConfig;
+export declare const getStaticMwConfig: ({ variable, parserFunction: [p0, p1, ...p2], protocol, nsid, functionHook, variants, redirection, ext, doubleUnderscore: [d0, d1, d2, d3], img, }: Config, modes: Record<string, string>) => MwConfig;

package/dist/token.d.ts

@@ -5,6 +5,7 @@
  */
 import { Tag } from '@lezer/highlight';
 import { tokens } from './config';
+import type { MwConfig as MwConfigBase } from '@bhsd/common/dist/cm';
 import type { EditorState } from '@codemirror/state';
 import type { StreamParser, StringStream as StringStreamBase } from '@codemirror/language';
 import type { SyntaxNode } from '@lezer/common';
@@ -29,7 +30,10 @@ declare interface State extends Nesting {
         n: number;
         html: number;
     };
-    redirect: boolean;
+    sof: boolean;
+    redirect: {
+        colon: boolean;
+    } | false;
     imgLink: boolean;
     data: MediaWikiData;
 }
@@ -52,14 +56,9 @@ export type ApiSuggestions = [string, string?][];
  * @param subpage 是否为子页面
  */
 export type ApiSuggest = (search: string, namespace?: number, subpage?: boolean) => ApiSuggestions | Promise<ApiSuggestions>;
-export interface MwConfig {
-    readonly tags: Record<string, true>;
-    tagModes: Record<string, string>;
-    urlProtocols: string;
-    functionSynonyms: [Record<string, string>, Record<string, string>];
-    doubleUnderscore: [Record<string, unknown>, Record<string, unknown>];
+export interface MwConfig extends MwConfigBase {
     nsid: Record<string, number>;
-    variableIDs?: string[];
+    functionHooks?: string[];
     variants?: string[];
     img?: Record<string, string>;
     redirection?: string[];
@@ -67,8 +66,8 @@ export interface MwConfig {
     implicitlyClosedHtmlTags?: string[];
     linkSuggest?: ApiSuggest;
     paramSuggest?: ApiSuggest;
-    titleParser?: (state: EditorState, node: SyntaxNode, urlProtocols: string) => true | undefined;
-    isbnParser?: (link: string) => true;
+    titleParser?: (state: EditorState, node: SyntaxNode) => string | undefined;
+    isbnParser?: (link: string) => string;
 }
 declare class MediaWikiData {
     /** 已解析的节点 */
@@ -90,7 +89,7 @@ export declare class MediaWiki {
         [x: string]: Tag;
     };
     readonly hiddenTable: Record<string, Tag>;
-    readonly permittedHtmlTags: Set<string>;
+    readonly permittedHtmlTags: Set<string | undefined>;
     readonly implicitlyClosedHtmlTags: Set<string>;
     readonly urlProtocols: RegExp;
     readonly linkRegex: RegExp;
@@ -98,16 +97,11 @@ export declare class MediaWiki {
     readonly redirectRegex: RegExp;
     readonly img: string[];
     readonly imgRegex: RegExp;
-    readonly headerRegex: RegExp;
-    readonly templateRegex: RegExp;
-    readonly argumentRegex: RegExp;
-    readonly styleRegex: RegExp;
     readonly convertSemicolon: RegExp | undefined;
     readonly convertLang: RegExp | undefined;
-    readonly convertRegex: RegExp;
-    readonly wikiRegex: RegExp;
-    readonly tableDefinitionRegex: RegExp;
     readonly tags: string[];
+    readonly hasVariants: boolean;
+    readonly preRegex: [RegExp, RegExp];
     constructor(config: MwConfig);
     /**
      * Dynamically register a token in CodeMirror.
@@ -149,9 +143,9 @@ export declare class MediaWiki {
     inExtTokens(origString: string): Tokenizer;
     inVariable(pos?: number): Tokenizer;
     eatTransclusion(stream: StringStream, state: State, { length }: string): string | undefined;
-    inParserFunctionName(invoke?: number, n?: number): Tokenizer;
+    inParserFunctionName(invoke?: number, n?: number, ns?: number): Tokenizer;
     inTemplatePageName(haveEaten?: boolean, anchor?: boolean): Tokenizer;
-    inParserFunctionArgument(module?: number, n?: number): Tokenizer;
+    inParserFunctionArgument(module?: number, n?: number, ns?: number): Tokenizer;
     inTemplateArgument(expectName?: boolean, parserFunction?: boolean): Tokenizer;
     inConvert(style: string, needFlag?: boolean, needLang?: boolean, plain?: boolean): Tokenizer;
     eatEntity(stream: StringStream, style: string): string;