@lage-run/hasher 1.2.1 → 1.3.1

package/CHANGELOG.json

@@ -2,7 +2,37 @@
   "name": "@lage-run/hasher",
   "entries": [
     {
-      "date": "Tue, 25 Jun 2024 22:03:26 GMT",
+      "date": "Wed, 04 Sep 2024 23:24:50 GMT",
+      "version": "1.3.1",
+      "tag": "@lage-run/hasher_v1.3.1",
+      "comments": {
+        "patch": [
+          {
+            "author": "kchau@microsoft.com",
+            "package": "@lage-run/hasher",
+            "commit": "cbfd60ade539086a6a797c0674e06f26cfc06af3",
+            "comment": "Use file hashes instead of just the file names for env glob for targets\\"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Fri, 30 Aug 2024 18:40:09 GMT",
+      "version": "1.3.0",
+      "tag": "@lage-run/hasher_v1.3.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "kchau@microsoft.com",
+            "package": "@lage-run/hasher",
+            "commit": "962af15909d64159bbc5fef954e66b6bd4c410d1",
+            "comment": "adding the ability to calculate target env globs"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 25 Jun 2024 22:03:40 GMT",
       "version": "1.2.1",
       "tag": "@lage-run/hasher_v1.2.1",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,28 @@
 # Change Log - @lage-run/hasher
 
-This log was last generated on Tue, 25 Jun 2024 22:03:26 GMT and should not be manually modified.
+This log was last generated on Wed, 04 Sep 2024 23:24:50 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 1.3.1
+
+Wed, 04 Sep 2024 23:24:50 GMT
+
+### Patches
+
+- Use file hashes instead of just the file names for env glob for targets\ (kchau@microsoft.com)
+
+## 1.3.0
+
+Fri, 30 Aug 2024 18:40:09 GMT
+
+### Minor changes
+
+- adding the ability to calculate target env globs (kchau@microsoft.com)
+
 ## 1.2.1
 
-Tue, 25 Jun 2024 22:03:26 GMT
+Tue, 25 Jun 2024 22:03:40 GMT
 
 ### Patches
 

package/lib/TargetHasher.d.ts

@@ -40,6 +40,8 @@ export declare class TargetHasher {
     lockInfo: ParsedLock | undefined;
     targetHashes: Record<string, string>;
     dependencyMap: DependencyMap;
+    memoizedEnvGlobResults: Map<string, string[]>;
+    getMemorizedEnvGlobResults(envGlob: string[]): Promise<string[]>;
     getPackageInfos(workspacePackages: WorkspaceInfo): PackageInfos;
     expandInputPatterns(patterns: string[], target: Target): Record<string, string[]>;
     constructor(options: TargetHasherOptions);

package/lib/TargetHasher.js

@@ -38,6 +38,17 @@ function _interop_require_default(obj) {
     };
 }
 class TargetHasher {
+    async getMemorizedEnvGlobResults(envGlob) {
+        const key = envGlob.join("\0ENV_GLOB\0");
+        const { root  } = this.options;
+        if (!this.memoizedEnvGlobResults.has(key)) {
+            const files = await (0, _fastglob.default)(envGlob, {
+                cwd: root
+            });
+            this.memoizedEnvGlobResults.set(key, files);
+        }
+        return this.memoizedEnvGlobResults.get(key) ?? [];
+    }
     getPackageInfos(workspacePackages) {
         const { root  } = this.options;
         const packageInfos = {};
@@ -110,9 +121,7 @@ class TargetHasher {
             return;
         }
         this.initializedPromise = Promise.all([
-            this.fileHasher.readManifest().then(()=>(0, _fastglob.default)(environmentGlob, {
-                    cwd: root
-                })).then((files)=>this.fileHasher.hash(files)).then((hash)=>this.globalInputsHash = hash),
+            this.fileHasher.readManifest().then(()=>this.getMemorizedEnvGlobResults(environmentGlob)).then((files)=>this.fileHasher.hash(files)).then((hash)=>this.globalInputsHash = hash),
             (0, _workspacetools.getWorkspacesAsync)(root).then((workspaceInfo)=>this.workspaceInfo = workspaceInfo).then(()=>{
                 this.packageInfos = this.getPackageInfos(this.workspaceInfo);
                 this.dependencyMap = (0, _workspacetools.createDependencyMap)(this.packageInfos, {
@@ -181,9 +190,10 @@ class TargetHasher {
         const fileHashes = this.fileHasher.hash(files) ?? {}; // this list is sorted by file name
         // get target hashes
         const targetDepHashes = target.dependencies?.sort().map((targetDep)=>this.targetHashes[targetDep]);
+        const envGlobFiles = Object.values(target.environmentGlob ? this.fileHasher.hash(await this.getMemorizedEnvGlobResults(target.environmentGlob)) : this.globalInputsHash ?? {});
         const combinedHashes = [
             // Environmental hashes
-            ...Object.values(this.globalInputsHash ?? {}),
+            ...envGlobFiles,
             `${target.id}|${JSON.stringify(this.options.cliArgs)}`,
             this.options.cacheKey || "",
             // File content hashes based on target.inputs
@@ -211,6 +221,7 @@ class TargetHasher {
         _define_property(this, "lockInfo", void 0);
         _define_property(this, "targetHashes", void 0);
         _define_property(this, "dependencyMap", void 0);
+        _define_property(this, "memoizedEnvGlobResults", void 0);
         this.options = options;
         this.packageInfos = {};
         this.targetHashes = {};
@@ -218,6 +229,7 @@ class TargetHasher {
             dependencies: new Map(),
             dependents: new Map()
         };
+        this.memoizedEnvGlobResults = new Map();
         const { root , logger  } = options;
         this.logger = logger;
         this.fileHasher = new _FileHasher.FileHasher({

package/lib/__fixtures__/monorepo-with-global-files/some-global.config.d.ts

@@ -0,0 +1 @@
+export const global: boolean;

package/lib/__fixtures__/monorepo-with-global-files/some-global2.config.d.ts

@@ -0,0 +1 @@
+export const global2: boolean;

package/lib/__fixtures__/monorepo-with-global-files-different-tasks/some-global.config.d.ts

@@ -0,0 +1 @@
+export const global: boolean;

package/lib/__tests__/TargetHasher.test.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 const _path = /*#__PURE__*/ _interop_require_default(require("path"));
 const _index = require("../index");
+const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
 const _monorepofixture = require("@lage-run/monorepo-fixture");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
@@ -125,4 +126,69 @@ describe("The main Hasher class", ()=>{
         monorepo1.cleanup();
         monorepo2.cleanup();
     });
+    it("creates different hashes when the target has a different env glob", async ()=>{
+        const monorepo1 = await setupFixture("monorepo-with-global-files");
+        const hasher = new _index.TargetHasher({
+            root: monorepo1.root,
+            environmentGlob: []
+        });
+        const target = createTarget(monorepo1.root, "package-a", "build");
+        target.environmentGlob = [
+            "some-global*"
+        ];
+        target.inputs = [
+            "**/*",
+            "^**/*"
+        ];
+        const hash = await getHash(hasher, target);
+        const target2 = createTarget(monorepo1.root, "package-a", "build");
+        target2.environmentGlob = [
+            "some-global.*"
+        ];
+        target2.inputs = [
+            "**/*",
+            "^**/*"
+        ];
+        const hash2 = await getHash(hasher, target2);
+        expect(hash).not.toEqual(hash2);
+        monorepo1.cleanup();
+    });
+    it("creates different hashes when the target has a different env glob for different task types", async ()=>{
+        const monorepo1 = await setupFixture("monorepo-with-global-files-different-tasks");
+        const hasher = new _index.TargetHasher({
+            root: monorepo1.root,
+            environmentGlob: []
+        });
+        const target = createTarget(monorepo1.root, "package-a", "test");
+        target.environmentGlob = [
+            "some-global*"
+        ];
+        target.inputs = [
+            "**/*",
+            "^**/*"
+        ];
+        const hash = await getHash(hasher, target);
+        const target2 = createTarget(monorepo1.root, "package-a", "lint");
+        target2.environmentGlob = [
+            ".eslintrc.js"
+        ];
+        target2.inputs = [
+            "**/*",
+            "^**/*"
+        ];
+        const hash2 = await getHash(hasher, target2);
+        const target3 = createTarget(monorepo1.root, "package-a", "lint");
+        _fs.default.writeFileSync(_path.default.join(monorepo1.root, ".eslintrc.js"), "module.exports = {/*somethingdifferent*/};");
+        target3.environmentGlob = [
+            ".eslintrc.js"
+        ];
+        target3.inputs = [
+            "**/*",
+            "^**/*"
+        ];
+        const hash3 = await getHash(hasher, target3);
+        expect(hash).not.toEqual(hash2);
+        expect(hash2).not.toEqual(hash3);
+        monorepo1.cleanup();
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lage-run/hasher",
-  "version": "1.2.1",
+  "version": "1.3.1",
   "description": "Hasher for Lage Targets",
   "repository": {
     "url": "https://github.com/microsoft/lage"