wikiparser-node 1.15.0 → 1.15.1

package/dist/src/attribute.d.ts

@@ -3,6 +3,7 @@ import { Token } from './index';
 import { AtomToken } from './atom';
 import type { LintError } from '../base';
 import type { AttributesToken } from '../internal';
+declare type Child = AtomToken | AttributeToken | undefined;
 export type AttributeTypes = 'ext-attr' | 'html-attr' | 'table-attr';
 /**
  * 扩展和HTML标签属性
@@ -15,14 +16,14 @@ export declare abstract class AttributeToken extends Token {
     abstract get firstChild(): AtomToken;
     abstract get lastChild(): Token;
     abstract get parentNode(): AttributesToken | undefined;
-    abstract get nextSibling(): AtomToken | this | undefined;
-    abstract get previousSibling(): AtomToken | this | undefined;
+    abstract get nextSibling(): Child;
+    abstract get previousSibling(): Child;
     abstract get children(): [AtomToken, Token];
     abstract get firstElementChild(): AtomToken;
     abstract get lastElementChild(): Token;
     abstract get parentElement(): AttributesToken | undefined;
-    abstract get nextElementSibling(): AtomToken | this | undefined;
-    abstract get previousElementSibling(): AtomToken | this | undefined;
+    abstract get nextElementSibling(): Child;
+    abstract get previousElementSibling(): Child;
     get type(): AttributeTypes;
     /** 标签名 */
     get tag(): string;
@@ -62,3 +63,4 @@ export declare abstract class AttributeToken extends Token {
      */
     rename(key: string): void;
 }
+export {};

package/dist/src/attributes.js

@@ -28,7 +28,7 @@ try {
     // eslint-disable-next-line prefer-regex-literals, es-x/no-regexp-unicode-property-escapes
     wordRegex = new RegExp(String.raw `[\p{L}\d]`, 'u');
 }
-catch {
+catch /* istanbul ignore next */ {
     wordRegex = /[^\W_]/u;
 }
 /**
@@ -388,9 +388,8 @@ class AttributesToken extends index_2.Token {
     }
     /** @private */
     toHtmlInternal() {
-        return ` ${(0, html_1.html)([
-            ...new Map(this.childNodes.filter(child => child instanceof attribute_1.AttributeToken).map(child => [child.name, child])).values(),
-        ], ' ')}`;
+        const map = new Map(this.childNodes.filter(child => child instanceof attribute_1.AttributeToken).map(child => [child.name, child]));
+        return map.size === 0 ? '' : ` ${(0, html_1.html)([...map.values()], ' ')}`;
     }
 }
 exports.AttributesToken = AttributesToken;

package/dist/src/link/base.js

