wikilint 2.12.7 → 2.13.0

package/config/default.json

@@ -704,6 +704,8 @@
 			"PAGELANGUAGE",
 			"=",
 			"#FORMAL",
+			"#bcp47",
+			"#dir",
 			"#timef",
 			"#timefl"
 		],
@@ -740,7 +742,9 @@
 			"静态重定向",
 			"靜態重新導向",
 			"NOGLOBAL",
-			"EXPECTED_UNCONNECTED_PAGE"
+			"禁用全域用户页",
+			"EXPECTED_UNCONNECTED_PAGE",
+			"EXPECTUNUSEDTEMPLATE"
 		],
 		{
 			"forcetoc": "forcetoc",
@@ -768,7 +772,9 @@
 			"目录": "toc",
 			"目錄": "toc",
 			"archivedtalk": "archivedtalk",
-			"notalk": "notalk"
+			"已存档讨论": "archivedtalk",
+			"notalk": "notalk",
+			"禁用讨论": "notalk"
 		}
 	],
 	"protocol": "bitcoin:|ftp://|ftps://|geo:|git://|gopher://|http://|https://|irc://|ircs://|magnet:|mailto:|matrix:|mms://|news:|nntp://|redis://|sftp://|sip:|sips:|sms:|ssh://|svn://|tel:|telnet://|urn:|worldwind://|xmpp:",

package/config/enwiki.json

@@ -120,6 +120,8 @@
 		"101": "Portal talk",
 		"118": "Draft",
 		"119": "Draft talk",
+		"126": "MOS",
+		"127": "MOS talk",
 		"710": "TimedText",
 		"711": "TimedText talk",
 		"828": "Module",
@@ -158,6 +160,8 @@
 		"portal talk": 101,
 		"draft": 118,
 		"draft talk": 119,
+		"mos": 126,
+		"mos talk": 127,
 		"timedtext": 710,
 		"timedtext talk": 711,
 		"module": 828,
@@ -333,6 +337,8 @@
 			"PAGELANGUAGE",
 			"=",
 			"#FORMAL",
+			"#bcp47",
+			"#dir",
 			"#timef",
 			"#timefl"
 		],
@@ -357,7 +363,8 @@
 			"NONEWSECTIONLINK",
 			"STATICREDIRECT",
 			"NOGLOBAL",
-			"EXPECTED_UNCONNECTED_PAGE"
+			"EXPECTED_UNCONNECTED_PAGE",
+			"EXPECTUNUSEDTEMPLATE"
 		],
 		{
 			"forcetoc": "forcetoc",

package/config/zhwiki.json

@@ -122,6 +122,8 @@
 		"103": "WikiProject talk",
 		"118": "Draft",
 		"119": "Draft talk",
+		"126": "MOS",
+		"127": "MOS talk",
 		"710": "TimedText",
 		"711": "TimedText talk",
 		"828": "Module",
@@ -260,6 +262,8 @@
 		"draft talk": 119,
 		"草稿讨论": 119,
 		"草稿討論": 119,
+		"mos": 126,
+		"mos talk": 127,
 		"timedtext": 710,
 		"timedtext talk": 711,
 		"module": 828,
@@ -646,6 +650,8 @@
 			"PAGELANGUAGE",
 			"=",
 			"#FORMAL",
+			"#bcp47",
+			"#dir",
 			"#timef",
 			"#timefl"
 		],
@@ -682,7 +688,9 @@
 			"静态重定向",
 			"靜態重新導向",
 			"NOGLOBAL",
