wikilint 2.34.0 → 2.35.0

package/config/default.json

@@ -41,6 +41,7 @@
 		"templatedata",
 		"timeline",
 		"page-collection",
+		"wish",
 		"img"
 	],
 	"html": [

package/dist/bin/config.js

@@ -77,7 +77,7 @@ const mw = {
         },
     },
 };
-const pkg = "wikilint", version = "2.34.0";
+const pkg = "wikilint", version = "2.35.0";
 let mwConfig;
 /**
  * Get the parser configuration for a Wikimedia Foundation project.
@@ -122,7 +122,7 @@ exports.default = async (site, url, user, force, internal) => {
         siprop: 'general|magicwords|functionhooks|namespaces|namespacealiases',
         format: 'json',
         formatversion: '2',
-    }, { query: { general: { articlepath, variants }, magicwords, namespaces, namespacealiases, functionhooks, }, } = await (await fetch(`${url}/api.php?${new URLSearchParams(params).toString()}`, headers)).json();
+    }, { query: { general: { articlepath, variants, langconversion }, magicwords, namespaces, namespacealiases, functionhooks, }, } = await (await fetch(`${url}/api.php?${new URLSearchParams(params).toString()}`, headers)).json();
     try {
         eval(m); // eslint-disable-line no-eval
     }
@@ -140,7 +140,7 @@ exports.default = async (site, url, user, force, internal) => {
     ]), config = {
         ...(0, cm_util_1.getParserConfig)(require(path_1.default.join(dir, 'minimum')), mwConfig),
         ...(0, cm_util_1.getKeywords)(magicwords),
-        variants: (0, cm_util_1.getVariants)(variants),
+        variants: langconversion ? (0, cm_util_1.getVariants)(variants) : [],
         namespaces: Object.fromEntries(ns),
         nsid: Object.fromEntries([
             ...ns.map(([id, canonical]) => [canonical.toLowerCase(), Number(id)]),

package/dist/parser/magicLinks.js

@@ -23,7 +23,7 @@ const parseMagicLinks = (wikitext, config, accum) => {
         let url = lead ? m.slice(lead.length) : m;
         if (p1) {
             let trail = '';
-            const m2 = /&(?:lt|gt|nbsp|#x0*(?:3[ce]|a0)|#0*(?:6[02]|160));/iu.exec(url);
+            const m2 = /&(?:[lg]t|nbsp|#x0*(?:3[ce]|a0)|#0*(?:6[02]|160));/iu.exec(url);
             if (m2) {
                 trail = url.slice(m2.index);
                 url = url.slice(0, m2.index);

package/dist/src/attribute.js

@@ -14,7 +14,7 @@ const index_2 = require("./index");
 const atom_1 = require("./atom");
 /* NOT FOR BROWSER ONLY */
 const document_1 = require("../lib/document");
