@lage-run/hasher 1.1.2 → 1.2.0

package/CHANGELOG.json

@@ -2,7 +2,28 @@
   "name": "@lage-run/hasher",
   "entries": [
     {
-      "date": "Mon, 10 Jun 2024 23:50:24 GMT",
+      "date": "Tue, 25 Jun 2024 18:10:41 GMT",
+      "version": "1.2.0",
+      "tag": "@lage-run/hasher_v1.2.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "kchau@microsoft.com",
+            "package": "@lage-run/hasher",
+            "commit": "e294f805313ceb5b66640f8aaff8647bdb588511",
+            "comment": "moving back to using globby instead for speed & accuracy reasons"
+          },
+          {
+            "author": "beachball",
+            "package": "@lage-run/hasher",
+            "comment": "Bump @lage-run/globby to v14.0.2",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 10 Jun 2024 23:50:39 GMT",
       "version": "1.1.2",
       "tag": "@lage-run/hasher_v1.1.2",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,21 @@
 # Change Log - @lage-run/hasher
 
-This log was last generated on Mon, 10 Jun 2024 23:50:24 GMT and should not be manually modified.
+This log was last generated on Tue, 25 Jun 2024 18:10:41 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 1.2.0
+
+Tue, 25 Jun 2024 18:10:41 GMT
+
+### Minor changes
+
+- moving back to using globby instead for speed & accuracy reasons (kchau@microsoft.com)
+- Bump @lage-run/globby to v14.0.2
+
 ## 1.1.2
 
-Mon, 10 Jun 2024 23:50:24 GMT
+Mon, 10 Jun 2024 23:50:39 GMT
 
 ### Patches
 

package/lib/PackageTree.js

@@ -8,9 +8,8 @@ Object.defineProperty(exports, "PackageTree", {
         return PackageTree;
     }
 });
-const _execa = /*#__PURE__*/ _interop_require_default(require("execa"));
 const _path = /*#__PURE__*/ _interop_require_default(require("path"));
-const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
+const _globby = require("@lage-run/globby");
 function _check_private_redeclaration(obj, privateCollection) {
     if (privateCollection.has(obj)) {
         throw new TypeError("Cannot initialize the same private elements twice on an object");
@@ -79,11 +78,9 @@ function _interop_require_default(obj) {
         default: obj
     };
 }
-var _tree = /*#__PURE__*/ new WeakMap(), _packageFiles = /*#__PURE__*/ new WeakMap(), _memoizedPackageFiles = /*#__PURE__*/ new WeakMap(), _findFilesFromGitTree = /*#__PURE__*/ new WeakSet();
+var _memoizedPackageFiles = /*#__PURE__*/ new WeakMap(), _findFilesFromGitTree = /*#__PURE__*/ new WeakSet();
 class PackageTree {
     reset() {
-        _class_private_field_set(this, _tree, {});
-        _class_private_field_set(this, _packageFiles, {});
         _class_private_field_set(this, _memoizedPackageFiles, {});
     }
     async initialize() {
@@ -92,7 +89,7 @@ class PackageTree {
     async findFilesInPath(packagePath, patterns) {
         const key = `${packagePath}\0${patterns.join("\0")}`;
         if (!_class_private_field_get(this, _memoizedPackageFiles)[key]) {
-            const files = (await _class_private_method_get(this, _findFilesFromGitTree, findFilesFromGitTree).call(this, packagePath, patterns)).map((f)=>_path.default.join(packagePath, f));
+            const files = await _class_private_method_get(this, _findFilesFromGitTree, findFilesFromGitTree).call(this, packagePath, patterns);
             _class_private_field_get(this, _memoizedPackageFiles)[key] = files;
         }
         return _class_private_field_get(this, _memoizedPackageFiles)[key];
@@ -101,58 +98,23 @@ class PackageTree {
     constructor(options){
         _class_private_method_init(this, _findFilesFromGitTree);
         _define_property(this, "options", void 0);
-        _class_private_field_init(this, _tree, {
-            writable: true,
-            value: void 0
-        });
-        _class_private_field_init(this, _packageFiles, {
-            writable: true,
-            value: void 0
-        });
         _class_private_field_init(this, _memoizedPackageFiles, {
             writable: true,
             value: void 0
         });
         this.options = options;
-        _class_private_field_set(this, _tree, {});
-        _class_private_field_set(this, _packageFiles, {});
         _class_private_field_set(this, _memoizedPackageFiles, {});
     }
 }
 async function findFilesFromGitTree(packagePath, patterns) {
-    const { includeUntracked  } = this.options;
     const cwd = _path.default.isAbsolute(packagePath) ? packagePath : _path.default.join(this.options.root, packagePath);
-    const trackedPromise = (0, _execa.default)("git", [
-        "ls-files",
-        "-z",
-        ...patterns.filter((p)=>!p.startsWith("!")).map((p)=>`:(glob)${p}`),
-        ...patterns.filter((p)=>p.startsWith("!")).map((p)=>`:(exclude,glob)${p.slice(1)}`)
-    ], {
-        cwd
-    }).then((lsFilesResults)=>{
-        if (lsFilesResults.exitCode === 0) {
-            return lsFilesResults.stdout.split("\0").filter((f)=>Boolean(f) && _fs.default.existsSync(_path.default.join(cwd, f)));
-        }
-        return [];
-    });
-    const untrackedPromise = includeUntracked ? (0, _execa.default)("git", [
-        "ls-files",
-        "-z",
-        "-o",
-        "--exclude-standard",
-        ...patterns.filter((p)=>!p.startsWith("!")).map((p)=>`:(glob)${p}`),
-        ...patterns.filter((p)=>p.startsWith("!")).map((p)=>`:(exclude,glob)${p.slice(1)}`)
-    ], {
-        cwd
-    }).then((lsOtherResults)=>{
-        if (lsOtherResults.exitCode === 0) {
-            return lsOtherResults.stdout.split("\0").filter((f)=>Boolean(f));
-        }
-        return [];
-    }) : Promise.resolve([]);
-    const [trackedFiles, untrackedFiles] = await Promise.all([
-        trackedPromise,
-        untrackedPromise
-    ]);
-    return trackedFiles.concat(untrackedFiles);
+    return (0, _globby.globby)(patterns, {
+        cwd,
+        onlyFiles: true,
+        ignore: [
+            ".git"
+        ],
+        gitignore: true,
+        absolute: true
+    }) ?? [];
 }

package/lib/TargetHasher.js

@@ -117,7 +117,13 @@ class TargetHasher {
         const finderInitPromise = this.packageTree.initialize();
         this.initializedPromise = finderInitPromise.then(()=>{
             return Promise.all([
-                this.fileHasher.readManifest().then(()=>environmentGlob.length > 0 ? this.packageTree.findFilesInPath(root, environmentGlob) : []).then((files)=>this.fileHasher.hash(files)).then((hash)=>this.globalInputsHash = hash),
+                this.fileHasher.readManifest().then(()=>environmentGlob.length > 0 ? this.packageTree.findFilesInPath(root, environmentGlob) : []).then((files)=>{
+                    if (this.logger !== undefined) {
+                        this.logger.verbose(`Environment glob files:`);
+                        this.logger.silly(" " + files.join("\n "));
+                    }
+                    return this.fileHasher.hash(files);
+                }).then((hash)=>this.globalInputsHash = hash),
                 (0, _workspacetools.parseLockFile)(root).then((lockInfo)=>this.lockInfo = lockInfo)
             ]);
         });

package/lib/__tests__/PackageTree.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/__tests__/PackageTree.test.js

@@ -0,0 +1,93 @@
+// test out the findFilesInPath method of the PackageTree
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+const _monorepofixture = require("@lage-run/monorepo-fixture");
+const _PackageTree = require("../PackageTree");
+const _path = /*#__PURE__*/ _interop_require_default(require("path"));
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+// given various patterns that exercises the globby functionality with extgob, etc.
+describe("PackageTree", ()=>{
+    async function setupFixture(fixture = "monorepo") {
+        const monorepo = new _monorepofixture.Monorepo(fixture);
+        await monorepo.init(_path.default.join(fixturesPath, fixture));
+        return monorepo;
+    }
+    const fixturesPath = _path.default.join(__dirname, "../__fixtures__");
+    it("should find all files in a package using globby basic pattern", async ()=>{
+        const monorepo = await setupFixture("basic");
+        const packagePath = monorepo.root;
+        const patterns = [
+            "**/*"
+        ];
+        const packageTree = new _PackageTree.PackageTree({
+            root: packagePath,
+            includeUntracked: true
+        });
+        await packageTree.initialize();
+        const files = await packageTree.findFilesInPath(packagePath, patterns);
+        expect(serializeFiles(files, packagePath)).toMatchInlineSnapshot(`
+      [
+        "node_modules/package-2/package.json",
+        "package.json",
+        "src/index.ts",
+        "yarn.lock",
+      ]
+    `);
+        monorepo.cleanup();
+    });
+    it("should find all files in a package using globby with extglob", async ()=>{
+        const monorepo = await setupFixture("basic");
+        const packagePath = monorepo.root;
+        const patterns = [
+            "**/*.+(json|ts)",
+            "!yarn.lock"
+        ];
+        const packageTree = new _PackageTree.PackageTree({
+            root: packagePath,
+            includeUntracked: true
+        });
+        await packageTree.initialize();
+        const files = await packageTree.findFilesInPath(packagePath, patterns);
+        expect(serializeFiles(files, packagePath)).toMatchInlineSnapshot(`
+      [
+        "node_modules/package-2/package.json",
+        "package.json",
+        "src/index.ts",
+      ]
+    `);
+        monorepo.cleanup();
+    });
+    it("should find all files in a package using globby with extglob of sub-exclusion pattern", async ()=>{
+        const monorepo = await setupFixture("monorepo-with-deps");
+        const packagePath = monorepo.root;
+        const patterns = [
+            "**/!(package.json)"
+        ];
+        const packageTree = new _PackageTree.PackageTree({
+            root: packagePath,
+            includeUntracked: true
+        });
+        await packageTree.initialize();
+        const files = await packageTree.findFilesInPath(packagePath, patterns);
+        expect(serializeFiles(files, packagePath)).toMatchInlineSnapshot(`
+      [
+        "node_modules/.yarn-integrity",
+        "node_modules/package-a/src/index.ts",
+        "node_modules/package-b/src/index.ts",
+        "packages/package-a/src/index.ts",
+        "packages/package-b/src/index.ts",
+        "yarn.lock",
+      ]
+    `);
+        monorepo.cleanup();
+    });
+    function serializeFiles(files, packagePath) {
+        return files.map((p)=>_path.default.relative(packagePath, p)).map((p)=>p.replace(/\\/g, "/")).sort();
+    }
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lage-run/hasher",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "Hasher for Lage Targets",
   "repository": {
     "url": "https://github.com/microsoft/lage"
@@ -16,6 +16,7 @@
   },
   "dependencies": {
     "@lage-run/target-graph": "^0.8.9",
+    "@lage-run/globby": "^14.0.2",
     "@lage-run/logger": "^1.3.0",
     "execa": "5.1.1",
     "workspace-tools": "0.36.4",