@bhsd/codemirror-mediawiki 3.6.4 → 3.6.6

package/dist/mwConfig.js

@@ -4,11 +4,6 @@ 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;
-};
 
 // ../cm-util/dist/index.mjs
 var otherParserFunctions = /* @__PURE__ */ new Set(["msg", "raw", "subst", "safesubst"]);
@@ -113,7 +108,7 @@ var getStaticMwConfig = ({
       ...p0,
       ...Object.fromEntries(p2.flat().map((s) => [s, s]))
     },
-    Array.isArray(p1) ? Object.fromEntries(p1.map((s) => [s, s.toLowerCase()])) : { ...p1 }
+    { ...p1 }
   ],
   urlProtocols: `${protocol}|//`,
   nsid,
@@ -209,7 +204,7 @@ var getParserConfig2 = (minConfig, mwConfig) => {
   if (config) {
     return config;
   }
-  const { nsid, variants, functionSynonyms, img } = mwConfig, [insensitive, sensitive] = functionSynonyms;
+  const { nsid, variants, functionSynonyms, img } = mwConfig, [insensitive] = functionSynonyms;
   config = {
     ...getParserConfig(minConfig, mwConfig),
     namespaces: mw.config.get("wgFormattedNamespaces"),
@@ -225,9 +220,6 @@ var getParserConfig2 = (minConfig, mwConfig) => {
       config.parserFunction[0][`#${key}`] = val;
     }
   }
-  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).replace(/_/gu, "-");
   }

package/dist/static.js

@@ -35,7 +35,7 @@ export const getStaticMwConfig = ({ variable, parserFunction: [p0, p1, ...p2], p
             ...p0,
             ...Object.fromEntries(p2.flat().map(s => [s, s])),
         },
-        Array.isArray(p1) ? Object.fromEntries(p1.map(s => [s, s.toLowerCase()])) : { ...p1 },
+        { ...p1 },
     ],
     urlProtocols: `${protocol}|//`,
     nsid,

package/dist/statusBar.js

