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

package/dist/parser/magicLinks.js

@@ -1,9 +1,16 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseMagicLinks = void 0;
 const string_1 = require("../util/string");
-const Parser = require("../index");
-const MagicLinkToken = require("../src/magicLink");
-/** 解析自由外链 */
-const parseMagicLinks = (wikitext, config = Parser.getConfig(), accum = []) => {
+const index_1 = require("../index");
+const magicLink_1 = require("../src/magicLink");
+/**
+ * 解析自由外链
+ * @param wikitext
+ * @param config
+ * @param accum
+ */
+const parseMagicLinks = (wikitext, config = index_1.default.getConfig(), accum = []) => {
     const regex = new RegExp(`(?<![\\p{L}\\d_])(?:${config.protocol})(${string_1.extUrlCharFirst}${string_1.extUrlChar})`, 'giu');
     return wikitext.replace(regex, (m, p1) => {
         let trail = '', url = m;
@@ -24,9 +31,9 @@ const parseMagicLinks = (wikitext, config = Parser.getConfig(), accum = []) => {
         if (trail.length >= p1.length) {
             return m;
         }
-        new MagicLinkToken(url, false, config, accum);
+        new magicLink_1.MagicLinkToken(url, false, config, accum);
         return `\0${accum.length - 1}w\x7F${trail}`;
     });
 };
-Parser.parsers['parseMagicLinks'] = __filename;
-module.exports = parseMagicLinks;
+exports.parseMagicLinks = parseMagicLinks;
+index_1.default.parsers['parseMagicLinks'] = __filename;

package/dist/parser/quotes.js

@@ -1,8 +1,15 @@
 "use strict";
-const Parser = require("../index");
-const QuoteToken = require("../src/nowiki/quote");
-/** 解析单引号 */
-const parseQuotes = (wikitext, config = Parser.getConfig(), accum = []) => {
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseQuotes = void 0;
+const index_1 = require("../index");
+const quote_1 = require("../src/nowiki/quote");
+/**
+ * 解析单引号
+ * @param wikitext
+ * @param config
+ * @param accum
+ */
+const parseQuotes = (wikitext, config = index_1.default.getConfig(), accum = []) => {
     const arr = wikitext.split(/('{2,})/u), { length } = arr;
     if (length === 1) {
         return wikitext;
@@ -20,11 +27,11 @@ const parseQuotes = (wikitext, config = Parser.getConfig(), accum = []) => {
             // fall through
             case 3:
                 nBold++;
-                if (firstSingle) {
+                if (firstSingle !== undefined) {
                     break;
                 }
                 else if (arr[i - 1].endsWith(' ')) {
-                    if (!firstMulti && !firstSpace) {
+                    if (firstMulti === undefined && firstSpace === undefined) {
                         firstSpace = i;
                     }
                 }
@@ -44,14 +51,17 @@ const parseQuotes = (wikitext, config = Parser.getConfig(), accum = []) => {
     }
     if (nItalic % 2 === 1 && nBold % 2 === 1) {
         const i = firstSingle ?? firstMulti ?? firstSpace;
-        arr[i] = `''`;
-        arr[i - 1] += `'`;
+        if (i !== undefined) {
+            arr[i] = `''`;
+            arr[i - 1] += `'`;
+        }
     }
     for (let i = 1; i < length; i += 2) {
-        new QuoteToken(arr[i].length, config, accum);
+        // @ts-expect-error abstract class
+        new quote_1.QuoteToken(arr[i].length, config, accum);
         arr[i] = `\0${accum.length - 1}q\x7F`;
     }
     return arr.join('');
 };
-Parser.parsers['parseQuotes'] = __filename;
-module.exports = parseQuotes;
+exports.parseQuotes = parseQuotes;
+index_1.default.parsers['parseQuotes'] = __filename;

package/dist/parser/selector.js

@@ -1,5 +1,7 @@
 "use strict";
-const Parser = require("../index");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseSelector = void 0;
+const index_1 = require("../index");
 const simplePseudos = new Set([
     'root',
     'first-child',
@@ -45,21 +47,25 @@ const specialChars = [
     ['&', '&'],
 ];
 const pseudoRegex = new RegExp(`:(${complexPseudos.join('|')})$`, 'u'), regularRegex = /[[(,>+~]|\s+/u, attributeRegex = /^\s*(\w+)\s*(?:([~|^$*!]?=)\s*("[^"]*"|'[^']*'|[^\s[\]]+)(?:\s+(i))?\s*)?\]/u, functionRegex = /^(\s*"[^"]*"\s*|\s*'[^']*'\s*|[^()]*)\)/u, grouping = new Set([',', '>', '+', '~']), combinator = new Set(['>', '+', '~', '']);
-/** 清理转义符号 */
+/**
+ * 清理转义符号
+ * @param selector
+ */
 const sanitize = (selector) => {
-    let s = selector;
     for (const [c, escaped] of specialChars) {
-        s = s.replaceAll(`\\${c}`, escaped);
+        selector = selector.replaceAll(`\\${c}`, escaped);
     }
-    return s;
+    return selector;
 };
-/** 还原转义符号 */
+/**
+ * 还原转义符号
+ * @param selector
+ */
 const desanitize = (selector) => {
-    let str = selector;
     for (const [c, escaped] of specialChars) {
-        str = str.replaceAll(escaped, c);
+        selector = selector.replaceAll(escaped, c);
     }
-    return str.trim();
+    return selector.trim();
 };
 /**
  * 去除首尾的引号
@@ -86,6 +92,7 @@ const pushSimple = (step, str) => {
 };
 /**
  * 解析选择器
+ * @param selector
  * @throws `SyntaxError` 非法的选择器
  */
 const parseSelector = (selector) => {
@@ -148,11 +155,11 @@ const parseSelector = (selector) => {
         pushSimple(step, sanitized);
         const pseudos = new Set(stack.flat(2).filter(e => typeof e === 'string' && e.startsWith(':')));
         if (pseudos.size > 0) {
-            Parser.warn('检测到伪选择器，请确认是否需要将":"转义成"\\:"。', pseudos);
+            index_1.default.warn('检测到伪选择器，请确认是否需要将":"转义成"\\:"。', pseudos);
         }
         return stack;
     }
     throw new SyntaxError(`非法的选择器！\n${s}\n检测到未闭合的'${regex === attributeRegex ? '[' : '('}'`);
 };
-Parser.parsers['parseSelector'] = __filename;
-module.exports = parseSelector;
+exports.parseSelector = parseSelector;
+index_1.default.parsers['parseSelector'] = __filename;

package/dist/parser/table.js

@@ -1,15 +1,19 @@
 "use strict";
-const Parser = require("../index");
-const Token = require("../src");
-const TableToken = require("../src/table");
-const TrToken = require("../src/table/tr");
-const TdToken = require("../src/table/td");
-const DdToken = require("../src/nowiki/dd");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseTable = void 0;
+const index_1 = require("../index");
+const src_1 = require("../src");
+const table_1 = require("../src/table");
+const tr_1 = require("../src/table/tr");
+const td_1 = require("../src/table/td");
+const dd_1 = require("../src/nowiki/dd");
 /**
  * 解析表格，注意`tr`和`td`包含开头的换行
  * @param {Token & {firstChild: AstText}} root 根节点
+ * @param config
+ * @param accum
  */
-const parseTable = ({ firstChild: { data }, type, name }, config = Parser.getConfig(), accum = []) => {
+const parseTable = ({ firstChild: { data }, type, name }, config = index_1.default.getConfig(), accum = []) => {
     const stack = [], lines = data.split('\n');
     let out = type === 'root' || type === 'parameter-value' || type === 'ext-inner' && name === 'poem'
         ? ''
@@ -25,11 +29,11 @@ const parseTable = ({ firstChild: { data }, type, name }, config = Parser.getCon
             return;
         }
         const { lastChild } = top;
-        if (lastChild.constructor === Token) {
+        if (lastChild.constructor === src_1.Token) {
             lastChild.setText(String(lastChild) + str);
         }
         else {
-            const token = new Token(str, config, true, accum);
+            const token = new src_1.Token(str, config, true, accum);
             token.type = 'table-inter';
             top.insertAt(token.setAttribute('stage', 3));
         }
@@ -44,10 +48,12 @@ const parseTable = ({ firstChild: { data }, type, name }, config = Parser.getCon
             }
             const [, indent, moreSpaces, tableSyntax, attr] = matchesStart;
             if (indent) {
-                new DdToken(indent, config, accum);
+                // @ts-expect-error abstract class
+                new dd_1.DdToken(indent, config, accum);
             }
             push(`\n${spaces}${indent && `\0${accum.length - 1}d\x7F`}${moreSpaces}\0${accum.length}b\x7F`, top);
-            const table = new TableToken(tableSyntax, attr, config, accum);
+            // @ts-expect-error abstract class
+            const table = new table_1.TableToken(tableSyntax, attr, config, accum);
             stack.push(...top ? [top] : [], table);
             continue;
         }
@@ -78,7 +84,8 @@ const parseTable = ({ firstChild: { data }, type, name }, config = Parser.getCon
             if (top.type === 'tr') {
                 top = stack.pop();
             }
-            const tr = new TrToken(`\n${spaces}${row}`, attr, config, accum);
+            // @ts-expect-error abstract class
+            const tr = new tr_1.TrToken(`\n${spaces}${row}`, attr, config, accum);
             stack.push(top, tr);
             top.insertAt(tr);
         }
@@ -91,18 +98,20 @@ const parseTable = ({ firstChild: { data }, type, name }, config = Parser.getCon
                 : /(?:\||\0\d+!\x7F){2}|\0\d+\+\x7F/gu;
             let mt = regex.exec(attr), lastIndex = 0, lastSyntax = `\n${spaces}${cell}`;
             while (mt) {
-                const td = new TdToken(lastSyntax, attr.slice(lastIndex, mt.index), config, accum);
+                // @ts-expect-error abstract class
+                const td = new td_1.TdToken(lastSyntax, attr.slice(lastIndex, mt.index), config, accum);
                 top.insertAt(td);
                 ({ lastIndex } = regex);
                 [lastSyntax] = mt;
                 mt = regex.exec(attr);
             }
-            const td = new TdToken(lastSyntax, attr.slice(lastIndex), config, accum);
+            // @ts-expect-error abstract class
+            const td = new td_1.TdToken(lastSyntax, attr.slice(lastIndex), config, accum);
             stack.push(top, td);
             top.insertAt(td);
         }
     }
     return out.slice(1);
 };
-Parser.parsers['parseTable'] = __filename;
-module.exports = parseTable;
+exports.parseTable = parseTable;
+index_1.default.parsers['parseTable'] = __filename;

package/dist/src/arg.d.ts

@@ -1,12 +1,12 @@
-import * as Parser from '../index';
-import Token = require('.');
-import AtomToken = require('./atom');
-import HiddenToken = require('./hidden');
+import { Token } from '.';
+import { AtomToken } from './atom';
+import { HiddenToken } from './hidden';
+import type { LintError } from '../index';
 /**
  * `{{{}}}`包裹的参数
  * @classdesc `{childNodes: [AtomToken, ?Token, ...HiddenToken]}`
  */
-declare abstract class ArgToken extends Token {
+export declare abstract class ArgToken extends Token {
     /** @browser */
     readonly type = "arg";
     name: string;
@@ -24,7 +24,7 @@ declare abstract class ArgToken extends Token {
      * @browser
      * @param parts 以'|'分隔的各部分
      */
-    constructor(parts: string[], config?: Parser.Config, accum?: Token[]);
+    constructor(parts: string[], config?: import("../index").Config, accum?: Token[]);
     /**
      * @override
      * @browser
@@ -44,7 +44,7 @@ declare abstract class ArgToken extends Token {
      * @override
      * @browser
      */
-    lint(start?: number): Parser.LintError[];
+    lint(start?: number): LintError[];
     /** @override */
     cloneNode(): this;
     /** 移除无效部分 */
@@ -75,4 +75,3 @@ declare abstract class ArgToken extends Token {
      */
     setDefault(value: string): void;
 }
-export = ArgToken;

package/dist/src/arg.js

@@ -1,15 +1,17 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ArgToken = void 0;
 const string_1 = require("../util/string");
 const lint_1 = require("../util/lint");
-const Parser = require("../index");
-const Token = require(".");
-const AtomToken = require("./atom");
-const HiddenToken = require("./hidden");
+const index_1 = require("../index");
+const _1 = require(".");
+const atom_1 = require("./atom");
+const hidden_1 = require("./hidden");
 /**
  * `{{{}}}`包裹的参数
  * @classdesc `{childNodes: [AtomToken, ?Token, ...HiddenToken]}`
  */
-class ArgToken extends Token {
+class ArgToken extends _1.Token {
     /** @browser */
     type = 'arg';
     /**
@@ -23,25 +25,25 @@ class ArgToken extends Token {
      * @browser
      * @param parts 以'|'分隔的各部分
      */
-    constructor(parts, config = Parser.getConfig(), accum = []) {
+    constructor(parts, config = index_1.default.getConfig(), accum = []) {
         super(undefined, config, true, accum, {
             AtomToken: 0, Token: 1, HiddenToken: '2:',
         });
         for (let i = 0; i < parts.length; i++) {
             if (i === 0) {
-                const token = new AtomToken(parts[i], 'arg-name', config, accum, {
+                const token = new atom_1.AtomToken(parts[i], 'arg-name', config, accum, {
                     'Stage-2': ':', '!HeadingToken': '',
                 });
                 super.insertAt(token);
             }
             else if (i > 1) {
-                const token = new HiddenToken(parts[i], config, accum, {
+                const token = new hidden_1.HiddenToken(parts[i], config, accum, {
                     'Stage-2': ':', '!HeadingToken': '',
                 });
                 super.insertAt(token);
             }
             else {
-                const token = new Token(parts[i], config, true, accum);
+                const token = new _1.Token(parts[i], config, true, accum);
                 token.type = 'arg-default';
                 super.insertAt(token.setAttribute('stage', 2));
             }
@@ -67,8 +69,8 @@ class ArgToken extends Token {
         return 3;
     }
     /** @private */
-    getGaps() {
-        return 1;
+    getGaps(i) {
+        return i < this.length - 1 ? 1 : 0;
     }
     /**
      * @override
@@ -92,7 +94,7 @@ class ArgToken extends Token {
         if (rest.length > 0) {
             const rect = { start, ...this.getRootNode().posFromIndex(start) };
             errors.push(...rest.map(child => {
-                const error = (0, lint_1.generateForChild)(child, rect, 'invisible content inside triple brackets'), { startIndex, startCol, excerpt } = error;
+                const error = (0, lint_1.generateForChild)(child, rect, 'invisible content inside triple braces'), { startIndex, startCol, excerpt } = error;
                 return { ...error, startIndex: startIndex - 1, startCol: startCol - 1, excerpt: `|${excerpt}` };
             }));
         }
@@ -101,7 +103,8 @@ class ArgToken extends Token {
     /** @override */
     cloneNode() {
         const [name, ...cloned] = this.cloneChildNodes();
-        return Parser.run(() => {
+        return index_1.default.run(() => {
+            // @ts-expect-error abstract class
             const token = new ArgToken([''], this.getAttribute('config'));
             token.firstChild.safeReplaceWith(name);
             token.append(...cloned);
@@ -121,7 +124,7 @@ class ArgToken extends Token {
     }
     /** 移除无效部分 */
     removeRedundant() {
-        Parser.run(() => {
+        index_1.default.run(() => {
             for (let i = this.length - 1; i > 1; i--) {
                 super.removeAt(i);
             }
@@ -164,13 +167,13 @@ class ArgToken extends Token {
      * @throws `SyntaxError` 非法的参数名
      */
     setName(name) {
-        const root = Parser.parse(`{{{${name}}}}`, this.getAttribute('include'), 2, this.getAttribute('config')), { length, firstChild: arg } = root;
-        if (length !== 1 || arg.type !== 'arg' || arg.length !== 1) {
-            throw new SyntaxError(`非法的参数名称：${(0, string_1.noWrap)(name)}`);
+        const root = index_1.default.parse(`{{{${name}}}}`, this.getAttribute('include'), 2, this.getAttribute('config')), { length, firstChild: arg } = root;
+        if (length === 1 && arg instanceof ArgToken && arg.length === 1) {
+            const { firstChild } = arg;
+            arg.destroy();
+            this.firstChild.safeReplaceWith(firstChild);
         }
-        const { firstChild } = arg;
-        arg.destroy();
-        this.firstChild.safeReplaceWith(firstChild);
+        throw new SyntaxError(`非法的参数名称：${(0, string_1.noWrap)(name)}`);
     }
     /**
      * 设置预设值
@@ -178,8 +181,8 @@ class ArgToken extends Token {
      * @throws `SyntaxError` 非法的参数预设值
      */
     setDefault(value) {
-        const root = Parser.parse(`{{{|${value}}}}`, this.getAttribute('include'), 2, this.getAttribute('config')), { length, firstChild: arg } = root;
-        if (length !== 1 || arg.type !== 'arg' || arg.length !== 2) {
+        const root = index_1.default.parse(`{{{|${value}}}}`, this.getAttribute('include'), 2, this.getAttribute('config')), { length, firstChild: arg } = root;
+        if (length !== 1 || !(arg instanceof ArgToken) || arg.length !== 2) {
             throw new SyntaxError(`非法的参数预设值：${(0, string_1.noWrap)(value)}`);
         }
         const { childNodes: [, oldDefault] } = this, { lastChild } = arg;
@@ -192,5 +195,5 @@ class ArgToken extends Token {
         }
     }
 }
-Parser.classes['ArgToken'] = __filename;
-module.exports = ArgToken;
+exports.ArgToken = ArgToken;
+index_1.default.classes['ArgToken'] = __filename;

package/dist/src/atom.d.ts

@@ -1,12 +1,11 @@
-import * as Parser from '../index';
-import Token = require('.');
+import { Token } from '.';
 declare type AtomTypes = 'arg-name' | 'attr-key' | 'attr-value' | 'ext-attr-dirty' | 'html-attr-dirty' | 'table-attr-dirty' | 'converter-flag' | 'converter-rule-variant' | 'converter-rule-to' | 'converter-rule-from' | 'converter-rule-noconvert' | 'invoke-function' | 'invoke-module' | 'template-name' | 'link-target' | 'param-line';
 /** 不会被继续解析的plain Token */
-declare class AtomToken extends Token {
+export declare class AtomToken extends Token {
     type: AtomTypes;
     /** @browser */
-    constructor(wikitext: string | undefined, type: AtomTypes, config?: Parser.Config, accum?: Token[], acceptable?: Acceptable);
+    constructor(wikitext: string | undefined, type: AtomTypes, config?: import("../index").Config, accum?: Token[], acceptable?: Acceptable);
     /** @override */
     cloneNode(): this;
 }
-export = AtomToken;
+export {};

package/dist/src/atom.js

@@ -1,22 +1,24 @@
 "use strict";
-const Parser = require("../index");
-const Token = require(".");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AtomToken = void 0;
+const index_1 = require("../index");
+const _1 = require(".");
 /** 不会被继续解析的plain Token */
-class AtomToken extends Token {
+class AtomToken extends _1.Token {
     /** @browser */
-    constructor(wikitext, type, config = Parser.getConfig(), accum = [], acceptable) {
+    constructor(wikitext, type, config = index_1.default.getConfig(), accum = [], acceptable) {
         super(wikitext, config, true, accum, acceptable);
         this.type = type;
     }
     /** @override */
     cloneNode() {
         const cloned = this.cloneChildNodes(), config = this.getAttribute('config'), acceptable = this.getAttribute('acceptable');
-        return Parser.run(() => {
+        return index_1.default.run(() => {
             const token = new AtomToken(undefined, this.type, config, [], acceptable);
             token.append(...cloned);
             return token;
         });
     }
 }
-Parser.classes['AtomToken'] = __filename;
-module.exports = AtomToken;
+exports.AtomToken = AtomToken;
+index_1.default.classes['AtomToken'] = __filename;

package/dist/src/attribute.d.ts

@@ -1,12 +1,12 @@
-import * as Parser from '../index';
-import Token = require('.');
-import AtomToken = require('./atom');
-import type { TokenAttributeGetter } from '../lib/node';
+import { Token } from '.';
+import { AtomToken } from './atom';
+import type { LintError } from '../index';
+import type { AttributesToken } from '../internal';
 declare type AttributeTypes = 'ext-attr' | 'html-attr' | 'table-attr';
 declare const AttributeToken_base: ((abstract new (...args: any[]) => {
     removeAt(): never;
-    insertAt(token: string, i?: number | undefined): import("../lib/text");
-    insertAt<T extends import("../lib/node").AstNodeTypes>(token: T, i?: number | undefined): T;
+    insertAt(token: string, i?: number | undefined): import("../index").AstText;
+    insertAt<T extends import("../index").AstNodes>(token: T, i?: number | undefined): T;
     length: number;
     toString(selector?: string | undefined, separator?: string | undefined): string;
     text(separator?: string | undefined): string;
@@ -17,7 +17,7 @@ declare const AttributeToken_base: ((abstract new (...args: any[]) => {
  * 扩展和HTML标签属性
  * @classdesc `{childNodes: [AtomToken, Token|AtomToken]}`
  */
-declare abstract class AttributeToken extends AttributeToken_base {
+export declare abstract class AttributeToken extends AttributeToken_base {
     #private;
     type: AttributeTypes;
     name: string;
@@ -26,8 +26,8 @@ declare abstract class AttributeToken extends AttributeToken_base {
     abstract get firstElementChild(): AtomToken;
     abstract get lastChild(): Token;
     abstract get lastElementChild(): Token;
-    abstract get parentNode(): import('./attributes') | undefined;
-    abstract get parentElement(): import('./attributes') | undefined;
+    abstract get parentNode(): AttributesToken | undefined;
+    abstract get parentElement(): AttributesToken | undefined;
     abstract get nextSibling(): AtomToken | this | undefined;
     abstract get nextElementSibling(): AtomToken | this | undefined;
     abstract get previousSibling(): AtomToken | this | undefined;
@@ -57,7 +57,7 @@ declare abstract class AttributeToken extends AttributeToken_base {
      * @param value 属性值
      * @param quotes 引号
      */
-    constructor(type: AttributeTypes, tag: string, key: string, equal?: string, value?: string, quotes?: [string?, string?], config?: Parser.Config, accum?: Token[]);
+    constructor(type: AttributeTypes, tag: string, key: string, equal?: string, value?: string, quotes?: [string?, string?], config?: import("../index").Config, accum?: Token[]);
     /**
      * @override
      * @browser
@@ -77,7 +77,7 @@ declare abstract class AttributeToken extends AttributeToken_base {
      * @override
      * @browser
      */
-    lint(start?: number): Parser.LintError[];
+    lint(start?: number): LintError[];
     /**
      * 获取属性值
      * @browser
@@ -99,8 +99,8 @@ declare abstract class AttributeToken extends AttributeToken_base {
      * 修改属性名
      * @param key 新属性名
      * @throws `Error` title属性不能更名
-     * @throws `SyntaxError` 非法的模板参数名
+     * @throws `SyntaxError` 非法的标签属性名
      */
     rename(key: string): void;
 }
-export = AttributeToken;
+export {};