wikiparser-node 1.5.7 → 1.6.0

package/dist/addon/table.d.ts

@@ -1,6 +1 @@
-import type { TableCoords } from '../src/table/trBase';
-/** @extends {Array<TableCoords[]>} */
-export declare class Layout extends Array<TableCoords[]> {
-    /** 打印表格布局 */
-    print(): void;
-}
+export {};

package/dist/addon/table.js

@@ -1,7 +1,6 @@
 "use strict";
 /* eslint @stylistic/operator-linebreak: [2, "before", {overrides: {"=": "after"}}] */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Layout = void 0;
 const assert = require("assert/strict");
 const debug_1 = require("../util/debug");
 const constants_1 = require("../util/constants");
@@ -24,11 +23,6 @@ const cmpCoords = (coords1, coords2) => {
     const diff = coords1.row - coords2.row;
     return diff === 0 ? coords1.column - coords2.column : diff;
 };
-/**
- * 是否是行尾
- * @param {Token} cell 表格单元格
- */
-const isRowEnd = ({ type }) => type === 'tr' || type === 'table-syntax';
 /**
  * 是否是合并单元格的第一列
  * @param rowLayout 行布局
@@ -82,79 +76,6 @@ const fill = (y, rowToken, layout, maxCol, token) => {
         }
     });
 };
-/** @extends {Array<TableCoords[]>} */
-class Layout extends Array {
-    /** 打印表格布局 */
-    print() {
-        const hBorders = (0, debug_1.emptyArray)(this.length + 1, i => {
-            const prev = this[i - 1] ?? [], next = this[i] ?? [];
-            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), 
-            // eslint-disable-next-line no-sparse-arrays
-            border = [' ', , , '┌', , '┐', '─', '┬', , '│', '└', '├', '┘', '┤', '┴', '┼'];
-            for (let j = 0; j <= hBorder.length; j++) {
-                const bit = (vBorderTop[j] << 3) + (vBorderBottom[j] << 0)
-                    + (hBorder[j - 1] << 2) + (hBorder[j] << 1);
-                out += `${border[bit]}${hBorder[j] ? '─' : ' '}`;
-            }
-            out += '\n';
-        }
-        console.log(out.slice(0, -1));
-    }
-}
-exports.Layout = Layout;
-table_1.TableToken.prototype.getNthCell =
-    /** @implements */
-    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 */
-    function (stop) {
-        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;
-            }
-            const rowLayout = layout[i];
-            let j = 0, k = 0, last;
-            for (const cell of rows[i].childNodes.slice(2)) {
-                if (cell.type === 'td') {
-                    if (cell.isIndependent()) {
-                        last = cell.subtype !== 'caption';
-                    }
-                    if (last) {
-                        const coords = { row: i, column: j }, { rowspan, colspan } = cell;
-                        j++;
-                        while (rowLayout[k]) {
-                            k++;
-                        }
-                        if (i === stop?.row && j > (stop.column ?? NaN)) {
-                            layout[i][k] = coords;
-                            return layout;
-                        }
-                        for (let y = i; y < Math.min(i + rowspan, length); y++) {
-                            for (let x = k; x < k + colspan; x++) {
-                                layout[y][x] = coords;
-                            }
-                        }
-                        k += colspan;
-                        if (i === stop?.y && k > (stop.x ?? NaN)) {
-                            return layout;
-                        }
-                    }
-                }
-                else if (isRowEnd(cell)) {
-                    break;
-                }
-            }
-        }
-        return layout;
-    };
 table_1.TableToken.prototype.printLayout =
     /** @implements */
     function () {
@@ -508,7 +429,7 @@ table_1.TableToken.prototype.moveTableRowAfter =
             }
         }
         if (afterToken === this) {
-            const index = this.childNodes.slice(2).findIndex(isRowEnd);
+            const index = this.childNodes.slice(2).findIndex(table_1.isRowEnd);
             this.insertAt(rowToken, index + 2);
         }
         else {
@@ -546,7 +467,7 @@ table_1.TableToken.prototype.moveCol =
                 }
                 if (start) {
                     const col = rowLayout.slice(reference + Number(after)).find(({ row }) => row === i)?.column;
-                    rowToken.insertBefore(token, col === undefined ? rowToken.childNodes.slice(2).find(isRowEnd) : rowToken.getNthCol(col));
+                    rowToken.insertBefore(token, col === undefined ? rowToken.childNodes.slice(2).find(table_1.isRowEnd) : rowToken.getNthCol(col));
                 }
             }
         }

package/dist/mixin/attributesParent.d.ts

