@lage-run/cache 0.5.4 → 1.1.1

package/CHANGELOG.json

@@ -2,7 +2,28 @@
   "name": "@lage-run/cache",
   "entries": [
     {
-      "date": "Tue, 25 Apr 2023 02:50:56 GMT",
+      "date": "Mon, 08 May 2023 22:26:52 GMT",
+      "tag": "@lage-run/cache_v1.1.1",
+      "version": "1.1.1",
+      "comments": {
+        "patch": [
+          {
+            "author": "kchau@microsoft.com",
+            "package": "@lage-run/cache",
+            "commit": "5a132808f166179bc316a279c9e11a13d3a39103",
+            "comment": "Moved the TargetHasher into @lage-run/hasher package"
+          },
+          {
+            "author": "beachball",
+            "package": "@lage-run/cache",
+            "comment": "Bump @lage-run/target-graph to v0.8.6",
+            "commit": "5a132808f166179bc316a279c9e11a13d3a39103"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 25 Apr 2023 02:51:19 GMT",
       "tag": "@lage-run/cache_v0.5.4",
       "version": "0.5.4",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,21 @@
 # Change Log - @lage-run/cache
 
-This log was last generated on Tue, 25 Apr 2023 02:50:56 GMT and should not be manually modified.
+This log was last generated on Mon, 08 May 2023 22:26:52 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 1.1.1
+
+Mon, 08 May 2023 22:26:52 GMT
+
+### Patches
+
+- Moved the TargetHasher into @lage-run/hasher package (kchau@microsoft.com)
+- Bump @lage-run/target-graph to v0.8.6
+
 ## 0.5.4
 
-Tue, 25 Apr 2023 02:50:56 GMT
+Tue, 25 Apr 2023 02:51:19 GMT
 
 ### Patches
 

package/lib/backfillWrapper.js

@@ -11,12 +11,16 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    createBackfillLogger: ()=>createBackfillLogger,
-    createBackfillCacheConfig: ()=>createBackfillCacheConfig
+    createBackfillLogger: function() {
+        return createBackfillLogger;
+    },
+    createBackfillCacheConfig: function() {
+        return createBackfillCacheConfig;
+    }
 });
-const _os = /*#__PURE__*/ _interopRequireWildcard(require("os"));
-const _backfillConfig = require("backfill-config");
-const _backfillLogger = require("backfill-logger");
+const _os = /*#__PURE__*/ _interop_require_wildcard(require("os"));
+const _backfillconfig = require("backfill-config");
+const _backfilllogger = require("backfill-logger");
 function _getRequireWildcardCache(nodeInterop) {
     if (typeof WeakMap !== "function") return null;
     var cacheBabelInterop = new WeakMap();
@@ -25,7 +29,7 @@ function _getRequireWildcardCache(nodeInterop) {
         return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
     })(nodeInterop);
 }
-function _interopRequireWildcard(obj, nodeInterop) {
+function _interop_require_wildcard(obj, nodeInterop) {
     if (!nodeInterop && obj && obj.__esModule) {
         return obj;
     }
@@ -59,7 +63,7 @@ function _interopRequireWildcard(obj, nodeInterop) {
 function createBackfillLogger() {
     const stdout = process.stdout;
     const stderr = process.stderr;
-    return (0, _backfillLogger.makeLogger)("error", {
+    return (0, _backfilllogger.makeLogger)("error", {
         console: {
             info (...args) {
                 stdout.write(args.join(" ") + _os.EOL);
@@ -74,9 +78,9 @@ function createBackfillLogger() {
     });
 }
 function createBackfillCacheConfig(cwd, cacheOptions = {}, backfillLogger) {
-    const envConfig = (0, _backfillConfig.getEnvConfig)(backfillLogger);
+    const envConfig = (0, _backfillconfig.getEnvConfig)(backfillLogger);
     return {
-        ...(0, _backfillConfig.createDefaultConfig)(cwd),
+        ...(0, _backfillconfig.createDefaultConfig)(cwd),
         ...cacheOptions,
         ...envConfig
     };

package/lib/chunkPromise.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "chunkPromise", {
     enumerable: true,
-    get: ()=>chunkPromise
+    get: function() {
+        return chunkPromise;
+    }
 });
 async function chunkPromise(promises, limit = 5) {
     for(let i = 0; i < promises.length; i += limit){

package/lib/getCacheDirectory.js

@@ -9,12 +9,18 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    getCacheDirectoryRoot: ()=>getCacheDirectoryRoot,
-    getCacheDirectory: ()=>getCacheDirectory,
-    getLogsCacheDirectory: ()=>getLogsCacheDirectory
+    getCacheDirectoryRoot: function() {
+        return getCacheDirectoryRoot;
+    },
+    getCacheDirectory: function() {
+        return getCacheDirectory;
+    },
+    getLogsCacheDirectory: function() {
+        return getLogsCacheDirectory;
+    }
 });
-const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
-function _interopRequireDefault(obj) {
+const _path = /*#__PURE__*/ _interop_require_default(require("path"));
+function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };

package/lib/index.d.ts

@@ -1,6 +1,5 @@
 export { BackfillCacheProvider } from "./providers/BackfillCacheProvider.js";
 export { RemoteFallbackCacheProvider } from "./providers/RemoteFallbackCacheProvider.js";
-export { TargetHasher } from "./TargetHasher.js";
 export type { CacheOptions } from "./types/CacheOptions.js";
 export type { CacheProvider } from "./types/CacheProvider.js";
 export { getCacheDirectory, getLogsCacheDirectory, getCacheDirectoryRoot } from "./getCacheDirectory.js";

package/lib/index.js

@@ -9,14 +9,22 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    BackfillCacheProvider: ()=>_backfillCacheProviderJs.BackfillCacheProvider,
-    RemoteFallbackCacheProvider: ()=>_remoteFallbackCacheProviderJs.RemoteFallbackCacheProvider,
-    TargetHasher: ()=>_targetHasherJs.TargetHasher,
-    getCacheDirectory: ()=>_getCacheDirectoryJs.getCacheDirectory,
-    getLogsCacheDirectory: ()=>_getCacheDirectoryJs.getLogsCacheDirectory,
-    getCacheDirectoryRoot: ()=>_getCacheDirectoryJs.getCacheDirectoryRoot
+    BackfillCacheProvider: function() {
+        return _BackfillCacheProvider.BackfillCacheProvider;
+    },
+    RemoteFallbackCacheProvider: function() {
+        return _RemoteFallbackCacheProvider.RemoteFallbackCacheProvider;
+    },
+    getCacheDirectory: function() {
+        return _getCacheDirectory.getCacheDirectory;
+    },
+    getLogsCacheDirectory: function() {
+        return _getCacheDirectory.getLogsCacheDirectory;
+    },
+    getCacheDirectoryRoot: function() {
+        return _getCacheDirectory.getCacheDirectoryRoot;
+    }
 });
-const _backfillCacheProviderJs = require("./providers/BackfillCacheProvider.js");
-const _remoteFallbackCacheProviderJs = require("./providers/RemoteFallbackCacheProvider.js");
-const _targetHasherJs = require("./TargetHasher.js");
-const _getCacheDirectoryJs = require("./getCacheDirectory.js");
+const _BackfillCacheProvider = require("./providers/BackfillCacheProvider.js");
+const _RemoteFallbackCacheProvider = require("./providers/RemoteFallbackCacheProvider.js");
+const _getCacheDirectory = require("./getCacheDirectory.js");

package/lib/providers/BackfillCacheProvider.js

@@ -4,15 +4,30 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "BackfillCacheProvider", {
     enumerable: true,
-    get: ()=>BackfillCacheProvider
+    get: function() {
+        return BackfillCacheProvider;
+    }
 });
-const _backfillWrapperJs = require("../backfillWrapper.js");
-const _backfillCache = require("backfill-cache");
+const _backfillWrapper = require("../backfillWrapper.js");
+const _backfillcache = require("backfill-cache");
 const _util = require("util");
-const _fs = /*#__PURE__*/ _interopRequireWildcard(require("fs"));
-const _path = /*#__PURE__*/ _interopRequireWildcard(require("path"));
-const _getCacheDirectoryJs = require("../getCacheDirectory.js");
-const _chunkPromiseJs = require("../chunkPromise.js");
+const _fs = /*#__PURE__*/ _interop_require_wildcard(require("fs"));
+const _path = /*#__PURE__*/ _interop_require_wildcard(require("path"));
+const _getCacheDirectory = require("../getCacheDirectory.js");
+const _chunkPromise = require("../chunkPromise.js");
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
 function _getRequireWildcardCache(nodeInterop) {
     if (typeof WeakMap !== "function") return null;
     var cacheBabelInterop = new WeakMap();
@@ -21,7 +36,7 @@ function _getRequireWildcardCache(nodeInterop) {
         return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
     })(nodeInterop);
 }
-function _interopRequireWildcard(obj, nodeInterop) {
+function _interop_require_wildcard(obj, nodeInterop) {
     if (!nodeInterop && obj && obj.__esModule) {
         return obj;
     }
@@ -59,9 +74,9 @@ const MS_IN_A_DAY = 1000 * 60 * 60 * 24;
 class BackfillCacheProvider {
     getTargetCacheStorageProvider(cwd, hash) {
         const { cacheOptions  } = this.options;
-        const { cacheStorageConfig , incrementalCaching  } = (0, _backfillWrapperJs.createBackfillCacheConfig)(cwd, cacheOptions, this.backfillLogger);
+        const { cacheStorageConfig , incrementalCaching  } = (0, _backfillWrapper.createBackfillCacheConfig)(cwd, cacheOptions, this.backfillLogger);
         const cachePath = this.getCachePath(cwd, hash);
-        return (0, _backfillCache.getCacheStorageProvider)(cacheStorageConfig ?? {
+        return (0, _backfillcache.getCacheStorageProvider)(cacheStorageConfig ?? {
             provider: "local"
         }, cachePath, this.backfillLogger, cwd, incrementalCaching);
     }
@@ -117,7 +132,7 @@ class BackfillCacheProvider {
         ];
         const entries = [];
         for (const cacheType of cacheTypes){
-            const cacheTypeDirectory = _path.join((0, _getCacheDirectoryJs.getCacheDirectoryRoot)(this.options.root), cacheType);
+            const cacheTypeDirectory = _path.join((0, _getCacheDirectory.getCacheDirectoryRoot)(this.options.root), cacheType);
             if (_fs.existsSync(cacheTypeDirectory)) {
                 const hashPrefixes = await readdir(cacheTypeDirectory);
                 for (const prefix of hashPrefixes){
@@ -126,7 +141,7 @@ class BackfillCacheProvider {
                 }
             }
         }
-        await (0, _chunkPromiseJs.chunkPromise)(entries.map((entry)=>{
+        await (0, _chunkPromise.chunkPromise)(entries.map((entry)=>{
             return async ()=>{
                 const entryPath = entry;
                 const entryStat = await stat(entryPath);
@@ -137,11 +152,15 @@ class BackfillCacheProvider {
         }), concurrency);
     }
     getCachePath(packagePath, hash) {
-        return _path.relative(packagePath, (0, _getCacheDirectoryJs.getCacheDirectory)(this.options.root, hash));
+        return _path.relative(packagePath, (0, _getCacheDirectory.getCacheDirectory)(this.options.root, hash));
     }
     constructor(options){
+        _define_property(this, "options", void 0);
+        /**
+   * logger for backfill
+   */ _define_property(this, "backfillLogger", void 0);
         this.options = options;
-        this.backfillLogger = (0, _backfillWrapperJs.createBackfillLogger)();
+        this.backfillLogger = (0, _backfillWrapper.createBackfillLogger)();
     }
 }
 async function removeCache(cachePath, entryStat) {

package/lib/providers/RemoteFallbackCacheProvider.js

@@ -4,8 +4,23 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "RemoteFallbackCacheProvider", {
     enumerable: true,
-    get: ()=>RemoteFallbackCacheProvider
+    get: function() {
+        return RemoteFallbackCacheProvider;
+    }
 });
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
 class RemoteFallbackCacheProvider {
     async fetch(hash, target) {
         const { logger , remoteCacheProvider , localCacheProvider  } = this.options;
@@ -62,8 +77,9 @@ class RemoteFallbackCacheProvider {
         }
     }
     constructor(options){
+        _define_property(this, "options", void 0);
         this.options = options;
     }
 }
-RemoteFallbackCacheProvider.localHits = {};
-RemoteFallbackCacheProvider.remoteHits = {};
+_define_property(RemoteFallbackCacheProvider, "localHits", {});
+_define_property(RemoteFallbackCacheProvider, "remoteHits", {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lage-run/cache",
-  "version": "0.5.4",
+  "version": "1.1.1",
   "description": "Cache for Lage",
   "repository": {
     "type": "git",
@@ -17,14 +17,12 @@
     "lint": "monorepo-scripts lint"
   },
   "dependencies": {
-    "@lage-run/hasher": "^0.2.2",
-    "@lage-run/target-graph": "^0.8.4",
+    "@lage-run/target-graph": "^0.8.6",
     "@lage-run/logger": "^1.3.0",
     "backfill-config": "^6.3.1",
     "backfill-cache": "^5.6.4",
     "backfill-logger": "^5.1.3",
-    "glob-hasher": "1.2.1",
-    "fast-glob": "3.2.12"
+    "glob-hasher": "^1.3.0"
   },
   "devDependencies": {
     "@lage-run/monorepo-fixture": "*",

package/lib/TargetHasher.d.ts

@@ -1,18 +0,0 @@
-import type { Target } from "@lage-run/target-graph";
-export interface TargetHasherOptions {
-    root: string;
-    environmentGlob: string[];
-    cacheKey?: string;
-    cliArgs?: string[];
-}
-/**
- * TargetHasher is a class that can be used to generate a hash of a target.
- *
- * Currently, it encapsulates the use of `backfill-hasher` to generate a hash.
- */
-export declare class TargetHasher {
-    private options;
-    private repoInfo?;
-    constructor(options: TargetHasherOptions);
-    hash(target: Target): Promise<string>;
-}

package/lib/TargetHasher.js

@@ -1,49 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "TargetHasher", {
-    enumerable: true,
-    get: ()=>TargetHasher
-});
-const _hasher = require("@lage-run/hasher");
-const _saltJs = require("./salt.js");
-const _globHasher = require("glob-hasher");
-const _fastGlob = /*#__PURE__*/ _interopRequireDefault(require("fast-glob"));
-const _hashStringsJs = require("./hashStrings.js");
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-class TargetHasher {
-    async hash(target) {
-        const { root  } = this.options;
-        const hashKey = await (0, _saltJs.salt)(target.environmentGlob ?? this.options.environmentGlob ?? [
-            "lage.config.js"
-        ], `${target.id}|${JSON.stringify(this.options.cliArgs)}`, this.options.root, this.options.cacheKey || "");
-        if (target.cwd === root && target.cache) {
-            if (!target.inputs) {
-                throw new Error("Root-level targets must have `inputs` defined if it has cache enabled.");
-            }
-            const files = await (0, _fastGlob.default)(target.inputs, {
-                cwd: root
-            });
-            const fileFashes = (0, _globHasher.hash)(files, {
-                cwd: root
-            }) ?? {};
-            const hashes = Object.values(fileFashes);
-            hashes.push(hashKey);
-            return (0, _hashStringsJs.hashStrings)(hashes);
-        }
-        if (!this.repoInfo) {
-            this.repoInfo = await (0, _hasher.getRepoInfo)(root);
-        }
-        const hasher = new _hasher.Hasher(target.cwd, this.repoInfo);
-        const hashString = hasher.createPackageHash(hashKey);
-        return hashString;
-    }
-    constructor(options){
-        this.options = options;
-    }
-}

package/lib/hashStrings.d.ts

@@ -1 +0,0 @@
-export declare function hashStrings(strings: string | string[]): string;

package/lib/hashStrings.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "hashStrings", {
-    enumerable: true,
-    get: ()=>hashStrings
-});
-const _crypto = /*#__PURE__*/ _interopRequireDefault(require("crypto"));
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-function hashStrings(strings) {
-    const hasher = _crypto.default.createHash("sha1");
-    const anArray = typeof strings === "string" ? [
-        strings
-    ] : strings;
-    const elements = [
-        ...anArray
-    ];
-    elements.sort((a, b)=>a.localeCompare(b));
-    elements.forEach((element)=>hasher.update(element));
-    return hasher.digest("hex");
-}

package/lib/salt.d.ts

@@ -1,2 +0,0 @@
-export declare function _testResetEnvHash(): void;
-export declare function salt(environmentGlobFiles: string[], command: string, repoRoot: string, customKey?: string): Promise<string>;

package/lib/salt.js

@@ -1,67 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    "_testResetEnvHash": ()=>_testResetEnvHash,
-    salt: ()=>salt
-});
-const _globHasher = require("glob-hasher");
-const _hashStringsJs = require("./hashStrings.js");
-const _fastGlob = /*#__PURE__*/ _interopRequireDefault(require("fast-glob"));
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-let envHashes = {};
-// A promise to guarantee the getEnvHashes is done one at a time
-let oneAtATime = Promise.resolve();
-function _testResetEnvHash() {
-    envHashes = {};
-}
-async function salt(environmentGlobFiles, command, repoRoot, customKey = "") {
-    const envHash = await getEnvHash(environmentGlobFiles, repoRoot);
-    return (0, _hashStringsJs.hashStrings)([
-        ...envHash,
-        command,
-        customKey
-    ]);
-}
-function envHashKey(environmentGlobFiles) {
-    return environmentGlobFiles.sort().join("|");
-}
-async function getEnvHash(environmentGlobFiles, repoRoot) {
-    const key = envHashKey(environmentGlobFiles);
-    // We want to make sure that we only call getEnvHashOneAtTime one at a time
-    // to avoid having many concurrent calls to read files again and again
-    oneAtATime = oneAtATime.then(async ()=>{
-        // we may already have it by time we get to here
-        if (envHashes[key]) {
-            return envHashes[key];
-        }
-        return getEnvHashOneAtTime(environmentGlobFiles, repoRoot);
-    });
-    return oneAtATime;
-}
-async function getEnvHashOneAtTime(environmentGlobFiles, root) {
-    const key = envHashKey(environmentGlobFiles);
-    if (environmentGlobFiles.length === 0) {
-        envHashes[key] = [];
-        return envHashes[key];
-    }
-    const files = await (0, _fastGlob.default)(environmentGlobFiles, {
-        cwd: root
-    });
-    const fileFashes = (0, _globHasher.hash)(files, {
-        cwd: root
-    }) ?? {};
-    envHashes[key] = Object.values(fileFashes);
-    return envHashes[key];
-}