wikiparser-node 1.3.4 → 1.3.6

package/dist/addon/table.js

@@ -39,6 +39,9 @@ const isStartCol = (rowLayout, i, oneCol = false) => {
     const coords = rowLayout[i];
     return rowLayout[i - 1] !== coords && (!oneCol || rowLayout[i + 1] !== coords);
 };
+function occupied(layout, i, oneRow = false, cells) {
+    return layout[i].map(({ row, column }, j) => row === i && (!oneRow || cells[column].rowspan === 1) ? j : undefined).filter((j) => j !== undefined);
+}
 /**
  * 设置表格格式
  * @param cells 单元格
@@ -52,9 +55,7 @@ const format = (cells, attr = {}, multi = false) => {
                 token.setSyntax(attr);
             }
             else {
-                for (const [k, v] of Object.entries(attr)) {
-                    token.setAttr(k, v);
-                }
+                token.setAttr(attr);
             }
         }
     }
@@ -81,11 +82,10 @@ const fill = (y, rowToken, layout, maxCol, token) => {
 class Layout extends Array {
     /** 打印表格布局 */
     print() {
-        const hBorders = new Array(this.length + 1).fill(undefined).map((_, i) => {
+        const hBorders = (0, debug_1.emptyArray)(this.length + 1, i => {
             const prev = this[i - 1] ?? [], next = this[i] ?? [];
-            return new Array(Math.max(prev.length, next.length)).fill(undefined)
-                .map((__, j) => prev[j] !== next[j]);
-        }), vBorders = this.map(cur => new Array(cur.length + 1).fill(undefined).map((_, j) => cur[j - 1] !== cur[j]));
+            return (0, debug_1.emptyArray)(Math.max(prev.length, next.length), j => prev[j] !== next[j]);
+        }), vBorders = this.map(cur => (0, debug_1.emptyArray)(cur.length + 1, j => cur[j - 1] !== cur[j]));
         let out = '';
         for (let i = 0; i <= this.length; i++) {
             const hBorder = hBorders[i].map(Number), vBorderTop = (vBorders[i - 1] ?? []).map(Number), vBorderBottom = (vBorders[i] ?? []).map(Number), 
@@ -111,7 +111,7 @@ table_1.TableToken.prototype.getNthCell =
 table_1.TableToken.prototype.getLayout =
     /** @implements */
     function (stop) {
-        const rows = this.getAllRows(), { length } = rows, layout = new Layout(...new Array(length).fill(undefined).map(() => []));
+        const rows = this.getAllRows(), { length } = rows, layout = new Layout(...(0, debug_1.emptyArray)(length, () => []));
         for (let i = 0; i < length; i++) {
             if (i > (stop?.row ?? stop?.y ?? NaN)) {
                 break;
@@ -250,9 +250,7 @@ table_1.TableToken.prototype.insertTableRow =
     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)) {
-            token.setAttr(k, v);
-        }
+        token.setAttr(attr);
         if (reference?.type === 'table') { // `row === 0`且表格自身是有效行
             reference = this.prependTableRow();
         }
@@ -455,11 +453,9 @@ table_1.TableToken.prototype.replicateTableCol =
 table_1.TableToken.prototype.moveTableRowBefore =
     /** @implements */
     function (y, before) {
-        const layout = this.getLayout(), 
-        /** @ignore */
-        occupied = (i) => layout[i].map(({ row }, j) => row === i ? j : undefined).filter((j) => j !== undefined);
+        const layout = this.getLayout();
         try {
-            assert.deepEqual(occupied(y), occupied(before));
+            assert.deepEqual(occupied(layout, y), occupied(layout, before));
         }
         catch (e) {
             if (e instanceof assert.AssertionError) {
@@ -483,11 +479,9 @@ table_1.TableToken.prototype.moveTableRowBefore =
 table_1.TableToken.prototype.moveTableRowAfter =
     /** @implements */
     function (y, after) {
-        const layout = this.getLayout(), afterToken = this.getNthRow(after), cells = afterToken.childNodes.filter(child => child.type === 'td' && 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);
+        const layout = this.getLayout(), afterToken = this.getNthRow(after), cells = afterToken.childNodes.filter(child => child.type === 'td' && child.subtype !== 'caption');
         try {
-            assert.deepEqual(occupied(y), occupied(after, true));
+            assert.deepEqual(occupied(layout, y), occupied(layout, after, true, cells));
         }
         catch (e) {
             if (e instanceof assert.AssertionError) {

package/dist/index.d.ts

@@ -2,6 +2,7 @@ import { Shadow } from './util/debug';
 import type { Config, LintError, Parser as ParserBase } from './base';
 import type { Title } from './lib/title';
 import type { Token } from './internal';
+declare type log = (msg: string, ...args: unknown[]) => void;
 declare interface Parser extends ParserBase {
     readonly Shadow: typeof Shadow;
     conversionTable: Map<string, string>;

package/dist/lib/element.d.ts

@@ -145,7 +145,6 @@ export declare abstract class AstElement extends AstNode {
      * @param reference 指定位置处的子节点
      */
     insertBefore(child: string, reference?: AstNodes): AstText;
-    /** @ignore */
     insertBefore<T extends AstNodes>(child: T, reference?: AstNodes): T;
     /**
      * 输出AST

package/dist/lib/element.js

@@ -5,6 +5,7 @@ const fs = require("fs");
 const path = require("path");
 const string_1 = require("../util/string");
 const constants_1 = require("../util/constants");
+const debug_1 = require("../util/debug");
 const selector_1 = require("../parser/selector");
 const ranges_1 = require("./ranges");
 const title_1 = require("./title");
@@ -130,10 +131,7 @@ class AstElement extends node_1.AstNode {
      */
     removeAt(i) {
         this.verifyChild(i);
-        const childNodes = [...this.childNodes], [node] = childNodes.splice(i, 1);
-        node.setAttribute('parentNode', undefined);
-        this.setAttribute('childNodes', childNodes);
-        return node;
+        return (0, debug_1.setChildNodes)(this, i, 1)[0];
     }
     /**
      * 插入子节点
@@ -143,19 +141,14 @@ class AstElement extends node_1.AstNode {
      */
     insertAt(node, i = this.length) {
         if (node.contains(this)) {
-            Parser.error('不能插入祖先节点！', node);
             throw new RangeError('不能插入祖先节点！');
         }
-        const childNodes = [...this.childNodes];
-        if (childNodes.includes(node)) {
-            Parser.error('不能插入子节点！', node);
+        if (this.childNodes.includes(node)) {
             throw new RangeError('不能插入子节点！');
         }
         this.verifyChild(i, 1);
         node.parentNode?.removeChild(node);
-        node.setAttribute('parentNode', this);
-        childNodes.splice(i, 0, node);
-        this.setAttribute('childNodes', childNodes);
+        (0, debug_1.setChildNodes)(this, i, 0, [node]);
         return node;
     }
     /**
@@ -573,7 +566,6 @@ class AstElement extends node_1.AstNode {
     #getChildIndex(node) {
         const i = this.childNodes.indexOf(node);
         if (i === -1) {
-            Parser.error('找不到子节点！', node);
             throw new RangeError('找不到子节点！');
         }
         return i;
@@ -586,7 +578,6 @@ class AstElement extends node_1.AstNode {
         this.removeAt(this.#getChildIndex(node));
         return node;
     }
-    /** @ignore */
     insertBefore(child, reference) {
         return reference === undefined
             ? this.insertAt(child)

package/dist/lib/node.js

@@ -205,6 +205,10 @@ class AstNode {
         return typeError(this.constructor, method, ...types);
     }
     /** @private */
+    constructorError(msg) {
+        throw new Error(`${this.constructor.name} ${msg}！`);
+    }
+    /** @private */
     seal(key) {
         this.#optional.add(key);
         Object.defineProperty(this, key, {

package/dist/lib/ranges.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Ranges = exports.Range = void 0;
 const constants_1 = require("../util/constants");
+const debug_1 = require("../util/debug");
 /** 模拟Python的Range对象。除`step`至少为`1`外，允许负数、小数或`end < start`的情形。 */
 class Range {
     #start;
@@ -102,7 +103,7 @@ class Ranges extends Array {
      * @param arr 参考数组
      */
     applyTo(arr) {
-        const length = typeof arr === 'number' ? arr : arr.length, a = new Array(length).fill(undefined).map((_, i) => i);
+        const length = typeof arr === 'number' ? arr : arr.length, a = (0, debug_1.emptyArray)(length, i => i);
         return [
             ...new Set([...this].flatMap(ele => {
                 if (typeof ele === 'number') {

package/dist/lib/text.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AstText = void 0;
 const constants_1 = require("../util/constants");
+const debug_1 = require("../util/debug");
 const Parser = require("../index");
 const node_1 = require("./node");
 const errorSyntax = /<\s*\/?([a-z]\w*)|\{+|\}+|\[{2,}|\[(?![^[]*\])|(?<=^|\])([^[]*?)\]+|\]{2,}|https?[:/]\/+/giu, errorSyntaxUrl = /<\s*\/?([a-z]\w*)|\{+|\}+|\[{2,}|\[(?![^[]*\])|(?<=^|\])([^[]*?)\]+|\]{2,}/giu, disallowedTags = [
@@ -215,11 +216,9 @@ class AstText extends node_1.AstNode {
         if (!parentNode) {
             throw new Error('待分裂的文本节点没有父节点！');
         }
-        const newText = new AstText(data.slice(offset)), childNodes = [...parentNode.childNodes];
+        const newText = new AstText(data.slice(offset));
+        (0, debug_1.setChildNodes)(parentNode, parentNode.childNodes.indexOf(this) + 1, 0, [newText]);
         this.setAttribute('data', data.slice(0, offset));
-        childNodes.splice(childNodes.indexOf(this) + 1, 0, newText);
-        newText.setAttribute('parentNode', parentNode);
-        parentNode.setAttribute('childNodes', childNodes);
         return newText;
     }
     /** @private */
@@ -228,7 +227,7 @@ class AstText extends node_1.AstNode {
             return super.getRelativeIndex();
         }
         else if (j < 0 || j > this.length) {
-            throw new RangeError(`超出文本长度范围！`);
+            throw new RangeError('超出文本长度范围！');
         }
         return j;
     }

package/dist/mixin/attributesParent.js

@@ -64,13 +64,8 @@ const attributesParent = (constructor, i = 0) => {
         getAttrs() {
             return this.#attributesChild.getAttrs();
         }
-        /**
-         * 对AttributesToken子节点设置属性
-         * @param key 属性键
-         * @param value 属性值
-         */
-        setAttr(key, value) {
-            this.#attributesChild.setAttr(key, value);
+        setAttr(keyOrProp, value) {
+            this.#attributesChild.setAttr(keyOrProp, value);
         }
         /**
          * 移除AttributesToken子节点的某属性

package/dist/mixin/fixed.js

@@ -11,19 +11,12 @@ const fixed = (constructor) => {
     /** 不可增删子节点的类 */
     class FixedToken extends constructor {
         static fixed = true;
-        /**
-         * @override
-         * @throws `Error` 不可用
-         */
+        /** @override */
         removeAt() {
-            throw new Error(`${this.constructor.name} 不可删除元素！`);
+            this.constructorError('不可删除元素');
         }
-        /** @ignore */
         insertAt(token, i) {
-            if (debug_1.Shadow.running) {
-                return super.insertAt(token, i);
-            }
-            throw new Error(`${this.constructor.name} 不可插入元素！`);
+            return debug_1.Shadow.running ? super.insertAt(token, i) : this.constructorError('不可插入元素');
         }
     }
     return FixedToken;

package/dist/mixin/syntax.js

@@ -4,7 +4,6 @@ exports.syntax = void 0;
 const debug_1 = require("../util/debug");
 const constants_1 = require("../util/constants");
 const string_1 = require("../util/string");
-const Parser = require("../index");
 /**
  * 满足特定语法格式的Token
  * @param constructor 基类
@@ -19,8 +18,7 @@ const syntax = (constructor, pattern) => {
             const /** @implements */ syntaxListener = (e, data) => {
                 if (!debug_1.Shadow.running && !this.#pattern.test(this.text())) {
                     (0, debug_1.undo)(e, data);
-                    Parser.error(`不可修改 ${this.constructor.name} 的语法！`, this.#pattern);
-                    throw new Error(`不可修改 ${this.constructor.name} 的语法！`);
+                    this.constructorError('不可修改语法');
                 }
             };
             this.addEventListener(['remove', 'insert', 'replace', 'text'], syntaxListener);

package/dist/parser/braces.js

@@ -25,6 +25,13 @@ const parseBraces = (wikitext, config = Parser.getConfig(), accum = []) => {
             mt.index += length;
         }
         const { 0: syntax, index: curIndex } = mt ?? { 0: '\n', index: wikitext.length }, top = stack.pop() ?? {}, { 0: open, index, parts, findEqual: topFindEqual, pos: topPos } = top, innerEqual = syntax === '=' && topFindEqual;
+        /**
+         * 填入模板内容
+         * @param text wikitext全文
+         */
+        const push = (text) => {
+            parts.at(-1).push(text.slice(topPos, curIndex));
+        };
         if (syntax === ']]' || syntax === '}-') { // 情形1：闭合内链或转换
             lastIndex = curIndex + 2;
         }
@@ -43,7 +50,7 @@ const parseBraces = (wikitext, config = Parser.getConfig(), accum = []) => {
         }
         else if (syntax === '|' || innerEqual) { // 情形3：模板内部，含行首单个'='
             lastIndex = curIndex + 1;
-            parts.at(-1).push(wikitext.slice(topPos, curIndex));
+            push(wikitext);
             if (syntax === '|') {
                 parts.push([]);
             }
@@ -54,7 +61,7 @@ const parseBraces = (wikitext, config = Parser.getConfig(), accum = []) => {
         else if (syntax.startsWith('}}')) { // 情形4：闭合模板
             const close = syntax.slice(0, Math.min(open.length, 3)), rest = open.length - close.length, { length } = accum;
             lastIndex = curIndex + close.length; // 这不是最终的lastIndex
-            parts.at(-1).push(wikitext.slice(topPos, curIndex));
+            push(wikitext);
             let skip = false, ch = 't';
             if (close.length === 3) {
                 const argParts = parts.map(part => part.join('=')), str = argParts.length > 1 && (0, string_1.removeComment)(argParts[1]).trim();

package/dist/parser/commentAndExt.js

@@ -17,27 +17,35 @@ const comment_1 = require("../src/nowiki/comment");
  */
 const parseCommentAndExt = (wikitext, config = Parser.getConfig(), accum = [], includeOnly = false) => {
     const onlyincludeLeft = '<onlyinclude>', onlyincludeRight = '</onlyinclude>', { length } = onlyincludeLeft;
+    /** 更新`<onlyinclude>`和`</onlyinclude>`的位置 */
+    const update = () => {
+        const i = wikitext.indexOf(onlyincludeLeft);
+        return { i, j: wikitext.indexOf(onlyincludeRight, i + length) };
+    };
     if (includeOnly) {
-        let i = wikitext.indexOf(onlyincludeLeft), j = wikitext.indexOf(onlyincludeRight, i + length);
+        let { i, j } = update();
         if (i !== -1 && j !== -1) { // `<onlyinclude>`拥有最高优先级
             let str = '';
+            /**
+             * 忽略未被`<onlyinclude>`和`</onlyinclude>`包裹的内容
+             * @param text 未被包裹的内容
+             */
+            const noinclude = (text) => {
+                new noinclude_1.NoincludeToken(text, config, accum);
+                str += `\0${accum.length - 1}c\x7F`;
+            };
             while (i !== -1 && j !== -1) {
                 const token = `\0${accum.length}e\x7F`;
                 new onlyinclude_1.OnlyincludeToken(wikitext.slice(i + length, j), config, accum);
                 if (i > 0) {
-                    new noinclude_1.NoincludeToken(wikitext.slice(0, i), config, accum);
-                    str += `\0${accum.length - 1}c\x7F${token}`;
-                }
-                else {
-                    str += token;
+                    noinclude(wikitext.slice(0, i));
                 }
+                str += token;
                 wikitext = wikitext.slice(j + length + 1);
-                i = wikitext.indexOf(onlyincludeLeft);
-                j = wikitext.indexOf(onlyincludeRight, i + length);
+                ({ i, j } = update());
             }
             if (wikitext) {
-                new noinclude_1.NoincludeToken(wikitext, config, accum);
-                str += `\0${accum.length - 1}c\x7F`;
+                noinclude(wikitext);
             }
             return str;
         }

package/dist/parser/list.js

@@ -23,17 +23,24 @@ const parseList = (wikitext, config = Parser.getConfig(), accum = []) => {
         return text;
     }
     let regex = /:+|-\{/gu, ex = regex.exec(text), lc = 0;
+    /**
+     * 创建`DdToken`
+     * @param syntax `:`
+     * @param index 起点
+     */
+    const dd = (syntax, index) => {
+        new dd_1.DdToken(syntax, config, accum);
+        return `${text.slice(0, index)}\0${accum.length - 1}d\x7F${text.slice(index + syntax.length)}`;
+    };
     while (ex && dt) {
         const { 0: syntax, index } = ex;
         if (syntax.startsWith(':')) {
             if (syntax.length >= dt) {
-                new dd_1.DdToken(':'.repeat(dt), config, accum);
-                return `${text.slice(0, index)}\0${accum.length - 1}d\x7F${text.slice(index + dt)}`;
+                return dd(syntax.slice(0, dt), index);
             }
-            text = `${text.slice(0, index)}\0${accum.length}d\x7F${text.slice(regex.lastIndex)}`;
             dt -= syntax.length;
             regex.lastIndex = index + 4 + String(accum.length).length;
-            new dd_1.DdToken(syntax, config, accum);
+            text = dd(syntax, index);
         }
         else if (syntax === '-{') {
             if (!lc) {

package/dist/parser/selector.js

@@ -72,21 +72,6 @@ const desanitize = (selector) => {
  * @param val 属性值或伪选择器函数的参数
  */
 const deQuote = (val) => /^(["']).*\1$/u.test(val) ? val.slice(1, -1) : val.trim();
-/**
- * 解析简单伪选择器
- * @param step 当前顶部
- * @param str 不含属性和复杂伪选择器的语句
- * @throws `SyntaxError` 非法的选择器
- */
-const pushSimple = (step, str) => {
-    const pieces = str.trim().split(':'), 
-    // eslint-disable-next-line unicorn/explicit-length-check
-    i = pieces.slice(1).findIndex(pseudo => simplePseudos.has(pseudo)) + 1 || pieces.length;
-    if (pieces.slice(i).some(pseudo => !simplePseudos.has(pseudo))) {
-        throw new SyntaxError(`非法的选择器！\n${str}\n可能需要将':'转义为'\\:'。`);
-    }
-    step.push(desanitize(pieces.slice(0, i).join(':')), ...pieces.slice(i).map(piece => `:${piece}`));
-};
 /**
  * 解析选择器
  * @param selector
@@ -96,6 +81,20 @@ const parseSelector = (selector) => {
     selector = selector.trim();
     const stack = [[[]]];
     let sanitized = sanitize(selector), regex = regularRegex, mt = regex.exec(sanitized), [condition] = stack, [step] = condition;
+    /**
+     * 解析简单伪选择器
+     * @param index 伪选择器的终点位置
+     * @throws `SyntaxError` 非法的选择器
+     */
+    const pushSimple = (index) => {
+        const str = sanitized.slice(0, index), pieces = str.trim().split(':'), 
+        // eslint-disable-next-line unicorn/explicit-length-check
+        i = pieces.slice(1).findIndex(pseudo => simplePseudos.has(pseudo)) + 1 || pieces.length;
+        if (pieces.slice(i).some(pseudo => !simplePseudos.has(pseudo))) {
+            throw new SyntaxError(`非法的选择器！\n${str}\n可能需要将':'转义为'\\:'。`);
+        }
+        step.push(desanitize(pieces.slice(0, i).join(':')), ...pieces.slice(i).map(piece => `:${piece}`));
+    };
     while (mt) {
         let { 0: syntax, index } = mt;
         if (syntax.trim() === '') {
@@ -104,13 +103,13 @@ const parseSelector = (selector) => {
             syntax = grouping.has(char) ? char : '';
         }
         if (syntax === ',') { // 情形1：并列
-            pushSimple(step, sanitized.slice(0, index));
+            pushSimple(index);
             condition = [[]];
             [step] = condition;
             stack.push(condition);
         }
         else if (combinator.has(syntax)) { // 情形2：关系
-            pushSimple(step, sanitized.slice(0, index));
+            pushSimple(index);
             if (!step.some(Boolean)) {
                 throw new SyntaxError(`非法的选择器！\n${selector}\n可能需要通用选择器'*'。`);
             }
@@ -119,7 +118,7 @@ const parseSelector = (selector) => {
             condition.push(step);
         }
         else if (syntax === '[') { // 情形3：属性开启
-            pushSimple(step, sanitized.slice(0, index));
+            pushSimple(index);
             regex = attributeRegex;
         }
         else if (syntax.endsWith(']')) { // 情形4：属性闭合
@@ -132,7 +131,7 @@ const parseSelector = (selector) => {
             if (!pseudoExec) {
                 throw new SyntaxError(`非法的选择器！\n${desanitize(sanitized)}\n请检查伪选择器是否存在。`);
             }
-            pushSimple(step, sanitized.slice(0, pseudoExec.index));
+            pushSimple(pseudoExec.index);
             step.push(pseudoExec[1]); // 临时存放复杂伪选择器
             regex = functionRegex;
         }
@@ -149,7 +148,7 @@ const parseSelector = (selector) => {
         mt = regex.exec(sanitized);
     }
     if (regex === regularRegex) {
-        pushSimple(step, sanitized);
+        pushSimple(Infinity);
         const pseudos = new Set(stack.flat(2).filter((e) => typeof e === 'string' && e.startsWith(':')));
         if (pseudos.size > 0) {
             Parser.warn('检测到伪选择器，请确认是否需要将":"转义成"\\:"。', pseudos);

package/dist/parser/table.js

@@ -8,7 +8,10 @@ const index_2 = require("../src/table/index");
 const tr_1 = require("../src/table/tr");
 const td_1 = require("../src/table/td");
 const dd_1 = require("../src/nowiki/dd");
-/** @ignore */
+/**
+ * 判断是否为表格行或表格
+ * @param token 表格节点
+ */
 const isTr = (token) => token.lastChild.constructor !== index_1.Token;
 /**
  * 解析表格，注意`tr`和`td`包含开头的换行
@@ -20,30 +23,32 @@ const parseTable = ({ firstChild: { data }, type, name }, config = Parser.getCon
     const stack = [], lines = data.split('\n');
     let out = type === 'root' || type === 'parameter-value' || type === 'ext-inner' && name === 'poem'
         ? ''
-        : `\n${lines.shift()}`;
+        : `\n${lines.shift()}`, top;
     /**
      * 向表格中插入纯文本
      * @param str 待插入的文本
-     * @param top 当前解析的表格或表格行
+     * @param topToken 当前解析的表格或表格行
      */
-    const push = (str, top) => {
-        if (!top) {
+    const push = (str, topToken) => {
+        if (!topToken) {
             out += str;
             return;
         }
-        const { lastChild } = top;
-        if (isTr(top)) {
+        const { lastChild } = topToken;
+        if (isTr(topToken)) {
             const token = new index_1.Token(str, config, accum);
             token.type = 'table-inter';
             token.setAttribute('stage', 3);
-            top.insertAt(token);
+            topToken.insertAt(token);
         }
         else {
             lastChild.setText(String(lastChild) + str);
         }
-    };
+    }, 
+    /** 取出最近的表格行 */
+    pop = () => top.type === 'td' ? stack.pop() : top;
     for (const outLine of lines) {
-        let top = stack.pop();
+        top = stack.pop();
         const [spaces] = /^(?:\s|\0\d+c\x7F)*/u.exec(outLine), line = outLine.slice(spaces.length), matchesStart = /^(:*)((?:\s|\0\d+c\x7F)*)(\{\||\{(?:\0\d+c\x7F)*\0\d+!\x7F|\0\d+\{\x7F)(.*)$/u
             .exec(line);
         if (matchesStart) {
@@ -79,9 +84,7 @@ const parseTable = ({ firstChild: { data }, type, name }, config = Parser.getCon
             push(attr, stack.at(-1));
         }
         else if (row) {
-            if (top.type === 'td') {
-                top = stack.pop();
-            }
+            top = pop();
             if (top.type === 'tr') {
                 top = stack.pop();
             }
@@ -90,20 +93,25 @@ const parseTable = ({ firstChild: { data }, type, name }, config = Parser.getCon
             top.insertAt(tr);
         }
         else {
-            if (top.type === 'td') {
-                top = stack.pop();
-            }
+            top = pop();
             const regex = cell === '!' ? /!!|(?:\||\0\d+!\x7F){2}|\0\d+\+\x7F/gu : /(?:\||\0\d+!\x7F){2}|\0\d+\+\x7F/gu;
             let mt = regex.exec(attr), lastIndex = 0, lastSyntax = `\n${spaces}${cell}`;
+            /**
+             * 创建表格单元格
+             * @param tr 当前表格行
+             */
+            const createTd = (tr) => {
+                const td = new td_1.TdToken(lastSyntax, attr.slice(lastIndex, mt?.index), config, accum);
+                tr.insertAt(td);
+                return td;
+            };
             while (mt) {
-                top.insertAt(new td_1.TdToken(lastSyntax, attr.slice(lastIndex, mt.index), config, accum));
+                createTd(top);
                 ({ lastIndex } = regex);
                 [lastSyntax] = mt;
                 mt = regex.exec(attr);
             }
-            const td = new td_1.TdToken(lastSyntax, attr.slice(lastIndex), config, accum);
-            stack.push(top, td);
-            top.insertAt(td);
+            stack.push(top, createTd(top));
         }
     }
     return out.slice(1);

package/dist/src/arg.d.ts

@@ -41,8 +41,6 @@ export declare class ArgToken extends Token {
      * @override
      * @param token 待插入的子节点
      * @param i 插入位置
-     * @throws `RangeError` 不可插入多余子节点
-     * @throws `TypeError` 不可插入文本节点
      */
     insertAt<T extends Token>(token: T, i?: number): T;
     /**

package/dist/src/arg.js

@@ -141,16 +141,14 @@ class ArgToken extends index_1.Token {
      * @override
      * @param token 待插入的子节点
      * @param i 插入位置
-     * @throws `RangeError` 不可插入多余子节点
-     * @throws `TypeError` 不可插入文本节点
      */
     insertAt(token, i = this.length) {
         i += i < 0 ? this.length : 0;
         if (i > 1) {
-            throw new RangeError(`${this.constructor.name}不可插入多余的子节点！`);
+            this.constructorError('不可插入多余的子节点');
         }
         else if (typeof token === 'string') {
-            throw new TypeError(`${this.constructor.name}不可插入文本节点！`);
+            this.constructorError('不可插入文本节点');
         }
         super.insertAt(token, i);
         if (i === 1) {

package/dist/src/attribute.d.ts

@@ -17,6 +17,7 @@ declare const AttributeToken_base: ((abstract new (...args: any[]) => {
     setAttribute<T_2 extends string>(key: T_2, value: TokenAttributeSetter<T_2>): void;
     addEventListener(events: string | string[], listener: AstListener): void;
     replaceChildren(...elements: (string | Parser.AstNodes)[]): void;
+    constructorError(msg: string): never;
 }) & {
     readonly fixed: true;
 }) & typeof Parser.Token;

package/dist/src/attribute.js

@@ -360,15 +360,15 @@ class AttributeToken extends (0, fixed_1.fixed)(index_1.Token) {
         else if (this.type === 'ext-attr' && value.includes('>')) {
             throw new RangeError('扩展标签属性不能包含 ">"！');
         }
-        else if (value.includes('"') && value.includes("'")) {
+        else if (value.includes('"') && value.includes(`'`)) {
             throw new RangeError('属性值不能同时包含单引号和双引号！');
         }
         const config = this.getAttribute('config'), { childNodes } = Parser.parse(value, this.getAttribute('include'), stages[this.type] + 1, config);
         this.lastChild.replaceChildren(...childNodes);
         if (value.includes('"')) {
-            this.#quotes = ["'", "'"];
+            this.#quotes = [`'`, `'`];
         }
-        else if (value.includes("'") || !this.#quotes[0]) {
+        else if (value.includes(`'`) || !this.#quotes[0]) {
             this.#quotes = ['"', '"'];
         }
         else {

package/dist/src/attributes.d.ts

@@ -70,16 +70,18 @@ export declare class AttributesToken extends Token {
      * @override
      * @param token 待插入的子节点
      * @param i 插入位置
-     * @throws `RangeError` 不是AttributeToken或标签不匹配
+     * @throws `RangeError` 标签不匹配
      */
     insertAt<T extends AttributeToken | AtomToken>(token: T, i?: number): T;
     /**
      * 设置指定属性
      * @param key 属性键
      * @param value 属性值
+     * @param prop 属性对象
      * @throws `RangeError` 扩展标签属性不能包含">"
      */
     setAttr(key: string, value: string | boolean): void;
+    setAttr(prop: Record<string, string | boolean>): void;
     /**
      * 标签是否具有某属性
      * @param key 属性键