wikiparser-node 1.4.5 → 1.5.0

package/dist/base.d.ts

@@ -13,18 +13,28 @@ export interface Config {
     readonly conversionTable?: [string, string][];
     readonly redirects?: [string, string][];
 }
-export type Severity = 'error' | 'warning';
-export type Rule = 'bold-header' | 'format-leakage' | 'fostered-content' | 'h1' | 'illegal-attr' | 'insecure-style' | 'invalid-gallery' | 'invalid-imagemap' | 'invalid-invoke' | 'lonely-apos' | 'lonely-bracket' | 'lonely-http' | 'nested-link' | 'no-arg' | 'no-duplicate' | 'no-ignored' | 'obsolete-attr' | 'obsolete-tag' | 'parsing-order' | 'pipe-like' | 'table-layout' | 'tag-like' | 'unbalanced-header' | 'unclosed-comment' | 'unclosed-quote' | 'unclosed-table' | 'unescaped' | 'unknown-page' | 'unmatched-tag' | 'unterminated-url' | 'url-encoding' | 'var-anchor' | 'void-ext';
+export declare namespace LintError {
+    type Severity = 'error' | 'warning';
+    type Rule = 'bold-header' | 'format-leakage' | 'fostered-content' | 'h1' | 'illegal-attr' | 'insecure-style' | 'invalid-gallery' | 'invalid-imagemap' | 'invalid-invoke' | 'lonely-apos' | 'lonely-bracket' | 'lonely-http' | 'nested-link' | 'no-arg' | 'no-duplicate' | 'no-ignored' | 'obsolete-attr' | 'obsolete-tag' | 'parsing-order' | 'pipe-like' | 'table-layout' | 'tag-like' | 'unbalanced-header' | 'unclosed-comment' | 'unclosed-quote' | 'unclosed-table' | 'unescaped' | 'unknown-page' | 'unmatched-tag' | 'unterminated-url' | 'url-encoding' | 'var-anchor' | 'void-ext';
+    interface Fix {
+        readonly range: [number, number];
+        text: string;
+    }
+}
 export interface LintError {
-    readonly rule: Rule;
-    readonly message: string;
-    readonly severity: Severity;
-    readonly startIndex: number;
-    readonly endIndex: number;
-    readonly startLine: number;
-    readonly startCol: number;
-    readonly endLine: number;
-    readonly endCol: number;
+    rule: LintError.Rule;
+    message: string;
+    severity: LintError.Severity;
+    startIndex: number;
+    endIndex: number;
+    startLine: number;
+    startCol: number;
+    endLine: number;
+    endCol: number;
+    fix?: LintError.Fix;
+    suggestions?: (LintError.Fix & {
+        desc: string;
+    })[];
 }
 export type AST = Record<string, string | number | boolean> & {
     range: [number, number];

package/dist/index.js

@@ -2,6 +2,7 @@
 /* eslint n/exports-style: 0 */
 const fs = require("fs");
 const path = require("path");
+const chalk = require("chalk");
 const debug_1 = require("./util/debug");
 const constants_1 = require("./util/constants");
 const string_1 = require("./util/string");
@@ -118,13 +119,13 @@ const Parser = {
     /** @implements */
     warn(msg, ...args) {
         if (this.warning) {
-            console.warn('\x1B[33m%s\x1B[0m', msg, ...args);
+            console.warn(chalk.yellow(msg), ...args);
         }
     },
     /** @implements */
     debug(msg, ...args) {
         if (this.debugging) {
-            console.debug('\x1B[34m%s\x1B[0m', msg, ...args);
+            console.debug(chalk.blue(msg), ...args);
         }
     },
     error: diff_1.error,

package/dist/lib/element.d.ts

@@ -147,9 +147,4 @@ export declare abstract class AstElement extends AstNode {
      */
     insertBefore(child: string, reference?: AstNodes): AstText;
     insertBefore<T extends AstNodes>(child: T, reference?: AstNodes): T;
-    /**
-     * 输出AST
-     * @param depth 当前深度
-     */
-    echo(depth?: number): void;
 }

package/dist/lib/element.js

@@ -9,7 +9,6 @@ const constants_1 = require("../util/constants");
 const selector_1 = require("../parser/selector");
 const ranges_1 = require("./ranges");
 const title_1 = require("./title");
-const index_1 = require("../index");
 const node_1 = require("./node");
 /* NOT FOR BROWSER */
 /**
@@ -613,43 +612,6 @@ class AstElement extends node_1.AstNode {
             ? this.insertAt(child)
             : this.insertAt(child, this.#getChildIndex(reference));
     }
-    /**
-     * 输出AST
-     * @param depth 当前深度
-     */
-    echo(depth = 0) {
-        const indent = '  '.repeat(depth), str = String(this), { childNodes, type, length } = this;
-        if (childNodes.every(child => child.type === 'text' || !String(child))) {
-            console.log(`${indent}\x1B[32m<%s>\x1B[0m${(0, string_1.noWrap)(str)}\x1B[32m</%s>\x1B[0m`, type, type);
-            return;
-        }
-        index_1.default.info(`${indent}<${type}>`);
-        let i = this.getAttribute('padding');
-        if (i) {
-            console.log(`${indent}  ${(0, string_1.noWrap)(str.slice(0, i))}`);
-        }
-        for (let j = 0; j < length; j++) {
-            const child = childNodes[j], childStr = String(child), gap = j === length - 1 ? 0 : this.getGaps(j);
-            if (!childStr) {
-                //
-            }
-            else if (child.type === 'text') {
-                console.log(`${indent}  ${(0, string_1.noWrap)(child.data)}`);
-            }
-            else {
-                child.echo(depth + 1);
-            }
-            i += childStr.length;
-            if (gap) {
-                console.log(`${indent}  ${(0, string_1.noWrap)(str.slice(i, i + gap))}`);
-                i += gap;
-            }
-        }
-        if (i < str.length) {
-            console.log(`${indent}  ${(0, string_1.noWrap)(str.slice(i))}`);
-        }
-        index_1.default.info(`${indent}</${type}>`);
-    }
 }
 exports.AstElement = AstElement;
 constants_1.classes['AstElement'] = __filename;

package/dist/lib/text.js

@@ -116,14 +116,13 @@ class AstText extends node_1.AstNode {
      */
     lint(start = this.getAbsoluteIndex()) {
         const { data, parentNode, nextSibling, previousSibling } = this;
-        /* NOT FOR BROWSER */
         if (!parentNode) {
+            /* NOT FOR BROWSER */
             throw new Error('无法对孤立文本节点进行语法分析！');
+            /* NOT FOR BROWSER END */
         }
-        /* 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';
+        const { type, name } = parentNode, nowiki = name === 'nowiki' || name === 'pre', isHtmlAttrVal = type === 'attr-value' && parentNode.parentNode.type !== 'ext-attr';
         let errorRegex;
         if (type === 'ext-inner' && (name === 'pre' || parentNode instanceof NowikiToken)) {
             errorRegex = new RegExp(`<\\s*(?:\\/\\s*)${nowiki ? '' : '?'}(${name})\\b`, 'giu');
@@ -131,7 +130,7 @@ class AstText extends node_1.AstNode {
         else if (type === 'free-ext-link'
             || type === 'ext-link-url'
             || type === 'image-parameter' && name === 'link'
-            || type === 'attr-value') {
+            || isHtmlAttrVal) {
             errorRegex = errorSyntaxUrl;
         }
         else {
@@ -163,14 +162,15 @@ class AstText extends node_1.AstNode {
             else if (char === ']' && (index || length > 1)) {
                 errorRegex.lastIndex--;
             }
-            const startIndex = start + index, endIndex = startIndex + length, rootStr = String(root), nextChar = rootStr[endIndex], previousChar = rootStr[startIndex - 1], severity = length > 1 && (char !== '<' || !nowiki && /[\s/>]/u.test(nextChar ?? ''))
+            const startIndex = start + index, endIndex = startIndex + length, rootStr = String(root), nextChar = rootStr[endIndex], previousChar = rootStr[startIndex - 1], severity = length > 1 && !(char === '<' && (nowiki || !/[\s/>]/u.test(nextChar ?? ''))
+                || isHtmlAttrVal && (char === '[' || char === ']'))
                 || char === '{' && (nextChar === char || previousChar === '-')
                 || char === '}' && (previousChar === char || nextChar === '-')
                 || char === '[' && (nextChar === char
                     || type === 'ext-link-text'
-                    || !data.slice(index + 1).trim() && nextType === 'free-ext-link')
+                    || nextType === 'free-ext-link' && !data.slice(index + 1).trim())
                 || char === ']' && (previousChar === char
-                    || !data.slice(0, index).trim() && previousType === 'free-ext-link')
+                    || previousType === 'free-ext-link' && !data.slice(0, index).includes(']'))
                 ? 'error'
                 : 'warning';
             const leftBracket = char === '{' || char === '[', rightBracket = char === ']' || char === '}';
@@ -191,8 +191,7 @@ class AstText extends node_1.AstNode {
                     }
                 }
             }
-            const lines = data.slice(0, index).split('\n'), startLine = lines.length + top - 1, line = lines[lines.length - 1], startCol = lines.length === 1 ? left + line.length : line.length;
-            errors.push({
+            const lines = data.slice(0, index).split('\n'), startLine = lines.length + top - 1, line = lines[lines.length - 1], startCol = lines.length === 1 ? left + line.length : line.length, e = {
                 rule: ruleMap[char],
                 message: index_1.default.msg('lonely "$1"', char === 'h' ? error : char),
                 severity,
@@ -202,7 +201,45 @@ class AstText extends node_1.AstNode {
                 endLine: startLine,
                 startCol,
                 endCol: startCol + length,
-            });
+            };
+            if (char === '<') {
+                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: ' ',
+                    },
+                ];
+            }
+            else if (char === '[' && type === 'ext-link-text') {
+                const i = parentNode.getAbsoluteIndex() + String(parentNode).length;
+                e.suggestions = [
+                    {
+                        desc: 'escape',
+                        range: [i, i + 1],
+                        text: '&#93;',
+                    },
+                ];
+            }
+            else if (char === ']' && previousType === 'free-ext-link' && severity === 'error') {
+                const i = start - String(previousSibling).length;
+                e.fix = {
+                    range: [i, i],
+                    text: '[',
+                };
+            }
+            errors.push(e);
         }
         return errors;
     }

package/dist/src/arg.js

@@ -71,22 +71,40 @@ class ArgToken extends index_2.Token {
     }
     /** @override */
     lint(start = this.getAbsoluteIndex()) {
+        const { childNodes: [argName, argDefault, ...rest] } = this;
         if (!this.getAttribute('include')) {
-            return [(0, lint_1.generateForSelf)(this, { start }, 'no-arg', 'unexpected template argument')];
+            const e = (0, lint_1.generateForSelf)(this, { start }, 'no-arg', 'unexpected template argument');
+            if (argDefault) {
+                e.fix = {
+                    range: [start, e.endIndex],
+                    text: argDefault.text(),
+                };
+            }
+            return [e];
         }
-        const { childNodes: [argName, argDefault, ...rest] } = this, errors = argName.lint(start + 3);
+        const errors = argName.lint(start + 3);
         if (argDefault) {
             errors.push(...argDefault.lint(start + 4 + String(argName).length));
         }
         if (rest.length > 0) {
             const rect = { start, ...this.getRootNode().posFromIndex(start) };
             errors.push(...rest.map(child => {
-                const error = (0, lint_1.generateForChild)(child, rect, 'no-ignored', 'invisible content inside triple braces');
-                return {
-                    ...error,
-                    startIndex: error.startIndex - 1,
-                    startCol: error.startCol - 1,
-                };
+                const e = (0, lint_1.generateForChild)(child, rect, 'no-ignored', 'invisible content inside triple braces');
+                e.startIndex--;
+                e.startCol--;
+                e.suggestions = [
+                    {
+                        desc: 'remove',
+                        range: [e.startIndex, e.endIndex],
+                        text: '',
+                    },
+                    {
+                        desc: 'escape',
+                        range: [e.startIndex, e.startIndex + 1],
+                        text: '{{!}}',
+                    },
+                ];
+                return e;
             }));
         }
         return errors;

package/dist/src/attribute.js

@@ -347,11 +347,24 @@ let AttributeToken = (() => {
                 const root = this.getRootNode();
                 rect = { start, ...root.posFromIndex(start) };
                 const e = (0, lint_1.generateForChild)(lastChild, rect, 'unclosed-quote', index_1.default.msg('unclosed $1', 'quotes'), 'warning');
-                errors.push({
-                    ...e,
-                    startIndex: e.startIndex - 1,
-                    startCol: e.startCol - 1,
-                });
+                e.startIndex--;
+                e.startCol--;
+                const fix = {
+                    range: [e.endIndex, e.endIndex],
+                    text: this.#quotes[0],
+                };
+                if (lastChild.childNodes.some(child => child.type === 'text' && /\s/u.test(child.text()))) {
+                    e.suggestions = [
+                        {
+                            desc: 'quote',
+                            ...fix,
+                        },
+                    ];
+                }
+                else {
+                    e.fix = fix;
+                }
+                errors.push(e);
             }
             const attrs = extAttrs[tag];
             if (attrs && !attrs.has(name)
@@ -372,7 +385,20 @@ let AttributeToken = (() => {
             }
             else if (name === 'tabindex' && typeof value === 'string' && value.trim() !== '0') {
                 rect ??= { start, ...this.getRootNode().posFromIndex(start) };
-                errors.push((0, lint_1.generateForChild)(lastChild, rect, 'illegal-attr', 'nonzero tabindex'));
+                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',
+                    },
+                ];
+                errors.push(e);
             }
             return errors;
         }

package/dist/src/attributes.js

@@ -149,13 +149,23 @@ class AttributesToken extends index_2.Token {
         let rect;
         if (parentNode?.type === 'html' && parentNode.closing && this.text().trim()) {
             rect = { start, ...this.getRootNode().posFromIndex(start) };
-            errors.push((0, lint_1.generateForSelf)(this, rect, 'no-ignored', 'attributes of a closing tag'));
+            const e = (0, lint_1.generateForSelf)(this, rect, 'no-ignored', 'attributes of a closing tag');
+            e.fix = { range: [start, e.endIndex], text: '' };
+            errors.push(e);
         }
         for (let i = 0; i < length; i++) {
             const attr = childNodes[i];
             if (attr instanceof atom_1.AtomToken && attr.text().trim()) {
                 rect ??= { start, ...this.getRootNode().posFromIndex(start) };
-                errors.push((0, lint_1.generateForChild)(attr, rect, 'no-ignored', 'containing invalid attribute'));
+                const e = (0, lint_1.generateForChild)(attr, rect, 'no-ignored', 'containing invalid attribute');
+                e.suggestions = [
+                    {
+                        desc: 'remove',
+                        range: [e.startIndex, e.endIndex],
+                        text: ' ',
+                    },
+                ];
+                errors.push(e);
             }
             else if (attr instanceof attribute_1.AttributeToken) {
                 const { name } = attr;

package/dist/src/converterFlags.js

@@ -78,7 +78,23 @@ class ConverterFlagsToken extends index_2.Token {
                 && !variantFlags.has(flag)
                 && !unknownFlags.has(flag)
                 && (variantFlags.size > 0 || !validFlags.has(flag))) {
-                errors.push((0, lint_1.generateForChild)(child, rect, 'no-ignored', 'invalid conversion flag'));
+                const e = (0, lint_1.generateForChild)(child, rect, 'no-ignored', 'invalid conversion flag');
+                if (variantFlags.size === 0 && definedFlags.has(flag.toUpperCase())) {
+                    e.fix = {
+                        range: [e.startIndex, e.endIndex],
+                        text: flag.toUpperCase(),
+                    };
+                }
+                else {
+                    e.suggestions = [
+                        {
+                            desc: 'remove',
+                            range: [e.startIndex, e.endIndex],
+                            text: '',
+                        },
+                    ];
+                }
+                errors.push(e);
             }
         }
         return errors;

package/dist/src/gallery.js

@@ -76,6 +76,18 @@ class GalleryToken extends index_2.Token {
                     endLine: startLine,
                     startCol,
                     endCol: startCol + length,
+                    suggestions: [
+                        {
+                            desc: 'remove',
+                            range: [start, start + length],
+                            text: '',
+                        },
+                        {
+                            desc: 'comment',
+                            range: [start, start + length],
+                            text: `<!--${str}-->`,
+                        },
+                    ],
                 });
             }
             else if (child.type !== 'noinclude' && child.type !== 'text') {

package/dist/src/html.js

@@ -216,6 +216,24 @@ let HtmlToken = (() => {
                         if (ancestor && magicWords.has(ancestor.name)) {
                             error.severity = 'warning';
                         }
+                        else {
+                            error.suggestions = [
+                                {
+                                    desc: 'remove',
+                                    range: [start, error.endIndex],
+                                    text: '',
+                                },
+                            ];
+                        }
+                    }
+                    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: '',
+                            };
+                        }
                     }
                     errors.push(error);
                 }
@@ -233,7 +251,7 @@ let HtmlToken = (() => {
                 refError ??= (0, lint_1.generateForSelf)(this, { start }, 'h1', '');
                 errors.push({
                     ...refError,
-                    rule: 'format-leakage',
+                    rule: 'bold-header',
                     message: index_1.default.msg('bold in section header'),
                     severity: 'warning',
                 });

package/dist/src/imageParameter.js

@@ -168,7 +168,12 @@ class ImageParameterToken extends index_2.Token {
     lint(start = this.getAbsoluteIndex()) {
         const errors = super.lint(start), { link, name } = this;
         if (name === 'invalid') {
-            errors.push((0, lint_1.generateForSelf)(this, { start }, 'invalid-gallery', 'invalid gallery image parameter'));
+            const e = (0, lint_1.generateForSelf)(this, { start }, 'invalid-gallery', 'invalid gallery image parameter');
+            e.fix = {
+                range: [start, start + e.endIndex],
+                text: '',
+            };
+            errors.push(e);
         }
         else if (typeof link === 'object' && link.encoded) {
             errors.push((0, lint_1.generateForSelf)(this, { start }, 'url-encoding', 'unnecessary URL encoding in an internal link'));

package/dist/src/index.js

@@ -414,7 +414,17 @@ class Token extends element_1.AstElement {
             }
             for (const value of Object.values(record)) {
                 if (value.size > 1) {
-                    errors.push(...[...value].map(cat => (0, lint_1.generateForSelf)(cat, { start: cat.getAbsoluteIndex() }, 'no-duplicate', 'duplicated category')));
+                    errors.push(...[...value].map(cat => {
+                        const e = (0, lint_1.generateForSelf)(cat, { start: cat.getAbsoluteIndex() }, 'no-duplicate', 'duplicated category');
+                        e.suggestions = [
+                            {
+                                desc: 'remove',
+                                range: [e.startIndex, e.endIndex],
+                                text: '',
+                            },
+                        ];
+                        return e;
+                    }));
                 }
             }
         }

package/dist/src/link/base.js

@@ -141,14 +141,34 @@ class LinkBaseToken extends index_2.Token {
             rect ??= { start, ...this.getRootNode().posFromIndex(start) };
             errors.push((0, lint_1.generateForChild)(target, rect, 'url-encoding', 'unnecessary URL encoding in an internal link'));
         }
-        if ((linkType === 'link' || linkType === 'category')
-            && linkText?.childNodes.some(({ type, data }) => type === 'text' && data.includes('|'))) {
-            rect ??= { start, ...this.getRootNode().posFromIndex(start) };
-            errors.push((0, lint_1.generateForChild)(linkText, rect, 'pipe-like', 'additional "|" in the link text', 'warning'));
+        if (linkType === 'link' || linkType === 'category') {
+            const textNode = linkText?.childNodes.find((c) => c.type === 'text' && c.data.includes('|'));
+            if (textNode) {
+                rect ??= { start, ...this.getRootNode().posFromIndex(start) };
+                const e = (0, lint_1.generateForChild)(linkText, rect, 'pipe-like', 'additional "|" in the link text', 'warning');
+                e.suggestions = [
+                    {
+                        desc: 'escape',
+                        range: [
+                            e.startIndex + textNode.getRelativeIndex(),
+                            e.startIndex + textNode.getRelativeIndex() + textNode.data.length,
+                        ],
+                        text: textNode.data.replace(/\|/gu, '|'),
+                    },
+                ];
+                errors.push(e);
+            }
         }
-        else if (linkType !== 'link' && fragment !== undefined) {
+        if (linkType !== 'link' && fragment !== undefined) {
             rect ??= { start, ...this.getRootNode().posFromIndex(start) };
-            errors.push((0, lint_1.generateForChild)(target, rect, 'no-ignored', 'useless fragment'));
+            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 = {
+                    range: [e.startIndex + textNode.getRelativeIndex() + textNode.data.indexOf('#'), e.endIndex],
+                    text: '',
+                };
+            }
+            errors.push(e);
         }
         return errors;
     }

package/dist/src/magicLink.js

@@ -114,17 +114,41 @@ let MagicLinkToken = (() => {
                 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;
-                    errors.push({
+                    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, pipe = s.startsWith('|');
+                    const e = {
                         ...refError,
-                        message: index_1.default.msg('$1 in URL', s.startsWith('|') ? '"|"' : 'full-width punctuation'),
+                        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);
                 }
             }
             return errors;
@@ -148,7 +172,7 @@ let MagicLinkToken = (() => {
                     this.constructorError('不可插入模板');
                 }
                 else if (!debug_1.Shadow.running && type === 'magic-word' && name !== '!' && name !== '=') {
-                    this.constructorError('不可插入 `{{!}}` 或 `{{=}}` 以外的魔术字');
+                    this.constructorError('不可插入 "{{!}}" 或 "{{=}}" 以外的魔术字');
                 }
             }
             return super.insertAt(token, i);

package/dist/src/nested.js

@@ -61,7 +61,20 @@ class NestedToken extends index_2.Token {
                 return str && !/^<!--.*-->$/su.test(str);
             }).map(child => {
                 rect ??= { start, ...this.getRootNode().posFromIndex(start) };
-                return (0, lint_1.generateForChild)(child, rect, 'no-ignored', index_1.default.msg('invalid content in <$1>', this.name));
+                const e = (0, lint_1.generateForChild)(child, rect, 'no-ignored', index_1.default.msg('invalid content in <$1>', this.name));
+                e.suggestions = [
+                    {
+                        desc: 'remove',
+                        range: [e.startIndex, e.endIndex],
+                        text: '',
+                    },
+                    {
+                        desc: 'comment',
+                        range: [e.startIndex, e.startIndex],
+                        text: `<!--${String(child)}-->`,
+                    },
+                ];
+                return e;
             }),
         ];
     }

package/dist/src/nowiki/comment.js

@@ -31,9 +31,15 @@ class CommentToken extends (0, hidden_1.hiddenToken)(base_1.NowikiBaseToken) {
     }
     /** @override */
     lint(start = this.getAbsoluteIndex()) {
-        return this.closed
-            ? []
-            : [(0, lint_1.generateForSelf)(this, { start }, 'unclosed-comment', index_1.default.msg('unclosed $1', 'HTML comment'))];
+        if (this.closed) {
+            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: '-->',
+        };
+        return [e];
     }
     /** @private */
     toString() {

package/dist/src/nowiki/index.js

@@ -12,9 +12,15 @@ class NowikiToken extends base_1.NowikiBaseToken {
     /** @override */
     lint(start = this.getAbsoluteIndex()) {
         const { name, firstChild: { data } } = this;
-        return (name === 'templatestyles' || name === 'section') && data
-            ? [(0, lint_1.generateForSelf)(this, { start }, 'void-ext', index_1.default.msg('nothing should be in <$1>', name))]
-            : super.lint(start);
+        if ((name === 'templatestyles' || name === 'section') && data) {
+            const e = (0, lint_1.generateForSelf)(this, { start }, 'void-ext', index_1.default.msg('nothing should be in <$1>', name));
+            e.fix = {
+                range: [start - 1, e.endIndex + name.length + 3],
+                text: '/>',
+            };
+            return [e];
+        }
+        return super.lint(start);
     }
 }
 exports.NowikiToken = NowikiToken;

package/dist/src/nowiki/quote.js

@@ -79,6 +79,13 @@ let QuoteToken = (() => {
                     startCol: endCol - length,
                     endLine,
                     endCol,
+                    suggestions: [
+                        {
+                            desc: 'escape',
+                            range: [startIndex, endIndex],
+                            text: '''.repeat(length),
+                        },
+                    ],
                 });
             }
             if (nextSibling?.type === 'text' && nextSibling.data.startsWith(`'`)) {
@@ -91,6 +98,13 @@ let QuoteToken = (() => {
                     startLine,
                     startCol,
                     endCol: startCol + length,
+                    suggestions: [
+                        {
+                            desc: 'escape',
+                            range: [startIndex, endIndex],
+                            text: '''.repeat(length),
+                        },
+                    ],
                 });
             }
             if (bold && this.closest('heading-title')) {

package/dist/src/paramTag/index.js

@@ -47,7 +47,15 @@ class ParamTagToken extends index_2.Token {
             return str && !(i >= 0 ? /^[a-z]+(?:\[\])?\s*(?:=|$)/iu : /^[a-z]+(?:\[\])?\s*=/iu).test(str);
         }).map(child => {
             rect ??= { start, ...this.getRootNode().posFromIndex(start) };
-            return (0, lint_1.generateForChild)(child, rect, 'no-ignored', index_1.default.msg('invalid parameter of <$1>', this.name));
+            const e = (0, lint_1.generateForChild)(child, rect, 'no-ignored', index_1.default.msg('invalid parameter of <$1>', this.name));
+            e.suggestions = [
+                {
+                    desc: 'remove',
+                    range: [e.startIndex, e.endIndex],
+                    text: '',
+                },
+            ];
+            return e;
         });
     }
     /** @override */

package/dist/src/parameter.js

@@ -159,14 +159,16 @@ let ParameterToken = (() => {
             const errors = super.lint(start), { firstChild } = this, link = new RegExp(`https?://${string_1.extUrlCharFirst}${string_1.extUrlChar}$`, 'iu').exec(firstChild.text())?.[0];
             if (link && new URL(link).search) {
                 const e = (0, lint_1.generateForChild)(firstChild, { start }, 'unescaped', 'unescaped query string in an anonymous parameter');
-                errors.push({
-                    ...e,
-                    startIndex: e.endIndex,
-                    endIndex: e.endIndex + 1,
-                    startLine: e.endLine,
-                    startCol: e.endCol,
-                    endCol: e.endCol + 1,
-                });
+                e.startIndex = e.endIndex;
+                e.startLine = e.endLine;
+                e.startCol = e.endCol;
+                e.endIndex++;
+                e.endCol++;
+                e.fix = {
+                    range: [e.startIndex, e.endIndex],
+                    text: '{{=}}',
+                };
+                errors.push(e);
             }
             return errors;
         }

package/dist/src/table/td.js

@@ -193,7 +193,24 @@ let TdToken = (() => {
                 if (child.type === 'text') {
                     const { data } = child;
                     if (data.includes('|')) {
-                        errors.push((0, lint_1.generateForChild)(child, { start }, 'pipe-like', 'additional "|" in a table cell', data.includes('||') ? 'error' : 'warning'));
+                        const isError = data.includes('||'), e = (0, lint_1.generateForChild)(child, { start }, 'pipe-like', 'additional "|" in a table cell', isError ? 'error' : 'warning');
+                        if (isError) {
+                            const syntax = { caption: '|+', td: '|', th: '!' }[this.subtype];
+                            e.fix = {
+                                range: [e.startIndex, e.endIndex],
+                                text: data.replace(/\|\|/gu, `\n${syntax}`),
+                            };
+                        }
+                        else {
+                            e.suggestions = [
+                                {
+                                    desc: 'escape',
+                                    range: [e.startIndex, e.endIndex],
+                                    text: data.replace(/\|/gu, '|'),
+                                },
+                            ];
+                        }
+                        errors.push(e);
                     }
                 }
             }

package/dist/src/table/trBase.js

@@ -30,13 +30,11 @@ class TrBaseToken extends base_1.TableBaseToken {
             catch { }
         }
         const error = (0, lint_1.generateForChild)(inter, { start }, 'fostered-content', 'content to be moved out from the table');
-        errors.push({
-            ...error,
-            severity: first.type === 'template' ? 'warning' : 'error',
-            startIndex: error.startIndex + 1,
-            startLine: error.startLine + 1,
-            startCol: 0,
-        });
+        error.severity = first.type === 'template' ? 'warning' : 'error';
+        error.startIndex++;
+        error.startLine++;
+        error.startCol = 0;
+        errors.push(error);
         return errors;
     }
     /* NOT FOR BROWSER */

package/dist/src/tagPair/include.js

@@ -38,9 +38,15 @@ class IncludeToken extends (0, hidden_1.hiddenToken)(index_2.TagPairToken) {
     }
     /** @override */
     lint(start = this.getAbsoluteIndex()) {
-        return this.closed
-            ? []
-            : [(0, lint_1.generateForSelf)(this, { start }, 'unclosed-comment', index_1.default.msg('unclosed $1', `<${this.name}>`))];
+        if (this.closed) {
+            return [];
+        }
+        const e = (0, lint_1.generateForSelf)(this, { start }, 'unclosed-comment', index_1.default.msg('unclosed $1', `<${this.name}>`));
+        e.fix = {
+            range: [e.endIndex, e.endIndex],
+            text: `</${this.name}>`,
+        };
+        return [e];
     }
     /* NOT FOR BROWSER */
     /** @override */

package/dist/src/transclude.js

@@ -232,7 +232,14 @@ class TranscludeToken extends index_2.Token {
         const title = this.#getTitle();
         if (title.fragment !== undefined) {
             rect = { start, ...this.getRootNode().posFromIndex(start) };
-            errors.push((0, lint_1.generateForChild)(childNodes[type === 'template' ? 0 : 1], rect, 'no-ignored', 'useless fragment'));
+            const child = childNodes[type === 'template' ? 0 : 1], e = (0, lint_1.generateForChild)(child, rect, 'no-ignored', 'useless fragment'), textNode = child.childNodes.find((c) => c.type === 'text' && c.data.includes('#'));
+            if (textNode) {
+                e.fix = {
+                    range: [e.startIndex + textNode.getRelativeIndex() + textNode.data.indexOf('#'), e.endIndex],
+                    text: '',
+                };
+            }
+            errors.push(e);
         }
         if (!title.valid) {
             rect ??= { start, ...this.getRootNode().posFromIndex(start) };

package/dist/util/diff.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.info = exports.error = exports.diff = exports.cmd = void 0;
 const fs = require("fs/promises");
 const child_process_1 = require("child_process");
+const chalk = require("chalk");
 process.on('unhandledRejection', e => {
     console.error(e);
 });
@@ -72,11 +73,11 @@ const diff = async (oldStr, newStr, uid = -1) => {
 exports.diff = diff;
 /** @implements */
 const error = (msg, ...args) => {
-    console.error('\x1B[31m%s\x1B[0m', msg, ...args);
+    console.error(chalk.red(msg), ...args);
 };
 exports.error = error;
 /** @implements */
 const info = (msg, ...args) => {
-    console.info('\x1B[32m%s\x1B[0m', msg, ...args);
+    console.info(chalk.green(msg), ...args);
 };
 exports.info = info;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.4.5",
+	"version": "1.5.0",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",
@@ -48,6 +48,7 @@
 		"@typescript-eslint/eslint-plugin": "^6.19.1",
 		"@typescript-eslint/parser": "^6.19.1",
 		"ajv-cli": "^5.0.0",
+		"chalk": "^4.1.2",
 		"eslint": "^8.56.0",
 		"eslint-plugin-es-x": "^7.5.0",
 		"eslint-plugin-eslint-comments": "^3.2.0",