wikiparser-node 1.0.3 → 1.1.0

package/dist/addon/table.js

@@ -1,4 +1,5 @@
 "use strict";
+/* eslint operator-linebreak: [2, "before", {overrides: {"=": "after"}}] */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Layout = void 0;
 const assert = require("assert/strict");
@@ -96,14 +97,15 @@ class Layout extends Array {
     }
 }
 exports.Layout = Layout;
-Object.assign(table_1.TableToken.prototype, {
+table_1.TableToken.prototype.getNthCell =
     /** @implements */
-    getNthCell(coords) {
+    function (coords) {
         const rawCoords = coords.row === undefined ? this.toRawCoords(coords) : coords;
         return rawCoords && this.getNthRow(rawCoords.row, false, false)?.getNthCol(rawCoords.column);
-    },
+    };
+table_1.TableToken.prototype.getLayout =
     /** @implements */
-    getLayout(stop) {
+    function (stop) {
         const rows = this.getAllRows(), { length } = rows, layout = new Layout(...new Array(length).fill(undefined).map(() => []));
         for (let i = 0; i < length; i++) {
             if (i > (stop?.row ?? stop?.y ?? NaN)) {
@@ -143,18 +145,21 @@ Object.assign(table_1.TableToken.prototype, {
             }
         }
         return layout;
-    },
+    };
+table_1.TableToken.prototype.printLayout =
     /** @implements */
-    printLayout() {
+    function () {
         this.getLayout().print();
-    },
+    };
+table_1.TableToken.prototype.toRenderedCoords =
     /** @implements */
-    toRenderedCoords({ row, column }) {
+    function ({ row, column }) {
         const rowLayout = this.getLayout({ row, column })[row], x = rowLayout?.findIndex(coords => cmpCoords(coords, { row, column }) === 0);
         return rowLayout && (x === -1 ? undefined : { y: row, x: x });
-    },
+    };
+table_1.TableToken.prototype.toRawCoords =
     /** @implements */
-    toRawCoords({ x, y }) {
+    function ({ x, y }) {
         const rowLayout = this.getLayout({ x, y })[y], coords = rowLayout?.[x];
         if (coords) {
             return { ...coords, start: coords.row === y && rowLayout[x - 1] !== coords };
@@ -165,39 +170,46 @@ Object.assign(table_1.TableToken.prototype, {
                 : undefined;
         }
         return { row: 0, column: 0, start: true };
-    },
+    };
+table_1.TableToken.prototype.getFullRow =
     /** @implements */
-    getFullRow(y) {
+    function (y) {
         const rows = this.getAllRows();
         return new Map(this.getLayout({ y })[y]?.map(({ row, column }) => [rows[row].getNthCol(column), row === y]));
-    },
+    };
+table_1.TableToken.prototype.getFullCol =
     /** @implements */
-    getFullCol(x) {
+    function (x) {
         const layout = this.getLayout(), colLayout = layout.map(row => row[x]).filter(Boolean), rows = this.getAllRows();
         return new Map(colLayout.map(coords => [rows[coords.row].getNthCol(coords.column), layout[coords.row][x - 1] !== coords]));
-    },
+    };
+table_1.TableToken.prototype.formatTableRow =
     /** @implements */
-    formatTableRow(y, attr = {}, multiRow = false) {
+    function (y, attr = {}, multiRow = false) {
         format(this.getFullRow(y), attr, multiRow);
-    },
+    };
+table_1.TableToken.prototype.formatTableCol =
     /** @implements */
-    formatTableCol(x, attr = {}, multiCol = false) {
+    function (x, attr = {}, multiCol = false) {
         format(this.getFullCol(x), attr, multiCol);
-    },
+    };
+table_1.TableToken.prototype.fillTableRow =
     /** @implements */
-    fillTableRow(y, inner, subtype = 'td', attr = {}) {
+    function (y, inner, subtype = 'td', attr = {}) {
         const rowToken = this.getNthRow(y), layout = this.getLayout({ y }), maxCol = Math.max(...layout.map(({ length }) => length)), token = (0, td_1.createTd)(inner, subtype, attr, this.getAttribute('include'), this.getAttribute('config'));
         fill(y, rowToken, layout, maxCol, token);
-    },
+    };
+table_1.TableToken.prototype.fillTable =
     /** @implements */
-    fillTable(inner, subtype = 'td', attr = {}) {
+    function (inner, subtype = 'td', attr = {}) {
         const rowTokens = this.getAllRows(), layout = this.getLayout(), maxCol = Math.max(...layout.map(({ length }) => length)), token = (0, td_1.createTd)(inner, subtype, attr, this.getAttribute('include'), this.getAttribute('config'));
         for (let y = 0; y < rowTokens.length; y++) {
             fill(y, rowTokens[y], layout, maxCol, token);
         }
-    },
+    };
+table_1.TableToken.prototype.insertTableCell =
     /** @implements */
-    insertTableCell(inner, coords, subtype = 'td', attr = {}) {
+    function (inner, coords, subtype = 'td', attr = {}) {
         let rawCoords;
         if (coords.column === undefined) {
             const { x, y } = coords;
@@ -213,9 +225,10 @@ Object.assign(table_1.TableToken.prototype, {
         return rowToken === this
             ? trBase_1.TrBaseToken.prototype.insertTableCell.call(this, inner, rawCoords, subtype, attr)
             : rowToken.insertTableCell(inner, rawCoords, subtype, attr);
-    },
+    };
+table_1.TableToken.prototype.prependTableRow =
     /** @implements */
-    prependTableRow() {
+    function () {
         const row = debug_1.Shadow.run(() => new tr_1.TrToken('\n|-', undefined, this.getAttribute('config'))), { childNodes } = this, [, , plain] = childNodes, start = plain?.constructor === src_1.Token ? 3 : 2, tdChildren = childNodes.slice(start), index = tdChildren.findIndex(({ type }) => type !== 'td');
         this.insertAt(row, index === -1 ? -1 : index + start);
         debug_1.Shadow.run(() => {
@@ -226,9 +239,10 @@ Object.assign(table_1.TableToken.prototype, {
             }
         });
         return row;
-    },
+    };
+table_1.TableToken.prototype.insertTableRow =
     /** @implements */
-    insertTableRow(y, attr = {}, inner, subtype = 'td', innerAttr = {}) {
+    function (y, attr = {}, inner, subtype = 'td', innerAttr = {}) {
         let reference = this.getNthRow(y, false, true);
         const token = debug_1.Shadow.run(() => new tr_1.TrToken('\n|-', undefined, this.getAttribute('config')));
         for (const [k, v] of Object.entries(attr)) {
@@ -256,9 +270,10 @@ Object.assign(table_1.TableToken.prototype, {
             });
         }
         return token;
-    },
+    };
+table_1.TableToken.prototype.insertTableCol =
     /** @implements */
-    insertTableCol(x, inner, subtype = 'td', attr = {}) {
+    function (x, inner, subtype = 'td', attr = {}) {
         const layout = this.getLayout(), rowLength = layout.map(({ length }) => length), minCol = Math.min(...rowLength);
         if (x > minCol) {
             throw new RangeError(`表格第 ${rowLength.indexOf(minCol)} 行仅有 ${minCol} 列！`);
@@ -277,9 +292,10 @@ Object.assign(table_1.TableToken.prototype, {
                 this.getNthCell(coords).colspan++;
             }
         }
-    },
+    };
+table_1.TableToken.prototype.removeTableRow =
     /** @implements */
-    removeTableRow(y) {
+    function (y) {
         const rows = this.getAllRows(), layout = this.getLayout(), rowLayout = layout[y], set = new WeakSet();
         for (let x = rowLayout.length - 1; x >= 0; x--) {
             const coords = rowLayout[x];
@@ -306,9 +322,10 @@ Object.assign(table_1.TableToken.prototype, {
         const rowToken = rows[y].type === 'table' ? this.prependTableRow() : rows[y];
         rowToken.remove();
         return rowToken;
-    },
+    };
+table_1.TableToken.prototype.removeTableCol =
     /** @implements */
-    removeTableCol(x) {
+    function (x) {
         for (const [token, start] of this.getFullCol(x)) {
             const { colspan, lastChild } = token;
             if (colspan > 1) {
@@ -321,10 +338,11 @@ Object.assign(table_1.TableToken.prototype, {
                 token.remove();
             }
         }
-    },
+    };
+table_1.TableToken.prototype.mergeCells =
     /** @implements */
-    mergeCells(xlim, ylim) {
-        const layout = this.getLayout(), maxCol = Math.max(...layout.map(({ length }) => length)), posXlim = xlim.map(x => x < 0 ? x + maxCol : x), posYlim = ylim.map(y => y < 0 ? y + layout.length : y), [xmin, xmax] = posXlim.sort(), [ymin, ymax] = posYlim.sort(), set = new Set(layout.slice(ymin, ymax).flatMap(rowLayout => rowLayout.slice(xmin, xmax)));
+    function (xlim, ylim) {
+        const layout = this.getLayout(), maxCol = Math.max(...layout.map(({ length }) => length)), [xmin, xmax] = xlim.map(x => x < 0 ? x + maxCol : x).sort(), [ymin, ymax] = ylim.map(y => y < 0 ? y + layout.length : y).sort(), set = new Set(layout.slice(ymin, ymax).flatMap(rowLayout => rowLayout.slice(xmin, xmax)));
         if ([...layout[ymin - 1] ?? [], ...layout[ymax] ?? []].some(coords => set.has(coords))
             || layout.some(rowLayout => set.has(rowLayout[xmin - 1]) || set.has(rowLayout[xmax]))) {
             throw new RangeError('待合并区域与外侧区域有重叠！');
@@ -337,9 +355,10 @@ Object.assign(table_1.TableToken.prototype, {
             token.remove();
         }
         return cornerCell;
-    },
+    };
+table_1.TableToken.prototype.split =
     /** @implements */
-    split(coords, dirs) {
+    function (coords, dirs) {
         const cell = this.getNthCell(coords), attr = cell.getAttrs(), { subtype } = cell;
         attr.rowspan ||= 1;
         attr.colspan ||= 1;
@@ -377,21 +396,25 @@ Object.assign(table_1.TableToken.prototype, {
                 }
             }
         }
-    },
+    };
+table_1.TableToken.prototype.splitIntoRows =
     /** @implements */
-    splitIntoRows(coords) {
+    function (coords) {
         this.split(coords, new Set(['rowspan']));
-    },
+    };
+table_1.TableToken.prototype.splitIntoCols =
     /** @implements */
-    splitIntoCols(coords) {
+    function (coords) {
         this.split(coords, new Set(['colspan']));
-    },
+    };
+table_1.TableToken.prototype.splitIntoCells =
     /** @implements */
-    splitIntoCells(coords) {
+    function (coords) {
         this.split(coords, new Set(['rowspan', 'colspan']));
-    },
+    };
+table_1.TableToken.prototype.replicateTableRow =
     /** @implements */
-    replicateTableRow(row) {
+    function (row) {
         let rowToken = this.getNthRow(row);
         if (rowToken.type === 'table') {
             rowToken = this.prependTableRow();
@@ -406,9 +429,10 @@ Object.assign(table_1.TableToken.prototype, {
             }
         }
         return replicated;
-    },
+    };
+table_1.TableToken.prototype.replicateTableCol =
     /** @implements */
-    replicateTableCol(x) {
+    function (x) {
         const replicated = [];
         for (const [token, start] of this.getFullCol(x)) {
             if (start) {
@@ -422,9 +446,10 @@ Object.assign(table_1.TableToken.prototype, {
             }
         }
         return replicated;
-    },
+    };
+table_1.TableToken.prototype.moveTableRowBefore =
     /** @implements */
-    moveTableRowBefore(y, before) {
+    function (y, before) {
         const layout = this.getLayout(), 
         /** @ignore */
         occupied = (i) => layout[i].map(({ row }, j) => row === i ? j : undefined).filter(j => j !== undefined);
@@ -449,9 +474,10 @@ Object.assign(table_1.TableToken.prototype, {
         }
         this.insertBefore(rowToken, beforeToken);
         return rowToken;
-    },
+    };
+table_1.TableToken.prototype.moveTableRowAfter =
     /** @implements */
-    moveTableRowAfter(y, after) {
+    function (y, after) {
         const layout = this.getLayout(), afterToken = this.getNthRow(after), cells = afterToken.childNodes.filter(child => child instanceof td_1.TdToken && child.subtype !== 'caption'), 
         /** @ignore */
         occupied = (i, oneRow = false) => layout[i].map(({ row, column }, j) => row === i && (!oneRow || cells[column].rowspan === 1) ? j : undefined).filter(j => j !== undefined);
@@ -484,9 +510,10 @@ Object.assign(table_1.TableToken.prototype, {
             this.insertBefore(rowToken, afterToken);
         }
         return rowToken;
-    },
+    };
+table_1.TableToken.prototype.moveCol =
     /** @implements */
-    moveCol(x, reference, after = false) {
+    function (x, reference, after = false) {
         const layout = this.getLayout();
         if (layout.some(rowLayout => isStartCol(rowLayout, x) !== isStartCol(rowLayout, reference, after))) {
             throw new RangeError(`第 ${x} 列与第 ${reference} 列的构造不同，无法移动！`);
@@ -518,14 +545,15 @@ Object.assign(table_1.TableToken.prototype, {
                 }
             }
         }
-    },
+    };
+table_1.TableToken.prototype.moveTableColBefore =
     /** @implements */
-    moveTableColBefore(x, before) {
+    function (x, before) {
         this.moveCol(x, before);
-    },
+    };
+table_1.TableToken.prototype.moveTableColAfter =
     /** @implements */
-    moveTableColAfter(x, after) {
+    function (x, after) {
         this.moveCol(x, after, true);
-    },
-});
+    };
 constants_1.classes['ExtendTableToken'] = __filename;

package/dist/index.d.ts

@@ -53,7 +53,7 @@ declare interface Parser {
      * 是否是跨维基链接
      * @param title 链接标题
      */
-    isInterwiki(title: string, config?: Config): [string, string] | null;
+    isInterwiki(title: string, config?: Config): RegExpExecArray | null;
 }
 declare const Parser: Parser;
 export = Parser;

package/dist/index.js

@@ -11,6 +11,11 @@ const constants_1 = require("./util/constants");
  * @param dir 子路径
  */
 const rootRequire = (file, dir) => require(file.startsWith('/') ? file : `../${file.includes('/') ? '' : dir}${file}`);
+/**
+ * 清理解析专用的不可见字符
+ * @param text 源文本
+ */
+const tidy = (text) => text.replace(/[\0\x7F]/gu, '');
 // eslint-disable-next-line @typescript-eslint/no-redeclare
 const Parser = {
     config: 'default',
@@ -69,11 +74,10 @@ const Parser = {
     /** @implements */
     parse(wikitext, include, maxStage = constants_1.MAX_STAGE, config = Parser.getConfig()) {
         const { Token } = require('./src/index');
-        let token;
-        debug_1.Shadow.run(() => {
-            token = new Token(wikitext.replace(/[\0\x7F]/gu, ''), config);
+        const root = debug_1.Shadow.run(() => {
+            const token = new Token(tidy(wikitext), config);
             try {
-                token.parse(maxStage, include);
+                return token.parse(maxStage, include);
             }
             catch (e) {
                 if (e instanceof Error) {
@@ -88,10 +92,10 @@ const Parser = {
             }
         });
         if (this.debugging) {
-            let restored = String(token), process = '解析';
+            let restored = String(root), process = '解析';
             if (restored === wikitext) {
                 const entities = { lt: '<', gt: '>', amp: '&' };
-                restored = token.print().replace(/<[^<]+?>|&([lg]t|amp);/gu, (_, s) => s ? entities[s] : '');
+                restored = root.print().replace(/<[^<]+?>|&([lg]t|amp);/gu, (_, s) => s ? entities[s] : '');
                 process = '渲染HTML';
             }
             if (restored !== wikitext) {
@@ -104,7 +108,7 @@ const Parser = {
                 })());
             }
         }
-        return token;
+        return root;
     },
     /* NOT FOR BROWSER */
     /** @implements */
@@ -139,6 +143,7 @@ const Parser = {
             ...Object.entries(constants_1.classes),
             ...Object.entries(constants_1.mixins),
             ...Object.entries(constants_1.parsers),
+            ...Object.entries(constants_1.utils),
         ];
         for (const [, filePath] of entries) {
             try {
@@ -158,7 +163,7 @@ const Parser = {
     },
     /** @implements */
     isInterwiki(title, { interwiki } = Parser.getConfig()) {
-        return new RegExp(`^(${interwiki.join('|')})\\s*:`, 'iu')
+        return new RegExp(`^(${interwiki.join('|')})\\s*:`, 'diu')
             .exec(title.replaceAll('_', ' ').replace(/^\s*:?\s*/u, ''));
     },
     /** @implements */
@@ -172,7 +177,7 @@ const Parser = {
         const { stage, include, config } = require(`${file}.json`), { Token } = require('./src');
         this.config = config;
         return debug_1.Shadow.run(() => {
-            const halfParsed = stage < constants_1.MAX_STAGE, token = new Token(halfParsed ? wikitext : wikitext.replace(/[\0\x7F]/gu, ''), this.getConfig());
+            const halfParsed = stage < constants_1.MAX_STAGE, token = new Token(halfParsed ? wikitext : tidy(wikitext), this.getConfig());
             if (halfParsed) {
                 token.setAttribute('stage', stage);
                 token.parseOnce(stage, include);

package/dist/lib/node.js

@@ -38,12 +38,12 @@ class AstNode {
     }
     /** 后一个兄弟节点 */
     get nextSibling() {
-        const childNodes = this.#parentNode?.childNodes;
+        const childNodes = this.parentNode?.childNodes;
         return childNodes && childNodes[childNodes.indexOf(this) + 1];
     }
     /** 前一个兄弟节点 */
     get previousSibling() {
-        const childNodes = this.#parentNode?.childNodes;
+        const childNodes = this.parentNode?.childNodes;
         return childNodes && childNodes[childNodes.indexOf(this) - 1];
     }
     /** 行数 */
@@ -57,12 +57,12 @@ class AstNode {
     /* NOT FOR BROWSER */
     /** 后一个非文本兄弟节点 */
     get nextElementSibling() {
-        const childNodes = this.#parentNode?.childNodes, i = childNodes?.indexOf(this);
+        const childNodes = this.parentNode?.childNodes, i = childNodes?.indexOf(this);
         return childNodes?.slice(i + 1).find(({ type }) => type !== 'text');
     }
     /** 前一个非文本兄弟节点 */
     get previousElementSibling() {
-        const childNodes = this.#parentNode?.childNodes, i = childNodes?.indexOf(this);
+        const childNodes = this.parentNode?.childNodes, i = childNodes?.indexOf(this);
         return childNodes?.slice(0, i).findLast(({ type }) => type !== 'text');
     }
     /** 是否具有根节点 */
@@ -71,14 +71,15 @@ class AstNode {
     }
     /** 后方是否还有其他节点（不含后代） */
     get eof() {
-        if (!this.#parentNode) {
+        const { parentNode } = this;
+        if (!parentNode) {
             return true;
         }
         let { nextSibling } = this;
         while (nextSibling?.type === 'text' && nextSibling.data.trim() === '') {
             ({ nextSibling } = nextSibling);
         }
-        return nextSibling === undefined && this.#parentNode.eof;
+        return nextSibling === undefined && parentNode.eof;
     }
     /** 相对于父容器的行号 */
     get offsetTop() {
@@ -360,8 +361,8 @@ class AstNode {
             currentTarget: { value: this, enumerable: true, configurable: true },
         });
         this.#events.emit(e.type, e, data);
-        if (e.bubbles && this.#parentNode) {
-            this.#parentNode.dispatchEvent(e, data);
+        if (e.bubbles && this.parentNode) {
+            this.parentNode.dispatchEvent(e, data);
         }
     }
     /** 获取所有祖先节点 */
@@ -408,7 +409,7 @@ class AstNode {
     }
     /** 获取当前节点的相对位置 */
     #getPosition() {
-        return this.#parentNode?.posFromIndex(this.getRelativeIndex()) ?? { top: 0, left: 0 };
+        return this.parentNode?.posFromIndex(this.getRelativeIndex()) ?? { top: 0, left: 0 };
     }
     /** 获取当前节点的行列位置和大小 */
     getBoundingClientRect() {

package/dist/lib/range.d.ts

@@ -27,7 +27,6 @@ export declare class AstRange {
      * 设置起点
      * @param startNode 起点容器
      * @param startOffset 起点位置
-     * @throws `RangeError` 不在同一个文档
      * @throws `RangeError` offset取值超出范围
      */
     setStart(startNode: AstNodes, startOffset: number): void;
@@ -35,7 +34,6 @@ export declare class AstRange {
      * 设置终点
      * @param endNode 终点容器
      * @param endOffset 终点位置
-     * @throws `RangeError` 不在同一个文档
      * @throws `RangeError` offset取值超出范围
      */
     setEnd(endNode: AstNodes, endOffset: number): void;
@@ -67,6 +65,7 @@ export declare class AstRange {
     /**
      * 设置Range包含整个节点
      * @param referenceNode 节点
+     * @throws `RangeError` 参考节点没有父节点
      */
     selectNode(referenceNode: AstNodes): void;
     /**
@@ -85,15 +84,8 @@ export declare class AstRange {
      * 端点是否在Range中
      * @param referenceNode 端点容器
      * @param offset 端点位置
-     * @throws `RangeError` 不在同一个文档
      */
     isPointInRange(referenceNode: AstNodes, offset: number): boolean;
-    /**
-     * 是否与节点相交
-     * @param referenceNode 节点
-     * @throws `RangeError` 不在同一个文档
-     */
-    intersectsNode(referenceNode: AstNodes): boolean;
     /** 复制AstRange对象 */
     cloneRange(): AstRange;
     /** 删除Range中的内容 */
@@ -105,10 +97,7 @@ export declare class AstRange {
      * @param newNode 插入的节点
      */
     insertNode(newNode: AstNodes | string): void;
-    /**
-     * 在满足条件时获取范围内的全部节点
-     * @throws `Error` 不是某个节点的连续子节点
-     */
+    /** 获取范围内的全部节点 */
     extractContents(): AstNodes[];
     /** 在满足条件时拷贝范围内的全部节点 */
     cloneContents(): AstNodes[];