-const insecureStyle = /expression|(?:accelerator|-o-link(?:-source)?|-o-replace)\s*:|(?:url|src|image(?:-set)?)\s*\(|attr\s*\([^)]+[\s,]url/u, evil = /(?:^|\s|\*\/)(?:javascript|vbscript)(?:\W|$)/iu, complexTypes = new Set(['ext', 'arg', 'magic-word', 'template']), urlAttrs = new Set([
+const insecureStyle = /expression|(?:accelerator|-o-link(?:-source)?|-o-replace)\s*:|(?:url|src|image(?:-set)?)\s*\(|attr\s*\([^)]+[\s,]url/u, evil = /(?:^|\s|\*\/)(?:java|vb)script(?:\W|$)/iu, complexTypes = new Set(['ext', 'arg', 'magic-word', 'template']), urlAttrs = new Set([
     'about',
     'property',
     'resource',

package/dist/src/nowiki/index.js

@@ -63,7 +63,7 @@ class NowikiToken extends base_1.NowikiBaseToken {
                 if (name === 'templatedata' && (sSyntax
                     || sDuplicate)) {
                     // browser版本使用`lintJSONNative()`
-                    return (0, common_1.lintJSON)(innerText).map(({ message, position, line, column, 
+                    return (0, common_1.lintJSON)(innerText).map(({ message, from, to = from, line, endLine = line, column, endColumn = column, 
                     /* NOT FOR BROWSER ONLY */
                     severity, }) => {
                         s =
@@ -75,17 +75,17 @@ class NowikiToken extends base_1.NowikiBaseToken {
                         if (!s) {
                             return false;
                         }
-                        const rect = new rect_1.BoundingRect(this, start), startIndex = start + position, startLine = rect.top + line - 1, startCol = (line > 1 ? 0 : rect.left) + column - 1;
+                        const rect = new rect_1.BoundingRect(this, start);
                         return {
                             rule,
                             message,
                             severity: s,
-                            startIndex,
-                            endIndex: startIndex,
-                            startLine,
-                            endLine: startLine,
-                            startCol,
-                            endCol: startCol,
+                            startIndex: start + from,
+                            endIndex: start + to,
+                            startLine: rect.top + line - 1,
+                            endLine: rect.top + endLine - 1,
+                            startCol: (line > 1 ? 0 : rect.left) + column - 1,
+                            endCol: (endLine > 1 ? 0 : rect.left) + endColumn - 1,
                         };
                     }).filter((e) => e !== false);
                 }

package/dist/src/nowiki/noinclude.js

@@ -74,7 +74,7 @@ let NoincludeToken = (() => {
             LINT: {
                 const { lintConfig } = index_1.default, rule = 'no-ignored', s = lintConfig.getSeverity(rule, 'include');
                 if (s) {
-                    const { innerText } = this, mt = /^<(noinclude|includeonly|onlyinclude)\s+(?:[^\s>/]|\/(?!>))[^>]*>$/iu.exec(innerText);
+                    const { innerText } = this, mt = /^<(includeonly|(?:no|only)include)\s+(?:[^\s>/]|\/(?!>))[^>]*>$/iu.exec(innerText);
                     if (mt) {
                         const e = (0, lint_1.generateForSelf)(this, { start }, rule, 'useless-attribute', s), { computeEditInfo } = lintConfig, before = mt[1].length + 1, after = innerText.endsWith('/>') ? 2 : 1;
                         e.startIndex += before;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.34.0",
+	"version": "2.35.0",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -72,8 +72,8 @@
 	},
 	"dependencies": {
 		"@bhsd/cm-util": "^0.1.0",
-		"@bhsd/common": "^1.2.0",
-		"@bhsd/stylelint-util": "^0.1.0",
+		"@bhsd/common": "^1.3.0",
+		"@bhsd/stylelint-util": "^1.0.1",
 		"binary-search": "^1.3.6",
 		"vscode-languageserver-types": "^3.17.5"
 	},
@@ -82,7 +82,7 @@
 		"entities": "^7.0.0",
 		"mathoid-texvcjs": "^0.6.0",
 		"minimatch": "^10.1.1",
-		"stylelint": "^16.26.1",
+		"stylelint": "^17.0.0",
 		"vscode-css-languageservice": "^6.3.8",
 		"vscode-html-languageservice": "^5.6.0",
 		"vscode-json-languageservice": "^5.6.3"
@@ -90,7 +90,7 @@
 	"devDependencies": {
 		"@bhsd/code-standard": "^1.3.2",
 		"@bhsd/nodejs": "^0.1.0",
-		"@bhsd/test-util": "^0.2.1",
+		"@bhsd/test-util": "^0.3.0",
 		"@stylistic/eslint-plugin": "^5.5.0",
 		"@types/color-name": "^2.0.0",
 		"@types/color-rgba": "^2.1.3",
@@ -117,6 +117,6 @@
 		"vscode-languageserver-textdocument": "^1.0.12"
 	},
 	"engines": {
-		"node": ">=18.17.0"
+		"node": ">=20.19.5"
 	}
 }