hologit 0.48.0 → 0.49.0

package/lib/BlobObject.js

@@ -3,11 +3,9 @@ class BlobObject {
 
     static async write (repo, content) {
         const git = await repo.getGit();
-        const hashObject = await git.hashObject({ w: true, stdin: true, $spawn: true });
+        const hash = await git.hashObjectInternally(content, { write: true });
 
-        return new BlobObject(repo, {
-            hash: await hashObject.captureOutputTrimmed(content)
-        });
+        return new BlobObject(repo, { hash });
     }
 
     static async writeFromFile (repo, filePath) {

package/lib/TreeObject.js

@@ -10,12 +10,20 @@ const EMPTY_TREE_HASH = '4b825dc642cb6eb9a060e54bf8d69288fbee4904';
 
 const cache = {};
 
+const stats = { treesWritten: 0, treesSkippedClean: 0, treesSkippedCached: 0, cacheHits: 0, cacheMisses: 0 };
+
 function cacheRead (hash) {
     if (hash == EMPTY_TREE_HASH) {
         return {};
     }
 
-    return cache[hash] || null;
+    const result = cache[hash] || null;
+    if (result) {
+        stats.cacheHits++;
+    } else {
+        stats.cacheMisses++;
+    }
+    return result;
 }
 
 function cacheWrite (hash, children) {
@@ -155,10 +163,16 @@ class TreeObject {
 
             cacheWrite(this.hash, cachedHashChildren);
 
+            // populate git-client's known-objects cache
+            for (const name in cachedHashChildren) {
+                git.knowObject(cachedHashChildren[name].hash);
+            }
+
             if (preloadChildren) {
                 for (const treePath in preloadedTrees) {
                     const tree = preloadedTrees[treePath];
                     cacheWrite(tree.hash, tree.children);
+                    git.knowObject(tree.hash);
                 }
             }
         }
@@ -368,7 +382,8 @@ class TreeObject {
             this.hash = EMPTY_TREE_HASH;
         } else {
             const git = await this.repo.getGit();
-            this.hash = await git.mktreeBatch(lines);
+            this.hash = await git.mktreeNative(lines);
+            stats.treesWritten++;
         }
 
 
@@ -546,6 +561,8 @@ class TreeObject {
 }
 
 TreeObject.treeLineRe = treeLineRe;
+TreeObject.stats = stats;
+TreeObject.resetStats = () => Object.keys(stats).forEach(k => stats[k] = 0);
 
 TreeObject.prototype.isTree = true;
 TreeObject.prototype.type = 'tree';

package/lib/Workspace.js

@@ -107,28 +107,30 @@ class Workspace extends Configurable {
         const children = tree ? await tree.getChildren() : {};
 
 
-        // build unsorted map
+        // build unsorted map via recursive discovery
         const childNameRe = /^([^\/]+)\.toml$/;
         const map = new Map();
-        for (const childName in children) {
-            let name;
 
-            // process trees or files ending in .toml
+        for (const childName in children) {
             if (children[childName].isTree) {
                 // skip .lenses directories (e.g. "docs-site.lenses")
                 if (childName.endsWith('.lenses')) {
                     continue;
                 }
-                name = childName;
+
+                // peek inside: if directory contains .toml files it defines
+                // a branch's mappings; otherwise it's a namespace — recurse
+                await this._discoverBranches(
+                    children[childName], childName, childNameRe, map
+                );
             } else {
                 const nameMatches = childName.match(childNameRe);
                 if (!nameMatches) {
                     continue;
                 }
-                [,name] = nameMatches;
+                const [,name] = nameMatches;
+                map.set(name, this.getBranch(name));
             }
-
-            map.set(name, this.getBranch(name));
         }
 
 
@@ -137,6 +139,35 @@ class Workspace extends Configurable {
         return map;
     }
 
+    async _discoverBranches (tree, prefix, childNameRe, map) {
+        const treeChildren = await tree.getChildren();
+
+        // check if this directory contains any .toml files directly
+        let hasTomlFiles = false;
+        for (const name in treeChildren) {
+            if (!treeChildren[name].isTree && childNameRe.test(name)) {
+                hasTomlFiles = true;
+                break;
+            }
+        }
+
+        if (hasTomlFiles) {
+            // directory contains mappings — it defines a branch
+            map.set(prefix, this.getBranch(prefix));
+        } else {
+            // no .toml files — it's a namespace, recurse into subdirectories
+            for (const name in treeChildren) {
+                if (!treeChildren[name].isTree || name.endsWith('.lenses')) {
+                    continue;
+                }
+
+                await this._discoverBranches(
+                    treeChildren[name], prefix + '/' + name, childNameRe, map
+                );
+            }
+        }
+    }
+
     getSource (name) {
         let cache = sourceCache.get(this);
         const cachedSource = cache && cache.get(name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hologit",
-  "version": "0.48.0",
+  "version": "0.49.0",
   "description": "Hologit automates the projection of layered composite file trees based on flat, declarative plans",
   "repository": "https://github.com/JarvusInnovations/hologit",
   "main": "lib/index.js",
@@ -11,18 +11,18 @@
   "dependencies": {
     "@iarna/toml": "^2.2.5",
     "async-exit-hook": "^2.0.1",
-    "axios": "^1.13.5",
+    "axios": "^1.13.6",
     "chokidar": "^5.0.0",
     "debounce": "^3.0.0",
     "fb-watchman": "^2.0.2",
-    "git-client": "^1.9.4",
+    "git-client": "^1.10.1",
     "hab-client": "^1.1.3",
     "handlebars": "^4.7.8",
-    "minimatch": "^10.2.2",
+    "minimatch": "^10.2.4",
     "mz": "^2.7.0",
     "mz-modules": "^2.1.0",
     "object-squish": "^1.1.0",
-    "parse-url": "^10.0.3",
+    "parse-url": "^11.1.0",
     "shell-quote-word": "^1.0.1",
     "sort-keys": "^6.0.0",
     "toposort": "^2.0.2",
@@ -49,9 +49,10 @@
   ],
   "devDependencies": {
     "@types/jest": "^30.0.0",
-    "jest": "^30.2.0"
+    "jest": "^30.3.0"
   },
   "scripts": {
-    "test": "jest"
+    "test": "jest",
+    "bench": "node test/benchmark/projection.bench.js"
   }
 }