enablement-build-monorepo-version 8.4.9 → 8.4.10

package/README.md

@@ -14,7 +14,7 @@ npx enablement-build-monorepo-version@latest [flags]
 
 1. **Hash** — Each subfolder under the configured `children` directories is hashed (source files only; `node_modules`, `dist`, etc. are excluded).
 2. **Compare** — Hashes are diffed against state in `--hashFile`, which defaults to `{configDir}/hash.json`.
-3. **Propagate** — Any package whose hash changed is marked `CHANGED`. All transitive dependents (read from `{configDir}/manifest.json` `dependencies` when available, or from `--dependencies` when explicitly provided) are also marked `CHANGED` via a breadth-first traversal.
+3. **Propagate** — After all workspace folders have been scanned, any package whose hash changed is marked `CHANGED`. All transitive dependents, including those in other workspace folders, are also marked `CHANGED` via a breadth-first traversal. The graph comes from `{configDir}/manifest.json` `dependents` (or inverted `dependencies` for manifests without `dependents`), or from the Nx graph supplied explicitly with `--dependencies`.
 4. **Version** — The next semver is determined from the current version found in each package's version manifest (`package.json`, `version.json`, or `pyproject.toml`) using conventional-commit rules.
 5. **Output** — Azure DevOps `##vso[task.setvariable]` lines are written to stdout for consumption by downstream pipeline steps.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "enablement-build-monorepo-version",
-  "version": "8.4.9",
+  "version": "8.4.10",
   "description": "This detects changes in the children packages of a monorepo.",
   "type": "module",
   "module": "./src/index.mjs",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "minimatch": "~10.1.1",
-    "enablement-build-manifest": "1.8.9"
+    "enablement-build-manifest": "1.8.10"
   },
   "devDependencies": {
     "jest": "^30.4.2"

package/src/index.mjs

@@ -9,7 +9,7 @@ const packageMetadata = JSON.parse(
 );
 const packageVersion = packageMetadata.version;
 
-import { dependencyMap, compare, getCurrentVersion, updateVersion, retagToPackageNames, detectOldFormatTags, resolveWorkspaceChildren, excludeChildren, applyInitScripts, RELEASE_SCRIPTS, emitVariable, hashElement, resolveHashFilePath, ensureHashFileExists, loadHashFile, writeHashFile } from "./lib.mjs";
+import { dependencyMap, parseDependencyMap, compare, getCurrentVersion, updateVersion, retagToPackageNames, detectOldFormatTags, resolveWorkspaceChildren, excludeChildren, applyInitScripts, RELEASE_SCRIPTS, emitVariable, hashElement, resolveHashFilePath, ensureHashFileExists, loadHashFile, writeHashFile } from "./lib.mjs";
 
 
 function bumpPatchVersion(version, forcedSuffix) {
@@ -162,7 +162,11 @@ async function main(options) {
     if (shouldPreferManifestDependencies) {
       const manifestText = readFileSync(manifestDependencyPath, 'utf8');
       const manifest = JSON.parse(manifestText || '{}');
-      dependencies = manifest.dependencies || {};
+      dependencies = manifest.dependents ?? parseDependencyMap(
+        Object.fromEntries(Object.entries(manifest.dependencies || {}).map(
+          ([name, targets]) => [name, targets.map(target => ({ target }))],
+        )),
+      );
       if (options.debug) console.log(`Loaded dependencies from ${manifestDependencyPath}\n`, JSON.stringify(dependencies));
     } else if (options.dependencies) {
       if (existsSync(options.dependencies)) {
@@ -211,6 +215,14 @@ async function main(options) {
 
           await collectPackageEntries(options.prefixPath, packageFolder, packageFolder, hashOptions, current, new Set());
 
+          resolve("OK");
+        }).catch(reject);
+      }));
+    });
+
+    Promise.all(scanlist).then(async () => {
+      const pendingOperations = [];
+      for (const packageFolder of children.split(',')) {
           if (options.changed || options.version || options.tag) {
             let results = await compare(packageFolder, previous, current, dependencies, options);
             if (options.debug) console.log("COMPARE", JSON.stringify(results));
@@ -231,14 +243,14 @@ async function main(options) {
                 if (results[i].value.changed) {
                   emitVariable(safeName, results[i].value.version, options.platform);
                   if (options.saveVersion) {
-                    scanlist.push(updateVersion(packageFolder, results[i].value.name, results[i].value.version, options));
+                    pendingOperations.push(updateVersion(packageFolder, results[i].value.name, results[i].value.version, options));
                   }
                 } else {
                   emitVariable(safeName, results[i].value.previous, options.platform);
                 }
               }
               if (options.tag) {
-                scanlist.push(new Promise((resolve, reject) => {
+                pendingOperations.push(new Promise((resolve, reject) => {
                   let v = results[i].value.version;
                   if (!v) v = getCurrentVersion(options.prefixPath, packageFolder, results[i].value.name)?.version;
                   const shortName = (results[i].value.fullName || results[i].value.name).replace(/^@[^/]+\//, '');
@@ -257,22 +269,15 @@ async function main(options) {
                       });
                       return;
                     }
+                    resolve(rev);
                   });
                 }));
               }
             }
           }
 
-          resolve("OK");
-        })
-        .catch(error => {
-          console.error('hashing failed:', error);
-          resolve("OK");
-        });
-      }));
-    });
-
-    Promise.all(scanlist).then(async () => {
+      }
+      await Promise.all(pendingOperations);
       await updateRootVersionIfNeeded(options, changeList);
 
       if (options.changed) {
@@ -339,7 +344,7 @@ async function main(options) {
       } else {
         finish();
       }
-    }, mainreject);
+    }).catch(mainreject);
   });
 }
 

