wikilint 2.27.0 → 2.28.1

package/dist/lib/node.js

@@ -108,7 +108,9 @@ let AstNode = (() => {
                     this.#previousSibling = value;
                     break;
                 case 'aIndex':
-                    this.#aIndex = [debug_1.Shadow.rev, value];
+                    LINT: { // eslint-disable-line no-unused-labels
+                        this.#aIndex = [debug_1.Shadow.rev, value];
+                    }
                     break;
                 default:
                     this[key] = value; // eslint-disable-line @typescript-eslint/no-explicit-any
@@ -154,18 +156,22 @@ let AstNode = (() => {
          * @param index character index / 字符位置
          */
         posFromIndex(index) {
-            const { length } = String(this);
-            index += index < 0 ? length : 0;
-            if (index >= 0 && index <= length) {
-                const lines = this.getLines(), top = lines.findIndex(([, , end]) => index <= end);
-                return { top, left: index - lines[top][1] };
+            LINT: { // eslint-disable-line no-unused-labels
+                const { length } = String(this);
+                index += index < 0 ? length : 0;
+                if (index >= 0 && index <= length) {
+                    const lines = this.getLines(), top = lines.findIndex(([, , end]) => index <= end);
+                    return { top, left: index - lines[top][1] };
+                }
+                return undefined;
             }
-            return undefined;
         }
         /** @private */
         getDimension() {
-            const lines = this.getLines(), last = lines[lines.length - 1];
-            return { height: lines.length, width: last[2] - last[1] };
+            LINT: { // eslint-disable-line no-unused-labels
+                const lines = this.getLines(), last = lines[lines.length - 1];
+                return { height: lines.length, width: last[2] - last[1] };
+            }
         }
         /** @private */
         getGaps(_) {
@@ -178,23 +184,25 @@ let AstNode = (() => {
          * @param j rank of the child node / 子节点序号
          */
         getRelativeIndex(j) {
-            if (j === undefined) {
-                const { parentNode } = this;
-                return parentNode
-                    ? parentNode.getRelativeIndex(parentNode.childNodes.indexOf(this))
-                    : 0;
-            }
-            return (0, lint_1.cache)(this.#rIndex[j], () => {
-                const { childNodes } = this, n = j + (j < 0 ? childNodes.length : 0);
-                let acc = this.getAttribute('padding');
-                for (let i = 0; i < n; i++) {
-                    this.#rIndex[i] = [debug_1.Shadow.rev, acc];
-                    acc += childNodes[i].toString().length + this.getGaps(i);
+            LINT: { // eslint-disable-line no-unused-labels
+                if (j === undefined) {
+                    const { parentNode } = this;
+                    return parentNode
+                        ? parentNode.getRelativeIndex(parentNode.childNodes.indexOf(this))
+                        : 0;
                 }
-                return acc;
-            }, value => {
-                this.#rIndex[j] = value;
-            });
+                return (0, lint_1.cache)(this.#rIndex[j], () => {
+                    const { childNodes } = this, n = j + (j < 0 ? childNodes.length : 0);
+                    let acc = this.getAttribute('padding');
+                    for (let i = 0; i < n; i++) {
+                        this.#rIndex[i] = [debug_1.Shadow.rev, acc];
+                        acc += childNodes[i].toString().length + this.getGaps(i);
+                    }
+                    return acc;
+                }, value => {
+                    this.#rIndex[j] = value;
+                });
+            }
         }
         /**
          * Get the absolute character index of the current node
@@ -202,7 +210,8 @@ let AstNode = (() => {
          * 获取当前节点的绝对位置
          */
         getAbsoluteIndex() {
-            return (0, lint_1.cache)(this.#aIndex, () => {
+            LINT: return (0, lint_1.cache)(// eslint-disable-line no-unused-labels
+            this.#aIndex, () => {
                 const { parentNode } = this;
                 return parentNode ? parentNode.getAbsoluteIndex() + this.getRelativeIndex() : 0;
             }, value => {
@@ -238,14 +247,16 @@ let AstNode = (() => {
          * @since v1.16.3
          */
         getLines() {
-            const results = [];
-            let start = 0;
-            for (const line of String(this).split('\n')) {
-                const end = start + line.length;
-                results.push([line, start, end]);
-                start = end + 1;
+            LINT: { // eslint-disable-line no-unused-labels
+                const results = [];
+                let start = 0;
+                for (const line of String(this).split('\n')) {
+                    const end = start + line.length;
+                    results.push([line, start, end]);
+                    start = end + 1;
+                }
+                return results;
             }
-            return results;
         }
     };
     return AstNode = _classThis;

package/dist/mixin/attributesParent.js

@@ -7,21 +7,23 @@ const debug_1 = require("../util/debug");
  * @param i AttributesToken子节点的位置
  */
 const attributesParent = (i = 0) => (constructor) => {
-    /* eslint-disable jsdoc/require-jsdoc */
-    class AttributesParent extends constructor {
-        /** AttributesToken子节点 */
-        #getAttributesChild() {
-            return this.childNodes[i];
-        }
-        hasAttr(key) {
-            LSP: return this.#getAttributesChild().hasAttr(key); // eslint-disable-line no-unused-labels
-        }
-        getAttr(key) {
-            return this.#getAttributesChild().getAttr(key);
+    LINT: { // eslint-disable-line no-unused-labels
+        /* eslint-disable jsdoc/require-jsdoc */
+        class AttributesParent extends constructor {
+            /** AttributesToken子节点 */
+            #getAttributesChild() {
+                return this.childNodes[i];
+            }
+            hasAttr(key) {
+                LSP: return this.#getAttributesChild().hasAttr(key); // eslint-disable-line no-unused-labels
+            }
+            getAttr(key) {
+                return this.#getAttributesChild().getAttr(key);
+            }
         }
+        /* eslint-enable jsdoc/require-jsdoc */
+        (0, debug_1.mixin)(AttributesParent, constructor);
+        return AttributesParent;
     }
-    /* eslint-enable jsdoc/require-jsdoc */
-    (0, debug_1.mixin)(AttributesParent, constructor);
-    return AttributesParent;
 };
 exports.attributesParent = attributesParent;

package/dist/mixin/elementLike.js

@@ -5,56 +5,58 @@ const debug_1 = require("../util/debug");
 const selector_1 = require("../parser/selector");
 /** @ignore */
 const elementLike = (constructor) => {
-    /* eslint-disable jsdoc/require-jsdoc */
-    class ElementLike extends constructor {
-        #getCondition(selector) {
-            return (0, selector_1.getCondition)(selector, 
-            // @ts-expect-error only AstElement
-            this);
-        }
-        getElementBy(condition) {
-            for (const child of this.childNodes) {
-                if (child.type === 'text') {
-                    continue;
-                }
-                else if (condition(child)) {
-                    return child;
-                }
-                const descendant = child.getElementBy(condition);
-                if (descendant) {
-                    return descendant;
-                }
+    LINT: { // eslint-disable-line no-unused-labels
+        /* eslint-disable jsdoc/require-jsdoc */
+        class ElementLike extends constructor {
+            #getCondition(selector) {
+                return (0, selector_1.getCondition)(selector, 
+                // @ts-expect-error only AstElement
+                this);
             }
-            return undefined;
-        }
-        querySelector(selector) {
-            return this.getElementBy(this.#getCondition(selector));
-        }
-        getElementsBy(condition, descendants = []) {
-            for (const child of this.childNodes) {
-                if (child.type === 'text') {
-                    continue;
-                }
-                else if (condition(child)) {
-                    descendants.push(child);
+            getElementBy(condition) {
+                for (const child of this.childNodes) {
+                    if (child.type === 'text') {
+                        continue;
+                    }
+                    else if (condition(child)) {
+                        return child;
+                    }
+                    const descendant = child.getElementBy(condition);
+                    if (descendant) {
+                        return descendant;
+                    }
                 }
-                child.getElementsBy(condition, descendants);
+                return undefined;
             }
-            return descendants;
-        }
-        querySelectorAll(selector) {
-            return this.getElementsBy(this.#getCondition(selector));
-        }
-        escape() {
-            LSP: { // eslint-disable-line no-unused-labels
+            querySelector(selector) {
+                return this.getElementBy(this.#getCondition(selector));
+            }
+            getElementsBy(condition, descendants = []) {
                 for (const child of this.childNodes) {
-                    child.escape();
+                    if (child.type === 'text') {
+                        continue;
+                    }
+                    else if (condition(child)) {
+                        descendants.push(child);
+                    }
+                    child.getElementsBy(condition, descendants);
+                }
+                return descendants;
+            }
+            querySelectorAll(selector) {
+                return this.getElementsBy(this.#getCondition(selector));
+            }
+            escape() {
+                LSP: { // eslint-disable-line no-unused-labels
+                    for (const child of this.childNodes) {
+                        child.escape();
+                    }
                 }
             }
         }
+        /* eslint-enable jsdoc/require-jsdoc */
+        (0, debug_1.mixin)(ElementLike, constructor);
+        return ElementLike;
     }
-    /* eslint-enable jsdoc/require-jsdoc */
-    (0, debug_1.mixin)(ElementLike, constructor);
-    return ElementLike;
 };
 exports.elementLike = elementLike;

package/dist/mixin/hidden.js

@@ -10,7 +10,6 @@ const debug_1 = require("../util/debug");
 const hiddenToken = (linter = true, html = true) => (constructor) => {
     /* eslint-disable jsdoc/require-jsdoc */
     class AnyHiddenToken extends constructor {
-        /** 没有可见部分 */
         text() {
             return '';
         }

package/dist/mixin/nodeLike.js

@@ -13,10 +13,10 @@ const nodeLike = (constructor) => {
             return this.childNodes[this.childNodes.length - 1];
         }
         get offsetHeight() {
-            return this.getDimension().height;
+            LINT: return this.getDimension().height; // eslint-disable-line no-unused-labels
         }
         get offsetWidth() {
-            return this.getDimension().width;
+            LINT: return this.getDimension().width; // eslint-disable-line no-unused-labels
         }
     }
     /* eslint-enable jsdoc/require-jsdoc */

package/dist/mixin/padded.js

@@ -8,14 +8,16 @@ const debug_1 = require("../util/debug");
  * @param padding.length
  */
 const padded = ({ length }) => (constructor) => {
-    /* eslint-disable jsdoc/require-jsdoc */
-    class PaddedToken extends constructor {
-        getAttribute(key) {
-            return key === 'padding' ? length : super.getAttribute(key);
+    LINT: { // eslint-disable-line no-unused-labels
+        /* eslint-disable jsdoc/require-jsdoc */
+        class PaddedToken extends constructor {
+            getAttribute(key) {
+                return key === 'padding' ? length : super.getAttribute(key);
+            }
         }
+        /* eslint-enable jsdoc/require-jsdoc */
+        (0, debug_1.mixin)(PaddedToken, constructor);
+        return PaddedToken;
     }
-    /* eslint-enable jsdoc/require-jsdoc */
-    (0, debug_1.mixin)(PaddedToken, constructor);
-    return PaddedToken;
 };
 exports.padded = padded;

package/dist/parser/commentAndExt.js

@@ -59,8 +59,11 @@ const parseCommentAndExt = (wikitext, config, accum, includeOnly) => {
             return str;
         }
     }
-    const { ext } = config, newExt = ext.filter(e => e !== 'translate' && e !== 'tvar'), newConfig = { ...config, ext: newExt };
+    const { ext } = config;
+    let newExt = ext, newConfig = config;
     if (ext.includes('translate')) {
+        newExt = ext.filter(e => e !== 'translate' && e !== 'tvar');
+        newConfig = { ...config, ext: newExt };
         const stack = [];
         wikitext = wikitext.replace(/<nowiki>[\s\S]*?<\/nowiki>/giu, m => {
             stack.push(m);
@@ -93,7 +96,7 @@ const parseCommentAndExt = (wikitext, config, accum, includeOnly) => {
         }
         else {
             // @ts-expect-error abstract class
-            new noinclude_1.NoincludeToken(substr, config, accum);
+            new noinclude_1.NoincludeToken(substr, config, accum, true);
         }
         return `\0${l}${ch}\x7F`;
     });

package/dist/parser/hrAndDoubleUnderscore.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseHrAndDoubleUnderscore = void 0;
+const cm_util_1 = require("@bhsd/cm-util");
 const hr_1 = require("../src/nowiki/hr");
 const doubleUnderscore_1 = require("../src/nowiki/doubleUnderscore");
 const heading_1 = require("../src/heading");
@@ -11,10 +12,10 @@ const heading_1 = require("../src/heading");
  * @param accum
  */
 const parseHrAndDoubleUnderscore = ({ firstChild: { data }, type, name }, config, accum) => {
-    const { doubleUnderscore: [insensitive, sensitive, aliases] } = config;
-    config.insensitiveDoubleUnderscore ??= new Set(insensitive);
-    config.sensitiveDoubleUnderscore ??= new Set(sensitive);
-    config.regexHrAndDoubleUnderscore ??= new RegExp(`__(${[...insensitive, ...sensitive].join('|')})__`, 'giu');
+    const { doubleUnderscore: [insensitive, sensitive, aliases] } = config, all = [...insensitive, ...sensitive];
+    config.insensitiveDoubleUnderscore ??= new Set(insensitive.filter(cm_util_1.isUnderscore));
+    config.sensitiveDoubleUnderscore ??= new Set(sensitive.filter(cm_util_1.isUnderscore));
+    config.regexHrAndDoubleUnderscore ??= new RegExp(`__(${all.filter(cm_util_1.isUnderscore).join('|')})__|＿{2}(${all.filter(s => !(0, cm_util_1.isUnderscore)(s)).map(s => s.slice(2, -2)).join('|')})＿{2}`, 'giu');
     if (type !== 'root' && (type !== 'ext-inner' || name !== 'poem')) {
         data = `\0${data}`;
     }
@@ -22,11 +23,11 @@ const parseHrAndDoubleUnderscore = ({ firstChild: { data }, type, name }, config
         // @ts-expect-error abstract class
         new hr_1.HrToken(m, config, accum);
         return `${lead}\0${accum.length - 1}r\x7F`;
-    }).replace(config.regexHrAndDoubleUnderscore, (m, p1) => {
-        const caseSensitive = config.sensitiveDoubleUnderscore.has(p1), lc = p1.toLowerCase(), caseInsensitive = config.insensitiveDoubleUnderscore.has(lc);
+    }).replace(config.regexHrAndDoubleUnderscore, (m, p1, p2) => {
+        const key = p1 ?? p2, caseSensitive = config.sensitiveDoubleUnderscore.has(key), lc = key.toLowerCase(), caseInsensitive = config.insensitiveDoubleUnderscore.has(lc);
         if (caseSensitive || caseInsensitive) {
             // @ts-expect-error abstract class
-            new doubleUnderscore_1.DoubleUnderscoreToken(p1, caseSensitive, config, accum);
+            new doubleUnderscore_1.DoubleUnderscoreToken(key, caseSensitive, Boolean(p2), config, accum);
             return `\0${accum.length - 1}${caseInsensitive && (aliases?.[lc] ?? /* istanbul ignore next */ lc) === 'toc' ? 'u' : 'n'}\x7F`;
         }
         return m;

package/dist/parser/html.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseHtml = void 0;
 const attributes_1 = require("../src/attributes");
-const html_1 = require("../src/html");
+const html_1 = require("../src/tag/html");
 const regex = /^(\/?)([a-z][^\s/>]*)((?:\s|\/(?!>))[^>]*?)?(\/?>)([^<]*)$/iu;
 /**
  * 解析HTML标签

package/dist/src/arg.js

@@ -101,7 +101,7 @@ let ArgToken = (() => {
         text() {
             return `{{{${(0, string_1.text)(this.childNodes.slice(0, 2), '|')}}}}`;
         }
-        /** 设置name */
+        /** 更新name */
         #setName() {
             // eslint-disable-next-line no-unused-labels
             LSP: this.setAttribute('name', this.firstChild.text().trim());
@@ -126,9 +126,8 @@ let ArgToken = (() => {
                         errors.push(...childErrors);
                     }
                 }
-                const rules = ['no-ignored', 'no-arg'], { lintConfig } = index_1.default, { computeEditInfo } = lintConfig, s = rules.map(rule => lintConfig.getSeverity(rule, 'arg'));
+                const rules = ['no-ignored', 'no-arg'], { lintConfig } = index_1.default, { computeEditInfo } = lintConfig, rect = new rect_1.BoundingRect(this, start), s = rules.map(rule => lintConfig.getSeverity(rule, 'arg'));
                 if (s[0] && rest.length > 0) {
-                    const rect = new rect_1.BoundingRect(this, start);
                     errors.push(...rest.map(child => {
                         const e = (0, lint_1.generateForChild)(child, rect, rules[0], 'invisible-triple-braces', s[0]);
                         e.startIndex--;
@@ -143,7 +142,7 @@ let ArgToken = (() => {
                     }));
                 }
                 if (s[1] && !this.getAttribute('include')) {
-                    const e = (0, lint_1.generateForSelf)(this, { start }, rules[1], 'unexpected-argument', s[1]);
+                    const e = (0, lint_1.generateForSelf)(this, rect, rules[1], 'unexpected-argument', s[1]);
                     if (computeEditInfo && argDefault) {
                         e.suggestions = [(0, lint_1.fixBy)(e, 'expand', argDefault.text())];
                     }

package/dist/src/atom.d.ts

@@ -1,6 +1,6 @@
 import { Token } from './index';
 import type { Config } from '../base';
-declare const atomTypes: readonly ["arg-name", "attr-key", "attr-value", "ext-attr-dirty", "html-attr-dirty", "table-attr-dirty", "converter-flag", "converter-rule-variant", "converter-rule-to", "converter-rule-from", "invoke-function", "invoke-module", "template-name", "link-target", "param-line"];
+declare const atomTypes: readonly ["arg-name", "attr-key", "attr-value", "ext-attr-dirty", "html-attr-dirty", "table-attr-dirty", "converter-flag", "converter-rule-variant", "converter-rule-to", "converter-rule-from", "invoke-function", "invoke-module", "template-name", "link-target"];
 declare type AtomTypes = typeof atomTypes[number];
 /**
  * plain Token that will not be parsed further

package/dist/src/atom.js

@@ -18,7 +18,6 @@ const atomTypes = [
     'invoke-module',
     'template-name',
     'link-target',
-    'param-line',
 ];
 /**
  * plain Token that will not be parsed further

package/dist/src/attribute.d.ts

@@ -3,7 +3,6 @@ import { Token } from './index';
 import { AtomToken } from './atom';
 import type { LintError } from '../base';
 import type { AttributesToken } from '../internal';
-declare type Child = AtomToken | AttributeToken | undefined;
 export type AttributeTypes = 'ext-attr' | 'html-attr' | 'table-attr';
 /**
  * attribute of extension and HTML tags
@@ -18,8 +17,8 @@ export declare abstract class AttributeToken extends Token {
     abstract get firstChild(): AtomToken;
     abstract get lastChild(): Token;
     abstract get parentNode(): AttributesToken | undefined;
-    abstract get nextSibling(): Child;
-    abstract get previousSibling(): Child;
+    abstract get nextSibling(): AtomToken | this | undefined;
+    abstract get previousSibling(): AtomToken | this | undefined;
     get type(): AttributeTypes;
     /** tag name / 标签名 */
     get tag(): string;
@@ -42,4 +41,3 @@ export declare abstract class AttributeToken extends Token {
     getValue(): string | true;
     escape(): void;
 }
-export {};

package/dist/src/attribute.js

@@ -44,7 +44,7 @@ class AttributeToken extends index_2.Token {
     }
     /** whether the quotes are balanced / 引号是否匹配 */
     get balanced() {
-        return !this.#equal || this.#quotes[0] === this.#quotes[1];
+        LINT: return !this.#equal || this.#quotes[0] === this.#quotes[1]; // eslint-disable-line no-unused-labels
     }
     /**
      * @param type 标签类型
@@ -63,6 +63,7 @@ class AttributeToken extends index_2.Token {
             valueToken.setAttribute('stage', constants_1.MAX_STAGE - 1);
         }
         else if (tag === 'gallery' && key === 'caption'
+            || tag === 'ref' && key === 'details'
             || tag === 'choose' && (key === 'before' || key === 'after')) {
             const newConfig = {
                 ...config,
@@ -83,6 +84,10 @@ class AttributeToken extends index_2.Token {
         this.#tag = tag;
         this.setAttribute('name', (0, string_1.trimLc)((0, string_1.removeComment)(key)));
     }
+    /** 更新name */
+    #setName() {
+        this.setAttribute('name', (0, string_1.trimLc)(this.firstChild.text()));
+    }
     /** @private */
     afterBuild() {
         if (this.#equal.includes('\0')) {
@@ -91,7 +96,7 @@ class AttributeToken extends index_2.Token {
         if (this.parentNode) {
             this.#tag = this.parentNode.name;
         }
-        this.setAttribute('name', (0, string_1.trimLc)(this.firstChild.text()));
+        this.#setName();
         super.afterBuild();
     }
     /** @private */

package/dist/src/attributes.d.ts

@@ -6,7 +6,6 @@ import type { ExtToken, HtmlToken, SyntaxToken } from '../internal';
 import type { AttributeTypes } from './attribute';
 import type { TableTokens } from './table/index';
 declare type AttributesTypes = `${AttributeTypes}s`;
-declare type Child = AtomToken | AttributeToken;
 /**
  * attributes of extension and HTML tags
  *
@@ -16,9 +15,9 @@ declare type Child = AtomToken | AttributeToken;
 export declare abstract class AttributesToken extends Token {
     #private;
     readonly name: string;
-    readonly childNodes: readonly Child[];
-    abstract get firstChild(): Child | undefined;
-    abstract get lastChild(): Child | undefined;
+    readonly childNodes: readonly (AtomToken | AttributeToken)[];
+    abstract get firstChild(): AtomToken | AttributeToken | undefined;
+    abstract get lastChild(): AtomToken | AttributeToken | undefined;
     abstract get parentNode(): ExtToken | HtmlToken | TableTokens | undefined;
     abstract get previousSibling(): SyntaxToken | undefined;
     get type(): AttributesTypes;

package/dist/src/attributes.js

@@ -112,8 +112,10 @@ class AttributesToken extends index_2.Token {
      * @param key attribute name / 属性名
      */
     getAttrToken(key) {
-        const tokens = this.getAttrTokens(key);
-        return tokens[tokens.length - 1];
+        LINT: { // eslint-disable-line no-unused-labels
+            const tokens = this.getAttrTokens(key);
+            return tokens[tokens.length - 1];
+        }
     }
     /**
      * Get the attribute
@@ -122,7 +124,7 @@ class AttributesToken extends index_2.Token {
      * @param key attribute name / 属性键
      */
     getAttr(key) {
-        return this.getAttrToken(key)?.getValue();
+        LINT: return this.getAttrToken(key)?.getValue(); // eslint-disable-line no-unused-labels
     }
     /** 是否位于闭合标签内 */
     #lint() {

package/dist/src/commented.d.ts

@@ -7,9 +7,9 @@ import type { AstText, AttributesToken, ExtToken } from '../internal';
  * @classdesc `{childNodes: (AstText|CommentToken)[]}`
  */
 export declare abstract class CommentedToken extends Token {
-    readonly childNodes: readonly (AstText | CommentToken)[];
-    abstract get firstChild(): AstText | CommentToken | undefined;
-    abstract get lastChild(): AstText | CommentToken | undefined;
+    readonly childNodes: readonly (CommentToken | AstText)[];
+    abstract get firstChild(): CommentToken | AstText | undefined;
+    abstract get lastChild(): CommentToken | AstText | undefined;
     abstract get nextSibling(): undefined;
     abstract get previousSibling(): AttributesToken | undefined;
     abstract get parentNode(): ExtToken | undefined;