rolldown-pnpm-config 0.5.4 → 0.5.6

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.5.4" }).pipe(Effect.provide(NodeServices.layer), NodeRuntime.runMain);
+Command.run(root, { version: "0.5.6" }).pipe(Effect.provide(NodeServices.layer), NodeRuntime.runMain);
 
 //#endregion
 export {  };

package/cli/commands/export.js

@@ -43,13 +43,15 @@ const WORKSPACE_FIELDS = new Set(Object.entries(DESCRIPTORS).filter(([, d]) => d
 */
 function runExport(opts) {
 	return Effect.gen(function* () {
-		const { config, errors } = evaluatePluginConfig(yield* Effect.try({
+		const configSource = yield* Effect.try({
 			try: () => readFileSync(opts.configFile, "utf8"),
 			catch: () => new ExportError({ message: `Cannot read ${opts.configFile}` })
-		}), 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 { base, manifest } = yield* freeze(withResolvedBuildPatches(config, dirname(opts.configFile))).pipe(Effect.mapError((e) => new ExportError({ message: e.message })));
+		const resolvedConfig = withResolvedBuildPatches(config, dirname(opts.configFile));
+		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");
@@ -58,7 +60,8 @@ function runExport(opts) {
 			catch: (e) => new ExportError({ message: `Cannot read or parse ${path}: ${String(e)}` })
 		}) : {};
 		const rootName = resolveRootName({ dir: dirname(path) });
-		const effective = effectiveManaged(managed, config.local && typeof config.local === "object" ? config.local : void 0, parsed, manifest, rootName);
+		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 contributed = {};
@@ -87,10 +90,11 @@ 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 diff = renderExportDiff(buildDiff(canonicalize(parsed), canonicalize(merged), {
+		const tree = buildDiff(canonicalize(parsed), canonicalize(merged), {
 			localKeys,
 			managedKeys: WORKSPACE_FIELDS
-		}), { full: opts.full ?? false });
+		});
+		const diff = renderExportDiff(tree, { full: opts.full ?? false });
 		if (opts.preview) return {
 			path,
 			rendered,
@@ -127,7 +131,8 @@ const exportCommand = Command.make("export", {
 	dryRun: dryRunFlag,
 	full: fullFlag
 }, ({ path, dryRun, full }) => Effect.gen(function* () {
-	const picked = pickConfigCandidate(yield* findConfigFiles(process.cwd()));
+	const matches = yield* findConfigFiles(process.cwd());
+	const picked = pickConfigCandidate(matches);
 	if (!picked.ok) return yield* Effect.fail(new ExportError({ message: picked.message }));
 	const workspacePath = Option.getOrUndefined(path);
 	const result = yield* runExport({

package/cli/commands/preview.js

@@ -25,10 +25,11 @@ var PreviewError = class extends Data.TaggedError("PreviewError") {};
 */
 function runPreviewViews(opts) {
 	return Effect.gen(function* () {
-		const { config, errors } = evaluatePluginConfig(yield* Effect.try({
+		const configSource = yield* Effect.try({
 			try: () => readFileSync(opts.configFile, "utf8"),
 			catch: () => new PreviewError({ message: `Cannot read ${opts.configFile}` })
-		}), 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 { base, manifest } = yield* freeze(config).pipe(Effect.mapError((e) => new PreviewError({ message: e.message })));
@@ -58,7 +59,8 @@ const pathArg = Argument.file("path").pipe(Argument.optional);
 * @internal
 */
 const previewCommand = Command.make("preview", { path: pathArg }, ({ path }) => Effect.gen(function* () {
-	const picked = pickConfigCandidate(yield* findConfigFiles(process.cwd()));
+	const matches = yield* findConfigFiles(process.cwd());
+	const picked = pickConfigCandidate(matches);
 	if (!picked.ok) return yield* Effect.fail(new PreviewError({ message: picked.message }));
 	const workspacePath = Option.getOrUndefined(path);
 	const views = yield* runPreviewViews({

package/cli/commands/upgrade.js

@@ -324,7 +324,8 @@ function runUpgradePreview(opts) {
 		});
 		const gate = yield* computeGate(source, opts.file, opts.resolver);
 		const versions = yield* resolveGatedVersions(discovered.entries, opts.resolver, gate, Date.now());
-		const text = renderSummary(projectDecisions(yield* buildWalkItems(discovered.entries, versions.gated).pipe(Effect.catch((e) => Effect.fail(new UpgradeError({ message: e.message })))), opts.full), void 0, { color: opts.color ?? false });
+		const items = yield* buildWalkItems(discovered.entries, versions.gated).pipe(Effect.catch((e) => Effect.fail(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;
 	});
 }
@@ -337,7 +338,8 @@ function resolveTargetFile(fileOpt) {
 	return Effect.gen(function* () {
 		const explicit = Option.getOrUndefined(fileOpt);
 		if (explicit !== void 0) return explicit;
-		const picked = pickConfigCandidate(yield* findConfigFiles(process.cwd()));
+		const matches = yield* findConfigFiles(process.cwd());
+		const picked = pickConfigCandidate(matches);
 		if (!picked.ok) return yield* Effect.fail(new UpgradeError({ message: picked.message }));
 		return picked.file;
 	});
@@ -476,7 +478,8 @@ const upgradeCommand = Command.make("upgrade", {
 			if (rangeChanged || peerChanged) interopChanged++;
 		}
 	}
-	const { accepted, rejected } = yield* validateEdits(buildEdits(nonInteropDecisions), versions.raw);
+	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: [],

package/cli/preview-views.js

@@ -20,9 +20,11 @@ function buildPreviewViews(input) {
 		localKeys: new Set(input.local ? Object.keys(input.local) : []),
 		managedKeys: WORKSPACE_FIELDS
 	};
-	const merged = overlayWorkspace(effectiveManaged(input.managed, input.local, input.parsed, input.manifest, input.rootName), input.parsed);
+	const effective = effectiveManaged(input.managed, input.local, input.parsed, input.manifest, input.rootName);
+	const merged = overlayWorkspace(effective, input.parsed);
 	const vanilla = vanillaManaged(input.managed, input.manifest, input.rootName);
-	const changesTree = buildDiff(canonicalize(input.parsed), canonicalize(merged), meta);
+	const before = canonicalize(input.parsed);
+	const changesTree = buildDiff(before, canonicalize(merged), meta);
 	return {
 		changes: renderExportDiff(changesTree, { full: false }),
 		full: renderExportDiff(changesTree, { full: true }),

package/cli/select-file.js

@@ -24,7 +24,8 @@ function findConfigFiles(dir) {
 			if (!name.endsWith(".ts") || name.endsWith(".d.ts")) continue;
 			const path = join(dir, name);
 			try {
-				const { entries } = discoverCatalogEntries(readFileSync(path, "utf8"), path);
+				const source = readFileSync(path, "utf8");
+				const { entries } = discoverCatalogEntries(source, path);
 				if (entries.length > 0) matches.push(path);
 			} catch {}
 		}

package/cli/ui/Preview.js

@@ -23,9 +23,10 @@ function renderLines(lines) {
 		const indent = "  ".repeat(l.indent);
 		const tag = l.tag === "local" ? "  (local)" : "";
 		const body = l.segments.map((s, j) => {
+			const props = INK_PROPS[s.style] ?? {};
 			return createElement(Text, {
 				key: j,
-				...INK_PROPS[s.style] ?? {}
+				...props
 			}, s.text);
 		});
 		return createElement(Text, { key: i }, `${l.gutter} ${indent}`, ...body, tag);
@@ -46,7 +47,7 @@ function Preview({ views, onExit }) {
 			app.exit();
 		}
 	});
-	return createElement(Box, { flexDirection: "column" }, createElement(TabsC, { onChange: (name) => setActive(name) }, createElement(TabC, {
+	const tabs = createElement(TabsC, { onChange: (name) => setActive(name) }, createElement(TabC, {
 		name: "changes",
 		key: "changes"
 	}, "Changes"), createElement(TabC, {
@@ -55,7 +56,9 @@ function Preview({ views, onExit }) {
 	}, "Full"), createElement(TabC, {
 		name: "simulated",
 		key: "simulated"
-	}, "Simulated")), renderLines(active === "simulated" ? simulatedLegendLines() : legendLines()), renderLines(views[active]));
+	}, "Simulated"));
+	const legend = renderLines(active === "simulated" ? simulatedLegendLines() : legendLines());
+	return createElement(Box, { flexDirection: "column" }, tabs, legend, renderLines(views[active]));
 }
 
 //#endregion

package/cli/walk-plan.js

@@ -16,7 +16,8 @@ function buildWalkItems(entries, versionsByPkg) {
 	return Effect.gen(function* () {
 		const items = [];
 		for (const entry of entries) {
-			const candidates = yield* planEntry(entry, [...versionsByPkg.get(entry.pkg) ?? []]);
+			const versions = versionsByPkg.get(entry.pkg) ?? [];
+			const candidates = yield* planEntry(entry, [...versions]);
 			const driftPeer = yield* detectPeerDrift(entry);
 			let peerWarning = null;
 			let materializePeer = null;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rolldown-pnpm-config",
-	"version": "0.5.4",
+	"version": "0.5.6",
 	"private": false,
 	"description": "A dogfooding example of our plugin",
 	"repository": {
@@ -42,7 +42,7 @@
 		"effect": "4.0.0-beta.101",
 		"ink": "^7.1.1",
 		"ink-tab": "^5.2.0",
-		"oxc-parser": "^0.141.0",
+		"oxc-parser": "^0.142.0",
 		"react": "^19.2.8",
 		"std-env": "^4.2.0",
 		"std-osc8": "^0.2.0"

package/patches/paths.js

@@ -21,7 +21,8 @@ function distributedPatchPath(name, rel) {
 * @internal
 */
 function distributedRel(baseDir, distRoot, fileName) {
-	const rel = relative(join(baseDir, "public"), distRoot);
+	const publicDir = join(baseDir, "public");
+	const rel = relative(publicDir, distRoot);
 	return `${(rel === "" || rel.startsWith("..") ? basename(distRoot) : rel).split(/[\\/]/).filter(Boolean).join("/")}/${fileName}`;
 }
 

package/runtime/warnings.js

@@ -12,7 +12,7 @@ function pad(line) {
 */
 function formatOverrideWarning(divergences, name) {
 	if (divergences.length === 0) return "";
-	const border = "─".repeat(WARNING_BOX_WIDTH - 2);
+	const border = "─".repeat(73);
 	const lines = [];
 	lines.push(`┌${border}┐`);
 	lines.push(pad(`  [${name}]`));
@@ -39,7 +39,7 @@ function formatOverrideWarning(divergences, name) {
 */
 function formatSecurityWarning(divergences, name) {
 	if (divergences.length === 0) return "";
-	const border = "─".repeat(WARNING_BOX_WIDTH - 2);
+	const border = "─".repeat(73);
 	const lines = [];
 	lines.push(`┌${border}┐`);
 	lines.push(pad(`  [${name}]`));

package/virtual.d.ts

@@ -14,8 +14,9 @@ declare module "rolldown-pnpm-config/virtual/pnpmfile" {
 	// against this package's own *source* `exports` map during the build's declaration
 	// pass and pulls a raw .ts file into API Extractor's analysis (ae-wrong-input-file-type).
 	// Keep this shape in sync with `PnpmConfig`/`PnpmHooks` in `src/runtime/types.ts`.
-	interface PnpmConfig {
-		catalogs?: Record<string, Record<string, string>>;
+	export type Catalogs = Map<string, Map<string, string>>;
+	export interface PnpmConfig {
+		catalogs?: Catalogs;
 		[key: string]: unknown;
 	}
 	export const hooks: {
@@ -24,5 +25,6 @@ declare module "rolldown-pnpm-config/virtual/pnpmfile" {
 }
 
 declare module "rolldown-pnpm-config/virtual/catalogs" {
-	export const catalogs: Map<string, Map<string, string>>;
+	export type Catalogs = Map<string, Map<string, string>>;
+	export const catalogs: Catalogs;
 }