wikilint 2.38.1 → 2.39.1

package/README.md

@@ -23,13 +23,16 @@ npx wikilint --config zhwiki --include --lang zh-hans *.wiki
 | `-c`, `--config` | \<path or preset config\> | Choose parser's [configuration](https://github.com/bhsd-harry/wikiparser-node/wiki/Parser-%28EN%29#config) | `default` |
 | `--cache` | | Enable caching | `false` |
 | `--cache-file` | \<path\> | Specify cache file and enable caching | `.wikilintcache` |
-| `--ext` | \<extension\> | Specify file extension<br>Can be used multiple times | all files |
+| `-e`, `--ext` | \<extension\> | Specify file extension<br>Can be used multiple times | all files |
 | `--fix` | | Automatically fix problems | `false` |
 | `-h`, `--help` | | Print available options | |
 | `-i`, `--include` | | Parse for inclusion | `false` |
+| `--id`, `--ignore-disables` | | Ignore inline configuration comments | `false` |
 | `--ignore` | \<pattern\> | Ignore files matching the glob pattern<br>Can be used multiple times | |
 | `-l`, `--lang` | \<path or preset language\> | Choose [i18n](https://github.com/bhsd-harry/wikiparser-node/wiki/Parser-%28EN%29#i18n) language | English |
 | `--lc`, `--lint-config` | \<path\> | Specify [lint config](https://github.com/bhsd-harry/wikiparser-node/wiki/Rules#configuration) file | `.wikilintrc.json`<br>`.wikilintrc.js`<br>`.wikilintrc.cjs`<br>`.wikilintrc.mjs` |
+| `--nc`, `--no-color` | | Disable colored output | `false` |
+| `--print-config`, `--print-lint-config` | | Print the resolved lint config and exit | |
 | `-q`, `--quiet` | | Report errors only | errors and warnings |
 | `-r`, `--recursive` | | Recursively lint files | `false` |
 | `-s`, `--strict` | | Exit when there is an error or warning<br>Override `-q` or `--quiet` | Exit `1` only where there is an error |
@@ -42,12 +45,12 @@ For MediaWiki sites with the [CodeMirror extension](https://mediawiki.org/wiki/E
 ```sh
 npx getParserConfig <site> <script path> [user] [force]
 # For example:
-npx getParserConfig jawiki https://ja.wikipedia.org/w user@example.net
+npx getParserConfig frwiki https://fr.wikipedia.org/w user@example.net
 ```
 
 The generated configuration file will be saved in the `config` directory. You can then use the site name as the `--config` option.
 
 ```sh
 # For example:
-npx wikilint --config jawiki *.wiki
+npx wikilint --config frwiki *.wiki
 ```

package/config/.schema.json

@@ -169,7 +169,7 @@
 					}
 				}
 			],
-			"minItems": 2,
+			"minItems": 4,
 			"maxItems": 4
 		},
 		"protocol": {

package/config/minimum.json

@@ -199,7 +199,9 @@
 	],
 	"doubleUnderscore": [
 		[],
-		[]
+		[],
+		{},
+		{}
 	],
 	"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:|wikipedia://|worldwind://|xmpp:",
 	"interwiki": [],

package/dist/base.d.mts

