rolldown-pnpm-config 0.3.0 → 0.4.0

package/bin/rolldown-pnpm-config.js

@@ -3,8 +3,8 @@ import { exportCommand } from "../cli/commands/export.js";
 import { previewCommand } from "../cli/commands/preview.js";
 import { upgradeCommand } from "../cli/commands/upgrade.js";
 import { Effect } from "effect";
-import { Command } from "@effect/cli";
-import { NodeContext, NodeRuntime } from "@effect/platform-node";
+import { NodeRuntime, NodeServices } from "@effect/platform-node";
+import { Command } from "effect/unstable/cli";
 
 //#region src/cli/bin.ts
 const root = Command.make("rolldown-pnpm-config").pipe(Command.withSubcommands([
@@ -12,10 +12,7 @@ const root = Command.make("rolldown-pnpm-config").pipe(Command.withSubcommands([
 	exportCommand,
 	previewCommand
 ]));
-Command.run(root, {
-	name: "rolldown-pnpm-config",
-	version: "0.3.0"
-})(process.argv).pipe(Effect.provide(NodeContext.layer), NodeRuntime.runMain);
+Command.run(root, { version: "0.4.0" }).pipe(Effect.provide(NodeServices.layer), NodeRuntime.runMain);
 
 //#endregion
 export {  };

package/cli/commands/export.js

@@ -16,7 +16,7 @@ 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 { Args, Command, Options } from "@effect/cli";
+import { Argument, Command, Flag } from "effect/unstable/cli";
 
 //#region src/cli/commands/export.ts
 /**
@@ -110,9 +110,9 @@ function runExport(opts) {
 		};
 	});
 }
-const pathArg = Args.file({ name: "path" }).pipe(Args.optional);
-const dryRunFlag = Options.boolean("dry-run").pipe(Options.withDefault(false));
-const fullFlag = Options.boolean("full").pipe(Options.withDefault(false));
+const pathArg = Argument.file("path").pipe(Argument.optional);
+const dryRunFlag = Flag.boolean("dry-run").pipe(Flag.withDefault(false));
+const fullFlag = Flag.boolean("full").pipe(Flag.withDefault(false));
 /**
 * The "export" command. Materializes the plugin config into pnpm-workspace.yaml.
 * An optional path argument overrides the auto-detected workspace file. --dry-run

package/cli/commands/preview.js

@@ -11,7 +11,7 @@ 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 { Args, Command } from "@effect/cli";
+import { Argument, Command } from "effect/unstable/cli";
 
 //#region src/cli/commands/preview.ts
 /** Typed failure for the preview run. @internal */
@@ -48,7 +48,7 @@ function runPreviewViews(opts) {
 		});
 	});
 }