@@ -66,7 +66,7 @@ const updateMenu = (cm, allDiagnostics, main, classList, optionAll, menu, fixer)
     if (menu) {
         const actionable = menuRegistry.filter(({ name, isActionable }) => cm.hasPreference(name) && isActionable(cm)), fixable = new Set(fixer && getDiagnostics(allDiagnostics, main).filter(({ actions }) => actions?.some(({ name }) => name === 'fix'
             || name !== 'Fix: Stylelint' && name.startsWith('Fix:'))).map(({ message }) => / \(([^()]+)\)$/u.exec(message)?.[1])
-            .filter(Boolean));
+            .filter(message => message !== undefined));
         if (actionable.length === 0 && fixable.size === 0) {
             toggleClass(classList, false);
             return;

package/dist/token.d.ts

@@ -81,7 +81,8 @@ declare class MediaWikiData {
     firstMultiLetterWord: number | null;
     firstSpace: number | null;
     readonly tags: string[];
-    constructor(tags: string[]);
+    readonly urlProtocols: RegExp;
+    constructor(tags: string[], urlProtocols: string);
 }
 /** Adapted from the original CodeMirror 5 stream parser by Pavel Astakhov */
 export declare class MediaWiki {

package/dist/token.js

@@ -44,8 +44,9 @@ import { decodeHTML } from '@bhsd/browser';
 import { otherParserFunctions } from '@bhsd/cm-util';
 import { htmlTags, voidHtmlTags, selfClosingTags, tokenTable, tokens } from './config';
 class MediaWikiData {
-    constructor(tags) {
+    constructor(tags, urlProtocols) {
         this.tags = tags.includes('translate') ? tags.filter(tag => tag !== 'tvar') : tags;
+        this.urlProtocols = new RegExp(String.raw `^(${this.tags.includes('tvar') ? '<tvar name=[^>]+>' : ''})?${urlProtocols}`, 'iu');
         this.firstSingleLetterWord = null;
         this.firstMultiLetterWord = null;
         this.firstSpace = null;
@@ -84,7 +85,7 @@ const simpleToken = (stream, state) => {
     const style = state.tokenize(stream, state);
     return Array.isArray(style) ? style[0] : style;
 };
-const startState = (tokenize, tags, sof = false) => ({
+const startState = (tokenize, tags, urlProtocols, sof = false) => ({
     tokenize,
     stack: [],
     inHtmlTag: [],
@@ -103,7 +104,7 @@ const startState = (tokenize, tags, sof = false) => ({
     sof,
     redirect: false,
     imgLink: false,
-    data: new MediaWikiData(tags),
+    data: new MediaWikiData(tags, `(${urlProtocols.source.slice(4)}`),
 });
 /**
  * 复制 StreamParser 状态
@@ -732,10 +733,15 @@ let MediaWiki = (() => {
                             }
                         }
                         else {
-                            const mt = stream.match(this.urlProtocols, false);
+                            const mt = stream.match(state.data.urlProtocols, false);
                             if (mt) {
                                 state.nExtLink++;
-                                chain(state, this.eatExternalLinkProtocol(mt[0], false));
+                                if (mt[1]) {
+                                    chain(state, this.inChars('<', 'extTagBracket'), this.eatTagName('tvar'), this.inExternalLink(true));
+                                }
+                                else {
+                                    chain(state, this.eatExternalLinkProtocol(mt[2], false));
+                                }
                                 return makeLocalTagStyle('extLinkBracket', state);
                             }
                         }
@@ -1697,7 +1703,7 @@ let MediaWiki = (() => {
          */
         mediawiki(tags) {
             return {
-                startState: () => startState(this.eatWikiText(''), tags ?? this.tags, tags === undefined),
+                startState: () => startState(this.eatWikiText(''), tags ?? this.tags, this.urlProtocols, tags === undefined),
                 copyState,
                 token(stream, state) {
                     const { data } = state, { readyTokens } = data;
@@ -1895,7 +1901,7 @@ let MediaWiki = (() => {
         }
         'text/pre'() {
             return {
-                startState: () => startState(this.inPre(), []),
+                startState: () => startState(this.inPre(), [], this.urlProtocols),
                 token: simpleToken,
             };
         }
@@ -1926,19 +1932,19 @@ let MediaWiki = (() => {
         }
         'text/references'(tags) {
             return {
-                startState: () => startState(this.inNested('ref'), tags),
+                startState: () => startState(this.inNested('ref'), tags, this.urlProtocols),
                 token: simpleToken,
             };
         }
         'text/choose'(tags) {
             return {
-                startState: () => startState(this.inNested('option'), tags),
+                startState: () => startState(this.inNested('option'), tags, this.urlProtocols),
                 token: simpleToken,
             };
         }
         'text/combobox'(tags) {
             return {
-                startState: () => startState(this.inNested('combooption'), tags),
+                startState: () => startState(this.inNested('combooption'), tags, this.urlProtocols),
                 token: simpleToken,
             };
         }
@@ -1955,7 +1961,7 @@ let MediaWiki = (() => {
         }
         'text/inputbox'() {
             return {
-                startState: () => startState(this.inInputbox, []),
+                startState: () => startState(this.inInputbox, [], this.urlProtocols),
                 token: simpleToken,
             };
         }
@@ -1982,10 +1988,10 @@ let MediaWiki = (() => {
         }
         'text/gallery'(tags) {
             return {
-                startState: () => startState(this.inGallery(), tags),
+                startState: () => startState(this.inGallery(), tags, this.urlProtocols),
                 token: (stream, state) => {
                     if (stream.sol()) {
-                        Object.assign(state, startState(this.inGallery(), state.data.tags));
+                        Object.assign(state, startState(this.inGallery(), state.data.tags, this.urlProtocols));
                     }
                     return simpleToken(stream, state);
                 },