cleanup(core): remove duplication from transitive lookup function

nrwl · Nov 4, 2022 · c7807f6 · c7807f6
1 parent 4f82e84
commit c7807f6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 18 deletions.
diff --git a/packages/nx/src/utils/lock-file/npm.ts b/packages/nx/src/utils/lock-file/npm.ts
@@ -379,10 +379,6 @@ export function transitiveDependencyNpmLookup(
   versions: PackageVersions,
   version: string
 ): string {
-  if (versions[`${packageName}@${version}`]) {
-    return version;
-  }
-
   const nestedVersion = Object.values(versions).find((v) =>
     v.packageMeta.some(
       (p) =>

diff --git a/packages/nx/src/utils/lock-file/pnpm.ts b/packages/nx/src/utils/lock-file/pnpm.ts
@@ -282,10 +282,6 @@ export function transitiveDependencyPnpmLookup(
   versions: PackageVersions,
   version: string
 ): string {
-  if (versions[`${packageName}@${version}`]) {
-    return version;
-  }
-
   // pnpm's dependencies always point to the exact version so this block is only for insurrance
   return Object.values(versions).find((v) => satisfies(v.version, version))
     ?.version;

diff --git a/packages/nx/src/utils/lock-file/utils.ts b/packages/nx/src/utils/lock-file/utils.ts
@@ -175,12 +175,14 @@ function mapTransitiveDependencies(
     if (versionCache[key]) {
       result.push(versionCache[key]);
     } else {
-      const version = transitiveLookupFn(
-        packageName,
-        parentPackage,
-        packages[packageName],
-        cleanVersion
-      );
+      const version = packages[packageName][`${packageName}@${cleanVersion}`]
+        ? cleanVersion
+        : transitiveLookupFn(
+            packageName,
+            parentPackage,
+            packages[packageName],
+            cleanVersion
+          );
       // for some peer dependencies, we won't find installed version so we'll just ignore these
       if (version) {
         const nodeName = getNodeName(

diff --git a/packages/nx/src/utils/lock-file/yarn.ts b/packages/nx/src/utils/lock-file/yarn.ts
@@ -161,10 +161,6 @@ export function transitiveDependencyYarnLookup(
   versions: PackageVersions,
   version: string
 ): string {
-  if (versions[`${packageName}@${version}`]) {
-    return version;
-  }
-
   return Object.values(versions).find((v) =>
     v.packageMeta.some((p) => p === `${packageName}@${version}`)
   ).version;