enablement-build-monorepo-version 2.0.7 → 2.0.9

package/package.json

@@ -1,12 +1,17 @@
 {
   "name": "enablement-build-monorepo-version",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "description": "This detects changes in the children packages of a monorepo.",
   "type": "module",
   "module": "./src/index.mjs",
   "bin": "./src/index.mjs",
   "license": "MIT",
   "author": "Contributors",
+  "scripts": {
+    "start": "node src/index.mjs",
+    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
+    "test:watch": "node --experimental-vm-modules node_modules/jest/bin/jest.js --watch"
+  },
   "jest": {
     "testEnvironment": "node",
     "testMatch": [
@@ -18,10 +23,5 @@
   },
   "devDependencies": {
     "jest": "^30.4.2"
-  },
-  "scripts": {
-    "start": "node src/index.mjs",
-    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
-    "test:watch": "node --experimental-vm-modules node_modules/jest/bin/jest.js --watch"
   }
 }

package/src/index.mjs

@@ -35,7 +35,7 @@ function buildHashesForCicd(current) {
       hashData[entry.fullName] = {
         hash: entry.hash,
         version: entry.version,
-        folderName: shortName,
+        name: entry.fullName,
         packageFolder: entry.packageFolder
       };
       versions[entry.fullName] = entry.version;
@@ -155,16 +155,25 @@ async function main(options) {
       }
     }
 
-    // Load manifest for later use (will extract hashes after building current)
+    // Load previous hashes.
+    // - hash.json mode: compare directly by short package folder name.
+    // - manifest.json mode: defer to full-name mapping after building current.
     let manifestData = {};
     if (usesManifestHashFile) {
       const data = existsSync(changeConfig) ? readFileSync(changeConfig, "utf8") : "{}";
       manifestData = JSON.parse(data || "{}");
-    }
 
-    // For now, set previous to empty - will populate after building current
-    // (because we need the fullName mapping from current)
-    previous = {};
+      // Backward compatibility: some manifests may still store hashes in the old
+      // flat format. Keep these as a fallback in case cicd is not present.
+      if (!manifestData.cicd) {
+        previous = convertOldHashFormat(manifestData);
+      } else {
+        previous = {};
+      }
+    } else {
+      const data = existsSync(changeConfig) ? readFileSync(changeConfig, "utf8") : "{}";
+      previous = JSON.parse(data || "{}");
+    }
     if (options.debug) console.log("PREVIOUS", JSON.stringify(previous));
 
     options.hashFiles.forEach(file => {
@@ -319,7 +328,8 @@ async function main(options) {
             if (!manifest.cicd) manifest.cicd = {};
             if (!manifest.cicd[fullname]) manifest.cicd[fullname] = {};
             manifest.cicd[fullname].hash = hashData[fullname].hash;
-            manifest.cicd[fullname].folderName = hashData[fullname].folderName;
+            manifest.cicd[fullname].name = hashData[fullname].name;
+            delete manifest.cicd[fullname].folderName;
             manifest.cicd[fullname].packageFolder = hashData[fullname].packageFolder;
           });
 

package/tests/index.test.mjs

@@ -0,0 +1,120 @@
+import { describe, it, expect } from "@jest/globals";
+import { execFileSync } from "child_process";
+import os from "os";
+import path from "path";
+import { fileURLToPath } from "url";
+import {
+  mkdtempSync,
+  mkdirSync,
+  readFileSync,
+  rmSync,
+  writeFileSync,
+} from "fs";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const repoRoot = path.resolve(__dirname, "..", "..");
+const cliPath = path.resolve(repoRoot, "monorepo-version", "src", "index.mjs");
+
+function setupWorkspace() {
+  const root = mkdtempSync(path.join(os.tmpdir(), "monorepo-version-"));
+
+  mkdirSync(path.join(root, "packages", "example"), { recursive: true });
+  mkdirSync(path.join(root, ".cicd"), { recursive: true });
+
+  writeFileSync(
+    path.join(root, "package.json"),
+    JSON.stringify(
+      {
+        name: "tmp-monorepo",
+        private: true,
+        workspaces: ["packages/*"],
+      },
+      null,
+      2,
+    ) + "\n",
+    "utf8",
+  );
+
+  writeFileSync(
+    path.join(root, "packages", "example", "package.json"),
+    JSON.stringify(
+      {
+        name: "@scope/example",
+        version: "1.0.0",
+      },
+      null,
+      2,
+    ) + "\n",
+    "utf8",
+  );
+
+  writeFileSync(path.join(root, "packages", "example", "index.js"), "export default 1;\n", "utf8");
+
+  return root;
+}
+
+function runRelease(root, hashFile) {
+  const stdout = execFileSync(
+    "node",
+    [
+      cliPath,
+      "--hash",
+      "--changed",
+      "--children",
+      "packages",
+      "--prefixPath",
+      root,
+      "--hashFile",
+      hashFile,
+    ],
+    {
+      cwd: repoRoot,
+      encoding: "utf8",
+    },
+  );
+
+  const changedMatch = stdout.match(/CHANGED - (\[[^\n]*\])/);
+  if (!changedMatch) {
+    throw new Error(`Could not find changed list in output:\n${stdout}`);
+  }
+
+  return JSON.parse(changedMatch[1]);
+}
+
+describe("index CLI hash loading", () => {
+  it("supports non-manifest hash mode across repeated runs", () => {
+    const root = setupWorkspace();
+    try {
+      const first = runRelease(root, ".cicd/hash.json");
+      const second = runRelease(root, ".cicd/hash.json");
+
+      expect(first).toContain("example");
+      expect(second).toEqual([]);
+
+      const hashJson = JSON.parse(readFileSync(path.join(root, ".cicd", "hash.json"), "utf8"));
+      expect(hashJson.example).toBeDefined();
+      expect(hashJson.example.hash).toBeTruthy();
+    } finally {
+      rmSync(root, { recursive: true, force: true });
+    }
+  });
+
+  it("supports manifest hash mode across repeated runs", () => {
+    const root = setupWorkspace();
+    try {
+      const first = runRelease(root, ".cicd/manifest.json");
+      const second = runRelease(root, ".cicd/manifest.json");
+
+      expect(first).toContain("example");
+      expect(second).toEqual([]);
+
+      const manifest = JSON.parse(readFileSync(path.join(root, ".cicd", "manifest.json"), "utf8"));
+      expect(manifest.cicd["@scope/example"]).toBeDefined();
+      expect(manifest.cicd["@scope/example"].hash).toBeTruthy();
+      expect(manifest.versions["@scope/example"]).toBe("1.0.0");
+    } finally {
+      rmSync(root, { recursive: true, force: true });
+    }
+  });
+});

package/tests/lib.test.mjs

@@ -343,6 +343,65 @@ describe("version manifest precedence and updates", () => {
     rmSync(root, { recursive: true, force: true });
   });
 
+  it("reads current version and name from version.json when package.json is absent", () => {
+    const root = mkdtempSync(path.join(os.tmpdir(), "monorepo-version-"));
+    const pkgDir = path.join(root, "packages", "gamma");
+    mkdirSync(pkgDir, { recursive: true });
+
+    writeFileSync(
+      path.join(pkgDir, "version.json"),
+      JSON.stringify({ name: "@s/gamma-version", version: "2.1.0" }, null, 2),
+      "utf8",
+    );
+    writeFileSync(
+      path.join(pkgDir, "pyproject.toml"),
+      '[project]\nname = "gamma-toml"\nversion = "3.0.0"\n',
+      "utf8",
+    );
+
+    const current = getCurrentVersion(root, "packages", "gamma");
+    expect(current.version).toBe("2.1.0");
+    expect(current.fullName).toBe("@s/gamma-version");
+
+    rmSync(root, { recursive: true, force: true });
+  });
+
+  it("reads current version and name from pyproject.toml only when package.json and version.json are absent", () => {
+    const root = mkdtempSync(path.join(os.tmpdir(), "monorepo-version-"));
+    const pkgDir = path.join(root, "packages", "delta");
+    mkdirSync(pkgDir, { recursive: true });
+
+    writeFileSync(
+      path.join(pkgDir, "pyproject.toml"),
+      '[project]\nname = "delta-toml"\nversion = "3.2.0"\n',
+      "utf8",
+    );
+
+    const current = getCurrentVersion(root, "packages", "delta");
+    expect(current.version).toBe("3.2.0");
+    expect(current.fullName).toBe("delta-toml");
+
+    rmSync(root, { recursive: true, force: true });
+  });
+
+  it("does not fall back to folder name when no manifest name exists", () => {
+    const root = mkdtempSync(path.join(os.tmpdir(), "monorepo-version-"));
+    const pkgDir = path.join(root, "packages", "epsilon");
+    mkdirSync(pkgDir, { recursive: true });
+
+    writeFileSync(
+      path.join(pkgDir, "package.json"),
+      JSON.stringify({ version: "1.0.0" }, null, 2),
+      "utf8",
+    );
+
+    const current = getCurrentVersion(root, "packages", "epsilon");
+    expect(current.version).toBe("1.0.0");
+    expect(current.fullName).toBeUndefined();
+
+    rmSync(root, { recursive: true, force: true });
+  });
+
   it("updates all version manifests when package.json, version.json, and pyproject.toml exist", async () => {
     const root = mkdtempSync(path.join(os.tmpdir(), "monorepo-version-"));
     const pkgDir = path.join(root, "packages", "beta");