@plugjs/eslint-plugin 0.2.18 → 0.2.20

package/bundles/eslint-plugin-import-x.cjs

@@ -30,7 +30,7 @@ var require_package = __commonJS({
   "node_modules/eslint-plugin-import-x/package.json"(exports2, module2) {
     module2.exports = {
       name: "eslint-plugin-import-x",
-      version: "4.2.1",
+      version: "4.3.1",
       description: "Import with sanity.",
       repository: "git+https://github.com/un-ts/eslint-plugin-import-x",
       author: "JounQin <admin@1stg.me> (https://www.1stG.me)",
@@ -947,9 +947,6 @@ var require_resolve = __commonJS({
       if (cachedPath !== void 0) {
         return { found: true, path: cachedPath };
       }
-      function cache(resolvedPath) {
-        fileExistsCache.set(cacheKey, resolvedPath);
-      }
       function withResolver(resolver, config) {
         if (resolver.interfaceVersion === 2) {
           return resolver.resolve(modulePath, sourceFile, config);
@@ -974,14 +971,16 @@ var require_resolve = __commonJS({
       const configResolvers = settings["import-x/resolver"] || {
         node: settings["import-x/resolve"]
       };
-      const resolvers = resolverReducer(configResolvers, /* @__PURE__ */ new Map());
-      for (const [name, config] of resolvers) {
-        const resolver = requireResolver(name, sourceFile);
-        const resolved = withResolver(resolver, config);
+      const resolvers = normalizeConfigResolvers(configResolvers, sourceFile);
+      for (const { enable, options, resolver } of resolvers) {
+        if (!enable) {
+          continue;
+        }
+        const resolved = withResolver(resolver, options);
         if (!resolved.found) {
           continue;
         }
-        cache(resolved.path);
+        fileExistsCache.set(cacheKey, resolved.path);
         return resolved;
       }
       return { found: false };
@@ -989,25 +988,50 @@ var require_resolve = __commonJS({
     function relative(modulePath, sourceFile, settings) {
       return fullResolve(modulePath, sourceFile, settings).path;
     }
-    function resolverReducer(resolvers, map) {
-      if (Array.isArray(resolvers)) {
-        for (const r of resolvers)
-          resolverReducer(r, map);
-        return map;
-      }
-      if (typeof resolvers === "string") {
-        map.set(resolvers, null);
-        return map;
-      }
-      if (typeof resolvers === "object") {
-        for (const [key, value] of Object.entries(resolvers)) {
-          map.set(key, value);
+    function normalizeConfigResolvers(resolvers, sourceFile) {
+      const resolverArray = Array.isArray(resolvers) ? resolvers : [resolvers];
+      const map = /* @__PURE__ */ new Map();
+      for (const nameOrRecordOrObject of resolverArray) {
+        if (typeof nameOrRecordOrObject === "string") {
+          const name = nameOrRecordOrObject;
+          map.set(name, {
+            name,
+            enable: true,
+            options: void 0,
+            resolver: requireResolver(name, sourceFile)
+          });
+        } else if (typeof nameOrRecordOrObject === "object") {
+          if (nameOrRecordOrObject.name && nameOrRecordOrObject.resolver) {
+            const object = nameOrRecordOrObject;
+            const { name, enable = true, options, resolver } = object;
+            map.set(name, { name, enable, options, resolver });
+          } else {
+            const record = nameOrRecordOrObject;
+            for (const [name, enableOrOptions] of Object.entries(record)) {
+              if (typeof enableOrOptions === "boolean") {
+                map.set(name, {
+                  name,
+                  enable: enableOrOptions,
+                  options: void 0,
+                  resolver: requireResolver(name, sourceFile)
+                });
+              } else {
+                map.set(name, {
+                  name,
+                  enable: true,
+                  options: enableOrOptions,
+                  resolver: requireResolver(name, sourceFile)
+                });
+              }
+            }
+          }
+        } else {
+          const err = new Error("invalid resolver config");
+          err.name = ERROR_NAME;
+          throw err;
         }
-        return map;
       }
-      const err = new Error("invalid resolver config");
-      err.name = ERROR_NAME;
-      throw err;
+      return [...map.values()];
     }
     function getBaseDir(sourceFile) {
       return (0, pkg_dir_1.pkgDir)(sourceFile) || process.cwd();
@@ -1882,7 +1906,11 @@ var require_import_declaration = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.importDeclaration = void 0;
+    var utils_1 = require("@typescript-eslint/utils");
     var importDeclaration = (context, node) => {
+      if (node.parent && node.parent.type === utils_1.AST_NODE_TYPES.ImportDeclaration) {
+        return node.parent;
+      }
       const ancestors = context.sourceCode.getAncestors(node);
       return ancestors[ancestors.length - 1];
     };
@@ -4929,8 +4957,13 @@ var require_no_duplicates = __commonJS({
             };
             moduleMaps.set(parent, map);
           }
-          if (!preferInline && n.importKind === "type") {
-            return n.specifiers.length > 0 && n.specifiers[0].type === "ImportDefaultSpecifier" ? map.defaultTypesImported : map.namedTypesImported;
+          if (n.importKind === "type") {
+            if (n.specifiers.length > 0 && n.specifiers[0].type === "ImportDefaultSpecifier") {
+              return map.defaultTypesImported;
+            }
+            if (!preferInline) {
+              return map.namedTypesImported;
+            }
           }
           if (!preferInline && n.specifiers.some((spec) => "importKind" in spec && spec.importKind === "type")) {
             return map.namedTypesImported;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plugjs/eslint-plugin",
-  "version": "0.2.18",
+  "version": "0.2.20",
   "description": "Shared ESLint configurations and extras",
   "main": "./index.mjs",
   "type": "module",
@@ -10,7 +10,7 @@
     "build": "eslint"
   },
   "peerDependencies": {
-    "eslint": "^9.10.0"
+    "eslint": "^9.11.1"
   },
   "files": [
     "*.md",
@@ -35,21 +35,21 @@
   },
   "homepage": "https://github.com/plugjs/eslint-plugin#readme",
   "dependencies": {
-    "@eslint/js": "9.10.0",
+    "@eslint/js": "9.11.1",
     "@nolyfill/is-core-module": "1.0.39",
-    "@typescript-eslint/utils": "8.6.0",
+    "@typescript-eslint/utils": "8.8.0",
     "debug": "4.3.7",
     "doctrine": "3.0.0",
     "enhanced-resolve": "5.17.1",
-    "eslint": "9.10.0",
-    "eslint-module-utils": "2.11.0",
-    "eslint-plugin-unicorn": "55.0.0",
-    "eslint-visitor-keys": "4.0.0",
-    "espree": "10.1.0",
+    "eslint": "9.11.1",
+    "eslint-module-utils": "2.12.0",
+    "eslint-plugin-unicorn": "56.0.0",
+    "eslint-visitor-keys": "4.1.0",
+    "espree": "10.2.0",
     "estraverse": "5.3.0",
     "fast-glob": "3.3.2",
     "get-tsconfig": "4.8.1",
-    "globals": "15.9.0",
+    "globals": "15.10.0",
     "is-bun-module": "1.2.1",
     "is-core-module": "2.15.1",
     "is-glob": "4.0.3",
@@ -60,6 +60,6 @@
     "stable-hash": "0.0.4",
     "tslib": "2.7.0",
     "typescript": "5.6.2",
-    "typescript-eslint": "8.6.0"
+    "typescript-eslint": "8.8.0"
   }
 }