wikiparser-node 1.16.3 → 1.16.5

package/extensions/es7/base.js

@@ -9,12 +9,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var _a;
-const version = '1.16.3', src = (_a = document.currentScript) === null || _a === void 0 ? void 0 : _a.src, file = /\/extensions\/dist\/base\.(?:min\.)?js$/u, CDN = src && file.test(src)
+const version = '1.16.5', src = (_a = document.currentScript) === null || _a === void 0 ? void 0 : _a.src, file = /\/extensions\/dist\/base\.(?:min\.)?js$/u, CDN = src && file.test(src)
     ? src.replace(file, '')
     : `https://testingcf.jsdelivr.net/npm/wikiparser-node@${version}`;
 const workerJS = () => {
     importScripts('$CDN/bundle/bundle.es7.js');
-    const entities = { '&': 'amp', '<': 'lt', '>': 'gt' }, lsps = new Map();
+    const entities = { '&': 'amp', '<': 'lt', '>': 'gt' }, lsps = new Map(), last = { include: true };
+    const parse = (wikitext, include = false, stage) => {
+        if (stage === undefined && last.wikitext === wikitext && last.include === include) {
+            return last.root;
+        }
+        const root = Parser.parse(wikitext, include, stage);
+        if (stage === undefined) {
+            last.wikitext = wikitext;
+            last.include = include;
+            last.root = root;
+        }
+        return root;
+    };
     const getLSP = (qid, signature) => {
         let id = Math.floor(qid);
         if (signature) {
@@ -35,10 +47,12 @@ const workerJS = () => {
                 parseInt(short ? s.charAt(1).repeat(2) : s.slice(1, 3), 16),
                 parseInt(short ? s.charAt(2).repeat(2) : s.slice(3, 5), 16),
                 parseInt(short ? s.charAt(3).repeat(2) : s.slice(5, 7), 16),
-                parseInt((short ? s.charAt(4).repeat(2) : s.slice(7, 9)) || 'ff', 16) / 255,
+                parseInt((short ? s.charAt(4).repeat(2) : s.slice(7, 9)) || 'ff', 16)
+                    / 255,
             ];
         }
-        const values = s.slice(s.indexOf('(') + 1, -1).trim().split(/\s+(?:[,/]\s*)?|[,/]\s*/u)
+        const values = s.slice(s.indexOf('(') + 1, -1).trim()
+            .split(/\s+(?:[,/]\s*)?|[,/]\s*/u)
             .map(v => parseFloat(v) / (v.endsWith('%') ? 100 : 1));
         return [
             values[0],
@@ -55,20 +69,21 @@ const workerJS = () => {
                 break;
             case 'setConfig':
                 Parser.config = qid;
+                delete last.wikitext;
                 break;
             case 'getConfig':
                 postMessage([qid, Parser.getConfig()]);
                 break;
             case 'json':
-                postMessage([qid, Parser.parse(wikitext, include, stage).json()]);
+                postMessage([qid, parse(wikitext, include, stage).json()]);
                 break;
             case 'lint':
-                postMessage([qid, Parser.parse(wikitext, include).lint(), wikitext]);
+                postMessage([qid, parse(wikitext, include).lint(), wikitext]);
                 break;
             case 'print':
                 postMessage([
                     qid,
-                    Parser.parse(wikitext, include, stage).childNodes.map(child => [
+                    parse(wikitext, include, stage).childNodes.map(child => [
                         stage !== null && stage !== void 0 ? stage : Infinity,
                         String(child),
                         child.type === 'text'
@@ -194,7 +209,9 @@ const splitNewLine = (html) => {
             cur.append(child.cloneNode(true));
             continue;
         }
-        const lines = child.nodeType === Node.TEXT_NODE ? textContent.split('\n') : splitNewLine(child);
+        const lines = child.nodeType === Node.TEXT_NODE
+            ? textContent.split('\n')
+            : splitNewLine(child);
         append(cur, lines[0]);
         for (const text of lines.slice(1)) {
             cur = html.cloneNode();

package/extensions/ui.css

@@ -1,162 +1 @@
-.wikiparse-container {
-	position: relative;
-	-webkit-text-size-adjust: none;
-}
-.wikiparser {
-	white-space: pre-wrap;
-	overflow-wrap: break-word;
-	word-break: break-all;
-	font-family: monospace;
-	border: 1.5px solid #dedede;
-	background-color: #fff;
-}
-/* wikiparse.highlight或wikiparse.codejar */
-.wikiparser.wikiparse-container {
-	padding: 4px 0;
-	overflow-y: auto;
-}
-.wikiparse-container > .wpb-root {
-	padding: 0 6px;
-	display: block;
-	position: relative;
-	overflow-y: hidden !important;
-}
-
-.wikiparser-line-numbers {
-	position: absolute;
-	top: 0;
-	left: 0;
-	display: inline-block;
-	background-color: #f5f5f5;
-	color: #6c6c6c;
-	border-right: 1px solid #ddd;
-	padding: 4px 0;
-}
-.wikiparser-line-numbers > span {
-	display: inline-block;
-	width: calc(100% - .5ch);
-	text-align: right;
-}
-.wikiparser-sizer {
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	visibility: hidden;
-	z-index: -1;
-	padding: 0 6px;
-}
-.wpb-root[contenteditable] > .wikiparser-sizer {
-	overflow-y: scroll;
-}
-
-.wpb-table-inter {
-	color: #d73333;
-	font-weight: normal;
-	text-decoration: underline wavy 1px;
-}
-
-.wpb-hidden, .wpb-noinclude, .wpb-include, .wpb-comment, .wpb-attr-dirty {
-	color: #7b8c8f;
-	font-weight: normal;
-	font-style: italic;
-}
-
-.wpb-ext, .wpb-html {
-	color: #14866d;
-	font-weight: bold;
-}
-.wpb-ext-attrs, .wpb-html-attrs {
-	font-weight: normal;
-}
-.wpb-ext-attr > .wpb-attr-value, .wpb-html-attr > .wpb-attr-value {
-	color: #179b1c;
-}
-.wpb-ext-inner {
-	color: initial;
-	font-weight: normal;
-	background-color: rgba(0, 0, 0, .03);
-}
-
-.wpb-arg {
-	color: #ac6600;
-	font-weight: bold;
-}
-.wpb-arg-default {
-	color: #ad9300;
-	font-weight: normal;
-}
-
-.wpb-template {
-	color: #80c;
-	font-weight: bold;
-	background-color: rgba(119, 0, 170, .03);
-}
-.wpb-magic-word {
-	color: #a11;
-	font-weight: bold;
-	background-color: rgba(170, 17, 17, .03);
-}
-.wpb-invoke-module, .wpb-invoke-function {
-	color: #bf3e13;
-	font-weight: normal;
-}
-.wpb-parameter {
-	font-weight: normal;
-}
-.wpb-template > .wpb-parameter,
-.wpb-invoke-function ~ .wpb-parameter {
-	color: #b0c;
-}
-.wpb-parameter-value {
-	color: initial;
-}
-
-.wpb-heading, .wpb-image-parameter {
-	color: #0076dd;
-}
-.wpb-heading-title {
-	color: initial;
-	font-weight: bold;
-}
-
-.wpb-table, .wpb-tr, .wpb-td {
-	color: #d08;
-	font-weight: bold;
-}
-.wpb-table-attrs {
-	font-weight: normal;
-}
-.wpb-table-attr > .wpb-attr-value {
-	color: #f500d4;
-}
-.wpb-td-inner {
-	color: initial;
-	font-weight: normal;
-}
-
-.wpb-double-underscore, .wpb-hr, .wpb-quote, .wpb-list, .wpb-dd, .wpb-redirect-syntax {
-	color: #0076dd;
-	font-weight: bold;
-	background-color: #eee;
-}
-
-.wpb-link, .wpb-category, .wpb-file, .wpb-gallery-image, .wpb-imagemap-image, .wpb-redirect-target,
-.wpb-ext-link, .wpb-free-ext-link, .wpb-magic-link {
-	color: #000aaa;
-	background-color: rgba(34, 17, 153, .03);
-}
-.wpb-link-text, .wpb-image-caption, .wpb-ext-link-text {
-	color: initial;
-}
-
-.wpb-converter {
-	color: #b68;
-	font-weight: bold;
-}
-.wpb-converter-rule {
-	font-weight: normal;
-}
-.wpb-converter-rule-from, .wpb-converter-rule-to, .wpb-converter-noconvert {
-	color: initial;
-}
+.wikiparse-container{position:relative;-webkit-text-size-adjust:none}.wikiparser{white-space:pre-wrap;overflow-wrap:break-word;word-break:break-all;font-family:monospace;border:1.5px solid #dedede;background-color:#fff}.wikiparser.wikiparse-container{padding:4px 0;overflow-y:auto}.wikiparse-container>.wpb-root{padding:0 6px;display:block;position:relative;overflow-y:hidden!important}.wikiparser-line-numbers{position:absolute;top:0;left:0;display:inline-block;background-color:#f5f5f5;color:#6c6c6c;border-right:1px solid #ddd;padding:4px 0}.wikiparser-line-numbers>span{display:inline-block;width:calc(100% - .5ch);text-align:right}.wikiparser-sizer{position:absolute;top:0;left:0;right:0;visibility:hidden;z-index:-1;padding:0 6px}.wpb-root[contenteditable]>.wikiparser-sizer{overflow-y:scroll}.wpb-table-inter{color:#d73333;font-weight:400;text-decoration:underline wavy 1px}.wpb-hidden,.wpb-noinclude,.wpb-include,.wpb-comment,.wpb-attr-dirty{color:#7b8c8f;font-weight:400;font-style:italic}.wpb-ext,.wpb-html{color:#14866d;font-weight:700}.wpb-ext-attrs,.wpb-html-attrs{font-weight:400}.wpb-ext-attr>.wpb-attr-value,.wpb-html-attr>.wpb-attr-value{color:#179b1c}.wpb-ext-inner{color:initial;font-weight:400;background-color:#00000008}.wpb-arg{color:#ac6600;font-weight:700}.wpb-arg-default{color:#ad9300;font-weight:400}.wpb-template{color:#80c;font-weight:700;background-color:#7700aa08}.wpb-magic-word{color:#a11;font-weight:700;background-color:#aa111108}.wpb-invoke-module,.wpb-invoke-function{color:#bf3e13;font-weight:400}.wpb-parameter{font-weight:400}.wpb-template>.wpb-parameter,.wpb-invoke-function~.wpb-parameter{color:#b0c}.wpb-parameter-value{color:initial}.wpb-heading,.wpb-image-parameter{color:#0076dd}.wpb-heading-title{color:initial;font-weight:700}.wpb-table,.wpb-tr,.wpb-td{color:#d08;font-weight:700}.wpb-table-attrs{font-weight:400}.wpb-table-attr>.wpb-attr-value{color:#f500d4}.wpb-td-inner{color:initial;font-weight:400}.wpb-double-underscore,.wpb-hr,.wpb-quote,.wpb-list,.wpb-dd,.wpb-redirect-syntax{color:#0076dd;font-weight:700;background-color:#eee}.wpb-link,.wpb-category,.wpb-file,.wpb-gallery-image,.wpb-imagemap-image,.wpb-redirect-target,.wpb-ext-link,.wpb-free-ext-link,.wpb-magic-link{color:#000aaa;background-color:#22119908}.wpb-link-text,.wpb-image-caption,.wpb-ext-link-text{color:initial}.wpb-converter{color:#b68;font-weight:700}.wpb-converter-rule{font-weight:400}.wpb-converter-rule-from,.wpb-converter-rule-to,.wpb-converter-noconvert{color:initial}

package/i18n/zh-hans.json

@@ -42,7 +42,7 @@
 	"obsolete attribute": "过时的属性",
 	"obsolete HTML tag": "过时的HTML标签",
 	"quotes": "引号",
-	"section header in a HTML tag": "HTML标签属性中的段落标题",
+	"section header in an HTML tag": "HTML标签属性中的段落标题",
 	"table": "表格",
 	"tag that is both closing and self-closing": "同时闭合和自封闭的标签",
 	"template in an internal link target": "内链目标包含模板",

package/i18n/zh-hant.json

@@ -42,7 +42,7 @@
 	"obsolete attribute": "過時的屬性",
 	"obsolete HTML tag": "過時的HTML標籤",
 	"quotes": "引號",
-	"section header in a HTML tag": "HTML標籤屬性中的段落標題",
+	"section header in an HTML tag": "HTML標籤屬性中的段落標題",
 	"table": "表格",
 	"tag that is both closing and self-closing": "同時閉合和自封閉的標籤",
 	"template in an internal link target": "內部連結目標包含模板",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.16.3",
+	"version": "1.16.5",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",
@@ -20,7 +20,7 @@
 		"/extensions/*.css",
 		"!/extensions/dist/gh-page.js",
 		"!/extensions/gh-page.css",
-		"!/extensions/dist/parserTests.js",
+		"!/extensions/dist/test-page.js",
 		"!/extensions/test-page.css",
 		"!/extensions/dist/compare.js",
 		"!/extensions/compare.css",
@@ -71,7 +71,7 @@
 		]
 	},
 	"dependencies": {
-		"@bhsd/common": "^0.6.4",
+		"@bhsd/common": "^0.6.6",
 		"@codemirror/lint": "^6.8.4",
 		"chalk": "^4.1.2",
 		"codejar-async": "^4.2.6",

package/extensions/dist/test-page.js

@@ -1,89 +0,0 @@
-(() => {
-"use strict";
-(async () => {
-    const tests = await (await fetch('./test/parserTests.json')).json(), key = 'wikiparser-node-done', dones = new Set(JSON.parse(localStorage.getItem(key))), isGH = location.hostname.endsWith('.github.io'), isIframe = self !== top, select = document.querySelector('select'), btn = document.querySelector('button'), pre = document.querySelector('pre'), container = document.getElementById('frame'), container1 = document.getElementById('frame1'), container2 = document.getElementById('frame2');
-    Parser.config = await (await fetch('./config/default.json')).json();
-    wikiparse.print = (wikitext, include, stage) => {
-        const printed = Parser.parse(wikitext, include, stage).print();
-        return Promise.resolve([[stage !== null && stage !== void 0 ? stage : Infinity, wikitext, printed]]);
-    };
-    wikiparse.highlight(pre, false, true);
-    btn.disabled = !select.value;
-    if (!isGH) {
-        btn.style.display = '';
-    }
-    let optgroup;
-    for (const [i, { desc, wikitext, html }] of tests.entries()) {
-        if (wikitext === undefined) {
-            optgroup = document.createElement('optgroup');
-            optgroup.label = desc;
-            select.append(optgroup);
-        }
-        else if ((isIframe || html !== undefined) && (isGH || !dones.has(desc))) {
-            const option = document.createElement('option');
-            option.value = String(i);
-            option.textContent = desc;
-            optgroup.append(option);
-        }
-    }
-    select.addEventListener('change', () => {
-        const { wikitext, html, render, desc } = tests[Number(select.value)];
-        pre.textContent = wikitext;
-        pre.classList.remove('wikiparser');
-        container.removeAttribute('data-source');
-        if (html === undefined) {
-            container.style.display = 'none';
-        }
-        else {
-            container.style.display = '';
-            container1.innerHTML = html;
-            container2.innerHTML = render !== null && render !== void 0 ? render : '';
-        }
-        wikiparse.highlight(pre, false, true);
-        select.selectedOptions[0].disabled = true;
-        btn.disabled = false;
-        history.replaceState(null, '', `#${encodeURIComponent(desc)}`);
-        dispatchEvent(new Event('casechange'));
-    });
-    btn.addEventListener('click', () => {
-        dones.add(tests[Number(select.value)].desc);
-        localStorage.setItem(key, JSON.stringify([...dones]));
-        while (select.selectedOptions[0].disabled) {
-            select.selectedIndex++;
-        }
-        select.dispatchEvent(new Event('change'));
-    });
-    container.addEventListener('click', e => {
-        e.preventDefault();
-    }, { capture: true });
-    container.addEventListener('dblclick', e => {
-        e.preventDefault();
-        if (container.dataset['source']) {
-            container.removeAttribute('data-source');
-            container1.innerHTML = container1.textContent;
-            container2.innerHTML = container2.textContent;
-        }
-        else {
-            container.dataset['source'] = '1';
-            const pre1 = document.createElement('pre'), pre2 = document.createElement('pre'), code1 = document.createElement('code'), code2 = document.createElement('code');
-            code1.textContent = container1.innerHTML;
-            code2.textContent = container2.innerHTML;
-            pre1.className = 'language-html';
-            pre2.className = 'language-html';
-            pre1.append(code1);
-            pre2.append(code2);
-            container1.replaceChildren(pre1);
-            container2.replaceChildren(pre2);
-            Prism.highlightAllUnder(container);
-        }
-    });
-    addEventListener('hashchange', () => {
-        const hash = decodeURIComponent(location.hash.slice(1)), i = tests.findIndex(({ desc }) => desc === hash);
-        if (i !== -1) {
-            select.value = String(i);
-            select.dispatchEvent(new Event('change'));
-        }
-    });
-    dispatchEvent(new Event('hashchange'));
-})();
-})();