-const pathArg = Args.file({ name: "path" }).pipe(Args.optional);
+const pathArg = Argument.file("path").pipe(Argument.optional);
 /**
 * The "preview" command: interactive ink-tab explorer of the export diff
 * (Changes / Full / Simulated). Falls back to printing the Changes view when

package/cli/commands/upgrade.js

@@ -14,10 +14,10 @@ import { renderSummary } from "../summary.js";
 import { runWalk } from "../ui/run-walk.js";
 import { validateEdits } from "../validate.js";
 import { buildWalkItems } from "../walk-plan.js";
-import { Data, Effect, Option } from "effect";
+import { Data, Effect, Option, Result } from "effect";
 import { readFileSync, writeFileSync } from "node:fs";
-import { Args, Command, Options } from "@effect/cli";
-import { NodeContext } from "@effect/platform-node";
+import { NodeServices } from "@effect/platform-node";
+import { Argument, Command, Flag } from "effect/unstable/cli";
 
 //#region src/cli/commands/upgrade.ts
 /**
@@ -29,9 +29,9 @@ var UpgradeError = class extends Data.TaggedError("UpgradeError") {};
 /** 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.catchAll(() => Effect.succeed({ config: null })));
+		const { config } = yield* Effect.try(() => evaluatePluginConfig(source, file)).pipe(Effect.catch(() => Effect.succeed({ config: null })));
 		const cfg = readConfigReleaseAge(config);
-		const [age, exc] = yield* Effect.all([resolver.pnpmConfig("minimumReleaseAge").pipe(Effect.catchAll(() => Effect.succeed(null))), resolver.pnpmConfig("minimumReleaseAgeExclude").pipe(Effect.catchAll(() => Effect.succeed(null)))], { concurrency: "unbounded" });
+		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" });
 		return combineReleaseAge(cfg, parsePnpmGate(age, exc));
 	});
 }
@@ -52,8 +52,8 @@ function resolveGatedVersions(entries, resolver, gate, now, onProgress) {
 	let resolved = 0;
 	onProgress?.(0, total);
 	return Effect.forEach(uniquePkgs, (pkg) => Effect.gen(function* () {
-		const vr = yield* resolver.versions(pkg).pipe(Effect.either);
-		if (vr._tag === "Left") {
+		const vr = yield* resolver.versions(pkg).pipe(Effect.result);
+		if (Result.isFailure(vr)) {
 			onProgress?.(++resolved, total);
 			return [
 				pkg,
@@ -61,12 +61,12 @@ function resolveGatedVersions(entries, resolver, gate, now, onProgress) {
 				[]
 			];
 		}
-		const times = gate.ageMinutes > 0 ? yield* resolver.times(pkg).pipe(Effect.catchAll(() => Effect.succeed({}))) : {};
+		const times = gate.ageMinutes > 0 ? yield* resolver.times(pkg).pipe(Effect.catch(() => Effect.succeed({}))) : {};
 		onProgress?.(++resolved, total);
 		return [
 			pkg,
-			filterByReleaseAge(vr.right, times, gate, pkg, now),
-			vr.right
+			filterByReleaseAge(vr.success, times, gate, pkg, now),
+			vr.success
 		];
 	}), { concurrency: 12 }).pipe(Effect.map((triples) => ({
 		gated: new Map(triples.map(([pkg, gated]) => [pkg, gated])),
@@ -148,12 +148,12 @@ function runUpgrade(opts) {
 				kind: "peer",
 				value
 			});
-			const derived = entry.strategy ? yield* derivePeerRange(entry.currentRange, entry.strategy).pipe(Effect.catchAll(() => Effect.succeed(null))) : null;
+			const derived = entry.strategy ? yield* derivePeerRange(entry.currentRange, entry.strategy).pipe(Effect.catch(() => Effect.succeed(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.catchAll(() => Effect.succeed(null)));
+					const expected = yield* detectPeerDrift(entry).pipe(Effect.catch(() => Effect.succeed(null)));
 					if (expected !== null) {
 						edits.push(peerEdit(entry.peer.span, expected));
 						changedSpans.add(entry.rangeSpan[0]);
@@ -167,7 +167,7 @@ function runUpgrade(opts) {
 				skipped.push(`${entry.catalog}.${entry.pkg}`);
 				continue;
 			}
-			const inRange = (yield* planEntry(entry, versions).pipe(Effect.catchAll(() => Effect.succeed([])))).find((c) => c.kind === "in-range");
+			const inRange = (yield* planEntry(entry, versions).pipe(Effect.catch(() => Effect.succeed([])))).find((c) => c.kind === "in-range");
 			const at = entry.rangeSpan[1];
 			if (inRange) {
 				edits.push(rangeEdit(entry.rangeSpan, inRange.range));
@@ -178,7 +178,7 @@ function runUpgrade(opts) {
 				edits.push(peerInsert(at, derived.range));
 				changedSpans.add(entry.rangeSpan[0]);
 			} else if (entry.peer && entry.strategy) {
-				const expected = yield* detectPeerDrift(entry).pipe(Effect.catchAll(() => Effect.succeed(null)));
+				const expected = yield* detectPeerDrift(entry).pipe(Effect.catch(() => Effect.succeed(null)));
 				if (expected !== null) {
 					edits.push(peerEdit(entry.peer.span, expected));
 					changedSpans.add(entry.rangeSpan[0]);
@@ -197,7 +197,7 @@ function runUpgrade(opts) {
 			const members = [];
 			for (const e of group) {
 				const versions = versionsByPkg.gated.get(e.pkg) ?? [];
-				const inRange = (yield* planEntry(e, versions).pipe(Effect.catchAll(() => Effect.succeed([])))).find((c) => c.kind === "in-range");
+				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(/^[\^~]/, "");
 				members.push({
 					pkg: e.pkg,
@@ -334,7 +334,7 @@ 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.catchAll((e) => Effect.fail(new UpgradeError({ message: e.message })))), opts.full), void 0, { color: opts.color ?? false });
+		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 });
 		return versions.unresolved.length > 0 ? `${text}\n⚠ ${unresolvedMessage(versions.unresolved)}` : text;
 	});
 }
@@ -352,15 +352,12 @@ function resolveTargetFile(fileOpt) {
 		return picked.file;
 	});
 }
-const fileArg = Args.file({
-	name: "file",
-	exists: "yes"
-}).pipe(Args.optional);
-const yesFlag = Options.boolean("yes").pipe(Options.withAlias("y"), Options.withDefault(false));
-const dryRunFlag = Options.boolean("dry-run").pipe(Options.withDefault(false));
-const catalogOption = Options.text("catalog").pipe(Options.optional);
-const previewFlag = Options.boolean("preview").pipe(Options.withDefault(false));
-const fullFlag = Options.boolean("full").pipe(Options.withDefault(false));
+const fileArg = Argument.file("file", { mustExist: true }).pipe(Argument.optional);
+const yesFlag = Flag.boolean("yes").pipe(Flag.withAlias("y"), Flag.withDefault(false));
+const dryRunFlag = Flag.boolean("dry-run").pipe(Flag.withDefault(false));
+const catalogOption = Flag.string("catalog").pipe(Flag.optional);
+const previewFlag = Flag.boolean("preview").pipe(Flag.withDefault(false));
+const fullFlag = Flag.boolean("full").pipe(Flag.withDefault(false));
 /**
 * The "upgrade" command. The default path runs the interactive table;
 * --yes applies latest-in-range non-interactively; --dry-run runs the identical
@@ -415,7 +412,7 @@ const upgradeCommand = Command.make("upgrade", {
 	const catalogName = Option.getOrUndefined(catalog);
 	const entries = filterEntriesByCatalog(discovered.entries, catalogName);
 	const versions = yield* resolveGatedVersions(entries, resolver, yield* computeGate(source, file, resolver), Date.now(), caps.interactive ? writeResolveProgress : void 0);
-	const items = yield* buildWalkItems(entries, versions.gated).pipe(Effect.catchAll((e) => Effect.fail(new UpgradeError({ message: e.message }))));
+	const items = yield* buildWalkItems(entries, versions.gated).pipe(Effect.catch((e) => Effect.fail(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)";
@@ -466,7 +463,7 @@ const upgradeCommand = Command.make("upgrade", {
 				const all = versions.gated.get(rc.pkg) ?? [];
 				cappedVersions.set(rc.pkg, rc.cap === null ? all : yield* capVersions(all, rc.cap));
 			}
-			const reDecisions = yield* runWalk(yield* buildWalkItems(capEntries, cappedVersions).pipe(Effect.catchAll((err) => Effect.fail(new UpgradeError({ message: err.message })))));
+			const reDecisions = yield* runWalk(yield* buildWalkItems(capEntries, cappedVersions).pipe(Effect.catch((err) => Effect.fail(new UpgradeError({ message: err.message })))));
 			const before = new Map(members.map((m) => [m.pkg, m.ceiling]));
 			members = members.map((m) => {
 				const rd = reDecisions.find((d) => d.item.entry.pkg === m.pkg);
@@ -504,7 +501,7 @@ const upgradeCommand = Command.make("upgrade", {
 	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`));
 	if (versions.unresolved.length > 0) yield* Effect.sync(() => process.stdout.write(`\n⚠ ${unresolvedMessage(versions.unresolved)}\n`));
-}).pipe(Effect.provide(RegistryResolverLive), Effect.provide(NodeContext.layer))).pipe(Command.withDescription("Upgrade catalog versions in a config file"));
+}).pipe(Effect.provide(RegistryResolverLive), Effect.provide(NodeServices.layer))).pipe(Command.withDescription("Upgrade catalog versions in a config file"));
 
 //#endregion
 export { UpgradeError, actionableWalkItems, applyInteropAndDecisions, computeGate, countChangedDecisions, nothingToUpgradeMessage, projectDecisions, resolveGatedVersions, resolveTargetFile, runUpgrade, runUpgradePreview, unresolvedMessage, upgradeCommand, writeResolveProgress };

package/cli/interop.js

@@ -1,5 +1,5 @@
 import { Effect } from "effect";
-import { Range, SemVer } from "semver-effect";
+import { Range, SemVer } from "@effected/semver";
 
 //#region src/cli/interop.ts
 /** Maximum number of concurrent peerDependencies fetches inside runInterop. @internal */
