@lage-run/cache 0.5.0 → 0.5.2

package/CHANGELOG.json

@@ -2,7 +2,43 @@
   "name": "@lage-run/cache",
   "entries": [
     {
-      "date": "Mon, 27 Mar 2023 18:00:03 GMT",
+      "date": "Thu, 06 Apr 2023 22:27:27 GMT",
+      "tag": "@lage-run/cache_v0.5.2",
+      "version": "0.5.2",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@lage-run/cache",
+            "comment": "Bump @lage-run/target-graph to v0.8.2",
+            "commit": "ec15819ad8677a57ed2c7b8ce55538da69095c3b"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Wed, 29 Mar 2023 20:02:40 GMT",
+      "tag": "@lage-run/cache_v0.5.1",
+      "version": "0.5.1",
+      "comments": {
+        "patch": [
+          {
+            "author": "kchau@microsoft.com",
+            "package": "@lage-run/cache",
+            "commit": "3554c6c3bc2226933a819fd1123ada422848d7d4",
+            "comment": "moving back to fast-glob for globbing, as it was more accurate"
+          },
+          {
+            "author": "beachball",
+            "package": "@lage-run/cache",
+            "comment": "Bump @lage-run/hasher to v0.2.2",
+            "commit": "3554c6c3bc2226933a819fd1123ada422848d7d4"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 27 Mar 2023 18:00:15 GMT",
       "tag": "@lage-run/cache_v0.5.0",
       "version": "0.5.0",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,29 @@
 # Change Log - @lage-run/cache
 
-This log was last generated on Mon, 27 Mar 2023 18:00:03 GMT and should not be manually modified.
+This log was last generated on Thu, 06 Apr 2023 22:27:27 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.5.2
+
+Thu, 06 Apr 2023 22:27:27 GMT
+
+### Patches
+
+- Bump @lage-run/target-graph to v0.8.2
+
+## 0.5.1
+
+Wed, 29 Mar 2023 20:02:40 GMT
+
+### Patches
+
+- moving back to fast-glob for globbing, as it was more accurate (kchau@microsoft.com)
+- Bump @lage-run/hasher to v0.2.2
+
 ## 0.5.0
 
-Mon, 27 Mar 2023 18:00:03 GMT
+Mon, 27 Mar 2023 18:00:15 GMT
 
 ### Minor changes
 

package/lib/TargetHasher.d.ts

@@ -12,6 +12,7 @@ export interface TargetHasherOptions {
  */
 export declare class TargetHasher {
     private options;
+    private repoInfo?;
     constructor(options: TargetHasherOptions);
     hash(target: Target): Promise<string>;
 }

package/lib/TargetHasher.js

@@ -9,7 +9,13 @@ Object.defineProperty(exports, "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;
@@ -20,16 +26,22 @@ class TargetHasher {
             if (!target.inputs) {
                 throw new Error("Root-level targets must have `inputs` defined if it has cache enabled.");
             }
-            const fileFashes = (0, _globHasher.hashGlobGit)(target.inputs, {
-                cwd: root,
-                gitignore: false
+            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);
         }
-        const hasher = new _hasher.Hasher(target.cwd);
-        return hasher.createPackageHash(hashKey);
+        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/salt.js

@@ -14,6 +14,12 @@ _export(exports, {
 });
 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();
@@ -35,7 +41,7 @@ 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(()=>{
+    oneAtATime = oneAtATime.then(async ()=>{
         // we may already have it by time we get to here
         if (envHashes[key]) {
             return envHashes[key];
@@ -44,16 +50,18 @@ async function getEnvHash(environmentGlobFiles, repoRoot) {
     });
     return oneAtATime;
 }
-function getEnvHashOneAtTime(environmentGlobFiles, repoRoot) {
+async function getEnvHashOneAtTime(environmentGlobFiles, root) {
     const key = envHashKey(environmentGlobFiles);
     if (environmentGlobFiles.length === 0) {
         envHashes[key] = [];
         return envHashes[key];
     }
-    const hashes = (0, _globHasher.hashGlobGit)(environmentGlobFiles, {
-        cwd: repoRoot,
-        gitignore: true
+    const files = await (0, _fastGlob.default)(environmentGlobFiles, {
+        cwd: root
     });
-    envHashes[key] = Object.values(hashes);
+    const fileFashes = (0, _globHasher.hash)(files, {
+        cwd: root
+    }) ?? {};
+    envHashes[key] = Object.values(fileFashes);
     return envHashes[key];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lage-run/cache",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Cache for Lage",
   "repository": {
     "url": "https://github.com/microsoft/lage"
@@ -15,13 +15,14 @@
     "lint": "monorepo-scripts lint"
   },
   "dependencies": {
-    "@lage-run/hasher": "^0.2.1",
-    "@lage-run/target-graph": "^0.8.1",
+    "@lage-run/hasher": "^0.2.2",
+    "@lage-run/target-graph": "^0.8.2",
     "@lage-run/logger": "^1.2.2",
     "backfill-config": "^6.3.0",
     "backfill-cache": "^5.6.1",
     "backfill-logger": "^5.1.3",
-    "glob-hasher": "1.1.1"
+    "glob-hasher": "1.2.1",
+    "fast-glob": "3.2.12"
   },
   "devDependencies": {
     "@lage-run/monorepo-fixture": "*",