@@ -7,7 +7,7 @@ export interface Config {
     readonly variable: string[];
     readonly functionHook: string[];
     readonly parserFunction: [Record<string, string>, Record<string, string>, string[], string[]];
-    readonly doubleUnderscore: [string[], string[], Record<string, string>?, Record<string, string>?];
+    readonly doubleUnderscore: [string[], string[], Record<string, string>, Record<string, string>];
     readonly protocol: string;
     readonly interwiki: string[];
     readonly img: Record<string, string>;

package/dist/base.d.ts

@@ -7,7 +7,7 @@ export interface Config {
     readonly variable: string[];
     readonly functionHook: string[];
     readonly parserFunction: [Record<string, string>, Record<string, string>, string[], string[]];
-    readonly doubleUnderscore: [string[], string[], Record<string, string>?, Record<string, string>?];
+    readonly doubleUnderscore: [string[], string[], Record<string, string>, Record<string, string>];
     readonly protocol: string;
     readonly interwiki: string[];
     readonly img: Record<string, string>;

package/dist/bin/cli.js

@@ -14,13 +14,16 @@ Available options:
 -c, --config <path or preset config>    Choose parser's configuration
 --cache                                 Enable caching
 --cache-file <path>                     Specify cache file
---ext <extension>                       Specify file extension
+-e, --ext <extension>                   Specify file extension
 --fix                                   Automatically fix problems
 -h, --help                              Print available options
 -i, --include                           Parse for inclusion
+--id, --ignore-disables                 Ignore inline configuration comments
 --ignore <pattern>                      Ignore files that match the pattern
 -l, --lang <path or preset language>    Choose i18n language
 --lc, --lint-config <path>              Specify lint config file
+--nc, --no-color                        Disable colored output
+--print-config, --print-lint-config     Print resolved lint config and exit
 -q, --quiet                             Report errors only
 -r, --recursive                         Lint files in directories recursively
 -s, --strict                            Exit when there is an error or warning
@@ -28,8 +31,8 @@ Available options:
 -v, --version                           Print package version
 `, root = path_1.default.join(__dirname, '..', '..'), configPath = path_1.default.join(root, 'config'), preset = new Set(fs_1.default.readdirSync(configPath).filter(file => file.endsWith('.json'))
     .map(file => file.slice(0, -5))), lintConfigDefaults = ['.wikilintrc.json', '.wikilintrc.js', '.wikilintrc.cjs', '.wikilintrc.mjs'], i18n = new Set(fs_1.default.readdirSync(path_1.default.join(root, 'i18n')).filter(file => file.endsWith('.json'))
-    .map(file => file.slice(0, -5))), { argv } = process, exts = [], ignorePatterns = [], jobs = [];
-let files = [], lintConfigFile, cacheFile = '.wikilintcache', cache, exiting = false, fixing = false, include = false, quiet = false, recursive = false, strict = false, caching = false, nErr = 0, nWarn = 0, nFixableErr = 0, nFixableWarn = 0, option;
+    .map(file => file.slice(0, -5))), colorSet = new Set(['red', 'yellow']), { argv } = process, exts = [], ignorePatterns = [], jobs = [];
+let files = [], lintConfigFile, cacheFile = '.wikilintcache', cache, caching = false, colors = true, exiting = false, fixing = false, include = false, ignoreDisables = false, printLintConfig = false, quiet = false, recursive = false, strict = false, nErr = 0, nWarn = 0, nFixableErr = 0, nFixableWarn = 0, option;
 /**
  * exit with message
  * @param msg message
@@ -138,8 +141,17 @@ const throwOnCacheFile = (input) => {
  * @param word item name
  */
 const plural = (n, word) => `${n} ${word}${n === 1 ? '' : 's'}`;
-// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-const styleText = util_1.default.styleText ?? ((_, text) => text);
+/**
+ * style text if possible
+ * @param format style format
+ * @param text text to style
+ */
+const styleText = (format, text) => {
+    if (!colors) {
+        format = (Array.isArray(format) ? format : [format]).filter(f => !colorSet.has(f));
+    }
+    return util_1.default.styleText(format, text);
+};
 /**
  * color the severity
  * @param severity problem severity
@@ -152,16 +164,13 @@ for (let i = 2; i < argv.length; i++) {
         case '--config':
             throwOnConfig(argv[++i]);
             break;
-        case '--lc':
-        case '--lint-config':
-            throwOnLintConfig(argv[++i]);
-            break;
         case '--cache':
             caching = true;
             break;
         case '--cache-file':
             throwOnCacheFile(argv[++i]);
             break;
+        case '-e':
         case '--ext':
             throwOnExt(argv[++i]);
             break;
@@ -177,6 +186,10 @@ for (let i = 2; i < argv.length; i++) {
         case '--include':
             include = true;
             break;
+        case '--id':
+        case '--ignore-disables':
+            ignoreDisables = true;
+            break;
         case '--ignore':
             throwOnIgnore(argv[++i]);
             break;
@@ -184,6 +197,18 @@ for (let i = 2; i < argv.length; i++) {
         case '--lang':
             throwOnLang(argv[++i]);
             break;
+        case '--lc':
+        case '--lint-config':
+            throwOnLintConfig(argv[++i]);
+            break;
+        case '--nc':
+        case '--no-color':
+            colors = false;
+            break;
+        case '--print-config':
+        case '--print-lint-config':
+            printLintConfig = true;
+            break;
         case '-q':
         case '--quiet':
             quiet = true;
@@ -223,6 +248,10 @@ for (let i = 2; i < argv.length; i++) {
                     case '--lang':
                         throwOnLang(value);
                         break;
+                    case '--lc':
+                    case '--lint-config':
+                        throwOnLintConfig(value);
+                        break;
                     default:
                         known = false;
                 }
@@ -307,8 +336,16 @@ const { mtimeMs } = fs_1.default.statSync(config), obj = cache?.[include ? 'incl
             cur = path_1.default.dirname(cur);
         }
     }
-    index_1.default.lintConfig.computeEditInfo = false;
-    index_1.default.lintConfig.fix = true;
+    index_1.default.lintConfig.computeEditInfo = true;
+    index_1.default.lintConfig.fix = fixing;
+    index_1.default.lintConfig.ignoreDisables = ignoreDisables;
+    if (printLintConfig) {
+        console.log(util_1.default.inspect({
+            ...index_1.default.lintConfig, // eslint-disable-line @typescript-eslint/no-misused-spread
+            rules: index_1.default.lintConfig.rules,
+        }, { depth: null, colors }));
+        process.exit(0);
+    }
     for (const file of new Set(files.map(f => path_1.default.resolve(f)))) {
         const stat = fs_1.default.statSync(file);
         if (stat.isDirectory()) {

package/dist/bin/config.js

@@ -40,7 +40,7 @@ const filterGadget = (id) => {
     const n = Number(id);
     return n < 2300 || n > 2303; // Gadget, Gadget talk, Gadget definition, Gadget definition talk
 };
-const pkg = "wikilint", version = "2.38.1";
+const pkg = "wikilint", version = "2.39.1";
 /**
  * Get the parser configuration for a Wikimedia Foundation project.
  * @param site site nickname

package/dist/index.js

@@ -26,6 +26,7 @@ const jsonRequire = (file) => {
     if (fullPath.endsWith('.json')) {
         return require(fullPath);
     }
+    /* c8 ignore next */
     throw new RangeError('Only JSON files are supported!');
 };
 /**
@@ -107,7 +108,7 @@ const Parser = {
                 this.config = rootRequire(this.config, 'config');
             }
             /* c8 ignore next 3 */
-            if (this.config.doubleUnderscore.length < 3 || !('functionHook' in this.config)) {
+            if (!('functionHook' in this.config)) {
                 (0, diff_1.error)(`The schema (${path_1.default.join(__dirname, '..', 'config', '.schema.json')}) of parser configuration is updated.`);
             }
             return this.getConfig();
@@ -115,7 +116,7 @@ const Parser = {
         /* NOT FOR BROWSER ONLY END */
         const parserConfig = config ?? this.config, { doubleUnderscore, ext, parserFunction, variable, } = parserConfig;
         for (let i = 0; i < 2; i++) {
-            if (doubleUnderscore.length > i + 2 && doubleUnderscore[i].length === 0) {
+            if (doubleUnderscore[i].length === 0) {
                 doubleUnderscore[i] = Object.keys(doubleUnderscore[i + 2]);
             }
         }

package/dist/lib/lsp.js

@@ -254,6 +254,7 @@ const partialParse = async (wikitext, watch, include, config = index_1.default.g
                     set(parseOnce, 0);
                 }
                 else {
+                    /* c8 ignore next */
                     resolve();
                 }
             }, 
@@ -498,6 +499,7 @@ class LanguageService {
                 colors = new RegExp(String.raw `\b${Object.keys(colorName).join('|')}\b`, 'giu');
             }
             catch {
+                /* c8 ignore next */
                 colors = false;
             }
         }
@@ -609,7 +611,7 @@ class LanguageService {
      * @param position position / 位置
      */
     async provideCompletionItems(text, position) {
-        const { re, allTags, functions, switches, jaSwitches, protocols, params, tags, ext, } = this.#prepareCompletionConfig(), { line, character } = position, curLine = text.split(/\r?\n/u, line + 1)[line], mt = re.exec(curLine?.slice(0, character) ?? ''), [, , iAlias = {}, sAlias = {}] = this.config.doubleUnderscore;
+        const { re, allTags, functions, switches, jaSwitches, protocols, params, tags, ext, } = this.#prepareCompletionConfig(), { line, character } = position, curLine = text.split(/\r?\n/u, line + 1)[line], mt = re.exec(curLine?.slice(0, character) ?? ''), [, , iAlias, sAlias] = this.config.doubleUnderscore;
         if (mt?.[1] !== undefined) { // tag
             const closing = mt[1].startsWith('/');
             return getCompletion(allTags, 'Class', mt[1].slice(closing ? 1 : 0), position, closing && !curLine?.slice(character).trim().startsWith('>') ? '>' : '');

package/dist/lib/title.d.ts

@@ -46,9 +46,9 @@ export declare class Title {
      */
     constructor(title: string, defaultNs: number, config: Config, { temporary, decode, selfLink, page }?: TitleOptions);
     /**
-     * Check if the title is a redirect
+     * Check if the title is a redirect and get the redirect target
      *
-     * 检测是否是重定向
+     * 检测是否是重定向并获取重定向目标
      * @since v1.12.2
      */
     getRedirection(): [boolean, string];

package/dist/lib/title.js

@@ -134,8 +134,9 @@ class Title {
     /**
      * 生成标题
      * @param prefix 前缀
+     * @param redirect 是否允许重定向
      */
-    #getTitle(prefix) {
+    #getTitle(prefix, redirect = true) {
         let title = (prefix + this.main).replace(/ /gu, '_');
         if (title.startsWith('/')) {
             title = (this.page ?? '') + title.replace(/(.)\/$/u, '$1');
@@ -149,9 +150,9 @@ class Title {
         return [false, title];
     }
     /**
-     * Check if the title is a redirect
+     * Check if the title is a redirect and get the redirect target
      *
-     * 检测是否是重定向
+     * 检测是否是重定向并获取重定向目标
      * @since v1.12.2
      */
     getRedirection() {

package/dist/parser/hrAndDoubleUnderscore.js

@@ -29,7 +29,7 @@ const parseHrAndDoubleUnderscore = ({ firstChild: { data }, type, name }, config
         if (caseSensitive || caseInsensitive) {
             // @ts-expect-error abstract class
             new doubleUnderscore_1.DoubleUnderscoreToken(key, caseSensitive, Boolean(p4), config, accum);
-            return `\0${accum.length - 1}${caseInsensitive && (aliases?.[lc] ?? /* c8 ignore next */ lc) === 'toc' ? 'u' : 'n'}\x7F`;
+            return `\0${accum.length - 1}${caseInsensitive && (aliases[lc] ?? /* c8 ignore next */ lc) === 'toc' ? 'u' : 'n'}\x7F`;
         }
         return m;
     });

package/dist/parser/table.js

@@ -89,7 +89,7 @@ const parseTable = ({ firstChild: { data }, type, name }, config, accum) => {
         else if (row) {
             top = pop(top, stack);
             if (top.is('tr')) {
-                top = stack.pop();
+                top = stack.pop(); // eslint-disable-line @typescript-eslint/no-unnecessary-type-assertion
             }
             // @ts-expect-error abstract class
             const tr = new tr_1.TrToken(`\n${spaces}${row}`, attr, config, accum);

package/dist/src/attribute.js

@@ -135,7 +135,7 @@ class AttributeToken extends index_2.Token {
             // 不支持通用HTML属性的扩展标签
             type === 'ext-attr' && !attrs2
                 // 或非通用HTML属性
-                || !/^(?:xmlns:[\w:.-]+|data-(?!ooui|mw|parsoid)[^:]*)$/u.test(name)
+                || !/^(?:xmlns:[\w:.-]+|data-(?!ooui|mw|parsoid)[^:_]*)$/u.test(name)
                     && (tag === 'meta' || tag === 'link' || !sharable_1.commonHtmlAttrs.has(name)))
             || (name === 'itemtype' || name === 'itemid' || name === 'itemref')
                 && !parentNode?.hasAttr('itemscope')) {

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

@@ -1,6 +1,7 @@
+import Parser from '../../index';
 import { Token } from '../index';
 import { AtomToken } from '../atom';
-import type { Config, LintError } from '../../base';
+import type { LintError } from '../../base';
 import type { Title } from '../../lib/title';
 /**
  * internal link
@@ -22,5 +23,5 @@ export declare abstract class LinkBaseToken extends Token {
      * @param linkText 链接显示文字
      * @param delimiter `|`
      */
-    constructor(link: string, linkText?: string, config?: Config, accum?: Token[], delimiter?: string);
+    constructor(link: string, linkText?: string, config?: Parser.Config, accum?: Token[], delimiter?: string);
 }

package/dist/src/link/base.js

@@ -81,11 +81,11 @@ let LinkBaseToken = (() => {
          * @param linkText 链接显示文字
          * @param delimiter `|`
          */
-        constructor(link, linkText, config, accum = [], delimiter = '|') {
+        constructor(link, linkText, config = index_1.default.getConfig(), accum = [], delimiter = '|') {
             super(undefined, config, accum, {});
             this.insertAt(new atom_1.AtomToken(link, 'link-target', config, accum, {}));
             if (linkText !== undefined) {
-                const inner = new index_2.Token(linkText, config, accum, {});
+                const inner = new index_2.Token(linkText, { ...config, excludes: [...config.excludes, 'list'] }, accum);
                 inner.type = 'link-text';
                 inner.setAttribute('stage', constants_1.MAX_STAGE - 1);
                 this.insertAt(inner);

package/dist/src/nowiki/doubleUnderscore.js

@@ -70,7 +70,7 @@ let DoubleUnderscoreToken = (() => {
         constructor(word, sensitive, fullWidth, config, accum) {
             super(word, config, accum);
             const lc = word.toLowerCase(), [, , iAlias, sAlias] = config.doubleUnderscore;
-            this.setAttribute('name', (sensitive ? sAlias?.[word]?.toLowerCase() : iAlias?.[lc]) ?? lc);
+            this.setAttribute('name', (sensitive ? sAlias[word]?.toLowerCase() : iAlias[lc]) ?? lc);
             this.#fullWidth = fullWidth;
         }
         /** @private */

package/dist/util/string.js

@@ -55,7 +55,7 @@ const decodeHtml = (str) => {
         if (typeof process === 'object' && typeof process.versions?.node === 'string') {
             try {
                 const { decodeHTMLStrict } = require('entities');
-                return (s) => decodeHTMLStrict(s).replace(/\xA0/gu, ' ');
+                return (s) => decodeHTMLStrict(s).replaceAll('\xA0', ' ');
             }
             catch /* c8 ignore next */ { }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.38.1",
+	"version": "2.39.1",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -39,6 +39,7 @@
 		"url": "git+https://github.com/bhsd-harry/wikiparser-node.git"
 	},
 	"scripts": {
+		"ls": "npm i --package-lock-only && npm ls --package-lock-only --all --omit=dev",
 		"prepublishOnly": "npm run build:core",
 		"build:core": "bash build.sh",
 		"build:define": "bash sed.sh -i \"s/pkg = \\$PKG/pkg = $(npm pkg get name)/; s/version = \\$VERSION/version = $(npm pkg get version)/\" dist/bin/config.js",
@@ -75,7 +76,7 @@
 	"dependencies": {
 		"@bhsd/cm-util": "^1.0.0",
 		"@bhsd/common": "^2.0.0",
-		"@bhsd/stylelint-util": "^1.0.1",
+		"@bhsd/stylelint-util": "^1.0.2",
 		"binary-search": "^1.3.6",
 		"vscode-languageserver-types": "^3.17.5"
 	},
@@ -83,7 +84,7 @@
 		"color-name": "^2.0.0",
 		"entities": "^8.0.0",
 		"mathoid-texvcjs": "^0.6.0",
-		"stylelint": "^17.6.0",
+		"stylelint": "^17.9.0",
 		"vscode-css-languageservice": "^6.3.10",
 		"vscode-html-languageservice": "^5.6.2",
 		"vscode-json-languageservice": "^5.7.2"
@@ -91,32 +92,35 @@
 	"devDependencies": {
 		"@bhsd/code-standard": "^2.2.0",
 		"@bhsd/nodejs": "^1.0.0",
-		"@bhsd/test-util": "^1.0.0",
+		"@bhsd/test-util": "^1.1.0",
 		"@eslint-community/eslint-plugin-eslint-comments": "^4.7.1",
 		"@stylistic/eslint-plugin": "^5.10.0",
 		"@types/color-name": "^2.0.0",
 		"@types/color-rgba": "^2.1.3",
 		"@types/mocha": "^10.0.10",
 		"@types/node": "^24.11.0",
-		"@typescript-eslint/eslint-plugin": "^8.58.0",
-		"@typescript-eslint/parser": "^8.58.0",
+		"@typescript-eslint/eslint-plugin": "^8.59.0",
+		"@typescript-eslint/parser": "^8.59.0",
 		"c8": "^11.0.0",
 		"color-rgba": "^3.0.0",
 		"diff2html-cli": "^5.2.15",
-		"esbuild": "^0.27.7",
-		"eslint": "^10.2.0",
-		"eslint-plugin-jsdoc": "^62.7.1",
+		"esbuild": "^0.28.0",
+		"eslint": "^10.2.1",
+		"eslint-plugin-jsdoc": "^62.9.0",
 		"eslint-plugin-jsonc": "^3.1.2",
 		"eslint-plugin-n": "^17.24.0",
 		"eslint-plugin-promise": "^7.2.1",
 		"eslint-plugin-regexp": "^3.1.0",
 		"eslint-plugin-unicorn": "^64.0.0",
-		"markdownlint-cli2": "^0.21.0",
+		"markdownlint-cli2": "^0.22.1",
 		"mocha": "^11.7.5",
-		"typescript": "^6.0.2",
+		"typescript": "^6.0.3",
 		"v8r": "^6.0.0",
 		"vscode-languageserver-textdocument": "^1.0.12"
 	},
+	"overrides": {
+		"eslint": "^10.2.1"
+	},
 	"engines": {
 		"node": "^20.19.0 || ^22.13.0 || >=24.11.0"
 	}