wikiparser-node 1.24.1 → 1.25.1

package/dist/src/heading.js

@@ -156,78 +156,80 @@ let HeadingToken = (() => {
         }
         /** @private */
         lint(start = this.getAbsoluteIndex(), re) {
-            const errors = super.lint(start, re), { firstChild, level } = this, innerStr = firstChild.toString(), unbalancedStart = innerStr.startsWith('='), unbalanced = unbalancedStart || innerStr.endsWith('='), rect = new rect_1.BoundingRect(this, start), s = this.inHtmlAttrs(), rules = ['h1', 'unbalanced-header', 'format-leakage'], severities = rules.map(rule => index_1.default.lintConfig.getSeverity(rule, 'apostrophe'));
-            if (severities[0] && this.level === 1) {
-                const e = (0, lint_1.generateForChild)(firstChild, rect, rules[0], '<h1>', severities[0]);
-                if (!unbalanced) {
-                    e.suggestions = [(0, lint_1.fixBy)(e, 'h2', `=${innerStr}=`)];
-                }
-                errors.push(e);
-            }
-            if (severities[1] && unbalanced) {
-                const msg = index_1.default.msg('unbalanced $1 in a section header', '"="'), e = (0, lint_1.generateForChild)(firstChild, rect, rules[1], msg, severities[1]);
-                if (innerStr === '=') {
-                    //
-                }
-                else if (unbalancedStart) {
-                    const [extra] = /^=+/u.exec(innerStr), newLevel = level + extra.length;
-                    e.suggestions = [{ desc: `h${level}`, range: [e.startIndex, e.startIndex + extra.length], text: '' }];
-                    if (newLevel < 7) {
-                        e.suggestions.push({ desc: `h${newLevel}`, range: [e.endIndex, e.endIndex], text: extra });
+            LINT: { // eslint-disable-line no-unused-labels
+                const errors = super.lint(start, re), { firstChild, level } = this, innerStr = firstChild.toString(), unbalancedStart = innerStr.startsWith('='), unbalanced = unbalancedStart || innerStr.endsWith('='), rect = new rect_1.BoundingRect(this, start), s = this.inHtmlAttrs(), rules = ['h1', 'unbalanced-header', 'format-leakage'], severities = rules.map(rule => index_1.default.lintConfig.getSeverity(rule, 'apostrophe'));
+                if (severities[0] && this.level === 1) {
+                    const e = (0, lint_1.generateForChild)(firstChild, rect, rules[0], '<h1>', severities[0]);
+                    if (!unbalanced) {
+                        e.suggestions = [(0, lint_1.fixBy)(e, 'h2', `=${innerStr}=`)];
                     }
+                    errors.push(e);
                 }
-                else {
-                    const extra = /[^=](=+)$/u.exec(innerStr)[1], newLevel = level + extra.length;
-                    e.suggestions = [{ desc: `h${level}`, range: [e.endIndex - extra.length, e.endIndex], text: '' }];
-                    if (newLevel < 7) {
-                        e.suggestions.push({ desc: `h${newLevel}`, range: [e.startIndex, e.startIndex], text: extra });
-                    }
-                }
-                errors.push(e);
-            }
-            if (s) {
-                const rule = 'parsing-order', severity = index_1.default.lintConfig.getSeverity(rule, s === 2 ? 'heading' : 'templateInTable');
-                if (severity) {
-                    errors.push((0, lint_1.generateForSelf)(this, rect, rule, 'section header in HTML tag attributes', severity));
-                }
-            }
-            if (severities[2]) {
-                const rootStr = this.getRootNode().toString(), quotes = firstChild.childNodes.filter((0, debug_1.isToken)('quote')), boldQuotes = quotes.filter(({ bold }) => bold), italicQuotes = quotes.filter(({ italic }) => italic);
-                if (boldQuotes.length % 2) {
-                    const e = (0, lint_1.generateForChild)(boldQuotes[boldQuotes.length - 1], {
-                        ...rect, // eslint-disable-line @typescript-eslint/no-misused-spread
-                        start: start + level,
-                        left: rect.left + level,
-                    }, rules[2], index_1.default.msg('unbalanced $1 in a section header', 'bold apostrophes'), severities[2]), end = start + level + innerStr.length, remove = (0, lint_1.fixByRemove)(e);
-                    if (rootStr.slice(e.endIndex, end).trim()) {
-                        e.suggestions = [
-                            remove,
-                            (0, lint_1.fixByClose)(end, `'''`),
-                        ];
+                if (severities[1] && unbalanced) {
+                    const msg = index_1.default.msg('unbalanced-in-section-header', '"="'), e = (0, lint_1.generateForChild)(firstChild, rect, rules[1], msg, severities[1]);
+                    if (innerStr === '=') {
+                        //
                     }
-                    else if (boldQuotes.length === 1 && italicQuotes.length === 0) {
-                        e.fix = remove;
+                    else if (unbalancedStart) {
+                        const [extra] = /^=+/u.exec(innerStr), newLevel = level + extra.length;
+                        e.suggestions = [{ desc: `h${level}`, range: [e.startIndex, e.startIndex + extra.length], text: '' }];
+                        if (newLevel < 7) {
+                            e.suggestions.push({ desc: `h${newLevel}`, range: [e.endIndex, e.endIndex], text: extra });
+                        }
                     }
                     else {
-                        e.suggestions = [remove];
+                        const extra = /[^=](=+)$/u.exec(innerStr)[1], newLevel = level + extra.length;
+                        e.suggestions = [{ desc: `h${level}`, range: [e.endIndex - extra.length, e.endIndex], text: '' }];
+                        if (newLevel < 7) {
+                            e.suggestions.push({ desc: `h${newLevel}`, range: [e.startIndex, e.startIndex], text: extra });
+                        }
                     }
                     errors.push(e);
                 }
-                if (italicQuotes.length % 2) {
-                    const e = (0, lint_1.generateForChild)(italicQuotes[italicQuotes.length - 1], { start: start + level }, rules[2], index_1.default.msg('unbalanced $1 in a section header', 'italic apostrophes'), severities[2]), end = start + level + innerStr.length;
-                    if (rootStr.slice(e.endIndex, end).trim()) {
-                        e.suggestions = [(0, lint_1.fixByClose)(end, `''`)];
+                if (s) {
+                    const rule = 'parsing-order', severity = index_1.default.lintConfig.getSeverity(rule, s === 2 ? 'heading' : 'templateInTable');
+                    if (severity) {
+                        errors.push((0, lint_1.generateForSelf)(this, rect, rule, 'header-in-html', severity));
                     }
-                    else if (italicQuotes.length === 1 && boldQuotes.length === 0) {
-                        e.fix = (0, lint_1.fixByRemove)(e);
+                }
+                if (severities[2]) {
+                    const rootStr = this.getRootNode().toString(), quotes = firstChild.childNodes.filter((0, debug_1.isToken)('quote')), boldQuotes = quotes.filter(({ bold }) => bold), italicQuotes = quotes.filter(({ italic }) => italic);
+                    if (boldQuotes.length % 2) {
+                        const e = (0, lint_1.generateForChild)(boldQuotes[boldQuotes.length - 1], {
+                            ...rect, // eslint-disable-line @typescript-eslint/no-misused-spread
+                            start: start + level,
+                            left: rect.left + level,
+                        }, rules[2], index_1.default.msg('unbalanced-in-section-header', 'bold-apostrophes'), severities[2]), end = start + level + innerStr.length, remove = (0, lint_1.fixByRemove)(e);
+                        if (rootStr.slice(e.endIndex, end).trim()) {
+                            e.suggestions = [
+                                remove,
+                                (0, lint_1.fixByClose)(end, `'''`),
+                            ];
+                        }
+                        else if (boldQuotes.length === 1 && italicQuotes.length === 0) {
+                            e.fix = remove;
+                        }
+                        else {
+                            e.suggestions = [remove];
+                        }
+                        errors.push(e);
                     }
-                    else {
-                        e.suggestions = [(0, lint_1.fixByRemove)(e)];
+                    if (italicQuotes.length % 2) {
+                        const e = (0, lint_1.generateForChild)(italicQuotes[italicQuotes.length - 1], { start: start + level }, rules[2], index_1.default.msg('unbalanced-in-section-header', 'italic-apostrophes'), severities[2]), end = start + level + innerStr.length;
+                        if (rootStr.slice(e.endIndex, end).trim()) {
+                            e.suggestions = [(0, lint_1.fixByClose)(end, `''`)];
+                        }
+                        else if (italicQuotes.length === 1 && boldQuotes.length === 0) {
+                            e.fix = (0, lint_1.fixByRemove)(e);
+                        }
+                        else {
+                            e.suggestions = [(0, lint_1.fixByRemove)(e)];
+                        }
+                        errors.push(e);
                     }
-                    errors.push(e);
                 }
+                return errors;
             }
-            return errors;
         }
         /** @private */
         print() {
@@ -237,8 +239,10 @@ let HeadingToken = (() => {
         /** @private */
         json(_, start = this.getAbsoluteIndex()) {
             const json = super.json(undefined, start);
-            json['level'] = this.level;
-            return json;
+            LSP: { // eslint-disable-line no-unused-labels
+                json['level'] = this.level;
+                return json;
+            }
         }
         /* NOT FOR BROWSER */
         cloneNode() {

package/dist/src/html.js

@@ -192,88 +192,90 @@ let HtmlToken = (() => {
         }
         /** @private */
         lint(start = this.getAbsoluteIndex(), re) {
-            const errors = super.lint(start, re), { name, parentNode, closing, selfClosing } = this, rect = new rect_1.BoundingRect(this, start), severity = this.inTableAttrs();
-            let rule = 'h1', s = index_1.default.lintConfig.getSeverity(rule, 'html');
-            if (s && name === 'h1' && !closing) {
-                const e = (0, lint_1.generateForSelf)(this, rect, rule, '<h1>', s);
-                e.suggestions = [{ desc: 'h2', range: [start + 2, start + 3], text: '2' }];
-                errors.push(e);
-            }
-            rule = 'parsing-order';
-            s = severity && index_1.default.lintConfig.getSeverity(rule, severity === 2 ? 'html' : 'templateInTable');
-            if (s) {
-                const e = (0, lint_1.generateForSelf)(this, rect, rule, 'HTML tag in table attributes', s);
-                if (severity === 2) {
-                    e.suggestions = [(0, lint_1.fixByRemove)(e)];
+            LINT: { // eslint-disable-line no-unused-labels
+                const errors = super.lint(start, re), { name, parentNode, closing, selfClosing } = this, rect = new rect_1.BoundingRect(this, start), severity = this.inTableAttrs();
+                let rule = 'h1', s = index_1.default.lintConfig.getSeverity(rule, 'html');
+                if (s && name === 'h1' && !closing) {
+                    const e = (0, lint_1.generateForSelf)(this, rect, rule, '<h1>', s);
+                    e.suggestions = [{ desc: 'h2', range: [start + 2, start + 3], text: '2' }];
+                    errors.push(e);
                 }
-                errors.push(e);
-            }
-            rule = 'obsolete-tag';
-            s = index_1.default.lintConfig.getSeverity(rule, name);
-            if (s && obsoleteTags.has(name)) {
-                errors.push((0, lint_1.generateForSelf)(this, rect, rule, 'obsolete HTML tag', s));
-            }
-            rule = 'bold-header';
-            s = index_1.default.lintConfig.getSeverity(rule, name);
-            if (s && (name === 'b' || name === 'strong')
-                && this.closest('heading-title,ext')?.type === 'heading-title') {
-                const e = (0, lint_1.generateForSelf)(this, rect, rule, 'bold in section header', s);
-                e.suggestions = [(0, lint_1.fixByRemove)(e)];
-                errors.push(e);
-            }
-            const { html: [, flexibleTags, voidTags] } = this.getAttribute('config'), isVoid = voidTags.includes(name), isFlexible = flexibleTags.includes(name), isNormal = !isVoid && !isFlexible;
-            rule = 'unmatched-tag';
-            if (closing && (selfClosing || isVoid) || selfClosing && isNormal) {
-                s = index_1.default.lintConfig.getSeverity(rule, closing ? 'both' : 'selfClosing');
+                rule = 'parsing-order';
+                s = severity && index_1.default.lintConfig.getSeverity(rule, severity === 2 ? 'html' : 'templateInTable');
                 if (s) {
-                    const e = (0, lint_1.generateForSelf)(this, rect, rule, closing ? 'tag that is both closing and self-closing' : 'invalid self-closing tag', s), open = (0, lint_1.fixByOpen)(start), noSelfClosing = {
-                        desc: 'no self-closing',
-                        range: [e.endIndex - 2, e.endIndex - 1],
-                        text: '',
-                    };
-                    if (isFlexible) {
-                        e.suggestions = [open, noSelfClosing];
-                    }
-                    else if (closing) {
-                        e.fix = isVoid ? open : noSelfClosing;
-                    }
-                    else {
-                        e.suggestions = [
-                            noSelfClosing,
-                            (0, lint_1.fixByClose)(e.endIndex, `></${name}>`, -2),
-                        ];
+                    const e = (0, lint_1.generateForSelf)(this, rect, rule, 'html-in-table', s);
+                    if (severity === 2) {
+                        e.suggestions = [(0, lint_1.fixByRemove)(e)];
                     }
                     errors.push(e);
                 }
-            }
-            else if (!this.findMatchingTag()) {
-                const error = (0, lint_1.generateForSelf)(this, rect, rule, closing ? 'unmatched closing tag' : 'unclosed tag'), ancestor = this.closest('magic-word');
-                if (ancestor && magicWords.has(ancestor.name)) {
-                    s = index_1.default.lintConfig.getSeverity(rule, 'conditional');
+                rule = 'obsolete-tag';
+                s = index_1.default.lintConfig.getSeverity(rule, name);
+                if (s && obsoleteTags.has(name)) {
+                    errors.push((0, lint_1.generateForSelf)(this, rect, rule, 'obsolete-tag', s));
                 }
-                else if (closing) {
-                    s = index_1.default.lintConfig.getSeverity(rule, 'closing');
-                    error.suggestions = [(0, lint_1.fixByRemove)(error)];
+                rule = 'bold-header';
+                s = index_1.default.lintConfig.getSeverity(rule, name);
+                if (s && (name === 'b' || name === 'strong')
+                    && this.closest('heading-title,ext')?.type === 'heading-title') {
+                    const e = (0, lint_1.generateForSelf)(this, rect, rule, 'bold-in-header', s);
+                    e.suggestions = [(0, lint_1.fixByRemove)(e)];
+                    errors.push(e);
                 }
-                else {
-                    s = index_1.default.lintConfig.getSeverity(rule, 'opening');
-                    const childNodes = parentNode?.childNodes;
-                    if (formattingTags.has(name)) {
-                        if (childNodes?.slice(0, childNodes.indexOf(this)).some(tag => tag.type === 'html' && tag.name === name && !tag.findMatchingTag())) {
-                            error.suggestions = [(0, lint_1.fixByClose)(start + 1, '/')];
+                const { html: [, flexibleTags, voidTags] } = this.getAttribute('config'), isVoid = voidTags.includes(name), isFlexible = flexibleTags.includes(name), isNormal = !isVoid && !isFlexible;
+                rule = 'unmatched-tag';
+                if (closing && (selfClosing || isVoid) || selfClosing && isNormal) {
+                    s = index_1.default.lintConfig.getSeverity(rule, closing ? 'both' : 'selfClosing');
+                    if (s) {
+                        const e = (0, lint_1.generateForSelf)(this, rect, rule, closing ? 'closing-and-self-closing' : 'invalid-self-closing', s), open = (0, lint_1.fixByOpen)(start), noSelfClosing = {
+                            desc: index_1.default.msg('no-self-closing'),
+                            range: [e.endIndex - 2, e.endIndex - 1],
+                            text: '',
+                        };
+                        if (isFlexible) {
+                            e.suggestions = [open, noSelfClosing];
+                        }
+                        else if (closing) {
+                            e.fix = isVoid ? open : noSelfClosing;
                         }
-                        if (this.closest('heading-title')) {
-                            error.rule = 'format-leakage';
-                            s = index_1.default.lintConfig.getSeverity('format-leakage', name);
+                        else {
+                            e.suggestions = [
+                                noSelfClosing,
+                                (0, lint_1.fixByClose)(e.endIndex, `></${name}>`, -2),
+                            ];
                         }
+                        errors.push(e);
                     }
                 }
-                if (s) {
-                    error.severity = s;
-                    errors.push(error);
+                else if (!this.findMatchingTag()) {
+                    const error = (0, lint_1.generateForSelf)(this, rect, rule, closing ? 'unmatched-closing' : 'unclosed-tag'), ancestor = this.closest('magic-word');
+                    if (ancestor && magicWords.has(ancestor.name)) {
+                        s = index_1.default.lintConfig.getSeverity(rule, 'conditional');
+                    }
+                    else if (closing) {
+                        s = index_1.default.lintConfig.getSeverity(rule, 'closing');
+                        error.suggestions = [(0, lint_1.fixByRemove)(error)];
+                    }
+                    else {
+                        s = index_1.default.lintConfig.getSeverity(rule, 'opening');
+                        const childNodes = parentNode?.childNodes;
+                        if (formattingTags.has(name)) {
+                            if (childNodes?.slice(0, childNodes.indexOf(this)).some(tag => tag.type === 'html' && tag.name === name && !tag.findMatchingTag())) {
+                                error.suggestions = [(0, lint_1.fixByClose)(start + 1, '/')];
+                            }
+                            if (this.closest('heading-title')) {
+                                error.rule = 'format-leakage';
+                                s = index_1.default.lintConfig.getSeverity('format-leakage', name);
+                            }
+                        }
+                    }
+                    if (s) {
+                        error.severity = s;
+                        errors.push(error);
+                    }
                 }
+                return errors;
             }
-            return errors;
         }
         /**
          * Find the matching tag
@@ -331,8 +333,10 @@ let HtmlToken = (() => {
         /** @private */
         json(_, start = this.getAbsoluteIndex()) {
             const json = super.json(undefined, start);
-            Object.assign(json, { closing: this.closing, selfClosing: this.#selfClosing });
-            return json;
+            LSP: { // eslint-disable-line no-unused-labels
+                Object.assign(json, { closing: this.closing, selfClosing: this.#selfClosing });
+                return json;
+            }
         }
         /* NOT FOR BROWSER */
         cloneNode() {

package/dist/src/imageParameter.js

@@ -196,24 +196,26 @@ class ImageParameterToken extends index_2.Token {
     }
     /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
-        const errors = super.lint(start, re), { link, name } = this;
-        if (name === 'invalid') {
-            const rule = 'invalid-gallery', s = index_1.default.lintConfig.getSeverity(rule, 'parameter');
-            if (s) {
-                const e = (0, lint_1.generateForSelf)(this, { start }, rule, 'invalid image parameter', s);
-                e.fix = (0, lint_1.fixByRemove)(e, -1);
-                errors.push(e);
+        LINT: { // eslint-disable-line no-unused-labels
+            const errors = super.lint(start, re), { link, name } = this;
+            if (name === 'invalid') {
+                const rule = 'invalid-gallery', s = index_1.default.lintConfig.getSeverity(rule, 'parameter');
+                if (s) {
+                    const e = (0, lint_1.generateForSelf)(this, { start }, rule, 'invalid-image-parameter', s);
+                    e.fix = (0, lint_1.fixByRemove)(e, -1);
+                    errors.push(e);
+                }
             }
-        }
-        else if (typeof link === 'object' && link.encoded) {
-            const rule = 'url-encoding', s = index_1.default.lintConfig.getSeverity(rule, 'file');
-            if (s) {
-                const e = (0, lint_1.generateForSelf)(this, { start }, rule, 'unnecessary URL encoding in an internal link', s);
-                e.fix = (0, lint_1.fixByDecode)(e, this);
-                errors.push(e);
+            else if (typeof link === 'object' && link.encoded) {
+                const rule = 'url-encoding', s = index_1.default.lintConfig.getSeverity(rule, 'file');
+                if (s) {
+                    const e = (0, lint_1.generateForSelf)(this, { start }, rule, 'unnecessary-encoding', s);
+                    e.fix = (0, lint_1.fixByDecode)(e, this);
+                    errors.push(e);
+                }
             }
+            return errors;
         }
-        return errors;
     }
     /** 是否是不可变参数 */
     #isVoid() {

package/dist/src/imagemap.js

@@ -148,26 +148,28 @@ let ImagemapToken = (() => {
         }
         /** @private */
         lint(start = this.getAbsoluteIndex(), re) {
-            const errors = super.lint(start, re), rect = new rect_1.BoundingRect(this, start), { childNodes, image } = this, rule = 'invalid-imagemap', s = index_1.default.lintConfig.getSeverity(rule, image ? 'link' : 'image');
-            if (s) {
-                if (image) {
-                    errors.push(...childNodes.filter(child => {
-                        const str = child.toString().trim();
-                        return child.is('noinclude') && str && !str.startsWith('#');
-                    }).map(child => {
-                        const e = (0, lint_1.generateForChild)(child, rect, rule, 'invalid link in <imagemap>', s);
-                        e.suggestions = [
-                            (0, lint_1.fixByRemove)(e, -1),
-                            (0, lint_1.fixBy)(e, 'comment', '# '),
-                        ];
-                        return e;
-                    }));
-                }
-                else {
-                    errors.push((0, lint_1.generateForSelf)(this, rect, rule, '<imagemap> without an image', s));
+            LINT: { // eslint-disable-line no-unused-labels
+                const errors = super.lint(start, re), rect = new rect_1.BoundingRect(this, start), { childNodes, image } = this, rule = 'invalid-imagemap', s = index_1.default.lintConfig.getSeverity(rule, image ? 'link' : 'image');
+                if (s) {
+                    if (image) {
+                        errors.push(...childNodes.filter(child => {
+                            const str = child.toString().trim();
+                            return child.is('noinclude') && str && !str.startsWith('#');
+                        }).map(child => {
+                            const e = (0, lint_1.generateForChild)(child, rect, rule, 'invalid-imagemap-link', s);
+                            e.suggestions = [
+                                (0, lint_1.fixByRemove)(e, -1),
+                                (0, lint_1.fixBy)(e, 'comment', '# '),
+                            ];
+                            return e;
+                        }));
+                    }
+                    else {
+                        errors.push((0, lint_1.generateForSelf)(this, rect, rule, 'imagemap-without-image', s));
+                    }
                 }
+                return errors;
             }
-            return errors;
         }
         /* PRINT ONLY */
         /** @private */