From 897c979165862bfe3032026ab98ff3a54607e9bb Mon Sep 17 00:00:00 2001
From: Miroslav Jonas <missing.manual@gmail.com>
Date: Fri, 4 Nov 2022 16:05:23 +0100
Subject: [PATCH] cleanup(core): remove duplication from transitive lookup
 function

---
 packages/nx/src/utils/lock-file/npm.ts   |  4 ----
 packages/nx/src/utils/lock-file/pnpm.ts  |  4 ----
 packages/nx/src/utils/lock-file/utils.ts | 14 ++++++++------
 packages/nx/src/utils/lock-file/yarn.ts  |  4 ----
 4 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/packages/nx/src/utils/lock-file/npm.ts b/packages/nx/src/utils/lock-file/npm.ts
index b89d91dd497b3..86e29c451c64c 100644
--- 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
index 2ee19e535d301..ec8cda2d25819 100644
--- 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
index d215aaf3a1a00..d604f8fbcf487 100644
--- 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
index 03ad5cedf60a4..803f4ee906816 100644
--- 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;