@@ -8,15 +8,15 @@ export interface AttributesParentBase {
     /** id属性 */
     id: string;
     /**
-     * AttributesToken子节点是否具有某属性
+     * 获取AttributesToken子节点的属性
      * @param key 属性键
      */
-    hasAttr(key: string): boolean;
+    getAttr(key: string): string | true | undefined;
     /**
-     * 获取AttributesToken子节点的属性
+     * AttributesToken子节点是否具有某属性
      * @param key 属性键
      */
-    getAttr(key: string): string | true | undefined;
+    hasAttr(key: string): boolean;
     /** 列举AttributesToken子节点的属性键 */
     getAttrNames(): Set<string>;
     /** 获取AttributesToken子节点的全部标签属性 */

package/dist/mixin/attributesParent.js

@@ -15,6 +15,7 @@ const attributesParent = (i = 0) => (constructor, _) => {
         get #attributesChild() {
             return this.childNodes[i];
         }
+        /* NOT FOR BROWSER */
         /** @implements */
         get attributes() {
             return this.#attributesChild.attributes;
@@ -43,14 +44,16 @@ const attributesParent = (i = 0) => (constructor, _) => {
         set id(id) {
             this.#attributesChild.id = id;
         }
-        /** @implements */
-        hasAttr(key) {
-            return this.#attributesChild.hasAttr(key);
-        }
+        /* NOT FOR BROWSER END */
         /** @implements */
         getAttr(key) {
             return this.#attributesChild.getAttr(key);
         }
+        /* NOT FOR BROWSER */
+        /** @implements */
+        hasAttr(key) {
+            return this.#attributesChild.hasAttr(key);
+        }
         /** @implements */
         getAttrNames() {
             return this.#attributesChild.getAttrNames();

package/dist/src/index.js

@@ -397,7 +397,6 @@ class Token extends element_1.AstElement {
     normalizeTitle(title, defaultNs = 0, halfParsed = false, decode = false, selfLink = false) {
         return index_1.default.normalizeTitle(title, defaultNs, this.#include, this.#config, halfParsed, decode, selfLink);
     }
-    /* NOT FOR BROWSER */
     /** @override */
     lint(start = this.getAbsoluteIndex(), re) {
         const errors = super.lint(start, re);
@@ -428,8 +427,48 @@ class Token extends element_1.AstElement {
                 }
             }
         }
+        if (this.type === 'root') {
+            const regex = /<!--\s*lint-(disable(?:(?:-next)?-line)?|enable)(\s[\sa-z,-]*)?-->/gu, wikitext = String(this), ignores = [];
+            let mt = regex.exec(wikitext), last = 0, curLine = 0;
+            while (mt) {
+                const { 1: type, index } = mt, detail = mt[2]?.trim();
+                curLine += wikitext.slice(last, index).split('\n').length - 1;
+                last = index;
+                ignores.push({
+                    line: curLine + (type === 'disable-line' ? 0 : 1),
+                    from: type === 'disable' ? regex.lastIndex : undefined,
+                    to: type === 'enable' ? regex.lastIndex : undefined,
+                    rules: detail ? new Set(detail.split(',').map(r => r.trim())) : undefined,
+                });
+                mt = regex.exec(wikitext);
+            }
+            return errors.filter(({ rule, startLine, startIndex }) => {
+                const nearest = { pos: 0 };
+                for (const { line, from, to, rules } of ignores) {
+                    if (line > startLine + 1) {
+                        break;
+                    }
+                    else if (rules && !rules.has(rule)) {
+                        continue;
+                    }
+                    else if (line === startLine && from === undefined && to === undefined) {
+                        return false;
+                    }
+                    else if (from <= startIndex && from > nearest.pos) {
+                        nearest.pos = from;
+                        nearest.type = 'from';
+                    }
+                    else if (to <= startIndex && to > nearest.pos) {
+                        nearest.pos = to;
+                        nearest.type = 'to';
+                    }
+                }
+                return nearest.type !== 'from';
+            });
+        }
         return errors;
     }
+    /* NOT FOR BROWSER */
     /** @private */
     protectChildren(...args) {
         this.#protectedChildren.push(...new ranges_1.Ranges(args));

package/dist/src/link/base.js

@@ -12,7 +12,6 @@ const atom_1 = require("../atom");
  * @classdesc `{childNodes: [AtomToken, ...Token]}`
  */
 class LinkBaseToken extends index_2.Token {
-    /* NOT FOR BROWSER END */
     #bracket = true;
     #delimiter;
     #title;
@@ -63,8 +62,8 @@ class LinkBaseToken extends index_2.Token {
         if (this.#delimiter.includes('\0')) {
             this.#delimiter = this.buildFromStr(this.#delimiter, constants_1.BuildMethod.String);
         }
-        /* NOT FOR BROWSER */
         this.setAttribute('name', this.#title.title);
+        /* NOT FOR BROWSER */
         const /** @implements */ linkListener = (e, data) => {
             const { prevTarget } = e;
             if (prevTarget?.type === 'link-target') {

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

@@ -5,10 +5,6 @@ import { AttributesToken } from '../attributes';
 import type { AttributesParentBase } from '../../mixin/attributesParent';
 export interface TableBaseToken extends AttributesParentBase {
 }
-/**
- * 表格行，含开头的换行，不含结尾的换行
- * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ...Token]}`
- */
 export declare abstract class TableBaseToken extends Token {
     type: 'table' | 'tr' | 'td';
     readonly childNodes: readonly [SyntaxToken, AttributesToken, ...Token[]];
@@ -28,3 +24,4 @@ export declare abstract class TableBaseToken extends Token {
     /** 转义表格语法 */
     escape(): void;
 }
+export {};

package/dist/src/table/base.js

@@ -1,38 +1,4 @@
 "use strict";
-var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
-    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
-    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
-    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
-    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
-    var _, done = false;
-    for (var i = decorators.length - 1; i >= 0; i--) {
-        var context = {};
-        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
-        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
-        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
-        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
-        if (kind === "accessor") {
-            if (result === void 0) continue;
-            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
-            if (_ = accept(result.get)) descriptor.get = _;
-            if (_ = accept(result.set)) descriptor.set = _;
-            if (_ = accept(result.init)) initializers.unshift(_);
-        }
-        else if (_ = accept(result)) {
-            if (kind === "field") initializers.unshift(_);
-            else descriptor[key] = _;
-        }
-    }
-    if (target) Object.defineProperty(target, contextIn.name, descriptor);
-    done = true;
-};
-var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
-    var useValue = arguments.length > 2;
-    for (var i = 0; i < initializers.length; i++) {
-        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
-    }
-    return useValue ? value : void 0;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TableBaseToken = void 0;
 const debug_1 = require("../../util/debug");
@@ -53,80 +19,63 @@ const escapeTable = (syntax) => {
         : String(child)).join(''), { childNodes } = index_1.default.parse(wikitext, syntax.getAttribute('include'), 2, syntax.getAttribute('config'));
     syntax.replaceChildren(...childNodes);
 };
-/* NOT FOR BROWSER END */
 /**
  * 表格行，含开头的换行，不含结尾的换行
  * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ...Token]}`
  */
-let TableBaseToken = (() => {
-    let _classDecorators = [(0, attributesParent_1.attributesParent)(1)];
-    let _classDescriptor;
-    let _classExtraInitializers = [];
-    let _classThis;
-    let _classSuper = index_2.Token;
-    var TableBaseToken = class extends _classSuper {
-        static { _classThis = this; }
-        static {
-            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
-            TableBaseToken = _classThis = _classDescriptor.value;
-            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
-            __runInitializers(_classThis, _classExtraInitializers);
-        }
-        /* NOT FOR BROWSER END */
-        /**
-         * @param pattern 表格语法正则
-         * @param syntax 表格语法
-         * @param attr 表格属性
-         */
-        constructor(pattern, syntax, attr, config = index_1.default.getConfig(), accum = [], acceptable = {}) {
-            super(undefined, config, accum, acceptable);
-            this.append(new syntax_1.SyntaxToken(syntax, pattern, 'table-syntax', config, accum, {
-                'Stage-1': ':', '!ExtToken': '', TranscludeToken: ':',
-            }), 
-            // @ts-expect-error abstract class
-            new attributes_1.AttributesToken(attr, 'table-attrs', this.type, config, accum));
-            /* NOT FOR BROWSER */
-            this.protectChildren(0, 1);
-        }
+class TableBaseToken extends (0, attributesParent_1.attributesParent)(1)(index_2.Token) {
+    /* NOT FOR BROWSER END */
+    /**
+     * @param pattern 表格语法正则
+     * @param syntax 表格语法
+     * @param attr 表格属性
+     */
+    constructor(pattern, syntax, attr, config = index_1.default.getConfig(), accum = [], acceptable = {}) {
+        super(undefined, config, accum, acceptable);
+        this.append(new syntax_1.SyntaxToken(syntax, pattern, 'table-syntax', config, accum, {
+            'Stage-1': ':', '!ExtToken': '', TranscludeToken: ':',
+        }), 
+        // @ts-expect-error abstract class
+        new attributes_1.AttributesToken(attr, 'table-attrs', this.type, config, accum));
         /* NOT FOR BROWSER */
-        /** @override */
-        cloneNode() {
-            const [syntax, attr, ...cloned] = this.cloneChildNodes();
-            return debug_1.Shadow.run(() => {
-                const { constructor } = this, token = new constructor(undefined, undefined, this.getAttribute('config'));
-                token.firstChild.safeReplaceWith(syntax);
-                token.childNodes[1].safeReplaceWith(attr);
-                if (token.type === 'td') { // TdToken
-                    token.childNodes[2].safeReplaceWith(cloned[0]);
-                }
-                else {
-                    token.append(...cloned);
-                }
-                return token;
-            });
-        }
-        /** 转义表格语法 */
-        escape() {
-            for (const child of this.childNodes) {
-                if (child instanceof syntax_1.SyntaxToken) {
-                    escapeTable(child);
-                }
-                else if (child instanceof TableBaseToken) {
-                    child.escape();
-                }
+        this.protectChildren(0, 1);
+    }
+    /* NOT FOR BROWSER */
+    /** @override */
+    cloneNode() {
+        const [syntax, attr, ...cloned] = this.cloneChildNodes();
+        return debug_1.Shadow.run(() => {
+            const { constructor } = this, token = new constructor(undefined, undefined, this.getAttribute('config'));
+            token.firstChild.safeReplaceWith(syntax);
+            token.childNodes[1].safeReplaceWith(attr);
+            if (token.type === 'td') { // TdToken
+                token.childNodes[2].safeReplaceWith(cloned[0]);
             }
-        }
-        /** @private */
-        setSyntax(syntax, esc = false) {
-            const { firstChild } = this;
-            firstChild.replaceChildren(syntax);
-            if (esc) {
-                escapeTable(firstChild);
+            else {
+                token.append(...cloned);
+            }
+            return token;
+        });
+    }
+    /** 转义表格语法 */
+    escape() {
+        for (const child of this.childNodes) {
+            if (child instanceof syntax_1.SyntaxToken) {
+                escapeTable(child);
             }
+            else if (child instanceof TableBaseToken) {
+                child.escape();
+            }
+        }
+    }
+    /** @private */
+    setSyntax(syntax, esc = false) {
+        const { firstChild } = this;
+        firstChild.replaceChildren(syntax);
+        if (esc) {
+            escapeTable(firstChild);
         }
-    };
-    return TableBaseToken = _classThis;
-})();
+    }
+}
 exports.TableBaseToken = TableBaseToken;
 constants_1.classes['TableBaseToken'] = __filename;

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

@@ -6,7 +6,6 @@ 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';
-import type { Layout } from '../../addon/table';
 export interface TableRenderedCoords {
     readonly row?: undefined;
     readonly column?: undefined;
@@ -15,6 +14,16 @@ export interface TableRenderedCoords {
 }
 export interface TableToken extends SyntaxBase {
 }
+/**
+ * 是否是行尾
+ * @param {Token} cell 表格单元格
+ */
+export declare const isRowEnd: ({ type }: Token) => boolean;
+/** @extends {Array<TableCoords[]>} */
+export declare class Layout extends Array<TableCoords[]> {
+    /** 打印表格布局 */
+    print(): void;
+}
 /**
  * 表格
  * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ?Token, ...TdToken, ...TrToken, ?SyntaxToken]}`
@@ -41,35 +50,6 @@ export declare abstract class TableToken extends TrBaseToken {
      * @param halfParsed
      */
     close(syntax?: string, halfParsed?: boolean): void;
-    /** @override */
-    json(): AST;
-    /**
-     * @override
-     * @param token 待插入的子节点
-     * @param i 插入位置
-     * @throws `SyntaxError` 表格的闭合部分非法
-     */
-    insertAt<T extends Token>(token: T, i?: number): T;
-    /** @override */
-    getRowCount(): number;
-    /** 获取下一行 */
-    getNextRow(): TrToken | undefined;
-    /**
-     * 获取第n行
-     * @param n 行号
-     * @param force 是否将表格自身视为第一行
-     * @param insert 是否用于判断插入新行的位置
-     * @throws `RangeError` 不存在该行
-     */
-    getNthRow(n: number, force?: boolean, insert?: false): TrToken | this | undefined;
-    getNthRow(n: number, force: boolean, insert: true): TrToken | this | SyntaxToken | undefined;
-    /** 获取所有行 */
-    getAllRows(): (TrToken | this)[];
-    /**
-     * 获取指定坐标的单元格
-     * @param coords 表格坐标
-     */
-    getNthCell(coords: TableCoords | TableRenderedCoords): TdToken | undefined;
     /**
      * 获取表格布局
      * @param stop 中止条件
@@ -84,6 +64,35 @@ export declare abstract class TableToken extends TrBaseToken {
         x?: number;
         y?: number;
     }): Layout;
+    /** 获取所有行 */
+    getAllRows(): (TrToken | this)[];
+    /**
+     * 获取指定坐标的单元格
+     * @param coords 表格坐标
+     */
+    getNthCell(coords: TableCoords | TableRenderedCoords): TdToken | undefined;
+    /**
+     * 获取第n行
+     * @param n 行号
+     * @param force 是否将表格自身视为第一行
+     * @param insert 是否用于判断插入新行的位置
+     * @throws `RangeError` 不存在该行
+     */
+    getNthRow(n: number, force?: boolean, insert?: false): TrToken | this | undefined;
+    getNthRow(n: number, force: boolean, insert: true): TrToken | this | SyntaxToken | undefined;
+    /** @override */
+    json(): AST;
+    /**
+     * @override
+     * @param token 待插入的子节点
+     * @param i 插入位置
+     * @throws `SyntaxError` 表格的闭合部分非法
+     */
+    insertAt<T extends Token>(token: T, i?: number): T;
+    /** @override */
+    getRowCount(): number;
+    /** 获取下一行 */
+    getNextRow(): TrToken | undefined;
     /** 打印表格布局 */
     printLayout(): void;
     /**

package/dist/src/table/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TableToken = void 0;
+exports.TableToken = exports.Layout = exports.isRowEnd = void 0;
 const lint_1 = require("../../util/lint");
 const debug_1 = require("../../util/debug");
 const string_1 = require("../../util/string");
@@ -10,6 +10,37 @@ const trBase_1 = require("./trBase");
 const syntax_1 = require("../syntax");
 /* NOT FOR BROWSER END */
 const closingPattern = /^\n[^\S\n]*(?:\|\}|\{\{\s*!\s*\}\}\}|\{\{\s*!\)\s*\}\})$/u;
+/**
+ * 是否是行尾
+ * @param {Token} cell 表格单元格
+ */
+const isRowEnd = ({ type }) => type === 'tr' || type === 'table-syntax';
+exports.isRowEnd = isRowEnd;
+/** @extends {Array<TableCoords[]>} */
+class Layout extends Array {
+    /* NOT FOR BROWSER */
+    /** 打印表格布局 */
+    print() {
+        const hBorders = (0, debug_1.emptyArray)(this.length + 1, i => {
+            const prev = this[i - 1] ?? [], next = this[i] ?? [];
+            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), 
+            // eslint-disable-next-line no-sparse-arrays
+            border = [' ', , , '┌', , '┐', '─', '┬', , '│', '└', '├', '┘', '┤', '┴', '┼'];
+            for (let j = 0; j <= hBorder.length; j++) {
+                const bit = (vBorderTop[j] << 3) + (vBorderBottom[j] << 0)
+                    + (hBorder[j - 1] << 2) + (hBorder[j] << 1);
+                out += `${border[bit]}${hBorder[j] ? '─' : ' '}`;
+            }
+            out += '\n';
+        }
+        console.log(out.slice(0, -1));
+    }
+}
+exports.Layout = Layout;
 /**
  * 表格
  * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ?Token, ...TdToken, ...TrToken, ?SyntaxToken]}`
@@ -43,7 +74,6 @@ class TableToken extends trBase_1.TrBaseToken {
         if (!this.closed) {
             errors.push((0, lint_1.generateForChild)(this.firstChild, { start }, 'unclosed-table', index_1.default.msg('unclosed $1', 'table')));
         }
-        /* NOT FOR BROWSER */
         const layout = this.getLayout(), { length } = layout;
         if (length > 1) {
             let low = 1, high = Infinity, j = 0;
@@ -67,7 +97,6 @@ class TableToken extends trBase_1.TrBaseToken {
                 errors.push((0, lint_1.generateForChild)(this.getNthRow(j), { start }, 'table-layout', 'inconsistent table layout', 'warning'));
             }
         }
-        /* NOT FOR BROWSER END */
         return errors;
     }
     /**
@@ -87,47 +116,91 @@ class TableToken extends trBase_1.TrBaseToken {
         }
         this.lastChild.replaceChildren(...inner);
     }
-    /** @override */
-    json() {
-        const json = super.json();
-        json['closed'] = this.closed;
-        return json;
-    }
-    /* NOT FOR BROWSER */
     /**
-     * @override
-     * @param token 待插入的子节点
-     * @param i 插入位置
-     * @throws `SyntaxError` 表格的闭合部分非法
+     * 获取表格布局
+     * @param stop 中止条件
+     * @param stop.row 中止行
+     * @param stop.column 中止列
+     * @param stop.x 中止行
+     * @param stop.y 中止列
      */
-    insertAt(token, i = this.length) {
-        i += i < 0 ? this.length : 0;
-        const previous = this.childNodes[i - 1];
-        if (typeof token !== 'string' && token.type === 'td' && previous?.type === 'tr') {
-            index_1.default.warn('改为将单元格插入当前行。');
-            return previous.insertAt(token);
-        }
-        else if (i > 0 && token instanceof syntax_1.SyntaxToken && token.pattern !== closingPattern) {
-            throw new SyntaxError(`表格的闭合部分不符合语法：${(0, string_1.noWrap)(String(token))}`);
+    getLayout(stop) {
+        const rows = this.getAllRows(), { length } = rows, layout = new Layout(...(0, debug_1.emptyArray)(length, () => []));
+        for (let i = 0; i < length; i++) {
+            /* NOT FOR BROWSER */
+            if (i > (stop?.row ?? stop?.y ?? NaN)) {
+                break;
+            }
+            /* NOT FOR BROWSER END */
+            const rowLayout = layout[i];
+            let j = 0, k = 0, last;
+            for (const cell of rows[i].childNodes.slice(2)) {
+                if (cell.type === 'td') {
+                    if (cell.isIndependent()) {
+                        last = cell.subtype !== 'caption';
+                    }
+                    if (last) {
+                        const coords = { row: i, column: j }, { rowspan, colspan } = cell;
+                        j++;
+                        while (rowLayout[k]) {
+                            k++;
+                        }
+                        /* NOT FOR BROWSER */
+                        if (i === stop?.row && j > stop.column) {
+                            layout[i][k] = coords;
+                            return layout;
+                        }
+                        /* NOT FOR BROWSER END */
+                        for (let y = i; y < Math.min(i + rowspan, length); y++) {
+                            for (let x = k; x < k + colspan; x++) {
+                                layout[y][x] = coords;
+                            }
+                        }
+                        k += colspan;
+                        /* NOT FOR BROWSER */
+                        if (i === stop?.y && k > (stop.x ?? NaN)) {
+                            return layout;
+                        }
+                    }
+                }
+                else if ((0, exports.isRowEnd)(cell)) {
+                    break;
+                }
+            }
         }
-        return super.insertAt(token, i);
+        return layout;
     }
-    /** @override */
-    getRowCount() {
-        return super.getRowCount() + this.childNodes.filter(child => child.type === 'tr' && child.getRowCount()).length;
+    /** 获取所有行 */
+    getAllRows() {
+        return [
+            ...super.getRowCount() ? [this] : [],
+            ...this.childNodes.slice(1)
+                .filter((child) => child.type === 'tr' && child.getRowCount() > 0),
+        ];
     }
-    /** 获取下一行 */
-    getNextRow() {
-        return this.getNthRow(super.getRowCount() ? 1 : 0, false, false);
+    /**
+     * 获取指定坐标的单元格
+     * @param coords 表格坐标
+     */
+    getNthCell(coords) {
+        const rawCoords = coords.row === undefined ? this.toRawCoords(coords) : coords;
+        return rawCoords && this.getNthRow(rawCoords.row, false, false)?.getNthCol(rawCoords.column);
     }
     getNthRow(n, force = false, insert = false) {
-        const nRows = this.getRowCount(), isRow = super.getRowCount();
+        const isRow = super.getRowCount();
+        /* NOT FOR BROWSER */
+        const nRows = this.getRowCount();
         n += n < 0 ? nRows : 0;
-        if (n === 0 && (isRow || force && nRows === 0)) {
+        /* NOT FOR BROWSER END */
+        if (n === 0
+            && (isRow
+                || force && nRows === 0)) {
             return this;
+            /* NOT FOR BROWSER */
         }
         else if (n < 0 || n > nRows || n === nRows && !insert) {
             throw new RangeError(`不存在第 ${n} 行！`);
+            /* NOT FOR BROWSER END */
         }
         else if (isRow) {
             n--;
@@ -138,40 +211,47 @@ class TableToken extends trBase_1.TrBaseToken {
                 if (n < 0) {
                     return child;
                 }
+                /* NOT FOR BROWSER */
             }
             else if (child.type === 'table-syntax') {
                 return child;
+                /* NOT FOR BROWSER END */
             }
         }
         return undefined;
     }
-    /** 获取所有行 */
-    getAllRows() {
-        return [
-            ...super.getRowCount() ? [this] : [],
-            ...this.childNodes.slice(1)
-                .filter((child) => child.type === 'tr' && child.getRowCount() > 0),
-        ];
+    /** @override */
+    json() {
+        const json = super.json();
+        json['closed'] = this.closed;
+        return json;
     }
+    /* NOT FOR BROWSER */
     /**
-     * 获取指定坐标的单元格
-     * @param coords 表格坐标
+     * @override
+     * @param token 待插入的子节点
+     * @param i 插入位置
+     * @throws `SyntaxError` 表格的闭合部分非法
      */
-    getNthCell(coords) {
-        require('../../addon/table');
-        return this.getNthCell(coords);
+    insertAt(token, i = this.length) {
+        i += i < 0 ? this.length : 0;
+        const previous = this.childNodes[i - 1];
+        if (typeof token !== 'string' && token.type === 'td' && previous?.type === 'tr') {
+            index_1.default.warn('改为将单元格插入当前行。');
+            return previous.insertAt(token);
+        }
+        else if (i > 0 && token instanceof syntax_1.SyntaxToken && token.pattern !== closingPattern) {
+            throw new SyntaxError(`表格的闭合部分不符合语法：${(0, string_1.noWrap)(String(token))}`);
+        }
+        return super.insertAt(token, i);
     }
-    /**
-     * 获取表格布局
-     * @param stop 中止条件
-     * @param stop.row 中止行
-     * @param stop.column 中止列
-     * @param stop.x 中止行
-     * @param stop.y 中止列
-     */
-    getLayout(stop) {
-        require('../../addon/table');
-        return this.getLayout(stop);
+    /** @override */
+    getRowCount() {
+        return super.getRowCount() + this.childNodes.filter(child => child.type === 'tr' && child.getRowCount()).length;
+    }
+    /** 获取下一行 */
+    getNextRow() {
+        return this.getNthRow(super.getRowCount() ? 1 : 0, false, false);
     }
     /** 打印表格布局 */
     printLayout() {

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

@@ -25,14 +25,14 @@ export declare abstract class TdToken extends TableBaseToken {
     abstract get children(): [SyntaxToken, AttributesToken, Token];
     abstract get parentElement(): TrToken | TableToken | undefined;
     abstract get nextElementSibling(): this | TrToken | SyntaxToken | undefined;
-    /** 单元格类型 */
-    get subtype(): TdSubtypes;
-    set subtype(subtype: TdSubtypes);
     /** rowspan */
     get rowspan(): number;
-    set rowspan(rowspan: number);
     /** colspan */
     get colspan(): number;
+    /** 单元格类型 */
+    get subtype(): TdSubtypes;
+    set subtype(subtype: TdSubtypes);
+    set rowspan(rowspan: number);
     set colspan(colspan: number);
     /** 内部wikitext */
     get innerText(): string;
@@ -48,6 +48,11 @@ export declare abstract class TdToken extends TableBaseToken {
     lint(start?: number, re?: RegExp): LintError[];
     /** 是否位于行首 */
     isIndependent(): boolean;
+    /**
+     * @override
+     * @param key 属性键
+     */
+    getAttr<T extends string>(key: T): TdAttrGetter<T>;
     /** @override */
     print(): string;
     /** @override */
@@ -56,11 +61,6 @@ export declare abstract class TdToken extends TableBaseToken {
     cloneNode(): this;
     /** 改为独占一行 */
     independence(): void;
-    /**
-     * @override
-     * @param key 属性键
-     */
-    getAttr<T extends string>(key: T): TdAttrGetter<T>;
     /** @override */
     getAttrs(): TdAttrs;
     /**

package/dist/src/table/td.js

@@ -42,6 +42,7 @@ const fixed_1 = require("../../mixin/fixed");
 const index_1 = require("../../index");
 const index_2 = require("../index");
 const base_1 = require("./base");
+/* NOT FOR BROWSER END */
 /**
  * `<td>`、`<th>`和`<caption>`
  * @classdesc `{childNodes: [SyntaxToken, AttributesToken, Token]}`
@@ -65,6 +66,14 @@ let TdToken = (() => {
         type = 'td';
         #innerSyntax = '';
         /* NOT FOR BROWSER END */
+        /** rowspan */
+        get rowspan() {
+            return this.getAttr('rowspan');
+        }
+        /** colspan */
+        get colspan() {
+            return this.getAttr('colspan');
+        }
         /** 单元格类型 */
         get subtype() {
             return this.#getSyntax().subtype;
@@ -73,17 +82,9 @@ let TdToken = (() => {
         set subtype(subtype) {
             this.setSyntax(subtype);
         }
-        /** rowspan */
-        get rowspan() {
-            return this.getAttr('rowspan');
-        }
         set rowspan(rowspan) {
             this.setAttr('rowspan', rowspan);
         }
-        /** colspan */
-        get colspan() {
-            return this.getAttr('colspan');
-        }
         set colspan(colspan) {
             this.setAttr('colspan', colspan);
         }
@@ -223,6 +224,15 @@ let TdToken = (() => {
         isIndependent() {
             return this.firstChild.text().startsWith('\n');
         }
+        /**
+         * @override
+         * @param key 属性键
+         */
+        getAttr(key) {
+            const value = super.getAttr(key);
+            key = key.toLowerCase().trim();
+            return (key === 'rowspan' || key === 'colspan' ? Number(value) || 1 : value);
+        }
         /** @override */
         print() {
             const { childNodes: [syntax, attr, inner] } = this;
@@ -276,15 +286,6 @@ let TdToken = (() => {
                 this.setSyntax(subtype, escape);
             }
         }
-        /**
-         * @override
-         * @param key 属性键
-         */
-        getAttr(key) {
-            const value = super.getAttr(key);
-            key = key.toLowerCase().trim();
-            return (key === 'rowspan' || key === 'colspan' ? Number(value) || 1 : value);
-        }
         /** @override */
         getAttrs() {
             const attr = super.getAttrs();

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

@@ -17,6 +17,16 @@ export declare abstract class TrBaseToken extends TableBaseToken {
     type: 'table' | 'tr';
     /** @override */
     lint(start?: number, re?: RegExp): LintError[];
+    /** 获取行数 */
+    getRowCount(): number;
+    /**
+     * 获取第n列
+     * @param n 列号
+     * @param insert 是否用于判断插入新列的位置
+     * @throws `RangeError` 不存在对应单元格
+     */
+    getNthCol(n: number, insert?: false): TdToken | undefined;
+    getNthCol(n: number, insert: true): TdToken | TrToken | SyntaxToken | undefined;
     /** @override */
     text(): string;
     /**
@@ -30,18 +40,8 @@ export declare abstract class TrBaseToken extends TableBaseToken {
      * @param i 插入位置
      */
     insertAt<T extends Token>(token: T, i?: number): T;
-    /** 获取行数 */
-    getRowCount(): number;
     /** 获取列数 */
     getColCount(): number;
-    /**
-     * 获取第n列
-     * @param n 列号
-     * @param insert 是否用于判断插入新列的位置
-     * @throws `RangeError` 不存在对应单元格
-     */
-    getNthCol(n: number, insert?: false): TdToken | undefined;
-    getNthCol(n: number, insert: true): TdToken | TrToken | SyntaxToken | undefined;
     /**
      * 插入新的单元格
      * @param inner 单元格内部wikitext

package/dist/src/table/trBase.js

@@ -37,6 +37,38 @@ class TrBaseToken extends base_1.TableBaseToken {
         errors.push(error);
         return errors;
     }
+    /** 获取行数 */
+    getRowCount() {
+        return Number(this.childNodes.some(child => child instanceof td_1.TdToken && child.isIndependent() && !child.firstChild.text().endsWith('+')));
+    }
+    getNthCol(n, insert = false) {
+        /* NOT FOR BROWSER */
+        const nCols = this.getColCount();
+        n += n < 0 ? nCols : 0;
+        if (n < 0 || n > nCols || n === nCols && !insert) {
+            throw new RangeError(`不存在第 ${n} 个单元格！`);
+        }
+        const isTr = (0, debug_1.isToken)('tr'), isSyntax = (0, debug_1.isToken)('table-syntax');
+        /* NOT FOR BROWSER END */
+        let last = 0;
+        for (const child of this.childNodes.slice(2)) {
+            if (child instanceof td_1.TdToken) {
+                if (child.isIndependent()) {
+                    last = Number(child.subtype !== 'caption');
+                }
+                n -= last;
+                if (n < 0) {
+                    return child;
+                }
+                /* NOT FOR BROWSER */
+            }
+            else if (isTr(child) || isSyntax(child)) {
+                return child;
+                /* NOT FOR BROWSER END */
+            }
+        }
+        return undefined;
+    }
     /* NOT FOR BROWSER */
     /** 修复简单的表格语法错误 */
     #correct() {
@@ -97,10 +129,6 @@ class TrBaseToken extends base_1.TableBaseToken {
         }
         return super.insertAt(token, i);
     }
-    /** 获取行数 */
-    getRowCount() {
-        return Number(this.childNodes.some(child => child instanceof td_1.TdToken && child.isIndependent() && !child.firstChild.text().endsWith('+')));
-    }
     /** 获取列数 */
     getColCount() {
         let count = 0, last = 0;
@@ -112,30 +140,6 @@ class TrBaseToken extends base_1.TableBaseToken {
         }
         return count;
     }
-    getNthCol(n, insert = false) {
-        const nCols = this.getColCount();
-        n += n < 0 ? nCols : 0;
-        if (n < 0 || n > nCols || n === nCols && !insert) {
-            throw new RangeError(`不存在第 ${n} 个单元格！`);
-        }
-        let last = 0;
-        const isTr = (0, debug_1.isToken)('tr'), isSyntax = (0, debug_1.isToken)('table-syntax');
-        for (const child of this.childNodes.slice(2)) {
-            if (child instanceof td_1.TdToken) {
-                if (child.isIndependent()) {
-                    last = Number(child.subtype !== 'caption');
-                }
-                n -= last;
-                if (n < 0) {
-                    return child;
-                }
-            }
-            else if (isTr(child) || isSyntax(child)) {
-                return child;
-            }
-        }
-        return undefined;
-    }
     /**
      * 插入新的单元格
      * @param inner 单元格内部wikitext

package/dist/util/debug.js

@@ -50,7 +50,6 @@ const setChildNodes = (parent, position, deleteCount, inserted = []) => {
     return removed;
 };
 exports.setChildNodes = setChildNodes;
-/* NOT FOR BROWSER */
 /**
  * 生成一个指定长度的空数组
  * @param n 数组长度
@@ -58,6 +57,7 @@ exports.setChildNodes = setChildNodes;
  */
 const emptyArray = (n, callback) => new Array(n).fill(undefined).map((_, i) => callback(i));
 exports.emptyArray = emptyArray;
+/* NOT FOR BROWSER */
 /**
  * 撤销最近一次Mutation
  * @param e 事件

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.5.7",
+	"version": "1.6.0",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",