wikiparser-node 1.18.2 → 1.18.3

package/dist/src/link/file.js

@@ -4,13 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileToken = void 0;
-const string_1 = require("../../util/string");
 const lint_1 = require("../../util/lint");
 const rect_1 = require("../../lib/rect");
 const index_1 = __importDefault(require("../../index"));
 const base_1 = require("./base");
 const imageParameter_1 = require("../imageParameter");
 /* NOT FOR BROWSER */
+const string_1 = require("../../util/string");
 const debug_1 = require("../../util/debug");
 const constants_1 = require("../../util/constants");
 const title_1 = require("../../lib/title");
@@ -20,24 +20,21 @@ const frame = new Map([
     ['frameless', 'Frameless'],
     ['framed', 'Frame'],
     ['thumbnail', 'Thumb'],
-]), horizAlign = new Set(['left', 'right', 'center', 'none']), vertAlign = new Set(['baseline', 'sub', 'super', 'top', 'text-top', 'middle', 'bottom', 'text-bottom']);
+]), horizAlign = new Set(['left', 'right', 'center', 'none']), vertAlign = new Set(['baseline', 'sub', 'super', 'top', 'text-top', 'middle', 'bottom', 'text-bottom']), extensions = new Set(['tiff', 'tif', 'png', 'gif', 'jpg', 'jpeg', 'webp', 'xcf', 'pdf', 'svg', 'djvu']);
 /**
  * a more sophisticated string-explode function
- * @param start start syntax of a nested AST node
- * @param end end syntax of a nested AST node
- * @param separator syntax for explosion
  * @param str string to be exploded
  */