-			"EXPECTED_UNCONNECTED_PAGE"
+			"禁用全域用户页",
+			"EXPECTED_UNCONNECTED_PAGE",
+			"EXPECTUNUSEDTEMPLATE"
 		],
 		{
 			"forcetoc": "forcetoc",
@@ -708,7 +716,11 @@
 			"無目錄": "notoc",
 			"toc": "toc",
 			"目录": "toc",
-			"目錄": "toc"
+			"目錄": "toc",
+			"archivedtalk": "archivedtalk",
+			"已存档讨论": "archivedtalk",
+			"notalk": "notalk",
+			"禁用讨论": "notalk"
 		}
 	],
 	"protocol": "bitcoin:|ftp://|ftps://|geo:|git://|gopher://|http://|https://|irc://|ircs://|magnet:|mailto:|matrix:|mms://|news:|nntp://|redis://|sftp://|sip:|sips:|sms:|ssh://|svn://|tel:|telnet://|urn:|worldwind://|xmpp:",

package/dist/base.d.ts

@@ -12,6 +12,33 @@ export interface Config {
     readonly excludes?: string[];
 }
 export type TokenTypes = 'root' | 'plain' | 'redirect' | 'redirect-syntax' | 'redirect-target' | 'onlyinclude' | 'noinclude' | 'include' | 'comment' | 'ext' | 'ext-attrs' | 'ext-attr-dirty' | 'ext-attr' | 'attr-key' | 'attr-value' | 'ext-inner' | 'arg' | 'arg-name' | 'arg-default' | 'hidden' | 'magic-word' | 'magic-word-name' | 'invoke-function' | 'invoke-module' | 'template' | 'template-name' | 'parameter' | 'parameter-key' | 'parameter-value' | 'heading' | 'heading-title' | 'heading-trail' | 'html' | 'html-attrs' | 'html-attr-dirty' | 'html-attr' | 'table' | 'tr' | 'td' | 'table-syntax' | 'table-attrs' | 'table-attr-dirty' | 'table-attr' | 'table-inter' | 'td-inner' | 'hr' | 'double-underscore' | 'link' | 'link-target' | 'link-text' | 'category' | 'file' | 'gallery-image' | 'imagemap-image' | 'image-parameter' | 'quote' | 'ext-link' | 'ext-link-text' | 'ext-link-url' | 'free-ext-link' | 'magic-link' | 'list' | 'dd' | 'list-range' | 'converter' | 'converter-flags' | 'converter-flag' | 'converter-rule' | 'converter-rule-variant' | 'converter-rule-to' | 'converter-rule-from' | 'param-line' | 'imagemap-link';
