rolldown-pnpm-config 2.2.0 → 2.3.0

package/cli/commands/export.js

@@ -1,10 +1,9 @@
-import { discoverOwnedPatches, withResolvedBuildPatches } from "../../patches/build.js";
 import { DESCRIPTORS } from "../../descriptors/index.js";
+import { discoverOwnedPatches, withResolvedBuildPatches } from "../../patches/build.js";
+import { reconcilePatches } from "../../patches/reconcile.js";
 import { freeze } from "../../plugin/freeze.js";
 import { resolveRootName } from "../../runtime/ctx.js";
-import { canonicalize, renderWorkspace } from "../workspace-file.js";
 import { WorkingDirectory, resolveWorkspacePath } from "../cwd.js";
-import { reconcilePatches } from "../../patches/reconcile.js";
 import { buildDiff } from "../diff/build.js";
 import { renderExportDiff } from "../diff/render.js";
 import { effectiveManaged } from "../effective.js";
@@ -13,11 +12,12 @@ import { legend } from "../render/legend.js";
 import { printView } from "../render/print.js";
 import { failureDoc } from "../render/report.js";
 import { findConfigFiles, pickConfigCandidate } from "../select-file.js";
+import { canonicalize, renderWorkspace } from "../workspace-file.js";
 import { overlayWorkspace } from "../workspace-overlay.js";
-import { Data, Effect, Option, Predicate } from "effect";
+import { Data, Effect, FileSystem, Option, Predicate } from "effect";
 import { dirname, relative } from "node:path";
 import { CliDoc, CliMessage } from "@effected/cli";
-import { existsSync, writeFileSync } from "node:fs";
+import { existsSync } from "node:fs";
 import { Argument, Command, Flag } from "effect/cli";
 
 // src/cli/commands/export.ts
@@ -90,10 +90,7 @@ function runExport(opts) {
 			diff,
 			report
 		};
-		yield* Effect.try({
-			try: () => writeFileSync(path, rendered, "utf8"),
-			catch: () => new ExportError({ message: `Cannot write ${path}` })
-		});
+		yield* (yield* FileSystem.FileSystem).writeFileString(path, rendered).pipe(Effect.mapError(() => new ExportError({ message: `Cannot write ${path}` })));
 		return {
 			path,
 			rendered,

package/cli/commands/preview.js

@@ -2,13 +2,13 @@ import { freeze } from "../../plugin/freeze.js";
 import { resolveRootName } from "../../runtime/ctx.js";
 import { WorkingDirectory, resolveWorkspacePath } from "../cwd.js";
 import { loadConfigAndWorkspace } from "../load-config.js";
+import { buildPreviewViews } from "../preview-views.js";
 import { legend } from "../render/legend.js";
 import { printView } from "../render/print.js";
 import { failureDoc } from "../render/report.js";
 import { findConfigFiles, pickConfigCandidate } from "../select-file.js";
-import { WORKSPACE_FIELDS } from "./export.js";
-import { buildPreviewViews } from "../preview-views.js";
 import { previewScreen } from "../ui/screens.js";
+import { WORKSPACE_FIELDS } from "./export.js";
 import { Data, Effect, Option } from "effect";
 import { dirname } from "node:path";
 import { CliDoc, CliInteractive } from "@effected/cli";

package/cli/commands/upgrade.js

@@ -1,27 +1,26 @@
 import { bareVersion } from "../../semver-util.js";
 import { WorkingDirectory } from "../cwd.js";
-import { RegistryResolver } from "../resolve.js";
-import { evaluatePluginConfig } from "../evaluate.js";
-import { failureDoc, warningDoc } from "../render/report.js";
 import { discoverCatalogEntries } from "../discover.js";
-import { filterEntriesByCatalog, findConfigFiles, pickConfigCandidate } from "../select-file.js";
-import { walkScreen, withProgress } from "../ui/screens.js";
-import { versionKeyOf } from "../version-key.js";
 import { buildEdits, entryEdits } from "../edits.js";
+import { evaluatePluginConfig } from "../evaluate.js";
 import { buildInteropEdits, interopEntryChanged, makePeerFetcher, runInterop } from "../interop.js";
 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 { failureDoc, warningDoc } from "../render/report.js";
+import { RegistryResolver } from "../resolve.js";
 import { applyEdits } from "../rewrite.js";
+import { filterEntriesByCatalog, findConfigFiles, pickConfigCandidate } from "../select-file.js";
 import { summaryDoc } from "../summary.js";
+import { walkScreen, withProgress } from "../ui/screens.js";
 import { validateEdits } from "../validate.js";
+import { versionKeyOf } from "../version-key.js";
 import { buildWalkItems } from "../walk-plan.js";
 import { findWorkspaceRoot, makeWorkspaceResolver } from "../workspace-resolve.js";
-import { Clock, Data, Effect, Option, Result } from "effect";
+import { Clock, Data, Effect, FileSystem, Option, Result } from "effect";
 import { dirname } from "node:path";
 import { CliDoc, CliExit, CliFormat, CliInteractive, CliMessage, Doc, Fmt } from "@effected/cli";
-import { readFileSync, writeFileSync } from "node:fs";
 import { Argument, Command, Flag } from "effect/cli";
 import { CliUi } from "@effected/cli/ui";
 import { ReleaseAgeGate } from "@effected/npm";
@@ -71,13 +70,14 @@ var CheckFailedError = class extends Data.TaggedError("CheckFailedError") {
 		return failureDoc(`${CHECK_FAILED_LABEL}\n${indent(this.message)}`);
 	}
 };
