@bhsd/codemirror-mediawiki 2.19.10 → 2.20.1

package/dist/mwConfig.mjs

@@ -8,30 +8,37 @@ var getObject = (key) => JSON.parse(String(localStorage.getItem(key)));
 var setObject = (key, value) => {
   localStorage.setItem(key, JSON.stringify(value));
 };
+var parseVersion = (version) => version.split(".", 3).map(Number);
+var compareVersion = (version, baseVersion) => {
+  const [major, minor] = parseVersion(version), [baseMajor, baseMinor] = parseVersion(baseVersion);
+  return major > baseMajor || major === baseMajor && minor >= baseMinor;
+};
 
 // src/static.ts
 var getStaticMwConfig = ({
+  variable,
   parserFunction: [p0, p1, ...p2],
   protocol,
   nsid,
   variants,
   redirection,
   ext,
-  doubleUnderscore: [d0, d1, d2],
+  doubleUnderscore: [d0, d1, d2, d3],
   img
 }, modes) => ({
   tags: Object.fromEntries(ext.map((s) => [s, true])),
   tagModes: modes,
   doubleUnderscore: [
     Object.fromEntries((d2 && d0.length === 0 ? Object.keys(d2) : d0).map((s) => [`__${s}__`, true])),
-    Object.fromEntries(d1.map((s) => [`__${s}__`, true]))
+    Object.fromEntries((d3 && d1.length === 0 ? Object.keys(d3) : d1).map((s) => [`__${s}__`, true]))
   ],
+  variableIDs: variable,
   functionSynonyms: [
     {
       ...p0,
       ...Object.fromEntries(p2.flat().map((s) => [s, s]))
     },
-    Object.fromEntries(p1.map((s) => [s, true]))
+    Array.isArray(p1) ? Object.fromEntries(p1.map((s) => [s, s.toLowerCase()])) : { ...p1 }
   ],
   urlProtocols: `${protocol}|//`,
   nsid,
@@ -57,6 +64,7 @@ var setConfig = (config) => {
   mw.config.set("extCodeMirrorConfig", config);
 };
 var getMwConfig = async (modes) => {
+  var _a2;
   if (mw.loader.getState("ext.CodeMirror") !== null && !VALID) {
     await mw.loader.using(mw.loader.getState("ext.CodeMirror.data") ? "ext.CodeMirror.data" : "ext.CodeMirror");
   }
@@ -66,13 +74,13 @@ 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 && !isIPE) {
+  if ((config == null ? void 0 : config.img) && config.redirection && config.variants && config.variableIDs && !isIPE) {
     config.urlProtocols = config.urlProtocols.replace(/\\:/gu, ":");
     config.tagModes = modes;
     return { ...config, nsid };
   } else if (location.hostname.endsWith(".moegirl.org.cn")) {
     const parserConfig = await (await fetch(
-      `${CDN}/npm/wikiparser-node@browser/config/moegirl.json`
+      `${CDN}/npm/wikiparser-node/config/moegirl.json`
     )).json();
     setObject("wikilintConfig", parserConfig);
     config = getStaticMwConfig(parserConfig, modes);
@@ -83,7 +91,8 @@ var getMwConfig = async (modes) => {
       siprop: [
         "general",
         "magicwords",
-        ...config && !isIPE ? [] : ["extensiontags", "functionhooks", "variables"]
+        ...config && !isIPE ? [] : ["extensiontags", "functionhooks"],
+        ...(config == null ? void 0 : config.variableIDs) && !isIPE ? [] : ["variables"]
       ],
       formatversion: "2"
     });
@@ -113,6 +122,7 @@ var getMwConfig = async (modes) => {
     config.variants = variants ? variants.map(({ code }) => code) : [];
     config.redirection = magicwords.find(({ name }) => name === "redirect").aliases;
     config.urlProtocols = mw.config.get("wgUrlProtocols").replace(/\\:/gu, ":");
+    (_a2 = config.variableIDs) != null ? _a2 : config.variableIDs = variables;
   }
   setConfig(config);
   ALL_SETTINGS_CACHE[SITE_ID] = { config, time: Date.now() };
@@ -120,39 +130,36 @@ var getMwConfig = async (modes) => {
   return { ...config, nsid };
 };
 var getParserConfig = (minConfig, mwConfig) => {
-  var _a2;
   let config = getObject("wikilintConfig");
   if (config) {
     return config;
   }
+  const { tags, nsid, doubleUnderscore, variants, urlProtocols, redirection, functionSynonyms, img } = mwConfig, [insensitive, sensitive] = functionSynonyms;
   config = {
     ...minConfig,
-    ext: Object.keys(mwConfig.tags),
+    ext: Object.keys(tags),
     namespaces: mw.config.get("wgFormattedNamespaces"),
-    nsid: mwConfig.nsid,
-    doubleUnderscore: mwConfig.doubleUnderscore.map(
+    nsid,
+    doubleUnderscore: doubleUnderscore.map(
       (obj) => Object.keys(obj).map((s) => s.slice(2, -2))
     ),
-    variants: mwConfig.variants,
-    protocol: mwConfig.urlProtocols.replace(/\|\\?\/\\?\//u, ""),
-    redirection: (_a2 = mwConfig.redirection) != null ? _a2 : minConfig.redirection
+    variants,
+    protocol: urlProtocols.replace(/\|\\?\/\\?\//u, ""),
+    redirection: redirection != null ? redirection : minConfig.redirection
   };
   if (location.hostname.endsWith(".moegirl.org.cn")) {
     config.html[2].push("img");
   }
-  [config.parserFunction[0]] = mwConfig.functionSynonyms;
+  config.parserFunction[0] = insensitive;
   if (mw.loader.getState("ext.CodeMirror") === null) {
-    for (const [key, val] of Object.entries(mwConfig.functionSynonyms[0])) {
+    for (const [key, val] of Object.entries(insensitive)) {
       if (!key.startsWith("#")) {
         config.parserFunction[0][`#${key}`] = val;
       }
     }
   }
-  config.parserFunction[1] = [
-    ...Object.keys(mwConfig.functionSynonyms[1]),
-    "="
-  ];
-  for (const [key, val] of Object.entries(mwConfig.img)) {
+  config.parserFunction[1] = "wikiparser" in globalThis && compareVersion(wikiparse.version, "1.15") && !Object.values(sensitive).includes(true) ? { ...sensitive, "=": "=" } : [...Object.keys(sensitive), "="];
+  for (const [key, val] of Object.entries(img)) {
     config.img[key] = val.slice(4);
   }
   return config;

package/dist/static.d.ts

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

package/dist/token.d.ts

@@ -56,9 +56,10 @@ export interface MwConfig {
     readonly tags: Record<string, true>;
     tagModes: Record<string, string>;
     urlProtocols: string;
-    functionSynonyms: [Record<string, string>, Record<string, unknown>];
+    functionSynonyms: [Record<string, string>, Record<string, string>];
     doubleUnderscore: [Record<string, unknown>, Record<string, unknown>];
     nsid: Record<string, number>;
+    variableIDs?: string[];
     variants?: string[];
     img?: Record<string, string>;
     redirection?: string[];