+export declare const stages: {
+    redirect: number;
+    onlyinclude: number;
+    noinclude: number;
+    include: number;
+    comment: number;
+    ext: number;
+    arg: number;
+    'magic-word': number;
+    template: number;
+    heading: number;
+    html: number;
+    table: number;
+    hr: number;
+    'double-underscore': number;
+    link: number;
+    category: number;
+    file: number;
+    quote: number;
+    'ext-link': number;
+    'free-ext-link': number;
+    'magic-link': number;
+    list: number;
+    dd: number;
+    converter: number;
+};
+export type Stage = keyof typeof stages;
 export declare const rules: readonly ["bold-header", "format-leakage", "fostered-content", "h1", "illegal-attr", "insecure-style", "invalid-gallery", "invalid-imagemap", "invalid-invoke", "invalid-isbn", "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';
@@ -63,6 +90,6 @@ export interface Parser {
      * @param include 是否嵌入
      * @param maxStage 最大解析层级
      */
-    parse(wikitext: string, include?: boolean, maxStage?: number, config?: Config): Token;
+    parse(wikitext: string, include?: boolean, maxStage?: number | Stage | Stage[], config?: Config): Token;
 }
 export {};

package/dist/base.js

@@ -1,6 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rules = void 0;
+exports.rules = exports.stages = void 0;
+exports.stages = {
+    redirect: 1,
+    onlyinclude: 1,
+    noinclude: 1,
+    include: 1,
+    comment: 1,
+    ext: 1,
+    arg: 2,
+    'magic-word': 2,
+    template: 2,
+    heading: 2,
+    html: 3,
+    table: 4,
+    hr: 5,
+    'double-underscore': 5,
+    link: 6,
+    category: 6,
+    file: 6,
+    quote: 7,
+    'ext-link': 8,
+    'free-ext-link': 9,
+    'magic-link': 9,
+    list: 10,
+    dd: 10,
+    converter: 11,
+};
+Object.setPrototypeOf(exports.stages, null);
 exports.rules = [
     'bold-header',
     'format-leakage',

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import type { Config, LintError, TokenTypes, Parser as ParserBase } from './base';
+import type { Config, LintError, TokenTypes, Parser as ParserBase, Stage } from './base';
 import type { Title } from './lib/title';
 import type { Token } from './internal';
 declare interface Parser extends ParserBase {
@@ -10,7 +10,7 @@ declare interface Parser extends ParserBase {
      * @param include 是否嵌入
      */
     normalizeTitle(title: string, defaultNs?: number, include?: boolean, config?: Config): Title;
-    parse(wikitext: string, include?: boolean, maxStage?: number, config?: Config): Token;
+    parse(wikitext: string, include?: boolean, maxStage?: number | Stage | Stage[], config?: Config): Token;
 }
 declare const Parser: Parser;
 // @ts-expect-error mixed export styles

package/dist/index.js

@@ -22,13 +22,13 @@ const Parser = {
     getConfig() {
         if (typeof this.config === 'string') {
             this.config = rootRequire(this.config, 'config');
+            if (this.config.doubleUnderscore.length < 3) {
+                (0, diff_1.error)(`The schema (${path.resolve(__dirname, '..', 'config', '.schema.json')}) of parser configuration is updated.`);
+            }
             return this.getConfig();
         }
         const { doubleUnderscore } = this.config;
-        if (doubleUnderscore.length === 2) {
-            (0, diff_1.error)(`The schema (${path.resolve(__dirname, '..', 'config', '.schema.json')}) of parser configuration is updated.`);
-        }
-        else if (doubleUnderscore[0].length === 0) {
+        if (doubleUnderscore.length > 2 && doubleUnderscore[0].length === 0) {
             doubleUnderscore[0] = Object.keys(doubleUnderscore[2]);
         }
         return {
@@ -78,6 +78,10 @@ const Parser = {
     /** @implements */
     parse(wikitext, include, maxStage = constants_1.MAX_STAGE, config = Parser.getConfig()) {
         wikitext = (0, string_1.tidy)(wikitext);
+        if (typeof maxStage !== 'number') {
+            const types = Array.isArray(maxStage) ? maxStage : [maxStage];
+            maxStage = Math.max(...types.map(t => base_1.stages[t] || constants_1.MAX_STAGE));
+        }
         const { Token } = require('./src/index');
         const root = debug_1.Shadow.run(() => {
             const token = new Token(wikitext, config);

package/dist/lib/element.js

@@ -3,15 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AstElement = void 0;
 const string_1 = require("../util/string");
 const debug_1 = require("../util/debug");
+const selector_1 = require("../parser/selector");
 const node_1 = require("./node");
-/**
- * 将选择器转化为类型谓词
- * @param selector 选择器
- */
-const getCondition = (selector) => (({ type, name }) => selector.split(',').some(str => {
-    const [t, ...ns] = str.trim().split('#');
-    return (!t || t === type) && ns.every(n => n === name);
-}));
 /** 类似HTMLElement */
 class AstElement extends node_1.AstNode {
     /** 子节点总数 */
@@ -64,7 +57,7 @@ class AstElement extends node_1.AstNode {
      * @param selector 选择器
      */
     closest(selector) {
-        const condition = getCondition(selector);
+        const condition = (0, selector_1.getCondition)(selector, this);
         let { parentNode } = this;
         while (parentNode) {
             if (condition(parentNode)) {
@@ -98,7 +91,7 @@ class AstElement extends node_1.AstNode {
      * @param selector 选择器
      */
     querySelector(selector) {
-        const condition = getCondition(selector);
+        const condition = (0, selector_1.getCondition)(selector, this);
         return this.#getElementBy(condition);
     }
     /**
@@ -123,7 +116,7 @@ class AstElement extends node_1.AstNode {
      * @param selector 选择器
      */
     querySelectorAll(selector) {
-        const condition = getCondition(selector);
+        const condition = (0, selector_1.getCondition)(selector, this);
         return this.#getElementsBy(condition);
     }
     /**

package/dist/lib/title.js

@@ -52,7 +52,6 @@ class Title {
      */
     constructor(title, defaultNs, config, decode, selfLink) {
         const subpage = title.trim().startsWith('../');
-        title = (0, string_1.decodeHtml)(title);
         if (decode && title.includes('%')) {
             try {
                 const encoded = /%(?!21|3[ce]|5[bd]|7[b-d])[\da-f]{2}/iu.test(title);
@@ -61,7 +60,7 @@ class Title {
             }
             catch { }
         }
-        title = title.replace(/[_ ]+/gu, ' ').trim();
+        title = (0, string_1.decodeHtml)(title).replace(/[_ ]+/gu, ' ').trim();
         if (subpage) {
             this.#ns = 0;
         }

package/dist/parser/selector.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCondition = void 0;
+/**
+ * 将选择器转化为类型谓词
+ * @param selector 选择器
+ * @param scope 作用对象
+ * @param has `:has()`伪选择器
+ */
+const getCondition = (selector, scope, has) => (({ type, name }) => selector.split(',').some(str => {
+    const [t, ...ns] = str.trim().split('#');
+    return (!t || t === type) && ns.every(n => n === name);
+}));
+exports.getCondition = getCondition;

package/dist/src/attributes.js

@@ -104,18 +104,7 @@ class AttributesToken extends index_2.Token {
             errors.push(e);
         }
         for (const attr of childNodes) {
-            if (attr instanceof atom_1.AtomToken && attr.text().trim()) {
-                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) {
+            if (attr instanceof attribute_1.AttributeToken) {
                 const { name } = attr;
                 if (attrs.has(name)) {
                     duplicated.add(name);
@@ -125,6 +114,20 @@ class AttributesToken extends index_2.Token {
                     attrs.set(name, [attr]);
                 }
             }
+            else {
+                const str = attr.text().trim();
+                if (str) {
+                    const e = (0, lint_1.generateForChild)(attr, rect, 'no-ignored', 'containing invalid attribute', /[\p{L}\d]/u.test(str) ? 'error' : 'warning');
+                    e.suggestions = [
+                        {
+                            desc: 'remove',
+                            range: [e.startIndex, e.endIndex],
+                            text: ' ',
+                        },
+                    ];
+                    errors.push(e);
+                }
+            }
         }
         if (duplicated.size > 0) {
             for (const key of duplicated) {

package/dist/src/transclude.js

@@ -265,7 +265,7 @@ class TranscludeToken extends index_2.Token {
     getPossibleValues() {
         const { type, name, childNodes } = this;
         if (type === 'template') {
-            throw new Error(`TranscludeToken.getPossibleValues method is only for specific magic words!`);
+            throw new Error('TranscludeToken.getPossibleValues method is only for specific magic words!');
         }
         let start;
         switch (name) {
@@ -279,7 +279,7 @@ class TranscludeToken extends index_2.Token {
                 start = 3;
                 break;
             default:
-                throw new Error(`TranscludeToken.getPossibleValues method is only for specific magic words!`);
+                throw new Error('TranscludeToken.getPossibleValues method is only for specific magic words!');
         }
         const queue = childNodes.slice(start, start + 2).map(({ childNodes: [, value] }) => value);
         for (let i = 0; i < queue.length;) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.12.7",
+	"version": "2.13.0",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -51,11 +51,11 @@
 		"chalk": "^4.1.2"
 	},
 	"devDependencies": {
-		"@bhsd/common": "^0.0.0",
+		"@bhsd/common": "^0.1.1",
 		"@types/node": "^20.11.6",
 		"v8r": "^3.0.0"
 	},
 	"engines": {
-		"node": "^20.9.0"
+		"node": ">=20.9.0"
 	}
 }