From 7024c214c6be20d6a4ca5606a7ddc2cf63883caf Mon Sep 17 00:00:00 2001
From: Priyagupta108 <priyagupta108@github.com>
Date: Tue, 23 Sep 2025 12:50:33 +0530
Subject: [PATCH] refactor: enhance package manager detection for auto-caching

---
 dist/setup/index.js | 14 ++++++++------
 src/main.ts         | 18 ++++++++++--------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/dist/setup/index.js b/dist/setup/index.js
index ea80b156..331a0bcc 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -99786,7 +99786,6 @@ function run() {
             if (registryUrl) {
                 auth.configAuthentication(registryUrl, alwaysAuth);
             }
-            const resolvedPackageManager = getNameFromPackageManagerField();
             const cacheDependencyPath = core.getInput('cache-dependency-path');
             if ((0, cache_utils_1.isCacheFeatureAvailable)()) {
                 // if the cache input is provided, use it for caching.
@@ -99795,11 +99794,14 @@ function run() {
                     yield (0, cache_restore_1.restoreCache)(cache, cacheDependencyPath);
                     // package manager npm is detected from package.json, enable auto-caching for npm.
                 }
-                else if (resolvedPackageManager && packagemanagercache) {
-                    core.info("Detected npm as the package manager from package.json's packageManager field. " +
-                        'Auto caching has been enabled for npm. If you want to disable it, set package-manager-cache input to false');
-                    core.saveState(constants_1.State.CachePackageManager, resolvedPackageManager);
-                    yield (0, cache_restore_1.restoreCache)(resolvedPackageManager, cacheDependencyPath);
+                else if (packagemanagercache) {
+                    const resolvedPackageManager = getNameFromPackageManagerField();
+                    if (resolvedPackageManager) {
+                        core.info("Detected npm as the package manager from package.json's packageManager field. " +
+                            'Auto caching has been enabled for npm. If you want to disable it, set package-manager-cache input to false');
+                        core.saveState(constants_1.State.CachePackageManager, resolvedPackageManager);
+                        yield (0, cache_restore_1.restoreCache)(resolvedPackageManager, cacheDependencyPath);
+                    }
                 }
             }
             const matchersPath = path.join(__dirname, '../..', '.github');
diff --git a/src/main.ts b/src/main.ts
index 8e95bf71..1e98895a 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -67,7 +67,6 @@ export async function run() {
       auth.configAuthentication(registryUrl, alwaysAuth);
     }
 
-    const resolvedPackageManager = getNameFromPackageManagerField();
     const cacheDependencyPath = core.getInput('cache-dependency-path');
 
     if (isCacheFeatureAvailable()) {
@@ -76,13 +75,16 @@ export async function run() {
         core.saveState(State.CachePackageManager, cache);
         await restoreCache(cache, cacheDependencyPath);
         // package manager npm is detected from package.json, enable auto-caching for npm.
-      } else if (resolvedPackageManager && packagemanagercache) {
-        core.info(
-          "Detected npm as the package manager from package.json's packageManager field. " +
-            'Auto caching has been enabled for npm. If you want to disable it, set package-manager-cache input to false'
-        );
-        core.saveState(State.CachePackageManager, resolvedPackageManager);
-        await restoreCache(resolvedPackageManager, cacheDependencyPath);
+      } else if (packagemanagercache) {
+        const resolvedPackageManager = getNameFromPackageManagerField();
+        if (resolvedPackageManager) {
+          core.info(
+            "Detected npm as the package manager from package.json's packageManager field. " +
+              'Auto caching has been enabled for npm. If you want to disable it, set package-manager-cache input to false'
+          );
+          core.saveState(State.CachePackageManager, resolvedPackageManager);
+          await restoreCache(resolvedPackageManager, cacheDependencyPath);
+        }
       }
     }