wikilint 2.13.2 → 2.13.4

package/config/default.json

@@ -383,7 +383,6 @@
 			"#匹配式": "ifeq",
 			"#若相等": "ifeq",
 			"#如果相等": "ifeq",
-			"#若表達式": "ifeq",
 			"#ifeq": "ifeq",
 			"#多选式": "switch",
 			"#多条件式": "switch",
@@ -397,6 +396,7 @@
 			"#如有": "ifexist",
 			"#ifexist": "ifexist",
 			"#若表达式": "ifexpr",
+			"#若表達式": "ifexpr",
 			"#ifexpr": "ifexpr",
 			"#错误式": "iferror",
 			"#如果错误": "iferror",

package/config/zhwiki.json

@@ -364,7 +364,6 @@
 			"#匹配式": "ifeq",
 			"#若相等": "ifeq",
 			"#如果相等": "ifeq",
-			"#若表達式": "ifeq",
 			"#ifeq": "ifeq",
 			"#多选式": "switch",
 			"#多条件式": "switch",
@@ -378,6 +377,7 @@
 			"#如有": "ifexist",
 			"#ifexist": "ifexist",
 			"#若表达式": "ifexpr",
+			"#若表達式": "ifexpr",
 			"#ifexpr": "ifexpr",
 			"#错误式": "iferror",
 			"#如果错误": "iferror",

package/dist/src/attribute.js

@@ -4,169 +4,12 @@ exports.AttributeToken = void 0;
 const lint_1 = require("../util/lint");
 const string_1 = require("../util/string");
 const constants_1 = require("../util/constants");
+const sharable_1 = require("../util/sharable");
 const rect_1 = require("../lib/rect");
 const index_1 = require("../index");
 const index_2 = require("./index");
 const atom_1 = require("./atom");
