rolldown-pnpm-config 0.8.1 → 1.0.0

package/cli/resolve.js

@@ -1,4 +1,4 @@
-import { Context, Data, Effect, Layer } from "effect";
+import { Context, Data, Effect, Layer, Predicate } from "effect";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 
 //#region src/cli/resolve.ts
@@ -17,6 +17,18 @@ var ResolveError = class extends Data.TaggedError("ResolveError") {};
 * @internal
 */
 var RegistryResolver = class extends Context.Service()("RegistryResolver") {};
+/**
+* Drop pnpm's own notice lines from captured stdout. pnpm prints e.g.
+* `[WARN] This project is configured to use 12.5.0… Your current pnpm is v12.4.2`
+* (a `packageManager` mismatch) to STDOUT ahead of the `--json` payload, which
+* would otherwise make every `pnpm view` unparseable and report each real
+* package as an unresolvable typo.
+*
+* @internal
+*/
+function stripPnpmNotices(stdout) {
+	return stdout.replace(/^[ \t]*(?:\[WARN\]|\[ERR\]|WARN\b|ERR_PNPM_\w+)[^\n]*\n?/gm, "");
+}
 /** Parse `pnpm view ... versions --json` stdout: a JSON array, or a single JSON string. */
 function parseVersions(pkg, stdout) {
 	return Effect.try({
@@ -32,43 +44,31 @@ function parseVersions(pkg, stdout) {
 		})
 	});
 }
-/** Parse `pnpm view <pkg> time --json` stdout: an object of version → ISO date. @internal */
-function parseTimes(pkg, stdout) {
+/** Parse a `pnpm view ... --json` object of string values into a string record. */
+function parseStringRecord(pkg, stdout, what) {
 	return Effect.try({
 		try: () => {
 			const json = JSON.parse(stdout);
-			if (json && typeof json === "object" && !Array.isArray(json)) {
-				const out = {};
-				for (const [k, v] of Object.entries(json)) out[k] = String(v);
-				return out;
-			}
-			throw new Error("unexpected shape");
+			if (!Predicate.isObject(json)) throw new Error("unexpected shape");
+			const out = {};
+			for (const [k, v] of Object.entries(json)) out[k] = String(v);
+			return out;
 		},
 		catch: () => new ResolveError({
 			pkg,
-			message: `Could not parse times for ${pkg}`
+			message: `Could not parse ${what} for ${pkg}`
 		})
 	});
 }
+/** Parse `pnpm view <pkg> time --json` stdout: an object of version → ISO date. @internal */
+function parseTimes(pkg, stdout) {
+	return parseStringRecord(pkg, stdout, "times");
+}
 /** Parse `pnpm view <pkg>@<version> peerDependencies --json`; empty stdout → {}. @internal */
 function parsePeerDeps(pkg, stdout) {
 	const trimmed = stdout.trim();
 	if (trimmed === "") return Effect.succeed({});
-	return Effect.try({
-		try: () => {
-			const json = JSON.parse(trimmed);
-			if (json && typeof json === "object" && !Array.isArray(json)) {
-				const out = {};
-				for (const [k, v] of Object.entries(json)) out[k] = String(v);
-				return out;
-			}
-			throw new Error("unexpected shape");
-		},
-		catch: () => new ResolveError({
-			pkg,
-			message: `Could not parse peerDependencies for ${pkg}`
-		})
-	});
+	return parseStringRecord(pkg, trimmed, "peerDependencies");
 }
 /**
 * Live RegistryResolver backed by `pnpm view <pkg> versions --json`.
@@ -77,53 +77,30 @@ function parsePeerDeps(pkg, stdout) {
 */
 const RegistryResolverLive = Layer.effect(RegistryResolver, Effect.gen(function* () {
 	const spawner = yield* Spawner;
+	/** `pnpm view <spec> <field> --json` stdout, with a spawn failure typed against `pkg`. */
+	const pnpmView = (pkg, spec, field) => spawner.string(ChildProcess.make("pnpm", [
+		"view",
+		spec,
+		field,
+		"--json"
+	])).pipe(Effect.map(stripPnpmNotices), Effect.mapError((e) => new ResolveError({
+		pkg,
+		message: String(e)
+	})));
 	return {
-		versions: (pkg) => Effect.gen(function* () {
-			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 = 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 = 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)
-			}))));
-		}),
+		versions: (pkg) => pnpmView(pkg, pkg, "versions").pipe(Effect.flatMap((out) => parseVersions(pkg, out))),
+		times: (pkg) => pnpmView(pkg, pkg, "time").pipe(Effect.flatMap((out) => parseTimes(pkg, out))),
+		peerDependencies: (pkg, version) => pnpmView(pkg, `${pkg}@${version}`, "peerDependencies").pipe(Effect.flatMap((out) => parsePeerDeps(pkg, out))),
 		pnpmConfig: (key) => Effect.gen(function* () {
 			const cmd = ChildProcess.make("pnpm", [
 				"config",
 				"get",
 				key
 			]);
-			return yield* spawner.string(cmd).pipe(Effect.map((s) => s.trim()), Effect.catch(() => Effect.succeed(null)));
+			return yield* spawner.string(cmd).pipe(Effect.map((s) => stripPnpmNotices(s).trim()), Effect.orElseSucceed(() => null));
 		})
 	};
 }));
 
 //#endregion
