Fix binary extraction from specifier

webpro-nl · Oct 28, 2024 · d61069d · d61069d
1 parent 229f5b3
commit d61069d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 21 deletions.
diff --git a/packages/knip/src/binaries/bash-parser.ts b/packages/knip/src/binaries/bash-parser.ts
@@ -3,10 +3,11 @@ import { pluginArgsMap } from '../plugins.js';
 import type { GetInputsFromScriptsOptions } from '../types/config.js';
 import { debugLogObject } from '../util/debug.js';
 import { type Input, toBinary, toDeferResolve } from '../util/input.js';
+import { extractBinary } from '../util/modules.js';
 import { resolve as fallbackResolve } from './fallback.js';
 import PackageManagerResolvers from './package-manager/index.js';
 import { resolve as resolverFromPlugins } from './plugins.js';
-import { parseNodeArgs, trimBinary } from './util.js';
+import { parseNodeArgs } from './util.js';
 
 // https://vorpaljs.github.io/bash-parser-playground/
 
@@ -35,7 +36,7 @@ export const getDependenciesFromScript = (script: string, options: GetInputsFrom
       switch (node.type) {
         case 'Command': {
           const text = node.name?.text;
-          const binary = text ? trimBinary(text) : text;
+          const binary = text ? extractBinary(text) : text;
 
           const commandExpansions =
             node.prefix

diff --git a/packages/knip/src/binaries/package-manager/npx.ts b/packages/knip/src/binaries/package-manager/npx.ts
@@ -1,8 +1,9 @@
 import parseArgs from 'minimist';
 import type { BinaryResolver } from '../../types/config.js';
 import { toBinary, toDependency } from '../../util/input.js';
+import { stripVersionFromSpecifier } from '../../util/modules.js';
 import { isInternal } from '../../util/path.js';
-import { argsFrom, stripVersionFromSpecifier } from '../util.js';
+import { argsFrom } from '../util.js';
 
 export const resolve: BinaryResolver = (_binary, args, options) => {
   const { fromArgs } = options;

diff --git a/packages/knip/src/binaries/util.ts b/packages/knip/src/binaries/util.ts
@@ -1,16 +1,5 @@
 import parseArgs from 'minimist';
 
-export const stripVersionFromSpecifier = (specifier: string) => specifier.replace(/(\S+)@.*/, '$1');
-
-const stripNodeModulesFromPath = (command: string) => command.replace(/^(\.\/)?node_modules\//, '');
-
-export const trimBinary = (command: string) =>
-  stripVersionFromSpecifier(
-    stripNodeModulesFromPath(command)
-      .replace(/^(\.bin\/)/, '')
-      .replace(/\$\(npm bin\)\/(\w+)/, '$1') // Removed in npm v9
-  );
-
 export const argsFrom = (args: string[], from: string) => args.slice(args.indexOf(from));
 
 export const parseNodeArgs = (args: string[]) =>

diff --git a/packages/knip/src/util/get-referenced-inputs.ts b/packages/knip/src/util/get-referenced-inputs.ts
@@ -1,10 +1,9 @@
 import type { ConfigurationChief, Workspace } from '../ConfigurationChief.js';
 import type { DependencyDeputy } from '../DependencyDeputy.js';
 import type { IssueCollector } from '../IssueCollector.js';
-import { trimBinary } from '../binaries/util.js';
 import { IGNORED_RUNTIME_DEPENDENCIES } from '../constants.js';
 import { debugLog } from './debug.js';
-import { toBinary, toDebugString } from './input.js';
+import { toDebugString } from './input.js';
 import { type Input, fromBinary, isBinary, isConfigPattern, isDeferResolveEntry, isDependency } from './input.js';
 import { getPackageNameFromSpecifier } from './modules.js';
 import { dirname, isAbsolute, isInternal, join } from './path.js';
@@ -28,11 +27,6 @@ export const getReferencedInputsHandler =
 
     if (!containingFilePath || IGNORED_RUNTIME_DEPENDENCIES.has(specifier)) return;
 
-    if (isDeferResolveEntry(input) && specifier.includes('node_modules/.bin')) {
-      // TODO? this quick-fixes edge case for entry like `node node_modules/.bin/jest`, maybe do it in binaries/node.ts alone or call this function again properly to avoid this mutation
-      Object.assign(input, toBinary(trimBinary(input.specifier)));
-    }
-
     if (isBinary(input)) {
       const binaryName = fromBinary(input);
       const ws = (input.dir && chief.findWorkspaceByFilePath(`${input.dir}/`)) || workspace;

diff --git a/packages/knip/src/util/modules.ts b/packages/knip/src/util/modules.ts
@@ -10,6 +10,7 @@ export const getPackageNameFromModuleSpecifier = (moduleSpecifier: string) => {
 
 const lastPackageNameMatch = /(?<=node_modules\/)(@[^/]+\/[^/]+|[^/]+)/g;
 export const getPackageNameFromFilePath = (value: string) => {
+  if (value.includes('node_modules/.bin/')) return extractBinary(value);
   const match = toPosix(value).match(lastPackageNameMatch);
   if (match) return match[match.length - 1];
   return value;
@@ -20,6 +21,17 @@ export const getPackageNameFromSpecifier = (specifier: string) =>
 
 export const isStartsLikePackageName = (specifier: string) => /^(@[a-z0-9._]|[a-z0-9])/.test(specifier);
 
+export const stripVersionFromSpecifier = (specifier: string) => specifier.replace(/(\S+)@.*/, '$1');
+
+const stripNodeModulesFromPath = (command: string) => command.replace(/^(\.\/)?node_modules\//, '');
+
+export const extractBinary = (command: string) =>
+  stripVersionFromSpecifier(
+    stripNodeModulesFromPath(command)
+      .replace(/^(\.bin\/)/, '')
+      .replace(/\$\(npm bin\)\/(\w+)/, '$1') // Removed in npm v9
+  );
+
 export const isDefinitelyTyped = (packageName: string) => packageName.startsWith(`${DT_SCOPE}/`);
 
 export const getDefinitelyTypedFor = (packageName: string) => {