@bhsd/codemirror-mediawiki 2.0.15 → 2.1.1

package/dist/mediawiki.d.ts

@@ -12,6 +12,7 @@ export interface MwConfig {
     doubleUnderscore: [Record<string, unknown>, Record<string, unknown>];
     variants?: string[];
     img?: Record<string, string>;
+    nsid: Record<string, number>;
 }
 /**
  * Gets a LanguageSupport instance for the MediaWiki mode.

package/mediawiki.css

@@ -38,7 +38,6 @@
 .cm-mw-skipformatting {
 	background-color: #adf;
 }
-.cm-mw-indenting,
 .cm-mw-list {
 	color: #08f;
 	font-weight: bold;
@@ -105,12 +104,6 @@
 .cm-mw-extlink,
 .cm-mw-free-extlink {
 	color: #36c;
-}
-.cm-mw-link-pagename:not(.cm-mw-strong),
-.cm-mw-link-bracket,
-.cm-mw-link-delimiter,
-.cm-mw-extlink:not(.cm-mw-strong),
-.cm-mw-free-extlink:not(.cm-mw-strong) {
 	font-weight: normal;
 }
 .cm-mw-link,

package/mw/dist/base.js

@@ -1,16 +1,16 @@
-import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror-mediawiki@2.0.15/dist/main.min.js';
+import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror-mediawiki@2.1.1/dist/main.min.js';
 (() => {
     var _a;
-    mw.loader.load('https://testingcf.jsdelivr.net/npm/@bhsd/codemirror-mediawiki@2.0.15/mediawiki.min.css', 'text/css');
+    mw.loader.load('https://testingcf.jsdelivr.net/npm/@bhsd/codemirror-mediawiki@2.1.1/mediawiki.min.css', 'text/css');
     const instances = new WeakMap();
     $.valHooks['textarea'] = {
         get(elem) {
             const cm = instances.get(elem);
-            return cm ? cm.view.state.doc.toString() : elem.value;
+            return (cm === null || cm === void 0 ? void 0 : cm.visible) ? cm.view.state.doc.toString() : elem.value;
         },
         set(elem, value) {
             const cm = instances.get(elem);
-            if (cm) {
+            if (cm === null || cm === void 0 ? void 0 : cm.visible) {
                 cm.view.dispatch({
                     changes: { from: 0, to: cm.view.state.doc.length, insert: value },
                 });
@@ -78,7 +78,10 @@ import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror
         }
         const isIPE = config && Object.values(config.functionSynonyms[0]).includes(true);
         if (config && config.img && config.variants && !isIPE) {
-            return config;
+            return {
+                ...config,
+                nsid: mw.config.get('wgNamespaceIds'),
+            };
         }
         const { query: { general: { variants }, magicwords, extensiontags, functionhooks, variables }, } = await new mw.Api().get({
             meta: 'siteinfo',
@@ -126,6 +129,7 @@ import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror
         }
         config.img = getConfig(getAliases(magicwords.filter(({ name }) => name.startsWith('img_'))));
         config.variants = variants ? variants.map(({ code }) => code) : [];
+        config.nsid = mw.config.get('wgNamespaceIds');
         mw.config.set('extCodeMirrorConfig', config);
         ALL_SETTINGS_CACHE[SITE_ID] = { config: config, time: Date.now() };
         localStorage.setItem('InPageEditMwConfig', JSON.stringify(ALL_SETTINGS_CACHE));
@@ -135,20 +139,32 @@ import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror
     class CodeMirror extends CodeMirror6 {
         constructor(textarea, lang, config) {
             super(textarea, lang, config);
+            this.visible = true;
             instances.set(textarea, this);
             if (mw.loader.getState('jquery.textSelection') === 'ready') {
                 $(textarea).data('jquery.textSelection', textSelection);
             }
         }
+        toggle(show = !this.visible) {
+            if (show && !this.visible) {
+                this.view.dispatch({
+                    changes: { from: 0, to: this.view.state.doc.length, insert: this.textarea.value },
+                });
+            }
+            this.visible = show;
+            this.view.dom.style.setProperty('display', show ? '' : 'none', 'important');
+            this.textarea.style.display = show ? 'none' : '';
+            $(this.textarea).data('jquery.textSelection', show && textSelection);
+        }
         async defaultLint(on) {
             if (!on) {
-                super.lint();
+                this.lint();
                 return;
             }
             const { lang } = this;
             if (!(lang in linters)) {
                 linters[lang] = await this.getLinter();
-                if (this.lang === 'mediawiki') {
+                if (this.lang === 'mediawiki' || this.lang === 'html') {
                     const mwConfig = await getMwConfig(), config = {
                         ...await wikiparse.getConfig(),
                         ext: Object.keys(mwConfig.tags),
@@ -156,7 +172,7 @@ import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror
                         nsid: mw.config.get('wgNamespaceIds'),
                         doubleUnderscore: mwConfig.doubleUnderscore.map(obj => Object.keys(obj).map(s => s.slice(2, -2))),
                         variants: mwConfig.variants,
-                        protocol: mwConfig.urlProtocols,
+                        protocol: mwConfig.urlProtocols.replace(/\\:/gu, ':'),
                     };
                     [config.parserFunction[0]] = mwConfig.functionSynonyms;
                     config.parserFunction[1] = [
@@ -169,23 +185,49 @@ import { CodeMirror6 } from 'https://testingcf.jsdelivr.net/npm/@bhsd/codemirror
                     wikiparse.setConfig(config);
                 }
             }
-            super.lint(linters[lang]);
+            this.lint(linters[lang]);
         }
         static async fromTextArea(textarea, lang) {
-            const cm = new CodeMirror(textarea, lang === 'mediawiki' ? undefined : lang);
-            if (lang === 'mediawiki') {
+            const isWiki = lang === 'mediawiki' || lang === 'html', cm = new CodeMirror(textarea, isWiki ? undefined : lang);
+            if (isWiki) {
                 const config = await getMwConfig();
-                cm.setLanguage('mediawiki', config);
+                cm.setLanguage(lang, config);
             }
             return cm;
         }
     }
-    $(document.body).click(async (e) => {
+    document.body.addEventListener('click', e => {
         if (e.target instanceof HTMLTextAreaElement && (e.ctrlKey || e.metaKey) && !instances.has(e.target)) {
             e.preventDefault();
-            await mw.loader.using('oojs-ui-windows');
-            const lang = await OO.ui.prompt('Language:') || undefined, cm = await CodeMirror.fromTextArea(e.target, lang === null || lang === void 0 ? void 0 : lang.toLowerCase());
-            void cm.defaultLint(true);
+            (async () => {
+                var _a;
+                const { wgAction, wgNamespaceNumber, wgPageContentModel } = mw.config.get();
+                let lang;
+                if (wgAction !== 'edit' && wgAction !== 'submit') {
+                    await mw.loader.using('oojs-ui-windows');
+                    lang = (_a = (await OO.ui.prompt('Language:') || undefined)) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+                }
+                else {
+                    switch (wgPageContentModel) {
+                        case 'css':
+                        case 'sanitized-css':
+                            lang = 'css';
+                            break;
+                        case 'javascript':
+                        case 'json':
+                            lang = 'javascript';
+                            break;
+                        case 'Scribunto':
+                            lang = 'lua';
+                            break;
+                        case 'wikitext':
+                            lang = wgNamespaceNumber === 274 ? 'html' : 'mediawiki';
+                            break;
+                    }
+                }
+                const cm = await CodeMirror.fromTextArea(e.target, lang);
+                void cm.defaultLint(true);
+            })();
         }
     });
     Object.assign(window, { CodeMirror });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bhsd/codemirror-mediawiki",
-	"version": "2.0.15",
+	"version": "2.1.1",
 	"description": "Modified CodeMirror mode based on wikimedia/mediawiki-extensions-CodeMirror",
 	"keywords": [
 		"mediawiki",