-export { RegistryResolver, RegistryResolverLive, ResolveError, parsePeerDeps, parseTimes, parseVersions };
+export { RegistryResolver, RegistryResolverLive, ResolveError, parsePeerDeps, parseTimes, parseVersions, stripPnpmNotices };

package/cli/simulated-view.js

@@ -1,3 +1,4 @@
+import { scalarText } from "./diff/render.js";
 import { canonicalize } from "./workspace-file.js";
 
 //#region src/cli/simulated-view.ts
@@ -51,9 +52,6 @@ function annotation(entry) {
 		}
 	];
 }
-function scalarText(v) {
-	return typeof v === "string" ? v : JSON.stringify(v);
-}
 /** Flatten one key/value into YAML-shaped plain lines; `ann` annotates the head. */
 function flatten(key, value, depth, ann) {
 	if (Array.isArray(value)) return [{

package/cli/summary.js

@@ -1,19 +1,12 @@
 import { toAnsi } from "./ui/ansi.js";
-import { displayCandidates, peerFor } from "./walk-reducer.js";
+import { displayCandidates, peerFor, tableLayout } from "./walk-reducer.js";
 
 //#region src/cli/summary.ts
-/** Trailing annotation appended to a major candidate's cell, e.g. " ⚠ major". */
-const MAJOR_SUFFIX = " ⚠ major";
-/** Filled / hollow radio glyphs. MUST match `ui/Walk.ts` — the summary mirrors the table. */
-const SELECTED = "●";
-const UNSELECTED = "○";
-/** "● " / "○ " glyph-plus-space prefix width, common to every cell. */
-const BUBBLE_WIDTH = 2;
 /**
 * Build the pending-decisions summary as styled lines: one table row per
 * decision — mirroring the interactive selection table, catalog headers,
-* chosen bubble filled — then a dim tally, interop adjustments, conflicts,
-* and any rejected edits. Pure; color is applied by `renderSummary`/`toAnsi`.
+* chosen bubble filled — then a dim tally, interop conflicts, and any
+* rejected edits. Pure; color is applied by `renderSummary`/`toAnsi`.
 *
 * @internal
 */
@@ -24,10 +17,7 @@ function summaryLines(decisions, interop, rejected) {
 	let resync = 0;
 	let materialize = 0;
 	let upToDate = 0;
-	const pkgWidth = decisions.length ? Math.max(...decisions.map((d) => d.item.entry.pkg.length)) : 0;
-	const cellWidth = decisions.length ? Math.max(...decisions.flatMap((d) => displayCandidates(d.item).map((c) => c.range.length + (c.isMajor ? 8 : 0)))) : 0;
-	const maxCells = decisions.length ? Math.max(...decisions.map((d) => displayCandidates(d.item).length)) : 0;
-	const blankCell = `${" ".repeat(BUBBLE_WIDTH + cellWidth)}  `;
+	const { pkgWidth, maxCells, blankCell, cellText } = tableLayout(decisions.map((d) => d.item));
 	let lastCatalog = null;
 	for (const { item, chosen } of decisions) {
 		const { entry } = item;
@@ -49,11 +39,9 @@ function summaryLines(decisions, interop, rejected) {
 		}];
 		for (const c of cells) {
 			const selected = c.kind === chosen.kind;
-			const bubble = selected ? SELECTED : UNSELECTED;
 			const style = !selected ? "unchanged" : c.kind === "keep" ? "unchanged" : c.isMajor ? "changed" : "added";
-			const content = `${c.range}${c.isMajor ? MAJOR_SUFFIX : ""}`.padEnd(cellWidth);
 			segments.push({
-				text: `${bubble} ${content}  `,
+				text: cellText(c, selected),
 				style
 			});
 		}
@@ -94,34 +82,14 @@ function summaryLines(decisions, interop, rejected) {
 			style: "unchanged"
 		}]
 	});
-	if (interop) {
-		for (const a of interop.adjustments) {
-			lines.push({
-				indent: 0,
-				gutter: "~",
-				segments: [{
-					text: `↓ ${a.pkg}  ${a.from} → ${a.to}`,
-					style: "changed"
-				}]
-			});
-			lines.push({
-				indent: 1,
-				gutter: "~",
-				segments: [{
-					text: `↳ peer  → ${a.peer}`,
-					style: "changed"
-				}]
-			});
-		}
-		for (const c of interop.conflicts) lines.push({
-			indent: 0,
-			gutter: "⚠",
-			segments: [{
-				text: `${c.pkg} (kept ${c.ceiling}) blocked by ${c.blockedBy}`,
-				style: "warn"
-			}]
-		});
-	}
+	if (interop) for (const c of interop.conflicts) lines.push({
+		indent: 0,
+		gutter: "⚠",
+		segments: [{
+			text: `${c.pkg} (kept ${c.ceiling}) blocked by ${c.blockedBy}`,
+			style: "warn"
+		}]
+	});
 	if (rejected && rejected.length > 0) {
 		lines.push({
 			indent: 0,

package/cli/ui/Walk.js

@@ -1,5 +1,5 @@
 import { computeGroupPeers } from "../interop-live.js";
-import { cellColor, displayCandidates, initTable, peerFor, tableDecisions, tableStep, truncateEnd } from "../walk-reducer.js";
+import { cellColor, displayCandidates, initTable, peerFor, tableDecisions, tableLayout, tableStep, truncateEnd } from "../walk-reducer.js";
 import { Box, Text, useApp, useInput } from "ink";
 import { createElement, useEffect, useState } from "react";
 
@@ -37,13 +37,7 @@ function Walk({ items, onDone, dryRun = false, unresolved = [], interopModels =
 		}
 	});
 	if (state.done || items.length === 0) return createElement(Text, null, "Done.");
-	const pkgWidth = Math.max(...items.map((i) => i.entry.pkg.length));
-	const MAJOR_SUFFIX = " ⚠ major";
-	const SELECTED = "●";
-	const UNSELECTED = "○";
-	const cellWidth = Math.max(...items.flatMap((i) => displayCandidates(i).map((c) => c.range.length + (c.isMajor ? 8 : 0))));
-	const maxCells = Math.max(...items.map((i) => displayCandidates(i).length));
-	const blankCell = `${" ".repeat(2 + cellWidth)}  `;
+	const { pkgWidth, cellWidth, maxCells, blankCell, cellText } = tableLayout(items);
 	const termCols = process.stdout.columns ?? 100;
 	const fixedPrefix = 2 + (pkgWidth + 2) + maxCells * (cellWidth + 4) + 2;
 	const start = Math.max(0, Math.min(state.cursor - Math.floor(VIEWPORT / 2), items.length - VIEWPORT));
@@ -74,14 +68,11 @@ function Walk({ items, onDone, dryRun = false, unresolved = [], interopModels =
 		const candidates = displayCandidates(item);
 		const cells = candidates.map((c, ci) => {
 			const selected = ci === pick;
-			const bubble = selected ? SELECTED : UNSELECTED;
-			const major = c.isMajor ? MAJOR_SUFFIX : "";
-			const content = `${c.range}${major}`.padEnd(cellWidth);
 			const color = cellColor(c, selected);
 			return createElement(Text, {
 				key: c.kind,
 				...color ? { color } : {}
-			}, `${bubble} ${content}  `);
+			}, cellText(c, selected));
 		});
 		for (let ci = candidates.length; ci < maxCells; ci++) cells.push(createElement(Text, { key: `blank-${ci}` }, blankCell));
 		const chosen = candidates[pick];

package/cli/ui/env.js

@@ -1,9 +1,8 @@
 import { hasTTY, isAgent, isCI, isColorSupported } from "std-env";
-import { supportsHyperlinks } from "std-osc8";
 
 //#region src/cli/ui/env.ts
 /**
-* Detect color / interactivity / hyperlink support once, at the command edge.
+* Detect color / interactivity once, at the command edge.
 * The render layer consumes the returned flags and never reads the environment.
 *
 * @internal
@@ -11,10 +10,9 @@ import { supportsHyperlinks } from "std-osc8";
 function detectCapabilities() {
 	return {
 		color: isColorSupported,
-		interactive: hasTTY && !isCI && !isAgent,
-		hyperlinks: supportsHyperlinks
+		interactive: hasTTY && !isCI && !isAgent
 	};
 }
 
 //#endregion
-export { detectCapabilities, supportsHyperlinks };
+export { detectCapabilities };

package/cli/ui/run-preview.js

@@ -6,17 +6,16 @@ import { createElement } from "react";
 //#region src/cli/ui/run-preview.ts
 /**
 * Render the interactive Preview inside an Effect, resolving once the user
-* exits and Ink has fully torn down.
+* exits and Ink has fully torn down. An Ink crash rejects `waitUntilExit()`,
+* which `Effect.promise` surfaces as a defect rather than a hung fiber.
 *
 * @internal
 */
 function runPreview(views) {
-	return Effect.callback((resume) => {
-		render(createElement(Preview, {
-			views,
-			onExit: () => {}
-		})).waitUntilExit().then(() => resume(Effect.void)).catch((err) => resume(Effect.die(err)));
-	});
+	return Effect.promise(() => render(createElement(Preview, {
+		views,
+		onExit: () => {}
+	})).waitUntilExit());
 }
 
 //#endregion

package/cli/ui/run-walk.js

@@ -7,14 +7,16 @@ import { createElement } from "react";
 /**
 * Render the interactive table inside an Effect, resolving with the collected
 * decisions once the user submits (or with an empty list when they cancel with
-* Esc, or when no rows are actionable), after Ink has fully exited.
+* Esc, or when no rows are actionable), after Ink has fully exited. An Ink
+* crash rejects `waitUntilExit()`, which `Effect.promise` surfaces as a
+* defect rather than a hung fiber.
 *
 * @internal
 */
 function runWalk(items, dryRun = false, unresolved = [], interopModels = /* @__PURE__ */ new Map()) {
-	return Effect.callback((resume) => {
+	return Effect.promise(async () => {
 		let collected = [];
-		render(createElement(Walk, {
+		await render(createElement(Walk, {
 			items,
 			dryRun,
 			unresolved,
@@ -22,7 +24,8 @@ function runWalk(items, dryRun = false, unresolved = [], interopModels = /* @__P
 			onDone: (d) => {
 				collected = d;
 			}
-		})).waitUntilExit().then(() => resume(Effect.succeed([...collected]))).catch((err) => resume(Effect.die(err)));
+		})).waitUntilExit();
+		return [...collected];
 	});
 }
 

package/cli/validate.js

@@ -1,5 +1,5 @@
+import { parseRange, parseVersion } from "../semver-util.js";
 import { Effect } from "effect";
-import { Range, SemVer } from "@effected/semver";
 
 //#region src/cli/validate.ts
 /**
@@ -19,15 +19,12 @@ import { Range, SemVer } from "@effected/semver";
 * @internal
 */
 function rangeIsSatisfiable(range, versions) {
-	return Effect.gen(function* () {
-		if (versions.length === 0) return true;
-		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.catch(() => Effect.succeed(null)));
-			if (sv && parsedRange.test(sv)) return true;
-		}
-		return false;
+	if (versions.length === 0) return true;
+	const parsedRange = parseRange(range);
+	if (parsedRange === null) return true;
+	return versions.some((v) => {
+		const sv = parseVersion(v);
+		return sv !== null && parsedRange.test(sv);
 	});
 }
 /**
@@ -49,7 +46,7 @@ function rangeIsSatisfiable(range, versions) {
 * @internal
 */
 function validateEdits(edits, versionsByPkg) {
-	return Effect.gen(function* () {
+	return Effect.sync(() => {
 		const byPkg = /* @__PURE__ */ new Map();
 		for (const e of edits) {
 			const key = e.versionKey ?? e.pkg;
@@ -62,11 +59,10 @@ function validateEdits(edits, versionsByPkg) {
 		for (const [key, group] of byPkg) {
 			const pkg = group[0]?.pkg ?? key;
 			const versions = versionsByPkg.get(key) ?? [];
-			const checked = [];
-			for (const e of group) checked.push({
-				edit: e,
-				ok: yield* rangeIsSatisfiable(e.value, versions)
-			});
+			const checked = group.map((edit) => ({
+				edit,
+				ok: rangeIsSatisfiable(edit.value, versions)
+			}));
 			const failing = checked.filter((c) => !c.ok);
 			if (failing.length === 0) {
 				accepted.push(...group);

package/cli/walk-plan.js

@@ -1,7 +1,7 @@
-import { derivePeerRange } from "./peer-range.js";
-import { detectPeerDrift } from "./drift.js";
 import { versionKeyOf } from "./version-key.js";
+import { derivePeerRange } from "./peer-range.js";
 import { planEntry } from "./plan.js";
+import { detectPeerDrift } from "./drift.js";
 import { Effect } from "effect";
 
 //#region src/cli/walk-plan.ts

package/cli/walk-reducer.js

@@ -5,6 +5,34 @@ const ORDER = {
 	minor: 2,
 	latest: 3
 };
+/** Trailing annotation appended to a major candidate's cell, e.g. " ⚠ major". @internal */
+const MAJOR_SUFFIX = " ⚠ major";
+/** Filled / hollow radio glyphs, matching `pnpm up -i`. @internal */
+const SELECTED = "●";
+/** @internal */
+const UNSELECTED = "○";
+/** "● " / "○ " glyph-plus-space prefix width, common to every cell. */
+const BUBBLE_WIDTH = 2;
+/**
+* Compute the table geometry once for a set of rows. The range and the major
+* suffix are padded TOGETHER so a major annotation never shifts a later
+* column, and every row emits `maxCells` cells so the peer separator lands
+* in the same column regardless of how many candidates a row has.
+*
+* @internal
+*/
+function tableLayout(items) {
+	const cells = items.map(displayCandidates);
+	const pkgWidth = items.length ? Math.max(...items.map((i) => i.entry.pkg.length)) : 0;
+	const cellWidth = items.length ? Math.max(...cells.flatMap((cs) => cs.map((c) => c.range.length + (c.isMajor ? 8 : 0)))) : 0;
+	return {
+		pkgWidth,
+		cellWidth,
+		maxCells: items.length ? Math.max(...cells.map((cs) => cs.length)) : 0,
+		blankCell: `${" ".repeat(BUBBLE_WIDTH + cellWidth)}  `,
+		cellText: (c, selected) => `${selected ? "●" : "○"} ${`${c.range}${c.isMajor ? MAJOR_SUFFIX : ""}`.padEnd(cellWidth)}  `
+	};
+}
 /**
 * Truncate `s` to at most `max` display columns, appending `…` when clipped.
 * Keeps a long peer-conflict annotation from wrapping and breaking the table's
@@ -130,4 +158,4 @@ function cellColor(candidate, selected) {
 }
 
 //#endregion
-export { cellColor, displayCandidates, initTable, peerFor, tableDecisions, tableStep, truncateEnd };
+export { MAJOR_SUFFIX, cellColor, displayCandidates, initTable, peerFor, tableDecisions, tableLayout, tableStep, truncateEnd };

package/cli/workspace-file.js

@@ -1,4 +1,4 @@
-import { Effect } from "effect";
+import { Result } from "effect";
 import { existsSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { Yaml, YamlStringifyOptions } from "@effected/yaml";
@@ -46,12 +46,12 @@ function findWorkspaceFile(startDir) {
 }
 /** Parse pnpm-workspace.yaml source; empty/whitespace yields an empty object. @internal */
 function parseWorkspace(source) {
-	const parsed = Effect.runSync(Yaml.parse(source));
+	const parsed = Result.getOrThrow(Yaml.parseResult(source));
 	return parsed && typeof parsed === "object" ? parsed : {};
 }
 /** Render a workspace object: deterministic key sort + yaml.stringify. @internal */
 function renderWorkspace(obj) {
-	return Effect.runSync(Yaml.stringify(canonicalize(obj), STRINGIFY_OPTIONS));
+	return Result.getOrThrow(Yaml.stringifyResult(canonicalize(obj), STRINGIFY_OPTIONS));
 }
 
 //#endregion

package/cli/workspace-resolve.js

@@ -1,8 +1,9 @@
+import { parseVersion } from "../semver-util.js";
+import { findWorkspaceFile } from "./workspace-file.js";
 import { ResolveError } from "./resolve.js";
 import { Effect, Layer } from "effect";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
-import { SemVer } from "@effected/semver";
 import { getWorkspacePackagesSync } from "@effected/workspaces";
 import { nodeSyncOps } from "@effected/workspaces/node-sync";
 
@@ -96,12 +97,8 @@ function applyPendingBumps(rootDir, versions) {
 	for (const [pkg, bump] of bumps) {
 		const current = versions.get(pkg);
 		if (current === void 0) continue;
-		let parsed;
-		try {
-			parsed = Effect.runSync(SemVer.parse(current));
-		} catch {
-			continue;
-		}
+		const parsed = parseVersion(current);
+		if (parsed === null) continue;
 		versions.set(pkg, parsed.bump[bump]().toString());
 	}
 }
@@ -112,9 +109,9 @@ function applyPendingBumps(rootDir, versions) {
 *
 * @internal
 */
-function readWorkspaceVersions(rootDir) {
+function readWorkspaceVersions(rootDir, manifests = readManifests(rootDir)) {
 	const out = /* @__PURE__ */ new Map();
-	for (const [name, manifest] of readManifests(rootDir)) out.set(name, manifest.version);
+	for (const [name, manifest] of manifests) out.set(name, manifest.version);
 	applyPendingBumps(rootDir, out);
 	return out;
 }
@@ -131,7 +128,7 @@ function makeWorkspaceResolver(rootDir) {
 	let versions;
 	const load = () => {
 		manifests ??= readManifests(rootDir);
-		versions ??= readWorkspaceVersions(rootDir);
+		versions ??= readWorkspaceVersions(rootDir, manifests);
 		return {
 			manifests,
 			versions
@@ -160,13 +157,8 @@ function makeWorkspaceResolver(rootDir) {
 * @internal
 */
 function findWorkspaceRoot(startDir) {
-	let dir = resolve(startDir);
-	for (;;) {
-		if (existsSync(join(dir, "pnpm-workspace.yaml"))) return dir;
-		const parent = dirname(dir);
-		if (parent === dir) return resolve(startDir);
-		dir = parent;
-	}
+	const file = findWorkspaceFile(resolve(startDir));
+	return file === null ? resolve(startDir) : dirname(file);
 }
 
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rolldown-pnpm-config",
-	"version": "0.8.1",
+	"version": "1.0.0",
 	"private": false,
 	"description": "A dogfooding example of our plugin",
 	"repository": {
@@ -45,8 +45,7 @@
 		"ink-tab": "^5.2.0",
 		"oxc-parser": "^0.150.0",
 		"react": "^19.3.0",
-		"std-env": "^4.2.0",
-		"std-osc8": "^0.2.0"
+		"std-env": "^4.2.0"
 	},
 	"peerDependencies": {
 		"rolldown": "^1.2.0"

package/patches/build.js

@@ -1,9 +1,10 @@
 import { discoverPatches } from "./discover.js";
+import { Predicate } from "effect";
 
 //#region src/patches/build.ts
 /** True only for the `{ strategy: "rewrite" }` directive. @internal */
 function isRewriteDirective(v) {
-	return v !== null && typeof v === "object" && !Array.isArray(v) && Object.keys(v).length === 1 && v.strategy === "rewrite";
+	return Predicate.isObject(v) && Object.keys(v).length === 1 && v.strategy === "rewrite";
 }
 /** Read `local.localPatchesDir` when it is a string. @internal */
 function readLocalPatchesDir(config) {
@@ -11,22 +12,35 @@ function readLocalPatchesDir(config) {
 	return typeof local?.localPatchesDir === "string" ? local.localPatchesDir : void 0;
 }
 /**
-* Resolve build-time `patchedDependencies`. When the field is absent or the
-* `{ strategy: "rewrite" }` directive, run discovery and inject the distributed
-* map (`name`-scoped `.pnpm-config` paths) so `freeze` sees a plain map. An
-* explicit map / wrapped value passes through untouched.
+* Discover this plugin's own patches when `patchedDependencies` is absent or
+* the `{ strategy: "rewrite" }` directive; undefined when an explicit map /
+* wrapped value is declared (the escape hatch skips discovery entirely).
 *
 * @internal
 */
-function withResolvedBuildPatches(config, baseDir) {
+function discoverOwnedPatches(config, baseDir) {
 	const raw = config.patchedDependencies;
-	if (raw !== void 0 && !isRewriteDirective(raw)) return config;
+	if (raw !== void 0 && !isRewriteDirective(raw)) return void 0;
 	const localPatchesDir = readLocalPatchesDir(config);
-	const distributed = discoverPatches({
+	return discoverPatches({
 		baseDir,
 		name: config.name,
 		...localPatchesDir !== void 0 ? { localPatchesDir } : {}
-	}).filter((p) => p.distributed);
+	});
+}
+/**
+* Resolve build-time `patchedDependencies`. When the field is absent or the
+* `{ strategy: "rewrite" }` directive, run discovery and inject the distributed
+* map (`name`-scoped `.pnpm-config` paths) so `freeze` sees a plain map. An
+* explicit map / wrapped value passes through untouched. A caller that has
+* already run discovery passes its result as `owned`.
+*
+* @internal
+*/
+function withResolvedBuildPatches(config, baseDir, owned = discoverOwnedPatches(config, baseDir)) {
+	const raw = config.patchedDependencies;
+	if (owned === void 0) return config;
+	const distributed = owned.filter((p) => p.distributed);
 	if (distributed.length === 0) {
 		if (raw === void 0) return config;
 		const { patchedDependencies: _drop, ...rest } = config;
@@ -41,4 +55,4 @@ function withResolvedBuildPatches(config, baseDir) {
 }
 
 //#endregion
-export { isRewriteDirective, readLocalPatchesDir, withResolvedBuildPatches };
+export { discoverOwnedPatches, isRewriteDirective, readLocalPatchesDir, withResolvedBuildPatches };

package/plugin/allowed-versions.js

@@ -1,10 +1,10 @@
+import { bareVersion } from "../semver-util.js";
+
 //#region src/plugin/allowed-versions.ts
 /** An exact version: no range operator, no wildcard — `X.Y.Z` with an optional prerelease. */
 const EXACT_VERSION = /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/;
 /** The install range of a catalog spec (bare string or `{ range }` object). */
 const rangeOf = (spec) => typeof spec === "string" ? spec : spec.range;
-/** Strip a leading range operator to the bare version digits (e.g. `^3.17.0` → `3.17.0`). */
-const bareVersion = (range) => range.replace(/^[\^~>=<\s]+/, "").split(/\s/)[0] ?? range;
 /** Apply the `prefix` transform to a peer value: verbatim, re-prefixed, or stripped to exact. */
 function applyPrefix(peerValue, prefix) {
 	if (prefix === void 0) return peerValue;