@savvy-web/silk 1.3.7 → 1.3.9

package/packages/silk-effects/dist/dev/pkg/changesets/services/deps-regen.cjs

@@ -1,13 +1,21 @@
+const require_ChangesetConfigReader = require('../../services/ChangesetConfigReader.cjs');
+const require_ChangesetConfig = require('../../services/ChangesetConfig.cjs');
+const require_WorkspaceDiscovery = require('../../../../../../../node_modules/.pnpm/workspaces-effect@2.0.1_@effect_platform@0.96.2_effect@3.21.4__effect@3.21.4/node_modules/workspaces-effect/services/WorkspaceDiscovery.cjs');
+const require_PointInTimeWorkspace = require('../../../../../../../node_modules/.pnpm/workspaces-effect@2.0.1_@effect_platform@0.96.2_effect@3.21.4__effect@3.21.4/node_modules/workspaces-effect/services/PointInTimeWorkspace.cjs');
+const require_PointInTimeWorkspaceLive = require('../../../../../../../node_modules/.pnpm/workspaces-effect@2.0.1_@effect_platform@0.96.2_effect@3.21.4__effect@3.21.4/node_modules/workspaces-effect/layers/PointInTimeWorkspaceLive.cjs');
+const require_PublishabilityDetector = require('../../../../../../../node_modules/.pnpm/workspaces-effect@2.0.1_@effect_platform@0.96.2_effect@3.21.4__effect@3.21.4/node_modules/workspaces-effect/services/PublishabilityDetector.cjs');
+const require_WorkspaceDiscoveryLive = require('../../../../../../../node_modules/.pnpm/workspaces-effect@2.0.1_@effect_platform@0.96.2_effect@3.21.4__effect@3.21.4/node_modules/workspaces-effect/layers/WorkspaceDiscoveryLive.cjs');
+const require_WorkspaceRootLive = require('../../../../../../../node_modules/.pnpm/workspaces-effect@2.0.1_@effect_platform@0.96.2_effect@3.21.4__effect@3.21.4/node_modules/workspaces-effect/layers/WorkspaceRootLive.cjs');
+const require_SilkPublishability = require('../../services/SilkPublishability.cjs');
+const require_errors = require('../errors.cjs');
 const require_dependency_table = require('../utils/dependency-table.cjs');
-const require_index = require('../../../../../../../node_modules/.pnpm/workspaces-effect@1.2.0_@effect_platform@0.96.2_effect@3.21.4__effect@3.21.4/node_modules/workspaces-effect/index.cjs');
 const require_config_inspector = require('./config-inspector.cjs');
 const require_dep_diff = require('../utils/dep-diff.cjs');
+const require_git = require('../utils/git.cjs');
 const require_publishability = require('../utils/publishability.cjs');
-const require_worktree_snapshot = require('../utils/worktree-snapshot.cjs');
-const require_workspace_snapshot = require('./workspace-snapshot.cjs');
 let effect = require("effect");
+let _effect_platform = require("@effect/platform");
 let node_path = require("node:path");
-let node_fs = require("node:fs");
 
 //#region ../silk-effects/dist/dev/pkg/changesets/services/deps-regen.js
 /**
@@ -17,9 +25,11 @@ let node_fs = require("node:fs");
 *
 * @remarks
 * `plan()` computes the cumulative dependency diff (merge-base → working
-* tree by default, or between two explicit refs), resolves `catalog:` /
-* `workspace:` specifiers to concrete versions, drops `devDependency`
-* rows (unless `includeDevDeps`), and returns a complete {@link RegenPlan}
+* tree by default, or between two explicit refs) by snapshotting both
+* sides through `PointInTimeWorkspace`, which resolves `catalog:` /
+* `workspace:` specifiers against each ref's own catalogs and package
+* versions before diffing. It drops `devDependency` rows (unless
+* `includeDevDeps`), and returns a complete {@link RegenPlan}
 * (target filenames + stale-changeset deletes) WITHOUT touching the
 * filesystem. `execute()` applies a plan — writing the fresh changesets
 * first, then deleting the stale pure-dependency ones (so an interrupted
@@ -32,41 +42,6 @@ let node_fs = require("node:fs");
 * @see {@link DepsRegenLive} for the production layer
 *
 */
