vouchington-tooling 0.12.1 → 0.12.3

package/dist/pnpm-install/install-operations.mjs

@@ -1,13 +1,17 @@
 import { scheduler } from 'node:timers/promises';
 import { runPnpm } from './exec.mjs';
 import { nativeBinariesMatchRuntime, repairedNativeBinariesMatchRuntime } from './native-health.mjs';
-import { buildLedgersAllowNativeRepair, pendingBuilds } from './pending-builds.mjs';
+import { buildLedgersAllowNativeRepair, deduplicatePendingBuilds, pendingBuilds, } from './pending-builds.mjs';
 import { INSTALL_TERMINATION_FAILED } from './process.mjs';
 import { formatReleaseAgeFailure, isReleaseAgeViolation } from './release-age.mjs';
 import { findWorkspaceLinkMismatches, forcedInstallArgs, logWorkspaceLinkMismatches, } from './support.mjs';
 function fail(message) {
     throw new Error(message);
 }
+function failPendingBuildLedger(phase, state) {
+    const ids = state.kind === 'pending' ? `; remaining IDs: ${JSON.stringify(state.ids)}` : '';
+    fail(`${phase} completed without a clear pending build ledger${ids}`);
+}
 export function withScriptPolicy(args, installScripts) {
     return installScripts ? args : [...args, '--ignore-scripts'];
 }
