@plugjs/eslint-plugin 0.2.15 → 0.2.16

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.1.1",
+      version: "4.2.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)",
@@ -78,7 +78,6 @@ var require_package = __commonJS({
         eslint: "^8.57.0 || ^9.0.0"
       },
       dependencies: {
-        "@typescript-eslint/typescript-estree": "^8.1.0",
         "@typescript-eslint/utils": "^8.1.0",
         debug: "^4.3.4",
         doctrine: "^3.0.0",
@@ -314,9 +313,7 @@ var require_typescript = __commonJS({
           "@typescript-eslint/parser": [...typeScriptExtensions]
         },
         "import-x/resolver": {
-          node: {
-            extensions: allExtensions
-          }
+          typescript: true
         }
       },
       rules: {
@@ -434,9 +431,7 @@ var require_typescript2 = __commonJS({
           "@typescript-eslint/parser": [...typeScriptExtensions]
         },
         "import-x/resolver": {
-          node: {
-            extensions: allExtensions
-          }
+          typescript: true
         }
       },
       rules: {
@@ -680,9 +675,12 @@ var require_parse = __commonJS({
     exports2.parse = parse;
     var tslib_12 = require("tslib");
     var node_path_1 = tslib_12.__importDefault(require("node:path"));
-    var typescript_estree_1 = require("@typescript-eslint/typescript-estree");
     var debug_1 = tslib_12.__importDefault(require("debug"));
     var module_require_1 = require_module_require();
+    function withoutProjectParserOptions(opts) {
+      const { EXPERIMENTAL_useProjectService, project, projectService, ...rest } = opts;
+      return rest;
+    }
     var log = (0, debug_1.default)("eslint-plugin-import-x:parse");
     function keysFromParser(parserPath, parserInstance, parsedResult) {
       if (parsedResult && parsedResult.visitorKeys) {
@@ -722,7 +720,7 @@ var require_parse = __commonJS({
       parserOptions.loc = true;
       parserOptions.range = true;
       parserOptions.filePath = path;
-      parserOptions = (0, typescript_estree_1.withoutProjectParserOptions)(parserOptions);
+      parserOptions = withoutProjectParserOptions(parserOptions);
       const parser = typeof parserOrPath === "string" ? (0, module_require_1.moduleRequire)(parserOrPath) : parserOrPath;
       content = transformHashbang(stripUnicodeBOM(String(content)));
       if ("parseForESLint" in parser && typeof parser.parseForESLint === "function") {
@@ -3876,7 +3874,7 @@ var require_newline_after_import = __commonJS({
             });
           }
         }
-        function commentAfterImport(node, nextComment) {
+        function commentAfterImport(node, nextComment, type) {
           const lineDifference = getLineDifference(node, nextComment);
           const EXPECTED_LINE_DIFFERENCE = options.count + 1;
           if (lineDifference < EXPECTED_LINE_DIFFERENCE) {
@@ -3893,7 +3891,7 @@ var require_newline_after_import = __commonJS({
               data: {
                 count: options.count,
                 lineSuffix: options.count > 1 ? "s" : "",
-                type: "import"
+                type
               },
               fix: options.exactCount && EXPECTED_LINE_DIFFERENCE < lineDifference ? void 0 : (fixer) => fixer.insertTextAfter(node, "\n".repeat(EXPECTED_LINE_DIFFERENCE - lineDifference))
             });
@@ -3922,7 +3920,7 @@ var require_newline_after_import = __commonJS({
             return;
           }
           if (nextComment) {
-            commentAfterImport(node, nextComment);
+            commentAfterImport(node, nextComment, "import");
           } else if (nextNode && nextNode.type !== "ImportDeclaration" && (nextNode.type !== "TSImportEqualsDeclaration" || nextNode.isExport)) {
             checkForNewLine(node, nextNode, "import");
           }
@@ -3949,7 +3947,16 @@ var require_newline_after_import = __commonJS({
                 continue;
               }
               if (nextStatement && (!nextRequireCall || !containsNodeOrEqual(nextStatement, nextRequireCall))) {
-                checkForNewLine(statementWithRequireCall, nextStatement, "require");
+                let nextComment;
+                if ("comments" in statementWithRequireCall.parent && statementWithRequireCall.parent.comments !== void 0 && options.considerComments) {
+                  const endLine = node2.loc.end.line;
+                  nextComment = statementWithRequireCall.parent.comments.find((o) => o.loc.start.line >= endLine && o.loc.start.line <= endLine + options.count + 1);
+                }
+                if (nextComment && nextComment !== void 0) {
+                  commentAfterImport(statementWithRequireCall, nextComment, "require");
+                } else {
+                  checkForNewLine(statementWithRequireCall, nextStatement, "require");
+                }
               }
             }
           },
@@ -4783,6 +4790,18 @@ var require_no_duplicates = __commonJS({
           ];
         }, ["", !firstHasTrailingComma && !firstIsEmpty, firstExistingIdentifiers]);
         const fixes = [];
+        if (shouldAddSpecifiers && preferInline && first.importKind === "type") {
+          const typeIdentifierToken = tokens.find((token) => token.type === "Identifier" && token.value === "type");
+          if (typeIdentifierToken) {
+            fixes.push(fixer.removeRange([
+              typeIdentifierToken.range[0],
+              typeIdentifierToken.range[1] + 1
+            ]));
+          }
+          for (const identifier of tokens.filter((token) => firstExistingIdentifiers.has(token.value))) {
+            fixes.push(fixer.replaceTextRange([identifier.range[0], identifier.range[1]], `type ${identifier.value}`));
+          }
+        }
         if (openBrace == null && shouldAddSpecifiers && shouldAddDefault()) {
           fixes.push(fixer.insertTextAfter(firstToken, ` ${defaultImportName}, {${specifiersText}} from`));
         } else if (openBrace == null && !shouldAddSpecifiers && shouldAddDefault()) {
@@ -5251,7 +5270,7 @@ var require_no_extraneous_dependencies = __commonJS({
         isInBundledDeps: result.isInBundledDeps || deps.bundledDependencies.includes(ancestorName)
       }), newDeclarationStatus);
     }
-    function reportIfMissing(context, deps, depsOptions, node, name) {
+    function reportIfMissing(context, deps, depsOptions, node, name, whitelist) {
       if (!depsOptions.verifyTypeImports && ("importKind" in node && (node.importKind === "type" || node.importKind === "typeof") || "exportKind" in node && node.exportKind === "type" || "specifiers" in node && Array.isArray(node.specifiers) && node.specifiers.length > 0 && node.specifiers.every((specifier) => "importKind" in specifier && (specifier.importKind === "type" || specifier.importKind === "typeof")))) {
         return;
       }
@@ -5276,6 +5295,9 @@ var require_no_extraneous_dependencies = __commonJS({
         }
       }
       const packageName = realPackageName || importPackageName;
+      if (whitelist?.has(packageName)) {
+        return;
+      }
       if (declarationStatus.isInDevDeps && !depsOptions.allowDevDeps) {
         context.report({
           node,
@@ -5328,7 +5350,8 @@ var require_no_extraneous_dependencies = __commonJS({
               bundledDependencies: { type: ["boolean", "array"] },
               packageDir: { type: ["string", "array"] },
               includeInternal: { type: ["boolean"] },
-              includeTypes: { type: ["boolean"] }
+              includeTypes: { type: ["boolean"] },
+              whitelist: { type: ["array"] }
             },
             additionalProperties: false
           }
@@ -5356,7 +5379,7 @@ var require_no_extraneous_dependencies = __commonJS({
         };
         return {
           ...(0, utils_1.moduleVisitor)((source, node) => {
-            reportIfMissing(context, deps, depsOptions, node, source.value);
+            reportIfMissing(context, deps, depsOptions, node, source.value, options.whitelist ? new Set(options.whitelist) : void 0);
           }, { commonjs: true }),
           "Program:exit"() {
             depFieldCache.clear();
@@ -6970,15 +6993,9 @@ var require_no_unused_modules = __commonJS({
         }
       }
     };
-    var getSrc = (src) => {
-      if (src) {
-        return src;
-      }
-      return [process.cwd()];
-    };
     var srcFiles;
     var lastPrepareKey;
-    var doPreparation = (src = [], ignoreExports, context) => {
+    var doPreparation = (src, ignoreExports, context) => {
       const prepareKey = JSON.stringify({
         src: src.sort(),
         ignoreExports: (ignoreExports || []).sort(),
@@ -6991,7 +7008,7 @@ var require_no_unused_modules = __commonJS({
       exportList.clear();
       ignoredFiles.clear();
       filesOutsideSrc.clear();
-      srcFiles = resolveFiles(getSrc(src), ignoreExports, context);
+      srcFiles = resolveFiles(src, ignoreExports, context);
       prepareImportsAndExports(srcFiles, context);
       determineUsage();
       lastPrepareKey = prepareKey;
@@ -7115,7 +7132,7 @@ var require_no_unused_modules = __commonJS({
       },
       defaultOptions: [],
       create(context) {
-        const { src, ignoreExports = [], missingExports, unusedExports, ignoreUnusedTypeExports } = context.options[0] || {};
+        const { src = [process.cwd()], ignoreExports = [], missingExports, unusedExports, ignoreUnusedTypeExports } = context.options[0] || {};
         if (unusedExports) {
           doPreparation(src, ignoreExports, context);
         }
@@ -7161,7 +7178,7 @@ var require_no_unused_modules = __commonJS({
             return;
           }
           if (!srcFiles.has(filename)) {
-            srcFiles = resolveFiles(getSrc(src), ignoreExports, context);
+            srcFiles = resolveFiles(src, ignoreExports, context);
             if (!srcFiles.has(filename)) {
               filesOutsideSrc.add(filename);
               return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plugjs/eslint-plugin",
-  "version": "0.2.15",
+  "version": "0.2.16",
   "description": "Shared ESLint configurations and extras",
   "main": "./index.mjs",
   "type": "module",
@@ -37,13 +37,12 @@
   "dependencies": {
     "@eslint/js": "9.9.1",
     "@nolyfill/is-core-module": "1.0.39",
-    "@typescript-eslint/typescript-estree": "8.3.0",
-    "@typescript-eslint/utils": "8.3.0",
-    "debug": "4.3.6",
+    "@typescript-eslint/utils": "8.4.0",
+    "debug": "4.3.7",
     "doctrine": "3.0.0",
     "enhanced-resolve": "5.17.1",
     "eslint": "9.9.1",
-    "eslint-module-utils": "2.8.2",
+    "eslint-module-utils": "2.10.0",
     "eslint-plugin-unicorn": "55.0.0",
     "eslint-visitor-keys": "4.0.0",
     "espree": "10.1.0",
@@ -61,6 +60,6 @@
     "stable-hash": "0.0.4",
     "tslib": "2.7.0",
     "typescript": "5.5.4",
-    "typescript-eslint": "8.3.0"
+    "typescript-eslint": "8.4.0"
   }
 }