wikilint 2.12.2 → 2.12.4

package/config/default.json

@@ -702,7 +702,10 @@
 			"CONTENTLANGUAGE",
 			"CONTENTLANG",
 			"PAGELANGUAGE",
-			"="
+			"=",
+			"#FORMAL",
+			"#timef",
+			"#timefl"
 		],
 		[
 			"msg",

package/config/enwiki.json

@@ -331,7 +331,10 @@
 			"CONTENTLANGUAGE",
 			"CONTENTLANG",
 			"PAGELANGUAGE",
-			"="
+			"=",
+			"#FORMAL",
+			"#timef",
+			"#timefl"
 		],
 		[
 			"msg",

package/config/minimum.json

@@ -114,7 +114,10 @@
 		},
 		[
 			"!",
-			"="
+			"=",
+			"#FORMAL",
+			"#timef",
+			"#timefl"
 		],
 		[
 			"msg",

package/config/zhwiki.json

@@ -644,7 +644,10 @@
 			"CONTENTLANGUAGE",
 			"CONTENTLANG",
 			"PAGELANGUAGE",
-			"="
+			"=",
+			"#FORMAL",
+			"#timef",
+			"#timefl"
 		],
 		[
 			"msg",

package/dist/lib/element.js

@@ -8,10 +8,10 @@ const node_1 = require("./node");
  * 将选择器转化为类型谓词
  * @param selector 选择器
  */
-const getCondition = (selector) => {
-    const types = new Set(selector.split(',').map(str => str.trim()));
-    return (({ type }) => types.has(type));
-};
+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 {
     /** 子节点总数 */

package/dist/parser/magicLinks.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseMagicLinks = void 0;
 const string_1 = require("../util/string");
 const magicLink_1 = require("../src/magicLink");
+const space = String.raw `[\p{Zs}\t]| |&#0*160;|&#x0*a0;`, sp = `(?:${space})+`, spdash = `(?:${space}|-)`, magicLinkPattern = String.raw `(?:RFC|PMID)${sp}\d+\b|ISBN${sp}(?:97[89]${spdash}?)?(?:\d${spdash}?){9}[\dx]\b`;
 /**
  * 解析自由外链
  * @param wikitext
@@ -10,7 +11,7 @@ const magicLink_1 = require("../src/magicLink");
  * @param accum
  */
 const parseMagicLinks = (wikitext, config, accum) => {
-    const space = String.raw `[\p{Zs}\t]| |&#0*160;|&#x0*a0;`, spdash = `(?:${space}|-)`, regex = new RegExp(String.raw `(^|[^\p{L}\d_])(?:(?:${config.protocol})(${string_1.extUrlCharFirst}${string_1.extUrlChar})|(?:RFC|PMID)(?:${space})+\d+\b|ISBN(?:${space})+(?:97[89]${spdash}?)?(?:\d${spdash}?){9}[\dx]\b)`, 'giu');
+    const regex = new RegExp(String.raw `(^|[^\p{L}\d_])(?:(?:${config.protocol})(${string_1.extUrlCharFirst}${string_1.extUrlChar})|${magicLinkPattern})`, 'giu');
     return wikitext.replace(regex, (m, lead, p1) => {
         let url = lead ? m.slice(lead.length) : m;
         if (p1) {

package/dist/src/heading.js

@@ -64,7 +64,7 @@ class HeadingToken extends index_2.Token {
         if (innerStr.startsWith('=') || innerStr.endsWith('=')) {
             errors.push((0, lint_1.generateForChild)(firstChild, rect, 'unbalanced-header', index_1.default.msg('unbalanced $1 in a section header', '"="')));
         }
-        if (this.closest('html-attrs, table-attrs')) {
+        if (this.closest('html-attrs,table-attrs')) {
             errors.push((0, lint_1.generateForSelf)(this, rect, 'parsing-order', 'section header in a HTML tag'));
         }
         if (boldQuotes.length % 2) {

package/dist/src/index.js

@@ -337,27 +337,38 @@ class Token extends element_1.AstElement {
     lint(start = this.getAbsoluteIndex(), re) {
         let errors = super.lint(start, re);
         if (this.type === 'root') {
-            const record = {};
-            for (const cat of this.querySelectorAll('category')) {
-                const thisCat = record[cat.name];
+            const record = {}, selector = 'category,html-attr#id,ext-attr#id,table-attr#id';
+            for (const cat of this.querySelectorAll(selector)) {
+                let key;
+                if (cat.type === 'category') {
+                    key = cat.name;
+                }
+                else {
+                    const value = cat.getValue();
+                    key = `#${value === true ? '' : value}`;
+                }
+                const thisCat = record[key];
                 if (thisCat) {
                     thisCat.add(cat);
                 }
                 else {
-                    record[cat.name] = new Set([cat]);
+                    record[key] = new Set([cat]);
                 }
             }
-            for (const value of Object.values(record)) {
-                if (value.size > 1) {
+            for (const [key, value] of Object.entries(record)) {
+                if (value.size > 1 && !key.startsWith('#mw-customcollapsible-')) {
+                    const isCat = !key.startsWith('#'), msg = `duplicated ${isCat ? 'category' : 'id'}`, severity = isCat ? 'error' : 'warning';
                     errors.push(...[...value].map(cat => {
-                        const e = (0, lint_1.generateForSelf)(cat, { start: cat.getAbsoluteIndex() }, 'no-duplicate', 'duplicated category');
-                        e.suggestions = [
-                            {
-                                desc: 'remove',
-                                range: [e.startIndex, e.endIndex],
-                                text: '',
-                            },
-                        ];
+                        const e = (0, lint_1.generateForSelf)(cat, { start: cat.getAbsoluteIndex() }, 'no-duplicate', msg, severity);
+                        if (isCat) {
+                            e.suggestions = [
+                                {
+                                    desc: 'remove',
+                                    range: [e.startIndex, e.endIndex],
+                                    text: '',
+                                },
+                            ];
+                        }
                         return e;
                     }));
                 }

package/dist/src/tagPair/ext.js

@@ -120,7 +120,7 @@ class ExtToken extends index_3.TagPairToken {
     /** @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')) {
+        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 === 'ref' && this.closest('heading-title')) {

package/i18n/zh-hans.json

@@ -11,6 +11,7 @@
 	"content to be moved out from the table": "将被移出表格的内容",
 	"duplicated $1 attribute": "重复的$1属性",
 	"duplicated category": "重复的分类",
+	"duplicated id": "重复的id",
 	"duplicated image $1 parameter": "重复的图片$1参数",
 	"duplicated parameter": "重复参数",
 	"extension tag in HTML tag attributes": "HTML标签属性中的扩展标签",

package/i18n/zh-hant.json

@@ -11,6 +11,7 @@
 	"content to be moved out from the table": "將被移出表格的內容",
 	"duplicated $1 attribute": "重複的$1屬性",
 	"duplicated category": "重複的分類",
+	"duplicated id": "重複的id",
 	"duplicated image $1 parameter": "重複的圖片$1參數",
 	"duplicated parameter": "重複參數",
 	"extension tag in HTML tag attributes": "HTML標籤屬性中的擴展標籤",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.12.2",
+	"version": "2.12.4",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",