Remove module resolving from plugins

Author: webpro

packages/knip/src/binaries/package-manager/bun.ts

@@ -1,6 +1,8 @@
 import parseArgs from 'minimist';
 import type { Resolver } from '../../types/config.js';
-import { tryResolveFilePath } from '../util.js';
+import { toEntry } from '../../util/dependencies.js';
+import { isFile } from '../../util/fs.js';
+import { isAbsolute, join } from '../../util/path.js';
 
 const commands = ['add', 'create', 'init', 'install', 'link', 'pm', 'remove', 'run', 'test', 'update', 'upgrade'];
 
@@ -10,7 +12,7 @@ export const resolve: Resolver = (_binary, args, { manifestScriptNames, cwd, fro
   if (command === 'run' && manifestScriptNames.has(script)) return [];
   if (manifestScriptNames.has(command) || commands.includes(command)) return [];
   const filePath = command === 'run' ? script : command;
-  const specifier = tryResolveFilePath(cwd, filePath);
-  if (specifier) return [specifier];
+  const absFilePath = isAbsolute(filePath) ? filePath : join(cwd, filePath);
+  if (isFile(absFilePath)) return [toEntry(absFilePath)];
   return fromArgs(args);
 };

packages/knip/src/binaries/util.ts

@@ -1,28 +1,3 @@
-import { toBinary, toDependency, toEntry } from '../util/dependencies.js';
-import { getPackageNameFromFilePath, getPackageNameFromModuleSpecifier } from '../util/modules.js';
-import { isAbsolute, isInNodeModules, join } from '../util/path.js';
-import { _resolveSync } from '../util/resolve.js';
-
-export const tryResolveFilePath = (cwd: string, specifier: string, acceptModuleSpecifier?: boolean) => {
-  if (specifier) {
-    const filePath = isAbsolute(specifier) ? specifier : join(cwd, specifier);
-    if (!isInNodeModules(filePath)) {
-      const resolvedFilePath = _resolveSync(filePath, cwd);
-      if (resolvedFilePath) {
-        return toEntry(resolvedFilePath);
-      }
-      if (acceptModuleSpecifier) {
-        const p = getPackageNameFromModuleSpecifier(specifier);
-        if (p) return toDependency(p);
-      }
-    } else if (specifier.includes('node_modules/.bin')) {
-      return toBinary(trimBinary(specifier));
-    } else {
-      return toDependency(getPackageNameFromFilePath(specifier));
-    }
-  }
-};
-
 export const stripVersionFromSpecifier = (specifier: string) => specifier.replace(/(\S+)@.*/, '$1');
 
 const stripNodeModulesFromPath = (command: string) => command.replace(/^(\.\/)?node_modules\//, '');

packages/knip/src/util/handle-referenced-dependency.ts

@@ -3,13 +3,10 @@ import type { DependencyDeputy } from '../DependencyDeputy.js';
 import type { IssueCollector } from '../IssueCollector.js';
 import { IGNORED_RUNTIME_DEPENDENCIES } from '../constants.js';
 import { type Dependency, fromBinary, isBinary, isConfigPattern, isDependency } from './dependencies.js';
-import { getPackageNameFromFilePath, getPackageNameFromModuleSpecifier } from './modules.js';
-import { dirname, isAbsolute, isInNodeModules, isInternal, join } from './path.js';
+import { getPackageNameFromSpecifier } from './modules.js';
+import { dirname, isAbsolute, isInternal, join } from './path.js';
 import { _resolveSync } from './resolve.js';
 
-const getPackageName = (specifier: string) =>
-  isInNodeModules(specifier) ? getPackageNameFromFilePath(specifier) : getPackageNameFromModuleSpecifier(specifier);
-
 /**
  * Resolve internal file paths + collect issues
  *
@@ -41,7 +38,7 @@ export const getReferencedDependencyHandler =
       return;
     }
 
-    const packageName = getPackageName(specifier);
+    const packageName = getPackageNameFromSpecifier(specifier);
 
     if (packageName) {
       // Attempt fast path first for external dependencies and internal workspaces

packages/knip/src/util/modules.ts

@@ -1,6 +1,6 @@
 import { isBuiltin } from 'node:module';
 import { DT_SCOPE } from '../constants.js';
-import { isAbsolute, toPosix } from './path.js';
+import { isAbsolute, isInNodeModules, toPosix } from './path.js';
 
 export const getPackageNameFromModuleSpecifier = (moduleSpecifier: string) => {
   if (!isStartsLikePackageName(moduleSpecifier)) return;
@@ -15,6 +15,9 @@ export const getPackageNameFromFilePath = (value: string) => {
   return value;
 };
 
+export const getPackageNameFromSpecifier = (specifier: string) =>
+  isInNodeModules(specifier) ? getPackageNameFromFilePath(specifier) : getPackageNameFromModuleSpecifier(specifier);
+
 export const isStartsLikePackageName = (specifier: string) => /^(@[a-z0-9._]|[a-z0-9])/.test(specifier);
 
 export const isDefinitelyTyped = (packageName: string) => packageName.startsWith(`${DT_SCOPE}/`);