rolldown-pnpm-config 2.0.1 → 2.0.3

package/cli/commands/upgrade.js

@@ -1,7 +1,7 @@
 import { bareVersion } from "../../semver-util.js";
 import { WorkingDirectory } from "../cwd.js";
+import { RegistryResolver } from "../resolve.js";
 import { evaluatePluginConfig } from "../evaluate.js";
-import { printDoc } from "../render/print.js";
 import { failureDoc, warningDoc } from "../render/report.js";
 import { discoverCatalogEntries } from "../discover.js";
 import { filterEntriesByCatalog, findConfigFiles, pickConfigCandidate } from "../select-file.js";
@@ -13,13 +13,12 @@ import { buildGroupModel, computeGroupPeers } from "../interop-live.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 { summaryDoc } from "../summary.js";
 import { validateEdits } from "../validate.js";
 import { buildWalkItems } from "../walk-plan.js";
 import { findWorkspaceRoot, makeWorkspaceResolver } from "../workspace-resolve.js";
-import { Console, Data, Effect, Option, Result, Runtime } from "effect";
+import { Clock, Console, Data, Effect, Option, Result, Runtime } from "effect";
 import { readFileSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
 import { CliDoc, CliExit, CliInteractive, CliMessage, Doc } from "@effected/cli";
@@ -208,7 +207,7 @@ function runUpgrade(opts) {
 	return Effect.gen(function* () {
 		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);
+		const versionsByPkg = yield* resolveGatedVersions(entries, opts.resolver, gate, yield* Clock.currentTimeMillis, opts.onProgress, opts.workspaceResolver);
 		if (versionsByPkg.unresolved.length > 0) return yield* Effect.fail(new UpgradeError({ message: unresolvedMessage(versionsByPkg.unresolved) }));
 		const edits = [];
 		const interopEdits = [];
@@ -388,7 +387,7 @@ function runUpgradePreview(opts) {
 	return Effect.gen(function* () {
 		const { source, entries } = yield* readCatalogSource(opts.file);
 		const gate = yield* computeGate(source, opts.file, opts.resolver);
-		const versions = yield* resolveGatedVersions(entries, opts.resolver, gate, Date.now(), void 0, opts.workspaceResolver);
+		const versions = yield* resolveGatedVersions(entries, opts.resolver, gate, yield* Clock.currentTimeMillis, void 0, opts.workspaceResolver);
 		const items = yield* buildWalkItems(entries, versions.gated).pipe(Effect.mapError((e) => new UpgradeError({ message: e.message })));
 		return {
 			doc: summaryDoc(projectDecisions(items, opts.full)),
@@ -415,7 +414,7 @@ function checkOutcome(changed) {
 		exitCode: 1,
 		doc: [
 			Doc.line(`Catalog drift detected in ${changed.length} package(s):`),
-			Doc.lines(changed.map((c) => `  ${c.name}  (${c.source})`)),
+			Doc.lines(changed.map((c) => `  ${c.name}  (${c.source})`), { wrap: false }),
 			Doc.line([
 				"Run ",
 				Doc.code("rolldown-pnpm-config upgrade --yes"),
@@ -546,7 +545,7 @@ function resolveTargetFile(fileOpt) {
 }
 /** Print the unresolved-packages warning to stderr, when there is one. */
 function warnUnresolved(unresolved) {
-	return unresolved.length > 0 ? printDoc(warningDoc(unresolvedMessage(unresolved)), { stream: "stderr" }) : Effect.void;
+	return unresolved.length > 0 ? Doc.print(warningDoc(unresolvedMessage(unresolved)), { stream: "stderr" }) : Effect.void;
 }
 /**
 * Resolve every entry's versions, then — for interop catalogs — pre-fetch the
@@ -558,7 +557,7 @@ function warnUnresolved(unresolved) {
 */
 function resolveForWalk(entries, resolver, gate, workspaceResolver, report) {
 	return Effect.gen(function* () {
-		const versions = yield* resolveGatedVersions(entries, resolver, gate, Date.now(), resolveProgress(report), workspaceResolver);
+		const versions = yield* resolveGatedVersions(entries, resolver, gate, yield* Clock.currentTimeMillis, resolveProgress(report), workspaceResolver);
 		const items = yield* buildWalkItems(entries, versions.gated).pipe(Effect.mapError((e) => new UpgradeError({ message: e.message })));
 		const interopByCatalog = /* @__PURE__ */ new Map();
 		for (const e of entries) {
@@ -659,7 +658,7 @@ const upgradeCommand = Command.make("upgrade", {
 			}));
 		}
 		const outcome = checkOutcome(result.success.changed);
-		yield* printDoc(outcome.doc);
+		yield* Doc.print(outcome.doc);
 		return yield* CliExit.set(outcome.exitCode);
 	}
 	if (json) {
@@ -677,7 +676,7 @@ const upgradeCommand = Command.make("upgrade", {
 			full,
 			workspaceResolver
 		});
-		yield* printDoc(doc);
+		yield* Doc.print(doc);
 		return yield* warnUnresolved(unresolved);
 	}
 	if (yes) {
@@ -691,7 +690,7 @@ const upgradeCommand = Command.make("upgrade", {
 		yield* dryRun ? CliMessage.info(`Dry run — no changes written. ${result.updated} package(s) would be updated; skipped ${result.skipped.length}.`) : CliMessage.success(`Updated ${result.updated} package(s); skipped ${result.skipped.length}.`);
 		if (result.conflicts.length > 0) {
 			const lines = result.conflicts.map((c) => `  ${c.pkg} (kept ${c.ceiling}) blocked by ${c.blockedBy}`);
-			yield* printDoc(warningDoc(["Interop conflicts (left at your pick):", ...lines].join("\n")), { stream: "stderr" });
+			yield* Doc.print(warningDoc(["Interop conflicts (left at your pick):", ...lines].join("\n")), { stream: "stderr" });
 		}
 		return;
 	}
@@ -699,10 +698,10 @@ const upgradeCommand = Command.make("upgrade", {
 	const entries = filterEntriesByCatalog(discovered, Option.getOrUndefined(catalog));
 	const gate = yield* computeGate(source, file, resolver);
 	if (!(yield* CliInteractive)) {
-		const versions = yield* resolveGatedVersions(entries, resolver, gate, Date.now(), void 0, workspaceResolver);
+		const versions = yield* resolveGatedVersions(entries, resolver, gate, yield* Clock.currentTimeMillis, void 0, workspaceResolver);
 		const items = yield* buildWalkItems(entries, versions.gated).pipe(Effect.mapError((e) => new UpgradeError({ message: e.message })));
 		const note = dryRun ? "(dry run — nothing written)" : "(not interactive — run with --yes to apply, or in a terminal to choose)";
-		yield* printDoc([
+		yield* Doc.print([
 			...summaryDoc(projectDecisions(items, full)),
 			Doc.line(""),
 			Doc.line(Doc.text(note, "muted"))
@@ -714,12 +713,14 @@ const upgradeCommand = Command.make("upgrade", {
 		yield* warnUnresolved(versions.unresolved);
 		return yield* CliMessage.info(nothingToUpgradeMessage(0));
 	}
-	const decisions = yield* CliUi.run(walkScreen({
+	const picked = yield* CliUi.run(walkScreen({
 		items,
 		dryRun,
 		unresolved: versions.unresolved,
 		interopModels
-	}));
+	})).pipe(Effect.map(Option.some), Effect.catchTag("Cancelled", (cancel) => cancel.reason === "escape" ? Effect.succeed(Option.none()) : Effect.fail(cancel)));
+	if (Option.isNone(picked)) return yield* CliMessage.info("cancelled; nothing written");
+	const decisions = picked.value;
 	const nonInteropDecisions = decisions.filter((d) => d.item.entry.strategy !== "interop");
 	const interopEdits = [];
 	const allConflicts = [];
@@ -755,12 +756,12 @@ 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* printDoc(summaryDoc(decisions, { conflicts: allConflicts }, rejected));
+	yield* Doc.print(summaryDoc(decisions, { conflicts: allConflicts }, rejected));
 	if (!dryRun) yield* applyInteropAndDecisions(file, source, accepted, interopEdits);
 	const changed = countChangedDecisions(nonInteropDecisions.filter((d) => acceptedPkgs.has(d.item.entry.pkg))) + interopChanged;
 	yield* dryRun ? CliMessage.info(`Dry run — no changes written. ${changed} change(s) would be applied.`) : CliMessage.success(`Applied ${changed} change(s).`);
 	yield* warnUnresolved(versions.unresolved);
-}).pipe(Effect.provide(RegistryResolverLive))).pipe(Command.withDescription("Upgrade catalog versions in a config file"));
+})).pipe(Command.withDescription("Upgrade catalog versions in a config file"));
 
 //#endregion
 export { CHECK_FAILED_LABEL, CheckFailedError, UpgradeError, UpgradeUsageError, applyInteropAndDecisions, checkJsonOutcome, checkOutcome, computeGate, countChangedDecisions, nothingToUpgradeMessage, projectDecisions, readCatalogSource, resolveGatedVersions, resolveProgress, resolveTargetFile, runUpgrade, runUpgradePreview, unresolvedMessage, upgradeCommand, upgradeJsonOutcome, validateJsonMode };

package/cli/main.js

@@ -1,4 +1,5 @@
 import { WorkingDirectory } from "./cwd.js";
+import { RegistryResolverLive } from "./resolve.js";
 import { rootCommand } from "./root.js";
 import { CLI_VERSION } from "./version.js";
 import { Effect } from "effect";
@@ -11,6 +12,10 @@ import { CliAudience, CliRuntime } from "@effected/cli";
 * the working directory, argv for the build-time log format, and stderr's
 * terminal state are read here and passed down as plain values.
 *
+* The registry resolver (`pnpm view`, spawned through the platform) is
+* provided here, at the edge, so a test drives the same command tree against
+* a stub resolver.
+*
 * `CliRuntime.main` builds the audience, terminal and theme from `env`,
 * decides whether the run may prompt, reports every failure on stderr for the
 * run's audience, and maps the exit code (usage 64, cancel 130, otherwise 1).
@@ -18,7 +23,7 @@ import { CliAudience, CliRuntime } from "@effected/cli";
 * @internal
 */
 function main() {
-	const program = CliAudience.run(rootCommand, { version: CLI_VERSION }).pipe(Effect.provideService(WorkingDirectory, process.cwd()));
+	const program = CliAudience.run(rootCommand, { version: CLI_VERSION }).pipe(Effect.provideService(WorkingDirectory, process.cwd()), Effect.provide(RegistryResolverLive));
 	NodeRuntime.runMain(CliRuntime.main(program, {
 		platform: NodeServices.layer,
 		helpOnUsageError: "stderr",

package/cli/render/legend.js

@@ -3,7 +3,7 @@ import { Doc } from "@effected/cli";
 
 //#region src/cli/render/legend.ts
 function swatches(entries) {
-	return Doc.line([Doc.text("  Legend:  "), ...entries.map(([label, t], i) => tone(`■ ${label}${i < entries.length - 1 ? "  " : ""}`, t))]);
+	return Doc.line([Doc.text("  Legend:  "), ...entries.map(([label, t], i) => tone(`■ ${label}${i < entries.length - 1 ? "  " : ""}`, t))], { wrap: false });
 }
 /**
 * The colour legend for the config diff (the `preview` command and

package/cli/render/print.js

@@ -15,24 +15,11 @@ const coloured = Effect.gen(function* () {
 	return (yield* Audience).kind === "human" && theme.color !== "none";
 });
 /**
-* Print a document with no width limit, for every audience. Diffs, summaries
-* and package lists are line-oriented data: a hard wrap at a person's width (80
-* when output is piped) would split a row away from its gutter and break a
-* grep. A terminal still soft-wraps a long line when it shows it.
-*
-* @internal
-*/
-function printDoc(doc, options = {}) {
-	return Doc.print(doc, {
-		...options,
-		width: Number.POSITIVE_INFINITY
-	});
-}
-/**
 * Print a diff-shaped view to stdout: an optional heading line, the legend
-* when the output is coloured, then the view. The audience picks the
-* renderer (ANSI for a person, plain for an agent, the GitHub log under
-* Actions).
+* when the output is coloured, then the view's rows, each kept whole on one
+* line whatever the width (the heading may wrap at a person's terminal). The
+* audience picks the renderer (ANSI for a person, plain for an agent, the
+* GitHub log under Actions).
 *
 * @internal
 */
@@ -41,10 +28,10 @@ function printView(view, options = {}) {
 		const doc = [];
 		if (options.heading !== void 0) doc.push(Doc.line(options.heading), Doc.line(""));
 		if (options.legend !== void 0 && (yield* coloured)) doc.push(options.legend, Doc.line(""));
-		doc.push(view);
-		yield* printDoc(doc);
+		doc.push(Doc.lines(view.lines, { wrap: false }));
+		yield* Doc.print(doc);
 	});
 }
 
 //#endregion
-export { coloured, printDoc, printView };
+export { coloured, printView };

package/cli/summary.js

@@ -46,8 +46,8 @@ function summaryDoc(decisions, interop, rejected) {
 	}
 	lines.push(row(" ", 0, [tone(`${toUpdate} to update · ${major} major · ${resync} resync · ${materialize} new peer · ${upToDate} up to date`, "unchanged")]));
 	if (interop) for (const c of interop.conflicts) lines.push(row("⚠", 0, [tone(`${c.pkg} (kept ${c.ceiling}) blocked by ${c.blockedBy}`, "warn")]));
-	const blocks = [Doc.lines(lines)];
-	if (rejected && rejected.length > 0) blocks.push(Doc.line(""), Doc.lines([row("⚠", 0, [tone("Rejected (no published version satisfies these):", "warn")]), ...rejected.map((r) => row("⚠", 1, [tone(`${r.pkg} ${r.kind} ${r.value} — ${r.reason}`, "warn")]))]));
+	const blocks = [Doc.lines(lines, { wrap: false })];
+	if (rejected && rejected.length > 0) blocks.push(Doc.line(""), Doc.lines([row("⚠", 0, [tone("Rejected (no published version satisfies these):", "warn")]), ...rejected.map((r) => row("⚠", 1, [tone(`${r.pkg} ${r.kind} ${r.value} — ${r.reason}`, "warn")]))], { wrap: false }));
 	return blocks;
 }
 

package/cli/ui/preview-screen.js

@@ -75,7 +75,7 @@ function makePreviewScreen(views) {
 						renderRow: (row, highlighted) => /* @__PURE__ */ jsxs(Box, { children: [/* @__PURE__ */ jsx(Text, { children: highlighted ? /* @__PURE__ */ jsx(Styled, {
 							token: "accent",
 							children: "›"
-						}) : " " }), /* @__PURE__ */ jsx(DocView, { doc: Doc.line(row._tag === "Item" ? lines[Number(row.key)] ?? [] : []) })] })
+						}) : " " }), /* @__PURE__ */ jsx(DocView, { doc: Doc.line(row._tag === "Item" ? lines[Number(row.key)] ?? [] : [], { truncate: true }) })] })
 					}),
 					/* @__PURE__ */ jsx(KeyHelp, { tables: [
 						Viewport.keys,

package/cli/ui/progress-view.js

@@ -1,4 +1,3 @@
-import { initialProgress, reduceProgress } from "./progress.js";
 import { Status } from "@effected/cli";
 import { Styled, useGlyphs, useTheme } from "@effected/cli/ui";
 import { Text } from "ink";
@@ -25,23 +24,19 @@ function Progress({ state, frame }) {
 	] });
 }
 /**
-* The resolve-progress live view, minus its events: one spinner line naming
-* the phase and its count, committed as a check-marked line carrying the
-* phase's finished label when it ends.
-* Shared by the command and its test so the two never drift.
+* The resolve-progress view: one spinner line naming the phase and its count,
+* committed as a check-marked line carrying the phase's finished label when it
+* ends. Loaded only when a run draws it (`CliUi.lazyView` in `screens.ts`), so
+* this module — and React with it — stays off every run that never draws.
 *
 * @internal
 */
-const progressView = {
-	initial: initialProgress,
-	reduce: reduceProgress,
-	render: (state, frame) => /* @__PURE__ */ jsx(Progress, {
+function progressView(state, frame) {
+	return /* @__PURE__ */ jsx(Progress, {
 		state,
 		frame
-	}),
-	isStart: (event) => event._tag === "Phase",
-	isTerminal: (event) => event._tag === "Finished"
-};
+	});
+}
 
 //#endregion
-export { progressView };
+export { progressView as default };

package/cli/ui/screens.js

@@ -1,5 +1,5 @@
+import { initialProgress, reduceProgress } from "./progress.js";
 import { Effect, PubSub } from "effect";
-import { CliInteractive } from "@effected/cli";
 import { CliUi } from "@effected/cli/ui";
 
 //#region src/cli/ui/screens.ts
@@ -12,29 +12,41 @@ function previewScreen(views) {
 	return CliUi.lazy(async () => ({ default: (await import("./preview-screen.js")).makePreviewScreen(views) }));
 }
 /**
-* Run `body` with a progress reporter. In an interactive run the reports
-* drive a live spinner view that redraws in place; otherwise the reporter is a
-* no-op and nothing is drawn or loaded, so piped and CI output stay clean. The
-* view is closed — its last frame committed — before this returns, so a
-* screen mounted next never waits on it.
+* The resolve-progress live view, minus its events: one spinner line per
+* phase, committed as a check-marked line when the phase finishes. A run that
+* cannot draw (a pipe, CI, an agent) prints nothing: `final` is the empty
+* document, so stdout carries only the command's own output, and neither the
+* view's module nor Ink nor React is loaded.
+*
+* @internal
+*/
+const progressOptions = {
+	initial: initialProgress,
+	reduce: reduceProgress,
+	render: CliUi.lazyView(() => import("./progress-view.js")),
+	final: () => [],
+	isStart: (event) => event._tag === "Phase",
+	isTerminal: (event) => event._tag === "Finished"
+};
+/**
+* Run `body` with a progress reporter whose reports drive the live view. In an
+* interactive run it redraws in place; otherwise it draws and prints nothing
+* (see {@link progressOptions}). The view is closed — its last frame committed
+* — before this returns, so a screen mounted next never waits on it.
 *
 * @internal
 */
 function withProgress(body) {
-	return Effect.gen(function* () {
-		if (!(yield* CliInteractive)) return yield* body(() => Effect.void);
-		const { progressView } = yield* Effect.promise(() => import("./progress-view.js"));
-		return yield* Effect.scoped(Effect.gen(function* () {
-			const pubsub = yield* PubSub.unbounded();
-			const events = yield* PubSub.subscribe(pubsub);
-			const view = yield* CliUi.live({
-				...progressView,
-				events
-			});
-			return yield* body((event) => PubSub.publish(pubsub, event).pipe(Effect.asVoid)).pipe(Effect.ensuring(view.close));
-		}));
-	});
+	return Effect.scoped(Effect.gen(function* () {
+		const pubsub = yield* PubSub.unbounded();
+		const events = yield* PubSub.subscribe(pubsub);
+		const view = yield* CliUi.live({
+			...progressOptions,
+			events
+		});
+		return yield* body((event) => PubSub.publish(pubsub, event).pipe(Effect.asVoid)).pipe(Effect.ensuring(view.close));
+	}));
 }
 
 //#endregion
-export { previewScreen, walkScreen, withProgress };
+export { previewScreen, progressOptions, walkScreen, withProgress };

package/cli/version.js

@@ -6,7 +6,7 @@
 *
 * @internal
 */
-const CLI_VERSION = "2.0.1";
+const CLI_VERSION = "2.0.3";
 
 //#endregion
 export { CLI_VERSION };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rolldown-pnpm-config",
-	"version": "2.0.1",
+	"version": "2.0.3",
 	"private": false,
 	"description": "A dogfooding example of our plugin",
 	"repository": {
@@ -36,8 +36,8 @@
 	},
 	"dependencies": {
 		"@effect/platform-node": "^4.0.2",
-		"@effected/cli": "^0.14.0",
-		"@effected/env": "^0.1.0",
+		"@effected/cli": "^0.16.1",
+		"@effected/env": "^0.1.1",
 		"@effected/glob": "^0.10.0",
 		"@effected/npm": "^0.20.0",
 		"@effected/semver": "^0.11.0",
@@ -45,7 +45,7 @@
 		"@effected/workspaces": "^0.32.0",
 		"@effected/yaml": "^0.19.1",
 		"effect": "^4.0.2",
-		"ink": "^7.1.1",
+		"ink": "^8.0.0",
 		"oxc-parser": "^0.153.0",
 		"react": "^19.3.0"
 	},