From e237d0a6e07c7d02a315f04be44904f7b3f85b89 Mon Sep 17 00:00:00 2001 From: Afloat Date: Wed, 18 Nov 2026 15:49:25 +0800 Subject: [PATCH] fix: reject partial pnpm ledger repairs Propagate structural failures from every dependency section before committing ledger changes. Keep sections without the target dependency skippable. --- src/dsh-ledger.ts | 2 +- .../issue3496-dsh-ledger-convergence.test.ts | 52 +++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/src/dsh-ledger.ts b/src/dsh-ledger.ts index d3e95a3426..61fbc43b6a 100644 --- a/src/dsh-ledger.ts +++ b/src/dsh-ledger.ts @@ -383,7 +383,7 @@ export function patchPnpmLock(text: string, spec: string, version: string): Pnpm const sub = patchNestedEntries(lines.slice(range[0], range[1]), 0, range[1] - range[0], spec, version); if (sub.kind === "fail") { // an entry-less section is fine when another section holds the entry - if (patched === 0 && !sub.reason.startsWith("no billion-context entry")) return sub; + if (!sub.reason.startsWith("no billion-context entry")) return sub; continue; } lines.splice(range[0], range[1] - range[0], ...sub.next.split("\n")); diff --git a/tests/issue3496-dsh-ledger-convergence.test.ts b/tests/issue3496-dsh-ledger-convergence.test.ts index dd7de54a36..56cfb57033 100644 --- a/tests/issue3496-dsh-ledger-convergence.test.ts +++ b/tests/issue3496-dsh-ledger-convergence.test.ts @@ -653,6 +653,58 @@ test("#3496: patchPnpmLock structural failures — no partial result", () => { assert.ok(r2.kind === "fail" && r2.reason.includes("no billion-context entry")); }); +for (const field of ["specifier", "version"] as const) { + test(`patchPnpmLock rejects a devDependency missing ${field} after a valid dependency`, () => { + const broken = pnpmLockV6("^0.1.196", "0.1.196") + [ + "devDependencies:", + " billion-context:", + field === "specifier" ? " version: 0.1.196" : " specifier: ^0.1.196", + "", + ].join("\n"); + const result = patchPnpmLock(broken, "^0.1.197", "0.1.197"); + assert.equal(result.kind, "fail"); + assert.ok(result.kind === "fail" && result.reason.includes("lacks both")); + }); +} + +test("ledger convergence leaves every file untouched when a later pnpm section is malformed", () => { + const root = mkdtempSync(path.join(tmpdir(), "bc-ledger-partial-")); + try { + const broken = pnpmLockV6("^0.1.196", "0.1.196") + [ + "devDependencies:", + " billion-context:", + " specifier: ^0.1.196", + "", + ].join("\n"); + const dir = makeProfile(root, "partial", { spec: "^1.2.9", copyVersion: "0.1.197", pnpmLock: broken }); + const before = profileFiles(dir); + const beforeMt = profileMtimes(dir); + const result = convergeDshLedger(dir, "0.1.197"); + assert.match(result.error ?? "", /lacks both/); + assert.deepEqual(result.changed, []); + assert.deepEqual(result.details, []); + assertZeroWrites(dir, before, beforeMt); + } finally { + rmrf(root); + } +}); + +test("patchPnpmLock accepts a later section containing only unrelated dependencies", () => { + const lock = pnpmLockV6("^0.1.196", "0.1.196") + [ + "devDependencies:", + " other-dev:", + " specifier: ^2.0.0", + " version: 2.0.0", + "", + ].join("\n"); + const result = patchPnpmLock(lock, "^0.1.197", "0.1.197"); + assert.equal(result.kind, "ok"); + if (result.kind === "ok") { + assert.match(result.next, /specifier: \^0\.1\.197\n version: 0\.1\.197/); + assert.ok(result.next.endsWith(lock.slice(lock.indexOf("devDependencies:")))); + } +}); + test("#3496: patchNpmLock without the node_modules entry fails cleanly", () => { const r = patchNpmLock(JSON.stringify({ packages: { "": { dependencies: { "billion-context": "^1.2.9" } } } }), "^0.1.197", "0.1.197"); assert.equal(r.kind, "fail");