wikiparser-node 1.0.0-beta.2 → 1.0.0-beta.4

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

@@ -1,6 +1,6 @@
 import { LinkToken } from '.';
 /** 分类 */
-export declare abstract class CategoryToken extends LinkToken {
+export declare class CategoryToken extends LinkToken {
     /** @browser */
     readonly type = "category";
     /** 分类排序关键字 */

package/dist/src/link/category.js

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CategoryToken = void 0;
 const string_1 = require("../../util/string");
-const index_1 = require("../../index");
+const Parser = require("../../index");
 const _1 = require(".");
 /** 分类 */
+// @ts-expect-error not implementing all abstract methods
 class CategoryToken extends _1.LinkToken {
     /** @browser */
     type = 'category';
@@ -25,4 +26,4 @@ class CategoryToken extends _1.LinkToken {
     }
 }
 exports.CategoryToken = CategoryToken;
-index_1.default.classes['CategoryToken'] = __filename;
+Parser.classes['CategoryToken'] = __filename;

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

@@ -1,3 +1,4 @@
+import * as Parser from '../../index';
 import { LinkBaseToken } from './base';
 import { ImageParameterToken } from '../imageParameter';
 import type { Title } from '../../lib/title';
@@ -7,14 +8,14 @@ import type { Token, AtomToken } from '../../internal';
  * 图片
  * @classdesc `{childNodes: [AtomToken, ...ImageParameterToken]}`
  */
-export declare abstract class FileToken extends LinkBaseToken {
+export declare class FileToken extends LinkBaseToken {
     #private;
     /** @browser */
     readonly type: 'file' | 'gallery-image' | 'imagemap-image';
     childNodes: [AtomToken, ...ImageParameterToken[]];
     abstract get children(): [AtomToken, ...ImageParameterToken[]];
-    abstract get lastChild(): ImageParameterToken;
-    abstract get lastElementChild(): ImageParameterToken;
+    abstract get lastChild(): AtomToken | ImageParameterToken;
+    abstract get lastElementChild(): AtomToken | ImageParameterToken;
     /** 图片链接 */
     get link(): string | Title;
     set link(value: string | Title);
@@ -35,7 +36,7 @@ export declare abstract class FileToken extends LinkBaseToken {
      * @param text 图片参数
      * @param delimiter `|`
      */
-    constructor(link: string, text?: string, config?: import("../../index").Config, accum?: Token[], delimiter?: string);
+    constructor(link: string, text?: string, config?: Parser.Config, accum?: Token[], delimiter?: string);
     /**
      * @override
      * @browser

package/dist/src/link/file.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileToken = void 0;
 const string_1 = require("../../util/string");
 const lint_1 = require("../../util/lint");
-const index_1 = require("../../index");
+const Parser = require("../../index");
 const base_1 = require("./base");
 const imageParameter_1 = require("../imageParameter");
 const frame = new Set(['manualthumb', 'frameless', 'framed', 'thumbnail']), horizAlign = new Set(['left', 'right', 'center', 'none']), vertAlign = new Set(['baseline', 'sub', 'super', 'top', 'text-top', 'middle', 'bottom', 'text-bottom']);
@@ -39,6 +39,7 @@ const explode = (start, end, separator, str) => {
  * 图片
  * @classdesc `{childNodes: [AtomToken, ...ImageParameterToken]}`
  */
+// @ts-expect-error not implementing all abstract methods
 class FileToken extends base_1.LinkBaseToken {
     /** @browser */
     type = 'file';
@@ -85,12 +86,10 @@ class FileToken extends base_1.LinkBaseToken {
      * @param text 图片参数
      * @param delimiter `|`
      */
-    constructor(link, text, config = index_1.default.getConfig(), accum = [], delimiter = '|') {
+    constructor(link, text, config = Parser.getConfig(), accum = [], delimiter = '|') {
         super(link, undefined, config, accum, delimiter);
         this.setAttribute('acceptable', { AtomToken: 0, ImageParameterToken: '1:' });
-        this.append(...explode('-{', '}-', '|', text).map(
-        // @ts-expect-error abstract class
-        part => new imageParameter_1.ImageParameterToken(part, config, accum)));
+        this.append(...explode('-{', '}-', '|', text).map(part => new imageParameter_1.ImageParameterToken(part, config, accum)));
     }
     /**
      * @override
@@ -106,6 +105,12 @@ class FileToken extends base_1.LinkBaseToken {
             return errors;
         }
         const rect = { start, ...this.getRootNode().posFromIndex(start) };
+        /**
+         * 图片参数到语法错误的映射
+         * @param msg 消息键
+         * @param p1 替换$1
+         */
+        const generate = (msg, p1) => (arg) => (0, lint_1.generateForChild)(arg, rect, Parser.msg(`${msg} image $1 parameter`, p1));
         for (const key of keys) {
             let relevantArgs = args.filter(({ name }) => name === key);
             if (key === 'caption') {
@@ -115,17 +120,17 @@ class FileToken extends base_1.LinkBaseToken {
                 ];
             }
             if (relevantArgs.length > 1) {
-                errors.push(...relevantArgs.map(arg => (0, lint_1.generateForChild)(arg, rect, index_1.default.msg('duplicated image $1 parameter', key))));
+                errors.push(...relevantArgs.map(generate('duplicated', key)));
             }
         }
         if (frameKeys.length > 1) {
-            errors.push(...args.filter(({ name }) => frame.has(name)).map(arg => (0, lint_1.generateForChild)(arg, rect, index_1.default.msg('conflicting image $1 parameter', 'frame'))));
+            errors.push(...args.filter(({ name }) => frame.has(name)).map(generate('conflicting', 'frame')));
         }
         if (horizAlignKeys.length > 1) {
-            errors.push(...args.filter(({ name }) => horizAlign.has(name)).map(arg => (0, lint_1.generateForChild)(arg, rect, index_1.default.msg('conflicting image $1 parameter', 'horizontal-alignment'))));
+            errors.push(...args.filter(({ name }) => horizAlign.has(name)).map(generate('conflicting', 'horizontal-alignment')));
         }
         if (vertAlignKeys.length > 1) {
-            errors.push(...args.filter(({ name }) => vertAlign.has(name)).map(arg => (0, lint_1.generateForChild)(arg, rect, index_1.default.msg('conflicting image $1 parameter', 'vertical-alignment'))));
+            errors.push(...args.filter(({ name }) => vertAlign.has(name)).map(generate('conflicting', 'vertical-alignment')));
         }
         return errors;
     }
@@ -134,8 +139,7 @@ class FileToken extends base_1.LinkBaseToken {
      * @browser
      */
     getAllArgs() {
-        const { childNodes: [, ...args] } = this;
-        return args;
+        return this.childNodes.slice(1);
     }
     /**
      * 获取指定图片参数
@@ -154,7 +158,7 @@ class FileToken extends base_1.LinkBaseToken {
     #getTypedArgs(keys, type) {
         const args = this.getAllArgs().filter(({ name }) => keys.has(name));
         if (args.length > 1) {
-            index_1.default.warn(`图片 ${this.name} 带有 ${args.length} 个${type}参数，只有最后 1 个 ${args[0].name} 会生效！`);
+            Parser.warn(`图片 ${this.name} 带有 ${args.length} 个${type}参数，只有最后 1 个 ${args[0].name} 会生效！`);
         }
         return args;
     }
@@ -249,21 +253,19 @@ class FileToken extends base_1.LinkBaseToken {
             if (syntax.includes('$1')) {
                 this.typeError('setValue', 'Boolean');
             }
-            // @ts-expect-error abstract class
-            const newArg = index_1.default.run(() => new imageParameter_1.ImageParameterToken(syntax, config));
-            this.insertAt(newArg);
+            this.insertAt(Parser.run(() => new imageParameter_1.ImageParameterToken(syntax, config)));
             return;
         }
-        const wikitext = `[[File:F|${syntax ? syntax.replace('$1', value) : value}]]`, root = index_1.default.parse(wikitext, this.getAttribute('include'), 6, config), { length, firstChild: file } = root;
+        const wikitext = `[[File:F|${syntax ? syntax.replace('$1', value) : value}]]`, root = Parser.parse(wikitext, this.getAttribute('include'), 6, config), { length, firstChild: file } = root;
         if (length !== 1 || file.type !== 'file' || file.length !== 2) {
             throw new SyntaxError(`非法的 ${key} 参数：${(0, string_1.noWrap)(value)}`);
         }
         const { name, lastChild: imageParameter } = file;
-        if (name === 'File:F' && imageParameter.name === key) {
-            this.insertAt(imageParameter);
+        if (name !== 'File:F' || imageParameter.name !== key) {
+            throw new SyntaxError(`非法的 ${key} 参数：${(0, string_1.noWrap)(value)}`);
         }
-        throw new SyntaxError(`非法的 ${key} 参数：${(0, string_1.noWrap)(value)}`);
+        this.insertAt(imageParameter);
     }
 }
 exports.FileToken = FileToken;
-index_1.default.classes['FileToken'] = __filename;
+Parser.classes['FileToken'] = __filename;

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

@@ -1,15 +1,15 @@
+import * as Parser from '../../index';
 import { Token } from '..';
-import { FileToken } from './file';
 import type { Title } from '../../lib/title';
 import type { LintError } from '../../index';
 declare const GalleryImageToken_base: (abstract new (...args: any[]) => {
-    toString(selector?: string | undefined): string;
+    toString(omit?: Set<string> | undefined): string;
     text(): string;
     length: number;
     insertAt(token: unknown, i?: number | undefined): unknown;
-}) & typeof FileToken;
+}) & typeof Parser.FileToken;
 /** 图库图片 */
-export declare abstract class GalleryImageToken extends GalleryImageToken_base {
+export declare class GalleryImageToken extends GalleryImageToken_base {
     #private;
     type: 'gallery-image' | 'imagemap-image';
     /** 图片链接 */
@@ -21,7 +21,7 @@ export declare abstract class GalleryImageToken extends GalleryImageToken_base {
      * @param link 图片文件名
      * @param text 图片参数
      */
-    constructor(type: 'gallery' | 'imagemap', link: string, text?: string, config?: import("../../index").Config, accum?: Token[]);
+    constructor(type: 'gallery' | 'imagemap', link: string, text?: string, config?: Parser.Config, accum?: Token[]);
     /**
      * @override
      * @browser

package/dist/src/link/galleryImage.js

@@ -4,10 +4,11 @@ exports.GalleryImageToken = void 0;
 const lint_1 = require("../../util/lint");
 const debug_1 = require("../../util/debug");
 const singleLine_1 = require("../../mixin/singleLine");
-const index_1 = require("../../index");
+const Parser = require("../../index");
 const __1 = require("..");
 const file_1 = require("./file");
 /** 图库图片 */
+// @ts-expect-error not implementing all abstract methods
 class GalleryImageToken extends (0, singleLine_1.singleLine)(file_1.FileToken) {
     /** @browser */
     #invalid = false;
@@ -26,12 +27,12 @@ class GalleryImageToken extends (0, singleLine_1.singleLine)(file_1.FileToken) {
      * @param link 图片文件名
      * @param text 图片参数
      */
-    constructor(type, link, text, config = index_1.default.getConfig(), accum = []) {
+    constructor(type, link, text, config = Parser.getConfig(), accum = []) {
         let token;
         if (text !== undefined) {
             token = new __1.Token(text, config, true, accum);
             token.type = 'plain';
-            for (let n = 1; n < index_1.default.MAX_STAGE; n++) {
+            for (let n = 1; n < Parser.MAX_STAGE; n++) {
                 token.parseOnce();
             }
             accum.splice(accum.indexOf(token), 1);
@@ -83,18 +84,18 @@ class GalleryImageToken extends (0, singleLine_1.singleLine)(file_1.FileToken) {
      * @throws `SyntaxError` 非法的链接目标
      */
     setTarget(link) {
-        const include = this.getAttribute('include'), config = this.getAttribute('config'), root = index_1.default.parse(`<gallery>${link}</gallery>`, include, 1, config), { length, firstChild: ext } = root;
+        const include = this.getAttribute('include'), config = this.getAttribute('config'), root = Parser.parse(`<gallery>${link}</gallery>`, include, 1, config), { length, firstChild: ext } = root;
         if (length !== 1 || ext.type !== 'ext') {
             throw new SyntaxError(`非法的图库文件名：${link}`);
         }
         const { lastChild: gallery } = ext, { firstChild: image } = gallery;
-        if (gallery.length === 1 && image.type === 'gallery-image') {
-            const { firstChild } = image;
-            image.destroy();
-            this.firstChild.safeReplaceWith(firstChild);
+        if (gallery.length !== 1 || image.type !== 'gallery-image') {
+            throw new SyntaxError(`非法的图库文件名：${link}`);
         }
-        throw new SyntaxError(`非法的图库文件名：${link}`);
+        const { firstChild } = image;
+        image.destroy();
+        this.firstChild.safeReplaceWith(firstChild);
     }
 }
 exports.GalleryImageToken = GalleryImageToken;
-index_1.default.classes['GalleryImageToken'] = __filename;
+Parser.classes['GalleryImageToken'] = __filename;

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

@@ -5,7 +5,7 @@ import type { Token, AtomToken } from '../../internal';
  * 内链
  * @classdesc `{childNodes: [AtomToken, ?Token]}`
  */
-export declare abstract class LinkToken extends LinkBaseToken {
+export declare class LinkToken extends LinkBaseToken {
     #private;
     /** @browser */
     readonly type: 'link' | 'category';

package/dist/src/link/index.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LinkToken = void 0;
-const index_1 = require("../../index");
+const Parser = require("../../index");
 const base_1 = require("./base");
 /**
  * 内链
  * @classdesc `{childNodes: [AtomToken, ?Token]}`
  */
+// @ts-expect-error not implementing all abstract methods
 class LinkToken extends base_1.LinkBaseToken {
     /** @browser */
     type = 'link';
@@ -55,7 +56,7 @@ class LinkToken extends base_1.LinkBaseToken {
         else if (char === ':') {
             strLink = strLink.slice(1);
         }
-        const config = this.getAttribute('config'), include = this.getAttribute('include'), root = index_1.default.parse(`[[${lang}:${strLink}]]`, include, 6, config), { length, firstChild: wikiLink } = root;
+        const config = this.getAttribute('config'), include = this.getAttribute('include'), root = Parser.parse(`[[${lang}:${strLink}]]`, include, 6, config), { length, firstChild: wikiLink } = root;
         if (length !== 1 || !(wikiLink instanceof LinkToken) || wikiLink.length !== 1) {
             throw new SyntaxError(`非法的跨语言链接目标：${lang}:${strLink}`);
         }
@@ -73,12 +74,13 @@ class LinkToken extends base_1.LinkBaseToken {
      * @throws `SyntaxError` 非法的fragment
      */
     #setFragment(fragment, page = true) {
-        const frag = fragment && fragment.replace(/[<>[\]#|=]/gu, p => encodeURIComponent(p)), include = this.getAttribute('include'), config = this.getAttribute('config'), root = index_1.default.parse(`[[${page ? `:${this.name}` : ''}${frag === undefined ? '' : `#${frag}`}]]`, include, 6, config), { length, firstChild: wikiLink } = root;
+        fragment &&= fragment.replace(/[<>[\]#|=]/gu, p => encodeURIComponent(p));
+        const include = this.getAttribute('include'), config = this.getAttribute('config'), root = Parser.parse(`[[${page ? `:${this.name}` : ''}${fragment === undefined ? '' : `#${fragment}`}]]`, include, 6, config), { length, firstChild: wikiLink } = root;
         if (length !== 1 || !(wikiLink instanceof LinkToken) || wikiLink.length !== 1) {
-            throw new SyntaxError(`非法的 fragment：${frag ?? ''}`);
+            throw new SyntaxError(`非法的 fragment：${fragment ?? ''}`);
         }
         else if (page) {
-            index_1.default.warn(`${this.constructor.name}.setFragment 方法会同时规范化页面名！`);
+            Parser.warn(`${this.constructor.name}.setFragment 方法会同时规范化页面名！`);
         }
         const { firstChild } = wikiLink;
         wikiLink.destroy();
@@ -131,4 +133,4 @@ class LinkToken extends base_1.LinkBaseToken {
     }
 }
 exports.LinkToken = LinkToken;
-index_1.default.classes['LinkToken'] = __filename;
+Parser.classes['LinkToken'] = __filename;

package/dist/src/magicLink.d.ts

@@ -1,3 +1,4 @@
+import * as Parser from '../index';
 import { Token } from '.';
 import type { LintError } from '../index';
 /**
@@ -22,7 +23,7 @@ export declare class MagicLinkToken extends Token {
      * @param url 网址
      * @param doubleSlash 是否接受"//"作为协议
      */
-    constructor(url: string | undefined, doubleSlash: boolean, config?: import("../index").Config, accum?: Token[]);
+    constructor(url?: string, doubleSlash?: boolean, config?: Parser.Config, accum?: Token[]);
     /**
      * @override
      * @browser
@@ -40,7 +41,7 @@ export declare class MagicLinkToken extends Token {
      * @param url 含协议的网址
      * @throws `SyntaxError` 非法的自由外链目标
      */
-    setTarget(url: string | URL): void;
+    setTarget(url: string): void;
     /** 是否是模板或魔术字参数 */
     isParamValue(): boolean;
 }

package/dist/src/magicLink.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MagicLinkToken = void 0;
 const lint_1 = require("../util/lint");
-const index_1 = require("../index");
+const Parser = require("../index");
 const _1 = require(".");
 /**
  * 自由外链
@@ -43,7 +43,7 @@ class MagicLinkToken extends _1.Token {
      * @param url 网址
      * @param doubleSlash 是否接受"//"作为协议
      */
-    constructor(url, doubleSlash, config = index_1.default.getConfig(), accum = []) {
+    constructor(url, doubleSlash = false, config = Parser.getConfig(), accum = []) {
         super(url, config, true, accum, {
             'Stage-1': ':', '!ExtToken': '',
         });
@@ -67,7 +67,7 @@ class MagicLinkToken extends _1.Token {
                 const lines = data.slice(0, index).split('\n'), { length: top } = lines, { length: left } = lines.at(-1), startIndex = start + index, startLine = refError.startLine + top - 1, startCol = top === 1 ? refError.startCol + left : left;
                 return {
                     ...refError,
-                    message: index_1.default.msg('$1 in URL', s.startsWith('|') ? '"|"' : index_1.default.msg('full-width punctuation')),
+                    message: Parser.msg('$1 in URL', s.startsWith('|') ? '"|"' : Parser.msg('full-width punctuation')),
                     startIndex,
                     endIndex: startIndex + s.length,
                     startLine,
@@ -83,7 +83,7 @@ class MagicLinkToken extends _1.Token {
     /** @override */
     cloneNode() {
         const cloned = this.cloneChildNodes();
-        return index_1.default.run(() => {
+        return Parser.run(() => {
             const token = new MagicLinkToken(undefined, this.type === 'ext-link-url', this.getAttribute('config'));
             token.append(...cloned);
             token.afterBuild();
@@ -115,17 +115,16 @@ class MagicLinkToken extends _1.Token {
      * @throws `SyntaxError` 非法的自由外链目标
      */
     setTarget(url) {
-        const strUrl = String(url), root = index_1.default.parse(strUrl, this.getAttribute('include'), 9, this.getAttribute('config')), { length, firstChild: freeExtLink } = root;
-        if (length === 1 && freeExtLink.type === 'free-ext-link') {
-            this.replaceChildren(...freeExtLink.childNodes);
+        const root = Parser.parse(url, this.getAttribute('include'), 9, this.getAttribute('config')), { length, firstChild: freeExtLink } = root;
+        if (length !== 1 || freeExtLink.type !== 'free-ext-link') {
+            throw new SyntaxError(`非法的自由外链目标：${url}`);
         }
-        throw new SyntaxError(`非法的自由外链目标：${strUrl}`);
+        this.replaceChildren(...freeExtLink.childNodes);
     }
     /** 是否是模板或魔术字参数 */
     isParamValue() {
-        const parameter = this.closest('parameter');
-        return parameter?.getValue() === this.text();
+        return this.closest('parameter')?.getValue() === this.text();
     }
 }
 exports.MagicLinkToken = MagicLinkToken;
-index_1.default.classes['MagicLinkToken'] = __filename;
+Parser.classes['MagicLinkToken'] = __filename;

package/dist/src/nested.d.ts

@@ -1,3 +1,4 @@
+import * as Parser from '../index';
 import { Token } from '.';
 import { ExtToken } from './tagPair/ext';
 import { NoincludeToken } from './nowiki/noinclude';
@@ -8,10 +9,11 @@ import type { AttributesToken } from './attributes';
  * 嵌套式的扩展标签
  * @classdesc `{childNodes: ...ExtToken|NoincludeToken|CommentToken}`
  */
-export declare abstract class NestedToken extends Token {
+export declare class NestedToken extends Token {
     #private;
     /** @browser */
     readonly type = "ext-inner";
+    name: string;
     childNodes: (ExtToken | NoincludeToken | CommentToken)[];
     abstract get children(): (ExtToken | NoincludeToken | CommentToken)[];
     abstract get firstChild(): ExtToken | NoincludeToken | CommentToken | undefined;
@@ -29,7 +31,7 @@ export declare abstract class NestedToken extends Token {
      * @param regex 内层正则
      * @param tags 内层标签名
      */
-    constructor(wikitext: string | undefined, regex: RegExp, tags: string[], config?: import("../index").Config, accum?: Token[]);
+    constructor(wikitext: string | undefined, regex: RegExp, tags: string[], config?: Parser.Config, accum?: Token[]);
     /**
      * @override
      * @browser

package/dist/src/nested.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NestedToken = void 0;
 const lint_1 = require("../util/lint");
-const index_1 = require("../index");
+const Parser = require("../index");
 const _1 = require(".");
 const ext_1 = require("./tagPair/ext");
 const noinclude_1 = require("./nowiki/noinclude");
@@ -21,21 +21,18 @@ class NestedToken extends _1.Token {
      * @param regex 内层正则
      * @param tags 内层标签名
      */
-    constructor(wikitext, regex, tags, config = index_1.default.getConfig(), accum = []) {
+    constructor(wikitext, regex, tags, config = Parser.getConfig(), accum = []) {
         const text = wikitext?.replace(regex, (comment, name, attr, inner, closing) => {
             const str = `\0${accum.length + 1}${name ? 'e' : 'c'}\x7F`;
             if (name) {
-                // @ts-expect-error abstract class
                 new ext_1.ExtToken(name, attr, inner, closing, config, accum);
             }
             else {
                 const closed = comment.endsWith('-->');
-                // @ts-expect-error abstract class
                 new comment_1.CommentToken(comment.slice(4, closed ? -3 : undefined), closed, config, accum);
             }
             return str;
         })?.replace(/(?<=^|\0\d+[ce]\x7F)[^\0]+(?=$|\0\d+[ce]\x7F)/gu, substr => {
-            // @ts-expect-error abstract class
             new noinclude_1.NoincludeToken(substr, config, accum);
             return `\0${accum.length}c\x7F`;
         });
@@ -61,7 +58,7 @@ class NestedToken extends _1.Token {
                 return str && !/^<!--.*-->$/su.test(str);
             }).map(child => {
                 rect ??= { start, ...this.getRootNode().posFromIndex(start) };
-                return (0, lint_1.generateForChild)(child, rect, index_1.default.msg('invalid content in <$1>', this.name));
+                return (0, lint_1.generateForChild)(child, rect, Parser.msg('invalid content in <$1>', this.name));
             }),
         ];
     }
@@ -80,8 +77,7 @@ class NestedToken extends _1.Token {
     /** @override */
     cloneNode() {
         const cloned = this.cloneChildNodes(), config = this.getAttribute('config');
-        return index_1.default.run(() => {
-            // @ts-expect-error abstract class
+        return Parser.run(() => {
             const token = new NestedToken(undefined, this.#regex, this.#tags, config);
             token.append(...cloned);
             return token;
@@ -89,4 +85,4 @@ class NestedToken extends _1.Token {
     }
 }
 exports.NestedToken = NestedToken;
-index_1.default.classes['NestedToken'] = __filename;
+Parser.classes['NestedToken'] = __filename;

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

@@ -1,16 +1,17 @@
+import * as Parser from '../../index';
 import { Token } from '..';
 import type { AstText } from '../../lib/text';
 declare type NowikiTypes = 'ext-inner' | 'comment' | 'dd' | 'double-underscore' | 'hr' | 'list' | 'noinclude' | 'quote';
 declare const NowikiBaseToken_base: ((abstract new (...args: any[]) => {
     removeAt(): never;
-    insertAt(token: string, i?: number | undefined): AstText;
-    insertAt<T extends import("../../index").AstNodes>(token: T, i?: number | undefined): T;
+    insertAt(token: string, i?: number | undefined): Parser.AstText;
+    insertAt<T extends Parser.AstNodes>(token: T, i?: number | undefined): T;
     length: number;
-    toString(selector?: string | undefined, separator?: string | undefined): string;
+    toString(omit?: Set<string> | undefined, separator?: string | undefined): string;
     text(separator?: string | undefined): string;
 }) & {
     readonly fixed: true;
-}) & typeof Token;
+}) & typeof Parser.Token;
 /**
  * 纯文字Token，不会被解析
  * @classdesc `{childNodes: [AstText]}`
@@ -24,7 +25,7 @@ export declare abstract class NowikiBaseToken extends NowikiBaseToken_base {
     abstract get lastChild(): AstText;
     abstract get lastElementChild(): undefined;
     /** @browser */
-    constructor(wikitext: string, config?: import("../../index").Config, accum?: Token[]);
+    constructor(wikitext?: string, config?: Parser.Config, accum?: Token[]);
     /** @override */
     cloneNode(this: this & {
         constructor: new (...args: any[]) => unknown;

package/dist/src/nowiki/base.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NowikiBaseToken = void 0;
 const fixed_1 = require("../../mixin/fixed");
-const index_1 = require("../../index");
+const Parser = require("../../index");
 const __1 = require("..");
 /**
  * 纯文字Token，不会被解析
@@ -10,12 +10,12 @@ const __1 = require("..");
  */
 class NowikiBaseToken extends (0, fixed_1.fixed)(__1.Token) {
     /** @browser */
-    constructor(wikitext, config = index_1.default.getConfig(), accum = []) {
+    constructor(wikitext = '', config = Parser.getConfig(), accum = []) {
         super(wikitext, config, true, accum);
     }
     /** @override */
     cloneNode() {
-        const { constructor, firstChild: { data }, type } = this, token = index_1.default.run(() => new constructor(data, this.getAttribute('config')));
+        const { constructor, firstChild: { data }, type } = this, token = Parser.run(() => new constructor(data, this.getAttribute('config')));
         token.type = type;
         return token;
     }
@@ -28,4 +28,4 @@ class NowikiBaseToken extends (0, fixed_1.fixed)(__1.Token) {
     }
 }
 exports.NowikiBaseToken = NowikiBaseToken;
-index_1.default.classes['NowikiBaseToken'] = __filename;
+Parser.classes['NowikiBaseToken'] = __filename;

package/dist/src/nowiki/comment.d.ts

@@ -1,16 +1,17 @@
+import * as Parser from '../../index';
 import { NowikiBaseToken } from './base';
 import type { LintError } from '../../index';
 import type { Token } from '..';
 declare const CommentToken_base: ((abstract new (...args: any[]) => {
-    text(): string;
+    text(): string; /** 内部wikitext */
     length: number;
-    toString(selector?: string | undefined, separator?: string | undefined): string;
+    toString(omit?: Set<string> | undefined, separator?: string | undefined): string;
     insertAt(token: unknown, i?: number | undefined): unknown;
 }) & {
     readonly hidden: true;
 }) & typeof NowikiBaseToken;
 /** HTML注释，不可见 */
-export declare abstract class CommentToken extends CommentToken_base {
+export declare class CommentToken extends CommentToken_base {
     /** @browser */
     readonly type = "comment";
     closed: boolean;
@@ -20,7 +21,7 @@ export declare abstract class CommentToken extends CommentToken_base {
      * @browser
      * @param closed 是否闭合
      */
-    constructor(wikitext: string, closed?: boolean, config?: import("../../index").Config, accum?: Token[]);
+    constructor(wikitext: string, closed?: boolean, config?: Parser.Config, accum?: Token[]);
     /**
      * @override
      * @browser
@@ -35,7 +36,7 @@ export declare abstract class CommentToken extends CommentToken_base {
      * @override
      * @browser
      */
-    toString(selector?: string): string;
+    toString(omit?: Set<string>): string;
     /** @override */
     cloneNode(): this;
 }

package/dist/src/nowiki/comment.js

@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommentToken = void 0;
 const lint_1 = require("../../util/lint");
 const hidden_1 = require("../../mixin/hidden");
-const index_1 = require("../../index");
+const Parser = require("../../index");
 const base_1 = require("./base");
 /** HTML注释，不可见 */
+// @ts-expect-error not implementing all abstract methods
 class CommentToken extends (0, hidden_1.hidden)(base_1.NowikiBaseToken) {
     /** @browser */
     type = 'comment';
@@ -18,7 +19,7 @@ class CommentToken extends (0, hidden_1.hidden)(base_1.NowikiBaseToken) {
      * @browser
      * @param closed 是否闭合
      */
-    constructor(wikitext, closed = true, config = index_1.default.getConfig(), accum = []) {
+    constructor(wikitext, closed = true, config = Parser.getConfig(), accum = []) {
         super(wikitext, config, accum);
         this.closed = closed;
         Object.defineProperty(this, 'closed', { enumerable: false });
@@ -45,20 +46,17 @@ class CommentToken extends (0, hidden_1.hidden)(base_1.NowikiBaseToken) {
      * @override
      * @browser
      */
-    toString(selector) {
+    toString(omit) {
         if (!this.closed && this.nextSibling) {
-            index_1.default.error('自动闭合HTML注释', this);
+            Parser.error('自动闭合HTML注释', this);
             this.closed = true;
         }
-        return selector && this.matches(selector)
-            ? ''
-            : `<!--${this.firstChild.data}${this.closed ? '-->' : ''}`;
+        return omit && this.matchesTypes(omit) ? '' : `<!--${this.firstChild.data}${this.closed ? '-->' : ''}`;
     }
     /** @override */
     cloneNode() {
-        // @ts-expect-error abstract class
-        return index_1.default.run(() => new CommentToken(this.firstChild.data, this.closed, this.getAttribute('config')));
+        return Parser.run(() => new CommentToken(this.firstChild.data, this.closed, this.getAttribute('config')));
     }
 }
 exports.CommentToken = CommentToken;
-index_1.default.classes['CommentToken'] = __filename;
+Parser.classes['CommentToken'] = __filename;

package/dist/src/nowiki/dd.d.ts

@@ -1,6 +1,6 @@
 import { NowikiBaseToken } from './base';
 /** `:` */
-export declare abstract class DdToken extends NowikiBaseToken {
+export declare class DdToken extends NowikiBaseToken {
     /** @browser */
     readonly type: 'dd' | 'list';
     /** 是否包含`;` */