@@ -34,7 +34,7 @@ function deriveFloors(resolved, fetchPeer) {
 				const valid = (yield* Effect.forEach(declared, (f) => SemVer.parse(f).pipe(Effect.map((sv) => ({
 					f,
 					sv
-				})), Effect.catchAll(() => Effect.succeed(null))))).filter((x) => x !== null);
+				})), Effect.catch(() => Effect.succeed(null))))).filter((x) => x !== null);
 				valid.sort((a, b) => a.sv.compare(b.sv));
 				out.set(pkg, `^${valid[0]?.f ?? version}`);
 			} else out.set(pkg, `^${version}`);
@@ -45,9 +45,9 @@ function deriveFloors(resolved, fetchPeer) {
 /** Does `version` satisfy `range`? Unparseable input is treated as not-satisfied. */
 function satisfies(version, range) {
 	return Effect.gen(function* () {
-		const r = yield* Range.parse(range).pipe(Effect.catchAll(() => Effect.succeed(null)));
+		const r = yield* Range.parse(range).pipe(Effect.catch(() => Effect.succeed(null)));
 		if (!r) return false;
-		const v = yield* SemVer.parse(version).pipe(Effect.catchAll(() => Effect.succeed(null)));
+		const v = yield* SemVer.parse(version).pipe(Effect.catch(() => Effect.succeed(null)));
 		return v ? r.test(v) : false;
 	});
 }
@@ -81,8 +81,8 @@ function resolveGroup(members, fetchPeer) {
 		const resolved = new Map(members.map((m) => [m.pkg, m.ceiling]));
 		const ceilingOf = new Map(members.map((m) => [m.pkg, m.ceiling]));
 		const leq = (a, b) => Effect.gen(function* () {
-			const av = yield* SemVer.parse(a).pipe(Effect.catchAll(() => Effect.succeed(null)));
-			const bv = yield* SemVer.parse(b).pipe(Effect.catchAll(() => Effect.succeed(null)));
+			const av = yield* SemVer.parse(a).pipe(Effect.catch(() => Effect.succeed(null)));
+			const bv = yield* SemVer.parse(b).pipe(Effect.catch(() => Effect.succeed(null)));
 			return av && bv ? av.compare(bv) <= 0 : false;
 		});
 		const maxIter = members.reduce((n, m) => n + m.candidates.length, 0) + members.length + 1;
@@ -130,7 +130,7 @@ function sortDesc(versions) {
 		const parsed = yield* Effect.forEach(versions, (v) => SemVer.parse(v).pipe(Effect.map((sv) => ({
 			v,
 			sv
-		})), Effect.catchAll(() => Effect.succeed({
+		})), Effect.catch(() => Effect.succeed({
 			v,
 			sv: null
 		}))));
@@ -165,7 +165,7 @@ function runInterop(members, resolver, cache = /* @__PURE__ */ new Map()) {
 			const k = key(pkg, v);
 			const cached = cache.get(k);
 			if (cached !== void 0) return Effect.succeed(cached);
-			return resolver.peerDependencies(pkg, v).pipe(Effect.catchAll(() => Effect.succeed({}))).pipe(Effect.map((deps) => {
+			return resolver.peerDependencies(pkg, v).pipe(Effect.catch(() => Effect.succeed({}))).pipe(Effect.map((deps) => {
 				cache.set(k, deps);
 				return deps;
 			}));
@@ -270,11 +270,11 @@ function buildInteropEdits(entries, result) {
 */
 function capVersions(list, max) {
 	return Effect.gen(function* () {
-		const mv = yield* SemVer.parse(max).pipe(Effect.catchAll(() => Effect.succeed(null)));
+		const mv = yield* SemVer.parse(max).pipe(Effect.catch(() => Effect.succeed(null)));
 		if (!mv) return [...list];
 		const out = [];
 		for (const v of list) {
-			const sv = yield* SemVer.parse(v).pipe(Effect.catchAll(() => Effect.succeed(null)));
+			const sv = yield* SemVer.parse(v).pipe(Effect.catch(() => Effect.succeed(null)));
 			if (sv && sv.compare(mv) <= 0) out.push(v);
 		}
 		return out;

package/cli/peer-range.js

@@ -1,5 +1,5 @@
 import { Data, Effect } from "effect";
-import { SemVer } from "semver-effect";
+import { SemVer } from "@effected/semver";
 
 //#region src/cli/peer-range.ts
 /**

package/cli/plan.js

@@ -1,10 +1,10 @@
 import { derivePeerRange } from "./peer-range.js";
 import { Effect } from "effect";
-import { Range, SemVer } from "semver-effect";
+import { Range, SemVer } from "@effected/semver";
 
 //#region src/cli/plan.ts
 /** Parse a version, returning null instead of failing (filters junk tags). */
-const parseOrNull = (v) => SemVer.parse(v).pipe(Effect.catchAll(() => Effect.succeed(null)));
+const parseOrNull = (v) => SemVer.parse(v).pipe(Effect.catch(() => Effect.succeed(null)));
 /**
 * Compute the candidate versions for one catalog entry against the list of
 * published versions. Order: latest in-range (when newer than current), latest
@@ -16,7 +16,7 @@ const parseOrNull = (v) => SemVer.parse(v).pipe(Effect.catchAll(() => Effect.suc
 */
 function planEntry(entry, versions) {
 	return Effect.gen(function* () {
-		const range = yield* Range.parse(entry.currentRange).pipe(Effect.catchAll(() => Effect.succeed(null)));
+		const range = yield* Range.parse(entry.currentRange).pipe(Effect.catch(() => Effect.succeed(null)));
 		const currentStripped = entry.currentRange.replace(/^[\^~]/, "");
 		const current = yield* parseOrNull(currentStripped);
 		const currentMajor = current?.major ?? 0;

package/cli/resolve.js

@@ -1,7 +1,8 @@
 import { Context, Data, Effect, Layer } from "effect";
-import { Command, CommandExecutor } from "@effect/platform";
+import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 
 //#region src/cli/resolve.ts
+const Spawner = ChildProcessSpawner.ChildProcessSpawner;
 /**
 * Typed failure raised when a package's versions cannot be resolved.
 *
@@ -15,7 +16,7 @@ var ResolveError = class extends Data.TaggedError("ResolveError") {};
 *
 * @internal
 */
-var RegistryResolver = class extends Context.Tag("RegistryResolver")() {};
+var RegistryResolver = class extends Context.Service()("RegistryResolver") {};
 /** Parse `pnpm view ... versions --json` stdout: a JSON array, or a single JSON string. */
 function parseVersions(pkg, stdout) {
 	return Effect.try({
@@ -75,32 +76,51 @@ function parsePeerDeps(pkg, stdout) {
 * @internal
 */
 const RegistryResolverLive = Layer.effect(RegistryResolver, Effect.gen(function* () {
-	const executor = yield* CommandExecutor.CommandExecutor;
+	const spawner = yield* Spawner;
 	return {
 		versions: (pkg) => Effect.gen(function* () {
-			const cmd = Command.make("pnpm", "view", pkg, "versions", "--json");
-			return yield* parseVersions(pkg, yield* executor.string(cmd).pipe(Effect.mapError((e) => new ResolveError({
+			const cmd = ChildProcess.make("pnpm", [
+				"view",
+				pkg,
+				"versions",
+				"--json"
+			]);
+			return yield* parseVersions(pkg, yield* spawner.string(cmd).pipe(Effect.mapError((e) => new ResolveError({
 				pkg,
 				message: String(e)
 			}))));
 		}),
 		times: (pkg) => Effect.gen(function* () {
-			const cmd = Command.make("pnpm", "view", pkg, "time", "--json");
-			return yield* parseTimes(pkg, yield* executor.string(cmd).pipe(Effect.mapError((e) => new ResolveError({
+			const cmd = ChildProcess.make("pnpm", [
+				"view",
+				pkg,
+				"time",
+				"--json"
+			]);
+			return yield* parseTimes(pkg, yield* spawner.string(cmd).pipe(Effect.mapError((e) => new ResolveError({
 				pkg,
 				message: String(e)
 			}))));
 		}),
 		peerDependencies: (pkg, version) => Effect.gen(function* () {
-			const cmd = Command.make("pnpm", "view", `${pkg}@${version}`, "peerDependencies", "--json");
-			return yield* parsePeerDeps(pkg, yield* executor.string(cmd).pipe(Effect.mapError((e) => new ResolveError({
+			const cmd = ChildProcess.make("pnpm", [
+				"view",
+				`${pkg}@${version}`,
+				"peerDependencies",
+				"--json"
+			]);
+			return yield* parsePeerDeps(pkg, yield* spawner.string(cmd).pipe(Effect.mapError((e) => new ResolveError({
 				pkg,
 				message: String(e)
 			}))));
 		}),
 		pnpmConfig: (key) => Effect.gen(function* () {
-			const cmd = Command.make("pnpm", "config", "get", key);
-			return yield* executor.string(cmd).pipe(Effect.map((s) => s.trim()), Effect.catchAll(() => Effect.succeed(null)));
+			const cmd = ChildProcess.make("pnpm", [
+				"config",
+				"get",
+				key
+			]);
+			return yield* spawner.string(cmd).pipe(Effect.map((s) => s.trim()), Effect.catch(() => Effect.succeed(null)));
 		})
 	};
 }));

package/cli/ui/run-preview.js

@@ -11,7 +11,7 @@ import { createElement } from "react";
 * @internal
 */
 function runPreview(views) {
-	return Effect.async((resume) => {
+	return Effect.callback((resume) => {
 		render(createElement(Preview, {
 			views,
 			onExit: () => {}

package/cli/ui/run-walk.js

@@ -12,7 +12,7 @@ import { createElement } from "react";
 * @internal
 */
 function runWalk(items, dryRun = false, unresolved = []) {
-	return Effect.async((resume) => {
+	return Effect.callback((resume) => {
 		let collected = [];
 		render(createElement(Walk, {
 			items,

package/cli/validate.js

@@ -1,5 +1,5 @@
 import { Effect } from "effect";
-import { Range, SemVer } from "semver-effect";
+import { Range, SemVer } from "@effected/semver";
 
 //#region src/cli/validate.ts
 /**
@@ -21,10 +21,10 @@ import { Range, SemVer } from "semver-effect";
 function rangeIsSatisfiable(range, versions) {
 	return Effect.gen(function* () {
 		if (versions.length === 0) return true;
-		const parsedRange = yield* Range.parse(range).pipe(Effect.catchAll(() => Effect.succeed(null)));
+		const parsedRange = yield* Range.parse(range).pipe(Effect.catch(() => Effect.succeed(null)));
 		if (parsedRange === null) return true;
 		for (const v of versions) {
-			const sv = yield* SemVer.parse(v).pipe(Effect.catchAll(() => Effect.succeed(null)));
+			const sv = yield* SemVer.parse(v).pipe(Effect.catch(() => Effect.succeed(null)));
 			if (sv && parsedRange.test(sv)) return true;
 		}
 		return false;

package/cli/workspace-file.js

@@ -1,14 +1,14 @@
+import { Effect } from "effect";
 import { existsSync } from "node:fs";
 import { dirname, join } from "node:path";
-import { parse, stringify } from "yaml";
+import { Yaml, YamlStringifyOptions } from "@effected/yaml";
 
 //#region src/cli/workspace-file.ts
 const FILENAME = "pnpm-workspace.yaml";
-const STRINGIFY_OPTIONS = {
+const STRINGIFY_OPTIONS = YamlStringifyOptions.make({
 	indent: 2,
-	lineWidth: 0,
-	singleQuote: false
-};
+	lineWidth: 0
+});
 /** True when every element is a string/number/boolean (safe to sort). */
 function allPrimitive(arr) {
 	return arr.every((v) => v === null || typeof v !== "object" && typeof v !== "function");
@@ -46,12 +46,12 @@ function findWorkspaceFile(startDir) {
 }
 /** Parse pnpm-workspace.yaml source; empty/whitespace yields an empty object. @internal */
 function parseWorkspace(source) {
-	const parsed = parse(source);
+	const parsed = Effect.runSync(Yaml.parse(source));
 	return parsed && typeof parsed === "object" ? parsed : {};
 }
 /** Render a workspace object: deterministic key sort + yaml.stringify. @internal */
 function renderWorkspace(obj) {
-	return stringify(canonicalize(obj), STRINGIFY_OPTIONS);
+	return Effect.runSync(Yaml.stringify(canonicalize(obj), STRINGIFY_OPTIONS));
 }
 
 //#endregion

package/descriptors/build.js

@@ -104,7 +104,12 @@ const build = {
 		anchor: "nodeoptions"
 	},
 	verifyDepsBeforeRun: {
-		schema: Schema.Union(Schema.Literal("install", "warn", "error", "prompt"), Schema.Boolean),
+		schema: Schema.Union([Schema.Literals([
+			"install",
+			"warn",
+			"error",
+			"prompt"
+		]), Schema.Boolean]),
 		kind: "union",
 		strategy: "scalar",
 		enforcement: "absent",

package/descriptors/hoisting.js

@@ -41,7 +41,11 @@ const hoisting = {
 		anchor: "shamefullyhoist"
 	},
 	hoistingLimits: {
-		schema: Schema.Literal("none", "workspaces", "dependencies"),
+		schema: Schema.Literals([
+			"none",
+			"workspaces",
+			"dependencies"
+		]),
 		kind: "enum",
 		strategy: "scalar",
 		enforcement: "absent",
@@ -63,7 +67,11 @@ const hoisting = {
 		anchor: "modulesdir"
 	},
 	nodeLinker: {
-		schema: Schema.Literal("isolated", "hoisted", "pnp"),
+		schema: Schema.Literals([
+			"isolated",
+			"hoisted",
+			"pnp"
+		]),
 		kind: "enum",
 		strategy: "scalar",
 		enforcement: "absent",
@@ -121,7 +129,13 @@ const hoisting = {
 		anchor: "virtualstoreonly"
 	},
 	packageImportMethod: {
-		schema: Schema.Literal("auto", "hardlink", "copy", "clone", "clone-or-copy"),
+		schema: Schema.Literals([
+			"auto",
+			"hardlink",
+			"copy",
+			"clone",
+			"clone-or-copy"
+		]),
 		kind: "enum",
 		strategy: "scalar",
 		enforcement: "absent",

package/descriptors/misc.js

@@ -5,7 +5,11 @@ import { Schema } from "effect";
 /** The 14 resolution/misc preference fields. @internal */
 const misc = {
 	resolutionMode: {
-		schema: Schema.Literal("highest", "time-based", "lowest-direct"),
+		schema: Schema.Literals([
+			"highest",
+			"time-based",
+			"lowest-direct"
+		]),
 		kind: "enum",
 		strategy: "scalar",
 		enforcement: "absent",
@@ -18,7 +22,11 @@ const misc = {
 		}
 	},
 	savePrefix: {
-		schema: Schema.Literal("^", "~", ""),
+		schema: Schema.Literals([
+			"^",
+			"~",
+			""
+		]),
 		kind: "enum",
 		strategy: "scalar",
 		enforcement: "absent",

package/descriptors/resolution.js

@@ -19,10 +19,7 @@ const PeerRulesSchema = Schema.Struct({
 */
 const resolution = {
 	catalogs: {
-		schema: Schema.Record({
-			key: Str,
-			value: StringRecord
-		}),
+		schema: Schema.Record(Str, StringRecord),
 		kind: "object",
 		strategy: "catalogs",
 		enforcement: "warn",
@@ -205,7 +202,7 @@ const resolution = {
 		anchor: "minimumreleaseageignoremissingtime"
 	},
 	trustPolicy: {
-		schema: Schema.Literal("off", "no-downgrade"),
+		schema: Schema.Literals(["off", "no-downgrade"]),
 		kind: "enum",
 		strategy: "scalar",
 		enforcement: "warn",

package/descriptors/runtime-cfg.js

@@ -32,7 +32,12 @@ const runtimeCfg = {
 		anchor: "managepackagemanagerversions"
 	},
 	pmOnFail: {
-		schema: Schema.Literal("download", "error", "warn", "ignore"),
+		schema: Schema.Literals([
+			"download",
+			"error",
+			"warn",
+			"ignore"
+		]),
 		kind: "enum",
 		strategy: "scalar",
 		enforcement: "absent",
@@ -45,7 +50,12 @@ const runtimeCfg = {
 		}
 	},
 	runtimeOnFail: {
-		schema: Schema.Literal("download", "error", "warn", "ignore"),
+		schema: Schema.Literals([
+			"download",
+			"error",
+			"warn",
+			"ignore"
+		]),
 		kind: "enum",
 		strategy: "scalar",
 		enforcement: "absent",

package/descriptors/schemas.js

@@ -5,22 +5,10 @@ import { Schema } from "effect";
 /** @internal */ const Num = Schema.Number;
 /** @internal */ const Str = Schema.String;
 /** @internal */ const StringArray = Schema.Array(Schema.String);
-/** @internal */ const StringRecord = Schema.Record({
-	key: Schema.String,
-	value: Schema.String
-});
-/** @internal */ const BooleanRecord = Schema.Record({
-	key: Schema.String,
-	value: Schema.Boolean
-});
-/** @internal */ const UnknownRecord = Schema.Record({
-	key: Schema.String,
-	value: Schema.Unknown
-});
-/** @internal */ const StringArrayRecord = Schema.Record({
-	key: Schema.String,
-	value: StringArray
-});
+/** @internal */ const StringRecord = Schema.Record(Schema.String, Schema.String);
+/** @internal */ const BooleanRecord = Schema.Record(Schema.String, Schema.Boolean);
+/** @internal */ const UnknownRecord = Schema.Record(Schema.String, Schema.Unknown);
+/** @internal */ const StringArrayRecord = Schema.Record(Schema.String, StringArray);
 
 //#endregion
 export { Bool, BooleanRecord, Num, Str, StringArray, StringArrayRecord, StringRecord, UnknownRecord };

package/descriptors/workspace.js

@@ -5,7 +5,11 @@ import { Schema } from "effect";
 /** The 10 catalog + workspace + audit fields. @internal */
 const workspace = {
 	catalogMode: {
-		schema: Schema.Literal("strict", "prefer", "manual"),
+		schema: Schema.Literals([
+			"strict",
+			"prefer",
+			"manual"
+		]),
 		kind: "enum",
 		strategy: "scalar",
 		enforcement: "absent",
@@ -27,7 +31,7 @@ const workspace = {
 		anchor: "cleanupunusedcatalogs"
 	},
 	linkWorkspacePackages: {
-		schema: Schema.Union(Schema.Boolean, Schema.Literal("deep")),
+		schema: Schema.Union([Schema.Boolean, Schema.Literals(["deep"])]),
 		kind: "union",
 		strategy: "scalar",
 		enforcement: "absent",
@@ -49,7 +53,7 @@ const workspace = {
 		anchor: "preferworkspacepackages"
 	},
 	saveWorkspaceProtocol: {
-		schema: Schema.Union(Schema.Boolean, Schema.Literal("rolling")),
+		schema: Schema.Union([Schema.Boolean, Schema.Literals(["rolling"])]),
 		kind: "union",
 		strategy: "scalar",
 		enforcement: "absent",
@@ -98,7 +102,12 @@ const workspace = {
 		anchor: "workspaceconcurrency"
 	},
 	auditLevel: {
-		schema: Schema.Literal("low", "moderate", "high", "critical"),
+		schema: Schema.Literals([
+			"low",
+			"moderate",
+			"high",
+			"critical"
+		]),
 		kind: "enum",
 		strategy: "scalar",
 		enforcement: "absent",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rolldown-pnpm-config",
-	"version": "0.3.0",
+	"version": "0.4.0",
 	"private": false,
 	"description": "A dogfooding example of our plugin",
 	"repository": {
@@ -33,26 +33,16 @@
 		"rolldown-pnpm-config": "bin/rolldown-pnpm-config.js"
 	},
 	"dependencies": {
-		"@effect/cli": "^0.75.2",
-		"@effect/cluster": "^0.59.0",
-		"@effect/experimental": "^0.60.0",
-		"@effect/platform": "^0.96.2",
-		"@effect/platform-node": "^0.107.0",
-		"@effect/printer": "^0.49.0",
-		"@effect/printer-ansi": "^0.49.0",
-		"@effect/rpc": "^0.75.1",
-		"@effect/sql": "^0.51.1",
-		"@effect/typeclass": "^0.40.0",
-		"@effect/workflow": "^0.18.2",
-		"effect": "^3.21.4",
+		"@effect/platform-node": "4.0.0-beta.98",
+		"@effected/semver": "^0.1.0",
+		"@effected/yaml": "^0.1.0",
+		"effect": "4.0.0-beta.98",
 		"ink": "^7.1.0",
 		"ink-tab": "^5.2.0",
 		"oxc-parser": "^0.140.0",
 		"react": "^19.2.7",
-		"semver-effect": "^0.3.1",
 		"std-env": "^4.2.0",
-		"std-osc8": "^0.2.0",
-		"yaml": "^2.9.0"
+		"std-osc8": "^0.2.0"
 	},
 	"peerDependencies": {
 		"rolldown": "^1.1.0"

package/plugin/freeze.js

@@ -48,7 +48,7 @@ function freeze(config) {
 	return Effect.gen(function* () {
 		const base = {};
 		const manifest = {};
-		base.catalogs = yield* Schema.decodeUnknown(CatalogsSchema)(normalizeCatalogs(config.catalogs)).pipe(Effect.mapError((error) => new ConfigError({ message: `Invalid catalogs: ${String(error)}` })));
+		base.catalogs = yield* Schema.decodeUnknownEffect(CatalogsSchema)(normalizeCatalogs(config.catalogs)).pipe(Effect.mapError((error) => new ConfigError({ message: `Invalid catalogs: ${String(error)}` })));
 		manifest.catalogs = {
 			strategy: "catalogs",
 			enforcement: "warn"
@@ -60,7 +60,7 @@ function freeze(config) {
 			if (raw === void 0) continue;
 			const decl = normalizeField(raw);
 			const schema = FIELD_SCHEMAS[field];
-			base[field] = schema ? yield* Schema.decodeUnknown(schema)(decl.value).pipe(Effect.mapError((error) => new ConfigError({ message: `Invalid ${field}: ${String(error)}` }))) : decl.value;
+			base[field] = schema ? yield* Schema.decodeUnknownEffect(schema)(decl.value).pipe(Effect.mapError((error) => new ConfigError({ message: `Invalid ${field}: ${String(error)}` }))) : decl.value;
 			manifest[field] = {
 				strategy: reg.strategy,
 				enforcement: decl.enforcement ?? reg.enforcement,

package/virtual.d.ts

@@ -9,8 +9,18 @@
 // per-module boilerplate.
 
 declare module "rolldown-pnpm-config/virtual/pnpmfile" {
-	import type { PnpmHooks } from "rolldown-pnpm-config/runtime";
-	export const hooks: PnpmHooks;
+	// Inlined rather than imported from "rolldown-pnpm-config/runtime": this file is
+	// shipped byte-for-byte (never compiled), so any cross-module import here resolves
+	// 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>>;
+		[key: string]: unknown;
+	}
+	export const hooks: {
+		updateConfig(config: PnpmConfig): PnpmConfig;
+	};
 }
 
 declare module "rolldown-pnpm-config/virtual/catalogs" {