@@ -48,6 +48,7 @@ class LinkBaseToken extends index_2.Token {
     set interwiki(interwiki) {
         if (isLink(this.type)) {
             const { prefix, main, fragment } = this.#title, link = `${interwiki}:${prefix}${main}${fragment === undefined ? '' : `#${fragment}`}`;
+            /* istanbul ignore if */
             if (interwiki && !this.isInterwiki(link)) {
                 throw new RangeError(`${interwiki} is not a valid interwiki prefix!`);
             }

package/dist/src/link/file.js

@@ -286,10 +286,12 @@ class FileToken extends base_1.LinkBaseToken {
             return;
         }
         const config = this.getAttribute('config'), syntax = key === 'caption' ? '$1' : Object.entries(config.img).find(([, name]) => name === key)?.[0];
+        /* istanbul ignore if */
         if (syntax === undefined) {
             throw new RangeError(`Unknown image parameter: ${key}`);
         }
         const free = syntax.includes('$1');
+        /* istanbul ignore if */
         if (value === true && free) {
             this.typeError('setValue', 'String');
         }
@@ -303,6 +305,7 @@ class FileToken extends base_1.LinkBaseToken {
         parameter.afterBuild();
         this.insertAt(parameter);
     }
+    /* istanbul ignore next */
     /**
      * @override
      * @throws `Error` 不适用于图片

package/dist/src/link/index.js

@@ -52,6 +52,7 @@ class LinkToken extends base_1.LinkBaseToken {
      */
     setLangLink(lang, link) {
         link = link.trim();
+        /* istanbul ignore if */
         if (link.startsWith('#')) {
             throw new SyntaxError('An interlanguage link cannot be fragment only!');
         }
@@ -63,6 +64,7 @@ class LinkToken extends base_1.LinkBaseToken {
      * @throws `RangeError` 空的片段标识符
      */
     asSelfLink(fragment = this.fragment) {
+        /* istanbul ignore if */
         if (!fragment?.trim()) {
             throw new RangeError('LinkToken.asSelfLink method must specify a non-empty fragment!');
         }
@@ -74,6 +76,7 @@ class LinkToken extends base_1.LinkBaseToken {
      */
     pipeTrick() {
         const linkText = this.firstChild.text();
+        /* istanbul ignore if */
         if (linkText.includes('#') || linkText.includes('%')) {
             throw new Error('Pipe trick cannot be used with "#" or "%"!');
         }
@@ -87,13 +90,9 @@ class LinkToken extends base_1.LinkBaseToken {
             this.setLinkText(m2[1]);
             return;
         }
-        const m3 = /^:?(?:[ \w\x80-\xFF-]+:)?(.+?)(?: ?(?<!\()\(.+\))?(?:(?:, |，|، ).|$)/u
+        const m3 = /^:?(?:[ \w\x80-\xFF-]+:)?(.*?)(?: ?(?<!\()\(.+\))?(?:(?:, |，|، ).|$)/u
             .exec(linkText);
-        if (m3) {
-            this.setLinkText(m3[1]);
-            return;
-        }
-        this.setLinkText(linkText);
+        this.setLinkText(m3[1]);
     }
 }
 exports.LinkToken = LinkToken;

package/dist/src/link/redirectTarget.d.ts

@@ -1,7 +1,6 @@
-import Parser from '../../index';
 import { LinkBaseToken } from './base';
 import { NoincludeToken } from '../nowiki/noinclude';
-import type { LintError } from '../../base';
+import type { LintError, Config } from '../../base';
 import type { Title } from '../../lib/title';
 import type { Token, AtomToken } from '../../internal';
 /**
@@ -23,5 +22,5 @@ export declare abstract class RedirectTargetToken extends LinkBaseToken {
      * @param linkText 链接显示文字
      * @param delimiter `|`
      */
-    constructor(link: string, linkText?: string, config?: Parser.Config, accum?: Token[]);
+    constructor(link: string, linkText?: string, config?: Config, accum?: Token[]);
 }

package/dist/src/link/redirectTarget.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedirectTargetToken = void 0;
 const lint_1 = require("../../util/lint");
-const index_1 = require("../../index");
 const base_1 = require("./base");
 const noinclude_1 = require("../nowiki/noinclude");
 /* NOT FOR BROWSER */
@@ -28,7 +27,7 @@ class RedirectTargetToken extends base_1.LinkBaseToken {
      * @param linkText 链接显示文字
      * @param delimiter `|`
      */
-    constructor(link, linkText, config = index_1.default.getConfig(), accum = []) {
+    constructor(link, linkText, config, accum) {
         super(link, undefined, config, accum);
         if (linkText !== undefined) {
             // @ts-expect-error abstract class

package/dist/src/nowiki/comment.js

@@ -111,6 +111,7 @@ let CommentToken = (() => {
         }
         /** @private */
         setText(text) {
+            /* istanbul ignore if */
             if (text.includes('-->')) {
                 throw new RangeError('Do not contain "-->" in the comment!');
             }

package/dist/src/onlyinclude.js

@@ -22,6 +22,7 @@ class OnlyincludeToken extends index_1.Token {
     }
     /** @throws `RangeError` 不允许包含`</onlyinclude>` */
     set innerText(text) {
+        /* istanbul ignore if */
         if (text.includes('</onlyinclude>')) {
             throw new RangeError('"</onlyinclude>" is not allowed in the text!');
         }

package/dist/src/table/index.d.ts

@@ -1,7 +1,6 @@
 import { TrBaseToken } from './trBase';
 import { SyntaxToken } from '../syntax';
 import type { Config, LintError, AST } from '../../base';
-import type { SyntaxBase } from '../../mixin/syntax';
 import type { AttributesToken, TdToken, TrToken, Token } from '../../internal';
 import type { TableCoords } from './trBase';
 import type { TdAttrs, TdSubtypes, TdSpanAttrs } from './td';
@@ -11,8 +10,6 @@ export interface TableRenderedCoords {
     readonly x: number;
     readonly y: number;
 }
-export interface TableToken extends SyntaxBase {
-}
 export type TableTokens = TableToken | TrToken | TdToken;
 /**
  * 是否是行尾

package/dist/src/table/index.js

@@ -211,7 +211,7 @@ class TableToken extends trBase_1.TrBaseToken {
             return this;
             /* NOT FOR BROWSER */
         }
-        else if (n < 0 || n > nRows || n === nRows && !insert) {
+        else /* istanbul ignore if */ if (n < 0 || n > nRows || n === nRows && !insert) {
             throw new RangeError(`The table does not have row ${n}!`);
             /* NOT FOR BROWSER END */
         }
@@ -249,6 +249,7 @@ class TableToken extends trBase_1.TrBaseToken {
     insertAt(token, i = this.length) {
         i += i < 0 ? this.length : 0;
         const previous = this.childNodes[i - 1];
+        /* istanbul ignore else */
         if (typeof token !== 'string' && token.type === 'td' && previous?.type === 'tr') {
             index_1.default.warn('The table cell is inserted into the current row instead.');
             return previous.insertAt(token);

package/dist/src/table/trBase.js

@@ -8,7 +8,6 @@ const td_1 = require("./td");
 const debug_1 = require("../../util/debug");
 const constants_1 = require("../../util/constants");
 const html_1 = require("../../util/html");
-const debug_2 = require("../../util/debug");
 const index_1 = require("../index");
 /** 表格行或表格 */
 class TrBaseToken extends base_1.TableBaseToken {
@@ -48,6 +47,7 @@ class TrBaseToken extends base_1.TableBaseToken {
         /* NOT FOR BROWSER */
         const nCols = this.getColCount();
         n += n < 0 ? nCols : 0;
+        /* istanbul ignore if */
         if (n < 0 || n > nCols || n === nCols && !insert) {
             throw new RangeError(`There is no cell at position ${n}!`);
         }
@@ -117,6 +117,7 @@ class TrBaseToken extends base_1.TableBaseToken {
      */
     insertAt(token, i = this.length) {
         if (!debug_1.Shadow.running && token.type !== 'td') {
+            /* istanbul ignore next */
             if (this.type === 'tr') {
                 this.typeError('insertAt', 'TdToken');
             }
@@ -155,7 +156,7 @@ class TrBaseToken extends base_1.TableBaseToken {
     }
     /** @private */
     toHtmlInternal(opt) {
-        const { childNodes, type } = this, td = childNodes.filter((0, debug_2.isToken)('td'));
+        const { childNodes, type } = this, td = childNodes.filter((0, debug_1.isToken)('td'));
         return td.some(({ subtype }) => subtype !== 'caption')
             ? `<tr${type === 'tr' ? childNodes[1].toHtmlInternal() : ''}>${(0, html_1.html)(td, '', opt)}</tr>`
             : (0, html_1.html)(td, '', opt);

package/dist/util/debug.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.undo = exports.mixin = exports.emptyArray = exports.setChildNodes = exports.isToken = exports.Shadow = void 0;
+exports.undo = exports.compare = exports.mixin = exports.emptyArray = exports.setChildNodes = exports.isToken = exports.Shadow = void 0;
 exports.Shadow = {
     running: false,
     /** @private */
@@ -16,7 +16,7 @@ exports.Shadow = {
             this.running = running;
             return result;
         }
-        catch (e) {
+        catch (e) /* istanbul ignore next */ {
             this.running = running;
             throw e;
         }
@@ -67,6 +67,13 @@ const mixin = (target, source) => {
 };
 exports.mixin = mixin;
 /* NOT FOR BROWSER */
+/**
+ * 比较两个数
+ * @param a
+ * @param b
+ */
+const compare = (a, b) => a - b;
+exports.compare = compare;
 /**
  * 撤销最近一次Mutation
  * @param e 事件
@@ -88,6 +95,7 @@ const undo = (e, data) => {
         case 'text':
             target.replaceData(data.oldText);
             break;
+        /* istanbul ignore next */
         default:
             throw new RangeError(`Unable to undo events with an unknown type: ${type}`);
     }

package/dist/util/diff.js

@@ -4,9 +4,11 @@ exports.info = exports.error = exports.diff = exports.cmd = void 0;
 const fs = require("fs/promises");
 const child_process_1 = require("child_process");
 const chalk = require("chalk");
+/* istanbul ignore next */
 process.on('unhandledRejection', e => {
     console.error(e);
 });
+/* istanbul ignore next */
 /**
  * 将shell命令转化为Promise对象
  * @param command shell指令
@@ -47,6 +49,7 @@ const cmd = (command, args) => new Promise(resolve => {
     }
 });
 exports.cmd = cmd;
+/* istanbul ignore next */
 /**
  * 比较两个文件
  * @param oldStr 旧文本
@@ -71,11 +74,13 @@ const diff = async (oldStr, newStr, uid) => {
     await Promise.all([fs.unlink(oldFile), fs.unlink(newFile)]);
 };
 exports.diff = diff;
+/* istanbul ignore next */
 /** @implements */
 const error = (msg, ...args) => {
     console.error(chalk.red(msg), ...args);
 };
 exports.error = error;
+/* istanbul ignore next */
 /** @implements */
 const info = (msg, ...args) => {
     console.info(chalk.green(msg), ...args);

package/dist/util/string.js

@@ -27,10 +27,21 @@ 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 */
-exports.decodeHtml = factory(/&(?:#(\d+|[Xx][\da-fA-F]+)|([lLgG][tT]|[lr]brac[ke]|nbsp|amp|AMP|quot|QUOT));/gu, (_, code, name) => code
+const 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()]);
+/**
+ * decode HTML entities
+ * @param str
+ */
+const decodeHtml = (str) => 
+// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+typeof process === 'object' && typeof process.versions?.node === 'string'
+    ? require('entities').decodeHTMLStrict(str).replace(/\xA0/gu, ' ')
+    : /* istanbul ignore next */ decodeHtmlBasic(str);
+exports.decodeHtml = decodeHtml;
 /** decode numbered HTML entities */
 exports.decodeNumber = factory(/&#(\d+|x[\da-f]+);/giu, (_, code) => String.fromCodePoint(Number((/^x/iu.test(code) ? '0' : '') + code)));
 /** escape newlines */

package/extensions/dist/base.js

@@ -1,6 +1,6 @@
 (() => {
 var _a;
-const version = '1.15.0', 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.15.1', 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 = () => {

package/extensions/dist/test-page.js

@@ -0,0 +1,89 @@
+(() => {
+"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'));
+})();
+})();

package/extensions/es7/base.js

@@ -1,6 +1,6 @@
 (() => {
 var _a;
-const version = '1.15.0', 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.15.1', 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 = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.15.0",
+	"version": "1.15.1",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",
@@ -24,8 +24,11 @@
 		"!/extensions/gh-page.css",
 		"!/extensions/dist/parserTests.js",
 		"!/extensions/test-page.css",
+		"!/extensions/dist/compare.js",
+		"!/extensions/compare.css",
 		"/config/",
 		"/i18n/",
+		"/coverage/badge.svg",
 		"/dist/",
 		"!/dist/[bt]*/"
 	],
@@ -37,17 +40,18 @@
 		"url": "git+https://github.com/bhsd-harry/wikiparser-node.git"
 	},
 	"scripts": {
-		"toc": "node ./dist/bin/toc.js",
-		"declaration": "grep -rl --include='*.d.ts' '@private' dist/ | xargs bash sed.sh -i -E '/^\\s+\\/\\*\\* @private/,+1d'; grep -rl --include='*.d.ts' '/util/' dist/ | xargs bash sed.sh -i -E '/^import .+\\/util\\//d'; bash sed.sh -i -E 's/abstract (lint|print|text)\\b/\\1/' dist/lib/node.d.ts; node ./dist/bin/declaration.js",
+		"toc": "node dist/bin/toc.js",
+		"declaration": "grep -rl --include='*.d.ts' '@private' dist/ | xargs bash sed.sh -i -E '/^\\s+\\/\\*\\* @private/,+1d'; grep -rl --include='*.d.ts' '/util/' dist/ | xargs bash sed.sh -i -E '/^import .+\\/util\\//d'; bash sed.sh -i -E 's/abstract (lint|print|text)\\b/\\1/' dist/lib/node.d.ts; node dist/bin/declaration.js",
 		"prepublishOnly": "npm run build:core",
 		"build:core": "bash build.sh",
-		"build": "npm run build:core && node ./dist/bin/parserTests.js",
+		"build": "npm run build:core && node dist/bin/parserTests.js",
 		"diff": "bash diff.sh",
 		"diff:stat": "f() { git diff --stat --ignore-all-space --color=always $1 $2 -- . ':!extensions/' ':!bin/' | grep '\\.ts'; }; f",
 		"lint:ts": "tsc --noEmit && eslint --cache .",
-		"lint:json": "v8r -s config/.schema.json config/*.json && node ./dist/test/json.js",
+		"lint:json": "v8r -s config/.schema.json config/*.json && node dist/test/json.js",
 		"lint": "npm run lint:ts && npm run lint:json",
 		"prof": "node dist/test/prof.js",
+		"coverage": "nyc --reporter=html --reporter=text-summary --reporter=json-summary --cache-dir=./.cache/nyc npm test && node dist/bin/coverage.js && open coverage/index.html",
 		"test:unit": "mocha dist/test/test.js",
 		"test:parser": "mocha dist/test/parserTests.js",
 		"test": "npm run test:unit && npm run test:parser",
@@ -55,10 +59,11 @@
 		"test:real": "node dist/test/real.js"
 	},
 	"dependencies": {
-		"@bhsd/common": "^0.5.0",
+		"@bhsd/common": "^0.6.3",
 		"@codemirror/lint": "^6.8.4",
 		"chalk": "^4.1.2",
 		"codejar-async": "^4.2.6",
+		"entities": "^6.0.0",
 		"monaco-editor": "^0.52.0"
 	},
 	"devDependencies": {
@@ -81,6 +86,7 @@
 		"eslint-plugin-unicorn": "^56.0.1",
 		"http-server": "^14.1.0",
 		"mocha": "^10.8.2",
+		"nyc": "^17.1.0",
 		"stylelint": "^16.11.0",
 		"stylelint-config-recommended": "^14.0.0",
 		"typescript": "^5.7.2",