wikiparser-node 1.16.3 → 1.16.5

package/dist/src/link/base.js

@@ -10,8 +10,6 @@ const index_2 = require("../index");
 const atom_1 = require("../atom");
 /* NOT FOR BROWSER */
 const debug_1 = require("../../util/debug");
-const string_2 = require("../../util/string");
-const html_1 = require("../../util/html");
 /* NOT FOR BROWSER END */
 /**
  * 是否为普通内链
@@ -19,27 +17,34 @@ const html_1 = require("../../util/html");
  */
 const isLink = (type) => type === 'redirect-target' || type === 'link';
 /**
+ * internal link
+ *
  * 内链
- * @classdesc `{childNodes: [AtomToken, ...Token]}`
+ * @classdesc `{childNodes: [AtomToken, ...Token[]]}`
  */
 class LinkBaseToken extends index_2.Token {
     #bracket = true;
     #delimiter;
     #title;
-    /** 完整链接 */
+    /* NOT FOR BROWSER END */
+    /** full link / 完整链接 */
     get link() {
-        return this.#title;
-    }
-    set link(link) {
-        this.setTarget(link);
+        // eslint-disable-next-line no-unused-labels
+        LSP: return this.#title;
     }
+    /* PRINT ONLY */
     /** 片段标识符 */
     get fragment() {
         return this.#title.fragment;
     }
+    /* PRINT ONLY END */
+    /* NOT FOR BROWSER */
     set fragment(fragment) {
         this.setFragment(fragment);
     }
+    set link(link) {
+        this.setTarget(link);
+    }
     /** interwiki */
     get interwiki() {
         return this.#title.interwiki;
@@ -103,7 +108,8 @@ class LinkBaseToken extends index_2.Token {
                     (0, debug_1.undo)(e, data);
                     throw new Error(`${type === 'category' ? 'Category' : 'File'} link cannot change namespace: ${name}`);
                 }
-                else if (type === 'link' && !interwiki && (ns === 6 || ns === 14) && !name.trim().startsWith(':')) {
+                else if (type === 'link' && !interwiki && (ns === 6 || ns === 14)
+                    && !name.trim().startsWith(':')) {
                     const { firstChild } = prevTarget;
                     if (firstChild?.type === 'text') {
                         firstChild.insertData(0, ':');
@@ -163,9 +169,9 @@ class LinkBaseToken extends index_2.Token {
             errors.push(e);
         }
         if (type === 'link' || type === 'category') {
-            const textNode = linkText?.childNodes.find((c) => c.type === 'text' && c.data.includes('|'));
+            const j = linkText?.childNodes.findIndex(c => c.type === 'text' && c.data.includes('|')), textNode = linkText?.childNodes[j];
             if (textNode) {
-                const e = (0, lint_1.generateForChild)(linkText, rect, 'pipe-like', 'additional "|" in the link text', 'warning'), i = e.startIndex + textNode.getRelativeIndex();
+                const e = (0, lint_1.generateForChild)(linkText, rect, 'pipe-like', 'additional "|" in the link text', 'warning'), i = e.startIndex + linkText.getRelativeIndex(j);
                 e.suggestions = [
                     {
                         desc: 'escape',
@@ -177,10 +183,13 @@ class LinkBaseToken extends index_2.Token {
             }
         }
         if (fragment !== undefined && !isLink(type)) {
-            const e = (0, lint_1.generateForChild)(target, rect, 'no-ignored', 'useless fragment'), textNode = target.childNodes.find((c) => c.type === 'text' && c.data.includes('#'));
+            const e = (0, lint_1.generateForChild)(target, rect, 'no-ignored', 'useless fragment'), j = target.childNodes.findIndex(c => c.type === 'text' && c.data.includes('#')), textNode = target.childNodes[j];
             if (textNode) {
                 e.fix = {
-                    range: [e.startIndex + textNode.getRelativeIndex() + textNode.data.indexOf('#'), e.endIndex],
+                    range: [
+                        e.startIndex + target.getRelativeIndex(j) + textNode.data.indexOf('#'),
+                        e.endIndex,
+                    ],
                     text: '',
                     desc: 'remove',
                 };
@@ -190,13 +199,21 @@ class LinkBaseToken extends index_2.Token {
         return errors;
     }
     /** @private */
-    getTitle(halfParsed) {
-        return this.normalizeTitle(this.firstChild.toString(true), 0, halfParsed, true, true);
+    getTitle(temporary, halfParsed) {
+        return this.normalizeTitle(this.firstChild.toString(true), 0, temporary, halfParsed, true, true);
     }
     /** @private */
     print() {
         return super.print(this.#bracket ? { pre: '[[', post: ']]', sep: this.#delimiter } : { sep: this.#delimiter });
     }
+    /** @private */
+    json(_, start = this.getAbsoluteIndex()) {
+        const json = super.json(undefined, start), { type, fragment } = this;
+        if (fragment !== undefined && (type === 'link' || type === 'redirect-target')) {
+            json['fragment'] = fragment;
+        }
+        return json;
+    }
     /* NOT FOR BROWSER */
     cloneNode() {
         const [link, ...linkText] = this.cloneChildNodes();
@@ -208,8 +225,10 @@ class LinkBaseToken extends index_2.Token {
         });
     }
     /**
+     * Set the link target
+     *
      * 设置链接目标
-     * @param link 链接目标
+     * @param link link target / 链接目标
      */
     setTarget(link) {
         const config = this.getAttribute('config'), { childNodes } = index_1.default.parse(link, this.getAttribute('include'), 2, config), token = debug_1.Shadow.run(() => new atom_1.AtomToken(undefined, 'link-target', config, [], {
@@ -219,26 +238,31 @@ class LinkBaseToken extends index_2.Token {
         this.firstChild.safeReplaceWith(token);
     }
     /**
+     * Set the fragment
+     *
      * 设置片段标识符
      * @param fragment 片段标识符
      */
     setFragment(fragment) {
         const { type, name } = this;
         if (fragment === undefined || isLink(type)) {
-            fragment &&= (0, string_2.encode)(fragment);
+            fragment &&= (0, string_1.encode)(fragment);
             this.setTarget(name + (fragment === undefined ? '' : `#${fragment}`));
         }
     }
     /**
+     * Set the link text
+     *
      * 设置链接显示文字
-     * @param linkStr 链接显示文字
+     * @param linkStr link text / 链接显示文字
      */
     setLinkText(linkStr) {
         if (linkStr === undefined) {
             this.childNodes[1]?.remove();
             return;
         }
-        const root = index_1.default.parse(linkStr, this.getAttribute('include'), undefined, this.getAttribute('config'));
+        const root = index_1.default
+            .parse(linkStr, this.getAttribute('include'), undefined, this.getAttribute('config'));
         if (this.length === 1) {
             root.type = 'link-text';
             root.setAttribute('acceptable', {
@@ -254,9 +278,9 @@ class LinkBaseToken extends index_2.Token {
     toHtmlInternal(opt) {
         if (this.is('link') || this.is('redirect-target')) {
             const { link, length, lastChild, type } = this, title = link.getTitleAttr();
-            return (0, html_1.font)(this, `<a${link.interwiki && ' class="extiw"'} href="${link.getUrl()}"${title && ` title="${title}"`}>${type === 'link' && length > 1
+            return `<a${link.interwiki && ' class="extiw"'} href="${link.getUrl()}"${title && ` title="${title}"`}>${type === 'link' && length > 1
                 ? lastChild.toHtmlInternal({ ...opt, nowrap: true })
-                : (0, string_2.sanitize)(this.innerText)}</a>`);
+                : (0, string_1.sanitize)(this.innerText)}</a>`;
         }
         return '';
     }

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

@@ -1,22 +1,27 @@
 import { LinkBaseToken } from './base';
-import type { Token, AtomToken } from '../../internal';
 import type { Title } from '../../lib/title';
+import type { AST } from '../../base';
+import type { Token, AtomToken } from '../../internal';
 /**
+ * category
+ *
  * 分类
  * @classdesc `{childNodes: [AtomToken, ?Token]}`
  */
 export declare abstract class CategoryToken extends LinkBaseToken {
     readonly childNodes: readonly [AtomToken] | readonly [AtomToken, Token];
-    abstract get children(): [AtomToken] | [AtomToken, Token];
     abstract get link(): Title;
+    abstract get children(): [AtomToken] | [AtomToken, Token];
     abstract set link(link: string);
     get type(): 'category';
-    /** 分类排序关键字 */
+    /** sort key / 分类排序关键字 */
     get sortkey(): string | undefined;
     set sortkey(text: string | undefined);
     /**
+     * Set the sort key
+     *
      * 设置排序关键字
-     * @param text 排序关键字
+     * @param text sort key / 排序关键字
      */
     setSortkey(text?: string): void;
 }

package/dist/src/link/category.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CategoryToken = void 0;
+const string_1 = require("../../util/string");
 const base_1 = require("./base");
 /* NOT FOR BROWSER */
-const string_1 = require("../../util/string");
 const constants_1 = require("../../util/constants");
 /* NOT FOR BROWSER END */
 /**
+ * category
+ *
  * 分类
  * @classdesc `{childNodes: [AtomToken, ?Token]}`
  */
@@ -15,18 +17,32 @@ class CategoryToken extends base_1.LinkBaseToken {
     get type() {
         return 'category';
     }
-    /* NOT FOR BROWSER */
-    /** 分类排序关键字 */
+    /* PRINT ONLY */
+    /** sort key / 分类排序关键字 */
     get sortkey() {
         const { childNodes: [, child] } = this;
         return child && (0, string_1.decodeHtml)(child.text());
     }
+    /* PRINT ONLY END */
+    /* NOT FOR BROWSER */
     set sortkey(text) {
         this.setSortkey(text);
     }
+    /* NOT FOR BROWSER END */
+    /** @private */
+    json(_, start = this.getAbsoluteIndex()) {
+        const json = super.json(undefined, start), { sortkey } = this;
+        if (sortkey) {
+            json['sortkey'] = sortkey;
+        }
+        return json;
+    }
+    /* NOT FOR BROWSER */
     /**
+     * Set the sort key
+     *
      * 设置排序关键字
-     * @param text 排序关键字
+     * @param text sort key / 排序关键字
      */
     setSortkey(text) {
         this.setLinkText(text);

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

@@ -1,12 +1,14 @@
 import Parser from '../../index';
 import { LinkBaseToken } from './base';
 import { ImageParameterToken } from '../imageParameter';
-import type { LintError } from '../../base';
+import type { LintError, AST } from '../../base';
 import type { Token, AtomToken } from '../../internal';
 import { Title } from '../../lib/title';
 /**
+ * image
+ *
  * 图片
- * @classdesc `{childNodes: [AtomToken, ...ImageParameterToken]}`
+ * @classdesc `{childNodes: [AtomToken, ...ImageParameterToken[]]}`
  */
 export declare abstract class FileToken extends LinkBaseToken {
     #private;
@@ -15,12 +17,12 @@ export declare abstract class FileToken extends LinkBaseToken {
     abstract get children(): [AtomToken, ...ImageParameterToken[]];
     abstract get lastElementChild(): AtomToken | ImageParameterToken;
     get type(): 'file' | 'gallery-image' | 'imagemap-image';
-    /** 扩展名 */
+    /** file extension / 扩展名 */
     get extension(): string | undefined;
-    /** 图片链接 */
+    /** image link / 图片链接 */
     get link(): string | Title;
     set link(value: string);
-    /** 图片大小 */
+    /** image size / 图片大小 */
     get size(): {
         width: string;
         height: string;
@@ -29,10 +31,10 @@ export declare abstract class FileToken extends LinkBaseToken {
         width: string;
         height: string;
     } | undefined);
-    /** 图片宽度 */
+    /** image width / 图片宽度 */
     get width(): string | undefined;
     set width(width: string | undefined);
-    /** 图片高度 */
+    /** image height / 图片高度 */
     get height(): string | undefined;
     set height(height: string | undefined);
     /**
@@ -41,56 +43,102 @@ export declare abstract class FileToken extends LinkBaseToken {
      * @param delimiter `|`
      */
     constructor(link: string, text?: string, config?: Parser.Config, accum?: Token[], delimiter?: string);
-    /** 获取所有图片参数节点 */
+    /**
+     * Get all image parameter tokens
+     *
+     * 获取所有图片参数节点
+     */
     getAllArgs(): ImageParameterToken[];
     /**
+     * Get image parameters with the specified name
+     *
      * 获取指定图片参数
-     * @param key 参数名
+     * @param key parameter name / 参数名
      */
     getArgs(key: string): ImageParameterToken[];
     /**
+     * Get the effective image parameter with the specified name
+     *
      * 获取生效的指定图片参数
-     * @param key 参数名
+     * @param key parameter name / 参数名
      */
     getArg(key: string): ImageParameterToken | undefined;
     /**
+     * Get the effective image parameter value
+     *
      * 获取生效的指定图片参数值
-     * @param key 参数名
+     * @param key parameter name / 参数名
      */
     getValue(key: string): string | true | undefined;
-    /** 获取图片框架属性参数节点 */
+    /**
+     * Get image frame parameter tokens
+     *
+     * 获取图片框架属性参数节点
+     */
     getFrameArgs(): ImageParameterToken[];
-    /** 获取图片水平对齐参数节点 */
+    /**
+     * Get image horizontal alignment parameter tokens
+     *
+     * 获取图片水平对齐参数节点
+     */
     getHorizAlignArgs(): ImageParameterToken[];
-    /** 获取图片垂直对齐参数节点 */
+    /**
+     * Get image vertical alignment parameter tokens
+     *
+     * 获取图片垂直对齐参数节点
+     */
     getVertAlignArgs(): ImageParameterToken[];
-    /** 获取生效的图片框架属性参数 */
+    /**
+     * Get the effective image frame paremter value
+     *
+     * 获取生效的图片框架属性参数
+     */
     getFrame(): string | Title | undefined;
-    /** 获取生效的图片水平对齐参数 */
+    /**
+     * Get the effective image horizontal alignment parameter value
+     *
+     * 获取生效的图片水平对齐参数
+     */
     getHorizAlign(): string | undefined;
-    /** 获取生效的图片垂直对齐参数 */
+    /**
+     * Get the effective image vertical alignment parameter value
+     *
+     * 获取生效的图片垂直对齐参数
+     */
     getVertAlign(): string | undefined;
     /**
+     * Check if the image contains the specified parameter
+     *
      * 是否具有指定图片参数
-     * @param key 参数名
+     * @param key parameter name / 参数名
      */
     hasArg(key: string): boolean;
     /**
+     * Remove the specified image parameter
+     *
      * 移除指定图片参数
-     * @param key 参数名
+     * @param key parameter name / 参数名
      */
     removeArg(key: string): void;
-    /** 获取图片参数名 */
+    /**
+     * Get all image parameter names
+     *
+     * 获取图片参数名
+     */
     getKeys(): Set<string>;
     /**
+     * Get the image parameter values with the specified name
+     *
      * 获取指定的图片参数值
-     * @param key 参数名
+     * @param key parameter name / 参数名
      */
     getValues(key: string): (string | true)[];
     /**
+     * Set the image parameter
+     *
      * 设置图片参数
-     * @param key 参数名
-     * @param value 参数值
+     * @param key parameter name / 参数名
+     * @param value parameter value / 参数值
      * @throws `RangeError` 未定义的图片参数
      */
     setValue(key: string, value?: string | boolean): void;