resolving comments

Author: dmitry-shibanov

action.yml

@@ -30,5 +30,5 @@ inputs:
 runs:
   using: 'node12'
   main: 'dist/setup/index.js'
-  post: 'dist/save-cache/index.js'
+  post: 'dist/cache-save/index.js'
   post-if: success()

dist/cache-save/index.js

@@ -39312,16 +39312,16 @@ const getpackageManagerVersion = (packageManager, command) => __awaiter(void 0,
     }
     return '2';
 });
-exports.isPackageManagerCacheSupported = packageManager => {
-    const arr = Array.of(...Object.values(constants_1.LockType));
-    return arr.includes(packageManager);
-};
-exports.getCacheDirectoryPath = (packageManager) => __awaiter(void 0, void 0, void 0, function* () {
+exports.getPackageManagerInfo = (packageManager) => __awaiter(void 0, void 0, void 0, function* () {
     let packageManagerInfo;
+    const arr = Array.of(...Object.values(constants_1.LockType));
+    if (arr.includes(packageManager)) {
+        return null;
+    }
     if (packageManager === 'npm') {
         packageManagerInfo = exports.supportedPackageManagers.npm;
     }
-    else if (packageManager === 'yarn') {
+    else {
         const yarnVersion = yield getpackageManagerVersion('yarn', '--version');
         if (yarnVersion.startsWith('1.')) {
             packageManagerInfo = exports.supportedPackageManagers.yarn1;
@@ -39330,11 +39330,15 @@ exports.getCacheDirectoryPath = (packageManager) => __awaiter(void 0, void 0, vo
             packageManagerInfo = exports.supportedPackageManagers.yarn2;
         }
     }
+    return packageManagerInfo;
+});
+exports.getCacheDirectoryPath = (packageManagerInfo) => __awaiter(void 0, void 0, void 0, function* () {
     const stdOut = yield getCommandOutput(packageManagerInfo.getCacheFolderCommand);
+    const packageManager = Object.keys(packageManagerInfo)[0];
     if (!stdOut) {
         throw new Error(`Could not get cache folder path for ${packageManager}`);
     }
-    return { supportedPackageManager: packageManagerInfo, cachePath: stdOut };
+    return stdOut;
 });
 // https://github.com/actions/runner/blob/master/src/Misc/expressionFunc/hashFiles/src/hashFiles.ts
 // replace it, when the issue will be resolved: https://github.com/actions/toolkit/issues/472
@@ -50346,7 +50350,11 @@ function run() {
 const cachePackages = (packageManager) => __awaiter(void 0, void 0, void 0, function* () {
     const state = core.getState(constants_1.State.CacheMatchedKey);
     const primaryKey = core.getState(constants_1.State.CachePrimaryKey);
-    const { cachePath } = yield cache_utils_1.getCacheDirectoryPath(packageManager);
+    const packageManagerInfo = yield cache_utils_1.getPackageManagerInfo(packageManager);
+    if (!packageManagerInfo) {
+        throw new Error(`Caching for '${packageManager}'is not supported`);
+    }
+    const cachePath = yield cache_utils_1.getCacheDirectoryPath(packageManagerInfo);
     if (primaryKey === state) {
         core.info(`Cache hit occurred on the primary key ${primaryKey}, not saving cache.`);
         return;

dist/setup/index.js

@@ -43402,12 +43402,13 @@ const fs_1 = __importDefault(__webpack_require__(747));
 const constants_1 = __webpack_require__(196);
 const cache_utils_1 = __webpack_require__(452);
 exports.restoreCache = (packageManager) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!cache_utils_1.isPackageManagerCacheSupported(packageManager)) {
+    const packageManagerInfo = yield cache_utils_1.getPackageManagerInfo(packageManager);
+    if (!packageManagerInfo) {
         throw new Error(`Caching for '${packageManager}'is not supported`);
     }
     const platform = process.env.RUNNER_OS;
-    const { cachePath, supportedPackageManager } = yield cache_utils_1.getCacheDirectoryPath(packageManager);
-    const lockFilePath = findLockFile(supportedPackageManager);
+    const cachePath = yield cache_utils_1.getCacheDirectoryPath(packageManagerInfo);
+    const lockFilePath = findLockFile(packageManagerInfo);
     const fileHash = yield cache_utils_1.hashFile(lockFilePath);
     const primaryKey = `${platform}-${packageManager}-${fileHash}`;
     core.saveState(constants_1.State.CachePrimaryKey, primaryKey);
@@ -44718,16 +44719,16 @@ const getpackageManagerVersion = (packageManager, command) => __awaiter(void 0,
     }
     return '2';
 });
-exports.isPackageManagerCacheSupported = packageManager => {
-    const arr = Array.of(...Object.values(constants_1.LockType));
-    return arr.includes(packageManager);
-};
-exports.getCacheDirectoryPath = (packageManager) => __awaiter(void 0, void 0, void 0, function* () {
+exports.getPackageManagerInfo = (packageManager) => __awaiter(void 0, void 0, void 0, function* () {
     let packageManagerInfo;
+    const arr = Array.of(...Object.values(constants_1.LockType));
+    if (arr.includes(packageManager)) {
+        return null;
+    }
     if (packageManager === 'npm') {
         packageManagerInfo = exports.supportedPackageManagers.npm;
     }
-    else if (packageManager === 'yarn') {
+    else {
         const yarnVersion = yield getpackageManagerVersion('yarn', '--version');
         if (yarnVersion.startsWith('1.')) {
             packageManagerInfo = exports.supportedPackageManagers.yarn1;
@@ -44736,11 +44737,15 @@ exports.getCacheDirectoryPath = (packageManager) => __awaiter(void 0, void 0, vo
             packageManagerInfo = exports.supportedPackageManagers.yarn2;
         }
     }
+    return packageManagerInfo;
+});
+exports.getCacheDirectoryPath = (packageManagerInfo) => __awaiter(void 0, void 0, void 0, function* () {
     const stdOut = yield getCommandOutput(packageManagerInfo.getCacheFolderCommand);
+    const packageManager = Object.keys(packageManagerInfo)[0];
     if (!stdOut) {
         throw new Error(`Could not get cache folder path for ${packageManager}`);
     }
-    return { supportedPackageManager: packageManagerInfo, cachePath: stdOut };
+    return stdOut;
 });
 // https://github.com/actions/runner/blob/master/src/Misc/expressionFunc/hashFiles/src/hashFiles.ts
 // replace it, when the issue will be resolved: https://github.com/actions/toolkit/issues/472

src/cache-restore.ts

@@ -7,21 +7,20 @@ import {State, Outputs} from './constants';
 import {
   getCacheDirectoryPath,
   hashFile,
-  isPackageManagerCacheSupported,
-  SupportedPackageInfo,
+  getPackageManagerInfo,
+  PackageInfo,
   supportedPackageManagers
 } from './cache-utils';
 
 export const restoreCache = async (packageManager: string) => {
-  if (!isPackageManagerCacheSupported(packageManager)) {
+  const packageManagerInfo = await getPackageManagerInfo(packageManager);
+  if (!packageManagerInfo) {
     throw new Error(`Caching for '${packageManager}'is not supported`);
   }
   const platform = process.env.RUNNER_OS;
-  const {cachePath, supportedPackageManager} = await getCacheDirectoryPath(
-    packageManager
-  );
+  const cachePath = await getCacheDirectoryPath(packageManagerInfo);
 
-  const lockFilePath = findLockFile(supportedPackageManager);
+  const lockFilePath = findLockFile(packageManagerInfo);
   const fileHash = await hashFile(lockFilePath);
   const primaryKey = `${platform}-${packageManager}-${fileHash}`;
   core.saveState(State.CachePrimaryKey, primaryKey);
@@ -39,7 +38,7 @@ export const restoreCache = async (packageManager: string) => {
   core.info(`Cache restored from key: ${cacheKey}`);
 };
 
-const findLockFile = (supportedPackageManager: SupportedPackageInfo) => {
+const findLockFile = (supportedPackageManager: PackageInfo) => {
   let lockFiles = supportedPackageManager.lockFilePatterns;
   const workspace = process.env.GITHUB_WORKSPACE!;
   const rootContent = fs.readdirSync(workspace);

src/cache-save.ts

@@ -1,7 +1,7 @@
 import * as core from '@actions/core';
 import * as cache from '@actions/cache';
 import {State} from './constants';
-import {getCacheDirectoryPath} from './cache-utils';
+import {getCacheDirectoryPath, getPackageManagerInfo} from './cache-utils';
 
 async function run() {
   const cacheLock = core.getInput('cache');
@@ -15,8 +15,11 @@ async function run() {
 const cachePackages = async (packageManager: string) => {
   const state = core.getState(State.CacheMatchedKey);
   const primaryKey = core.getState(State.CachePrimaryKey);
-
-  const {cachePath} = await getCacheDirectoryPath(packageManager);
+  const packageManagerInfo = await getPackageManagerInfo(packageManager);
+  if (!packageManagerInfo) {
+    throw new Error(`Caching for '${packageManager}'is not supported`);
+  }
+  const cachePath = await getCacheDirectoryPath(packageManagerInfo);
   if (primaryKey === state) {
     core.info(
       `Cache hit occurred on the primary key ${primaryKey}, not saving cache.`

src/cache-utils.ts

@@ -8,10 +8,10 @@ import * as util from 'util';
 import * as path from 'path';
 
 type SupportedPackageManagers = {
-  [prop: string]: SupportedPackageInfo;
+  [prop: string]: PackageInfo;
 };
 
-export interface SupportedPackageInfo {
+export interface PackageInfo {
   lockFilePatterns: Array<string>;
   getCacheFolderCommand: string;
 }
@@ -66,32 +66,40 @@ const getpackageManagerVersion = async (
   return '2';
 };
 
-export const isPackageManagerCacheSupported = packageManager => {
+export const getPackageManagerInfo = async (packageManager: string) => {
+  let packageManagerInfo: PackageInfo;
   const arr = Array.of<string>(...Object.values(LockType));
-  return arr.includes(packageManager);
-};
+  if (arr.includes(packageManager)) {
+    return null;
+  }
 
-export const getCacheDirectoryPath = async (packageManager: string) => {
-  let packageManagerInfo;
   if (packageManager === 'npm') {
     packageManagerInfo = supportedPackageManagers.npm;
-  } else if (packageManager === 'yarn') {
+  } else {
     const yarnVersion = await getpackageManagerVersion('yarn', '--version');
     if (yarnVersion.startsWith('1.')) {
       packageManagerInfo = supportedPackageManagers.yarn1;
     } else {
       packageManagerInfo = supportedPackageManagers.yarn2;
     }
   }
+
+  return packageManagerInfo;
+};
+
+export const getCacheDirectoryPath = async (
+  packageManagerInfo: PackageInfo
+) => {
   const stdOut = await getCommandOutput(
     packageManagerInfo.getCacheFolderCommand
   );
+  const packageManager = Object.keys(packageManagerInfo)[0];
 
   if (!stdOut) {
     throw new Error(`Could not get cache folder path for ${packageManager}`);
   }
 
-  return {supportedPackageManager: packageManagerInfo, cachePath: stdOut};
+  return stdOut;
 };
 
 // https://github.com/actions/runner/blob/master/src/Misc/expressionFunc/hashFiles/src/hashFiles.ts