wikiparser-node 1.18.2 → 1.18.4

package/dist/util/debug.js

@@ -37,7 +37,14 @@ exports.isToken = isToken;
  * @param inserted 插入的子节点
  */
 const setChildNodes = (parent, position, deleteCount, inserted = []) => {
-    const nodes = parent.getChildNodes(), removed = nodes.splice(position, deleteCount, ...inserted);
+    let nodes = parent.getChildNodes(), removed;
+    if (nodes.length === deleteCount) {
+        removed = nodes;
+        nodes = inserted;
+    }
+    else {
+        removed = nodes.splice(position, deleteCount, ...inserted);
+    }
     for (let i = 0; i < inserted.length; i++) {
         const node = inserted[i];
         node.setAttribute('parentNode', parent);
@@ -46,8 +53,8 @@ const setChildNodes = (parent, position, deleteCount, inserted = []) => {
     }
     nodes[position - 1]?.setAttribute('nextSibling', nodes[position]);
     nodes[position + inserted.length]?.setAttribute('previousSibling', nodes[position + inserted.length - 1]);
-    /* NOT FOR BROWSER */
     parent.setAttribute('childNodes', nodes);
+    /* NOT FOR BROWSER */
     for (const node of removed) {
         node.setAttribute('parentNode', undefined);
     }
@@ -84,7 +91,7 @@ const undo = (e, data) => {
             (0, exports.setChildNodes)(target.parentNode, data.position, 1, [data.oldToken]);
             break;
         case 'text':
-            target.replaceData(data.oldText);
+            target.setAttribute('data', data.oldText);
             break;
         /* istanbul ignore next */
         default:

package/dist/util/diff.js

@@ -31,7 +31,7 @@ const cmd = (command, args) => new Promise(resolve => {
         shell = (0, child_process_1.spawn)(command, args);
         timer = setTimeout(() => {
             shell.kill('SIGINT');
-        }, 60 * 1000);
+        }, 60 * 1e3);
         let buf = '';
         shell.stdout.on('data', data => {
             buf += String(data);

package/dist/util/string.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeCommentLine = exports.newline = exports.sanitizeAlt = exports.sanitizeId = exports.sanitizeAttr = exports.sanitize = exports.normalizeSpace = exports.encode = exports.print = exports.escape = exports.noWrap = exports.decodeNumber = exports.decodeHtml = exports.text = exports.escapeRegExp = exports.removeComment = exports.tidy = exports.extUrlChar = exports.extUrlCharFirst = exports.zs = exports.rawurldecode = void 0;
+exports.removeCommentLine = exports.newline = exports.sanitizeAlt = exports.sanitizeId = exports.sanitizeAttr = exports.sanitize = exports.normalizeSpace = exports.encode = exports.print = exports.escape = exports.noWrap = exports.decodeNumber = exports.decodeHtml = exports.decodeHtmlBasic = exports.text = exports.escapeRegExp = exports.removeComment = exports.tidy = exports.extUrlChar = exports.extUrlCharFirst = exports.zs = exports.rawurldecode = void 0;
 var common_1 = require("@bhsd/common");
 Object.defineProperty(exports, "rawurldecode", { enumerable: true, get: function () { return common_1.rawurldecode; } });
 exports.zs = String.raw ` \xA0\u1680\u2000-\u200A\u202F\u205F\u3000`;
@@ -27,9 +27,8 @@ exports.escapeRegExp = factory(/[\\{}()|.?*+^$[\]]/gu, String.raw `\$&`);
 const text = (childNodes, separator = '') => childNodes.map(child => typeof child === 'string' ? child : child.text()).join(separator);
 exports.text = text;
 const names = { lt: '<', gt: '>', lbrack: '[', rbrack: ']', lbrace: '{', rbrace: '}', nbsp: ' ', amp: '&', quot: '"' };
-/* istanbul ignore next */
 /** decode HTML entities */
-const decodeHtmlBasic = factory(/&(?:#(\d+|[Xx][\da-fA-F]+)|([lg]t|[LG]T|[lr]brac[ke]|nbsp|amp|AMP|quot|QUOT));/gu, (_, code, name) => code
+exports.decodeHtmlBasic = factory(/&(?:#(\d+|[Xx][\da-fA-F]+)|([lg]t|[LG]T|[lr]brac[ke]|nbsp|amp|AMP|quot|QUOT));/gu, (_, code, name) => code
     ? String.fromCodePoint(Number((/^x/iu.test(code) ? '0' : '') + code))
     : names[name.toLowerCase()]);
 /**
@@ -48,7 +47,7 @@ const decodeHtml = (str) => {
     }
     /* istanbul ignore next */
     /* NOT FOR BROWSER ONLY END */
-    return decodeHtmlBasic(str);
+    return (0, exports.decodeHtmlBasic)(str);
 };
 exports.decodeHtml = decodeHtml;
 /** decode numbered HTML entities */
@@ -85,7 +84,7 @@ exports.encode = factory(/[<>[\]#|=]+/gu, encodeURIComponent);
 const normalizeSpace = (token) => {
     if (token) {
         for (const child of token.childNodes) {
-            if (child.type === 'text') {
+            if (child.type === 'text' && child.data.includes('\n')) {
                 child.replaceData(child.data.replace(/\n+/gu, ' '));
             }
         }

package/extensions/dist/base.js

@@ -1,6 +1,6 @@
 (() => {
 var _a;
-const version = '1.18.2', 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.18.4', 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 = () => {
@@ -221,7 +221,7 @@ const splitNewLine = (html) => {
 };
 const getGutter = (container) => container.querySelector('.wikiparser-line-numbers');
 const size = (html) => {
-    const container = html.parentElement, gutter = getGutter(container);
+    const container = html.parentElement, { isContentEditable } = html, { clientHeight } = container, gutter = getGutter(container);
     if (!gutter) {
         intersectionObserver.unobserve(html);
         return;
@@ -230,6 +230,9 @@ const size = (html) => {
     const start = Number(html.dataset['start'] || 1), lines = splitNewLine(html), width = `${String(lines.length + start - 1).length + 1.5}ch`;
     html.style.marginLeft = width;
     gutter.style.width = width;
+    if (isContentEditable) {
+        gutter.style.minHeight = `${clientHeight + 1}px`;
+    }
     const sizer = document.createElement('span'), { style: { paddingLeft, paddingRight } } = html;
     sizer.className = 'wikiparser-sizer';
     sizer.style.paddingLeft = paddingLeft;
@@ -250,11 +253,10 @@ const size = (html) => {
         lastTop = top;
     }
     if (line) {
-        const noScroll = html.offsetHeight <= container.clientHeight;
-        if (html.isContentEditable) {
-            line.style.height = `${container.clientHeight}px`;
+        if (isContentEditable) {
+            line.style.height = `${clientHeight}px`;
         }
-        else if (noScroll) {
+        else if (html.offsetHeight <= clientHeight) {
             line.style.height = `${container.getBoundingClientRect().top + container.scrollHeight - lastTop}px`;
             container.style.overflowY = 'hidden';
         }

package/extensions/dist/lint.js

@@ -54,7 +54,7 @@ class Linter {
     async monaco(wikitext) {
         return (await this.queue(wikitext))
             .map(({ startLine, startCol, endLine, endCol, severity, message, rule }) => ({
-            source: `WikiLint`,
+            source: 'WikiLint',
             startLineNumber: startLine + 1,
             startColumn: startCol + 1,
             endLineNumber: endLine + 1,

package/extensions/es7/base.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var _a;
-const version = '1.18.2', 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.18.4', 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 = () => {
@@ -230,7 +230,7 @@ const splitNewLine = (html) => {
 };
 const getGutter = (container) => container.querySelector('.wikiparser-line-numbers');
 const size = (html) => {
-    const container = html.parentElement, gutter = getGutter(container);
+    const container = html.parentElement, { isContentEditable } = html, { clientHeight } = container, gutter = getGutter(container);
     if (!gutter) {
         intersectionObserver.unobserve(html);
         return;
@@ -239,6 +239,9 @@ const size = (html) => {
     const start = Number(html.dataset['start'] || 1), lines = splitNewLine(html), width = `${String(lines.length + start - 1).length + 1.5}ch`;
     html.style.marginLeft = width;
     gutter.style.width = width;
+    if (isContentEditable) {
+        gutter.style.minHeight = `${clientHeight + 1}px`;
+    }
     const sizer = document.createElement('span'), { style: { paddingLeft, paddingRight } } = html;
     sizer.className = 'wikiparser-sizer';
     sizer.style.paddingLeft = paddingLeft;
@@ -259,11 +262,10 @@ const size = (html) => {
         lastTop = top;
     }
     if (line) {
-        const noScroll = html.offsetHeight <= container.clientHeight;
-        if (html.isContentEditable) {
-            line.style.height = `${container.clientHeight}px`;
+        if (isContentEditable) {
+            line.style.height = `${clientHeight}px`;
         }
-        else if (noScroll) {
+        else if (html.offsetHeight <= clientHeight) {
             line.style.height = `${container.getBoundingClientRect().top + container.scrollHeight - lastTop}px`;
             container.style.overflowY = 'hidden';
         }

package/extensions/es7/lint.js

@@ -68,7 +68,7 @@ class Linter {
         return __awaiter(this, void 0, void 0, function* () {
             return (yield this.queue(wikitext))
                 .map(({ startLine, startCol, endLine, endCol, severity, message, rule }) => ({
-                source: `WikiLint`,
+                source: 'WikiLint',
                 startLineNumber: startLine + 1,
                 startColumn: startCol + 1,
                 endLineNumber: endLine + 1,

package/extensions/ui.css

@@ -1 +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}.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}
+.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-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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.18.2",
+	"version": "1.18.4",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",
@@ -62,7 +62,7 @@
 		"test:unit": "mocha dist/test/test.js",
 		"test:clonenode": "CLONENODE=1 npm run test:unit",
 		"test:parser": "mocha dist/test/parserTests.js",
-		"test": "npm run test:unit && npm run test:parser",
+		"test": "npm run test:unit && npm run test:clonenode && npm run test:parser",
 		"test:end": "pkill -x http-server",
 		"test:real": "node dist/test/real.js"
 	},
@@ -77,7 +77,7 @@
 		]
 	},
 	"dependencies": {
-		"@bhsd/common": "^0.8.1",
+		"@bhsd/common": "^0.9.1",
 		"vscode-languageserver-types": "^3.17.5"
 	},
 	"optionalDependencies": {