-/** The em-dash sentinel (U+2014) used for added ("from") / removed ("to") cells. */
-const EM_DASH = "—";
-/** Whether a From/To cell holds a pnpm protocol specifier that could resolve to a version. */
-const isProtocol = (v) => /^(?:catalog|workspace|npm|jsr|file|link|portal):/.test(v);
-/**
-* Resolve protocol From/To cells to concrete versions (raw-string fallback
-* when unresolved or on resolver error), leave em-dash sentinels untouched,
-* then optionally drop `devDependency` rows, and re-sort.
-*
-* @param diff - One workspace package's dependency-table rows.
-* @param keepDevDeps - When `true`, retain `devDependency` rows; otherwise
-*   drop them unconditionally (the regen default).
-* @returns An Effect yielding the transformed {@link WorkspaceDependencyDiff}.
-*
-* @public
-*/
-const resolveDiffRows = (diff, keepDevDeps = false) => effect.Effect.gen(function* () {
-	const resolver = yield* require_index.CatalogResolver;
-	const resolveCell = (dep, value) => isProtocol(value) ? resolver.resolveSpecifier(dep, value).pipe(effect.Effect.map((opt) => effect.Option.getOrElse(opt, () => value)), effect.Effect.catchAll((error) => effect.Effect.logWarning(`DepsRegen: catalog resolution failed for "${dep}" (${value}); keeping raw specifier: ${String(error)}`).pipe(effect.Effect.as(value)))) : effect.Effect.succeed(value);
-	const rows = [];
-	for (const row of diff.rows) {
-		if (!keepDevDeps && row.type === "devDependency") continue;
-		const from = row.from === EM_DASH ? EM_DASH : yield* resolveCell(row.dependency, row.from);
-		const to = row.to === EM_DASH ? EM_DASH : yield* resolveCell(row.dependency, row.to);
-		rows.push({
-			...row,
-			from,
-			to
-		});
-	}
-	return {
-		...diff,
-		rows: require_dependency_table.sortDependencyRows(rows)
-	};
-});
 const ADJECTIVES = [
 	"brave",
 	"clever",
@@ -110,30 +85,35 @@ function pickRandomTriplet() {
 * Pick a `<adjective>-<noun>-<verb>` filename slug that does not collide
 * with an existing `.changeset/*.md` OR with a slug already claimed
 * earlier in the same {@link RegenPlan.toWrite} computation. `plan()`
-* never writes to disk, so `existsSync` alone cannot see slugs chosen
-* moments earlier in the same call — the `chosen` set closes that gap.
-* The triplet space is 1,000 combinations, so a busy repo can plausibly
-* exhaust it across runs; fall back to a timestamp suffix after 20
-* unlucky picks.
+* never writes to disk, so an on-disk existence check alone cannot see
+* slugs chosen moments earlier in the same call — the `chosen` set closes
+* that gap. The triplet space is 1,000 combinations, so a busy repo can
+* plausibly exhaust it across runs; fall back to a timestamp suffix after
+* 20 unlucky picks.
 *
-* @param changesetDir - Directory checked via `existsSync` for on-disk collisions.
+* @param fileExists - Effectful on-disk existence check (never fails; a
+*   filesystem error is treated as "does not exist" so filename selection
+*   degrades gracefully rather than blocking the plan).
+* @param changesetDir - Directory checked for on-disk collisions.
 * @param chosen - Basenames (without extension) already picked within this plan;
 *   the picked candidate is added to this set before returning.
 * @internal
 */
-function randomFilename(changesetDir, chosen) {
-	for (let i = 0; i < 20; i++) {
-		const candidate = pickRandomTriplet();
-		if (!chosen.has(candidate) && !(0, node_fs.existsSync)((0, node_path.join)(changesetDir, `${candidate}.md`))) {
-			chosen.add(candidate);
-			return candidate;
+function randomFilename(fileExists, changesetDir, chosen) {
+	return effect.Effect.gen(function* () {
+		for (let i = 0; i < 20; i++) {
+			const candidate = pickRandomTriplet();
+			if (!chosen.has(candidate) && !(yield* fileExists((0, node_path.join)(changesetDir, `${candidate}.md`)))) {
+				chosen.add(candidate);
+				return candidate;
+			}
 		}
-	}
-	let attempt = 0;
-	let fallback = `${pickRandomTriplet()}-${Date.now()}`;
-	while (chosen.has(fallback) || (0, node_fs.existsSync)((0, node_path.join)(changesetDir, `${fallback}.md`))) fallback = `${pickRandomTriplet()}-${Date.now()}-${++attempt}`;
-	chosen.add(fallback);
-	return fallback;
+		let attempt = 0;
+		let fallback = `${pickRandomTriplet()}-${Date.now()}`;
+		while (chosen.has(fallback) || (yield* fileExists((0, node_path.join)(changesetDir, `${fallback}.md`)))) fallback = `${pickRandomTriplet()}-${Date.now()}-${++attempt}`;
+		chosen.add(fallback);
+		return fallback;
+	});
 }
 /**
 * Strict detection of "pure dependency changesets" per the documented
@@ -184,43 +164,59 @@ function isPureDependencyChangeset(content) {
 		package: pkg
 	};
 }
-function listChangesetFiles(changesetDir) {
-	if (!(0, node_fs.existsSync)(changesetDir)) return [];
-	return (0, node_fs.readdirSync)(changesetDir).filter((f) => f.endsWith(".md") && f !== "README.md").map((f) => (0, node_path.join)(changesetDir, f));
-}
-function findPureDependencyChangesets(changesetDir) {
+/**
+* List `.changeset/*.md` files (excluding `README.md`) in `changesetDir`.
+* A missing directory is today's behavior for "no changesets yet" and
+* resolves to an empty list; any OTHER failure (e.g. a directory that
+* exists but cannot be read) is a loud {@link ChangesetIOError} — an
+* unreadable `.changeset` dir must not silently masquerade as "no
+* changesets".
+*/
+const listChangesetFiles = (fs, changesetDir) => fs.readDirectory(changesetDir).pipe(effect.Effect.map((names) => names.filter((f) => f.endsWith(".md") && f !== "README.md").map((f) => (0, node_path.join)(changesetDir, f))), effect.Effect.catchAll((e) => e._tag === "SystemError" && e.reason === "NotFound" ? effect.Effect.succeed([]) : effect.Effect.fail(new require_errors.ChangesetIOError({
+	path: changesetDir,
+	operation: "list",
+	reason: String(e)
+}))));
+/**
+* Pure-dependency changesets found in `changesetDir`. An individual file
+* that cannot be read (e.g. removed mid-scan, permission race) is skipped —
+* today's semantics — while a failure to list the directory itself
+* propagates as a loud {@link ChangesetIOError}.
+*/
+const findPureDependencyChangesets = (fs, changesetDir) => effect.Effect.gen(function* () {
+	const files = yield* listChangesetFiles(fs, changesetDir);
 	const result = [];
-	for (const file of listChangesetFiles(changesetDir)) {
-		let content;
-		try {
-			content = (0, node_fs.readFileSync)(file, "utf8");
-		} catch {
-			continue;
-		}
-		const detection = isPureDependencyChangeset(content);
+	for (const file of files) {
+		const content = yield* fs.readFileString(file).pipe(effect.Effect.option);
+		if (effect.Option.isNone(content)) continue;
+		const detection = isPureDependencyChangeset(content.value);
 		if (detection.isPure && detection.package) result.push({
 			file,
 			package: detection.package
 		});
 	}
 	return result;
-}
-function findMixedDependencyChangesets(changesetDir) {
+});
+/**
+* Mixed dependency changesets (have a `## Dependencies` heading but fail
+* the strict pure-changeset test) found in `changesetDir`. Same
+* skip-unreadable-file / loud-list-failure semantics as
+* {@link findPureDependencyChangesets}.
+*/
+const findMixedDependencyChangesets = (fs, changesetDir) => effect.Effect.gen(function* () {
+	const files = yield* listChangesetFiles(fs, changesetDir);
 	const result = [];
-	for (const file of listChangesetFiles(changesetDir)) {
-		let content;
-		try {
-			content = (0, node_fs.readFileSync)(file, "utf8");
-		} catch {
-			continue;
-		}
-		if (/^## Dependencies\b/m.test(content) && !isPureDependencyChangeset(content).isPure) result.push(file);
+	for (const file of files) {
+		const content = yield* fs.readFileString(file).pipe(effect.Effect.option);
+		if (effect.Option.isNone(content)) continue;
+		if (/^## Dependencies\b/m.test(content.value) && !isPureDependencyChangeset(content.value).isPure) result.push(file);
 	}
 	return result;
-}
+});
 /**
-* Render a single-package, patch-bump changeset for a diff whose rows have
-* already been resolved/filtered by {@link resolveDiffRows}.
+* Render a single-package, patch-bump changeset for a diff whose rows are
+* already resolved (per-side, inside {@link computeWorkspaceDependencyDiffs})
+* and devDep-filtered.
 */
 function renderChangesetContent(diff) {
 	return `${`---\n"${diff.package}": patch\n---`}\n\n## Dependencies\n\n${require_dependency_table.serializeDependencyTableToMarkdown([...diff.rows])}\n`;
@@ -252,9 +248,9 @@ var DepsRegen = class extends DepsRegenBase {};
 * implementations, keeping the public `plan`/`execute` signatures
 * requirement-free (`R = never`).
 */
-function makeShape(reader, inspector, discovery, resolver, detector) {
-	const provideResolver = effect.Layer.succeed(require_index.CatalogResolver, resolver);
-	const provideDetector = effect.Layer.succeed(require_index.PublishabilityDetector, detector);
+function makeShape(pit, inspector, discovery, detector, config, fs) {
+	const provideDetector = effect.Layer.succeed(require_PublishabilityDetector.PublishabilityDetector, detector);
+	const fileExists = (p) => fs.exists(p).pipe(effect.Effect.orElseSucceed(() => false));
 	const plan = (options) => effect.Effect.gen(function* () {
 		const resolvedCwd = (0, node_path.resolve)(options.cwd);
 		const changesetDir = (0, node_path.join)(resolvedCwd, ".changeset");
@@ -262,43 +258,60 @@ function makeShape(reader, inspector, discovery, resolver, detector) {
 		if (!fromRef) {
 			let baseBranch = options.base;
 			if (!baseBranch) baseBranch = (yield* inspector.inspect(resolvedCwd).pipe(effect.Effect.catchTag("ConfigurationError", () => effect.Effect.succeed({ baseBranch: "main" })))).baseBranch;
-			fromRef = yield* require_worktree_snapshot.gitMergeBase(resolvedCwd, baseBranch);
+			fromRef = yield* require_git.gitMergeBase(resolvedCwd, baseBranch);
 		}
-		const rawDiffs = require_dep_diff.computeWorkspaceDependencyDiffs(yield* reader.snapshotAt(resolvedCwd, fromRef), options.to ? yield* reader.snapshotAt(resolvedCwd, options.to) : require_worktree_snapshot.snapshotFromWorktree(resolvedCwd));
+		const rawDiffs = require_dep_diff.computeWorkspaceDependencyDiffs(yield* pit.at(fromRef, { cwd: resolvedCwd }), options.to ? yield* pit.at(options.to, { cwd: resolvedCwd }) : yield* pit.worktree({ cwd: resolvedCwd }));
 		const targetPkg = options.package;
-		const publishable = yield* require_publishability.listPublishablePackageNames(yield* discovery.listPackages(resolvedCwd)).pipe(effect.Effect.provide(provideDetector));
+		const livePackages = yield* discovery.listPackages(resolvedCwd);
+		const publishable = yield* require_publishability.listPublishablePackageNames(livePackages, resolvedCwd).pipe(effect.Effect.provide(provideDetector));
+		const versionPrivate = yield* config.versionPrivate(resolvedCwd);
+		const inScope = /* @__PURE__ */ new Set();
+		for (const pkg of livePackages) {
+			if (yield* config.isIgnored(pkg.name, resolvedCwd)) continue;
+			if (publishable.has(pkg.name) || versionPrivate) inScope.add(pkg.name);
+		}
+		const targetIgnored = targetPkg ? yield* config.isIgnored(targetPkg, resolvedCwd) : false;
 		const keepDevDeps = options.includeDevDeps === true;
-		const scoped = targetPkg ? rawDiffs.filter((d) => d.package === targetPkg) : rawDiffs.filter((d) => publishable.has(d.package));
+		const scoped = targetPkg ? targetIgnored ? [] : rawDiffs.filter((d) => d.package === targetPkg) : rawDiffs.filter((d) => inScope.has(d.package));
 		const resolved = [];
 		for (const diff of scoped) {
-			const next = yield* resolveDiffRows(diff, keepDevDeps).pipe(effect.Effect.provide(provideResolver));
-			if (next.rows.length > 0) resolved.push(next);
+			const rows = keepDevDeps ? [...diff.rows] : diff.rows.filter((r) => r.type !== "devDependency");
+			if (rows.length > 0) resolved.push({
+				...diff,
+				rows: require_dependency_table.sortDependencyRows(rows)
+			});
 		}
-		const existingPure = findPureDependencyChangesets(changesetDir);
-		const skippedMixed = findMixedDependencyChangesets(changesetDir);
-		const toDelete = targetPkg ? existingPure.filter((p) => p.package === targetPkg) : existingPure.filter((p) => publishable.has(p.package));
+		const existingPure = yield* findPureDependencyChangesets(fs, changesetDir);
+		const skippedMixed = yield* findMixedDependencyChangesets(fs, changesetDir);
+		const toDelete = targetPkg ? targetIgnored ? [] : existingPure.filter((p) => p.package === targetPkg) : existingPure.filter((p) => inScope.has(p.package));
 		const chosenFilenames = /* @__PURE__ */ new Set();
-		return {
-			toDelete,
-			toWrite: resolved.map((diff) => ({
-				file: (0, node_path.join)(changesetDir, `${randomFilename(changesetDir, chosenFilenames)}.md`),
+		const toWrite = [];
+		for (const diff of resolved) {
+			const filename = yield* randomFilename(fileExists, changesetDir, chosenFilenames);
+			toWrite.push({
+				file: (0, node_path.join)(changesetDir, `${filename}.md`),
 				package: diff.package,
 				diff
-			})),
+			});
+		}
+		return {
+			toDelete,
+			toWrite,
 			skippedMixed
 		};
 	});
-	const execute = (plan) => effect.Effect.sync(() => {
+	const execute = (plan) => effect.Effect.gen(function* () {
 		const deleted = [];
 		const written = [];
 		for (const entry of plan.toWrite) {
-			(0, node_fs.writeFileSync)(entry.file, renderChangesetContent(entry.diff));
+			yield* fs.writeFileString(entry.file, renderChangesetContent(entry.diff)).pipe(effect.Effect.mapError((e) => new require_errors.ChangesetIOError({
+				path: entry.file,
+				operation: "write",
+				reason: String(e)
+			})));
 			written.push(entry.file);
 		}
-		for (const entry of plan.toDelete) try {
-			(0, node_fs.unlinkSync)(entry.file);
-			deleted.push(entry.file);
-		} catch {}
+		for (const entry of plan.toDelete) if (yield* effect.Effect.isSuccess(fs.remove(entry.file))) deleted.push(entry.file);
 		return {
 			deleted,
 			written,
@@ -313,19 +326,50 @@ function makeShape(reader, inspector, discovery, resolver, detector) {
 /**
 * Live layer for {@link DepsRegen}.
 *
-* Requires {@link WorkspaceSnapshotReader}, {@link ConfigInspector},
-* `WorkspaceDiscovery`, `CatalogResolver`, and `PublishabilityDetector`
-* (the last three from `workspaces-effect`).
+* Requires `PointInTimeWorkspace`, `WorkspaceDiscovery`,
+* `PublishabilityDetector` (all from `workspaces-effect`),
+* {@link ConfigInspector}, {@link ChangesetConfig}, and
+* `FileSystem.FileSystem` (resolved once at construction and closed over by
+* the shape, keeping `plan`/`execute` themselves requirement-free).
 *
 * @public
 */
 const DepsRegenLive = effect.Layer.effect(DepsRegen, effect.Effect.gen(function* () {
-	return makeShape(yield* require_workspace_snapshot.WorkspaceSnapshotReader, yield* require_config_inspector.ConfigInspector, yield* require_index.WorkspaceDiscovery, yield* require_index.CatalogResolver, yield* require_index.PublishabilityDetector);
+	return makeShape(yield* require_PointInTimeWorkspace.PointInTimeWorkspace, yield* require_config_inspector.ConfigInspector, yield* require_WorkspaceDiscovery.WorkspaceDiscovery, yield* require_PublishabilityDetector.PublishabilityDetector, yield* require_ChangesetConfig.ChangesetConfig, yield* _effect_platform.FileSystem.FileSystem);
 }));
+const WorkspaceGraph = effect.Layer.mergeAll(require_WorkspaceRootLive.WorkspaceRootLive, require_WorkspaceDiscoveryLive.WorkspaceDiscoveryLive.pipe(effect.Layer.provide(require_WorkspaceRootLive.WorkspaceRootLive)));
+const ConfigGraph = require_ChangesetConfig.ChangesetConfigLive.pipe(effect.Layer.provide(require_ChangesetConfigReader.ChangesetConfigReaderLive));
+/**
+* Batteries-included {@link DepsRegen} layer: silk's opinionated default
+* composition of the full dependency graph. Only the platform services
+* remain — note that {@link PointInTimeWorkspace} reads git history, so
+* this layer genuinely requires `CommandExecutor` in addition to
+* `FileSystem`/`Path`: provide a git-capable platform layer
+* (`NodeContext.layer`), not a bare filesystem-only layer.
+*
+* Gating uses silk's adaptive publishability detector
+* ({@link PublishabilityDetectorAdaptiveLive}), so the default semantics
+* are "versionable minus ignored" — identical to the savvy CLI and MCP
+* runtimes. Consumers who need to swap any dependency (test detectors,
+* alternate config sources) should keep composing {@link DepsRegenLive}
+* directly; this layer is purely additive.
+*
+* @example
+* ```typescript
+* import { NodeContext } from "@effect/platform-node";
+* import { Layer } from "effect";
+* import { Changesets } from "@savvy-web/silk-effects";
+*
+* const depsRegen = Changesets.DepsRegenDefault.pipe(Layer.provide(NodeContext.layer));
+* ```
+*
+* @public
+*/
+const DepsRegenDefault = DepsRegenLive.pipe(effect.Layer.provide(require_PointInTimeWorkspaceLive.PointInTimeWorkspaceLive.pipe(effect.Layer.provide(WorkspaceGraph))), effect.Layer.provide(require_config_inspector.ConfigInspectorLive.pipe(effect.Layer.provide(effect.Layer.mergeAll(require_ChangesetConfigReader.ChangesetConfigReaderLive, WorkspaceGraph)))), effect.Layer.provide(require_SilkPublishability.PublishabilityDetectorAdaptiveLive.pipe(effect.Layer.provide(ConfigGraph))), effect.Layer.provide(ConfigGraph), effect.Layer.provide(WorkspaceGraph));
 
 //#endregion
 exports.DepsRegen = DepsRegen;
 exports.DepsRegenBase = DepsRegenBase;
+exports.DepsRegenDefault = DepsRegenDefault;
 exports.DepsRegenLive = DepsRegenLive;
-exports.isPureDependencyChangeset = isPureDependencyChangeset;
-exports.resolveDiffRows = resolveDiffRows;
+exports.isPureDependencyChangeset = isPureDependencyChangeset;