wikilint 2.21.0 → 2.21.1

package/config/default.json

@@ -672,6 +672,7 @@
 			"urlエンコード": "urlencode",
 			"ｕｒｌエンコード：": "urlencode",
 			"urlencode": "urlencode",
+			"#urlencode": "urlencode",
 			"小写首字": "lcfirst",
 			"先頭小文字": "lcfirst",
 			"lcfirst": "lcfirst",

package/config/minimum.json

@@ -105,6 +105,7 @@
 			"servername": "servername",
 			"scriptpath": "scriptpath",
 			"stylepath": "stylepath",
+			"#urlencode": "urlencode",
 			"#language": "language",
 			"#special": "special",
 			"#speciale": "speciale",

package/config/moegirl.json

@@ -435,6 +435,7 @@
 			"nse": "nse",
 			"url编码": "urlencode",
 			"urlencode": "urlencode",
+			"#urlencode": "urlencode",
 			"小写首字": "lcfirst",
 			"lcfirst": "lcfirst",
 			"大写首字": "ucfirst",

package/dist/parser/list.js

@@ -40,7 +40,7 @@ const parseList = (wikitext, state, config, accum) => {
     if (!dt) {
         return text;
     }
-    const { html: [normalTags] } = config, fullRegex = /:+|-\{|\0\d+[xq]\x7F/gu;
+    const { html: [normalTags, , voidTags] } = config, fullRegex = /:+|-\{|\0\d+[xq]\x7F/gu;
     let regex = fullRegex, ex = regex.exec(text), lt = 0, lb = false, li = false, lc = 0;
     /**
      * 创建`DdToken`
@@ -84,7 +84,7 @@ const parseList = (wikitext, state, config, accum) => {
         }
         else if (syntax.endsWith('x\x7F')) {
             const { name, closing, selfClosing } = accum[Number(syntax.slice(1, -2))];
-            if (!selfClosing || normalTags.includes(name)) {
+            if (normalTags.includes(name) || !selfClosing && !voidTags.includes(name)) {
                 update(closing);
             }
         }

package/dist/src/attribute.js

@@ -96,17 +96,13 @@ class AttributeToken extends index_2.Token {
     getGaps() {
         return this.#equal ? this.#equal.length + (this.#quotes[0]?.length ?? 0) : 0;
     }
-    /** @private */
-    lint(start = this.getAbsoluteIndex(), re) {
-        const errors = super.lint(start, re), { balanced, firstChild, lastChild, type, name, tag } = this, value = this.getValue(), rect = new rect_1.BoundingRect(this, start);
-        if (!balanced) {
-            const e = (0, lint_1.generateForChild)(lastChild, rect, 'unclosed-quote', index_1.default.msg('unclosed $1', 'quotes'), 'warning');
-            e.startIndex--;
-            e.startCol--;
-            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], { length } = this.toString();
+    /**
+     * 判定无效的属性名或值
+     * @param start 起始位置
+     * @param rect 位置
+     */
+    #lint(start, rect) {
+        const { firstChild, lastChild, type, name, tag } = this, value = this.getValue(), attrs = sharable_1.extAttrs[tag], attrs2 = sharable_1.htmlAttrs[tag], { length } = this.toString();
         if (!attrs?.has(name)
             && !attrs2?.has(name)
             // 不是未定义的扩展标签或包含嵌入的HTML标签
@@ -116,10 +112,10 @@ class AttributeToken extends index_2.Token {
                     && (tag === 'meta' || tag === 'link' || !sharable_1.commonHtmlAttrs.has(name)))) {
             const e = (0, lint_1.generateForChild)(firstChild, rect, 'illegal-attr', 'illegal attribute name');
             e.suggestions = [{ desc: 'remove', range: [start, start + length], text: '' }];
-            errors.push(e);
+            return e;
         }
         else if (name === 'style' && typeof value === 'string' && insecureStyle.test(value)) {
-            errors.push((0, lint_1.generateForChild)(lastChild, rect, 'insecure-style', 'insecure style'));
+            return (0, lint_1.generateForChild)(lastChild, rect, 'insecure-style', 'insecure style');
         }
         else if (name === 'tabindex' && typeof value === 'string' && value !== '0') {
             const e = (0, lint_1.generateForChild)(lastChild, rect, 'illegal-attr', 'nonzero tabindex');
@@ -127,14 +123,30 @@ class AttributeToken extends index_2.Token {
                 { desc: 'remove', range: [start, start + length], text: '' },
                 { desc: '0 tabindex', range: [e.startIndex, e.endIndex], text: '0' },
             ];
-            errors.push(e);
+            return e;
         }
         else if (type !== 'ext-attr' && !lastChild.childNodes.some(({ type: t }) => complexTypes.has(t))) {
             const data = (0, lint_1.provideValues)(tag, name), v = String(value).toLowerCase();
             if (data.length > 0 && data.every(n => n !== v)) {
-                errors.push((0, lint_1.generateForChild)(lastChild, rect, 'illegal-attr', 'illegal attribute value', 'warning'));
+                return (0, lint_1.generateForChild)(lastChild, rect, 'illegal-attr', 'illegal attribute value', 'warning');
             }
         }
+        return false;
+    }
+    /** @private */
+    lint(start = this.getAbsoluteIndex(), re) {
+        const errors = super.lint(start, re), { balanced, firstChild, lastChild, name, tag } = this, rect = new rect_1.BoundingRect(this, start);
+        if (!balanced) {
+            const e = (0, lint_1.generateForChild)(lastChild, rect, 'unclosed-quote', index_1.default.msg('unclosed $1', 'quotes'), 'warning');
+            e.startIndex--;
+            e.startCol--;
+            e.suggestions = [{ range: [e.endIndex, e.endIndex], text: this.#quotes[0], desc: 'close' }];
+            errors.push(e);
+        }
+        const e = this.#lint(start, rect);
+        if (e) {
+            errors.push(e);
+        }
         if (sharable_1.obsoleteAttrs[tag]?.has(name)) {
             errors.push((0, lint_1.generateForChild)(firstChild, rect, 'obsolete-attr', 'obsolete attribute', 'warning'));
         }

package/dist/src/attributes.js

@@ -114,10 +114,15 @@ class AttributesToken extends index_2.Token {
     getAttr(key) {
         return this.getAttrToken(key)?.getValue();
     }
+    /** 是否位于闭合标签内 */
+    #lint() {
+        const { parentNode } = this;
+        return parentNode?.type === 'html' && parentNode.closing && this.text().trim() !== '';
+    }
     /** @private */
     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()) {
+        if (this.#lint()) {
             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: '' },

package/dist/src/converterFlags.js

@@ -102,6 +102,12 @@ let ConverterFlagsToken = (() => {
             return new Set(this.#flags.filter(flag => variants.has(flag)));
         }
         /** @private */
+        // eslint-disable-next-line @typescript-eslint/class-methods-use-this
+        isInvalidFlag(flag, variant, unknown, valid) {
+            // @ts-expect-error flag is string
+            return Boolean(flag) && !variant.has(flag) && !unknown.has(flag) && (variant.size > 0 || !valid.has(flag));
+        }
+        /** @private */
         lint(start = this.getAbsoluteIndex(), re) {
             const variantFlags = this.getVariantFlags(), unknownFlags = this.getUnknownFlags(), validFlags = new Set(this.#flags.filter(flag => definedFlags.has(flag))), emptyFlagCount = this.#flags.filter(flag => !flag).length, knownFlagCount = this.#flags.length - unknownFlags.size - emptyFlagCount, errors = super.lint(start, re);
             if (variantFlags.size === knownFlagCount || validFlags.size === knownFlagCount) {
@@ -110,10 +116,7 @@ let ConverterFlagsToken = (() => {
             const rect = new rect_1.BoundingRect(this, start);
             for (let i = 0; i < this.length; i++) {
                 const child = this.childNodes[i], flag = child.text().trim();
-                if (flag
-                    && !variantFlags.has(flag)
-                    && !unknownFlags.has(flag)
-                    && (variantFlags.size > 0 || !validFlags.has(flag))) {
+                if (this.isInvalidFlag(flag, variantFlags, unknownFlags, validFlags)) {
                     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(), desc: 'uppercase' };

package/dist/src/heading.js

@@ -62,7 +62,7 @@ class HeadingToken extends index_2.Token {
     }
     /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
-        const errors = super.lint(start, re), { firstChild, level } = this, innerStr = firstChild.toString(), 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);
+        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), s = this.inHtmlAttrs();
         if (this.level === 1) {
             const e = (0, lint_1.generateForChild)(firstChild, rect, 'h1', '<h1>');
             if (!unbalanced) {
@@ -91,8 +91,8 @@ class HeadingToken extends index_2.Token {
             }
             errors.push(e);
         }
-        if (this.closest('html-attrs,table-attrs')) {
-            errors.push((0, lint_1.generateForSelf)(this, rect, 'parsing-order', 'section header in an HTML tag'));
+        if (s) {
+            errors.push((0, lint_1.generateForSelf)(this, rect, 'parsing-order', 'section header in an HTML tag', s));
         }
         const rootStr = this.getRootNode().toString();
         if (boldQuotes.length % 2) {

package/dist/src/html.js

@@ -134,15 +134,17 @@ 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);
+            const errors = super.lint(start, re), { name, parentNode, closing, selfClosing } = this, rect = new rect_1.BoundingRect(this, start), s = this.inTableAttrs();
             if (name === 'h1' && !closing) {
                 const e = (0, lint_1.generateForSelf)(this, rect, 'h1', '<h1>');
                 e.suggestions = [{ desc: 'h2', range: [start + 2, start + 3], text: '2' }];
                 errors.push(e);
             }
-            if (this.closest('table-attrs')) {
-                const e = (0, lint_1.generateForSelf)(this, rect, 'parsing-order', 'HTML tag in table attributes');
-                e.fix = { desc: 'remove', range: [start, e.endIndex], text: '' };
+            if (s) {
+                const e = (0, lint_1.generateForSelf)(this, rect, 'parsing-order', 'HTML tag in table attributes', s);
+                if (s === 'error') {
+                    e.fix = { desc: 'remove', range: [start, e.endIndex], text: '' };
+                }
                 errors.push(e);
             }
             if (obsoleteTags.has(name)) {

package/dist/src/index.js

@@ -11,7 +11,7 @@
 // 6. 内链，含文件和分类，参见Parser::handleInternalLinks2
 // 7. `'`，参见Parser::doQuotes
 // 8. 外链，参见Parser::handleExternalLinks
-// 9. ISBN、RFC（未来将废弃，不予支持）和自由外链，参见Parser::handleMagicLinks
+// 9. ISBN、RFC和自由外链，参见Parser::handleMagicLinks
 // 10. 段落和列表，参见BlockLevelPass::execute
 // 11. 转换，参见LanguageConverter::recursiveConvertTopLevel
 // \0\d+.\x7F标记Token：
@@ -354,6 +354,14 @@ class Token extends element_1.AstElement {
         return index_1.default.normalizeTitle(title, defaultNs, this.#include, this.#config, opt);
     }
     /** @private */
+    inTableAttrs() {
+        return this.closest('table-attrs,ext')?.type === 'table-attrs' && (this.closest('table-attrs,arg,magic-word,template')?.type === 'table-attrs' ? 'error' : 'warning');
+    }
+    /** @private */
+    inHtmlAttrs() {
+        return this.closest('html-attrs,ext')?.type === 'html-attrs' ? 'error' : this.inTableAttrs();
+    }
+    /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
         let errors = super.lint(start, re);
         if (this.type === 'root') {

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

@@ -9,6 +9,7 @@ declare type GalleryTypes = 'gallery' | 'imagemap';
  * 图库图片
  */
 export declare abstract class GalleryImageToken extends FileToken {
+    #private;
     get type(): `${GalleryTypes}-image`;
     /**
      * @param type 图片类型

package/dist/src/link/galleryImage.js

@@ -89,10 +89,16 @@ let GalleryImageToken = (() => {
             const imagemap = this.type === 'imagemap-image';
             return this.normalizeTitle(this.firstChild.toString(), imagemap ? 0 : 6, { halfParsed: true, temporary, decode: !imagemap });
         }
+        /** 判定无效的图片 */
+        #lint() {
+            const { ns, } = this.getAttribute('title');
+            // eslint-disable-next-line @stylistic/semi
+            return ns !== 6;
+        }
         /** @private */
         lint(start = this.getAbsoluteIndex(), re) {
-            const errors = super.lint(start, re), { ns, } = this.getAttribute('title');
-            if (ns !== 6) {
+            const errors = super.lint(start, re);
+            if (this.#lint()) {
                 const e = (0, lint_1.generateForSelf)(this, { start }, 'invalid-gallery', 'invalid gallery image');
                 e.suggestions = [{ desc: 'prefix', range: [start, start], text: 'File:' }];
                 errors.push(e);

package/dist/src/magicLink.js

@@ -53,19 +53,27 @@ class MagicLinkToken extends index_2.Token {
         super(url, config, accum, {});
         this.#type = type;
     }
-    /** @private */
-    lint(start = this.getAbsoluteIndex(), re) {
-        const errors = super.lint(start, re), rect = new rect_1.BoundingRect(this, start), { type, childNodes } = this;
-        if (type === 'magic-link') {
+    /** 判定无效的ISBN */
+    #lint() {
+        if (this.type === 'magic-link') {
             const { link } = this;
             if (link.startsWith('ISBN')) {
                 // eslint-disable-next-line unicorn/no-useless-spread, @typescript-eslint/no-misused-spread
                 const digits = [...link.slice(5)].map(s => s === 'X' ? 10 : Number(s));
-                if (digits.length === 10 && digits.reduce((sum, d, i) => sum + d * (10 - i), 0) % 11
-                    || digits.length === 13 && (digits[12] === 10
-                        || digits.reduce((sum, d, i) => sum + d * (i % 2 ? 3 : 1), 0) % 10)) {
-                    errors.push((0, lint_1.generateForSelf)(this, rect, 'invalid-isbn', 'invalid ISBN'));
-                }
+                return digits.length === 10
+                    ? digits.reduce((sum, d, i) => sum + d * (10 - i), 0) % 11 !== 0
+                    : digits.length === 13 && (digits[12] === 10
+                        || digits.reduce((sum, d, i) => sum + d * (i % 2 ? 3 : 1), 0) % 10 !== 0);
+            }
+        }
+        return false;
+    }
+    /** @private */
+    lint(start = this.getAbsoluteIndex(), re) {
+        const errors = super.lint(start, re), rect = new rect_1.BoundingRect(this, start), { type, childNodes } = this;
+        if (type === 'magic-link') {
+            if (this.#lint()) {
+                errors.push((0, lint_1.generateForSelf)(this, rect, 'invalid-isbn', 'invalid ISBN'));
             }
             return errors;
         }
@@ -99,7 +107,7 @@ class MagicLinkToken extends index_2.Token {
                         .getUrl(articlePath);
                 }
                 link = link.startsWith('RFC')
-                    ? `https://tools.ietf.org/html/rfc${link.slice(4)}`
+                    ? `https://datatracker.ietf.org/doc/html/rfc${link.slice(4)}`
                     : `https://pubmed.ncbi.nlm.nih.gov/${link.slice(5)}`;
             }
             else if (link.startsWith('//')) {

package/dist/src/nowiki/index.d.ts

@@ -7,6 +7,7 @@ import type { AttributesToken, ExtToken } from '../../internal';
  * 扩展标签内的纯文字Token
  */
 export declare abstract class NowikiToken extends NowikiBaseToken {
+    #private;
     readonly name: string;
     abstract get nextSibling(): undefined;
     abstract get previousSibling(): AttributesToken | undefined;

package/dist/src/nowiki/index.js

@@ -19,10 +19,15 @@ class NowikiToken extends base_1.NowikiBaseToken {
     get type() {
         return 'ext-inner';
     }
+    /** 扩展标签内的无效内容 */
+    #lint() {
+        const { name, firstChild: { data } } = this;
+        return voidExt.has(name) && Boolean(data);
+    }
     /** @private */
     lint(start = this.getAbsoluteIndex()) {
-        const { name, firstChild: { data } } = this;
-        if (voidExt.has(name) && data) {
+        const { name } = this;
+        if (this.#lint()) {
             const e = (0, lint_1.generateForSelf)(this, { start }, 'void-ext', index_1.default.msg('nothing should be in <$1>', name));
             e.fix = { range: [start, e.endIndex], text: '', desc: 'empty' };
             return [e];

package/dist/src/table/trBase.js

@@ -4,34 +4,6 @@ exports.TrBaseToken = void 0;
 const lint_1 = require("../../util/lint");
 const base_1 = require("./base");
 const td_1 = require("./td");
-const tableTags = new Set(['tr', 'td', 'th', 'caption']), tableTemplates = new Set(['Template:!!', 'Template:!-']);
-/**
- * Check if the content is fostered
- * @param token
- */
-const isFostered = (token) => {
-    const first = token.childNodes.find(child => child.text().trim());
-    if (!first
-        || first.type === 'text' && first.data.trim().startsWith('!')
-        || first.type === 'magic-word' && first.name === '!'
-        || first.type === 'template' && tableTemplates.has(first.name)
-        || first.is('html') && tableTags.has(first.name)) {
-        return false;
-    }
-    else if (first.is('arg')) {
-        return first.length > 1 && isFostered(first.childNodes[1]);
-    }
-    else if (first.is('magic-word')) {
-        try {
-            const severity = first.getPossibleValues().map(isFostered);
-            return severity.includes('error')
-                ? 'error'
-                : severity.includes('warning') && 'warning';
-        }
-        catch { }
-    }
-    return first.type === 'template' || first.type === 'magic-word' && first.name === 'invoke' ? 'warning' : 'error';
-};
 /**
  * table row or table
  *
@@ -44,7 +16,7 @@ class TrBaseToken extends base_1.TableBaseToken {
         if (!inter) {
             return errors;
         }
-        const severity = isFostered(inter);
+        const severity = (0, lint_1.isFostered)(inter);
         if (!severity) {
             return errors;
         }

package/dist/src/tagPair/ext.js

@@ -185,8 +185,11 @@ let ExtToken = (() => {
         /** @private */
         lint(start = this.getAbsoluteIndex(), re) {
             const errors = super.lint(start, re), rect = new rect_1.BoundingRect(this, start);
-            if (this.name !== 'nowiki' && this.closest('html-attrs,table-attrs')) {
-                errors.push((0, lint_1.generateForSelf)(this, rect, 'parsing-order', 'extension tag in HTML tag attributes'));
+            if (this.name !== 'nowiki') {
+                const s = this.inHtmlAttrs();
+                if (s) {
+                    errors.push((0, lint_1.generateForSelf)(this, rect, 'parsing-order', 'extension tag in HTML tag attributes', s));
+                }
             }
             if (this.name === 'ref' && this.closest('heading-title')) {
                 errors.push((0, lint_1.generateForSelf)(this, rect, 'var-anchor', 'variable anchor in a section header'));

package/dist/util/lint.js

@@ -3,10 +3,39 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.provideValues = exports.cache = exports.generateForSelf = exports.generateForChild = exports.getEndPos = void 0;
+exports.provideValues = exports.cache = exports.generateForSelf = exports.generateForChild = exports.getEndPos = exports.isFostered = void 0;
 const debug_1 = require("./debug");
 const rect_1 = require("../lib/rect");
 const index_1 = __importDefault(require("../index"));
+const tableTags = new Set(['tr', 'td', 'th', 'caption']), tableTemplates = new Set(['Template:!!', 'Template:!-']);
+/**
+ * Check if the content is fostered
+ * @param token
+ */
+const isFostered = (token) => {
+    const first = token.childNodes.find(child => child.text().trim());
+    if (!first
+        || first.type === 'text' && first.data.trim().startsWith('!')
+        || first.type === 'magic-word' && first.name === '!'
+        || first.type === 'template' && tableTemplates.has(first.name)
+        || first.is('html') && tableTags.has(first.name)) {
+        return false;
+    }
+    else if (first.is('arg')) {
+        return first.length > 1 && (0, exports.isFostered)(first.childNodes[1]);
+    }
+    else if (first.is('magic-word')) {
+        try {
+            const severity = first.getPossibleValues().map(exports.isFostered);
+            return severity.includes('error')
+                ? 'error'
+                : severity.includes('warning') && 'warning';
+        }
+        catch { }
+    }
+    return first.type === 'template' || first.type === 'magic-word' && first.name === 'invoke' ? 'warning' : 'error';
+};
+exports.isFostered = isFostered;
 /**
  * 计算结束位置
  * @param top 起始行

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.21.0",
+	"version": "2.21.1",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -77,14 +77,13 @@
 		"entities": "^6.0.0",
 		"mathjax": "^3.2.2",
 		"minimatch": "^10.0.1",
-		"stylelint": "^16.19.1",
+		"stylelint": "^16.20.0",
 		"vscode-css-languageservice": "^6.3.4",
 		"vscode-html-languageservice": "^5.3.3",
 		"vscode-json-languageservice": "^5.4.4"
 	},
 	"devDependencies": {
 		"@stylistic/eslint-plugin": "^3.1.0",
-		"@stylistic/stylelint-plugin": "^3.1.2",
 		"@types/color-name": "^2.0.0",
 		"@types/color-rgba": "^2.1.3",
 		"@types/mocha": "^10.0.10",
@@ -102,11 +101,10 @@
 		"eslint-plugin-promise": "^7.2.1",
 		"eslint-plugin-regexp": "^2.7.0",
 		"eslint-plugin-unicorn": "^56.0.1",
-		"http-server": "^14.1.1",
 		"mocha": "^11.1.0",
 		"nyc": "^17.1.0",
 		"typescript": "^5.8.2",
-		"v8r": "^4.2.1",
+		"v8r": "^5.0.0",
 		"vscode-languageserver-textdocument": "^1.0.12"
 	},
 	"engines": {