wikiparser-node 1.3.9 → 1.4.0

package/dist/src/parameter.d.ts

@@ -1,32 +1,15 @@
 import * as Parser from '../index';
 import { Token } from './index';
 import type { LintError } from '../base';
+import type { FixedTokenBase } from '../mixin/fixed';
 import type { AtomToken, SyntaxToken, TranscludeToken } from '../internal';
-declare const ParameterToken_base: ((abstract new (...args: any[]) => {
+export declare class ParameterToken extends Token implements FixedTokenBase {
     removeAt(): never;
     insertAt(token: string, i?: number | undefined): Parser.AstText;
     insertAt<T extends Parser.AstNodes>(token: T, i?: number | undefined): T;
-    readonly length: number;
-    toString(omit?: Set<string> | undefined, separator?: string | undefined): string;
-    text(separator?: string | undefined): string;
-    lint(start?: number | undefined): Parser.LintError[];
-    afterBuild(): void;
-    getAttribute<T_1 extends string>(key: T_1): TokenAttributeGetter<T_1>;
-    setAttribute<T_2 extends string>(key: T_2, value: TokenAttributeSetter<T_2>): void;
-    addEventListener(events: string | string[], listener: AstListener): void;
-    replaceChildren(...elements: (string | Parser.AstNodes)[]): void;
-    constructorError(msg: string): never;
-}) & {
-    readonly fixed: true;
-}) & typeof Parser.Token;
-/**
- * 模板或魔术字参数
- * @classdesc `{childNodes: [Token, Token]}`
- */
-export declare class ParameterToken extends ParameterToken_base {
     readonly type = "parameter";
     readonly name: string;
-    readonly childNodes: [Token, Token];
+    readonly childNodes: readonly [Token, Token];
     abstract get children(): [Token, Token];
     abstract get firstChild(): Token;
     abstract get firstElementChild(): Token;

package/dist/src/parameter.js

@@ -18,7 +18,7 @@ const getName = (name) => name.toString(new Set(['comment', 'noinclude', 'includ
  * 模板或魔术字参数
  * @classdesc `{childNodes: [Token, Token]}`
  */
-class ParameterToken extends (0, fixed_1.fixed)(index_1.Token) {
+class ParameterToken extends (0, fixed_1.fixedToken)(index_1.Token) {
     type = 'parameter';
     /** 是否是匿名参数 */
     get anon() {

package/dist/src/pre.d.ts

@@ -9,7 +9,7 @@ import type { AstText, AttributesToken, ExtToken, ConverterToken } from '../inte
 export declare class PreToken extends Token {
     readonly type = "ext-inner";
     readonly name: 'pre';
-    readonly childNodes: (AstText | NoincludeToken | ConverterToken)[];
+    readonly childNodes: readonly (AstText | NoincludeToken | ConverterToken)[];
     abstract get children(): (NoincludeToken | ConverterToken)[];
     abstract get firstChild(): AstText | NoincludeToken | ConverterToken | undefined;
     abstract get firstElementChild(): NoincludeToken | ConverterToken | undefined;

package/dist/src/syntax.d.ts

@@ -2,23 +2,12 @@ import * as Parser from '../index';
 import { Token } from './index';
 import type { LintError } from '../base';
 declare type SyntaxTypes = 'plain' | 'heading-trail' | 'magic-word-name' | 'table-syntax';
-declare const SyntaxToken_base: (abstract new (...args: any[]) => {
+export declare class SyntaxToken extends Token {
     "__#10@#pattern": RegExp;
     afterBuild(): void;
     getAttribute<T extends string>(key: T): TokenAttributeGetter<T>;
     setAttribute<T_1 extends string>(key: T_1, value: TokenAttributeSetter<T_1>): void;
     replaceChildren(...elements: (string | Parser.AstNodes)[]): void;
-    readonly length: number;
-    toString(omit?: Set<string> | undefined, separator?: string | undefined): string;
-    text(separator?: string | undefined): string;
-    lint(start?: number | undefined): Parser.LintError[];
-    insertAt(token: unknown, i?: number | undefined): unknown;
-    addEventListener(events: string | string[], listener: AstListener): void;
-    /** @override */
-    constructorError(msg: string): never;
-}) & typeof Parser.Token;
-/** 满足特定语法格式的plain Token */
-export declare class SyntaxToken extends SyntaxToken_base {
     type: SyntaxTypes;
     /** @param pattern 语法正则 */
     constructor(wikitext: string | undefined, pattern: RegExp, type?: SyntaxTypes, config?: Parser.Config, accum?: Token[], acceptable?: Acceptable);

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

@@ -2,14 +2,9 @@ import * as Parser from '../../index';
 import { Token } from '../index';
 import { SyntaxToken } from '../syntax';
 import { AttributesToken } from '../attributes';
-declare const TableBaseToken_base: (abstract new (...args: any[]) => {
-    readonly childNodes: Parser.AstNodes[];
-    readonly "__#7@#attributesChild": Parser.AttributesToken;
+import type { AttributesParentBase } from '../../mixin/attributesParent';
+export declare abstract class TableBaseToken extends Token implements AttributesParentBase {
     attributes: Record<string, string | true>;
-    /**
-     * 表格行，含开头的换行，不含结尾的换行
-     * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ...Token]}`
-     */
     className: string;
     classList: Set<string>;
     id: string;
@@ -19,27 +14,10 @@ declare const TableBaseToken_base: (abstract new (...args: any[]) => {
     getAttrs(): Record<string, string | true>;
     setAttr(key: string, value: string | boolean): void;
     setAttr(prop: Record<string, string | boolean>): void;
-    removeAttr(key: string): void;
+    removeAttr(key: string): void; /** @private */
     toggleAttr(key: string, force?: boolean | undefined): void;
-    readonly length: number;
-    toString(omit?: Set<string> | undefined, separator?: string | undefined): string;
-    text(separator?: string | undefined): string;
-    lint(start?: number | undefined): Parser.LintError[];
-    insertAt(token: unknown, i?: number | undefined): unknown;
-    afterBuild(): void;
-    getAttribute<T extends string>(key: T): TokenAttributeGetter<T>;
-    setAttribute<T_1 extends string>(key: T_1, value: TokenAttributeSetter<T_1>): void;
-    addEventListener(events: string | string[], listener: AstListener): void;
-    replaceChildren(...elements: (string | Parser.AstNodes)[]): void;
-    constructorError(msg: string): never;
-}) & typeof Parser.Token;
-/**
- * 表格行，含开头的换行，不含结尾的换行
- * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ...Token]}`
- */
-export declare abstract class TableBaseToken extends TableBaseToken_base {
     type: 'table' | 'tr' | 'td';
-    readonly childNodes: [SyntaxToken, AttributesToken, ...Token[]];
+    readonly childNodes: readonly [SyntaxToken, AttributesToken, ...Token[]];
     abstract get children(): [SyntaxToken, AttributesToken, ...Token[]];
     abstract get firstChild(): SyntaxToken;
     abstract get firstElementChild(): SyntaxToken;

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

@@ -18,7 +18,7 @@ export interface TableRenderedCoords {
  */
 export declare class TableToken extends TrBaseToken {
     readonly type = "table";
-    readonly childNodes: [SyntaxToken, AttributesToken, ...(TdToken | TrToken)[], SyntaxToken] | [SyntaxToken, AttributesToken, ...(TdToken | TrToken)[]];
+    readonly childNodes: readonly [SyntaxToken, AttributesToken, ...(TdToken | TrToken)[], SyntaxToken] | readonly [SyntaxToken, AttributesToken, ...(TdToken | TrToken)[]];
     abstract get children(): [SyntaxToken, AttributesToken, ...(TdToken | TrToken)[], SyntaxToken] | [SyntaxToken, AttributesToken, ...(TdToken | TrToken)[]];
     abstract get lastChild(): AttributesToken | TdToken | TrToken | SyntaxToken;
     abstract get lastElementChild(): AttributesToken | TdToken | TrToken | SyntaxToken;
@@ -61,7 +61,7 @@ export declare class TableToken extends TrBaseToken {
     getNthRow(n: number, force?: boolean, insert?: false): TrToken | this | undefined;
     getNthRow(n: number, force: boolean, insert: true): TrToken | this | SyntaxToken | undefined;
     /** 获取所有行 */
-    getAllRows(): readonly (TrToken | this)[];
+    getAllRows(): (TrToken | this)[];
     /**
      * 获取指定坐标的单元格
      * @param coords 表格坐标
@@ -200,7 +200,7 @@ export declare class TableToken extends TrBaseToken {
      * 复制一列并插入该列之前
      * @param x 列号
      */
-    replicateTableCol(x: number): readonly TdToken[];
+    replicateTableCol(x: number): TdToken[];
     /**
      * 移动表格行
      * @param y 行号

package/dist/src/table/index.js

@@ -23,7 +23,7 @@ class TableToken extends trBase_1.TrBaseToken {
     /* NOT FOR BROWSER */
     set closed(closed) {
         if (closed && !this.closed) {
-            this.close(this.closest('parameter') ? '\n{{!}}}' : '\n|}');
+            this.close(this.closest('parameter-value') ? '\n{{!}}}' : '\n|}');
         }
     }
     /* NOT FOR BROWSER END */

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

@@ -2,6 +2,7 @@ import * as Parser from '../../index';
 import { Token } from '../index';
 import { TableBaseToken } from './base';
 import type { LintError } from '../../base';
+import type { FixedTokenBase } from '../../mixin/fixed';
 import type { SyntaxToken, AttributesToken, TrToken, TableToken } from '../../internal';
 export type TdSubtypes = 'td' | 'th' | 'caption';
 export interface TdSpanAttrs {
@@ -11,31 +12,12 @@ export interface TdSpanAttrs {
 declare type TdAttrGetter<T extends string> = T extends keyof TdSpanAttrs ? number : string | true | undefined;
 declare type TdAttrSetter<T extends string> = T extends keyof TdSpanAttrs ? number : string | boolean;
 export type TdAttrs = Record<string, string | true> & TdSpanAttrs;
-declare const TdToken_base: ((abstract new (...args: any[]) => {
+export declare class TdToken extends TableBaseToken implements FixedTokenBase {
     removeAt(): never;
     insertAt(token: string, i?: number | undefined): Parser.AstText;
     insertAt<T extends Parser.AstNodes>(token: T, i?: number | undefined): T;
-    readonly length: number;
-    toString(omit?: Set<string> | undefined, separator?: string | undefined): string;
-    text(separator?: string | undefined): string;
-    lint(start?: number | undefined): Parser.LintError[];
-    afterBuild(): void;
-    getAttribute<T_1 extends string>(key: T_1): TokenAttributeGetter<T_1>;
-    setAttribute<T_2 extends string>(key: T_2, value: TokenAttributeSetter<T_2>): void;
-    addEventListener(events: string | string[], listener: AstListener): void;
-    replaceChildren(...elements: (string | Parser.AstNodes)[]): void;
-    constructorError(msg: string): never;
-}) & {
-    readonly fixed: true;
-}) & typeof TableBaseToken;
-/**
- * `<td>`、`<th>`和`<caption>`
- * @classdesc `{childNodes: [SyntaxToken, AttributesToken, Token]}`
- */
-export declare class TdToken extends TdToken_base {
-    #private;
     readonly type = "td";
-    readonly childNodes: [SyntaxToken, AttributesToken, Token];
+    readonly childNodes: readonly [SyntaxToken, AttributesToken, Token];
     abstract get children(): [SyntaxToken, AttributesToken, Token];
     abstract get parentNode(): TrToken | TableToken | undefined;
     abstract get parentElement(): TrToken | TableToken | undefined;

package/dist/src/table/td.js

@@ -13,7 +13,7 @@ const base_1 = require("./base");
  * @classdesc `{childNodes: [SyntaxToken, AttributesToken, Token]}`
  */
 // @ts-expect-error not implementing all abstract methods
-class TdToken extends (0, fixed_1.fixed)(base_1.TableBaseToken) {
+class TdToken extends (0, fixed_1.fixedToken)(base_1.TableBaseToken) {
     type = 'td';
     #innerSyntax = '';
     /** 单元格类型 */

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

@@ -6,9 +6,8 @@ import type { Token, TdToken, TableToken, SyntaxToken, AttributesToken } from '.
  * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ?Token, ...TdToken]}`
  */
 export declare class TrToken extends TrBaseToken {
-    #private;
     readonly type = "tr";
-    readonly childNodes: [SyntaxToken, AttributesToken, ...TdToken[]];
+    readonly childNodes: readonly [SyntaxToken, AttributesToken, ...TdToken[]];
     abstract get children(): [SyntaxToken, AttributesToken, ...TdToken[]];
     abstract get lastChild(): AttributesToken | TdToken;
     abstract get lastElementChild(): AttributesToken | TdToken;

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

@@ -13,7 +13,6 @@ export interface TableCoords {
 }
 /** 表格行或表格 */
 export declare abstract class TrBaseToken extends TableBaseToken {
-    #private;
     type: 'table' | 'tr';
     /** @override */
     lint(start?: number): LintError[];

package/dist/src/tagPair/ext.d.ts

@@ -3,9 +3,8 @@ import { Token } from '../index';
 import { TagPairToken } from './index';
 import { AttributesToken } from '../attributes';
 import type { LintError } from '../../base';
-declare const ExtToken_base: (abstract new (...args: any[]) => {
-    readonly childNodes: Parser.AstNodes[];
-    readonly "__#7@#attributesChild": Parser.AttributesToken;
+import type { AttributesParentBase } from '../../mixin/attributesParent';
+export declare class ExtToken extends TagPairToken implements AttributesParentBase {
     attributes: Record<string, string | true>;
     className: string;
     classList: Set<string>;
@@ -18,26 +17,9 @@ declare const ExtToken_base: (abstract new (...args: any[]) => {
     setAttr(prop: Record<string, string | boolean>): void;
     removeAttr(key: string): void;
     toggleAttr(key: string, force?: boolean | undefined): void;
-    readonly length: number;
-    toString(omit?: Set<string> | undefined, separator?: string | undefined): string;
-    text(separator?: string | undefined): string;
-    lint(start?: number | undefined): Parser.LintError[];
-    insertAt(token: unknown, i?: number | undefined): unknown;
-    afterBuild(): void;
-    getAttribute<T extends string>(key: T): TokenAttributeGetter<T>;
-    setAttribute<T_1 extends string>(key: T_1, value: TokenAttributeSetter<T_1>): void;
-    addEventListener(events: string | string[], listener: AstListener): void;
-    replaceChildren(...elements: (string | Parser.AstNodes)[]): void;
-    constructorError(msg: string): never;
-}) & typeof TagPairToken;
-/**
- * 扩展标签
- * @classdesc `{childNodes: [AttributesToken, Token]}`
- */
-export declare class ExtToken extends ExtToken_base {
     readonly type = "ext";
     closed: true;
-    readonly childNodes: [AttributesToken, Token];
+    readonly childNodes: readonly [AttributesToken, Token];
     abstract get children(): [AttributesToken, Token];
     abstract get firstChild(): AttributesToken;
     abstract get firstElementChild(): AttributesToken;

package/dist/src/tagPair/include.d.ts

@@ -2,28 +2,11 @@ import * as Parser from '../../index';
 import { TagPairToken } from './index';
 import type { LintError } from '../../base';
 import type { AstText, Token } from '../../internal';
-declare const IncludeToken_base: ((abstract new (...args: any[]) => {
+export declare class IncludeToken extends TagPairToken {
     text(): string;
     lint(): Parser.LintError[];
-    readonly length: number;
-    toString(omit?: Set<string> | undefined, separator?: string | undefined): string;
-    insertAt(token: unknown, i?: number | undefined): unknown;
-    afterBuild(): void;
-    getAttribute<T extends string>(key: T): TokenAttributeGetter<T>;
-    setAttribute<T_1 extends string>(key: T_1, value: TokenAttributeSetter<T_1>): void;
-    addEventListener(events: string | string[], listener: AstListener): void;
-    replaceChildren(...elements: (string | Parser.AstNodes)[]): void;
-    constructorError(msg: string): never;
-}) & {
-    readonly hidden: true;
-}) & typeof TagPairToken;
-/**
- * `<includeonly>`或`<noinclude>`或`<onlyinclude>`
- * @classdesc `{childNodes: [AstText, AstText]}`
- */
-export declare class IncludeToken extends IncludeToken_base {
     readonly type = "include";
-    readonly childNodes: [AstText, AstText];
+    readonly childNodes: readonly [AstText, AstText];
     abstract get children(): [];
     abstract get firstChild(): AstText;
     abstract get firstElementChild(): undefined;

package/dist/src/tagPair/include.js

@@ -11,7 +11,7 @@ const index_1 = require("./index");
  * `<includeonly>`或`<noinclude>`或`<onlyinclude>`
  * @classdesc `{childNodes: [AstText, AstText]}`
  */
-class IncludeToken extends (0, hidden_1.hidden)(index_1.TagPairToken) {
+class IncludeToken extends (0, hidden_1.hiddenToken)(index_1.TagPairToken) {
     type = 'include';
     /* NOT FOR BROWSER */
     /**	@override */

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

@@ -1,31 +1,16 @@
 import * as Parser from '../../index';
 import { Token } from '../index';
 import type { AstNodes } from '../../lib/node';
-declare const TagPairToken_base: ((abstract new (...args: any[]) => {
+import type { FixedTokenBase } from '../../mixin/fixed';
+export declare abstract class TagPairToken extends Token implements FixedTokenBase {
     removeAt(): never;
     insertAt(token: string, i?: number | undefined): Parser.AstText;
     insertAt<T extends Parser.AstNodes>(token: T, i?: number | undefined): T;
-    readonly length: number;
-    toString(omit?: Set<string> | undefined, separator?: string | undefined): string;
-    text(separator?: string | undefined): string;
-    lint(start?: number | undefined): Parser.LintError[];
-    afterBuild(): void;
-    getAttribute<T_1 extends string>(key: T_1): TokenAttributeGetter<T_1>;
-    setAttribute<T_2 extends string>(key: T_2, value: TokenAttributeSetter<T_2>): void;
-    addEventListener(events: string | string[], listener: AstListener): void;
-    replaceChildren(...elements: (string | Parser.AstNodes)[]): void;
-    constructorError(msg: string): never;
-}) & {
-    readonly fixed: true;
-}) & typeof Parser.Token;
-/** 成对标签 */
-export declare abstract class TagPairToken extends TagPairToken_base {
-    #private;
     type: 'ext' | 'include';
     readonly name: string;
     closed: boolean;
     selfClosing: boolean;
-    readonly childNodes: [AstNodes, AstNodes];
+    readonly childNodes: readonly [AstNodes, AstNodes];
     abstract get firstChild(): AstNodes;
     abstract get lastChild(): AstNodes;
     /** 内部wikitext */

package/dist/src/tagPair/index.js

@@ -6,7 +6,7 @@ const fixed_1 = require("../../mixin/fixed");
 const Parser = require("../../index");
 const index_1 = require("../index");
 /** 成对标签 */
-class TagPairToken extends (0, fixed_1.fixed)(index_1.Token) {
+class TagPairToken extends (0, fixed_1.fixedToken)(index_1.Token) {
     #tags;
     closed;
     selfClosing;

package/dist/src/transclude.d.ts

@@ -9,11 +9,10 @@ import type { LintError } from '../base';
  * @classdesc `{childNodes: [AtomToken|SyntaxToken, ...AtomToken, ...ParameterToken]}`
  */
 export declare class TranscludeToken extends Token {
-    #private;
     type: 'template' | 'magic-word';
     readonly name: string;
     readonly modifier: string;
-    readonly childNodes: [AtomToken | SyntaxToken, ...ParameterToken[]] | [SyntaxToken, AtomToken, AtomToken, ...ParameterToken[]];
+    readonly childNodes: readonly [AtomToken | SyntaxToken, ...ParameterToken[]] | readonly [SyntaxToken, AtomToken, AtomToken, ...ParameterToken[]];
     abstract get children(): [AtomToken | SyntaxToken, ...ParameterToken[]] | [SyntaxToken, AtomToken, AtomToken, ...ParameterToken[]];
     abstract get firstChild(): AtomToken | SyntaxToken;
     abstract get firstElementChild(): AtomToken | SyntaxToken;
@@ -46,9 +45,9 @@ export declare class TranscludeToken extends Token {
      */
     insertAt<T extends ParameterToken>(token: T, i?: number): T;
     /** 获取所有参数 */
-    getAllArgs(): readonly ParameterToken[];
+    getAllArgs(): ParameterToken[];
     /** 获取所有匿名参数 */
-    getAnonArgs(): readonly ParameterToken[];
+    getAnonArgs(): ParameterToken[];
     /**
      * 获取指定参数
      * @param key 参数名
@@ -60,12 +59,12 @@ export declare class TranscludeToken extends Token {
      * 获取重名参数
      * @throws `Error` 仅用于模板
      */
-    getDuplicatedArgs(): readonly [string, ParameterToken[]][];
+    getDuplicatedArgs(): [string, ParameterToken[]][];
     /**
      * 对特定魔术字获取可能的取值
      * @throws `Error` 不是可接受的魔术字
      */
-    getPossibleValues(): readonly Token[];
+    getPossibleValues(): Token[];
     /** @override */
     print(): string;
     /** @override */
@@ -98,12 +97,12 @@ export declare class TranscludeToken extends Token {
      */
     removeArg(key: string | number, exact?: boolean): void;
     /** 获取所有参数名 */
-    getKeys(): readonly string[];
+    getKeys(): string[];
     /**
      * 获取参数值
      * @param key 参数名
      */
-    getValues(key: string | number): readonly string[];
+    getValues(key: string | number): string[];
     /** 获取所有生效的参数值 */
     getValue(): Record<string, string>;
     /**
@@ -158,7 +157,7 @@ export declare class TranscludeToken extends Token {
      * `aggressive = true`时还会尝试处理连续的以数字编号的参数。
      * @param aggressive 是否使用有更大风险的修复手段
      */
-    fixDuplication(aggressive?: boolean): readonly string[];
+    fixDuplication(aggressive?: boolean): string[];
     /**
      * 转义模板内的表格
      * @throws `Error` 转义失败

package/i18n/zh-hans.json

@@ -5,6 +5,7 @@
 	"additional \"|\" in the link text": "链接文本中多余的\"|\"",
 	"attributes of a closing tag": "位于闭合标签的属性",
 	"bold": "粗体单引号",
+	"bold in section header": "段落标题中的粗体",
 	"conflicting image $1 parameter": "冲突的图片$1参数",
 	"containing invalid attribute": "包含无效属性",
 	"content to be moved out from the table": "将被移出表格的内容",

package/i18n/zh-hant.json

@@ -5,6 +5,7 @@
 	"additional \"|\" in the link text": "連結文本中多餘的\"|\"",
 	"attributes of a closing tag": "位於閉合標籤的屬性",
 	"bold apostrophes": "粗體撇號",
+	"bold in section header": "段落標題中的粗體",
 	"conflicting image $1 parameter": "衝突的圖片$1參數",
 	"containing invalid attribute": "包含無效屬性",
 	"content to be moved out from the table": "將被移出表格的內容",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.3.9",
+	"version": "1.4.0",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",
@@ -28,8 +28,9 @@
 	},
 	"scripts": {
 		"toc": "node ./dist/bin/toc.js",
-		"prepublishOnly": "npm run build && rm dist/internal.js dist/base.js dist/[mpu]*/*.d.ts",
-		"build": "rm -rf dist/; tsc && grep -rl --include='*.d.ts' '@private' dist/ | xargs gsed -i '/@private/,+1d'",
+		"declaration": "grep -rl --include='*.d.ts' '@private' dist/ | xargs gsed -i -E '/^\\s+\\/\\*\\* @private/,+1d'; grep -rl --include='*.d.ts' '#private' dist/ | xargs gsed -i '/#private/d'; node ./dist/bin/declaration.js",
+		"prepublishOnly": "npm run build && rm dist/internal.js dist/base.js dist/[pu]*/*.d.ts",
+		"build": "bash build.sh",
 		"diff": "git diff --ignore-all-space --color-moved",
 		"lint:ts": "tsc --noEmit && eslint --cache .",
 		"lint:json": "ajv -s config/.schema.json -d 'config/*.json' --strict=true --strict-required=false",