-const explode = (start, end, separator, str) => {
+const explode = (str) => {
     if (str === undefined) {
         return [];
     }
-    const regex = new RegExp(`${[start, end, separator].map(string_1.escapeRegExp).join('|')}`, 'gu'), exploded = [];
+    const regex = /-\{|\}-|\|/gu, exploded = [];
     let mt = regex.exec(str), depth = 0, lastIndex = 0;
     while (mt) {
         const { 0: match, index } = mt;
-        if (match !== separator) {
-            depth += match === start ? 1 : -1;
+        if (match !== '|') {
+            depth += match === '-{' ? 1 : -1;
         }
         else if (depth === 0) {
             exploded.push(str.slice(lastIndex, index));
@@ -59,12 +56,10 @@ class FileToken extends base_1.LinkBaseToken {
     get type() {
         return 'file';
     }
-    /* PRINT ONLY */
     /** file extension / 扩展名 */
     get extension() {
         return this.getAttribute('title').extension;
     }
-    /* PRINT ONLY END */
     /* NOT FOR BROWSER */
     /** image link / 图片链接 */
     get link() {
@@ -124,7 +119,7 @@ class FileToken extends base_1.LinkBaseToken {
         /* NOT FOR BROWSER END */
         const { extension } = this.getTitle(true, true);
         /-\{|\}-|\|/gu; // eslint-disable-line @typescript-eslint/no-unused-expressions
-        this.append(...explode('-{', '}-', '|', text).map(
+        this.append(...explode(text).map(
         // @ts-expect-error abstract class
         (part) => new imageParameter_1.ImageParameterToken(part, extension, config, accum)));
     }
@@ -155,12 +150,14 @@ class FileToken extends base_1.LinkBaseToken {
          * 图片参数到语法错误的映射
          * @param msg 消息键
          * @param p1 替换$1
+         * @param severity 错误等级
          */
-        const generate = (msg, p1) => (arg) => {
-            const e = (0, lint_1.generateForChild)(arg, rect, 'no-duplicate', index_1.default.msg(`${msg} image $1 parameter`, p1));
+        const generate = (msg, p1, severity) => (arg) => {
+            const e = (0, lint_1.generateForChild)(arg, rect, 'no-duplicate', index_1.default.msg(`${msg} image $1 parameter`, p1), severity);
             e.suggestions = [{ desc: 'remove', range: [e.startIndex - 1, e.endIndex], text: '' }];
             return e;
         };
+        const { extension } = this;
         for (const key of keys) {
             if (key === 'invalid' || key === 'width' && unscaled) {
                 continue;
@@ -173,7 +170,7 @@ class FileToken extends base_1.LinkBaseToken {
                 ];
             }
             if (relevantArgs.length > 1) {
-                errors.push(...relevantArgs.map(generate('duplicated', key)));
+                errors.push(...relevantArgs.map(generate('duplicated', key, key === 'caption' && extension && !extensions.has(extension) ? 'warning' : 'error')));
             }
         }
         if (frameKeys.length > 1) {
@@ -368,7 +365,6 @@ class FileToken extends base_1.LinkBaseToken {
                 .parse(value, this.getAttribute('include'), undefined, config);
             parameter.replaceChildren(...childNodes);
         }
-        parameter.afterBuild();
         this.insertAt(parameter);
     }
     /* istanbul ignore next */
@@ -407,7 +403,7 @@ class FileToken extends base_1.LinkBaseToken {
             catch { }
         }
         const a = link
-            ? `<a${href && ` href="${href}"`}${hasLink ? '' : ` class="mw-file-description"`}${titleAttr}${typeof link === 'string' ? ` rel="nofollow"` : ''}>${img}</a>`
+            ? `<a${href && ` href="${href}"`}${hasLink ? '' : ' class="mw-file-description"'}${titleAttr}${typeof link === 'string' ? ' rel="nofollow"' : ''}>${img}</a>`
             : `<span${titleAttr}>${img}</span>`;
         if (type !== 'gallery-image') {
             return horiz || vert || visibleCaption

package/dist/src/link/galleryImage.js

@@ -106,7 +106,7 @@ let GalleryImageToken = (() => {
         /** @private */
         getTitle(temporary) {
             const imagemap = this.type === 'imagemap-image';
-            return this.normalizeTitle(this.firstChild.toString(), imagemap ? 0 : 6, temporary, true, !imagemap);
+            return this.normalizeTitle(this.firstChild.toString(), imagemap ? 0 : 6, { halfParsed: true, temporary, decode: !imagemap });
         }
         /** @private */
         getAttribute(key) {

package/dist/src/link/redirectTarget.js

@@ -41,8 +41,7 @@ class RedirectTargetToken extends base_1.LinkBaseToken {
     }
     /** @private */
     getTitle() {
-        return this
-            .normalizeTitle(this.firstChild.toString(), 0, false, true, true);
+        return this.normalizeTitle(this.firstChild.toString(), 0, { halfParsed: true, decode: true });
     }
     /** @private */
     lint(start = this.getAbsoluteIndex()) {

package/dist/src/magicLink.d.ts

@@ -63,11 +63,5 @@ export declare abstract class MagicLinkToken extends Token {
      * 是否是模板或魔术字参数
      */
     isParamValue(): boolean;
-    /**
-     * Escape `=`
-     *
-     * 转义 `=`
-     */
-    escape(): void;
 }
 export {};

package/dist/src/magicLink.js

@@ -38,6 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MagicLinkToken = void 0;
+const common_1 = require("@bhsd/common");
 const lint_1 = require("../util/lint");
 const string_1 = require("../util/string");
 const rect_1 = require("../lib/rect");
@@ -59,6 +60,8 @@ const isbnPattern = new RegExp(String.raw `^(ISBN)${space}+(?:97[89]${spdash}?)?
 // eslint-disable-next-line @typescript-eslint/no-unused-expressions, es-x/no-regexp-unicode-property-escapes
 /^(RFC|PMID)[\p{Zs}\t]+\d+$/u;
 const rfcPattern = new RegExp(String.raw `^(RFC|PMID)${space}+\d+$`, 'u');
+/^(ftp:\/\/|\/\/)/iu; // eslint-disable-line @typescript-eslint/no-unused-expressions
+const getUrlRegex = (0, common_1.getRegex)(protocol => new RegExp(`^(${protocol})`, 'iu'));
 /* NOT FOR BROWSER END */
 /**
  * free external link
@@ -141,8 +144,7 @@ let MagicLinkToken = (() => {
                 pattern = url?.startsWith('ISBN') ? isbnPattern : rfcPattern;
             }
             else {
-                /^(ftp:\/\/|\/\/)/iu; // eslint-disable-line @typescript-eslint/no-unused-expressions
-                pattern = new RegExp(`^(${config.protocol}${type === 'ext-link-url' ? '|//' : ''})`, 'iu');
+                pattern = getUrlRegex(config.protocol + (type === 'ext-link-url' ? '|//' : ''));
             }
             this.setAttribute('pattern', pattern);
         }
@@ -188,7 +190,7 @@ let MagicLinkToken = (() => {
                 if (type === 'magic-link') {
                     if (link.startsWith('ISBN')) {
                         return this
-                            .normalizeTitle(`BookSources/${link.slice(5)}`, -1, true)
+                            .normalizeTitle(`BookSources/${link.slice(5)}`, -1, { temporary: true })
                             .getUrl(articlePath);
                     }
                     link = link.startsWith('RFC')
@@ -243,18 +245,6 @@ let MagicLinkToken = (() => {
         isParamValue() {
             return this.closest('parameter')?.getValue() === this.text();
         }
-        /**
-         * Escape `=`
-         *
-         * 转义 `=`
-         */
-        escape() {
-            for (const child of this.childNodes) {
-                if (child.type === 'text') {
-                    child.escape();
-                }
-            }
-        }
         /** @private */
         toHtmlInternal() {
             const { type, innerText, protocol } = this;

package/dist/src/nested.js

@@ -15,7 +15,12 @@ const noinclude_1 = require("./nowiki/noinclude");
 /* NOT FOR BROWSER */
 const debug_1 = require("../util/debug");
 const constants_1 = require("../util/constants");
-const childTypes = new Set(['comment', 'include', 'arg', 'template', 'magic-word']);
+const childTypes = new Set(['comment', 'include', 'arg', 'template', 'magic-word']), lintRegex = [false, true].map(article => {
+    const noinclude = article ? 'includeonly' : 'noinclude';
+    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+    /^(?:<noinclude(?:\s[^>]*)?\/?>|<\/noinclude\s*>)$/iu;
+    return new RegExp(String.raw `^(?:<${noinclude}(?:\s[^>]*)?/?>|</${noinclude}\s*>)$`, 'iu');
+});
 /**
  * extension tag that has a nested structure
  *
@@ -60,12 +65,7 @@ class NestedToken extends index_2.Token {
     }
     /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
-        const rect = new rect_1.BoundingRect(this, start), noinclude = this.#regex ? 'includeonly' : 'noinclude';
-        // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-        /^(?:<noinclude(?:\s[^>]*)?\/?>|<\/noinclude\s*>)$/iu;
-        const regex = typeof this.#regex === 'boolean'
-            ? new RegExp(String.raw `^(?:<${noinclude}(?:\s[^>]*)?/?>|</${noinclude}\s*>)$`, 'iu')
-            : /^<!--[\s\S]*-->$/u;
+        const rect = new rect_1.BoundingRect(this, start), regex = typeof this.#regex === 'boolean' ? lintRegex[this.#regex ? 1 : 0] : /^<!--[\s\S]*-->$/u;
         return [
             ...super.lint(start, re),
             ...this.childNodes.filter(child => {

package/dist/src/nowiki/base.js

@@ -40,6 +40,7 @@ const index_1 = require("../index");
 const debug_1 = require("../../util/debug");
 const constants_1 = require("../../util/constants");
 const fixed_1 = require("../../mixin/fixed");
+const noEscape_1 = require("../../mixin/noEscape");
 /**
  * text-only token that will not be parsed
  *
@@ -47,7 +48,7 @@ const fixed_1 = require("../../mixin/fixed");
  * @classdesc `{childNodes: [AstText]}`
  */
 let NowikiBaseToken = (() => {
-    let _classDecorators = [fixed_1.fixedToken];
+    let _classDecorators = [fixed_1.fixedToken, noEscape_1.noEscape];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;

package/dist/src/nowiki/index.js

@@ -4,12 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NowikiToken = void 0;
+const common_1 = require("@bhsd/common");
 const lint_1 = require("../../util/lint");
 const index_1 = __importDefault(require("../../index"));
 const base_1 = require("./base");
 /* NOT FOR BROWSER */
 const constants_1 = require("../../util/constants");
 /* NOT FOR BROWSER END */
+/<\s*(?:\/\s*)?(nowiki)\b/giu; // eslint-disable-line @typescript-eslint/no-unused-expressions
+const getLintRegex = (0, common_1.getRegex)(name => new RegExp(String.raw `<\s*(?:/\s*)${name === 'nowiki' ? '' : '?'}(${name})\b`, 'giu'));
 /**
  * text-only token inside an extension tag
  *
@@ -28,9 +31,7 @@ class NowikiToken extends base_1.NowikiBaseToken {
             e.fix = { range: [start, e.endIndex], text: '', desc: 'empty' };
             return [e];
         }
-        /<\s*(?:\/\s*)?(nowiki)\b/giu; // eslint-disable-line @typescript-eslint/no-unused-expressions
-        const re = new RegExp(String.raw `<\s*(?:/\s*)${name === 'nowiki' ? '' : '?'}(${name})\b`, 'giu');
-        return super.lint(start, re);
+        return super.lint(start, getLintRegex(name));
     }
 }
 exports.NowikiToken = NowikiToken;

package/dist/src/onlyinclude.js

@@ -1,4 +1,38 @@
 "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;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -8,6 +42,7 @@ const index_1 = require("./index");
 /* NOT FOR BROWSER */
 const debug_1 = require("../util/debug");
 const constants_1 = require("../util/constants");
+const noEscape_1 = require("../mixin/noEscape");
 const index_2 = __importDefault(require("../index"));
 /* NOT FOR BROWSER END */
 /**
@@ -16,51 +51,67 @@ const index_2 = __importDefault(require("../index"));
  * 嵌入时的`<onlyinclude>`
  * @classdesc `{childNodes: (AstText|Token)[]}`
  */
-class OnlyincludeToken extends index_1.Token {
-    get type() {
-        return 'onlyinclude';
-    }
-    /* NOT FOR BROWSER */
-    /** inner wikitext / 内部wikitext */
-    get innerText() {
-        return this.text();
-    }
-    /** @throws `RangeError` 不允许包含`</onlyinclude>` */
-    set innerText(text) {
-        /* istanbul ignore if */
-        if (text.includes('</onlyinclude>')) {
-            throw new RangeError('"</onlyinclude>" is not allowed in the text!');
+let OnlyincludeToken = (() => {
+    let _classDecorators = [noEscape_1.noEscape];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = index_1.Token;
+    var OnlyincludeToken = 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);
+            OnlyincludeToken = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
         }
-        this.replaceChildren(...index_2.default.parse(text, true, undefined, this.getAttribute('config')).childNodes);
-    }
-    /* NOT FOR BROWSER END */
-    /** @private */
-    toString(skip) {
-        return `<onlyinclude>${super.toString(skip)}</onlyinclude>`;
-    }
-    /** @private */
-    getAttribute(key) {
-        if (key === 'padding') {
-            return 13;
+        get type() {
+            return 'onlyinclude';
         }
-        return (key === 'plain') || super.getAttribute(key);
-    }
-    /** @private */
-    print() {
-        return super.print({
-            pre: '<span class="wpb-ext">&lt;onlyinclude&gt;</span>',
-            post: '<span class="wpb-ext">&lt;/onlyinclude&gt;</span>',
-        });
-    }
-    /* NOT FOR BROWSER */
-    cloneNode() {
-        const cloned = this.cloneChildNodes();
-        return debug_1.Shadow.run(() => {
-            const token = new OnlyincludeToken(undefined, this.getAttribute('config'));
-            token.append(...cloned);
-            return token;
-        });
-    }
-}
+        /* NOT FOR BROWSER */
+        /** inner wikitext / 内部wikitext */
+        get innerText() {
+            return this.text();
+        }
+        /** @throws `RangeError` 不允许包含`</onlyinclude>` */
+        set innerText(text) {
+            /* istanbul ignore if */
+            if (text.includes('</onlyinclude>')) {
+                throw new RangeError('"</onlyinclude>" is not allowed in the text!');
+            }
+            this.replaceChildren(...index_2.default.parse(text, true, undefined, this.getAttribute('config')).childNodes);
+        }
+        /* NOT FOR BROWSER END */
+        /** @private */
+        toString(skip) {
+            return `<onlyinclude>${super.toString(skip)}</onlyinclude>`;
+        }
+        /** @private */
+        getAttribute(key) {
+            if (key === 'padding') {
+                return 13;
+            }
+            return (key === 'plain') || super.getAttribute(key);
+        }
+        /** @private */
+        print() {
+            return super.print({
+                pre: '<span class="wpb-ext">&lt;onlyinclude&gt;</span>',
+                post: '<span class="wpb-ext">&lt;/onlyinclude&gt;</span>',
+            });
+        }
+        /* NOT FOR BROWSER */
+        cloneNode() {
+            const cloned = this.cloneChildNodes();
+            return debug_1.Shadow.run(() => {
+                const token = new OnlyincludeToken(undefined, this.getAttribute('config'));
+                token.append(...cloned);
+                return token;
+            });
+        }
+    };
+    return OnlyincludeToken = _classThis;
+})();
 exports.OnlyincludeToken = OnlyincludeToken;
 constants_1.classes['OnlyincludeToken'] = __filename;

package/dist/src/parameter.d.ts

@@ -63,10 +63,4 @@ export declare abstract class ParameterToken extends Token {
      * @throws `RangeError` 更名造成重复参数
      */
     rename(key: string, force?: boolean): void;
-    /**
-     * Ecape `=`
-     *
-     * 转义 `=`
-     */
-    escape(): void;
 }

package/dist/src/parameter.js

@@ -195,7 +195,7 @@ let ParameterToken = (() => {
         /** @private */
         json(_, start = this.getAbsoluteIndex()) {
             const json = super.json(undefined, start);
-            Object.assign(json, { anon: this.anon, duplicated: this.duplicated });
+            Object.assign(json, { anon: this.anon }, this.duplicated && { duplicated: true });
             return json;
         }
         /* NOT FOR BROWSER */
@@ -269,18 +269,6 @@ let ParameterToken = (() => {
             }
             this.firstChild.replaceChildren(...root.childNodes);
         }
-        /**
-         * Ecape `=`
-         *
-         * 转义 `=`
-         */
-        escape() {
-            for (const child of this.lastChild.childNodes) {
-                if (child.type === 'text') {
-                    child.escape();
-                }
-            }
-        }
     };
     return ParameterToken = _classThis;
 })();

package/dist/src/redirect.js

@@ -40,9 +40,13 @@ const index_1 = require("./index");
 const syntax_1 = require("./syntax");
 const redirectTarget_1 = require("./link/redirectTarget");
 /* NOT FOR BROWSER */
+const common_1 = require("@bhsd/common");
 const constants_1 = require("../util/constants");
 const debug_1 = require("../util/debug");
 const fixed_1 = require("../mixin/fixed");
+const noEscape_1 = require("../mixin/noEscape");
+/^(?:#redirect|#重定向)\s*(?::\s*)?$/iu; // eslint-disable-line @typescript-eslint/no-unused-expressions
+const getPattern = (0, common_1.getObjRegex)(redirection => new RegExp(String.raw `^(?:${redirection.join('|')})\s*(?::\s*)?$`, 'iu'));
 /* NOT FOR BROWSER END */
 /**
  * redirect
@@ -51,7 +55,7 @@ const fixed_1 = require("../mixin/fixed");
  * @classdesc `{childNodes: [SyntaxToken, LinkToken]}`
  */
 let RedirectToken = (() => {
-    let _classDecorators = [fixed_1.fixedToken, (0, hidden_1.hiddenToken)(false, false)];
+    let _classDecorators = [fixed_1.fixedToken, noEscape_1.noEscape, (0, hidden_1.hiddenToken)(false, false)];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
@@ -82,11 +86,7 @@ let RedirectToken = (() => {
             super(undefined, config, accum);
             this.#pre = pre;
             this.#post = post;
-            /^(?:#redirect|#重定向)\s*(?::\s*)?$/iu; // eslint-disable-line @typescript-eslint/no-unused-expressions
-            const pattern = new RegExp(String.raw `^(?:${config.redirection.join('|')})\s*(?::\s*)?$`, 'iu');
-            this.append(new syntax_1.SyntaxToken(syntax, pattern, 'redirect-syntax', config, accum, {
-                AstText: ':',
-            }), 
+            this.append(new syntax_1.SyntaxToken(syntax, getPattern(config.redirection), 'redirect-syntax', config, accum, { AstText: ':' }), 
             // @ts-expect-error abstract class
             new redirectTarget_1.RedirectTargetToken(link, text?.slice(1), config, accum));
         }

package/dist/src/syntax.d.ts

@@ -12,7 +12,10 @@ declare type SyntaxTypes = 'heading-trail' | 'magic-word-name' | 'table-syntax'
 export declare class SyntaxToken extends Token {
     #private;
     get type(): SyntaxTypes;
-    /** @param pattern 语法正则 */
+    /**
+     * @class
+     * @param pattern 语法正则
+     */
     constructor(wikitext: string | undefined, pattern: RegExp, type: SyntaxTypes, config?: Config, accum?: Token[], acceptable?: Acceptable);
     cloneNode(): this;
 }

package/dist/src/syntax.js

@@ -64,7 +64,10 @@ let SyntaxToken = (() => {
         get type() {
             return this.#type;
         }
-        /** @param pattern 语法正则 */
+        /**
+         * @class
+         * @param pattern 语法正则
+         */
         constructor(wikitext, pattern, type, config, accum, acceptable) {
             super(wikitext, config, accum, acceptable);
             this.#type = type;

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

@@ -22,11 +22,6 @@ export declare abstract class TableBaseToken extends Token {
      */
     constructor(pattern: RegExp, syntax: string, type: TableTypes, attr?: string, config?: Parser.Config, accum?: Token[], acceptable?: Acceptable);
     cloneNode(): this;
-    /**
-     * Escape the table syntax
-     *
-     * 转义表格语法
-     */
     escape(): void;
 }
 export {};

package/dist/src/table/base.js

@@ -39,9 +39,7 @@ class TableBaseToken extends (0, attributesParent_1.attributesParent)(1)(index_2
      */
     constructor(pattern, syntax, type, 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: ':',
-        }), 
+        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', type, config, accum));
         /* NOT FOR BROWSER */
@@ -63,17 +61,12 @@ class TableBaseToken extends (0, attributesParent_1.attributesParent)(1)(index_2
             return token;
         });
     }
-    /**
-     * Escape the table syntax
-     *
-     * 转义表格语法
-     */
     escape() {
         for (const child of this.childNodes) {
             if (child instanceof syntax_1.SyntaxToken) {
                 escapeTable(child);
             }
-            else if (child instanceof TableBaseToken) {
+            else {
                 child.escape();
             }
         }

package/dist/src/table/index.js

@@ -130,9 +130,12 @@ class TableToken extends trBase_1.TrBaseToken {
      * @param halfParsed
      */
     close(syntax = '\n|}', halfParsed) {
-        const config = this.getAttribute('config'), accum = this.getAttribute('accum'), inner = halfParsed
-            ? [syntax]
-            : index_1.default.parse(syntax, this.getAttribute('include'), 2, config).childNodes;
+        const config = this.getAttribute('config'), accum = this.getAttribute('accum'), 
+        /* eslint-disable unicorn/no-negated-condition, @stylistic/operator-linebreak */
+        inner = !halfParsed ?
+            index_1.default.parse(syntax, this.getAttribute('include'), 2, config).childNodes :
+            [syntax];
+        /* eslint-enable unicorn/no-negated-condition, @stylistic/operator-linebreak */
         if (this.lastChild.type !== 'table-syntax') {
             debug_1.Shadow.run(() => {
                 const token = new syntax_1.SyntaxToken(undefined, closingPattern, 'table-syntax', config, accum, { 'Stage-1': ':', '!ExtToken': '', TranscludeToken: ':' });

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

@@ -67,6 +67,7 @@ export declare abstract class TdToken extends TableBaseToken {
      */
     setAttr<T extends string>(key: T, value: TdAttrSetter<T>): void;
     setAttr(prop: Record<string, string | number | boolean>): void;
+    escape(): void;
 }
 /**
  * 创建新的单元格

package/dist/src/table/td.js

@@ -260,8 +260,8 @@ let TdToken = (() => {
         }
         /** @private */
         json(_, start = this.getAbsoluteIndex()) {
-            const json = super.json(undefined, start);
-            Object.assign(json, { subtype: this.subtype, rowspan: this.rowspan, colspan: this.colspan });
+            const json = super.json(undefined, start), { rowspan, colspan } = this;
+            Object.assign(json, { subtype: this.subtype }, rowspan !== 1 && { rowspan }, colspan !== 1 && { colspan });
             return json;
         }
         /* NOT FOR BROWSER */
@@ -335,7 +335,6 @@ let TdToken = (() => {
                 this.#innerSyntax = '';
             }
         }
-        /** @private */
         escape() {
             super.escape();
             if (this.childNodes[1].toString()) {

package/dist/src/table/trBase.js

@@ -9,6 +9,7 @@ const debug_1 = require("../../util/debug");
 const constants_1 = require("../../util/constants");
 const html_1 = require("../../util/html");
 const index_1 = require("../index");
+const tableTags = new Set(['tr', 'td', 'th', 'caption']);
 /**
  * table row or table
  *
@@ -24,7 +25,8 @@ class TrBaseToken extends base_1.TableBaseToken {
         const first = inter.childNodes.find(child => child.text().trim()), tdPattern = /^\s*(?:!|\{\{\s*![!-]?\s*\}\})/u;
         if (!first
             || tdPattern.test(first.toString())
-            || first.is('arg') && tdPattern.test(first.default || '')) {
+            || first.is('arg') && tdPattern.test(first.default || '')
+            || first.is('html') && tableTags.has(first.name)) {
             return errors;
         }
         else if (first.is('magic-word')) {