rolldown-pnpm-config 0.8.1 → 1.0.0

package/bin/rolldown-pnpm-config.js

@@ -12,7 +12,7 @@ const root = Command.make("rolldown-pnpm-config").pipe(Command.withSubcommands([
 	exportCommand,
 	previewCommand
 ]));
-Command.run(root, { version: "0.8.1" }).pipe(Effect.provide(NodeServices.layer), NodeRuntime.runMain);
+Command.run(root, { version: "1.0.0" }).pipe(Effect.provide(NodeServices.layer), NodeRuntime.runMain);
 
 //#endregion
 export {  };

package/cli/ast.js

@@ -0,0 +1,54 @@
+//#region src/cli/ast.ts
+/**
+* The static name of an ObjectExpression property key: an Identifier's name
+* or a Literal's stringified value; undefined for a computed key.
+*
+* @internal
+*/
+function keyName(key) {
+	return key.type === "Identifier" ? key.name : key.type === "Literal" ? String(key.value) : void 0;
+}
+/**
+* Find a property value by key name in an ObjectExpression node. Handles both
+* Identifier keys (unquoted) and Literal keys (quoted).
+*
+* @internal
+*/
+function prop(obj, key) {
+	for (const p of obj.properties ?? []) {
+		if (p.type !== "Property") continue;
+		if (keyName(p.key) === key) return p.value;
+	}
+}
+/**
+* Find the first `PnpmConfigPlugin(...)` call's first argument (an object
+* literal). The single AST walker behind both static discovery (`upgrade`)
+* and static evaluation (`export` / `preview`), so the two always agree on
+* which call they found.
+*
+* @internal
+*/
+function findPluginArg(program) {
+	let found;
+	const visit = (node) => {
+		if (found || node === null || typeof node !== "object") return;
+		const n = node;
+		if (n.type === "CallExpression") {
+			const callee = n.callee;
+			if (callee?.type === "Identifier" && callee.name === "PnpmConfigPlugin") {
+				const args = n.arguments;
+				if (args?.[0]?.type === "ObjectExpression") {
+					found = args[0];
+					return;
+				}
+			}
+		}
+		for (const value of Object.values(n)) if (Array.isArray(value)) value.forEach(visit);
+		else if (value && typeof value === "object") visit(value);
+	};
+	visit(program);
+	return found;
+}
+
+//#endregion
+export { findPluginArg, keyName, prop };

package/cli/commands/export.js

@@ -1,5 +1,4 @@
-import { discoverPatches } from "../../patches/discover.js";
-import { isRewriteDirective, readLocalPatchesDir, withResolvedBuildPatches } from "../../patches/build.js";
+import { discoverOwnedPatches, withResolvedBuildPatches } from "../../patches/build.js";
 import { DESCRIPTORS } from "../../descriptors/index.js";
 import { freeze } from "../../plugin/freeze.js";
 import { resolveRootName } from "../../runtime/ctx.js";
@@ -7,16 +6,16 @@ import { reconcilePatches } from "../../patches/reconcile.js";
 import { buildDiff } from "../diff/build.js";
 import { renderExportDiff } from "../diff/render.js";
 import { effectiveManaged } from "../effective.js";
-import { evaluatePluginConfig } from "../evaluate.js";
+import { canonicalize, renderWorkspace } from "../workspace-file.js";
+import { loadConfigAndWorkspace } from "../load-config.js";
 import { findConfigFiles, pickConfigCandidate } from "../select-file.js";
 import { toAnsi } from "../ui/ansi.js";
 import { detectCapabilities } from "../ui/env.js";
 import { legendLines } from "../ui/legend.js";
-import { canonicalize, findWorkspaceFile, parseWorkspace, renderWorkspace } from "../workspace-file.js";
 import { overlayWorkspace } from "../workspace-overlay.js";
-import { Data, Effect, Option } from "effect";
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
-import { dirname, join, relative } from "node:path";
+import { Data, Effect, Option, Predicate } from "effect";
+import { existsSync, writeFileSync } from "node:fs";
+import { dirname, relative } from "node:path";
 import { Argument, Command, Flag } from "effect/unstable/cli";
 
 //#region src/cli/commands/export.ts
