wikilint 2.9.3 → 2.11.0

package/dist/src/extLink.js

@@ -36,11 +36,11 @@ class ExtLinkToken extends index_2.Token {
         }
     }
     /** @private */
-    toString() {
+    toString(skip) {
         if (this.length === 1) {
-            return `[${super.toString()}${this.#space}]`;
+            return `[${super.toString(skip)}${this.#space}]`;
         }
-        return `[${super.toString(this.#space)}]`;
+        return `[${super.toString(skip, this.#space)}]`;
     }
     /** @private */
     text() {

package/dist/src/gallery.js

@@ -42,8 +42,8 @@ class GalleryToken extends index_2.Token {
         return this.normalizeTitle(file, 6, true, true).valid;
     }
     /** @private */
-    toString() {
-        return super.toString('\n');
+    toString(skip) {
+        return super.toString(skip, '\n');
     }
     /** @private */
     text() {
@@ -59,12 +59,13 @@ class GalleryToken extends index_2.Token {
         for (let i = 0; i < this.length; i++) {
             const child = this.childNodes[i], str = child.toString(), { length } = str, trimmed = str.trim(), startLine = top + i, startCol = i ? 0 : left;
             if (child.type === 'noinclude' && trimmed && !/^<!--.*-->$/u.test(trimmed)) {
+                const endIndex = start + length;
                 errors.push({
                     rule: 'no-ignored',
                     message: index_1.default.msg('invalid content in <$1>', 'gallery'),
                     severity: trimmed.startsWith('|') ? 'warning' : 'error',
                     startIndex: start,
-                    endIndex: start + length,
+                    endIndex,
                     startLine,
                     endLine: startLine,
                     startCol,
@@ -72,12 +73,12 @@ class GalleryToken extends index_2.Token {
                     suggestions: [
                         {
                             desc: 'remove',
-                            range: [start, start + length],
+                            range: [start, endIndex],
                             text: '',
                         },
                         {
                             desc: 'comment',
-                            range: [start, start + length],
+                            range: [start, endIndex],
                             text: `<!--${str}-->`,
                         },
                     ],

package/dist/src/heading.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HeadingToken = void 0;
 const lint_1 = require("../util/lint");
 const rect_1 = require("../lib/rect");
+const debug_1 = require("../util/debug");
 const index_1 = require("../index");
 const index_2 = require("./index");
 const syntax_1 = require("./syntax");
@@ -37,9 +38,9 @@ class HeadingToken extends index_2.Token {
         this.append(token, trail);
     }
     /** @private */
-    toString() {
+    toString(skip) {
         const equals = this.#equals;
-        return equals + this.firstChild.toString() + equals + this.lastChild.toString();
+        return equals + this.firstChild.toString(skip) + equals + this.lastChild.toString(skip);
     }
     /** @private */
     text() {
@@ -56,7 +57,7 @@ class HeadingToken extends index_2.Token {
     }
     /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
-        const errors = super.lint(start, re), { firstChild, level } = this, innerStr = firstChild.toString(), quotes = firstChild.childNodes.filter((node) => node.type === 'quote'), boldQuotes = quotes.filter(({ bold }) => bold), italicQuotes = quotes.filter(({ italic }) => italic), rect = new rect_1.BoundingRect(this, start);
+        const errors = super.lint(start, re), { firstChild, level } = this, innerStr = firstChild.toString(), quotes = firstChild.childNodes.filter((0, debug_1.isToken)('quote')), boldQuotes = quotes.filter(({ bold }) => bold), italicQuotes = quotes.filter(({ italic }) => italic), rect = new rect_1.BoundingRect(this, start);
         if (this.level === 1) {
             errors.push((0, lint_1.generateForChild)(firstChild, rect, 'h1', '<h1>'));
         }

package/dist/src/hidden.js

@@ -39,7 +39,7 @@ const hidden_1 = require("../mixin/hidden");
 const index_1 = require("./index");
 /** 不可见的节点 */
 let HiddenToken = (() => {
-    let _classDecorators = [(0, hidden_1.hiddenToken)(true)];
+    let _classDecorators = [(0, hidden_1.hiddenToken)()];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;

package/dist/src/html.js

@@ -66,8 +66,8 @@ class HtmlToken extends index_1.Token {
         this.#tag = name;
     }
     /** @private */
-    toString() {
-        return `<${this.closing ? '/' : ''}${this.#tag}${super.toString()}${this.#selfClosing ? '/' : ''}>`;
+    toString(skip) {
+        return `<${this.closing ? '/' : ''}${this.#tag}${super.toString(skip)}${this.#selfClosing ? '/' : ''}>`;
     }
     /** @private */
     text() {
@@ -125,10 +125,7 @@ class HtmlToken extends index_1.Token {
                 else if (msg === 'tag that is both closing and self-closing') {
                     const { html: [, , voidTags] } = this.getAttribute('config');
                     if (voidTags.includes(this.name)) {
-                        error.fix = {
-                            range: [start + 1, start + 2],
-                            text: '',
-                        };
+                        error.fix = { range: [start + 1, start + 2], text: '' };
                     }
                 }
                 errors.push(error);

package/dist/src/imageParameter.js

@@ -8,7 +8,7 @@ const index_2 = require("./index");
 exports.galleryParams = new Set(['alt', 'link', 'lang', 'page', 'caption']);
 function validate(key, val, config, halfParsed, ext) {
     val = val.trim();
-    let value = val.replace(/\0\d+t\x7F/gu, '').trim();
+    let value = val.replace(key === 'link' ? /\0\d+[tq]\x7F/gu : /\0\d+t\x7F/gu, '').trim();
     switch (key) {
         case 'width':
             return !value || /^(?:\d+x?|\d*x\d+)(?:\s*px)?$/u.test(value);
@@ -16,9 +16,9 @@ function validate(key, val, config, halfParsed, ext) {
             if (!value) {
                 return val;
             }
-            const regex = new RegExp(String.raw `^(?:(?:${config.protocol}|//)${string_1.extUrlCharFirst}|\0\d+m\x7F)${string_1.extUrlChar}$`, 'iu');
-            if (regex.test(value)) {
-                return val;
+            const re1 = new RegExp(String.raw `^(?:${config.protocol}|//|\0\d+m\x7F)`, 'iu'), re2 = new RegExp(String.raw `^(?:(?:${config.protocol}|//)${string_1.extUrlCharFirst}|\0\d+m\x7F)${string_1.extUrlChar}$`, 'iu');
+            if (re1.test(value)) {
+                return re2.test(value) && val;
             }
             else if (value.startsWith('[[') && value.endsWith(']]')) {
                 value = value.slice(2, -2);
@@ -86,8 +86,8 @@ class ImageParameterToken extends index_2.Token {
         super.afterBuild();
     }
     /** @private */
-    toString() {
-        return this.#syntax ? this.#syntax.replace('$1', super.toString()) : super.toString();
+    toString(skip) {
+        return this.#syntax ? this.#syntax.replace('$1', super.toString(skip)) : super.toString(skip);
     }
     /** @private */
     text() {
@@ -106,11 +106,8 @@ class ImageParameterToken extends index_2.Token {
     lint(start = this.getAbsoluteIndex(), re) {
         const errors = super.lint(start, re), { link, name } = this;
         if (name === 'invalid') {
-            const e = (0, lint_1.generateForSelf)(this, { start }, 'invalid-gallery', 'invalid gallery image parameter');
-            e.fix = {
-                range: [start, start + e.endIndex],
-                text: '',
-            };
+            const e = (0, lint_1.generateForSelf)(this, { start }, 'invalid-gallery', 'invalid image parameter');
+            e.fix = { range: [start - 1, e.endIndex], text: '' };
             errors.push(e);
         }
         else if (typeof link === 'object' && link.encoded) {

package/dist/src/imagemap.js

@@ -77,8 +77,8 @@ class ImagemapToken extends index_2.Token {
         }
     }
     /** @private */
-    toString() {
-        return super.toString('\n');
+    toString(skip) {
+        return super.toString(skip, '\n');
     }
     /** @private */
     text() {

package/dist/src/index.js

@@ -80,7 +80,7 @@ class Token extends element_1.AstElement {
     }
     /** @private */
     parseOnce(n = this.#stage, include = false) {
-        if (n < this.#stage || !this.getAttribute('plain') || this.length === 0) {
+        if (n < this.#stage || this.length === 0 || !this.getAttribute('plain')) {
             return this;
         }
         else if (this.#stage >= constants_1.MAX_STAGE) {
@@ -89,7 +89,7 @@ class Token extends element_1.AstElement {
         switch (n) {
             case 0:
                 if (this.type === 'root') {
-                    this.#accum.shift();
+                    this.#accum.pop();
                     const isRedirect = this.#parseRedirect();
                     include &&= !isRedirect;
                 }
@@ -129,7 +129,7 @@ class Token extends element_1.AstElement {
         }
         if (this.type === 'root') {
             for (const token of this.#accum) {
-                token.parseOnce(n, include);
+                token?.parseOnce(n, include); // eslint-disable-line @typescript-eslint/no-unnecessary-condition
             }
         }
         this.#stage++;
@@ -163,7 +163,7 @@ class Token extends element_1.AstElement {
             this.normalize();
             if (this.type === 'root') {
                 for (const token of this.#accum) {
-                    token.build();
+                    token?.build(); // eslint-disable-line @typescript-eslint/no-unnecessary-condition
                 }
             }
         }
@@ -172,7 +172,7 @@ class Token extends element_1.AstElement {
     afterBuild() {
         if (this.type === 'root') {
             for (const token of this.#accum) {
-                token.afterBuild();
+                token?.afterBuild(); // eslint-disable-line @typescript-eslint/no-unnecessary-condition
             }
         }
         this.#built = true;
@@ -275,10 +275,10 @@ class Token extends element_1.AstElement {
             return;
         }
         const { parseList } = require('../parser/list');
-        const lines = this.firstChild.toString().split('\n');
+        const lines = this.firstChild.toString().split('\n'), state = { lastPrefix: '' };
         let i = this.type === 'root' || this.type === 'ext-inner' && this.name === 'poem' ? 0 : 1;
         for (; i < lines.length; i++) {
-            lines[i] = parseList(lines[i], this.#config, this.#accum);
+            lines[i] = parseList(lines[i], state, this.#config, this.#accum);
         }
         this.setText(lines.join('\n'));
     }
@@ -401,14 +401,15 @@ class Token extends element_1.AstElement {
         return errors;
     }
     /** @private */
-    toString(separator) {
+    toString(skip, separator) {
         const { rev } = debug_1.Shadow, root = this.getRootNode();
-        if (root.type === 'root'
+        if (!skip
+            && root.type === 'root'
             && root.#built) {
-            this.#string ??= [rev, super.toString(separator)];
+            this.#string ??= [rev, super.toString(false, separator)];
             return this.#string[1];
         }
-        return super.toString(separator);
+        return super.toString(skip, separator);
     }
 }
 exports.Token = Token;

package/dist/src/link/base.js

@@ -2,11 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LinkBaseToken = void 0;
 const lint_1 = require("../../util/lint");
-const rect_1 = require("../../lib/rect");
 const constants_1 = require("../../util/constants");
+const rect_1 = require("../../lib/rect");
 const index_1 = require("../../index");
 const index_2 = require("../index");
 const atom_1 = require("../atom");
+/**
+ * 是否为普通内链
+ * @param type 节点类型
+ */
+const isLink = (type) => type === 'redirect-target' || type === 'link';
 /**
  * 内链
  * @classdesc `{childNodes: [AtomToken, ...Token]}`
@@ -53,8 +58,8 @@ class LinkBaseToken extends index_2.Token {
         }
     }
     /** @private */
-    toString() {
-        const str = super.toString(this.#delimiter);
+    toString(skip) {
+        const str = super.toString(skip, this.#delimiter);
         return this.#bracket ? `[[${str}]]` : str;
     }
     /** @private */
@@ -75,31 +80,28 @@ class LinkBaseToken extends index_2.Token {
     }
     /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
-        const errors = super.lint(start, re), { childNodes: [target, linkText], type: linkType } = this, { encoded, fragment } = this.#title, rect = new rect_1.BoundingRect(this, start);
-        if (target.childNodes.some(({ type }) => type === 'template')) {
+        const errors = super.lint(start, re), { childNodes: [target, linkText], type } = this, { encoded, fragment } = this.#title, rect = new rect_1.BoundingRect(this, start);
+        if (target.childNodes.some(({ type: t }) => t === 'template')) {
             errors.push((0, lint_1.generateForChild)(target, rect, 'unknown-page', 'template in an internal link target', 'warning'));
         }
         if (encoded) {
             errors.push((0, lint_1.generateForChild)(target, rect, 'url-encoding', 'unnecessary URL encoding in an internal link'));
         }
-        if (linkType === 'link' || linkType === 'category') {
+        if (type === 'link' || type === 'category') {
             const textNode = linkText?.childNodes.find((c) => c.type === 'text' && c.data.includes('|'));
             if (textNode) {
-                const e = (0, lint_1.generateForChild)(linkText, rect, 'pipe-like', 'additional "|" in the link text', 'warning');
+                const e = (0, lint_1.generateForChild)(linkText, rect, 'pipe-like', 'additional "|" in the link text', 'warning'), i = e.startIndex + textNode.getRelativeIndex();
                 e.suggestions = [
                     {
                         desc: 'escape',
-                        range: [
-                            e.startIndex + textNode.getRelativeIndex(),
-                            e.startIndex + textNode.getRelativeIndex() + textNode.data.length,
-                        ],
+                        range: [i, i + textNode.data.length],
                         text: textNode.data.replace(/\|/gu, '|'),
                     },
                 ];
                 errors.push(e);
             }
         }
-        if (linkType !== 'link' && linkType !== 'redirect-target' && fragment !== undefined) {
+        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('#'));
             if (textNode) {
                 e.fix = {
@@ -113,7 +115,7 @@ class LinkBaseToken extends index_2.Token {
     }
     /** @private */
     getTitle(halfParsed) {
-        return this.normalizeTitle(this.firstChild.text(), 0, halfParsed, true, true);
+        return this.normalizeTitle(this.firstChild.toString(true), 0, halfParsed, true, true);
     }
 }
 exports.LinkBaseToken = LinkBaseToken;

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

@@ -8,7 +8,6 @@ import type { Token, AtomToken } from '../../internal';
  * @classdesc `{childNodes: [AtomToken, ...ImageParameterToken]}`
  */
 export declare abstract class FileToken extends LinkBaseToken {
-    #private;
     readonly childNodes: readonly [AtomToken, ...ImageParameterToken[]];
     abstract get lastChild(): AtomToken | ImageParameterToken;
     get type(): 'file' | 'gallery-image' | 'imagemap-image';
@@ -27,12 +26,6 @@ export declare abstract class FileToken extends LinkBaseToken {
      * @param key 参数名
      */
     getArgs(key: string): ImageParameterToken[];
-    /** 获取图片框架属性参数节点 */
-    getFrameArgs(): ImageParameterToken[];
-    /** 获取图片水平对齐参数节点 */
-    getHorizAlignArgs(): ImageParameterToken[];
-    /** 获取图片垂直对齐参数节点 */
-    getVertAlignArgs(): ImageParameterToken[];
     /**
      * 获取生效的指定图片参数
      * @param key 参数名

package/dist/src/link/file.js

@@ -7,7 +7,12 @@ const rect_1 = require("../../lib/rect");
 const index_1 = 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']);
+const frame = new Map([
+    ['manualthumb', 'Thumb'],
+    ['frameless', 'Frameless'],
+    ['framed', 'Frame'],
+    ['thumbnail', 'Thumb'],
+]), horizAlign = new Set(['left', 'right', 'center', 'none']), vertAlign = new Set(['baseline', 'sub', 'super', 'top', 'text-top', 'middle', 'bottom', 'text-bottom']);
 /**
  * a more sophisticated string-explode function
  * @param start start syntax of a nested AST node
@@ -57,17 +62,24 @@ class FileToken extends base_1.LinkBaseToken {
         const { extension } = this.getTitle(true);
         this.append(...explode('-{', '}-', '|', text).map(
         // @ts-expect-error abstract class
-        part => new imageParameter_1.ImageParameterToken(part, extension, config, accum)));
+        (part) => new imageParameter_1.ImageParameterToken(part, extension, config, accum)));
     }
     /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
         const errors = super.lint(start, re), args = this.getAllArgs().filter(({ childNodes }) => {
             const visibleNodes = childNodes.filter(node => node.text().trim());
             return visibleNodes.length !== 1 || visibleNodes[0].type !== 'arg';
-        }), keys = [...new Set(args.map(({ name }) => name))].filter(key => key !== 'invalid'), frameKeys = keys.filter(key => frame.has(key)), horizAlignKeys = keys.filter(key => horizAlign.has(key)), vertAlignKeys = keys.filter(key => vertAlign.has(key)), rect = new rect_1.BoundingRect(this, start);
+        }), keys = [...new Set(args.map(({ name }) => name))], frameKeys = keys.filter(key => frame.has(key)), horizAlignKeys = keys.filter(key => horizAlign.has(key)), vertAlignKeys = keys.filter(key => vertAlign.has(key)), [fr] = frameKeys, unscaled = fr === 'framed' || fr === 'manualthumb', rect = new rect_1.BoundingRect(this, start);
         if (this.closest('ext-link-text') && this.getValue('link')?.trim() !== '') {
             errors.push((0, lint_1.generateForSelf)(this, rect, 'nested-link', 'internal link in an external link'));
         }
+        if (unscaled) {
+            for (const arg of args.filter(({ name }) => name === 'width')) {
+                const e = (0, lint_1.generateForChild)(arg, rect, 'invalid-gallery', 'invalid image parameter');
+                e.fix = { range: [e.startIndex - 1, e.endIndex], text: '' };
+                errors.push(e);
+            }
+        }
         if (args.length === keys.length
             && frameKeys.length < 2
             && horizAlignKeys.length < 2
@@ -81,6 +93,9 @@ class FileToken extends base_1.LinkBaseToken {
          */
         const generate = (msg, p1) => (arg) => (0, lint_1.generateForChild)(arg, rect, 'no-duplicate', index_1.default.msg(`${msg} image $1 parameter`, p1));
         for (const key of keys) {
+            if (key === 'invalid' || key === 'width' && unscaled) {
+                continue;
+            }
             let relevantArgs = args.filter(({ name }) => name === key);
             if (key === 'caption') {
                 relevantArgs = [...relevantArgs.slice(0, -1).filter(arg => arg.text()), ...relevantArgs.slice(-1)];
@@ -111,34 +126,13 @@ class FileToken extends base_1.LinkBaseToken {
     getArgs(key) {
         return this.getAllArgs().filter(({ name }) => key === name);
     }
-    /**
-     * 获取特定类型的图片属性参数节点
-     * @param keys 接受的参数名
-     * @param type 类型名
-     */
-    #getTypedArgs(keys, type) {
-        const args = this.getAllArgs().filter(({ name }) => keys.has(name));
-        return args;
-    }
-    /** 获取图片框架属性参数节点 */
-    getFrameArgs() {
-        return this.#getTypedArgs(frame, 'frame');
-    }
-    /** 获取图片水平对齐参数节点 */
-    getHorizAlignArgs() {
-        return this.#getTypedArgs(horizAlign, 'horizontal-align');
-    }
-    /** 获取图片垂直对齐参数节点 */
-    getVertAlignArgs() {
-        return this.#getTypedArgs(vertAlign, 'vertical-align');
-    }
     /**
      * 获取生效的指定图片参数
      * @param key 参数名
      */
     getArg(key) {
         const args = this.getArgs(key);
-        return args[args.length - 1];
+        return args[key === 'manualthumb' ? 0 : args.length - 1];
     }
     /**
      * 获取生效的指定图片参数值

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

@@ -6,7 +6,7 @@ import type { Title } from '../../lib/title';
 import type { Token, AtomToken } from '../../internal';
 /**
  * 重定向目标
- * @classdesc `{childNodes: [AtomToken, ?Token]}`
+ * @classdesc `{childNodes: [AtomToken, ?NoincludeToken]}`
  */
 export declare abstract class RedirectTargetToken extends LinkBaseToken {
     readonly childNodes: readonly [AtomToken] | readonly [AtomToken, NoincludeToken];

package/dist/src/link/redirectTarget.js

@@ -7,7 +7,7 @@ const base_1 = require("./base");
 const noinclude_1 = require("../nowiki/noinclude");
 /**
  * 重定向目标
- * @classdesc `{childNodes: [AtomToken, ?Token]}`
+ * @classdesc `{childNodes: [AtomToken, ?NoincludeToken]}`
  */
 class RedirectTargetToken extends base_1.LinkBaseToken {
     get type() {
@@ -30,20 +30,13 @@ class RedirectTargetToken extends base_1.LinkBaseToken {
         return this.normalizeTitle(this.firstChild.toString(), 0, true, true);
     }
     /** @private */
-    text() {
-        return `[[${this.firstChild.toString()}]]`;
-    }
-    /** @private */
     lint(start = this.getAbsoluteIndex()) {
-        const errors = super.lint(start, /\]\]/u);
+        const errors = super.lint(start, false);
         if (this.length === 2) {
             const e = (0, lint_1.generateForChild)(this.lastChild, { start }, 'no-ignored', 'useless link text');
             e.startIndex--;
             e.startCol--;
-            e.fix = {
-                range: [e.startIndex, e.endIndex],
-                text: '',
-            };
+            e.fix = { range: [e.startIndex, e.endIndex], text: '' };
             errors.push(e);
         }
         return errors;

package/dist/src/magicLink.d.ts

@@ -13,6 +13,8 @@ export declare abstract class MagicLinkToken extends Token {
     abstract get firstChild(): AstText | TranscludeToken;
     abstract get lastChild(): AstText | CommentToken | IncludeToken | NoincludeToken | TranscludeToken;
     get type(): ExtLinkTypes;
+    /** 链接显示文字 */
+    get innerText(): string;
     /** 和内链保持一致 */
     get link(): string;
     /**

package/dist/src/magicLink.js

@@ -16,21 +16,26 @@ class MagicLinkToken extends index_2.Token {
     get type() {
         return this.#type;
     }
-    /** 和内链保持一致 */
-    get link() {
-        const map = { '!': '|', '=': '=' };
+    /** 链接显示文字 */
+    get innerText() {
+        const map = new Map([['!', '|'], ['=', '=']]);
         let link = (0, string_1.text)(this.childNodes.map(child => {
-            const { type, name } = child;
-            return type === 'magic-word' && String(name) in map ? map[name] : child;
+            const { type } = child, name = String(child.name);
+            return type === 'magic-word' && map.has(name) ? map.get(name) : child;
         }));
         if (this.type === 'magic-link') {
             link = link.replace(spaceRegex, ' ');
-            if (link.startsWith('ISBN')) {
-                link = `ISBN ${link.slice(5).replace(/[- ]/gu, '').replace(/x$/u, 'X')}`;
-            }
         }
         return link;
     }
+    /** 和内链保持一致 */
+    get link() {
+        let { innerText } = this;
+        if (this.type === 'magic-link' && innerText.startsWith('ISBN')) {
+            innerText = `ISBN ${innerText.slice(5).replace(/[- ]/gu, '').replace(/x$/u, 'X')}`;
+        }
+        return innerText;
+    }
     /**
      * @param url 网址
      * @param type 类型
@@ -55,51 +60,30 @@ class MagicLinkToken extends index_2.Token {
             }
             return errors;
         }
-        const pipe = this.type === 'ext-link-url', source = pipe ? String.raw `\|+` : '[，；。：！？（）]+', regex = new RegExp(source, 'u'), regexGlobal = new RegExp(source, 'gu');
-        for (const child of this.childNodes) {
-            const { type, data } = child;
-            if (type !== 'text' || !regex.test(data)) {
-                continue;
-            }
-            const refError = (0, lint_1.generateForChild)(child, rect, 'unterminated-url', '', 'warning');
-            regexGlobal.lastIndex = 0;
-            for (let mt = regexGlobal.exec(data); mt; mt = regexGlobal.exec(data)) {
-                const { index, 0: s } = mt, lines = data.slice(0, index).split('\n'), top = lines.length, left = lines[top - 1].length, startIndex = refError.startIndex + index, startLine = refError.startLine + top - 1, startCol = top === 1 ? refError.startCol + left : left;
-                const e = {
-                    ...refError,
-                    message: index_1.default.msg('$1 in URL', pipe ? '"|"' : 'full-width punctuation'),
-                    startIndex,
-                    endIndex: startIndex + s.length,
-                    startLine,
-                    endLine: startLine,
-                    startCol,
-                    endCol: startCol + s.length,
-                };
-                if (!pipe) {
-                    e.suggestions = [
-                        {
-                            desc: 'whitespace',
-                            range: [startIndex, startIndex],
-                            text: ' ',
-                        },
-                        {
-                            desc: 'escape',
-                            range: [startIndex, e.endIndex],
-                            text: encodeURI(s),
-                        },
-                    ];
-                }
-                else if (s.length === 1) {
-                    e.suggestions = [
-                        {
-                            desc: 'whitespace',
-                            range: [startIndex, startIndex + 1],
-                            text: ' ',
-                        },
-                    ];
-                }
-                errors.push(e);
-            }
+        const pipe = this.type === 'ext-link-url', regex = pipe ? /\|/u : /[，；。：！？（）]+/u, child = this.childNodes.find((c) => c.type === 'text' && regex.test(c.data));
+        if (child) {
+            const { data } = child, e = (0, lint_1.generateForChild)(child, rect, 'unterminated-url', index_1.default.msg('$1 in URL', pipe ? '"|"' : 'full-width punctuation'), 'warning'), { index, 0: s } = regex.exec(data), i = e.startIndex + index;
+            e.suggestions = pipe
+                ? [
+                    {
+                        desc: 'whitespace',
+                        range: [i, i + 1],
+                        text: ' ',
+                    },
+                ]
+                : [
+                    {
+                        desc: 'whitespace',
+                        range: [i, i],
+                        text: ' ',
+                    },
+                    {
+                        desc: 'escape',
+                        range: [i, i + s.length],
+                        text: encodeURI(s),
+                    },
+                ];
+            errors.push(e);
         }
         return errors;
     }

package/dist/src/nested.js

@@ -61,7 +61,7 @@ class NestedToken extends index_2.Token {
                     },
                     {
                         desc: 'comment',
-                        range: [e.startIndex, e.startIndex],
+                        range: [e.startIndex, e.endIndex],
                         text: `<!--${child.toString()}-->`,
                     },
                 ];

package/dist/src/nowiki/comment.js

@@ -41,7 +41,7 @@ const index_1 = require("../../index");
 const base_1 = require("./base");
 /** HTML注释，不可见 */
 let CommentToken = (() => {
-    let _classDecorators = [(0, hidden_1.hiddenToken)()];
+    let _classDecorators = [(0, hidden_1.hiddenToken)(false)];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
@@ -74,15 +74,12 @@ let CommentToken = (() => {
                 return [];
             }
             const e = (0, lint_1.generateForSelf)(this, { start }, 'unclosed-comment', index_1.default.msg('unclosed $1', 'HTML comment'));
-            e.fix = {
-                range: [e.endIndex, e.endIndex],
-                text: '-->',
-            };
+            e.fix = { range: [e.endIndex, e.endIndex], text: '-->' };
             return [e];
         }
         /** @private */
-        toString() {
-            return `<!--${this.innerText}${this.closed ? '-->' : ''}`;
+        toString(skip) {
+            return skip ? '' : `<!--${this.innerText}${this.closed ? '-->' : ''}`;
         }
     };
     return CommentToken = _classThis;