@@ -49,16 +53,15 @@ async function verifyInstallHealth(runCapture, phase, repairedNativePaths = [])
 export async function finalizePendingBuilds(options, runCapture, phase) {
     const before = await pendingBuilds();
     if (options.installScripts && before.kind === 'unknown')
-        fail(`${phase} completed without a clear pending build ledger`);
+        failPendingBuildLedger(phase, before);
     if (options.installScripts && before.kind === 'pending') {
+        const deduplicated = await deduplicatePendingBuilds();
+        if (deduplicated.kind !== 'pending')
+            failPendingBuildLedger(phase, deduplicated);
         await install(['rebuild', '--pending', '--recursive'], options, 'pending scripts rebuild');
-        let after = await pendingBuilds();
-        if (after.kind === 'pending' && after.ids.length === 1 && after.ids[0] === '.') {
-            await install(['rebuild', '--pending', '--workspace-root'], options, 'pending workspace root rebuild');
-            after = await pendingBuilds();
-        }
+        const after = await pendingBuilds();
         if (after.kind !== 'clear')
-            fail(`${phase} completed without a clear pending build ledger`);
+            failPendingBuildLedger(phase, after);
     }
     await verifyInstallHealth(runCapture, phase);
     return options.installScripts ? { kind: 'clear' } : before;

package/dist/pnpm-install/pending-builds.d.mts

@@ -7,4 +7,5 @@ export type PendingBuildState = {
     kind: 'unknown';
 };
 export declare function pendingBuilds(): Promise<PendingBuildState>;
+export declare function deduplicatePendingBuilds(): Promise<PendingBuildState>;
 export declare function buildLedgersAllowNativeRepair(): Promise<boolean>;

package/dist/pnpm-install/pending-builds.mjs

@@ -1,9 +1,10 @@
-import { readFile } from 'node:fs/promises';
+import { readFile, writeFile } from 'node:fs/promises';
 import path from 'node:path';
-import { parse } from 'yaml';
+import { parse, stringify } from 'yaml';
+const modulesPath = () => path.join(process.cwd(), 'node_modules', '.modules.yaml');
 async function buildLedgers() {
     try {
-        const value = parse(await readFile(path.join(process.cwd(), 'node_modules', '.modules.yaml'), 'utf8'));
+        const value = parse(await readFile(modulesPath(), 'utf8'));
         if (typeof value !== 'object' || value === null || Array.isArray(value))
             return undefined;
         // oxlint-disable-next-line no-mistakes/ts-no-const-aliases -- validate the parsed YAML object before reading its fields
@@ -18,6 +19,7 @@ async function buildLedgers() {
         return {
             ignoredBuilds: ignored,
             pendingBuilds: pending.length === 0 ? { kind: 'clear' } : { ids: pending.toSorted(), kind: 'pending' },
+            record,
         };
     }
     catch {
@@ -27,6 +29,22 @@ async function buildLedgers() {
 export async function pendingBuilds() {
     return (await buildLedgers())?.pendingBuilds ?? { kind: 'unknown' };
 }
+export async function deduplicatePendingBuilds() {
+    const ledgers = await buildLedgers();
+    if (ledgers === undefined || ledgers.pendingBuilds.kind !== 'pending')
+        return ledgers?.pendingBuilds ?? { kind: 'unknown' };
+    // `buildLedgers` has already verified every pending entry is a string.
+    const unique = [...new Set(ledgers.record.pendingBuilds)];
+    if (unique.length === ledgers.pendingBuilds.ids.length)
+        return ledgers.pendingBuilds;
+    try {
+        await writeFile(modulesPath(), stringify({ ...ledgers.record, pendingBuilds: unique }));
+    }
+    catch {
+        return { kind: 'unknown' };
+    }
+    return pendingBuilds();
+}
 export async function buildLedgersAllowNativeRepair() {
     const ledgers = await buildLedgers();
     return (ledgers !== undefined &&

package/dist/pnpm-install/pnpm-install-fake-pnpm.test-helpers.mjs

@@ -29,10 +29,10 @@ if [ "\${PNPM_FAIL_RELEASE_AGE_CALL:-0}" = "$calls" ]; then
   exit 1
 fi
 if [ -n "\${PNPM_SLEEP_SECONDS:-}" ]; then sleep "$PNPM_SLEEP_SECONDS"; fi
-if [ "\${PNPM_INVALID_PENDING_BUILDS:-0}" = 1 ]; then
+if [ "\${1:-}" != rebuild ] && [ "\${PNPM_INVALID_PENDING_BUILDS:-0}" = 1 ]; then
   mkdir -p "$PNPM_NODE_MODULES"
   printf 'pendingBuilds: invalid\n' > "$PNPM_NODE_MODULES/.modules.yaml"
-elif [ -n "\${PNPM_PENDING_BUILDS:-}" ]; then
+elif [ "\${1:-}" != rebuild ] && [ -n "\${PNPM_PENDING_BUILDS:-}" ]; then
   mkdir -p "$PNPM_NODE_MODULES"
   printf 'pendingBuilds: [%s]\\n' "$PNPM_PENDING_BUILDS" > "$PNPM_NODE_MODULES/.modules.yaml"
 elif [ ! -f "$PNPM_NODE_MODULES/.modules.yaml" ]; then
@@ -49,6 +49,8 @@ case " $* " in
     fi
     if [ "\${PNPM_REBUILD_INVALID_LEDGER:-0}" = 1 ]; then
       printf 'pendingBuilds: invalid\n' > "$PNPM_NODE_MODULES/.modules.yaml"
+    elif [ "\${PNPM_REBUILD_REQUIRES_DEDUPED:-0}" = 1 ] && sed -n 's/.*\\[\\(.*\\)\\].*/\\1/p' "$PNPM_NODE_MODULES/.modules.yaml" | tr ',' '\\n' | sed 's/^ *//; s/ *$//' | sort | uniq -d | grep -q .; then
+      cp "$PNPM_NODE_MODULES/.modules.yaml" "$PNPM_NODE_MODULES/.modules.yaml.rebuild-left-pending"
     elif [ -n "\${PNPM_REBUILD_PENDING_BUILDS:-}" ]; then
       printf 'pendingBuilds: [%s]\n' "$PNPM_REBUILD_PENDING_BUILDS" > "$PNPM_NODE_MODULES/.modules.yaml"
     else

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vouchington-tooling",
-  "version": "0.12.1",
+  "version": "0.12.3",
   "description": "Vouchington CLI and extractable tooling libraries.",
   "homepage": "https://github.com/vouchington/vouchington-tooling/tree/main/packages/vouchington-tooling#readme",
   "bugs": {