@ota-meshi/eslint-plugin 0.17.5 → 0.18.0

package/lib/config-builder/+eslint-plugin.js

@@ -10,7 +10,8 @@ function buildESLintPlugin() {
         const eslintPlugin = (0, module_js_1.requireFromCwd)("eslint-plugin-eslint-plugin");
         return [
             {
-                ...eslintPlugin.configs["flat/recommended"],
+                ...(eslintPlugin.configs["flat/recommended"] ||
+                    eslintPlugin.configs.recommended),
                 files: _eslint_plugin_js_1.eslintPluginFiles,
             },
             ...(0, _node_js_1.buildNode)(),

package/lib/config-builder/+svelte.js

@@ -5,11 +5,12 @@ const _svelte_js_1 = require("../config-helpers/+svelte.js");
 const module_js_1 = require("../utils/module.js");
 const fallback_js_1 = require("./fallback.js");
 const any_parser_js_1 = require("../parsers/any-parser.js");
+const flatten_js_1 = require("./flatten.js");
 function buildSvelte() {
     return (0, module_js_1.requireOf)(["eslint-plugin-svelte@2.9.0"], () => {
-        const eslintPluginSvelte = (0, module_js_1.requireFromCwd)("eslint-plugin-svelte");
+        const svelteRecommended = (0, module_js_1.importFromCwd)("eslint-plugin-svelte").then((eslintPluginSvelte) => eslintPluginSvelte.configs["flat/recommended"]);
         return [
-            ...eslintPluginSvelte.configs["flat/recommended"],
+            ...(0, flatten_js_1.flattenConfig)(svelteRecommended),
             {
                 files: _svelte_js_1.svelteFiles,
                 rules: {

package/lib/config-builder/flatten.d.ts

@@ -0,0 +1 @@
+export declare function flattenConfig(config: Promise<any>): any;

package/lib/config-builder/flatten.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.flattenConfig = flattenConfig;
+function* flattenConfig(config) {
+    for (let index = 0; index < 15; index++) {
+        const i = index;
+        yield config.then((configs) => configs[i] || {});
+    }
+}

package/lib/config-helpers/+eslint-plugin.js

@@ -72,7 +72,7 @@ function rulesDocumentUrl() {
             return `${baseUrl}/blob/v${version}/docs/rules/{{name}}.md`;
         }
     }
-    catch (_error) {
+    catch {
         // ignore
     }
     return undefined;

package/lib/configs/+eslint-plugin.d.ts

@@ -1,3 +1,3 @@
 import type { Linter } from "eslint";
-declare const _default: Linter.Config<Linter.RulesRecord, Linter.RulesRecord>;
+declare const _default: Linter.LegacyConfig<Linter.RulesRecord, Linter.RulesRecord>;
 export = _default;

package/lib/configs/+eslint-plugin.js

@@ -1,22 +1,33 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 const module_js_1 = require("../utils/module.js");
 const _eslint_plugin_js_1 = require("../config-helpers/+eslint-plugin.js");
 const fallback_js_1 = require("./fallback.js");
-module.exports = (0, module_js_1.requireOf)(["eslint-plugin-eslint-plugin"], () => ({
-    plugins: ["eslint-plugin"],
-    overrides: [
-        {
-            files: _eslint_plugin_js_1.eslintPluginFiles,
-            extends: [
-                require.resolve("./+node"),
-                "plugin:eslint-plugin/recommended",
-            ],
-            rules: {
-                ..._eslint_plugin_js_1.eslintPluginExtendRules,
+const semver_1 = __importDefault(require("semver"));
+module.exports = (0, module_js_1.requireOf)(["eslint-plugin-eslint-plugin"], () => {
+    const version = (0, module_js_1.requireFromCwd)("eslint-plugin-eslint-plugin/package.json").version;
+    if (semver_1.default.satisfies(version, ">=7.0.0")) {
+        // eslint-plugin-eslint-plugin v7+ does not support legacy config
+        return {};
+    }
+    return {
+        plugins: ["eslint-plugin"],
+        overrides: [
+            {
+                files: _eslint_plugin_js_1.eslintPluginFiles,
+                extends: [
+                    require.resolve("./+node"),
+                    "plugin:eslint-plugin/recommended",
+                ],
+                rules: {
+                    ..._eslint_plugin_js_1.eslintPluginExtendRules,
+                },
             },
-        },
-    ],
-}), (missingList) => {
+        ],
+    };
+}, (missingList) => {
     return {
         overrides: [
             {

package/lib/configs/+json.d.ts

@@ -1,3 +1,3 @@
 import type { Linter } from "eslint";
-declare const _default: Linter.Config<Linter.RulesRecord, Linter.RulesRecord>;
+declare const _default: Linter.LegacyConfig<Linter.RulesRecord, Linter.RulesRecord>;
 export = _default;

package/lib/configs/+md.d.ts

@@ -1,3 +1,3 @@
 import type { Linter } from "eslint";
-declare const _default: Linter.Config<Linter.RulesRecord, Linter.RulesRecord>;
+declare const _default: Linter.LegacyConfig<Linter.RulesRecord, Linter.RulesRecord>;
 export = _default;

package/lib/configs/+node.d.ts

@@ -1,3 +1,3 @@
 import type { Linter } from "eslint";
-declare const _default: Linter.Config<Linter.RulesRecord, Linter.RulesRecord>;
+declare const _default: Linter.LegacyConfig<Linter.RulesRecord, Linter.RulesRecord>;
 export = _default;

package/lib/configs/+package-json.d.ts

@@ -1,3 +1,3 @@
 import type { Linter } from "eslint";
-declare const _default: Linter.Config<Linter.RulesRecord, Linter.RulesRecord>;
+declare const _default: Linter.LegacyConfig<Linter.RulesRecord, Linter.RulesRecord>;
 export = _default;

package/lib/configs/+prettier.d.ts

@@ -1,3 +1,3 @@
 import type { Linter } from "eslint";
-declare const _default: Linter.Config<Linter.RulesRecord, Linter.RulesRecord>;
+declare const _default: Linter.LegacyConfig<Linter.RulesRecord, Linter.RulesRecord>;
 export = _default;

package/lib/configs/+prettier.js

@@ -7,7 +7,7 @@ function getConfigArrayIfHasConfig(config) {
         const configPath = (0, module_js_1.resolveFromCwd)(`eslint-config-${config}`);
         (0, module_js_1.requireFromCwd)(configPath);
     }
-    catch (_e) {
+    catch {
         return [];
     }
     return [config];

package/lib/configs/+svelte-with-ts.d.ts

@@ -1,3 +1,3 @@
 import type { Linter } from "eslint";
-declare const _default: Linter.Config<Linter.RulesRecord, Linter.RulesRecord>;
+declare const _default: Linter.LegacyConfig<Linter.RulesRecord, Linter.RulesRecord>;
 export = _default;

package/lib/configs/+svelte-with-ts.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 const module_js_1 = require("../utils/module.js");
 const base = __importStar(require("./ts/base-config.js"));
 const _svelte_js_1 = require("../config-helpers/+svelte.js");

package/lib/configs/+svelte.d.ts

@@ -1,3 +1,3 @@
 import type { Linter } from "eslint";
-declare const _default: Linter.Config<Linter.RulesRecord, Linter.RulesRecord>;
+declare const _default: Linter.LegacyConfig<Linter.RulesRecord, Linter.RulesRecord>;
 export = _default;

package/lib/configs/+toml.d.ts

@@ -1,3 +1,3 @@
 import type { Linter } from "eslint";
-declare const _default: Linter.Config<Linter.RulesRecord, Linter.RulesRecord>;
+declare const _default: Linter.LegacyConfig<Linter.RulesRecord, Linter.RulesRecord>;
 export = _default;

package/lib/configs/+typescript.d.ts

@@ -1,3 +1,3 @@
 import type { Linter } from "eslint";
-declare const _default: Linter.Config<Linter.RulesRecord, Linter.RulesRecord>;
+declare const _default: Linter.LegacyConfig<Linter.RulesRecord, Linter.RulesRecord>;
 export = _default;

package/lib/configs/+typescript.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 const _typescript_js_1 = require("../config-helpers/+typescript.js");
 const module_js_1 = require("../utils/module.js");
 const base = __importStar(require("./ts/base-config.js"));

package/lib/configs/+vue2-with-ts.d.ts

@@ -1,3 +1,3 @@
 import type { Linter } from "eslint";
-declare const _default: Linter.Config<Linter.RulesRecord, Linter.RulesRecord>;
+declare const _default: Linter.LegacyConfig<Linter.RulesRecord, Linter.RulesRecord>;
 export = _default;

package/lib/configs/+vue2-with-ts.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 const _vue_js_1 = require("../config-helpers/+vue.js");
 const module_js_1 = require("../utils/module.js");
 const fallback_js_1 = require("./fallback.js");

package/lib/configs/+vue2.d.ts

@@ -1,3 +1,3 @@
 import type { Linter } from "eslint";
-declare const _default: Linter.Config<Linter.RulesRecord, Linter.RulesRecord>;
+declare const _default: Linter.LegacyConfig<Linter.RulesRecord, Linter.RulesRecord>;
 export = _default;

package/lib/configs/+vue3-with-ts.d.ts

@@ -1,3 +1,3 @@
 import type { Linter } from "eslint";
-declare const _default: Linter.Config<Linter.RulesRecord, Linter.RulesRecord>;
+declare const _default: Linter.LegacyConfig<Linter.RulesRecord, Linter.RulesRecord>;
 export = _default;

package/lib/configs/+vue3-with-ts.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 const _vue_js_1 = require("../config-helpers/+vue.js");
 const module_js_1 = require("../utils/module.js");
 const fallback_js_1 = require("./fallback.js");

package/lib/configs/+vue3.d.ts

@@ -1,3 +1,3 @@
 import type { Linter } from "eslint";
-declare const _default: Linter.Config<Linter.RulesRecord, Linter.RulesRecord>;
+declare const _default: Linter.LegacyConfig<Linter.RulesRecord, Linter.RulesRecord>;
 export = _default;

package/lib/configs/+yaml.d.ts

@@ -1,3 +1,3 @@
 import type { Linter } from "eslint";
-declare const _default: Linter.Config<Linter.RulesRecord, Linter.RulesRecord>;
+declare const _default: Linter.LegacyConfig<Linter.RulesRecord, Linter.RulesRecord>;
 export = _default;

package/lib/configs/base-plugins/eslint-comments.d.ts

@@ -1,3 +1,3 @@
 import type { Linter } from "eslint";
-declare const _default: Linter.Config<Linter.RulesRecord, Linter.RulesRecord>;
+declare const _default: Linter.LegacyConfig<Linter.RulesRecord, Linter.RulesRecord>;
 export = _default;

package/lib/configs/base-plugins/jsdoc.d.ts

@@ -1,3 +1,3 @@
 import type { Linter } from "eslint";
-declare const _default: Linter.Config<Linter.RulesRecord, Linter.RulesRecord>;
+declare const _default: Linter.LegacyConfig<Linter.RulesRecord, Linter.RulesRecord>;
 export = _default;

package/lib/configs/base-plugins/regexp.d.ts

@@ -1,3 +1,3 @@
 import type { Linter } from "eslint";
-declare const _default: Linter.Config<Linter.RulesRecord, Linter.RulesRecord>;
+declare const _default: Linter.LegacyConfig<Linter.RulesRecord, Linter.RulesRecord>;
 export = _default;

package/lib/configs/fallback.d.ts

@@ -2,4 +2,4 @@ import type { Linter } from "eslint";
 /**
  * Fallback Legacy config builder
  */
-export declare function buildFallbackForLegacy(missingList: string[]): Linter.Config;
+export declare function buildFallbackForLegacy(missingList: string[]): Linter.LegacyConfig;

package/lib/configs/json-schema/config.d.ts

@@ -1,3 +1,3 @@
 import type { Linter } from "eslint";
-declare const _default: Linter.Config<Linter.RulesRecord, Linter.RulesRecord>;
+declare const _default: Linter.LegacyConfig<Linter.RulesRecord, Linter.RulesRecord>;
 export = _default;

package/lib/configs/recommended.d.ts

@@ -5,7 +5,7 @@ declare const _default: {
         ecmaVersion: number;
     };
     rules: {
-        [x: string]: import("eslint").Linter.RuleEntry<any[]>;
+        [rule: string]: import("eslint").Linter.RuleEntry<any[]>;
     };
     overrides: ({
         files: string[];
@@ -15,10 +15,10 @@ declare const _default: {
     } | {
         files: string[];
         globals: {
-            [x: string]: boolean | "off" | "writable" | "readonly";
+            [name: string]: import("eslint").Linter.GlobalConf;
         };
         rules: {
-            [x: string]: import("eslint").Linter.RuleEntry<any[]>;
+            [rule: string]: import("eslint").Linter.RuleEntry<any[]>;
         };
         extends?: undefined;
     })[];

package/lib/configs/ts/base-config.d.ts

@@ -6,5 +6,5 @@ export declare const parserOptions: {
     sourceType: "module";
 };
 export declare const rules: {
-    [x: string]: import("eslint").Linter.RuleEntry<any[]>;
+    [rule: string]: import("eslint").Linter.RuleEntry<any[]>;
 };

package/lib/utils/module.d.ts

@@ -1,5 +1,6 @@
 import type { Linter } from "eslint";
 export declare function requireFromCwd(modulePath: string): any;
+export declare function importFromCwd(modulePath: string): Promise<any>;
 export declare function resolveFromCwd(modulePath: string): string;
 export declare function parseModule(name: string): {
     moduleName: string;
@@ -15,5 +16,5 @@ export declare function has(name: string): boolean;
 /**
  * Checks exists module and return config
  */
-export declare function requireOf<C extends Linter.FlatConfig[] | Linter.Config>(names: string[], getConfig: () => C, fallback: (missingList: string[]) => C): C;
+export declare function requireOf<C extends Linter.Config[] | Linter.LegacyConfig>(names: string[], getConfig: () => C, fallback: (missingList: string[]) => C): C;
 export declare function tryInstall(moduleName: string, targetFile?: string): string | null;

package/lib/utils/module.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requireFromCwd = requireFromCwd;
+exports.importFromCwd = importFromCwd;
 exports.resolveFromCwd = resolveFromCwd;
 exports.parseModule = parseModule;
 exports.has = has;
@@ -19,7 +20,39 @@ function requireFromCwd(modulePath) {
     if (!requireFunction) {
         requireFunction = (0, module_1.createRequire)(path_1.default.join(process.cwd(), "__placeholder__.js"));
     }
-    return requireFunction(modulePath);
+    const module = requireFunction(modulePath);
+    return module.default ?? module;
+}
+function importFromCwd(modulePath) {
+    try {
+        return import(modulePath);
+    }
+    catch {
+        // ignore
+    }
+    const pkg = requireFromCwd(`${modulePath}/package.json`);
+    const mainPath = findMainPath(pkg);
+    if (!mainPath) {
+        throw new Error(`Cannot find main path of ${modulePath}`);
+    }
+    const moduleRootPath = path_1.default.dirname(resolveFromCwd(`${modulePath}/package.json`));
+    return import(path_1.default.join(moduleRootPath, mainPath));
+}
+function findMainPath(pkg) {
+    const exports = pkg.exports;
+    if (!exports) {
+        return pkg.module ?? pkg.main;
+    }
+    return findMainPathFromExports(exports);
+}
+function findMainPathFromExports(exports) {
+    if (typeof exports === "string") {
+        return exports;
+    }
+    if (exports?.["."]) {
+        return findMainPathFromExports(exports["."]);
+    }
+    return exports?.import ?? exports?.require ?? exports?.default;
 }
 function resolveFromCwd(modulePath) {
     if (!requireFunction) {
@@ -46,8 +79,13 @@ function has(name) {
     try {
         modulePath = resolveFromCwd(moduleName);
     }
-    catch (_e) {
-        return false;
+    catch {
+        try {
+            modulePath = path_1.default.dirname(resolveFromCwd(`${moduleName}/package.json`));
+        }
+        catch {
+            return false;
+        }
     }
     if (version) {
         const moduleRootPath = (0, find_root_dir_js_1.findRootDir)(modulePath);
@@ -55,7 +93,7 @@ function has(name) {
             const pkg = requireFromCwd(`${moduleRootPath}/package.json`);
             return semver_1.default.lte(version, pkg.version);
         }
-        catch (_e) {
+        catch {
             return false;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ota-meshi/eslint-plugin",
-  "version": "0.17.5",
+  "version": "0.18.0",
   "description": "ESLint configuration plugin for me.",
   "repository": "git+https://github.com/ota-meshi/eslint-plugin.git",
   "homepage": "https://github.com/ota-meshi/eslint-plugin#readme",
@@ -35,17 +35,17 @@
   },
   "devDependencies": {
     "@eslint-community/eslint-plugin-eslint-comments": "^4.3.0",
-    "@types/eslint": "^8.56.7",
+    "@types/eslint": "^9.0.0",
     "@types/eslint__js": "^8.42.3",
-    "@types/node": "^20.12.7",
+    "@types/node": "^22.0.0",
     "@types/semver": "^7.5.8",
-    "@typescript-eslint/eslint-plugin": "^7.0.0",
-    "@typescript-eslint/parser": "^7.0.0",
+    "@typescript-eslint/eslint-plugin": "^8.16.0",
+    "@typescript-eslint/parser": "^8.16.0",
     "eslint": "^9.5.0",
-    "eslint-config-prettier": "^9.0.0",
+    "eslint-config-prettier": "^10.0.0",
     "eslint-plugin-astro": "^1.0.0",
-    "eslint-plugin-eslint-plugin": "^6.0.0",
-    "eslint-plugin-jsdoc": "^48.2.3",
+    "eslint-plugin-eslint-plugin": "^7.0.0",
+    "eslint-plugin-jsdoc": "^50.0.0",
     "eslint-plugin-json-schema-validator": "^5.0.0",
     "eslint-plugin-jsonc": "^2.0.0",
     "eslint-plugin-markdown": "^5.0.0",
@@ -54,16 +54,16 @@
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-regexp": "^2.5.0",
     "eslint-plugin-svelte": "^2.36.0",
-    "eslint-plugin-toml": "^0.11.0",
+    "eslint-plugin-toml": "^0.12.0",
     "eslint-plugin-vue": "^9.0.0",
     "eslint-plugin-yml": "^1.0.0",
-    "mocha": "^10.0.0",
+    "mocha": "^11.0.0",
     "prettier": "^3.0.0",
     "prettier-plugin-pkg": "^0.18.0",
     "prettier-plugin-svelte": "^3.0.0",
-    "svelte": "^4.0.0",
+    "svelte": "^5.0.0",
     "typescript": "^5.0.0",
-    "typescript-eslint": "^7.6.0"
+    "typescript-eslint": "^8.16.0"
   },
   "publishConfig": {
     "access": "public"