-const commonHtmlAttrs = new Set([
-    'id',
-    'class',
-    'style',
-    'lang',
-    'dir',
-    'title',
-    'tabindex',
-    'aria-describedby',
-    'aria-flowto',
-    'aria-hidden',
-    'aria-label',
-    'aria-labelledby',
-    'aria-level',
-    'aria-owns',
-    'role',
-    'about',
-    'property',
-    'resource',
-    'datatype',
-    'typeof',
-    'itemid',
-    'itemprop',
-    'itemref',
-    'itemscope',
-    'itemtype',
-]), blockAttrs = new Set(['align']), citeAttrs = new Set(['cite']), citeAndAttrs = new Set(['cite', 'datetime']), widthAttrs = new Set(['width']), obsoleteTdAttrs = new Set(['axis', 'align', 'bgcolor', 'height', 'width', 'valign']), tdAttrs = new Set([...obsoleteTdAttrs, 'abbr', 'headers', 'scope', 'rowspan', 'colspan']), typeAttrs = new Set(['type']), obsoleteTableAttrs = new Set(['summary', 'align', 'bgcolor', 'cellpadding', 'cellspacing', 'frame', 'rules', 'width']), brAttrs = new Set(['clear']), trAttrs = new Set(['bgcolor', 'align', 'valign']), htmlAttrs = {
-    div: blockAttrs,
-    h1: blockAttrs,
-    h2: blockAttrs,
-    h3: blockAttrs,
-    h4: blockAttrs,
-    h5: blockAttrs,
-    h6: blockAttrs,
-    blockquote: citeAttrs,
-    q: citeAttrs,
-    p: blockAttrs,
-    br: brAttrs,
-    pre: widthAttrs,
-    ins: citeAndAttrs,
-    del: citeAndAttrs,
-    ul: typeAttrs,
-    ol: new Set(['type', 'start', 'reversed']),
-    li: new Set(['type', 'value']),
-    table: new Set([...obsoleteTableAttrs, 'border']),
-    caption: blockAttrs,
-    tr: trAttrs,
-    td: tdAttrs,
-    th: tdAttrs,
-    img: new Set(['alt', 'src', 'width', 'height', 'srcset']),
-    font: new Set(['size', 'color', 'face']),
-    hr: widthAttrs,
-    data: new Set(['value']),
-    time: new Set(['datetime']),
-    meta: new Set(['itemprop', 'content']),
-    link: new Set(['itemprop', 'href', 'title']),
-    gallery: typeAttrs,
-    poem: blockAttrs,
-    categorytree: blockAttrs,
-    combooption: blockAttrs,
-}, empty = new Set(), extAttrs = {
-    gallery: new Set(['mode', 'showfilename', 'caption', 'perrow', 'widths', 'heights', 'showthumbnails']),
-    poem: new Set(['compact']),
-    categorytree: new Set([
-        'hideroot',
-        'onlyroot',
-        'depth',
-        'mode',
-        'hideprefix',
-        'namespaces',
-        'showcount',
-        'notranslations',
-    ]),
-    combooption: new Set(['name', 'for', 'inline']),
-    nowiki: empty,
-    indicator: new Set(['name']),
-    langconvert: new Set(['from', 'to']),
-    ref: new Set(['group', 'name', 'extends', 'follow', 'dir']),
-    references: new Set(['group', 'responsive']),
-    charinsert: new Set(['label']),
-    choose: new Set(['uncached', 'before', 'after']),
-    option: new Set(['weight']),
-    imagemap: empty,
-    inputbox: empty,
-    templatestyles: new Set(['src', 'wrapper']),
-    dynamicpagelist: empty,
-    poll: new Set(['id', 'show-results-before-voting']),
-    sm2: typeAttrs,
-    flashmp3: typeAttrs,
-    score: new Set([
-        'line_width_inches',
-        'lang',
-        'override_midi',
-        'raw',
-        'note-language',
-        'override_audio',
-        'override_ogg',
-        'sound',
-        'vorbis',
-    ]),
-    seo: new Set([
-        'title',
-        'title_mode',
-        'title_separator',
-        'keywords',
-        'description',
-        'robots',
-        'google_bot',
-        'image',
-        'image_width',
-        'image_height',
-        'image_alt',
-        'type',
-        'site_name',
-        'locale',
-        'section',
-        'author',
-        'published_time',
-        'twitter_site',
-    ]),
-    tab: new Set([
-        'nested',
-        'name',
-        'index',
-        'class',
-        'block',
-        'inline',
-        'openname',
-        'closename',
-        'collapsed',
-        'dropdown',
-        'style',
-        'bgcolor',
-        'container',
-        'id',
-        'title',
-    ]),
-    tabs: new Set(['plain', 'class', 'container', 'id', 'title', 'style']),
-    combobox: new Set(['placeholder', 'value', 'id', 'class', 'text', 'dropdown', 'style']),
-}, insecureStyle = /expression|(?:accelerator|-o-link(?:-source)?|-o-replace)\s*:|(?:url|image(?:-set)?)\s*\(|attr\s*\([^)]+[\s,]url/u, obsoleteAttrs = {
-    table: obsoleteTableAttrs,
-    td: new Set([...obsoleteTdAttrs, 'scope']),
-    th: obsoleteTdAttrs,
-    br: brAttrs,
-    caption: blockAttrs,
-    div: blockAttrs,
-    hr: widthAttrs,
-    h1: blockAttrs,
-    h2: blockAttrs,
-    h3: blockAttrs,
-    h4: blockAttrs,
-    h5: blockAttrs,
-    h6: blockAttrs,
-    li: typeAttrs,
-    p: blockAttrs,
-    pre: widthAttrs,
-    tr: trAttrs,
-    ul: typeAttrs,
-};
+const insecureStyle = /expression|(?:accelerator|-o-link(?:-source)?|-o-replace)\s*:|(?:url|image(?:-set)?)\s*\(|attr\s*\([^)]+[\s,]url/u;
 /**
  * 扩展和HTML标签属性
  * @classdesc `{childNodes: [AtomToken, Token|AtomToken]}`
@@ -269,16 +112,17 @@ class AttributeToken extends index_2.Token {
             }
             errors.push(e);
         }
-        const attrs = extAttrs[tag];
+        const attrs = sharable_1.extAttrs[tag], attrs2 = sharable_1.htmlAttrs[tag];
         if (!attrs?.has(name)
-            && (type === 'ext-attr' ? attrs : !/\{\{[^{]+\}\}/u.test(name))
-            && (type === 'ext-attr' && !(tag in htmlAttrs)
-                || !htmlAttrs[tag]?.has(name)
-                    && !/^(?:xmlns:[\w:.-]+|data-(?!ooui|mw|parsoid)[^:]*)$/u.test(name)
-                    && (tag === 'meta' || tag === 'link' || !commonHtmlAttrs.has(name)))) {
+            && !attrs2?.has(name)
+            // 不是未定义的扩展标签或包含嵌入的HTML标签
+            && (type === 'ext-attr' ? attrs || attrs2 : !/\{\{[^{]+\}\}/u.test(name))
+            && (type === 'ext-attr' && !attrs2
+                || !/^(?:xmlns:[\w:.-]+|data-(?!ooui|mw|parsoid)[^:]*)$/u.test(name)
+                    && (tag === 'meta' || tag === 'link' || !sharable_1.commonHtmlAttrs.has(name)))) {
             errors.push((0, lint_1.generateForChild)(firstChild, rect, 'illegal-attr', 'illegal attribute name'));
         }
-        else if (obsoleteAttrs[tag]?.has(name)) {
+        else if (sharable_1.obsoleteAttrs[tag]?.has(name)) {
             errors.push((0, lint_1.generateForChild)(firstChild, rect, 'obsolete-attr', 'obsolete attribute', 'warning'));
         }
         else if (name === 'style' && typeof value === 'string' && insecureStyle.test(value)) {

package/dist/src/transclude.js

@@ -59,7 +59,7 @@ class TranscludeToken extends index_2.Token {
         if (isFunction || parts.length === 0 && !this.#raw) {
             const [magicWord, ...arg] = title.split(':'), cleaned = (0, string_1.removeComment)(magicWord), name = cleaned[arg.length > 0 ? 'trimStart' : 'trim'](), lcName = name.toLowerCase(), canonicalName = Object.prototype.hasOwnProperty.call(insensitive, lcName) && insensitive[lcName], isSensitive = sensitive.includes(name), isVar = isSensitive || insensitiveVars.has(canonicalName);
             if (isVar || isFunction && canonicalName) {
-                this.setAttribute('name', canonicalName || lcName);
+                this.setAttribute('name', canonicalName || lcName.replace(/^#/u, ''));
                 this.#type = 'magic-word';
                 const pattern = new RegExp(String.raw `^\s*${name}\s*$`, isSensitive ? 'u' : 'iu'), token = new syntax_1.SyntaxToken(magicWord, pattern, 'magic-word-name', config, accum, {});
                 super.insertAt(token);

package/dist/util/sharable.d.ts

@@ -0,0 +1 @@
+export declare const commonHtmlAttrs: Set<string>, htmlAttrs: Record<string, Set<string>>, extAttrs: Record<string, Set<string>>, obsoleteAttrs: Record<string, Set<string>>;

package/dist/util/sharable.js

@@ -0,0 +1,163 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.obsoleteAttrs = exports.extAttrs = exports.htmlAttrs = exports.commonHtmlAttrs = void 0;
+const blockAttrs = new Set(['align']), citeAttrs = new Set(['cite']), citeAndAttrs = new Set(['cite', 'datetime']), widthAttrs = new Set(['width']), obsoleteTdAttrs = new Set(['axis', 'align', 'bgcolor', 'height', 'width', 'valign']), tdAttrs = new Set([...obsoleteTdAttrs, 'abbr', 'headers', 'scope', 'rowspan', 'colspan']), typeAttrs = new Set(['type']), obsoleteTableAttrs = new Set(['summary', 'align', 'bgcolor', 'cellpadding', 'cellspacing', 'frame', 'rules', 'width']), brAttrs = new Set(['clear']), trAttrs = new Set(['bgcolor', 'align', 'valign']), empty = new Set();
+exports.commonHtmlAttrs = new Set([
+    'id',
+    'class',
+    'style',
+    'lang',
+    'dir',
+    'title',
+    'tabindex',
+    'aria-describedby',
+    'aria-flowto',
+    'aria-hidden',
+    'aria-label',
+    'aria-labelledby',
+    'aria-level',
+    'aria-owns',
+    'role',
+    'about',
+    'property',
+    'resource',
+    'datatype',
+    'typeof',
+    'itemid',
+    'itemprop',
+    'itemref',
+    'itemscope',
+    'itemtype',
+]), exports.htmlAttrs = {
+    div: blockAttrs,
+    h1: blockAttrs,
+    h2: blockAttrs,
+    h3: blockAttrs,
+    h4: blockAttrs,
+    h5: blockAttrs,
+    h6: blockAttrs,
+    blockquote: citeAttrs,
+    q: citeAttrs,
+    p: blockAttrs,
+    br: brAttrs,
+    pre: widthAttrs,
+    ins: citeAndAttrs,
+    del: citeAndAttrs,
+    ul: typeAttrs,
+    ol: new Set(['type', 'start', 'reversed']),
+    li: new Set(['type', 'value']),
+    table: new Set([...obsoleteTableAttrs, 'border']),
+    caption: blockAttrs,
+    tr: trAttrs,
+    td: tdAttrs,
+    th: tdAttrs,
+    img: new Set(['alt', 'src', 'width', 'height', 'srcset']),
+    font: new Set(['size', 'color', 'face']),
+    hr: widthAttrs,
+    data: new Set(['value']),
+    time: new Set(['datetime']),
+    meta: new Set(['itemprop', 'content']),
+    link: new Set(['itemprop', 'href', 'title']),
+    gallery: typeAttrs,
+    poem: blockAttrs,
+    categorytree: blockAttrs,
+    combooption: blockAttrs,
+}, exports.extAttrs = {
+    gallery: new Set(['mode', 'showfilename', 'caption', 'perrow', 'widths', 'heights', 'showthumbnails']),
+    poem: new Set(['compact']),
+    categorytree: new Set([
+        'hideroot',
+        'onlyroot',
+        'depth',
+        'mode',
+        'hideprefix',
+        'namespaces',
+        'showcount',
+        'notranslations',
+    ]),
+    combooption: new Set(['name', 'for', 'inline']),
+    nowiki: empty,
+    indicator: new Set(['name']),
+    langconvert: new Set(['from', 'to']),
+    ref: new Set(['group', 'name', 'extends', 'follow', 'dir']),
+    references: new Set(['group', 'responsive']),
+    charinsert: new Set(['label']),
+    choose: new Set(['uncached', 'before', 'after']),
+    option: new Set(['weight']),
+    imagemap: empty,
+    inputbox: empty,
+    templatestyles: new Set(['src', 'wrapper']),
+    dynamicpagelist: empty,
+    poll: new Set(['id', 'show-results-before-voting']),
+    sm2: typeAttrs,
+    flashmp3: typeAttrs,
+    score: new Set([
+        'line_width_inches',
+        'lang',
+        'override_midi',
+        'raw',
+        'note-language',
+        'override_audio',
+        'override_ogg',
+        'sound',
+        'vorbis',
+    ]),
+    seo: new Set([
+        'title',
+        'title_mode',
+        'title_separator',
+        'keywords',
+        'description',
+        'robots',
+        'google_bot',
+        'image',
+        'image_width',
+        'image_height',
+        'image_alt',
+        'type',
+        'site_name',
+        'locale',
+        'section',
+        'author',
+        'published_time',
+        'twitter_site',
+    ]),
+    tab: new Set([
+        'nested',
+        'name',
+        'index',
+        'class',
+        'block',
+        'inline',
+        'openname',
+        'closename',
+        'collapsed',
+        'dropdown',
+        'style',
+        'bgcolor',
+        'container',
+        'id',
+        'title',
+    ]),
+    tabs: new Set(['plain', 'class', 'container', 'id', 'title', 'style']),
+    combobox: new Set(['placeholder', 'value', 'id', 'class', 'text', 'dropdown', 'style']),
+}, exports.obsoleteAttrs = {
+    table: obsoleteTableAttrs,
+    td: new Set([...obsoleteTdAttrs, 'scope']),
+    th: obsoleteTdAttrs,
+    br: brAttrs,
+    caption: blockAttrs,
+    div: blockAttrs,
+    hr: widthAttrs,
+    h1: blockAttrs,
+    h2: blockAttrs,
+    h3: blockAttrs,
+    h4: blockAttrs,
+    h5: blockAttrs,
+    h6: blockAttrs,
+    li: typeAttrs,
+    p: blockAttrs,
+    pre: widthAttrs,
+    tr: trAttrs,
+    ul: typeAttrs,
+};

package/dist/util/string.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.noWrap = exports.decodeNumber = exports.decodeHtml = exports.text = exports.rawurldecode = exports.escapeRegExp = exports.removeComment = exports.tidy = exports.extUrlChar = exports.extUrlCharFirst = void 0;
+exports.noWrap = exports.decodeNumber = exports.decodeHtml = exports.text = exports.escapeRegExp = exports.removeComment = exports.tidy = exports.extUrlChar = exports.extUrlCharFirst = exports.rawurldecode = void 0;
+var common_1 = require("@bhsd/common");
+Object.defineProperty(exports, "rawurldecode", { enumerable: true, get: function () { return common_1.rawurldecode; } });
 const commonExtUrlChar = String.raw `[^[\]<>"\0-\x1F\x7F\p{Zs}\uFFFD]`;
 exports.extUrlCharFirst = String.raw `(?:\[[\da-f:.]+\]|${commonExtUrlChar})`;
 exports.extUrlChar = String.raw `(?:${commonExtUrlChar}|\0\d+[cn!~]\x7F)*`;
@@ -16,12 +18,6 @@ exports.tidy = factory(/[\0\x7F]|\r$/gmu, '');
 exports.removeComment = factory(/\0\d+[cn]\x7F/gu, '');
 /** escape special chars for RegExp constructor */
 exports.escapeRegExp = factory(/[\\{}()|.?*+^$[\]]/gu, String.raw `\$&`);
-/**
- * PHP的`rawurldecode`函数的JavaScript实现
- * @param str 要解码的字符串
- */
-const rawurldecode = (str) => decodeURIComponent(str.replace(/%(?![\da-f]{2})/giu, '%25'));
-exports.rawurldecode = rawurldecode;
 /**
  * extract effective wikitext
  * @param childNodes a Token's contents

package/package.json

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