package/src/lib.mjs

@@ -317,7 +317,6 @@ export async function compare(
   // Collect directly-changed/new packages
   const changedNames = new Set();
   packages.forEach((name) => {
-    if (current[name].packageFolder !== packageFolder) return;
     if (
       previous[current[name].fullName] === undefined ||
       current[name].hash !== previous[current[name].fullName].hash

package/tests/index.test.mjs

@@ -120,6 +120,65 @@ describe("index CLI hash loading", () => {
   });
 });
 
+describe("index CLI cross-folder propagation", () => {
+  it.each(["dependents", "dependencies", "nx"])(
+    "includes unchanged consumers across folders using %s",
+    graphSource => {
+      const root = setupWorkspace();
+      try {
+        const packages = [
+          ["ux/apps", "admin-ux", "@icg/x-saas-ux"],
+          ["ux/packages", "saas-package", "@lit/lit-saas-package"],
+          ["ux/saas", "manage-role", "@lit/lit-saas-manage-role"],
+          ["ux/apps", "unrelated", "@scope/unrelated"],
+        ];
+        for (const [folder, name, fullName] of packages) {
+          const directory = path.join(root, folder, name);
+          mkdirSync(directory, { recursive: true });
+          writeFileSync(path.join(directory, "package.json"), JSON.stringify({ name: fullName, version: "1.0.0" }));
+          writeFileSync(path.join(directory, "index.js"), "export default 1;\n");
+        }
+        const dependencies = {
+          "@icg/x-saas-ux": ["@lit/lit-saas-package"],
+          "@lit/lit-saas-package": ["@lit/lit-saas-manage-role"],
+          "@lit/lit-saas-manage-role": [],
+        };
+        const dependents = {
+          "@lit/lit-saas-manage-role": ["@lit/lit-saas-package"],
+          "@lit/lit-saas-package": ["@icg/x-saas-ux"],
+        };
+        writeFileSync(path.join(root, ".cicd/manifest.json"), JSON.stringify(
+          graphSource === "dependents" ? { dependencies, dependents } :
+            graphSource === "dependencies" ? { dependencies } : { dependencies: {} },
+        ));
+        const graphPath = path.join(root, "dependencies.json");
+        writeFileSync(graphPath, JSON.stringify({ graph: {
+          dependencies: Object.fromEntries(Object.entries(dependencies).map(
+            ([name, targets]) => [name, targets.map(target => ({ target }))],
+          )),
+        } }));
+        const run = (folders, saveHash = false) => execFileSync("node", [
+          cliPath, "--changed", "--children", folders, "--prefixPath", root,
+          ...(saveHash ? ["--hash"] : []),
+          ...(graphSource === "nx" ? ["--dependencies", graphPath] : []),
+        ], { cwd: repoRoot, encoding: "utf8" });
+        run("ux/apps,ux/packages,ux/saas", true);
+        writeFileSync(path.join(root, "ux/saas/manage-role/index.js"), "export default 2;\n");
+        for (const folders of ["ux/apps,ux/packages,ux/saas", "ux/saas,ux/packages,ux/apps"]) {
+          const stdout = run(folders);
+          const changed = JSON.parse(stdout.match(/CHANGED - (\[[^\n]*\])/)[1]);
+          expect(changed.sort()).toEqual(["admin-ux", "manage-role", "saas-package"]);
+          expect(stdout).toContain("variable=ux_apps;");
+          expect(stdout).toContain("variable=ux_packages;");
+          expect(stdout).toContain("variable=ux_saas;");
+        }
+      } finally {
+        rmSync(root, { recursive: true, force: true });
+      }
+    },
+  );
+});
+
 describe("index CLI --exclude", () => {
   function setupWorkspaceWithTwoRoots() {
     const root = mkdtempSync(path.join(os.tmpdir(), "monorepo-version-"));

package/tests/lib.test.mjs

@@ -256,7 +256,7 @@ describe("compare", () => {
       expect(results[0].value.name).toBe("comp-a");
     });
 
-    it("does not propagate cross-folder dependency changes into result", async () => {
+    it("propagates cross-folder changes while emitting only the requested folder", async () => {
       // leaf is in 'components', parent is in 'saas'
       // when comparing 'components', only comp packages appear in output
       const current = {
@@ -274,6 +274,9 @@ describe("compare", () => {
       );
       expect(results).toHaveLength(1);
       expect(results[0].value.name).toBe("leaf");
+      const parentResults = await compare("saas", previous, current, deps, opts);
+      expect(parentResults).toHaveLength(1);
+      expect(parentResults[0].value).toMatchObject({ name: "parent", changed: true });
     });
   });