wikiparser-node 1.4.2 → 1.4.3

package/dist/addon/table.js

@@ -40,7 +40,11 @@ const isStartCol = (rowLayout, i, oneCol = false) => {
     return rowLayout[i - 1] !== coords && (!oneCol || rowLayout[i + 1] !== coords);
 };
 function occupied(layout, i, oneRow = false, cells) {
-    return layout[i].map(({ row, column }, j) => row === i && (!oneRow || cells[column].rowspan === 1) ? j : undefined).filter((j) => j !== undefined);
+    const rowLayout = layout[i];
+    if (rowLayout) {
+        return rowLayout.map(({ row, column }, j) => row === i && (!oneRow || cells[column]?.rowspan === 1) ? j : undefined).filter((j) => j !== undefined);
+    }
+    throw new RangeError(`表格没有第 ${i} 行！`);
 }
 /**
  * 设置表格格式

package/dist/base.d.ts

@@ -24,6 +24,11 @@ export interface LintError {
     readonly endLine: number;
     readonly endCol: number;
 }
+export type AST = Record<string, string | number | boolean> & {
+    range: [number, number];
+    type?: string;
+    childNodes?: AST[];
+};
 /** 类似Node */
 export interface AstNode {
     type: string;
@@ -36,7 +41,7 @@ export interface AstNode {
 /** 类似HTMLElement */
 interface AstElement extends AstNode {
     /** 保存为JSON */
-    json(): object;
+    json(): AST;
 }
 export interface Parser {
     config: string | Config;

package/dist/index.d.ts

@@ -1,10 +1,8 @@
-import { Shadow } from './util/debug';
 import type { log } from './util/diff';
 import type { Config, LintError, Parser as ParserBase } from './base';
 import type { Title } from './lib/title';
 import type { Token } from './internal';
 declare interface Parser extends ParserBase {
-    readonly Shadow: typeof Shadow;
     conversionTable: Map<string, string>;
     redirects: Map<string, string>;
     warning: boolean;

package/dist/index.js

@@ -17,7 +17,6 @@ const Parser = {
     config: 'default',
     i18n: undefined,
     /* NOT FOR BROWSER */
-    Shadow: debug_1.Shadow,
     conversionTable: new Map(),
     redirects: new Map(),
     warning: true,
@@ -62,8 +61,9 @@ const Parser = {
         /* NOT FOR BROWSER */
         debug_1.Shadow.run(() => {
             for (const key of ['main', 'fragment']) {
-                if (titleObj[key]?.includes('\0')) {
-                    titleObj[key] = token.buildFromStr(titleObj[key], constants_1.BuildMethod.Text);
+                const str = titleObj[key];
+                if (str?.includes('\0')) {
+                    titleObj[key] = token.buildFromStr(str, constants_1.BuildMethod.Text);
                 }
             }
         });

package/dist/lib/element.d.ts

@@ -1,5 +1,5 @@
 import { AstNode } from './node';
-import type { LintError } from '../base';
+import type { LintError, AST } from '../base';
 import type { AstNodes, AstText, Token } from '../internal';
 /** 类似HTMLElement */
 export declare abstract class AstElement extends AstNode {
@@ -85,8 +85,9 @@ export declare abstract class AstElement extends AstNode {
     /**
      * 保存为JSON
      * @param file 文件名
+     * @param start
      */
-    json(file?: string): object;
+    json(file?: string, start?: number): AST;
     /** 销毁 */
     destroy(): void;
     /**

package/dist/lib/element.js

@@ -11,6 +11,7 @@ const ranges_1 = require("./ranges");
 const title_1 = require("./title");
 const index_1 = require("../index");
 const node_1 = require("./node");
+/* NOT FOR BROWSER */
 /**
  * optionally convert to lower cases
  * @param val 属性值
@@ -164,18 +165,14 @@ class AstElement extends node_1.AstNode {
      * @param selector 选择器
      */
     #getCondition(selector) {
-        let condition;
         /* NOT FOR BROWSER */
         if (/[^a-z\-,\s]/u.test(selector)) {
             const stack = (0, selector_1.parseSelector)(selector);
-            condition = (token => stack.some(copy => token.#matchesArray(copy)));
+            return (token => stack.some(copy => token.#matchesArray(copy)));
         }
-        else {
-            /* NOT FOR BROWSER END */
-            const types = new Set(selector.split(',').map(str => str.trim()));
-            condition = (token => types.has(token.type));
-        }
-        return condition;
+        /* NOT FOR BROWSER END */
+        const types = new Set(selector.split(',').map(str => str.trim()));
+        return (({ type }) => types.has(type));
     }
     /**
      * 最近的祖先节点
@@ -223,9 +220,7 @@ class AstElement extends node_1.AstNode {
         this.verifyChild(i);
         /* NOT FOR BROWSER END */
         const oldText = this.childNodes[i];
-        /* NOT FOR BROWSER */
-        if (oldText.type === 'text') {
-            /* NOT FOR BROWSER END */
+        if (oldText.type === 'text') { // eslint-disable-line @typescript-eslint/no-unnecessary-condition
             const { data } = oldText;
             oldText.replaceData(str);
             return data;
@@ -260,12 +255,24 @@ class AstElement extends node_1.AstNode {
     /**
      * 保存为JSON
      * @param file 文件名
+     * @param start
      */
-    json(file) {
+    json(file, start = this.getAbsoluteIndex()) {
         const json = {
             ...this,
-            childNodes: this.childNodes.map(child => child.type === 'text' ? { data: child.data } : child.json()),
+            range: [start, start + String(this).length],
+            childNodes: [],
         };
+        for (let i = 0, cur = start + this.getAttribute('padding'); i < this.length; i++) {
+            const child = this.childNodes[i], { length } = String(child);
+            if (child.type === 'text') {
+                json.childNodes.push({ data: child.data, range: [cur, cur + length] });
+            }
+            else {
+                json.childNodes.push(child.json(undefined, cur));
+            }
+            cur += length + this.getGaps(i);
+        }
         /* NOT FOR BROWSER */
         if (typeof file === 'string') {
             fs.writeFileSync(path.join(__dirname.slice(0, -4), '..', 'printed', `${file}${file.endsWith('.json') ? '' : '.json'}`), JSON.stringify(json, null, 2));

package/dist/lib/node.js

@@ -199,26 +199,29 @@ class AstNode {
         const { parentNode } = this;
         return parentNode ? parentNode.getAbsoluteIndex() + this.getRelativeIndex() : 0;
     }
-    /* NOT FOR BROWSER */
-    /** @private */
-    typeError(method, ...types) {
-        return typeError(this.constructor, method, ...types);
-    }
-    /** @private */
-    constructorError(msg) {
-        throw new Error(`${this.constructor.name} ${msg}！`);
-    }
     /** @private */
     seal(key, permanent) {
+        /* NOT FOR BROWSER */
         if (!permanent) {
             this.#optional.add(key);
         }
+        /* NOT FOR BROWSER END */
         Object.defineProperty(this, key, {
-            writable: false,
             enumerable: !permanent && Boolean(this[key]),
             configurable: true,
+            /* NOT FOR BROWSER */
+            writable: false,
         });
     }
+    /* NOT FOR BROWSER */
+    /** @private */
+    typeError(method, ...types) {
+        return typeError(this.constructor, method, ...types);
+    }
+    /** @private */
+    constructorError(msg) {
+        throw new Error(`${this.constructor.name} ${msg}！`);
+    }
     /**
      * 是否是全同节点
      * @param node 待比较的节点

package/dist/lib/text.js

@@ -85,14 +85,13 @@ class AstText extends node_1.AstNode {
     constructor(text) {
         super();
         Object.defineProperties(this, {
+            childNodes: { enumerable: false, configurable: false },
+            type: { enumerable: false, writable: false },
             data: {
                 value: text,
                 /* NOT FOR BROWSER */
                 writable: false,
             },
-            /* NOT FOR BROWSER */
-            childNodes: { enumerable: false, configurable: false },
-            type: { enumerable: false, writable: false },
         });
     }
     /** @private */
@@ -116,6 +115,7 @@ class AstText extends node_1.AstNode {
         }
         /* NOT FOR BROWSER END */
         const { NowikiToken } = require('../src/nowiki');
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
         const { type, name } = parentNode, nowiki = name === 'nowiki' || name === 'pre';
         let errorRegex;
         if (type === 'ext-inner' && (name === 'pre' || parentNode instanceof NowikiToken)) {

package/dist/lib/title.js

@@ -61,12 +61,6 @@ class Title {
      * @param selfLink 是否允许selfLink
      */
     constructor(title, defaultNs = 0, config = index_1.default.getConfig(), decode = false, selfLink = false) {
-        const { nsid, 
-        /* NOT FOR BROWSER */
-        namespaces, } = config;
-        /* NOT FOR BROWSER */
-        this.#namespaces = namespaces;
-        /* NOT FOR BROWSER END */
         title = (0, string_1.decodeHtml)(title);
         if (decode && title.includes('%')) {
             try {
@@ -91,7 +85,7 @@ class Title {
         /* NOT FOR BROWSER END */
         const m = title.split(':');
         if (m.length > 1) {
-            const id = nsid[m[0].trim().toLowerCase()];
+            const id = config.nsid[m[0].trim().toLowerCase()];
             if (id) {
                 ns = id;
                 title = m.slice(1).join(':').trim();
@@ -116,12 +110,10 @@ class Title {
             this.fragment = fragment;
             title = title.slice(0, i).trim();
         }
-        this.valid = Boolean(title
-            /* NOT FOR BROWSER */
-            || this.interwiki
-            /* NOT FOR BROWSER END */
-            || selfLink && this.fragment !== undefined) && !/^:|\0\d+[eh!+-]\x7F|[<>[\]{}|]|%[\da-f]{2}/iu.test(title);
+        this.valid = Boolean(title || this.interwiki || selfLink && this.fragment !== undefined)
+            && !/^:|\0\d+[eh!+-]\x7F|[<>[\]{}|]|%[\da-f]{2}/iu.test(title);
         /* NOT FOR BROWSER */
+        this.#namespaces = config.namespaces;
         this.main = title;
         Object.defineProperties(this, {
             valid: { writable: false },

package/dist/mixin/attributesParent.d.ts

@@ -1,20 +1,50 @@
 export interface AttributesParentBase {
+    /** getAttrs()方法的getter写法 */
     attributes: Record<string, string | true>;
+    /** 以字符串表示的class属性 */
     className: string;
+    /** 以Set表示的class属性 */
     classList: Set<string>;
+    /** id属性 */
     id: string;
+    /**
+     * AttributesToken子节点是否具有某属性
+     * @param key 属性键
+     */
     hasAttr(key: string): boolean;
+    /**
+     * 获取AttributesToken子节点的属性
+     * @param key 属性键
+     */
     getAttr(key: string): string | true | undefined;
+    /** 列举AttributesToken子节点的属性键 */
     getAttrNames(): Set<string>;
+    /** 获取AttributesToken子节点的全部标签属性 */
     getAttrs(): Record<string, string | true>;
+    /**
+     * 对AttributesToken子节点设置属性
+     * @param key 属性键
+     * @param value 属性值
+     * @param prop 属性对象
+     */
     setAttr(key: string, value: string | boolean): void;
     setAttr(prop: Record<string, string | boolean>): void;
+    /**
+     * 移除AttributesToken子节点的某属性
+     * @param key 属性键
+     */
     removeAttr(key: string): void;
+    /**
+     * 开关AttributesToken子节点的某属性
+     * @param key 属性键
+     * @param force 强制开启或关闭
+     */
     toggleAttr(key: string, force?: boolean): void;
 }
 /**
  * 子节点含有AttributesToken的类
- * @param constructor 基类
  * @param i AttributesToken子节点的位置
+ * @param constructor 基类
+ * @param _ context
  */
-export declare const attributesParent: <T extends AstConstructor>(constructor: T, i?: number) => T;
+export declare const attributesParent: (i?: number) => <T extends AstConstructor>(constructor: T, _?: unknown) => T;

package/dist/mixin/attributesParent.js

@@ -4,85 +4,74 @@ exports.attributesParent = void 0;
 const constants_1 = require("../util/constants");
 /**
  * 子节点含有AttributesToken的类
- * @param constructor 基类
  * @param i AttributesToken子节点的位置
+ * @param constructor 基类
+ * @param _ context
  */
-const attributesParent = (constructor, i = 0) => {
+const attributesParent = (i = 0) => (constructor, _) => {
     /** 子节点含有AttributesToken的类 */
     class AttributesParent extends constructor {
         /** AttributesToken子节点 */
         get #attributesChild() {
             return this.childNodes[i];
         }
-        /** getAttrs()方法的getter写法 */
+        /** @implements */
         get attributes() {
             return this.#attributesChild.attributes;
         }
         set attributes(attributes) {
             this.#attributesChild.attributes = attributes;
         }
-        /** 以字符串表示的class属性 */
+        /** @implements */
         get className() {
             return this.#attributesChild.className;
         }
         set className(className) {
             this.#attributesChild.className = className;
         }
-        /** 以Set表示的class属性 */
+        /** @implements */
         get classList() {
             return this.#attributesChild.classList;
         }
         set classList(classList) {
             this.#attributesChild.classList = classList;
         }
-        /** id属性 */
+        /** @implements */
         get id() {
             return this.#attributesChild.id;
         }
         set id(id) {
             this.#attributesChild.id = id;
         }
-        /**
-         * AttributesToken子节点是否具有某属性
-         * @param key 属性键
-         */
+        /** @implements */
         hasAttr(key) {
             return this.#attributesChild.hasAttr(key);
         }
-        /**
-         * 获取AttributesToken子节点的属性
-         * @param key 属性键
-         */
+        /** @implements */
         getAttr(key) {
             return this.#attributesChild.getAttr(key);
         }
-        /** 列举AttributesToken子节点的属性键 */
+        /** @implements */
         getAttrNames() {
             return this.#attributesChild.getAttrNames();
         }
-        /** 获取AttributesToken子节点的全部标签属性 */
+        /** @implements */
         getAttrs() {
             return this.#attributesChild.getAttrs();
         }
         setAttr(keyOrProp, value) {
             this.#attributesChild.setAttr(keyOrProp, value);
         }
-        /**
-         * 移除AttributesToken子节点的某属性
-         * @param key 属性键
-         */
+        /** @implements */
         removeAttr(key) {
             this.#attributesChild.removeAttr(key);
         }
-        /**
-         * 开关AttributesToken子节点的某属性
-         * @param key 属性键
-         * @param force 强制开启或关闭
-         */
+        /** @implements */
         toggleAttr(key, force) {
             this.#attributesChild.toggleAttr(key, force);
         }
     }
+    Object.defineProperty(AttributesParent, 'name', { value: constructor.name });
     return AttributesParent;
 };
 exports.attributesParent = attributesParent;

package/dist/mixin/fixed.d.ts

@@ -1,5 +1,6 @@
 /**
  * 不可增删子节点的类
  * @param constructor 基类
+ * @param _ context
  */
-export declare const fixedToken: <S extends AstConstructor>(constructor: S) => S;
+export declare const fixedToken: <S extends AstConstructor>(constructor: S, _?: unknown) => S;

package/dist/mixin/fixed.js

@@ -6,8 +6,9 @@ const constants_1 = require("../util/constants");
 /**
  * 不可增删子节点的类
  * @param constructor 基类
+ * @param _ context
  */
-const fixedToken = (constructor) => {
+const fixedToken = (constructor, _) => {
     /** 不可增删子节点的类 */
     class FixedToken extends constructor {
         /** @private */
@@ -22,6 +23,7 @@ const fixedToken = (constructor) => {
             return debug_1.Shadow.running ? super.insertAt(token, i) : this.constructorError('不可插入元素');
         }
     }
+    Object.defineProperty(FixedToken, 'name', { value: constructor.name });
     return FixedToken;
 };
 exports.fixedToken = fixedToken;

package/dist/mixin/flagsParent.d.ts

@@ -1,22 +1,5 @@
 import type { ConverterFlagsToken } from '../src/converterFlags';
 export interface FlagsParentBase {
-    flags: Set<string>;
-    getAllFlags(): Set<string>;
-    getEffectiveFlags(): Set<string>;
-    getUnknownFlags(): Set<string>;
-    hasFlag(flag: string): boolean;
-    hasEffectiveFlag(flag: string): boolean;
-    removeFlag(flag: string): void;
-    setFlag(flag: string): void;
-    toggleFlag(flag: string): void;
-}
-/**
- * ConverterToken
- * @param constructor 基类
- */
-export declare const flagsParent: <T extends AstConstructor>(constructor: T) => (abstract new (...args: any[]) => {
-    readonly firstChild: ConverterFlagsToken;
-    readonly firstElementChild: ConverterFlagsToken;
     /** 所有转换类型标记 */
     flags: Set<string>;
     /** 获取所有转换类型标记 */
@@ -50,6 +33,33 @@ export declare const flagsParent: <T extends AstConstructor>(constructor: T) =>
      * @param flag 转换类型标记
      */
     toggleFlag(flag: string): void;
+}
+/**
+ * ConverterToken
+ * @param constructor 基类
+ * @param _ context
+ */
+export declare const flagsParent: <T extends AstConstructor>(constructor: T, _?: unknown) => (abstract new (...args: any[]) => {
+    readonly firstChild: ConverterFlagsToken;
+    readonly firstElementChild: ConverterFlagsToken;
+    /** @implements */
+    flags: Set<string>;
+    /** @implements */
+    getAllFlags(): Set<string>;
+    /** @implements */
+    getEffectiveFlags(): Set<string>;
+    /** @implements */
+    getUnknownFlags(): Set<string>;
+    /** @implements */
+    hasFlag(flag: string): boolean;
+    /** @implements */
+    hasEffectiveFlag(flag: string): boolean;
+    /** @implements */
+    removeFlag(flag: string): void;
+    /** @implements */
+    setFlag(flag: string): void;
+    /** @implements */
+    toggleFlag(flag: string): void;
     toString(separator?: string | undefined): string;
     text(separator?: string | undefined): string;
     insertAt(token: unknown, i?: number | undefined): unknown;
@@ -58,4 +68,5 @@ export declare const flagsParent: <T extends AstConstructor>(constructor: T) =>
     addEventListener(events: string | string[], listener: AstListener): void;
     replaceChildren(...elements: (string | import("..").AstNodes)[]): void;
     constructorError(msg: string): never;
+    seal(key: string, permanent?: boolean | undefined): void;
 }) & T;

package/dist/mixin/flagsParent.js

@@ -6,66 +6,53 @@ const constants_1 = require("../util/constants");
 /**
  * ConverterToken
  * @param constructor 基类
+ * @param _ context
  */
-const flagsParent = (constructor) => {
+const flagsParent = (constructor, _) => {
     /** 子节点含有ConverterFlagsToken的类 */
     class FlagsParent extends constructor {
         /* NOT FOR BROWSER */
-        /** 所有转换类型标记 */
+        /** @implements */
         get flags() {
             return this.firstChild.flags;
         }
         set flags(value) {
             this.firstChild.flags = value;
         }
-        /** 获取所有转换类型标记 */
+        /** @implements */
         getAllFlags() {
             return this.firstChild.getAllFlags();
         }
-        /** 获取有效的转换类型标记 */
+        /** @implements */
         getEffectiveFlags() {
             return this.firstChild.getEffectiveFlags();
         }
-        /** 获取未知的转换类型标记 */
+        /** @implements */
         getUnknownFlags() {
             return this.firstChild.getUnknownFlags();
         }
-        /**
-         * 是否具有某转换类型标记
-         * @param flag 转换类型标记
-         */
+        /** @implements */
         hasFlag(flag) {
             return this.firstChild.hasFlag(flag);
         }
-        /**
-         * 是否具有某有效的转换类型标记
-         * @param flag 转换类型标记
-         */
+        /** @implements */
         hasEffectiveFlag(flag) {
             return this.firstChild.hasEffectiveFlag(flag);
         }
-        /**
-         * 移除转换类型标记
-         * @param flag 转换类型标记
-         */
+        /** @implements */
         removeFlag(flag) {
             this.firstChild.removeFlag(flag);
         }
-        /**
-         * 设置转换类型标记
-         * @param flag 转换类型标记
-         */
+        /** @implements */
         setFlag(flag) {
             this.firstChild.setFlag(flag);
         }
-        /**
-         * 开关某转换类型标记
-         * @param flag 转换类型标记
-         */
+        /** @implements */
         toggleFlag(flag) {
             this.firstChild.toggleFlag(flag);
         }
     }
+    Object.defineProperty(FlagsParent, 'name', { value: constructor.name });
     return FlagsParent;
 };
 exports.flagsParent = flagsParent;

package/dist/mixin/magicLinkParent.d.ts

@@ -1,27 +1,32 @@
 import type { MagicLinkToken } from '../src/magicLink';
 export interface MagicLinkParentBase {
+    /** 协议 */
     protocol: string | undefined;
+    /** 和内链保持一致 */
     link: string;
+    /** 获取网址 */
     getUrl(): URL;
+    /**
+     * 设置链接目标
+     * @param url 网址
+     */
     setTarget(url: string): void;
 }
 /**
  * ExtLinkToken
  * @param constructor 基类
+ * @param _ context
  */
-export declare const magicLinkParent: <T extends AstConstructor>(constructor: T) => (abstract new (...args: any[]) => {
+export declare const magicLinkParent: <T extends AstConstructor>(constructor: T, _?: unknown) => (abstract new (...args: any[]) => {
     readonly firstChild: MagicLinkToken;
     readonly firstElementChild: MagicLinkToken;
-    /** 协议 */
+    /** @implements */
     protocol: string | undefined;
-    /** 和内链保持一致 */
+    /** @implements */
     link: string;
-    /** 获取网址 */
+    /** @implements */
     getUrl(): URL;
-    /**
-     * 设置链接目标
-     * @param url 网址
-     */
+    /** @implements */
     setTarget(url: string): void;
     toString(separator?: string | undefined): string;
     text(separator?: string | undefined): string;
@@ -31,4 +36,5 @@ export declare const magicLinkParent: <T extends AstConstructor>(constructor: T)
     addEventListener(events: string | string[], listener: AstListener): void;
     replaceChildren(...elements: (string | import("..").AstNodes)[]): void;
     constructorError(msg: string): never;
+    seal(key: string, permanent?: boolean | undefined): void;
 }) & T;

package/dist/mixin/magicLinkParent.js

@@ -6,37 +6,36 @@ const constants_1 = require("../util/constants");
 /**
  * ExtLinkToken
  * @param constructor 基类
+ * @param _ context
  */
-const magicLinkParent = (constructor) => {
+const magicLinkParent = (constructor, _) => {
     /** 子节点含有MagicLinkParent的类 */
     class MagicLinkParent extends constructor {
         /* NOT FOR BROWSER */
-        /** 协议 */
+        /** @implements */
         get protocol() {
             return this.firstChild.protocol;
         }
         set protocol(value) {
             this.firstChild.protocol = value;
         }
-        /** 和内链保持一致 */
+        /** @implements */
         get link() {
             return this.firstChild.link;
         }
         set link(url) {
             this.firstChild.link = url;
         }
-        /** 获取网址 */
+        /** @implements */
         getUrl() {
             return this.firstChild.getUrl();
         }
-        /**
-         * 设置链接目标
-         * @param url 网址
-         */
+        /** @implements */
         setTarget(url) {
             this.firstChild.setTarget(url);
         }
     }
+    Object.defineProperty(MagicLinkParent, 'name', { value: constructor.name });
     return MagicLinkParent;
 };
 exports.magicLinkParent = magicLinkParent;