wikilint 2.5.1 → 2.5.3

package/config/default.json

@@ -830,8 +830,7 @@
 		"page=$1": "page",
 		"page $1": "page",
 		"页数=$1": "page",
-		"$1页": "page",
-		"lossy=$1": "lossy"
+		"$1页": "page"
 	},
 	"variants": [
 		"zh",

package/config/enwiki.json

@@ -404,8 +404,7 @@
 		"text-bottom": "text-bottom",
 		"lang=$1": "lang",
 		"page=$1": "page",
-		"page $1": "page",
-		"lossy=$1": "lossy"
+		"page $1": "page"
 	},
 	"variants": []
 }

package/dist/lib/text.js

@@ -83,8 +83,18 @@ class AstText extends node_1.AstNode {
         if (!parentNode) {
             return [];
         }
+        const { type, name, parentNode: grandparent } = parentNode, nowiki = name === 'nowiki' || name === 'pre';
+        let isHtmlAttrVal = false;
+        if (type === 'attr-value') {
+            const { type: grandType, name: grandName, tag } = grandparent;
+            if (grandType !== 'ext-attr') {
+                isHtmlAttrVal = true;
+            }
+            else if (tag === 'choose' && (grandName === 'before' || grandName === 'after')) {
+                return [];
+            }
+        }
         const { NowikiToken } = require('../src/nowiki');
-        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');

package/dist/lib/title.d.ts

@@ -1,9 +1,15 @@
 import Parser from '../index';
 /** MediaWiki页面标题对象 */
 export declare class Title {
+    #private;
     readonly valid: boolean;
     ns: number;
     fragment: string | undefined;
+    /** 不含命名空间的标题主体部分 */
+    get main(): string;
+    set main(title: string);
+    /** 扩展名 */
+    get extension(): string | undefined;
     /**
      * @param title 标题（含或不含命名空间前缀）
      * @param defaultNs 命名空间

package/dist/lib/title.js

@@ -10,6 +10,20 @@ class Title {
     fragment;
     /** @private */
     encoded = false;
+    #main;
+    /** 不含命名空间的标题主体部分 */
+    get main() {
+        return this.#main;
+    }
+    set main(title) {
+        title = title.replace(/_/gu, ' ').trim();
+        this.#main = title && `${title[0].toUpperCase()}${title.slice(1)}`;
+    }
+    /** 扩展名 */
+    get extension() {
+        const { main } = this, i = main.lastIndexOf('.');
+        return i === -1 ? undefined : main.slice(i + 1).toLowerCase();
+    }
     /**
      * @param title 标题（含或不含命名空间前缀）
      * @param defaultNs 命名空间
@@ -61,6 +75,7 @@ class Title {
         }
         this.valid = Boolean(title || this.interwiki || selfLink && this.fragment !== undefined)
             && !/^:|\0\d+[eh!+-]\x7F|[<>[\]{}|]|%[\da-f]{2}/iu.test(title);
+        this.main = title;
     }
 }
 exports.Title = Title;

package/dist/parser/list.js

@@ -22,8 +22,8 @@ const parseList = (wikitext, config = index_1.default.getConfig(), accum = []) =
     if (!dt) {
         return text;
     }
-    const { html: [normalTags] } = config, fullRegex = /:+|-\{|\0\d+x\x7F/gu;
-    let regex = fullRegex, ex = regex.exec(text), lt = 0, lc = 0;
+    const { html: [normalTags] } = config, fullRegex = /:+|-\{|\0\d+[xq]\x7F/gu;
+    let regex = fullRegex, ex = regex.exec(text), lt = 0, lb = false, li = false, lc = 0;
     /**
      * 创建`DdToken`
      * @param syntax `:`
@@ -34,6 +34,18 @@ const parseList = (wikitext, config = index_1.default.getConfig(), accum = []) =
         new dd_1.DdToken(syntax, config, accum);
         return `${text.slice(0, index)}\0${accum.length - 1}d\x7F${text.slice(index + syntax.length)}`;
     };
+    /**
+     * 更新 `lt`
+     * @param closing 是否是闭合标签
+     */
+    const update = (closing) => {
+        if (!closing) {
+            lt++;
+        }
+        else if (lt) {
+            lt--;
+        }
+    };
     while (ex && dt) {
         const { 0: syntax, index } = ex;
         if (syntax === '-{') {
@@ -52,15 +64,21 @@ const parseList = (wikitext, config = index_1.default.getConfig(), accum = []) =
                 regex.lastIndex = lastIndex;
             }
         }
-        else if (syntax.startsWith('\0')) {
+        else if (syntax.endsWith('x\x7F')) {
             const { name, closing, selfClosing } = accum[Number(syntax.slice(1, -2))];
             if (!selfClosing || normalTags.includes(name)) {
-                if (!closing) {
-                    lt++;
-                }
-                else if (lt) {
-                    lt--;
-                }
+                update(closing);
+            }
+        }
+        else if (syntax.endsWith('q\x7F')) {
+            const { bold, italic } = accum[Number(syntax.slice(1, -2))];
+            if (bold) {
+                update(lb);
+                lb = !lb;
+            }
+            if (italic) {
+                update(li);
+                li = !li;
             }
         }
         else if (lt === 0) { // syntax === ':'

package/dist/src/attribute.d.ts

@@ -18,6 +18,8 @@ export declare abstract class AttributeToken extends Token {
     abstract get parentNode(): AttributesToken | undefined;
     abstract get nextSibling(): AtomToken | this | undefined;
     abstract get previousSibling(): AtomToken | this | undefined;
+    /** 标签名 */
+    get tag(): string;
     /** 引号是否匹配 */
     get balanced(): boolean;
     /**

package/dist/src/attribute.js

@@ -178,7 +178,7 @@ class AttributeToken extends index_2.Token {
     #tag;
     #equal;
     #quotes;
-    /** @private */
+    /** 标签名 */
     get tag() {
         return this.#tag;
     }

package/dist/src/imageParameter.d.ts

@@ -15,7 +15,7 @@ export declare abstract class ImageParameterToken extends Token {
     /** 图片链接 */
     get link(): string | Title | undefined;
     /** @param str 图片参数 */
-    constructor(str: string, config?: Parser.Config, accum?: Token[]);
+    constructor(str: string, extension: string | undefined, config?: Parser.Config, accum?: Token[]);
     /** @override */
     text(): string;
     /** @override */

package/dist/src/imageParameter.js

@@ -6,7 +6,7 @@ const lint_1 = require("../util/lint");
 const index_1 = require("../index");
 const index_2 = require("./index");
 exports.galleryParams = new Set(['alt', 'link', 'lang', 'page', 'caption']);
-function validate(key, val, config = index_1.default.getConfig(), halfParsed = false) {
+function validate(key, val, config, halfParsed = false, ext) {
     val = val.trim();
     let value = val.replace(/\0\d+t\x7F/gu, '').trim();
     switch (key) {
@@ -29,11 +29,13 @@ function validate(key, val, config = index_1.default.getConfig(), halfParsed = f
             return title.valid && title;
         }
         case 'lang':
-            return !value || config.variants.includes(value);
+            return (ext === 'svg' || ext === 'svgz') && !/[^a-z\d-]/u.test(value);
         case 'alt':
         case 'class':
         case 'manualthumb':
             return true;
+        case 'page':
+            return (ext === 'djvu' || ext === 'djv') && Number(value) > 0;
         default:
             return !Number.isNaN(Number(value));
     }
@@ -47,7 +49,7 @@ class ImageParameterToken extends index_2.Token {
         return this.name === 'link' ? validate('link', super.text(), this.getAttribute('config')) : undefined;
     }
     /** @param str 图片参数 */
-    constructor(str, config = index_1.default.getConfig(), accum = []) {
+    constructor(str, extension, config = index_1.default.getConfig(), accum = []) {
         let mt;
         const regexes = Object.entries(config.img).map(([syntax, param]) => [
             syntax,
@@ -56,7 +58,8 @@ class ImageParameterToken extends index_2.Token {
         ]), param = regexes.find(([, key, regex]) => {
             mt = regex.exec(str);
             return mt
-                && (mt.length !== 4 || validate(key, mt[2], config, true) !== false);
+                && (mt.length !== 4
+                    || validate(key, mt[2], config, true, extension) !== false);
         });
         // @ts-expect-error mt already assigned
         if (param && mt) {

package/dist/src/link/base.js

@@ -114,8 +114,8 @@ class LinkBaseToken extends index_2.Token {
         return errors;
     }
     /** @private */
-    getTitle() {
-        return this.normalizeTitle(this.firstChild.text(), 0, false, true, true);
+    getTitle(halfParsed = false) {
+        return this.normalizeTitle(this.firstChild.text(), 0, halfParsed, true, true);
     }
 }
 exports.LinkBaseToken = LinkBaseToken;

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

@@ -12,6 +12,8 @@ export declare abstract class FileToken extends LinkBaseToken {
     readonly type: 'file' | 'gallery-image' | 'imagemap-image';
     readonly childNodes: readonly [AtomToken, ...ImageParameterToken[]];
     abstract get lastChild(): AtomToken | ImageParameterToken;
+    /** 扩展名 */
+    get extension(): string | undefined;
     /**
      * @param link 文件名
      * @param text 图片参数

package/dist/src/link/file.js

@@ -40,6 +40,10 @@ const explode = (start, end, separator, str) => {
  */
 class FileToken extends base_1.LinkBaseToken {
     type = 'file';
+    /** 扩展名 */
+    get extension() {
+        return this.getTitle().extension;
+    }
     /**
      * @param link 文件名
      * @param text 图片参数
@@ -47,9 +51,10 @@ class FileToken extends base_1.LinkBaseToken {
      */
     constructor(link, text, config = index_1.default.getConfig(), accum = [], delimiter = '|') {
         super(link, undefined, config, accum, delimiter);
+        const { extension } = this.getTitle(true);
         this.append(...explode('-{', '}-', '|', text).map(
         // @ts-expect-error abstract class
-        part => new imageParameter_1.ImageParameterToken(part, config, accum)));
+        part => new imageParameter_1.ImageParameterToken(part, extension, config, accum)));
     }
     /** @override */
     lint(start = this.getAbsoluteIndex()) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.5.1",
+	"version": "2.5.3",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -43,15 +43,17 @@
 		"test:end": "pkill -x http-server",
 		"test:real": "node dist/test/real.js"
 	},
+	"dependencies": {
+		"chalk": "^4.1.2"
+	},
 	"devDependencies": {
 		"@cypress/request": "^3.0.1",
 		"@stylistic/eslint-plugin": "^1.5.4",
 		"@types/node": "^20.11.6",
 		"@types/request": "^2.48.12",
-		"@typescript-eslint/eslint-plugin": "^6.19.1",
-		"@typescript-eslint/parser": "^6.19.1",
+		"@typescript-eslint/eslint-plugin": "^7.1.0",
+		"@typescript-eslint/parser": "^7.1.0",
 		"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",
@@ -60,7 +62,7 @@
 		"eslint-plugin-n": "^16.6.2",
 		"eslint-plugin-promise": "^6.1.1",
 		"eslint-plugin-regexp": "^2.2.0",
-		"eslint-plugin-unicorn": "^50.0.1",
+		"eslint-plugin-unicorn": "^51.0.1",
 		"typescript": "^5.3.3"
 	},
 	"engines": {