+/** Write the rewritten config source back to `file`. */
+function writeSource(file, next) {
+	return Effect.flatMap(FileSystem.FileSystem, (fs) => fs.writeFileString(file, next).pipe(Effect.mapError(() => new UpgradeError({ message: `Cannot write ${file}` }))));
+}
 /** 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 source = yield* (yield* FileSystem.FileSystem).readFileString(file).pipe(Effect.mapError(() => new UpgradeError({ message: `Cannot read ${file}` })));
 		const { entries, skipped } = yield* Effect.try({
 			try: () => discoverCatalogEntries(source, file),
 			catch: (e) => new UpgradeError({ message: Fmt.describe(e) })
@@ -165,16 +165,15 @@ function resolveGatedVersions(entries, resolver, gate, now, onProgress, workspac
 * @internal
 */
 function resolveProgress(report) {
-	const noun = (n) => `${n} package${n === 1 ? "" : "s"}`;
 	const finished = (total) => report({
 		_tag: "Finished",
-		label: `Resolved ${noun(total)}`
+		label: `Resolved ${Fmt.plural(total, "package")}`
 	});
 	return (resolved, total) => {
 		if (resolved === 0) {
 			const begin = report({
 				_tag: "Phase",
-				label: `Resolving ${noun(total)}`,
+				label: `Resolving ${Fmt.plural(total, "package")}`,
 				total
 			});
 			return total === 0 ? Effect.andThen(begin, finished(total)) : begin;
@@ -283,10 +282,7 @@ function runUpgrade(opts) {
 		const allEdits = [...accepted, ...interopEdits];
 		if (allEdits.length > 0 && !opts.dryRun) {
 			const next = applyEdits(source, allEdits);
-			yield* Effect.try({
-				try: () => writeFileSync(opts.file, next, "utf8"),
-				catch: () => new UpgradeError({ message: `Cannot write ${opts.file}` })
-			});
+			yield* writeSource(opts.file, next);
 		}
 		return {
 			updated: changedSpans.size,
@@ -316,11 +312,7 @@ function applyInteropAndDecisions(file, source, nonInteropEdits, interopEdits) {
 	return Effect.gen(function* () {
 		const edits = [...nonInteropEdits, ...interopEdits];
 		if (edits.length === 0) return;
-		const next = applyEdits(source, edits);
-		yield* Effect.try({
-			try: () => writeFileSync(file, next, "utf8"),
-			catch: () => new UpgradeError({ message: `Cannot write ${file}` })
-		});
+		yield* writeSource(file, applyEdits(source, edits));
 	});
 }
 /**

package/cli/diff/build.js

@@ -1,4 +1,4 @@
-import { Predicate } from "effect";
+import { Order, Predicate } from "effect";
 
 // src/cli/diff/build.ts
 const isObject = Predicate.isObject;
@@ -49,7 +49,7 @@ function diffArray(key, path, before, after, tag) {
 	const here = [...path, key];
 	const b = new Set(before.map(String));
 	const a = new Set(after.map(String));
-	const children = [.../* @__PURE__ */ new Set([...b, ...a])].sort((x, y) => x.localeCompare(y)).map((el) => {
+	const children = [.../* @__PURE__ */ new Set([...b, ...a])].sort(Order.String).map((el) => {
 		const inB = b.has(el);
 		const inA = a.has(el);
 		const kind = inB && inA ? "unchanged" : inA ? "added" : "removed";
@@ -73,7 +73,7 @@ function diffArray(key, path, before, after, tag) {
 function diffValue(key, path, before, after, tag) {
 	const here = [...path, key];
 	if (isObject(before) && isObject(after)) {
-		const children = [.../* @__PURE__ */ new Set([...Object.keys(before), ...Object.keys(after)])].sort((x, y) => x.localeCompare(y)).map((k) => {
+		const children = [.../* @__PURE__ */ new Set([...Object.keys(before), ...Object.keys(after)])].sort(Order.String).map((k) => {
 			if (!(k in before)) return uniform(k, here, after[k], "added");
 			if (!(k in after)) return uniform(k, here, before[k], "removed");
 			return diffValue(k, here, before[k], after[k]);
@@ -104,7 +104,7 @@ function diffValue(key, path, before, after, tag) {
 * @internal
 */
 function buildDiff(before, after, meta) {
-	const children = [.../* @__PURE__ */ new Set([...Object.keys(before), ...Object.keys(after)])].sort((x, y) => x.localeCompare(y)).map((k) => {
+	const children = [.../* @__PURE__ */ new Set([...Object.keys(before), ...Object.keys(after)])].sort(Order.String).map((k) => {
 		const tag = meta.localKeys.has(k) ? "local" : meta.managedKeys.has(k) ? void 0 : "unmanaged";
 		if (!(k in before)) return uniform(k, [], after[k], "added", tag);
 		if (!(k in after)) return uniform(k, [], before[k], "removed", tag);

package/cli/interop-live.js

@@ -1,5 +1,5 @@
 import { bareVersion, parseRange, parseVersion } from "../semver-util.js";
-import "./interop.js";
+import { lowestVersion } from "./interop.js";
 import { Effect } from "effect";
 
 // src/cli/interop-live.ts
@@ -28,19 +28,7 @@ function computeGroupPeers(model, selected) {
 	for (const m of model.members) {
 		const v = selected.get(m);
 		if (v === void 0) continue;
-		const declared = declaredFloors.get(m);
-		if (declared?.length) {
-			let minStr = declared[0];
-			let minSv = model.ver.get(minStr) ?? null;
-			for (const f of declared.slice(1)) {
-				const sv = model.ver.get(f) ?? null;
-				if (sv && (minSv === null || sv.compare(minSv) < 0)) {
-					minSv = sv;
-					minStr = f;
-				}
-			}
-			peer.set(m, `^${minStr}`);
-		} else peer.set(m, `^${v}`);
+		peer.set(m, `^${lowestVersion(declaredFloors.get(m) ?? []) ?? v}`);
 	}
 	const conflict = /* @__PURE__ */ new Map();
 	for (const m of model.members) {

package/cli/interop.js

@@ -50,7 +50,13 @@ function deriveFloors(resolved, fetchPeer) {
 		return out;
 	});
 }
-/** The lowest parseable version string in `list`, or null when none parses. */
+/**
+* The lowest parseable version string in `list`, or null when none parses.
+* Shared by the `--yes` resolver and the interactive table so both write the
+* same peer floor.
+*
+* @internal
+*/
 function lowestVersion(list) {
 	let best = null;
 	for (const f of list) {
@@ -223,4 +229,4 @@ function buildInteropEdits(entries, result) {
 	return edits;
 }
 
-export { buildInteropEdits, deriveFloors, interopEntryChanged, makePeerFetcher, resolveGroup, runInterop };
+export { buildInteropEdits, deriveFloors, interopEntryChanged, lowestVersion, makePeerFetcher, resolveGroup, runInterop };

package/cli/load-config.js

@@ -1,8 +1,7 @@
-import { parseWorkspace } from "./workspace-file.js";
 import { evaluatePluginConfig } from "./evaluate.js";
-import { Effect, Predicate } from "effect";
+import { parseWorkspace } from "./workspace-file.js";
+import { Effect, FileSystem, Predicate } from "effect";
 import { Fmt } from "@effected/cli";
-import { existsSync, readFileSync } from "node:fs";
 
 // src/cli/load-config.ts
 /**
@@ -11,22 +10,26 @@ import { existsSync, readFileSync } from "node:fs";
 * parse the workspace file when present. `mkError` wraps each failure
 * message in the command's own error type.
 *
+* IO goes through the platform `FileSystem`. Only a workspace file that is
+* NOT FOUND reads as absent (`fs.exists` maps `NotFound` to `false`); an
+* existence check that fails for any other reason (EACCES, ENOTDIR, EIO) is a
+* `Cannot read or parse` failure, never a silent "create it fresh".
+*
 * @internal
 */
 function loadConfigAndWorkspace(opts, mkError) {
 	return Effect.gen(function* () {
-		const configSource = yield* Effect.try({
-			try: () => readFileSync(opts.configFile, "utf8"),
-			catch: () => mkError(`Cannot read ${opts.configFile}`)
-		});
+		const fs = yield* FileSystem.FileSystem;
+		const configSource = yield* fs.readFileString(opts.configFile).pipe(Effect.mapError(() => mkError(`Cannot read ${opts.configFile}`)));
 		const { config, errors } = evaluatePluginConfig(configSource, opts.configFile);
 		if (config === null) return yield* Effect.fail(mkError(`No PnpmConfigPlugin call found in ${opts.configFile}`));
 		if (errors.length > 0) return yield* Effect.fail(mkError(`Non-literal config values: ${errors.join("; ")}`));
 		const path = opts.workspacePath;
-		const parsed = existsSync(path) ? yield* Effect.try({
-			try: () => parseWorkspace(readFileSync(path, "utf8")),
-			catch: (e) => mkError(`Cannot read or parse ${path}: ${Fmt.causeMessage(e) ?? Fmt.describe(e)}`)
-		}) : {};
+		const cannotRead = (e) => mkError(`Cannot read or parse ${path}: ${Fmt.errorText(e)}`);
+		const parsed = (yield* fs.exists(path).pipe(Effect.mapError(cannotRead))) ? yield* fs.readFileString(path).pipe(Effect.mapError(cannotRead), Effect.flatMap((text) => Effect.try({
+			try: () => parseWorkspace(text),
+			catch: cannotRead
+		}))) : {};
 		return {
 			config,
 			localCfg: Predicate.isObject(config.local) ? config.local : void 0,

package/cli/local-merge.js

@@ -1,4 +1,4 @@
-import { Predicate } from "effect";
+import { Array as Array$1, Predicate } from "effect";
 
 // src/cli/local-merge.ts
 /** Default protocols whose existing-file override entries are preserved. @internal */
@@ -30,9 +30,7 @@ function combine(managed, value, strategy) {
 	if (Array.isArray(managed) || Array.isArray(value)) {
 		const m = Array.isArray(managed) ? managed : [];
 		const v = Array.isArray(value) ? value : [];
-		if (strategy === "union") return [.../* @__PURE__ */ new Set([...m, ...v])];
-		const drop = new Set(v.map((x) => JSON.stringify(x)));
-		return m.filter((x) => !drop.has(JSON.stringify(x)));
+		return strategy === "union" ? Array$1.dedupe(Array$1.appendAll(m, v)) : Array$1.difference(m, v);
 	}
 	const m = Predicate.isObject(managed) ? managed : {};
 	const v = Predicate.isObject(value) ? value : {};

package/cli/preview-views.js

@@ -1,10 +1,10 @@
-import { canonicalize } from "./workspace-file.js";
+import { WORKSPACE_FIELDS } from "./commands/export.js";
 import { buildDiff } from "./diff/build.js";
 import { renderExportDiff } from "./diff/render.js";
 import { effectiveManaged, vanillaManaged } from "./effective.js";
-import { overlayWorkspace } from "./workspace-overlay.js";
-import { WORKSPACE_FIELDS } from "./commands/export.js";
 import { renderSimulated } from "./simulated-view.js";
+import { canonicalize } from "./workspace-file.js";
+import { overlayWorkspace } from "./workspace-overlay.js";
 
 // src/cli/preview-views.ts
 /**

package/cli/resolve.js

@@ -86,7 +86,7 @@ const RegistryResolverLive = Layer.effect(RegistryResolver, Effect.gen(function*
 		"--json"
 	])).pipe(Effect.map(stripPnpmNotices), Effect.mapError((e) => new ResolveError({
 		pkg,
-		message: Fmt.causeMessage(e) ?? Fmt.describe(e)
+		message: Fmt.errorText(e)
 	})));
 	return {
 		versions: (pkg) => pnpmView(pkg, pkg, "versions").pipe(Effect.flatMap((out) => parseVersions(pkg, out))),

package/cli/select-file.js

@@ -1,10 +1,9 @@
 import { discoverCatalogEntries } from "./discover.js";
-import { Effect, Result } from "effect";
+import { Effect, FileSystem, Result } from "effect";
 import { join } from "node:path";
 import { GlobPattern, GlobPatternOptions } from "@effected/glob";
 import { descendSync } from "@effected/walker";
 import { nodeWalkerSyncOps } from "@effected/walker/node-sync";
-import { readFileSync } from "node:fs";
 
 // src/cli/select-file.ts
 /** Top-level `.ts` FILES of a directory, no dotfiles, sorted. */
@@ -20,7 +19,8 @@ const TS_FILES = Result.getOrThrow(GlobPattern.compileResult("*.ts", GlobPattern
 * @internal
 */
 function findConfigFiles(dir) {
-	return Effect.sync(() => {
+	return Effect.gen(function* () {
+		const fs = yield* FileSystem.FileSystem;
 		const names = Result.getOrElse(descendSync(TS_FILES, {
 			cwd: dir,
 			...nodeWalkerSyncOps
@@ -29,11 +29,7 @@ function findConfigFiles(dir) {
 		for (const name of names) {
 			if (name.endsWith(".d.ts")) continue;
 			const path = join(dir, name);
-			try {
-				const source = readFileSync(path, "utf8");
-				const { entries } = discoverCatalogEntries(source, path);
-				if (entries.length > 0) matches.push(path);
-			} catch {}
+			if (yield* fs.readFileString(path).pipe(Effect.flatMap((source) => Effect.try(() => discoverCatalogEntries(source, path).entries.length > 0)), Effect.orElseSucceed(() => false))) matches.push(path);
 		}
 		return matches;
 	});

package/cli/simulated-view.js

@@ -1,6 +1,7 @@
-import { canonicalize } from "./workspace-file.js";
-import { row, tone } from "./render/tone.js";
 import { scalarText } from "./diff/render.js";
+import { row, tone } from "./render/tone.js";
+import { canonicalize } from "./workspace-file.js";
+import { Predicate } from "effect";
 import { Doc } from "@effected/cli";
 
 // src/cli/simulated-view.ts
@@ -42,7 +43,7 @@ function annotation(entry) {
 /** Flatten one key/value into YAML-shaped plain lines; `ann` annotates the head. */
 function flatten(key, value, depth, ann) {
 	if (Array.isArray(value)) return [row(" ", depth, [tone(`${key}:`, "plain"), ...ann]), ...value.map((el) => row(" ", depth + 1, [tone(`- ${scalarText(el)}`, "plain")]))];
-	if (value !== null && typeof value === "object") return [row(" ", depth, [tone(`${key}:`, "plain"), ...ann]), ...Object.entries(value).flatMap(([k, v]) => flatten(k, v, depth + 1, []))];
+	if (Predicate.isObject(value)) return [row(" ", depth, [tone(`${key}:`, "plain"), ...ann]), ...Object.entries(value).flatMap(([k, v]) => flatten(k, v, depth + 1, []))];
 	return [row(" ", depth, [tone(`${key}: ${scalarText(value)}`, "plain"), ...ann])];
 }
 /**

package/cli/ui/walk-screen.js

@@ -1,5 +1,5 @@
-import { TONES } from "../render/tone.js";
 import { computeGroupPeers } from "../interop-live.js";
+import { TONES } from "../render/tone.js";
 import { cellTone, displayCandidates, initTable, peerFor, tableDecisions, tableLayout, tableStep } from "../walk-reducer.js";
 import { Fmt } from "@effected/cli";
 import { KeyHelp, KeyTable, Styled, useKeys, useTerminalSize } from "@effected/cli/ui";

package/cli/version.js

@@ -6,6 +6,6 @@
 *
 * @internal
 */
-const CLI_VERSION = "2.2.0";
+const CLI_VERSION = "2.3.0";
 
 export { CLI_VERSION };

package/cli/walk-plan.js

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

package/cli/workspace-file.js

@@ -1,6 +1,6 @@
-import { Result } from "effect";
-import { dirname, join } from "node:path";
-import { existsSync } from "node:fs";
+import { Order, Predicate, Result } from "effect";
+import { locateWorkspaceRootSync } from "@effected/workspaces";
+import { nodeSyncOps } from "@effected/workspaces/node-sync";
 import { Yaml, YamlStringifyOptions } from "@effected/yaml";
 
 // src/cli/workspace-file.ts
@@ -23,31 +23,28 @@ function allPrimitive(arr) {
 function canonicalize(value) {
 	if (Array.isArray(value)) {
 		const mapped = value.map(canonicalize);
-		return allPrimitive(mapped) ? [...mapped].sort((a, b) => String(a).localeCompare(String(b))) : mapped;
+		return allPrimitive(mapped) ? [...mapped].sort((a, b) => Order.String(String(a), String(b))) : mapped;
 	}
-	if (value !== null && typeof value === "object") return Object.fromEntries(Object.entries(value).sort(([a], [b]) => a.localeCompare(b)).map(([k, v]) => [k, canonicalize(v)]));
+	if (Predicate.isObject(value)) return Object.fromEntries(Object.entries(value).sort(([a], [b]) => Order.String(a, b)).map(([k, v]) => [k, canonicalize(v)]));
 	return value;
 }
 /**
 * Walk up from `startDir` to the nearest directory containing a
-* pnpm-workspace.yaml; returns the file path or null.
+* pnpm-workspace.yaml; returns the file path or null. A `package.json`
+* `workspaces` field is not a marker here: this tool targets pnpm only.
 *
 * @internal
 */
 function findWorkspaceFile(startDir) {
-	let dir = startDir;
-	for (;;) {
-		const candidate = join(dir, FILENAME);
-		if (existsSync(candidate)) return candidate;
-		const parent = dirname(dir);
-		if (parent === dir) return null;
-		dir = parent;
-	}
+	return locateWorkspaceRootSync(startDir, {
+		...nodeSyncOps,
+		markers: [FILENAME]
+	})?.path ?? null;
 }
 /** Parse pnpm-workspace.yaml source; empty/whitespace yields an empty object. @internal */
 function parseWorkspace(source) {
 	const parsed = Result.getOrThrow(Yaml.parseResult(source));
-	return parsed && typeof parsed === "object" ? parsed : {};
+	return Predicate.isObject(parsed) ? parsed : {};
 }
 /** Render a workspace object: deterministic key sort + yaml.stringify. @internal */
 function renderWorkspace(obj) {

package/cli/workspace-resolve.js

@@ -1,13 +1,12 @@
 import { parseVersion } from "../semver-util.js";
-import { findWorkspaceFile } from "./workspace-file.js";
 import { ResolveError } from "./resolve.js";
 import { Effect, Layer, Result } from "effect";
-import { dirname, join, resolve } from "node:path";
+import { join, resolve } from "node:path";
 import { GlobPattern, GlobPatternOptions } from "@effected/glob";
 import { descendSync } from "@effected/walker";
 import { nodeWalkerSyncOps } from "@effected/walker/node-sync";
 import { readFileSync } from "node:fs";
-import { getWorkspacePackagesSync } from "@effected/workspaces";
+import { findWorkspaceRootSync, getWorkspacePackagesSync } from "@effected/workspaces";
 import { nodeSyncOps } from "@effected/workspaces/node-sync";
 
 // src/cli/workspace-resolve.ts
@@ -159,8 +158,10 @@ function makeWorkspaceResolver(rootDir) {
 * @internal
 */
 function findWorkspaceRoot(startDir) {
-	const file = findWorkspaceFile(resolve(startDir));
-	return file === null ? resolve(startDir) : dirname(file);
+	return findWorkspaceRootSync(startDir, {
+		...nodeSyncOps,
+		markers: ["pnpm-workspace.yaml"]
+	}) ?? resolve(startDir);
 }
 
 export { findWorkspaceRoot, makeWorkspaceResolver, readManifests, readWorkspaceVersions };

package/index.d.ts

@@ -83,12 +83,28 @@ interface AllowedVersionsFromCatalogs {
  * authored by hand wins over a derived one on the same selector, and the
  * consumer's own `overrides` still win over the plugin's at install time.
  *
+ * `include` and `exclude` select which members are pinned, so one catalog can
+ * hold both a release family that is pinned graph-wide and packages that are
+ * not. Each entry is an exact package name or a glob pattern (`@effect/*`),
+ * matched with `effect/Glob` against the whole name; `*` stays within the
+ * scope or the bare name. A member matched by both lists is excluded. Every
+ * entry must match at least one member, and an empty `include` is rejected,
+ * so a typo throws instead of silently widening or narrowing the pin set.
+ *
  * @public
  */
 interface OverridesFromCatalogs {
   /** The catalog whose members are pinned. */
   readonly catalog: string;
-  /** Members left out, e.g. a tool that rides the catalog but is not part of the release family. */
+  /**
+   * Members to pin, as exact names or glob patterns (`effect`, `@effect/*`);
+   * the rest are skipped. Omitted, every member is a candidate.
+   */
+  readonly include?: readonly string[];
+  /**
+   * Members left out, as exact names or glob patterns, e.g. a tool that rides
+   * the catalog but is not part of the release family. Wins over `include`.
+   */
   readonly exclude?: readonly string[];
   /**
    * How each selector is scoped. `"line"` (the default) qualifies the package

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rolldown-pnpm-config",
-	"version": "2.2.0",
+	"version": "2.3.0",
 	"private": false,
 	"description": "A dogfooding example of our plugin",
 	"repository": {
@@ -35,16 +35,16 @@
 		"rolldown-pnpm-config": "bin/rolldown-pnpm-config.js"
 	},
 	"dependencies": {
-		"@effect/platform-node": "^4.0.6",
-		"@effected/cli": "^0.23.0",
-		"@effected/env": "^0.6.0",
-		"@effected/glob": "^0.15.0",
-		"@effected/npm": "^0.27.1",
-		"@effected/semver": "^0.18.0",
-		"@effected/walker": "^0.21.0",
-		"@effected/workspaces": "^0.39.1",
-		"@effected/yaml": "^0.25.1",
-		"effect": "^4.0.6",
+		"@effect/platform-node": "~4.1.1",
+		"@effected/cli": "^0.25.0",
+		"@effected/env": "^0.9.0",
+		"@effected/glob": "^0.17.0",
+		"@effected/npm": "^0.29.0",
+		"@effected/semver": "^0.20.0",
+		"@effected/walker": "^0.24.0",
+		"@effected/workspaces": "^0.41.0",
+		"@effected/yaml": "^0.27.0",
+		"effect": "~4.1.1",
 		"ink": "^8.0.0",
 		"oxc-parser": "^0.156.0",
 		"react": "^19.3.1"

package/plugin/allowed-versions.js

@@ -1,5 +1,6 @@
 import { rangeOf } from "../catalogs.js";
 import { bareVersion } from "../semver-util.js";
+import { Predicate } from "effect";
 
 // src/plugin/allowed-versions.ts
 /** An exact version: no range operator, no wildcard — `X.Y.Z` with an optional prerelease. */
@@ -43,7 +44,7 @@ function deriveAllowedVersions(catalogs, directives) {
 * @internal
 */
 function resolvePeerDependencyRules(value, catalogs) {
-	if (value === null || typeof value !== "object" || !("allowedVersionsFromCatalogs" in value)) return value;
+	if (!Predicate.isObject(value) || !("allowedVersionsFromCatalogs" in value)) return value;
 	const { allowedVersionsFromCatalogs, ...rest } = value;
 	const merged = {
 		...deriveAllowedVersions(catalogs, allowedVersionsFromCatalogs),

package/plugin/freeze.js

@@ -3,7 +3,7 @@ import { DESCRIPTORS, deriveSchemas } from "../descriptors/index.js";
 import { FIELD_REGISTRY } from "../registry.js";
 import { resolvePeerDependencyRules } from "./allowed-versions.js";
 import { resolveOverrides } from "./overrides-from-catalogs.js";
-import { Data, Effect, Schema } from "effect";
+import { Data, Effect, Predicate, Schema } from "effect";
 import { Fmt } from "@effected/cli";
 
 // src/plugin/freeze.ts
@@ -33,7 +33,7 @@ const WRAPPED_KEYS = /* @__PURE__ */ new Set([
 * @internal
 */
 function isWrappedField(input) {
-	if (input === null || typeof input !== "object") return false;
+	if (!Predicate.isObject(input)) return false;
 	const keys = Object.keys(input);
 	return keys.includes("value") && keys.every((k) => WRAPPED_KEYS.has(k));
 }

package/plugin/overrides-from-catalogs.js

@@ -1,5 +1,6 @@
 import { rangeOf } from "../catalogs.js";
 import { bareVersion } from "../semver-util.js";
+import { Glob, Predicate } from "effect";
 
 // src/plugin/overrides-from-catalogs.ts
 /** A plain release version: `X.Y.Z`, no prerelease, no build metadata. */
@@ -16,15 +17,29 @@ function releaseLine(major, minor) {
 	if (major !== "0") return `^${major}.0.0`;
 	return minor === "0" ? "~0.0.0" : `^0.${minor}.0`;
 }
-/** Derive the overrides for one directive. Pure; throws when the catalog or an excluded member is absent. */
-function deriveOne(catalogs, { catalog, exclude = [], scope = "line" }) {
+/**
+* Compile a filter list into a member predicate, throwing when an entry
+* matches no member (an exact name or a pattern alike).
+*/
+function compileFilter(entries, members, label, catalog) {
+	const globs = entries.map((entry) => {
+		const glob = Glob.make(entry);
+		if (!members.some((name) => Glob.match(glob, name))) throw new Error(`overridesFromCatalogs: ${label} member "${entry}" is not in catalog "${catalog}"`);
+		return glob;
+	});
+	return (name) => globs.some((glob) => Glob.match(glob, name));
+}
+/** Derive the overrides for one directive. Pure; throws when the catalog is absent or a filter entry matches nothing. */
+function deriveOne(catalogs, { catalog, include, exclude = [], scope = "line" }) {
 	const decl = catalogs[catalog];
 	if (decl === void 0) throw new Error(`overridesFromCatalogs: catalog "${catalog}" is not declared`);
-	for (const name of exclude) if (!(name in decl.packages)) throw new Error(`overridesFromCatalogs: excluded member "${name}" is not in catalog "${catalog}"`);
-	const excluded = new Set(exclude);
+	if (include?.length === 0) throw new Error(`overridesFromCatalogs: include for catalog "${catalog}" is empty, which would pin nothing`);
+	const members = Object.keys(decl.packages);
+	const isIncluded = include === void 0 ? () => true : compileFilter(include, members, "included", catalog);
+	const isExcluded = compileFilter(exclude, members, "excluded", catalog);
 	const table = {};
 	for (const [name, spec] of Object.entries(decl.packages)) {
-		if (excluded.has(name)) continue;
+		if (!isIncluded(name) || isExcluded(name)) continue;
 		const range = rangeOf(spec);
 		if (!SIMPLE_RANGE.test(range) || /\s/.test(range.trim())) continue;
 		const version = bareVersion(range);
@@ -58,7 +73,7 @@ function deriveOverrides(catalogs, directives) {
 function resolveOverrides(authored, directives, catalogs) {
 	if (directives === void 0) return authored;
 	const derived = deriveOverrides(catalogs, directives);
-	const manual = authored !== null && typeof authored === "object" ? authored : {};
+	const manual = Predicate.isObject(authored) ? authored : {};
 	return {
 		...derived,
 		...manual

package/plugin/serialize.js

@@ -1,8 +1,10 @@
+import { Order, Predicate } from "effect";
+
 // src/plugin/serialize.ts
 /** Recursively sort object keys for deterministic output; arrays keep order. */
 function sortKeys(value) {
 	if (Array.isArray(value)) return value.map(sortKeys);
-	if (value !== null && typeof value === "object") return Object.fromEntries(Object.entries(value).sort(([a], [b]) => a.localeCompare(b)).map(([k, v]) => [k, sortKeys(v)]));
+	if (Predicate.isObject(value)) return Object.fromEntries(Object.entries(value).sort(([a], [b]) => Order.String(a, b)).map(([k, v]) => [k, sortKeys(v)]));
 	return value;
 }
 /** Source for the `catalogs` virtual module: a sorted Map literal (plain-JS branch). */

package/runtime/strategies/arrays.js

@@ -1,9 +1,11 @@
 // src/runtime/strategies/arrays.ts
+/** Code-unit order: locale-independent, so the render is the same on every machine. */
+const byCodeUnit = (a, b) => a < b ? -1 : a > b ? 1 : 0;
 /** Union `managed` with `local` (when present), deduped and sorted for a stable render. @internal */
 function unionSort(managed, local) {
 	const set = new Set(managed);
 	for (const item of local ?? []) set.add(item);
-	return [...set].sort((a, b) => a.localeCompare(b));
+	return [...set].sort(byCodeUnit);
 }
 /**
 * Union + sort string arrays; child entries are added to the managed set. Quiet.
@@ -24,7 +26,7 @@ const arrayRecordUnion = (base, local) => {
 	const child = local ?? {};
 	const keys = /* @__PURE__ */ new Set([...Object.keys(managed), ...Object.keys(child)]);
 	const result = {};
-	for (const key of [...keys].sort((a, b) => a.localeCompare(b))) {
+	for (const key of [...keys].sort(byCodeUnit)) {
 		const merged = unionSort(managed[key] ?? [], child[key]);
 		if (merged.length > 0) result[key] = merged;
 	}

package/runtime/strategies/table.js

@@ -1,7 +1,7 @@
 import { arrayRecordUnion, arrayUnion } from "./arrays.js";
-import { overrides, peerDependencyRules } from "./overrides.js";
 import { catalogs } from "./catalogs.js";
 import { allowBuilds, mapChildWins } from "./maps.js";
+import { overrides, peerDependencyRules } from "./overrides.js";
 import { scalar, securityFlag, securityMin } from "./scalar.js";
 
 // src/runtime/strategies/table.ts

package/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.59.4"
+      "packageVersion": "7.60.0"
     }
   ]
 }