@@ -43,43 +42,25 @@ const WORKSPACE_FIELDS = new Set(Object.entries(DESCRIPTORS).filter(([, d]) => d
 */
 function runExport(opts) {
 	return Effect.gen(function* () {
-		const configSource = yield* Effect.try({
-			try: () => readFileSync(opts.configFile, "utf8"),
-			catch: () => new ExportError({ message: `Cannot read ${opts.configFile}` })
-		});
-		const { config, errors } = evaluatePluginConfig(configSource, opts.configFile);
-		if (config === null) return yield* Effect.fail(new ExportError({ message: `No PnpmConfigPlugin call found in ${opts.configFile}` }));
-		if (errors.length > 0) return yield* Effect.fail(new ExportError({ message: `Non-literal config values: ${errors.join("; ")}` }));
-		const resolvedConfig = withResolvedBuildPatches(config, dirname(opts.configFile));
+		const { config, localCfg, path, parsed } = yield* loadConfigAndWorkspace(opts, (message) => new ExportError({ message }));
+		const pluginConfig = config;
+		const owned = discoverOwnedPatches(pluginConfig, dirname(opts.configFile));
+		const resolvedConfig = withResolvedBuildPatches(pluginConfig, dirname(opts.configFile), owned);
 		const { base, manifest } = yield* freeze(resolvedConfig).pipe(Effect.mapError((e) => new ExportError({ message: e.message })));
 		const managed = {};
 		for (const [k, v] of Object.entries(base)) if (WORKSPACE_FIELDS.has(k)) managed[k] = v;
-		const path = opts.workspacePath ?? findWorkspaceFile(process.cwd()) ?? join(process.cwd(), "pnpm-workspace.yaml");
-		const parsed = existsSync(path) ? yield* Effect.try({
-			try: () => parseWorkspace(readFileSync(path, "utf8")),
-			catch: (e) => new ExportError({ message: `Cannot read or parse ${path}: ${String(e)}` })
-		}) : {};
 		const rootName = resolveRootName({ dir: dirname(path) });
-		const localCfg = config.local && typeof config.local === "object" ? config.local : void 0;
 		const effective = effectiveManaged(managed, localCfg, parsed, manifest, rootName);
-		const rawPatched = config.patchedDependencies;
-		const explicitPatchMap = rawPatched !== void 0 && !isRewriteDirective(rawPatched);
+		const explicitPatchMap = owned === void 0;
 		const contributed = {};
 		if (explicitPatchMap) {
-			const explicit = effective.patchedDependencies;
-			if (explicit !== null && typeof explicit === "object" && !Array.isArray(explicit)) Object.assign(contributed, explicit);
+			if (Predicate.isObject(effective.patchedDependencies)) Object.assign(contributed, effective.patchedDependencies);
 		} else {
-			const localPatchesDir = readLocalPatchesDir(config);
-			const owned = discoverPatches({
-				baseDir: dirname(opts.configFile),
-				name: typeof config.name === "string" ? config.name : "",
-				...localPatchesDir !== void 0 ? { localPatchesDir } : {}
-			});
 			const workspaceRoot = dirname(path);
 			for (const p of owned) contributed[p.key] = relative(workspaceRoot, p.absPath).split(/[\\/]/).join("/");
 		}
 		if (Object.keys(contributed).length > 0) effective.patchedDependencies = {
-			...(parsed !== null && typeof parsed === "object" && !Array.isArray(parsed) ? parsed.patchedDependencies : void 0) ?? {},
+			...parsed.patchedDependencies ?? {},
 			...contributed
 		};
 		const report = reconcilePatches({
@@ -89,7 +70,7 @@ function runExport(opts) {
 		});
 		const merged = overlayWorkspace(effective, parsed);
 		const rendered = renderWorkspace(merged);
-		const localKeys = new Set(config.local && typeof config.local === "object" ? Object.keys(config.local) : []);
+		const localKeys = new Set(Object.keys(localCfg ?? {}));
 		const tree = buildDiff(canonicalize(parsed), canonicalize(merged), {
 			localKeys,
 			managedKeys: WORKSPACE_FIELDS

package/cli/commands/preview.js

@@ -1,17 +1,14 @@
 import { freeze } from "../../plugin/freeze.js";
 import { resolveRootName } from "../../runtime/ctx.js";
-import { evaluatePluginConfig } from "../evaluate.js";
+import { loadConfigAndWorkspace } from "../load-config.js";
 import { findConfigFiles, pickConfigCandidate } from "../select-file.js";
 import { toAnsi } from "../ui/ansi.js";
 import { detectCapabilities } from "../ui/env.js";
 import { legendLines } from "../ui/legend.js";
-import { findWorkspaceFile, parseWorkspace } from "../workspace-file.js";
 import { WORKSPACE_FIELDS } from "./export.js";
 import { buildPreviewViews } from "../preview-views.js";
-import { runPreview } from "../ui/run-preview.js";
 import { Data, Effect, Option } from "effect";
-import { existsSync, readFileSync } from "node:fs";
-import { dirname, join } from "node:path";
+import { dirname } from "node:path";
 import { Argument, Command } from "effect/unstable/cli";
 
 //#region src/cli/commands/preview.ts
@@ -25,22 +22,10 @@ var PreviewError = class extends Data.TaggedError("PreviewError") {};
 */
 function runPreviewViews(opts) {
 	return Effect.gen(function* () {
-		const configSource = yield* Effect.try({
-			try: () => readFileSync(opts.configFile, "utf8"),
-			catch: () => new PreviewError({ message: `Cannot read ${opts.configFile}` })
-		});
-		const { config, errors } = evaluatePluginConfig(configSource, opts.configFile);
-		if (config === null) return yield* Effect.fail(new PreviewError({ message: `No PnpmConfigPlugin call found in ${opts.configFile}` }));
-		if (errors.length > 0) return yield* Effect.fail(new PreviewError({ message: `Non-literal config values: ${errors.join("; ")}` }));
+		const { config, localCfg, path, parsed } = yield* loadConfigAndWorkspace(opts, (message) => new PreviewError({ message }));
 		const { base, manifest } = yield* freeze(config).pipe(Effect.mapError((e) => new PreviewError({ message: e.message })));
 		const managed = {};
 		for (const [k, v] of Object.entries(base)) if (WORKSPACE_FIELDS.has(k)) managed[k] = v;
-		const path = opts.workspacePath ?? findWorkspaceFile(process.cwd()) ?? join(process.cwd(), "pnpm-workspace.yaml");
-		const parsed = existsSync(path) ? yield* Effect.try({
-			try: () => parseWorkspace(readFileSync(path, "utf8")),
-			catch: (e) => new PreviewError({ message: `Cannot read or parse ${path}: ${String(e)}` })
-		}) : {};
-		const localCfg = config.local && typeof config.local === "object" ? config.local : void 0;
 		return buildPreviewViews({
 			managed,
 			...localCfg ? { local: localCfg } : {},
@@ -68,8 +53,10 @@ const previewCommand = Command.make("preview", { path: pathArg }, ({ path }) =>
 		...workspacePath !== void 0 ? { workspacePath } : {}
 	});
 	const caps = detectCapabilities();
-	if (caps.interactive) yield* runPreview(views);
-	else yield* Effect.sync(() => {
+	if (caps.interactive) {
+		const { runPreview } = yield* Effect.promise(() => import("../ui/run-preview.js"));
+		yield* runPreview(views);
+	} else yield* Effect.sync(() => {
 		const legend = caps.color ? `${toAnsi(legendLines(), { color: caps.color })}\n\n` : "";
 		process.stdout.write(`${legend}${toAnsi(views.changes, { color: caps.color })}\n`);
 	});

package/cli/commands/upgrade.js

@@ -1,19 +1,18 @@
+import { bareVersion } from "../../semver-util.js";
 import { evaluatePluginConfig } from "../evaluate.js";
 import { discoverCatalogEntries } from "../discover.js";
 import { filterEntriesByCatalog, findConfigFiles, pickConfigCandidate } from "../select-file.js";
 import { detectCapabilities } from "../ui/env.js";
-import { derivePeerRange } from "../peer-range.js";
-import { detectPeerDrift } from "../drift.js";
 import { versionKeyOf } from "../version-key.js";
-import { buildEdits } from "../edits.js";
-import { buildInteropEdits, interopEntryChanged, runInterop } from "../interop.js";
+import { buildEdits, entryEdits } from "../edits.js";
+import { buildInteropEdits, interopEntryChanged, makePeerFetcher, runInterop } from "../interop.js";
 import { buildGroupModel, computeGroupPeers } from "../interop-live.js";
-import { planEntry } from "../plan.js";
+import { derivePeerRange } from "../peer-range.js";
+import { defaultPick, planEntry } from "../plan.js";
 import { parsePnpmGate, readConfigReleaseAge } from "../release-age.js";
 import { RegistryResolver, RegistryResolverLive } from "../resolve.js";
 import { applyEdits } from "../rewrite.js";
 import { renderSummary } from "../summary.js";
-import { runWalk } from "../ui/run-walk.js";
 import { validateEdits } from "../validate.js";
 import { buildWalkItems } from "../walk-plan.js";
 import { findWorkspaceRoot, makeWorkspaceResolver } from "../workspace-resolve.js";
@@ -31,12 +30,30 @@ import { ReleaseAgeGate } from "@effected/npm";
 * @internal
 */
 var UpgradeError = class extends Data.TaggedError("UpgradeError") {};
+/** Read a config file and statically discover its catalog entries. @internal */
+function readCatalogSource(file) {
+	return Effect.gen(function* () {
+		const source = yield* Effect.try({
+			try: () => readFileSync(file, "utf8"),
+			catch: () => new UpgradeError({ message: `Cannot read ${file}` })
+		});
+		const { entries, skipped } = yield* Effect.try({
+			try: () => discoverCatalogEntries(source, file),
+			catch: (e) => new UpgradeError({ message: String(e) })
+		});
+		return {
+			source,
+			entries,
+			skipped
+		};
+	});
+}
 /** Combine the config-declared and pnpm-resolved release-age gates (strictest of both). @internal */
 function computeGate(source, file, resolver) {
 	return Effect.gen(function* () {
-		const { config } = yield* Effect.try(() => evaluatePluginConfig(source, file)).pipe(Effect.catch(() => Effect.succeed({ config: null })));
+		const { config } = yield* Effect.try(() => evaluatePluginConfig(source, file)).pipe(Effect.orElseSucceed(() => ({ config: null })));
 		const cfg = readConfigReleaseAge(config);
-		const [age, exc] = yield* Effect.all([resolver.pnpmConfig("minimumReleaseAge").pipe(Effect.catch(() => Effect.succeed(null))), resolver.pnpmConfig("minimumReleaseAgeExclude").pipe(Effect.catch(() => Effect.succeed(null)))], { concurrency: "unbounded" });
+		const [age, exc] = yield* Effect.all([resolver.pnpmConfig("minimumReleaseAge").pipe(Effect.orElseSucceed(() => null)), resolver.pnpmConfig("minimumReleaseAgeExclude").pipe(Effect.orElseSucceed(() => null))], { concurrency: "unbounded" });
 		const contributions = [cfg, parsePnpmGate(age, exc)].filter((g) => g !== null);
 		return ReleaseAgeGate.combine(...contributions);
 	});
@@ -70,27 +87,22 @@ function resolveGatedVersions(entries, resolver, gate, now, onProgress, workspac
 	let resolved = 0;
 	onProgress?.(0, total);
 	return Effect.forEach([...pairs], ([key, { pkg, fromWorkspace }]) => Effect.gen(function* () {
-		const vr = yield* (fromWorkspace && workspace !== void 0 ? workspace : resolver).versions(pkg).pipe(Effect.result);
-		if (Result.isFailure(vr)) {
-			onProgress?.(++resolved, total);
-			return [
-				key,
-				pkg,
-				[],
-				[]
-			];
-		}
-		if (fromWorkspace) {
-			onProgress?.(++resolved, total);
-			return [
-				key,
-				pkg,
-				vr.success,
-				vr.success
-			];
-		}
-		const times = gate.ageMinutes > 0 ? yield* resolver.times(pkg).pipe(Effect.catch(() => Effect.succeed({}))) : {};
+		const routed = fromWorkspace && workspace !== void 0 ? workspace : resolver;
+		const needTimes = !fromWorkspace && gate.ageMinutes > 0;
+		const [vr, times] = yield* Effect.all([routed.versions(pkg).pipe(Effect.result), needTimes ? resolver.times(pkg).pipe(Effect.orElseSucceed(() => ({}))) : Effect.succeed({})], { concurrency: "unbounded" });
 		onProgress?.(++resolved, total);
+		if (Result.isFailure(vr)) return [
+			key,
+			pkg,
+			[],
+			[]
+		];
+		if (fromWorkspace) return [
+			key,
+			pkg,
+			vr.success,
+			vr.success
+		];
 		return [
 			key,
 			pkg,
@@ -137,14 +149,7 @@ function writeResolveProgress(resolved, total) {
 */
 function runUpgrade(opts) {
 	return Effect.gen(function* () {
-		const source = yield* Effect.try({
-			try: () => readFileSync(opts.file, "utf8"),
-			catch: () => new UpgradeError({ message: `Cannot read ${opts.file}` })
-		});
-		const { entries, skipped } = yield* Effect.try({
-			try: () => discoverCatalogEntries(source, opts.file),
-			catch: (e) => new UpgradeError({ message: String(e) })
-		});
+		const { source, entries, skipped } = yield* readCatalogSource(opts.file);
 		const gate = yield* computeGate(source, opts.file, opts.resolver);
 		const versionsByPkg = yield* resolveGatedVersions(entries, opts.resolver, gate, Date.now(), opts.onProgress, opts.workspaceResolver);
 		if (versionsByPkg.unresolved.length > 0) return yield* Effect.fail(new UpgradeError({ message: unresolvedMessage(versionsByPkg.unresolved) }));
@@ -167,70 +172,21 @@ function runUpgrade(opts) {
 		};
 		for (const entry of entries) {
 			if (entry.strategy === "interop") continue;
-			const versionKey = versionKeyOf(entry);
-			const versions = versionsByPkg.gated.get(versionKey) ?? [];
-			const pkg = entry.pkg;
-			const rangeEdit = (span, value) => ({
-				span,
-				text: JSON.stringify(value),
-				pkg,
-				versionKey,
-				kind: "range",
-				value
-			});
-			const peerEdit = (span, value) => ({
-				span,
-				text: JSON.stringify(value),
-				pkg,
-				versionKey,
-				kind: "peer",
-				value
-			});
-			const peerInsert = (at, value) => ({
-				span: [at, at],
-				text: `, peer: ${JSON.stringify(value)}`,
-				pkg,
-				versionKey,
-				kind: "peer",
-				value
-			});
-			const derived = entry.strategy ? yield* derivePeerRange(entry.currentRange, entry.strategy).pipe(Effect.catch(() => Effect.succeed(null))) : null;
+			const versions = versionsByPkg.gated.get(versionKeyOf(entry)) ?? [];
+			const { range, setPeer } = entryEdits(entry);
+			const derived = entry.strategy ? yield* derivePeerRange(entry.currentRange, entry.strategy).pipe(Effect.orElseSucceed(() => null)) : null;
 			if (derived?.warning) warnings.push(`${entry.pkg}: ${derived.warning.message}`);
-			if (versions.length === 0) {
-				const at = entry.rangeSpan[1];
-				if (entry.peer && entry.strategy) {
-					const expected = yield* detectPeerDrift(entry).pipe(Effect.catch(() => Effect.succeed(null)));
-					if (expected !== null) {
-						edits.push(peerEdit(entry.peer.span, expected));
-						markChanged(entry);
-						continue;
-					}
-				} else if (!entry.peer && entry.strategy && derived !== null) {
-					edits.push(peerInsert(at, derived.range));
-					markChanged(entry);
-					continue;
-				}
-				skipped.push(`${entry.catalog}.${entry.pkg}`);
-				continue;
-			}
-			const candidates = yield* planEntry(entry, versions).pipe(Effect.catch(() => Effect.succeed([])));
-			const inRange = entry.source === "workspace" ? candidates.find((c) => c.kind !== "keep") : candidates.find((c) => c.kind === "in-range");
-			const at = entry.rangeSpan[1];
-			if (inRange) {
-				edits.push(rangeEdit(entry.rangeSpan, inRange.range));
-				markChanged(entry, inRange.range);
-				if (entry.peer && inRange.peerRange) edits.push(peerEdit(entry.peer.span, inRange.peerRange));
-				else if (!entry.peer && entry.strategy && inRange.peerRange) edits.push(peerInsert(at, inRange.peerRange));
-			} else if (!entry.peer && entry.strategy && derived !== null) {
-				edits.push(peerInsert(at, derived.range));
+			const peerOnly = derived === null ? null : entry.peer ? derived.range === entry.peer.value ? null : derived.range : derived.range;
+			const candidates = versions.length === 0 ? [] : yield* planEntry(entry, versions).pipe(Effect.orElseSucceed(() => []));
+			const pick = defaultPick(entry, candidates);
+			if (pick) {
+				edits.push(range(pick.range));
+				markChanged(entry, pick.range);
+				if (pick.peerRange) edits.push(setPeer(pick.peerRange));
+			} else if (peerOnly !== null) {
+				edits.push(setPeer(peerOnly));
 				markChanged(entry);
-			} else if (entry.peer && entry.strategy) {
-				const expected = yield* detectPeerDrift(entry).pipe(Effect.catch(() => Effect.succeed(null)));
-				if (expected !== null) {
-					edits.push(peerEdit(entry.peer.span, expected));
-					markChanged(entry);
-				}
-			}
+			} else if (versions.length === 0) skipped.push(`${entry.catalog}.${entry.pkg}`);
 		}
 		const interopEntries = entries.filter((e) => e.strategy === "interop");
 		const conflicts = [];
@@ -244,8 +200,8 @@ function runUpgrade(opts) {
 			const members = [];
 			for (const e of group) {
 				const versions = versionsByPkg.gated.get(versionKeyOf(e)) ?? [];
-				const inRange = (yield* planEntry(e, versions).pipe(Effect.catch(() => Effect.succeed([])))).find((c) => c.kind === "in-range");
-				const ceiling = inRange ? inRange.version : e.currentRange.replace(/^[\^~]/, "");
+				const inRange = (yield* planEntry(e, versions).pipe(Effect.orElseSucceed(() => []))).find((c) => c.kind === "in-range");
+				const ceiling = inRange ? inRange.version : bareVersion(e.currentRange);
 				members.push({
 					pkg: e.pkg,
 					ceiling,
@@ -336,11 +292,11 @@ function unresolvedMessage(unresolved) {
 function projectDecisions(items, full) {
 	const out = [];
 	for (const i of items) {
-		const inRange = i.entry.source === "workspace" ? i.candidates.find((c) => c.kind !== "keep") : i.candidates.find((c) => c.kind === "in-range");
-		if (inRange) {
+		const pick = defaultPick(i.entry, i.candidates);
+		if (pick) {
 			out.push({
 				item: i,
-				chosen: inRange
+				chosen: pick
 			});
 			continue;
 		}
@@ -367,17 +323,10 @@ function projectDecisions(items, full) {
 /** Build the colored preview summary string without writing. @internal */
 function runUpgradePreview(opts) {
 	return Effect.gen(function* () {
-		const source = yield* Effect.try({
-			try: () => readFileSync(opts.file, "utf8"),
-			catch: () => new UpgradeError({ message: `Cannot read ${opts.file}` })
-		});
-		const discovered = yield* Effect.try({
-			try: () => discoverCatalogEntries(source, opts.file),
-			catch: (e) => new UpgradeError({ message: String(e) })
-		});
+		const { source, entries } = yield* readCatalogSource(opts.file);
 		const gate = yield* computeGate(source, opts.file, opts.resolver);
-		const versions = yield* resolveGatedVersions(discovered.entries, opts.resolver, gate, Date.now(), void 0, opts.workspaceResolver);
-		const items = yield* buildWalkItems(discovered.entries, versions.gated).pipe(Effect.catch((e) => Effect.fail(new UpgradeError({ message: e.message }))));
+		const versions = yield* resolveGatedVersions(entries, opts.resolver, gate, Date.now(), void 0, opts.workspaceResolver);
+		const items = yield* buildWalkItems(entries, versions.gated).pipe(Effect.mapError((e) => new UpgradeError({ message: e.message })));
 		const text = renderSummary(projectDecisions(items, opts.full), void 0, { color: opts.color ?? false });
 		return versions.unresolved.length > 0 ? `${text}\n⚠ ${unresolvedMessage(versions.unresolved)}` : text;
 	});
@@ -642,18 +591,11 @@ const upgradeCommand = Command.make("upgrade", {
 		}
 		return;
 	}
-	const source = yield* Effect.try({
-		try: () => readFileSync(file, "utf8"),
-		catch: () => new UpgradeError({ message: `Cannot read ${file}` })
-	});
-	const discovered = yield* Effect.try({
-		try: () => discoverCatalogEntries(source, file),
-		catch: (e) => new UpgradeError({ message: String(e) })
-	});
+	const { source, entries: discovered } = yield* readCatalogSource(file);
 	const catalogName = Option.getOrUndefined(catalog);
-	const entries = filterEntriesByCatalog(discovered.entries, catalogName);
+	const entries = filterEntriesByCatalog(discovered, catalogName);
 	const versions = yield* resolveGatedVersions(entries, resolver, yield* computeGate(source, file, resolver), Date.now(), caps.interactive ? writeResolveProgress : void 0, workspaceResolver);
-	const items = yield* buildWalkItems(entries, versions.gated).pipe(Effect.catch((e) => Effect.fail(new UpgradeError({ message: e.message }))));
+	const items = yield* buildWalkItems(entries, versions.gated).pipe(Effect.mapError((e) => new UpgradeError({ message: e.message })));
 	if (!caps.interactive) {
 		const text = renderSummary(projectDecisions(items, full), void 0, { color: caps.color });
 		const note = dryRun ? "(dry run — nothing written)" : "(non-interactive terminal — run with --yes to apply, or in a TTY to choose)";
@@ -673,26 +615,18 @@ const upgradeCommand = Command.make("upgrade", {
 		list.push(e);
 		interopByCatalog.set(e.catalog, list);
 	}
-	const peerCache = /* @__PURE__ */ new Map();
-	const fetchPeer = (pkg, v) => {
-		const k = `${pkg}@${v}`;
-		const cached = peerCache.get(k);
-		if (cached !== void 0) return Effect.succeed(cached);
-		return resolver.peerDependencies(pkg, v).pipe(Effect.catch(() => Effect.succeed({})), Effect.map((deps) => {
-			peerCache.set(k, deps);
-			return deps;
-		}));
-	};
+	const fetchPeer = makePeerFetcher(resolver);
 	if (interopByCatalog.size > 0) yield* Effect.sync(() => process.stderr.write("Resolving peer dependencies…\n"));
 	const interopModels = /* @__PURE__ */ new Map();
 	for (const [catalog, group] of interopByCatalog) {
 		const candByPkg = /* @__PURE__ */ new Map();
 		for (const e of group) {
 			const it = items.find((i) => i.entry.catalog === catalog && i.entry.pkg === e.pkg);
-			candByPkg.set(e.pkg, it ? it.candidates.map((c) => c.version) : [e.currentRange.replace(/^[\^~]/, "")]);
+			candByPkg.set(e.pkg, it ? it.candidates.map((c) => c.version) : [bareVersion(e.currentRange)]);
 		}
 		interopModels.set(catalog, yield* buildGroupModel(candByPkg, fetchPeer));
 	}
+	const { runWalk } = yield* Effect.promise(() => import("../ui/run-walk.js"));
 	const decisions = yield* runWalk(items, dryRun, versions.unresolved, interopModels);
 	const nonInteropDecisions = decisions.filter((d) => d.item.entry.strategy !== "interop");
 	const interopEdits = [];
@@ -704,14 +638,13 @@ const upgradeCommand = Command.make("upgrade", {
 		const selected = /* @__PURE__ */ new Map();
 		for (const e of group) {
 			const d = decisions.find((dd) => dd.item.entry.catalog === catalog && dd.item.entry.pkg === e.pkg);
-			selected.set(e.pkg, d ? d.chosen.version : e.currentRange.replace(/^[\^~]/, ""));
+			selected.set(e.pkg, d ? d.chosen.version : bareVersion(e.currentRange));
 		}
 		const { peer, conflict } = computeGroupPeers(model, selected);
 		interopEdits.push(...buildInteropEdits(group, {
 			resolved: selected,
 			peers: peer,
-			conflicts: [],
-			peerDepsOf: () => ({})
+			conflicts: []
 		}));
 		for (const [pkg, blockedBy] of conflict) allConflicts.push({
 			pkg,
@@ -730,10 +663,7 @@ const upgradeCommand = Command.make("upgrade", {
 	const planned = buildEdits(nonInteropDecisions);
 	const { accepted, rejected } = yield* validateEdits(planned, versions.raw);
 	const acceptedPkgs = new Set(accepted.map((e) => e.pkg));
-	yield* Effect.sync(() => process.stdout.write(`${renderSummary(decisions, {
-		adjustments: [],
-		conflicts: allConflicts
-	}, { color: caps.color }, rejected)}\n`));
+	yield* Effect.sync(() => process.stdout.write(`${renderSummary(decisions, { conflicts: allConflicts }, { color: caps.color }, rejected)}\n`));
 	if (!dryRun) yield* applyInteropAndDecisions(file, source, accepted, interopEdits);
 	const changed = countChangedDecisions(nonInteropDecisions.filter((d) => acceptedPkgs.has(d.item.entry.pkg))) + interopChanged;
 	yield* Effect.sync(() => process.stdout.write(dryRun ? `Dry run — no changes written. ${changed} change(s) would be applied.\n` : `Applied ${changed} change(s).\n`));
@@ -741,4 +671,4 @@ const upgradeCommand = Command.make("upgrade", {
 }).pipe(Effect.provide(RegistryResolverLive), Effect.provide(NodeServices.layer))).pipe(Command.withDescription("Upgrade catalog versions in a config file"));
 
 //#endregion
-export { UpgradeError, applyInteropAndDecisions, checkFailureOutcome, checkJsonOutcome, checkOutcome, computeGate, countChangedDecisions, nothingToUpgradeMessage, projectDecisions, resolveGatedVersions, resolveTargetFile, runUpgrade, runUpgradePreview, unresolvedMessage, upgradeCommand, upgradeJsonOutcome, validateJsonMode, writeResolveProgress };
+export { UpgradeError, applyInteropAndDecisions, checkFailureOutcome, checkJsonOutcome, checkOutcome, computeGate, countChangedDecisions, nothingToUpgradeMessage, projectDecisions, readCatalogSource, resolveGatedVersions, resolveTargetFile, runUpgrade, runUpgradePreview, unresolvedMessage, upgradeCommand, upgradeJsonOutcome, validateJsonMode, writeResolveProgress };

package/cli/diff/build.js

@@ -1,7 +1,7 @@
+import { Predicate } from "effect";
+
 //#region src/cli/diff/build.ts
-function isObject(v) {
-	return v !== null && typeof v === "object" && !Array.isArray(v);
-}
+const isObject = Predicate.isObject;
 /** Worst kind among children: changed if any differs, added/removed if uniform, else unchanged. */
 function rollup(children) {
 	if (children.length === 0) return "unchanged";

package/cli/diff/render.js

@@ -12,6 +12,7 @@ const STYLE = {
 	changed: "changed",
 	unchanged: "unchanged"
 };
+/** A scalar as YAML-shaped text: strings verbatim, everything else JSON. @internal */
 function scalarText(v) {
 	return typeof v === "string" ? v : JSON.stringify(v);
 }
@@ -101,4 +102,4 @@ function renderExportDiff(root, opts) {
 }
 
 //#endregion
-export { renderExportDiff };
+export { renderExportDiff, scalarText };

package/cli/discover.js

@@ -1,3 +1,4 @@
+import { findPluginArg, keyName, prop } from "./ast.js";
 import { Data } from "effect";
 import { parseSync } from "oxc-parser";
 
@@ -16,40 +17,6 @@ function operatorOf(range) {
 	return "";
 }
 /**
-* Find a property value by key name in an ObjectExpression node.
-* Handles both Identifier keys (unquoted) and Literal keys (quoted).
-*/
-function prop(obj, key) {
-	const properties = obj.properties ?? [];
-	for (const p of properties) {
-		if (p.type !== "Property") continue;
-		const k = p.key;
-		if ((k.type === "Identifier" ? k.name : k.type === "Literal" ? String(k.value) : void 0) === key) return p.value;
-	}
-}
-/** Find the first `PnpmConfigPlugin(...)` CallExpression's first argument object. */
-function findPluginArg(program) {
-	let found;
-	const visit = (node) => {
-		if (found || node === null || typeof node !== "object") return;
-		const n = node;
-		if (n.type === "CallExpression") {
-			const callee = n.callee;
-			if (callee?.type === "Identifier" && callee.name === "PnpmConfigPlugin") {
-				const args = n.arguments;
-				if (args?.[0]?.type === "ObjectExpression") {
-					found = args[0];
-					return;
-				}
-			}
-		}
-		for (const value of Object.values(n)) if (Array.isArray(value)) value.forEach(visit);
-		else if (value && typeof value === "object") visit(value);
-	};
-	visit(program);
-	return found;
-}
-/**
 * Statically discover the catalog version literals in a config source. Locates
 * the single `PnpmConfigPlugin(...)` call and walks `.catalogs.<name>.packages`.
 * Each package whose range is a simple-operator string literal yields a
@@ -76,16 +43,16 @@ function discoverCatalogEntries(source, filename) {
 	};
 	for (const catProp of catalogs.properties ?? []) {
 		if (catProp.type !== "Property") continue;
-		const catKey = catProp.key;
-		const catalog = catKey.type === "Identifier" ? catKey.name : String(catKey.value);
+		const catalog = keyName(catProp.key);
+		if (catalog === void 0) continue;
 		const decl = catProp.value;
 		if (decl.type !== "ObjectExpression") continue;
 		const packages = prop(decl, "packages");
 		if (packages?.type !== "ObjectExpression") continue;
 		for (const pkgProp of packages.properties ?? []) {
 			if (pkgProp.type !== "Property") continue;
-			const pkgKey = pkgProp.key;
-			const pkg = pkgKey.type === "Identifier" ? pkgKey.name : String(pkgKey.value);
+			const pkg = keyName(pkgProp.key);
+			if (pkg === void 0) continue;
 			const value = pkgProp.value;
 			let rangeNode;
 			let peerNode;