rolldown-pnpm-config 2.2.1 → 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,6 +12,7 @@ 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, FileSystem, Option, Predicate } from "effect";
 import { dirname, relative } from "node:path";

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,21 +1,21 @@
 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, FileSystem, Option, Result } from "effect";

package/cli/load-config.js

@@ -1,5 +1,5 @@
-import { parseWorkspace } from "./workspace-file.js";
 import { evaluatePluginConfig } from "./evaluate.js";
+import { parseWorkspace } from "./workspace-file.js";
 import { Effect, FileSystem, Predicate } from "effect";
 import { Fmt } from "@effected/cli";
 

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/simulated-view.js

@@ -1,6 +1,6 @@
-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";
 

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.1";
+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/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.1",
+	"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.7",
-		"@effected/cli": "^0.24.0",
-		"@effected/env": "^0.7.0",
-		"@effected/glob": "^0.16.0",
-		"@effected/npm": "^0.28.0",
-		"@effected/semver": "^0.19.0",
-		"@effected/walker": "^0.22.0",
-		"@effected/workspaces": "^0.40.0",
-		"@effected/yaml": "^0.26.0",
-		"effect": "^4.0.7",
+		"@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/overrides-from-catalogs.js

@@ -1,6 +1,6 @@
 import { rangeOf } from "../catalogs.js";
 import { bareVersion } from "../semver-util.js";
-import { Predicate } from "effect";
+import { Glob, Predicate } from "effect";
 
 // src/plugin/overrides-from-catalogs.ts
 /** A plain release version: `X.Y.Z`, no prerelease, no build metadata. */
@@ -17,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);

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