@netlify/cache-utils 5.0.0 → 5.0.1

package/lib/dir.js

@@ -1,6 +1,6 @@
 import { resolve } from 'path';
+const DEFAULT_CACHE_DIR = '.netlify/cache/';
 // Retrieve the cache directory location
 export const getCacheDir = function ({ cacheDir = DEFAULT_CACHE_DIR, cwd = '.' } = {}) {
     return resolve(cwd, cacheDir);
 };
-const DEFAULT_CACHE_DIR = '.netlify/cache/';

package/lib/hash.js

@@ -2,6 +2,9 @@ import { createHash } from 'crypto';
 import { createReadStream } from 'fs';
 import getStream from 'get-stream';
 import { locatePath } from 'locate-path';
+// We need a hashing algoritm that's as fast as possible.
+// Userland CRC32 implementations are actually slower than Node.js SHA1.
+const HASH_ALGO = 'sha1';
 // Caching a big directory like `node_modules` is slow. However those can
 // sometime be represented by a digest file such as `package-lock.json`. If this
 // has not changed, we don't need to save cache again.
@@ -25,6 +28,3 @@ const hashFile = async function (path) {
     const hash = await getStream(hashStream);
     return hash;
 };
-// We need a hashing algoritm that's as fast as possible.
-// Userland CRC32 implementations are actually slower than Node.js SHA1.
-const HASH_ALGO = 'sha1';

package/lib/list.js

@@ -3,17 +3,17 @@ import readdirp from 'readdirp';
 import { getCacheDir } from './dir.js';
 import { isManifest } from './manifest.js';
 import { getBases } from './path.js';
+const DEFAULT_DEPTH = 1;
 // List all cached files/directories, at the top-level
-export const list = async function ({ cacheDir, cwd: cwdOpt, depth = DEFAULT_DEPTH } = {}) {
+export const list = async function ({ cacheDir, cwd: cwdOpt, depth = DEFAULT_DEPTH, } = {}) {
     const bases = await getBases(cwdOpt);
     const cacheDirA = getCacheDir({ cacheDir, cwd: cwdOpt });
     const files = await Promise.all(bases.map(({ name, base }) => listBase({ name, base, cacheDir: cacheDirA, depth })));
     const filesA = files.flat();
     return filesA;
 };
-const DEFAULT_DEPTH = 1;
 // TODO: the returned paths are missing the Windows drive
-const listBase = async function ({ name, base, cacheDir, depth }) {
+const listBase = async function ({ name, base, cacheDir, depth, }) {
     const files = await readdirp.promise(`${cacheDir}/${name}`, { fileFilter, depth, type: 'files_directories' });
     const filesA = files.map(({ path }) => join(base, path));
     return filesA;

package/lib/main.js

@@ -7,7 +7,7 @@ import { parsePath } from './path.js';
 export { getCacheDir } from './dir.js';
 export { list } from './list.js';
 // Cache a file
-const saveOne = async function (path, { move = DEFAULT_MOVE, ttl = DEFAULT_TTL, digests = [], cacheDir, cwd: cwdOpt } = {}) {
+const saveOne = async function (path, { move = DEFAULT_MOVE, ttl = DEFAULT_TTL, digests = [], cacheDir, cwd: cwdOpt, } = {}) {
     const { srcPath, cachePath } = await parsePath({ path, cacheDir, cwdOpt });
     if (!(await hasFiles(srcPath))) {
         return false;
@@ -22,7 +22,7 @@ const saveOne = async function (path, { move = DEFAULT_MOVE, ttl = DEFAULT_TTL,
     return true;
 };
 // Restore a cached file
-const restoreOne = async function (path, { move = DEFAULT_MOVE, cacheDir, cwd: cwdOpt } = {}) {
+const restoreOne = async function (path, { move = DEFAULT_MOVE, cacheDir, cwd: cwdOpt, } = {}) {
     const { srcPath, cachePath } = await parsePath({ path, cacheDir, cwdOpt });
     if (!(await hasFiles(cachePath))) {
         return false;
@@ -35,7 +35,7 @@ const restoreOne = async function (path, { move = DEFAULT_MOVE, cacheDir, cwd: c
     return true;
 };
 // Remove the cache of a file
-const removeOne = async function (path, { cacheDir, cwd: cwdOpt } = {}) {
+const removeOne = async function (path, { cacheDir, cwd: cwdOpt, } = {}) {
     const { cachePath } = await parsePath({ path, cacheDir, cwdOpt });
     if (!(await hasFiles(cachePath))) {
         return false;
@@ -45,7 +45,7 @@ const removeOne = async function (path, { cacheDir, cwd: cwdOpt } = {}) {
     return true;
 };
 // Check if a file is cached
-const hasOne = async function (path, { cacheDir, cwd: cwdOpt } = {}) {
+const hasOne = async function (path, { cacheDir, cwd: cwdOpt, } = {}) {
     const { cachePath } = await parsePath({ path, cacheDir, cwdOpt });
     return (await hasFiles(cachePath)) && !(await isExpired(cachePath));
 };

package/lib/manifest.js

@@ -52,7 +52,7 @@ export const isExpired = async function (cachePath) {
 };
 const readManifest = async function (cachePath) {
     const manifestPath = getManifestPath(cachePath);
-    const manifestString = await fs.readFile(manifestPath);
+    const manifestString = await fs.readFile(manifestPath, 'utf-8');
     const manifest = JSON.parse(manifestString);
     return manifest;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/cache-utils",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "Utility for caching files in Netlify Build",
   "type": "module",
   "exports": "./lib/main.js",
@@ -13,8 +13,9 @@
   "scripts": {
     "prebuild": "rm -rf lib",
     "build": "tsc",
-    "test": "ava",
-    "test:ci": "c8 -r lcovonly -r text -r json ava"
+    "test": "vitest run",
+    "test:dev": "vitest",
+    "test:ci": "vitest run --reporter=default"
   },
   "keywords": [
     "nodejs",
@@ -61,13 +62,12 @@
   },
   "devDependencies": {
     "@types/node": "^14.18.31",
-    "ava": "^4.0.0",
-    "c8": "^7.12.0",
     "tmp-promise": "^3.0.0",
-    "typescript": "^4.8.4"
+    "typescript": "^4.8.4",
+    "vitest": "^0.24.1"
   },
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "c4502f1c112e7f33d5e6fa053bfbe7dabdfe0160"
+  "gitHead": "701e883d4e19c048e8de9801e49e21de5c891a18"
 }