restore exact match when no restoreKeys are given

hashbite · May 28, 2021 · ce408ed · ce408ed
1 parent 21e6ee4
commit ce408ed
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/dist/restore/index.js b/dist/restore/index.js
@@ -847,7 +847,9 @@ function restoreCache(paths, primaryKey, restoreKeys, options) {
         // @todo order files by name/date
         yield streamOutputUntilResolved(mkdirPromise);
         const cacheFiles = yield readDirAsync(cacheDir);
-        const potentialCaches = (restoreKeys || [primaryKey]).map(key => filenamify_1.default(key));
+        const potentialCaches = (Array.isArray(restoreKeys) && restoreKeys.length
+            ? restoreKeys
+            : [primaryKey]).map(key => filenamify_1.default(key));
         console.log({ cacheFiles, potentialCaches });
         const result = locateCache(potentialCaches, cacheFiles);
         if (typeof result !== "object") {

diff --git a/dist/save/index.js b/dist/save/index.js
@@ -939,7 +939,9 @@ function restoreCache(paths, primaryKey, restoreKeys, options) {
         // @todo order files by name/date
         yield streamOutputUntilResolved(mkdirPromise);
         const cacheFiles = yield readDirAsync(cacheDir);
-        const potentialCaches = (restoreKeys || [primaryKey]).map(key => filenamify_1.default(key));
+        const potentialCaches = (Array.isArray(restoreKeys) && restoreKeys.length
+            ? restoreKeys
+            : [primaryKey]).map(key => filenamify_1.default(key));
         console.log({ cacheFiles, potentialCaches });
         const result = locateCache(potentialCaches, cacheFiles);
         if (typeof result !== "object") {

diff --git a/src/cache.ts b/src/cache.ts
@@ -115,9 +115,10 @@ export async function restoreCache(
 
     const cacheFiles = await readDirAsync(cacheDir);
 
-    const potentialCaches = (restoreKeys || [primaryKey]).map(key =>
-        filenamify(key)
-    );
+    const potentialCaches = (Array.isArray(restoreKeys) && restoreKeys.length
+        ? restoreKeys
+        : [primaryKey]
+    ).map(key => filenamify(key));
 
     console.log({ cacheFiles, potentialCaches });