hologit 0.48.0 → 0.48.1

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.48.1",
   "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",