enablement-build-monorepo-version 6.0.0 → 8.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "enablement-build-monorepo-version",
-  "version": "6.0.0",
+  "version": "8.2.0",
   "description": "This detects changes in the children packages of a monorepo.",
   "type": "module",
   "module": "./src/index.mjs",
@@ -14,7 +14,7 @@
     ]
   },
   "dependencies": {
-    "enablement-build-manifest": "1.4.0"
+    "enablement-build-manifest": "1.7.0"
   },
   "devDependencies": {
     "jest": "^30.4.2"

package/src/index.mjs

@@ -44,6 +44,35 @@ async function updateRootVersionIfNeeded(options, changeList) {
 }
 
 
+
+async function collectPackageEntries(prefixPath, scanFolder, packageFolder, hashOptions, current, seenDirs = new Set()) {
+  const dirPath = path.join(prefixPath, scanFolder);
+  const dirKey = path.resolve(dirPath);
+  if (!existsSync(dirPath) || !lstatSync(dirPath).isDirectory()) return;
+  if (seenDirs.has(dirKey)) return;
+  seenDirs.add(dirKey);
+
+  const hash = await hashElement(dirPath, hashOptions);
+  const children = hash.children || [];
+
+  for (let i = 0; i < children.length; i++) {
+    const child = children[i];
+    const name = child.name;
+    if (name.substring(0, 1) === "_" || name === "version") continue;
+
+    const childPath = path.join(dirPath, name);
+    if (!existsSync(childPath) || lstatSync(childPath).isFile()) continue;
+
+    const versionInfo = getCurrentVersion(prefixPath, scanFolder, name);
+    if (versionInfo.fullName) {
+      current[name] = { hash: child.hash, ...versionInfo, packageFolder };
+      continue;
+    }
+
+    await collectPackageEntries(prefixPath, path.join(scanFolder, name), packageFolder, hashOptions, current, seenDirs);
+  }
+}
+
 async function main(options) {
   return new Promise((mainResolve, mainreject) => {
     const hashOptions = { encoding: 'hex', folders: { exclude: options.hashExcludeFolders }, files: { exclude: options.hashExcludeFiles } };
@@ -101,7 +130,7 @@ async function main(options) {
       }
     }
 
-    // Load previous hashes, keyed by short package folder name.
+    // Load previous hashes, keyed by full package name.
     previous = loadHashFile(changeConfig);
     if (options.debug) console.log("PREVIOUS", JSON.stringify(previous));
 
@@ -131,16 +160,7 @@ async function main(options) {
           const children = hash.children;
           if (options.debug) console.log("HASH", JSON.stringify(children));
 
-          for (let i = 0; i < children.length; i++) {
-            let name = children[i].name;
-            if (name.substring(0, 1) === "_" || name === "version") continue;
-            if (lstatSync(path.join(options.prefixPath, packageFolder, name)).isFile()) continue;
-            if (!existsSync(path.join(options.prefixPath, packageFolder, name))) continue;
-
-            delete children[i].children;
-            let v = getCurrentVersion(options.prefixPath, packageFolder, name);
-            current[name] = { hash: children[i].hash, ...v };
-          }
+          await collectPackageEntries(options.prefixPath, packageFolder, packageFolder, hashOptions, current, new Set());
 
           if (options.changed || options.version || options.tag) {
             let results = await compare(packageFolder, previous, current, dependencies, options);
@@ -194,16 +214,6 @@ async function main(options) {
             }
           }
 
-          // save current hashes
-          if (options.hash) {
-            let names = Object.keys(current);
-            for (let i = 0; i < names.length; i++) {
-              if (current[names[i]].packageFolder !== packageFolder) continue;
-              let v = getCurrentVersion(options.prefixPath, packageFolder, names[i]);
-              current[names[i]].version = v.version;
-              current[names[i]].fullName = v.fullName;
-            }
-          }
           resolve("OK");
         })
         .catch(error => {
@@ -233,7 +243,12 @@ async function main(options) {
         if (options.try) {
           console.log('\x1b[36m%s\x1b[0m', `[try] Would write updated hashes to ${changeConfig}`);
         } else {
-          writeHashFile(changeConfig, current, { usesManifestHashFile });
+          const hashesByFullName = Object.fromEntries(
+            Object.entries(current)
+              .filter(([, entry]) => entry && entry.fullName)
+              .map(([, entry]) => [entry.fullName, entry])
+          );
+          writeHashFile(changeConfig, hashesByFullName, { usesManifestHashFile });
           console.log('folder hashes written successfully');
         }
       }

package/src/lib.mjs

@@ -319,8 +319,8 @@ export async function compare(
   packages.forEach((name) => {
     if (current[name].packageFolder !== packageFolder) return;
     if (
-      previous[name] === undefined ||
-      current[name].hash !== previous[name].hash
+      previous[current[name].fullName] === undefined ||
+      current[name].hash !== previous[current[name].fullName].hash
     )
       changedNames.add(name);
   });
@@ -342,8 +342,9 @@ export async function compare(
   // Emit one result per package — no duplicates
   packages.forEach((name) => {
     if (current[name].packageFolder !== packageFolder) return;
-    const isNew = previous[name] === undefined;
-    const isDirect = !isNew && current[name].hash !== previous[name].hash;
+    const previousPackage = previous[current[name].fullName];
+    const isNew = previousPackage === undefined;
+    const isDirect = !isNew && current[name].hash !== previousPackage.hash;
     const status = isNew
       ? "NEW"
       : changedNames.has(name)
@@ -363,7 +364,7 @@ export async function compare(
         current[name].version,
         status,
         options,
-        previous[name]?.hash,
+        previousPackage?.hash,
         current[name].hash,
         parent,
         current[name].fullName,

package/tests/index.test.mjs

@@ -94,8 +94,8 @@ describe("index CLI hash loading", () => {
 
       const hashJson = JSON.parse(readFileSync(path.join(root, ".cicd", "hash.json"), "utf8"));
       expect(hashJson.version).toBe(2);
-      expect(typeof hashJson.hash.example).toBe("string");
-      expect(hashJson.hash.example).toBeTruthy();
+      expect(typeof hashJson.hash["@scope/example"]).toBe("string");
+      expect(hashJson.hash["@scope/example"]).toBeTruthy();
     } finally {
       rmSync(root, { recursive: true, force: true });
     }
@@ -112,8 +112,8 @@ describe("index CLI hash loading", () => {
 
       const hashJson = JSON.parse(readFileSync(path.join(root, ".cicd", "hash.json"), "utf8"));
       expect(hashJson.version).toBe(2);
-      expect(typeof hashJson.hash.example).toBe("string");
-      expect(hashJson.hash.example).toBeTruthy();
+      expect(typeof hashJson.hash["@scope/example"]).toBe("string");
+      expect(hashJson.hash["@scope/example"]).toBeTruthy();
     } finally {
       rmSync(root, { recursive: true, force: true });
     }
@@ -164,8 +164,8 @@ describe("index CLI --exclude", () => {
       expect(changed).not.toContain("skip-me");
 
       const hashJson = JSON.parse(readFileSync(path.join(root, ".cicd", "hash.json"), "utf8"));
-      expect(hashJson.hash.example).toBeTruthy();
-      expect(hashJson.hash["skip-me"]).toBeUndefined();
+      expect(hashJson.hash["@scope/example"]).toBeTruthy();
+      expect(hashJson.hash["@scope/skip-me"]).toBeUndefined();
     } finally {
       rmSync(root, { recursive: true, force: true });
     }
@@ -198,7 +198,49 @@ describe("index CLI --children defaulting", () => {
       expect(JSON.parse(changedMatch[1])).toContain("example");
 
       const hashJson = JSON.parse(readFileSync(path.join(root, ".cicd", "hash.json"), "utf8"));
-      expect(hashJson.hash.example).toBeTruthy();
+      expect(hashJson.hash["@scope/example"]).toBeTruthy();
+    } finally {
+      rmSync(root, { recursive: true, force: true });
+    }
+  });
+});
+
+describe("index CLI nested workspace roots", () => {
+  it("skips non-package folders and discovers nested package roots under a child directory", () => {
+    const root = mkdtempSync(path.join(os.tmpdir(), "monorepo-version-"));
+    try {
+      mkdirSync(path.join(root, "ux", "portal", "profile"), { recursive: true });
+      mkdirSync(path.join(root, ".cicd"), { recursive: true });
+
+      writeFileSync(
+        path.join(root, "package.json"),
+        JSON.stringify(
+          { name: "tmp-monorepo", private: true, workspaces: ["ux/*"] },
+          null,
+          2,
+        ) + "\n",
+        "utf8",
+      );
+
+      writeFileSync(
+        path.join(root, "ux", "portal", "profile", "package.json"),
+        JSON.stringify({ name: "@scope/profile", version: "1.0.0" }, null, 2) + "\n",
+        "utf8",
+      );
+
+      const stdout = execFileSync(
+        "node",
+        [cliPath, "--hash", "--changed", "--children", "ux", "--prefixPath", root],
+        { cwd: repoRoot, encoding: "utf8" },
+      );
+
+      const changedMatch = stdout.match(/CHANGED - (\[[^\n]*\])/);
+      expect(changedMatch).not.toBeNull();
+      expect(JSON.parse(changedMatch[1])).toContain("profile");
+
+      const hashJson = JSON.parse(readFileSync(path.join(root, ".cicd", "hash.json"), "utf8"));
+      expect(hashJson.hash["@scope/profile"]).toBeTruthy();
+      expect(hashJson.hash.undefined).toBeUndefined();
     } finally {
       rmSync(root, { recursive: true, force: true });
     }

package/tests/lib.test.mjs

@@ -83,7 +83,7 @@ describe("compare", () => {
     [name]: { hash, version: "1.0.0", fullName, packageFolder: folder },
   });
 
-  const prev = (name, hash) => ({ [name]: { hash } });
+  const prev = (name, hash, fullName = "@s/" + name) => ({ [fullName]: { hash } });
 
   describe("status classification", () => {
     it("marks all packages UNCHANGED when hashes match", async () => {