wikiparser-node 1.13.9 → 1.14.1

package/dist/addon/transclude.js

@@ -94,7 +94,16 @@ transclude_1.TranscludeToken.prototype.fixDuplication =
             if (args.length <= 1) {
                 continue;
             }
-            const values = Map.groupBy(args, (arg) => arg.getValue().trim());
+            const values = new Map();
+            for (const arg of args) {
+                const val = arg.getValue().trim();
+                if (values.has(val)) {
+                    values.get(val).push(arg);
+                }
+                else {
+                    values.set(val, [arg]);
+                }
+            }
             let noMoreAnon = anonCount === 0 || !key.trim() || isNaN(key);
             const emptyArgs = values.get('') ?? [], duplicatedArgs = [...values].filter(([val, { length }]) => val && length > 1).flatMap(([, curArgs]) => {
                 const anonIndex = noMoreAnon ? -1 : curArgs.findIndex(({ anon }) => anon);

package/dist/base.d.ts

@@ -63,9 +63,7 @@ export interface LintError {
     endLine: number;
     endCol: number;
     fix?: LintError.Fix;
-    suggestions?: (LintError.Fix & {
-        desc: string;
-    })[];
+    suggestions?: LintError.Fix[];
 }
 export type AST = Record<string, string | number | boolean> & {
     range: [number, number];

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import type { Config, LintError, TokenTypes, Parser as ParserBase, Stage } from './base';
+import type { Config, LintError, TokenTypes, Parser as ParserBase, Stage, AST } from './base';
 import type { Title } from './lib/title';
 import type { Token } from './internal';
 declare interface Parser extends ParserBase {
@@ -28,6 +28,6 @@ declare const Parser: Parser;
 // @ts-expect-error mixed export styles
 export = Parser;
 export default Parser;
-export type { Config, LintError, TokenTypes };
+export type { Config, LintError, TokenTypes, AST, };
 export type * from './internal';
 declare global { type Acceptable = unknown; }

package/dist/index.js

@@ -222,8 +222,8 @@ const Parser = {
             catch { }
         }
         for (const [name, filePath] of entries) {
-            if (name in globalThis) {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+            if (name in globalThis) { // eslint-disable-line es-x/no-global-this
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, es-x/no-global-this
                 Object.assign(globalThis, { [name]: require(filePath)[name] });
             }
         }

package/dist/lib/element.js

@@ -260,7 +260,9 @@ class AstElement extends node_1.AstNode {
     print(opt = {}) {
         const cl = opt.class;
         return this.toString()
-            ? `${cl === '' ? '' : `<span class="wpb-${cl ?? this.type}">`}${(0, string_1.print)(this.childNodes, opt)}${cl === '' ? '' : '</span>'}`
+            ? (cl === '' ? '' : `<span class="wpb-${cl ?? this.type}">`)
+                + (0, string_1.print)(this.childNodes, opt)
+                + (cl === '' ? '' : '</span>')
             : '';
     }
     /**

package/dist/lib/text.js

@@ -9,11 +9,11 @@ const constants_1 = require("../util/constants");
 const debug_1 = require("../util/debug");
 const html_1 = require("../util/html");
 /* NOT FOR BROWSER END */
-/* eslint-disable @typescript-eslint/no-unused-expressions */
+/* eslint-disable @typescript-eslint/no-unused-expressions, es-x/no-regexp-unicode-property-escapes */
 /<\s*(?:\/\s*)?([a-z]\w*)|\{+|\}+|\[{2,}|\[(?![^[]*?\])|((?:^|\])[^[]*?)\]+|https?[:/]\/+/giu;
 /^https?:\/\/(?:\[[\da-f:.]+\]|[^[\]<>"\t\n\p{Zs}])[^[\]<>"\t\n\p{Zs}]*\.(?:gif|png|jpg|jpeg)$/iu;
-/* eslint-enable @typescript-eslint/no-unused-expressions */
-const sp = String.raw `[\p{Zs}\t]*`, source = String.raw `<\s*(?:/\s*)?([a-z]\w*)|\{+|\}+|\[{2,}|\[(?![^[]*?\])|((?:^|\])[^[]*?)\]+|(?:rfc|pmid)(?=[-:：]?${sp}\d)|isbn(?=[-:：]?${sp}(?:\d(?:${sp}|-)){6})`, errorSyntax = new RegExp(String.raw `${source}|https?[:/]/+`, 'giu'), errorSyntaxUrl = new RegExp(source, 'giu'), extImage = new RegExp(String.raw `^https?://${string_1.extUrlCharFirst}${string_1.extUrlChar}\.(?:gif|png|jpg|jpeg)$`, 'iu'), noLinkTypes = new Set(['attr-value', 'ext-link-text', 'link-text']), regexes = {
+/* eslint-enable @typescript-eslint/no-unused-expressions, es-x/no-regexp-unicode-property-escapes */
+const sp = String.raw `[${string_1.zs}\t]*`, source = String.raw `<\s*(?:/\s*)?([a-z]\w*)|\{+|\}+|\[{2,}|\[(?![^[]*?\])|((?:^|\])[^[]*?)\]+|(?:rfc|pmid)(?=[-:：]?${sp}\d)|isbn(?=[-:：]?${sp}(?:\d(?:${sp}|-)){6})`, errorSyntax = new RegExp(String.raw `${source}|https?[:/]/+`, 'giu'), errorSyntaxUrl = new RegExp(source, 'giu'), extImage = new RegExp(String.raw `^https?://${string_1.extUrlCharFirst}${string_1.extUrlChar}\.(?:gif|png|jpg|jpeg)$`, 'iu'), noLinkTypes = new Set(['attr-value', 'ext-link-text', 'link-text']), regexes = {
     '[': /[[\]]/u,
     '{': /[{}]/u,
     ']': /[[\]](?=[^[\]]*$)/u,
@@ -80,6 +80,14 @@ const sp = String.raw `[\p{Zs}\t]*`, source = String.raw `<\s*(?:/\s*)?([a-z]\w*
     'param',
     'xmp',
 ];
+let wordRegex;
+try {
+    // eslint-disable-next-line prefer-regex-literals, es-x/no-regexp-unicode-property-escapes
+    wordRegex = new RegExp(String.raw `[\p{L}\d_]`, 'u');
+}
+catch {
+    wordRegex = /\w/u;
+}
 /** 文本节点 */
 class AstText extends node_1.AstNode {
     data = '';
@@ -148,7 +156,16 @@ class AstText extends node_1.AstNode {
             return [];
         }
         errorRegex.lastIndex = 0;
-        const errors = [], nextType = nextSibling?.type, nextName = nextSibling?.name, previousType = previousSibling?.type, root = this.getRootNode(), { ext, html } = root.getAttribute('config'), { top, left } = root.posFromIndex(start), tags = new Set(['onlyinclude', 'noinclude', 'includeonly', ext, html, disallowedTags].flat(2));
+        const errors = [], nextType = nextSibling?.type, nextName = nextSibling?.name, previousType = previousSibling?.type, root = this.getRootNode(), rootStr = root.toString(), { ext, html } = root.getAttribute('config'), { top, left } = root.posFromIndex(start), tags = new Set([
+            'onlyinclude',
+            'noinclude',
+            'includeonly',
+            ...ext,
+            ...html[0],
+            ...html[1],
+            ...html[2],
+            ...disallowedTags,
+        ]);
         for (let mt = errorRegex.exec(data); mt; mt = errorRegex.exec(data)) {
             const [, tag, prefix] = mt;
             let { index } = mt, error = mt[0].toLowerCase();
@@ -168,7 +185,7 @@ class AstText extends node_1.AstNode {
             else if (char === ']' && (index || length > 1)) {
                 errorRegex.lastIndex--;
             }
-            const startIndex = start + index, endIndex = startIndex + length, rootStr = root.toString(), nextChar = rootStr[endIndex], previousChar = rootStr[startIndex - 1], severity = length > 1 && !(char === '<' && !/[\s/>]/u.test(nextChar ?? '')
+            const startIndex = start + index, endIndex = startIndex + length, nextChar = rootStr[endIndex], previousChar = rootStr[startIndex - 1], severity = length > 1 && !(char === '<' && !/[\s/>]/u.test(nextChar ?? '')
                 || isHtmlAttrVal && (char === '[' || char === ']')
                 || magicLink && type === 'parameter-value')
                 || char === '{' && (nextChar === char || previousChar === '-')
@@ -213,39 +230,31 @@ class AstText extends node_1.AstNode {
                 endCol: startCol + length,
             };
             if (char === '<') {
-                e.suggestions = [
-                    {
-                        desc: 'escape',
-                        range: [startIndex, startIndex + 1],
-                        text: '&lt;',
-                    },
-                ];
+                e.suggestions = [{ desc: 'escape', range: [startIndex, startIndex + 1], text: '&lt;' }];
             }
             else if (char === 'h'
                 && !(type === 'ext-link-text' || type === 'link-text')
-                && /[\p{L}\d_]/u.test(previousChar || '')) {
-                e.suggestions = [
-                    {
-                        desc: 'whitespace',
-                        range: [startIndex, startIndex],
-                        text: ' ',
-                    },
-                ];
+                && wordRegex.test(previousChar || '')) {
+                e.suggestions = [{ desc: 'whitespace', range: [startIndex, startIndex], text: ' ' }];
             }
             else if (char === '[' && type === 'ext-link-text') {
                 const i = parentNode.getAbsoluteIndex() + parentNode.toString().length;
-                e.suggestions = [
-                    {
-                        desc: 'escape',
-                        range: [i, i + 1],
-                        text: '&#93;',
-                    },
-                ];
+                e.suggestions = [{ desc: 'escape', range: [i, i + 1], text: '&#93;' }];
             }
             else if (char === ']' && previousType === 'free-ext-link' && severity === 'error') {
                 const i = start - previousSibling.toString().length;
                 e.fix = { range: [i, i], text: '[', desc: 'left bracket' };
             }
+            else if (magicLink) {
+                e.suggestions = [
+                    ...mt[0] === error
+                        ? []
+                        : [{ desc: 'uppercase', range: [startIndex, endIndex], text: error }],
+                    ...nextChar === ':' || nextChar === '：'
+                        ? [{ desc: 'whitespace', range: [endIndex, endIndex + 1], text: ' ' }]
+                        : [],
+                ];
+            }
             errors.push(e);
         }
         return errors;
@@ -378,6 +387,7 @@ class AstText extends node_1.AstNode {
                     }
                 }
                 else if (mt && nextSibling.type === 'category') {
+                    // eslint-disable-next-line es-x/no-string-prototype-trimstart-trimend
                     const trimmed = this.data.trimEnd();
                     if (this.data !== trimmed) {
                         const { length } = trimmed;
@@ -398,6 +408,7 @@ class AstText extends node_1.AstNode {
                     }
                 }
                 else {
+                    // eslint-disable-next-line es-x/no-string-prototype-trimstart-trimend
                     this.#setData(this.data.trimEnd());
                 }
                 for (const space of spaces) {

package/dist/lib/title.js

@@ -78,6 +78,7 @@ class Title {
                 }
                 catch { }
             }
+            // eslint-disable-next-line es-x/no-string-prototype-trimstart-trimend
             this.#fragment = (0, string_1.decodeHtml)(fragment).replace(/[_ ]+/gu, ' ').trimEnd().replaceAll(' ', '_');
         }
     }
@@ -129,7 +130,7 @@ class Title {
         }
         const i = title.indexOf('#');
         if (i !== -1) {
-            let fragment = title.slice(i + 1).trimEnd();
+            let fragment = title.slice(i).trim().slice(1);
             if (fragment.includes('%')) {
                 try {
                     fragment = (0, string_1.rawurldecode)(fragment);
@@ -155,11 +156,12 @@ class Title {
     }
     /** @private */
     toString(display) {
-        return `${display ? this.title.replace(/_/gu, ' ') : this.title}${this.#fragment === undefined
-            && this.#redirectFragment === undefined
-            ? ''
-            : `#${this.#fragment
-                ?? this.#redirectFragment}`}`;
+        return (display ? this.title.replace(/_/gu, ' ') : this.title)
+            + (this.#fragment === undefined
+                && this.#redirectFragment === undefined
+                ? ''
+                : `#${this.#fragment
+                    ?? this.#redirectFragment}`);
     }
     /** 检测是否是重定向 */
     getRedirection() {
@@ -236,9 +238,10 @@ class Title {
     getUrl() {
         const { title, fragment } = this;
         if (title) {
-            return this.#path.replace('$1', `${encodeURIComponent(title)}${fragment === undefined && this.#redirectFragment === undefined
-                ? ''
-                : `#${encodeURIComponent(fragment ?? this.#redirectFragment)}`}`);
+            return this.#path.replace('$1', encodeURIComponent(title)
+                + (fragment === undefined && this.#redirectFragment === undefined
+                    ? ''
+                    : `#${encodeURIComponent(fragment ?? this.#redirectFragment)}`));
         }
         return fragment === undefined ? '' : `#${encodeURIComponent(fragment)}`;
     }

package/dist/parser/commentAndExt.js

@@ -56,10 +56,10 @@ const parseCommentAndExt = (wikitext, config, accum, includeOnly) => {
         }
     }
     // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-    /<!--.*?(?:-->|$)|<foo(?:\s[^>]*)?\/?>|<\/foo\s*>|<(bar)(\s[^>]*?)?(?:\/>|>(.*?)<\/(\1\s*)>)|<(baz)(\s[^>]*?)?(?:\/>|>(.*?)(?:<\/(baz\s*)>|$))/gisu;
+    /<!--[\s\S]*?(?:-->|$)|<foo(?:\s[^>]*)?\/?>|<\/foo\s*>|<(bar)(\s[^>]*?)?(?:\/>|>([\s\S]*?)<\/(\1\s*)>)|<(baz)(\s[^>]*?)?(?:\/>|>([\s\S]*?)(?:<\/(baz\s*)>|$))/giu;
     const ext = config.ext.join('|'), noincludeRegex = includeOnly ? 'includeonly' : '(?:no|only)include', includeRegex = includeOnly ? 'noinclude' : 'includeonly', 
     /** Never cached due to the possibility of nested extension tags */
-    regex = new RegExp(String.raw `<!--.*?(?:-->|$)|<${noincludeRegex}(?:\s[^>]*)?/?>|</${noincludeRegex}\s*>|<(${ext})(\s[^>]*?)?(?:/>|>(.*?)</(\1\s*)>)|<(${includeRegex})(\s[^>]*?)?(?:/>|>(.*?)(?:</(${includeRegex}\s*)>|$))`, 'gisu');
+    regex = new RegExp(String.raw `<!--[\s\S]*?(?:-->|$)|<${noincludeRegex}(?:\s[^>]*)?/?>|</${noincludeRegex}\s*>|<(${ext})(\s[^>]*?)?(?:/>|>([\s\S]*?)</(\1\s*)>)|<(${includeRegex})(\s[^>]*?)?(?:/>|>([\s\S]*?)(?:</(${includeRegex}\s*)>|$))`, 'giu');
     return wikitext.replace(regex, (substr, name, attr, inner, closing, include, includeAttr, includeInner, includeClosing) => {
         const l = accum.length;
         let ch = 'n';

package/dist/parser/externalLinks.js

@@ -15,9 +15,9 @@ const constants_1 = require("../util/constants");
  * @param inFile 是否在图链中
  */
 const parseExternalLinks = (wikitext, config, accum, inFile) => {
-    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+    // eslint-disable-next-line @typescript-eslint/no-unused-expressions, es-x/no-regexp-unicode-property-escapes
     /\[((?:ftp:\/\/|\/\/)(?:\[[\da-f:.]+\]|[^[\]<>"\t\n\p{Zs}])[^[\]<>"\t\n\p{Zs}]*(?=[[\]<>"\t\p{Zs}]|\0\d))(\p{Zs}*(?!\p{Zs}))([^\]\n]*)\]/giu;
-    config.regexExternalLinks ??= new RegExp(String.raw `\[(\0\d+f\x7F|(?:(?:${config.protocol}|//)${string_1.extUrlCharFirst}|\0\d+m\x7F)${string_1.extUrlChar}(?=[[\]<>"\t\p{Zs}]|\0\d))(\p{Zs}*(?!\p{Zs}))([^\]\x01-\x08\x0A-\x1F\uFFFD]*)\]`, 'giu');
+    config.regexExternalLinks ??= new RegExp(String.raw `\[(\0\d+f\x7F|(?:(?:${config.protocol}|//)${string_1.extUrlCharFirst}|\0\d+m\x7F)${string_1.extUrlChar}(?=[[\]<>"\t${string_1.zs}]|\0\d))([${string_1.zs}]*(?![${string_1.zs}]))([^\]\x01-\x08\x0A-\x1F\uFFFD]*)\]`, 'giu');
     return wikitext.replace(config.regexExternalLinks, (_, url, space, text) => {
         const { length } = accum, mt = /&[lg]t;/u.exec(url);
         if (mt) {

package/dist/parser/html.js

@@ -14,7 +14,8 @@ const regex = /^(\/?)([a-z][^\s/>]*)((?:\s|\/(?!>))[^>]*?)?(\/?>)([^<]*)$/iu;
  * @param accum
  */
 const parseHtml = (wikitext, config, accum) => {
-    config.htmlElements ??= new Set(config.html.flat());
+    const { html } = config;
+    config.htmlElements ??= new Set([...html[0], ...html[1], ...html[2]]);
     const bits = wikitext.split('<');
     let text = bits.shift();
     for (const x of bits) {

package/dist/parser/links.js

@@ -10,7 +10,7 @@ const category_1 = require("../src/link/category");
 /* NOT FOR BROWSER */
 const constants_1 = require("../util/constants");
 /* NOT FOR BROWSER END */
-const regexImg = /^((?:(?!\0\d+!\x7F)[^\n[\]{}|])+)(\||\0\d+!\x7F)(.*)$/su;
+const regexImg = /^((?:(?!\0\d+!\x7F)[^\n[\]{}|])+)(\||\0\d+!\x7F)([\s\S]*)$/u;
 /**
  * 解析内部链接
  * @param wikitext
@@ -22,8 +22,8 @@ const parseLinks = (wikitext, config, accum) => {
     /^\s*(?:ftp:\/\/|\/\/)/iu;
     config.regexLinks ??= new RegExp(String.raw `^\s*(?:${config.protocol}|//)`, 'iu');
     const regex = true // eslint-disable-line no-constant-condition, @typescript-eslint/no-unnecessary-condition
-        ? /^((?:(?!\0\d+!\x7F)[^\n[\]{}|])+)(?:(\||\0\d+!\x7F)(.*?[^\]]))?\]\](.*)$/su
-        : /^((?:(?!\0\d+!\x7F)[^\n[\]{}|])+)(?:(\||\0\d+!\x7F)(.*?[^\]])?)?\]\](.*)$/su, bits = wikitext.split('[[');
+        ? /^((?:(?!\0\d+!\x7F)[^\n[\]{}|])+)(?:(\||\0\d+!\x7F)([\s\S]*?[^\]]))?\]\]([\s\S]*)$/u
+        : /^((?:(?!\0\d+!\x7F)[^\n[\]{}|])+)(?:(\||\0\d+!\x7F)([\s\S]*?[^\]])?)?\]\]([\s\S]*)$/u, bits = wikitext.split('[[');
     let s = bits.shift();
     for (let i = 0; i < bits.length; i++) {
         let mightBeImg = false, link, delimiter, text, after;

package/dist/parser/magicLinks.js

@@ -6,7 +6,7 @@ const magicLink_1 = require("../src/magicLink");
 /* NOT FOR BROWSER */
 const constants_1 = require("../util/constants");
 /* NOT FOR BROWSER END */
-const space = String.raw `[\p{Zs}\t]| |&#0*160;|&#x0*a0;`, sp = `(?:${space})+`, spdash = `(?:${space}|-)`, magicLinkPattern = String.raw `(?:RFC|PMID)${sp}\d+\b|ISBN${sp}(?:97[89]${spdash}?)?(?:\d${spdash}?){9}[\dx]\b`;
+const space = String.raw `[${string_1.zs}\t]| |&#0*160;|&#x0*a0;`, sp = `(?:${space})+`, spdash = `(?:${space}|-)`, magicLinkPattern = String.raw `(?:RFC|PMID)${sp}\d+\b|ISBN${sp}(?:97[89]${spdash}?)?(?:\d${spdash}?){9}[\dx]\b`;
 /**
  * 解析自由外链
  * @param wikitext
@@ -14,9 +14,16 @@ const space = String.raw `[\p{Zs}\t]| |&#0*160;|&#x0*a0;`, sp = `(?:${space
  * @param accum
  */
 const parseMagicLinks = (wikitext, config, accum) => {
-    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+    // eslint-disable-next-line @typescript-eslint/no-unused-expressions, es-x/no-regexp-unicode-property-escapes
     /(^|[^\p{L}\d_])(?:(?:ftp:\/\/|http:\/\/)((?:\[[\da-f:.]+\]|[^[\]<>"\t\n\p{Zs}])[^[\]<>"\0\t\n\p{Zs}]*)|(?:rfc|pmid)[\p{Zs}\t]+\d+\b|isbn[\p{Zs}\t]+(?:97[89][\p{Zs}\t-]?)?(?:\d[\p{Zs}\t-]?){9}[\dx]\b)/giu;
-    config.regexMagicLinks ??= new RegExp(String.raw `(^|[^\p{L}\d_])(?:(?:${config.protocol})(${string_1.extUrlCharFirst}${string_1.extUrlChar})|${magicLinkPattern})`, 'giu');
+    if (!config.regexMagicLinks) {
+        try {
+            config.regexMagicLinks = new RegExp(String.raw `(^|[^\p{L}\d_])(?:(?:${config.protocol})(${string_1.extUrlCharFirst}${string_1.extUrlChar})|${magicLinkPattern})`, 'giu');
+        }
+        catch {
+            config.regexMagicLinks = new RegExp(String.raw `(^|\W)(?:(?:${config.protocol})(${string_1.extUrlCharFirst}${string_1.extUrlChar})|${magicLinkPattern})`, 'giu');
+        }
+    }
     return wikitext.replace(config.regexMagicLinks, (m, lead, p1) => {
         let url = lead ? m.slice(lead.length) : m;
         if (p1) {

package/dist/parser/selector.js

@@ -161,7 +161,7 @@ const matches = (token, step, scope, has) => {
         }
         else if (selector.length === 4) { // 情形2：属性选择器
             const [key, equal, val = '', i] = selector, isAttr = typeof token.hasAttr === 'function' && typeof token.getAttr === 'function';
-            if (!(key in token) && (!isAttr || !token.hasAttr(key))) {
+            if (!(key in token || isAttr && token.hasAttr(key))) {
                 return equal === '!=';
             }
             const v = toCase(val, i), thisVal = getAttr(token, key);
@@ -173,7 +173,7 @@ const matches = (token, step, scope, has) => {
                 return Boolean(thisVals?.[Symbol.iterator])
                     && [...thisVals].some(w => typeof w === 'string' && toCase(w, i) === v);
             }
-            else if (!primitives.has(typeof thisVal) && !(thisVal instanceof title_1.Title)) {
+            else if (!(primitives.has(typeof thisVal) || thisVal instanceof title_1.Title)) {
                 throw new RangeError(`The complex attribute ${key} cannot be used in a selector!`);
             }
             const stringVal = toCase(String(thisVal), i);

package/dist/src/arg.js

@@ -95,7 +95,7 @@ class ArgToken extends index_2.Token {
         if (!this.getAttribute('include')) {
             const e = (0, lint_1.generateForSelf)(this, { start }, 'no-arg', 'unexpected template argument');
             if (argDefault) {
-                e.fix = { range: [start, e.endIndex], text: argDefault.text(), desc: 'expand' };
+                e.suggestions = [{ range: [start, e.endIndex], text: argDefault.text(), desc: 'expand' }];
             }
             return [e];
         }
@@ -110,16 +110,8 @@ class ArgToken extends index_2.Token {
                 e.startIndex--;
                 e.startCol--;
                 e.suggestions = [
-                    {
-                        desc: 'remove',
-                        range: [e.startIndex, e.endIndex],
-                        text: '',
-                    },
-                    {
-                        desc: 'escape',
-                        range: [e.startIndex, e.startIndex + 1],
-                        text: '{{!}}',
-                    },
+                    { desc: 'remove', range: [e.startIndex, e.endIndex], text: '' },
+                    { desc: 'escape', range: [e.startIndex, e.startIndex + 1], text: '{{!}}' },
                 ];
                 return e;
             }));

package/dist/src/attribute.js

@@ -180,16 +180,10 @@ let AttributeToken = (() => {
                 const e = (0, lint_1.generateForChild)(lastChild, rect, 'unclosed-quote', index_1.default.msg('unclosed $1', 'quotes'), 'warning');
                 e.startIndex--;
                 e.startCol--;
-                const fix = { range: [e.endIndex, e.endIndex], text: this.#quotes[0], desc: 'close' };
-                if (lastChild.childNodes.some(({ type: t, data }) => t === 'text' && /\s/u.test(data))) {
-                    e.suggestions = [fix];
-                }
-                else {
-                    e.fix = fix;
-                }
+                e.suggestions = [{ range: [e.endIndex, e.endIndex], text: this.#quotes[0], desc: 'close' }];
                 errors.push(e);
             }
-            const attrs = sharable_1.extAttrs[tag], attrs2 = sharable_1.htmlAttrs[tag];
+            const attrs = sharable_1.extAttrs[tag], attrs2 = sharable_1.htmlAttrs[tag], { length } = this.toString();
             if (!attrs?.has(name)
                 && !attrs2?.has(name)
                 // 不是未定义的扩展标签或包含嵌入的HTML标签
@@ -197,7 +191,10 @@ let AttributeToken = (() => {
                 && (type === 'ext-attr' && !attrs2
                     || !/^(?:xmlns:[\w:.-]+|data-(?!ooui|mw|parsoid)[^:]*)$/u.test(name)
                         && (tag === 'meta' || tag === 'link' || !sharable_1.commonHtmlAttrs.has(name)))) {
-                errors.push((0, lint_1.generateForChild)(firstChild, rect, 'illegal-attr', 'illegal attribute name'));
+                errors.push({
+                    ...(0, lint_1.generateForChild)(firstChild, rect, 'illegal-attr', 'illegal attribute name'),
+                    suggestions: [{ desc: 'remove', range: [start, start + length], text: '' }],
+                });
             }
             else if (sharable_1.obsoleteAttrs[tag]?.has(name)) {
                 errors.push((0, lint_1.generateForChild)(firstChild, rect, 'obsolete-attr', 'obsolete attribute', 'warning'));
@@ -208,16 +205,8 @@ let AttributeToken = (() => {
             else if (name === 'tabindex' && typeof value === 'string' && value !== '0') {
                 const e = (0, lint_1.generateForChild)(lastChild, rect, 'illegal-attr', 'nonzero tabindex');
                 e.suggestions = [
-                    {
-                        desc: 'remove',
-                        range: [start, e.endIndex],
-                        text: '',
-                    },
-                    {
-                        desc: '0 tabindex',
-                        range: [e.startIndex, e.endIndex],
-                        text: '0',
-                    },
+                    { desc: 'remove', range: [start, start + length], text: '' },
+                    { desc: '0 tabindex', range: [e.startIndex, e.endIndex], text: '0' },
                 ];
                 errors.push(e);
             }

package/dist/src/attributes.js

@@ -23,6 +23,14 @@ const toAttributeType = (type) => type.slice(0, -1);
  * @param type 属性类型
  */
 const toDirty = (type) => `${toAttributeType(type)}-dirty`;
+let wordRegex;
+try {
+    // eslint-disable-next-line prefer-regex-literals, es-x/no-regexp-unicode-property-escapes
+    wordRegex = new RegExp(String.raw `[\p{L}\d]`, 'u');
+}
+catch {
+    wordRegex = /[^\W_]/u;
+}
 /**
  * 扩展和HTML标签属性
  * @classdesc `{childNodes: ...AtomToken|AttributeToken}`
@@ -104,7 +112,7 @@ class AttributesToken extends index_2.Token {
         this.#type = type;
         this.setAttribute('name', name);
         if (attr) {
-            const regex = /([^\s/](?:(?!\0\d+~\x7F)[^\s/=])*)(?:((?:\s(?:\s|\0\d+[cn]\x7F)*)?(?:=|\0\d+~\x7F)(?:\s|\0\d+[cn]\x7F)*)(?:(["'])(.*?)(\3|$)|(\S*)))?/gsu;
+            const regex = /([^\s/](?:(?!\0\d+~\x7F)[^\s/=])*)(?:((?:\s(?:\s|\0\d+[cn]\x7F)*)?(?:=|\0\d+~\x7F)(?:\s|\0\d+[cn]\x7F)*)(?:(["'])([\s\S]*?)(\3|$)|(\S*)))?/gu;
             let out = '', mt = regex.exec(attr), lastIndex = 0;
             const insertDirty = /** 插入无效属性 */ () => {
                 if (out) {
@@ -168,8 +176,11 @@ class AttributesToken extends index_2.Token {
     lint(start = this.getAbsoluteIndex(), re) {
         const errors = super.lint(start, re), { parentNode, childNodes } = this, attrs = new Map(), duplicated = new Set(), rect = new rect_1.BoundingRect(this, start);
         if (parentNode?.type === 'html' && parentNode.closing && this.text().trim()) {
-            const e = (0, lint_1.generateForSelf)(this, rect, 'no-ignored', 'attributes of a closing tag');
-            e.fix = { range: [start, e.endIndex], text: '', desc: 'remove' };
+            const e = (0, lint_1.generateForSelf)(this, rect, 'no-ignored', 'attributes of a closing tag'), index = parentNode.getAbsoluteIndex();
+            e.suggestions = [
+                { desc: 'remove', range: [start, e.endIndex], text: '' },
+                { desc: 'open', range: [index + 1, index + 2], text: '' },
+            ];
             errors.push(e);
         }
         for (const attr of childNodes) {
@@ -186,21 +197,28 @@ class AttributesToken extends index_2.Token {
             else {
                 const str = attr.text().trim();
                 if (str) {
-                    const e = (0, lint_1.generateForChild)(attr, rect, 'no-ignored', 'containing invalid attribute', /[\p{L}\d]/u.test(str) ? 'error' : 'warning');
-                    e.suggestions = [
-                        {
-                            desc: 'remove',
-                            range: [e.startIndex, e.endIndex],
-                            text: ' ',
-                        },
-                    ];
+                    const e = (0, lint_1.generateForChild)(attr, rect, 'no-ignored', 'containing invalid attribute', wordRegex.test(str) ? 'error' : 'warning');
+                    e.suggestions = [{ desc: 'remove', range: [e.startIndex, e.endIndex], text: ' ' }];
                     errors.push(e);
                 }
             }
         }
         if (duplicated.size > 0) {
             for (const key of duplicated) {
-                errors.push(...attrs.get(key).map(attr => (0, lint_1.generateForChild)(attr, rect, 'no-duplicate', index_1.default.msg('duplicated $1 attribute', key))));
+                const pairs = attrs.get(key).map(attr => {
+                    const value = attr.getValue();
+                    return [attr, value === true ? '' : value];
+                });
+                errors.push(...pairs.map(([attr, value], i) => {
+                    const e = (0, lint_1.generateForChild)(attr, rect, 'no-duplicate', index_1.default.msg('duplicated $1 attribute', key)), remove = { desc: 'remove', range: [e.startIndex, e.endIndex], text: '' };
+                    if (!value || pairs.slice(0, i).some(([, v]) => v === value)) {
+                        e.fix = remove;
+                    }
+                    else {
+                        e.suggestions = [remove];
+                    }
+                    return e;
+                }));
             }
         }
         return errors;

package/dist/src/converterFlags.js

@@ -91,13 +91,7 @@ class ConverterFlagsToken extends index_2.Token {
                     e.fix = { range: [e.startIndex, e.endIndex], text: flag.toUpperCase(), desc: 'uppercase' };
                 }
                 else {
-                    e.suggestions = [
-                        {
-                            desc: 'remove',
-                            range: [e.startIndex - (i && 1), e.endIndex],
-                            text: '',
-                        },
-                    ];
+                    e.suggestions = [{ desc: 'remove', range: [e.startIndex - (i && 1), e.endIndex], text: '' }];
                 }
                 errors.push(e);
             }

package/dist/src/extLink.js

@@ -168,6 +168,7 @@ let ExtLinkToken = (() => {
                 && length > 1
                 && (firstChild?.type === 'text' || firstChild?.type === 'converter')
                 // 都替换成`<`肯定不对，但无妨
+                // eslint-disable-next-line es-x/no-regexp-unicode-property-escapes
                 && /^[^[\]<>"\0-\x1F\x7F\p{Zs}\uFFFD]/u.test(lastChild.text().replace(/&[lg]t;/u, '<'))) {
                 this.#space = ' ';
             }

package/dist/src/gallery.js

@@ -92,16 +92,8 @@ class GalleryToken extends index_2.Token {
                     startCol,
                     endCol: startCol + length,
                     suggestions: [
-                        {
-                            desc: 'remove',
-                            range: [start, endIndex],
-                            text: '',
-                        },
-                        {
-                            desc: 'comment',
-                            range: [start, endIndex],
-                            text: `<!--${str}-->`,
-                        },
+                        { desc: 'remove', range: [start, endIndex], text: '' },
+                        { desc: 'comment', range: [start, endIndex], text: `<!--${str}-->` },
                     ],
                 });
             }

package/dist/src/heading.js

@@ -135,21 +135,55 @@ let HeadingToken = (() => {
         }
         /** @private */
         lint(start = this.getAbsoluteIndex(), re) {
-            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);
+            const errors = super.lint(start, re), { firstChild, level } = this, innerStr = firstChild.toString(), unbalancedStart = innerStr.startsWith('='), unbalanced = unbalancedStart || innerStr.endsWith('='), 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>'));
+                const e = (0, lint_1.generateForChild)(firstChild, rect, 'h1', '<h1>');
+                if (!unbalanced) {
+                    e.suggestions = [{ desc: 'h2', range: [e.startIndex, e.endIndex], text: `=${innerStr}=` }];
+                }
+                errors.push(e);
             }
-            if (innerStr.startsWith('=') || innerStr.endsWith('=')) {
-                errors.push((0, lint_1.generateForChild)(firstChild, rect, 'unbalanced-header', index_1.default.msg('unbalanced $1 in a section header', '"="')));
+            if (unbalanced) {
+                const e = (0, lint_1.generateForChild)(firstChild, rect, 'unbalanced-header', index_1.default.msg('unbalanced $1 in a section header', '"="'));
+                if (innerStr === '=') {
+                    //
+                }
+                else if (unbalancedStart) {
+                    const [extra] = /^=+/u.exec(innerStr);
+                    e.suggestions = [
+                        { desc: `h${level}`, range: [e.startIndex, e.startIndex + extra.length], text: '' },
+                        { desc: `h${level + extra.length}`, range: [e.endIndex, e.endIndex], text: extra },
+                    ];
+                }
+                else {
+                    const extra = /[^=](=+)$/u.exec(innerStr)[1];
+                    e.suggestions = [
+                        { desc: `h${level}`, range: [e.endIndex - extra.length, e.endIndex], text: '' },
+                        { desc: `h${level + extra.length}`, range: [e.startIndex, e.startIndex], text: extra },
+                    ];
+                }
+                errors.push(e);
             }
             if (this.closest('html-attrs,table-attrs')) {
                 errors.push((0, lint_1.generateForSelf)(this, rect, 'parsing-order', 'section header in a HTML tag'));
             }
+            const rootStr = this.getRootNode().toString();
             if (boldQuotes.length % 2) {
-                errors.push((0, lint_1.generateForChild)(boldQuotes[boldQuotes.length - 1], { ...rect, start: start + level, left: rect.left + level }, 'format-leakage', index_1.default.msg('unbalanced $1 in a section header', 'bold apostrophes')));
+                const e = (0, lint_1.generateForChild)(boldQuotes[boldQuotes.length - 1], { ...rect, start: start + level, left: rect.left + level }, 'format-leakage', index_1.default.msg('unbalanced $1 in a section header', 'bold apostrophes')), end = start + level + innerStr.length;
+                if (rootStr.slice(e.endIndex, end).trim()) {
+                    e.suggestions = [{ desc: 'close', range: [end, end], text: "'''" }];
+                }
+                else {
+                    e.fix = { desc: 'remove', range: [e.startIndex, e.endIndex], text: '' };
+                }
+                errors.push(e);
             }
             if (italicQuotes.length % 2) {
-                errors.push((0, lint_1.generateForChild)(italicQuotes[italicQuotes.length - 1], { start: start + level }, 'format-leakage', index_1.default.msg('unbalanced $1 in a section header', 'italic apostrophes')));
+                const e = (0, lint_1.generateForChild)(italicQuotes[italicQuotes.length - 1], { start: start + level }, 'format-leakage', index_1.default.msg('unbalanced $1 in a section header', 'italic apostrophes')), end = start + level + innerStr.length;
+                e.fix = rootStr.slice(e.endIndex, end).trim()
+                    ? { desc: 'close', range: [end, end], text: "''" }
+                    : { desc: 'remove', range: [e.startIndex, e.endIndex], text: '' };
+                errors.push(e);
             }
             return errors;
         }
@@ -205,7 +239,7 @@ let HeadingToken = (() => {
             if (headings?.has(lcId)) {
                 let i = 2;
                 for (; headings.has(`${lcId}_${i}`); i++) {
-                    // pass
+                    //
                 }
                 id = `${id}_${i}`;
                 headings.add(`${lcId}_${i}`);