@ota-meshi/eslint-plugin 0.15.3 → 0.17.0

package/lib/rules/missing-module-for-config.js

@@ -1,70 +1,52 @@
 "use strict";
-
-const { spawnSync } = require("child_process");
-const getLinters = require("../utils/get-linters");
-const findRootDir = require("../utils/find-root-dir");
-
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.create = exports.meta = void 0;
+const get_linters_js_1 = require("../utils/get-linters.js");
+const module_js_1 = require("../utils/module.js");
 let shouldFix = false;
-const fixedModules = new Set();
 patch();
-
-module.exports = {
-  meta: {
+exports.meta = {
     type: "problem",
     docs: {
-      description: "report missing modules",
-      url: "https://github.com/ota-meshi/eslint-plugin",
+        description: "report missing modules",
+        url: "https://github.com/ota-meshi/eslint-plugin",
     },
     fixable: "code", // or "code" or "whitespace"
     schema: [
-      {
-        type: "array",
-        items: { type: "string" },
-      },
+        {
+            type: "array",
+            items: { type: "string" },
+        },
     ],
-  },
-  create(context) {
+};
+function create(context) {
     const modules = context.options[0];
     for (const moduleName of modules) {
-      let consoleOutput = "";
-      if (shouldFix && !fixedModules.has(moduleName)) {
-        fixedModules.add(moduleName);
-        const cwd = findRootDir(context.getFilename());
-        if (cwd) {
-          const result = spawnSync("npm", ["install", "-D", moduleName], {
-            cwd,
-            windowsHide: true,
-            maxBuffer: Infinity,
-          });
-
-          if (result.error) {
-            throw result.error;
-          }
-          consoleOutput = `\n${result.output}`;
+        let consoleOutput = "";
+        if (shouldFix) {
+            const result = (0, module_js_1.tryInstall)(moduleName, context.filename || context.getFilename());
+            consoleOutput = result ? `\n${result}` : "";
         }
-      }
-      context.report({
-        loc: { line: 1, column: 0 },
-        message: `Missing module of ${moduleName}. run: \`npm i -D ${moduleName}\`${consoleOutput}`,
-      });
+        context.report({
+            loc: { line: 1, column: 0 },
+            message: `Missing module of ${moduleName}. run: \`npm i -D ${moduleName}\`${consoleOutput}`,
+        });
     }
     return {};
-  },
-};
-
+}
+exports.create = create;
 /** Patch */
 function patch() {
-  for (const Linter of getLinters()) {
-    const verify0 = Linter.prototype.verify;
-    Object.defineProperty(Linter.prototype, "verify", {
-      // eslint-disable-next-line no-loop-func -- ignore
-      value(textOrSourceCode, config, options, ...args) {
-        shouldFix =
-          options && typeof options.fix !== "undefined" && options.fix;
-        return verify0.call(this, textOrSourceCode, config, options, ...args);
-      },
-      configurable: true,
-      writable: true,
-    });
-  }
+    for (const Linter of (0, get_linters_js_1.getLinters)()) {
+        const verify0 = Linter.prototype.verify;
+        Object.defineProperty(Linter.prototype, "verify", {
+            // eslint-disable-next-line no-loop-func -- ignore
+            value(textOrSourceCode, config, options, ...args) {
+                shouldFix = Boolean(options && typeof options.fix !== "undefined" && options.fix);
+                return verify0.call(this, textOrSourceCode, config, options, ...args);
+            },
+            configurable: true,
+            writable: true,
+        });
+    }
 }

package/lib/utils/find-root-dir.d.ts

@@ -0,0 +1 @@
+export declare function findRootDir(startPath: string): string | null;

package/lib/utils/find-root-dir.js

@@ -1,23 +1,26 @@
 "use strict";
-
-const fs = require("fs");
-const path = require("path");
-
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findRootDir = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
 /** Check has package json */
 function hasPackageJson(dir) {
-  const filePath = path.join(dir, "package.json");
-  return fs.existsSync(filePath);
+    const filePath = path_1.default.join(dir, "package.json");
+    return fs_1.default.existsSync(filePath);
 }
-
-module.exports = function findRootDir(startPath) {
-  const startDir = path.dirname(path.resolve(startPath));
-  let dir = startDir;
-  while (!hasPackageJson(dir)) {
-    const nextDir = path.dirname(dir);
-    if (!nextDir || nextDir === dir) {
-      return null;
+function findRootDir(startPath) {
+    const startDir = startPath;
+    let dir = startDir;
+    while (!hasPackageJson(dir)) {
+        const nextDir = path_1.default.dirname(dir);
+        if (!nextDir || nextDir === dir) {
+            return null;
+        }
+        dir = nextDir;
     }
-    dir = nextDir;
-  }
-  return dir;
-};
+    return dir;
+}
+exports.findRootDir = findRootDir;

package/lib/utils/get-linters.d.ts

@@ -0,0 +1 @@
+export declare function getLinters(): any[];

package/lib/utils/get-linters.js

@@ -1,29 +1,29 @@
 "use strict";
-
-const path = require("path");
-const needle = `${path.sep}node_modules${path.sep}eslint${path.sep}`;
-
-module.exports = () => {
-  const eslintPaths = new Set(
-    Object.keys(require.cache)
-      .filter((id) => id.includes(needle))
-      .map((id) => id.slice(0, id.indexOf(needle) + needle.length)),
-  );
-  const linters = [];
-
-  for (const eslintPath of eslintPaths) {
-    try {
-      const linter = require(eslintPath).Linter;
-
-      if (linter) {
-        linters.push(linter);
-      }
-    } catch (error) {
-      if (error.code !== "MODULE_NOT_FOUND") {
-        throw error;
-      }
-    }
-  }
-
-  return linters;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLinters = void 0;
+const path_1 = __importDefault(require("path"));
+const needle = `${path_1.default.sep}node_modules${path_1.default.sep}eslint${path_1.default.sep}`;
+function getLinters() {
+    const eslintPaths = new Set(Object.keys(require.cache)
+        .filter((id) => id.includes(needle))
+        .map((id) => id.slice(0, id.indexOf(needle) + needle.length)));
+    const linters = [];
+    for (const eslintPath of eslintPaths) {
+        try {
+            const linter = require(eslintPath).Linter;
+            if (linter) {
+                linters.push(linter);
+            }
+        }
+        catch (error) {
+            if (error.code !== "MODULE_NOT_FOUND") {
+                throw error;
+            }
+        }
+    }
+    return linters;
+}
+exports.getLinters = getLinters;

package/lib/utils/module.d.ts

@@ -0,0 +1,19 @@
+import type { Linter } from "eslint";
+export declare function requireFromCwd(modulePath: string): any;
+export declare function resolveFromCwd(modulePath: string): string;
+export declare function parseModule(name: string): {
+    moduleName: string;
+    version: string;
+} | {
+    moduleName: string;
+    version: null;
+};
+/**
+ * Checks if exists module
+ */
+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 tryInstall(moduleName: string, targetFile?: string): string | null;

package/lib/utils/module.js

@@ -1,76 +1,98 @@
 "use strict";
-
-const semver = require("semver");
-
-module.exports = {
-  has,
-  requireOf,
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tryInstall = exports.requireOf = exports.has = exports.parseModule = exports.resolveFromCwd = exports.requireFromCwd = void 0;
+const semver_1 = __importDefault(require("semver"));
+const find_root_dir_js_1 = require("./find-root-dir.js");
+const module_1 = require("module");
+const path_1 = __importDefault(require("path"));
+const child_process_1 = require("child_process");
+let requireFunction = null;
+function requireFromCwd(modulePath) {
+    if (!requireFunction) {
+        requireFunction = (0, module_1.createRequire)(path_1.default.join(process.cwd(), "__placeholder__.js"));
+    }
+    return requireFunction(modulePath);
+}
+exports.requireFromCwd = requireFromCwd;
+function resolveFromCwd(modulePath) {
+    if (!requireFunction) {
+        requireFunction = (0, module_1.createRequire)(path_1.default.join(process.cwd(), "__placeholder__.js"));
+    }
+    return requireFunction.resolve(modulePath);
+}
+exports.resolveFromCwd = resolveFromCwd;
+function parseModule(name) {
+    const parts = name.split(/@/u);
+    if (parts.length > 1 && parts.slice(0, -1).join("@")) {
+        return {
+            moduleName: parts.slice(0, -1).join("@"),
+            version: parts[parts.length - 1],
+        };
+    }
+    return { moduleName: name, version: null };
+}
+exports.parseModule = parseModule;
 /**
  * Checks if exists module
- * @param {string} name
  */
 function has(name) {
-  const parts = name.split(/@/u);
-  if (parts.length > 1 && parts[0]) {
-    const v = parts[parts.length - 1];
+    const { moduleName, version } = parseModule(name);
+    let modulePath;
     try {
-      const pkg = require(`${parts.slice(0, -1).join("@")}/package.json`);
-      return semver.lte(v, pkg.version);
-    } catch (_e) {
-      return false;
+        modulePath = resolveFromCwd(moduleName);
+    }
+    catch (_e) {
+        return false;
+    }
+    if (version) {
+        const moduleRootPath = (0, find_root_dir_js_1.findRootDir)(modulePath);
+        try {
+            const pkg = requireFromCwd(`${moduleRootPath}/package.json`);
+            return semver_1.default.lte(version, pkg.version);
+        }
+        catch (_e) {
+            return false;
+        }
     }
-  }
-  try {
-    require.resolve(name);
     return true;
-  } catch (_e) {
-    return false;
-  }
 }
-
+exports.has = has;
 /**
  * Checks exists module and return config
  */
 function requireOf(names, getConfig, fallback) {
-  let missings = names.filter((n) => !has(n));
-
-  if (missings.length) {
-    const fb =
-      (typeof fallback === "function"
-        ? {
-            fallback,
-          }
-        : fallback) || {};
-    if (fb.fallback) {
-      Object.assign(fb, fb.fallback());
-      delete fb.fallback;
+    const missingList = names.filter((n) => !has(n));
+    if (!missingList.length) {
+        return getConfig();
     }
-
-    // getFallback, files
-    if (fb.files && fb.files.length) {
-      return {
-        overrides: [
-          {
-            plugins: ["@ota-meshi"],
-            rules: {
-              "@ota-meshi/missing-module-for-config": ["error", missings],
-            },
-            ...fb,
-            files: [...fb.files, "*missing-parser.js"],
-          },
-        ],
-      };
+    return fallback(missingList);
+}
+exports.requireOf = requireOf;
+const installedModules = new Set();
+function tryInstall(moduleName, targetFile = process.cwd()) {
+    if (installedModules.has(moduleName))
+        return null;
+    const cwd = (0, find_root_dir_js_1.findRootDir)(targetFile);
+    if (cwd) {
+        installedModules.add(moduleName);
+        const parsed = parseModule(moduleName);
+        const result = (0, child_process_1.spawnSync)("npm", [
+            "install",
+            "-D",
+            parsed.moduleName + (parsed.version ? `@^${parsed.version}` : ""),
+        ], {
+            cwd,
+            windowsHide: true,
+            maxBuffer: Infinity,
+        });
+        if (result.error) {
+            throw result.error;
+        }
+        return `${result.output}`;
     }
-    return {
-      plugins: ["@ota-meshi"],
-      rules: {
-        "@ota-meshi/missing-module-for-config": ["error", missings],
-      },
-      ...fb,
-    };
-  }
-
-  return getConfig();
+    return null;
 }
+exports.tryInstall = tryInstall;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ota-meshi/eslint-plugin",
-  "version": "0.15.3",
+  "version": "0.17.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",
@@ -11,41 +11,49 @@
   "license": "MIT",
   "packageManager": "yarn@1.22.22",
   "engines": {
-    "node": "^12.20.0 || ^14.14.0 || >=16"
+    "node": "^18.18.0||^20.9.0||>=21.1.0"
   },
   "main": "lib/index.js",
   "files": [
     "lib"
   ],
   "scripts": {
+    "build": "tsc",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
+    "pretest": "yarn build",
     "test": "mocha \"tests/lib/**/*.js\" --reporter dot --timeout 60000"
   },
   "peerDependencies": {
-    "eslint": "^7.0.0 || ^8.0.0",
-    "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-regexp": "^1.0.0 || ^2.0.0"
+    "@eslint-community/eslint-plugin-eslint-comments": "^4.3.0",
+    "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0",
+    "eslint-plugin-regexp": "^2.5.0"
   },
   "dependencies": {
+    "@eslint/js": "^9.0.0",
     "semver": "^7.3.4"
   },
   "devDependencies": {
+    "@eslint-community/eslint-plugin-eslint-comments": "^4.3.0",
+    "@types/eslint": "^8.56.7",
+    "@types/eslint__js": "^8.42.3",
+    "@types/node": "^20.12.7",
     "@typescript-eslint/eslint-plugin": "^7.0.0",
     "@typescript-eslint/parser": "^7.0.0",
     "eslint": "^8.0.0",
     "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-eslint-plugin": "^5.0.0",
+    "eslint-plugin-astro": "^0.34.0",
+    "eslint-plugin-eslint-plugin": "^6.0.0",
+    "eslint-plugin-jsdoc": "^48.2.3",
     "eslint-plugin-json-schema-validator": "^5.0.0",
     "eslint-plugin-jsonc": "^2.0.0",
-    "eslint-plugin-markdown": "^3.0.0",
-    "eslint-plugin-n": "^16.0.1",
-    "eslint-plugin-node-dependencies": "^0.11.0",
+    "eslint-plugin-markdown": "^4.0.0",
+    "eslint-plugin-n": "^17.0.0",
+    "eslint-plugin-node-dependencies": "^0.12.0",
     "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-regexp": "^2.0.0",
-    "eslint-plugin-svelte": "^2.9.0",
-    "eslint-plugin-toml": "^0.10.0",
+    "eslint-plugin-regexp": "^2.5.0",
+    "eslint-plugin-svelte": "^2.36.0",
+    "eslint-plugin-toml": "^0.11.0",
     "eslint-plugin-vue": "^9.0.0",
     "eslint-plugin-yml": "^1.0.0",
     "mocha": "^10.0.0",
@@ -53,7 +61,8 @@
     "prettier-plugin-pkg": "^0.18.0",
     "prettier-plugin-svelte": "^3.0.0",
     "svelte": "^4.0.0",
-    "typescript": "^5.0.0"
+    "typescript": "^5.0.0",
+    "typescript-eslint": "^7.6.0"
   },
   "publishConfig": {
     "access": "public"