@savvy-web/silk-effects 5.1.3 → 5.2.1

package/services/SilkWorkspaceAnalyzer.js

@@ -25,7 +25,7 @@ import { DependencyGraph, PackageManagerDetector, VersioningStrategy, WorkspaceD
 *     const analyzer = yield* SilkWorkspaceAnalyzer;
 *     return yield* analyzer.analyze("/path/to/monorepo");
 *   }).pipe(
-*     Effect.provide(SilkWorkspaceAnalyzerLive),
+*     Effect.provide(SilkWorkspaceAnalyzer.layer),
 *     // ... provide all transitive layers
 *   )
 * );
@@ -34,7 +34,114 @@ import { DependencyGraph, PackageManagerDetector, VersioningStrategy, WorkspaceD
 * @since 0.2.0
 * @public
 */
-var SilkWorkspaceAnalyzer = class extends Context.Service()("@savvy-web/silk-effects/SilkWorkspaceAnalyzer") {};
+var SilkWorkspaceAnalyzer = class extends Context.Service()("@savvy-web/silk-effects/SilkWorkspaceAnalyzer") {
+	/**
+	* Production implementation of {@link SilkWorkspaceAnalyzer}.
+	*
+	* @remarks
+	* Requires `WorkspaceDiscovery`, `PackageManagerDetector` and
+	* {@link ChangesetConfigReader}. Versioning and tag classification are pure
+	* `@effected/workspaces` value operations, so neither adds a requirement.
+	*
+	* @since 0.2.0
+	* @public
+	*/
+	static layer = Layer.effect(this, Effect.gen(function* () {
+		const fs = yield* FileSystem.FileSystem;
+		const discovery = yield* WorkspaceDiscovery;
+		const pmDetector = yield* PackageManagerDetector;
+		const configReader = yield* ChangesetConfigReader;
+		const analyze = (root) => Effect.gen(function* () {
+			const pm = yield* pmDetector.detect(root).pipe(Effect.mapError((err) => new WorkspaceAnalysisError({
+				root,
+				reason: `Package manager detection failed: ${String(err)}`
+			})));
+			const packages = yield* discovery.listPackages().pipe(Effect.mapError((err) => new WorkspaceAnalysisError({
+				root,
+				reason: `Workspace discovery failed: ${String(err)}`
+			})));
+			const topoOrder = yield* DependencyGraph.make({ packages }).sort().pipe(Effect.mapError((err) => new WorkspaceAnalysisError({
+				root,
+				reason: `Cyclic dependency detected: ${String(err)}`
+			})));
+			const packagesByName = new Map(packages.map((p) => [p.name, p]));
+			const reordered = topoOrder.flatMap((name) => {
+				const pkg = packagesByName.get(name);
+				return pkg ? [pkg] : [];
+			});
+			const sortedPackages = reordered.length > 0 ? reordered : [...packages];
+			const changesetConfigOption = yield* configReader.read(root).pipe(Effect.option);
+			const changesetConfig = Option.getOrNull(changesetConfigOption);
+			const analyzedWorkspaces = [];
+			for (const pkg of sortedPackages) {
+				const pkgJson = yield* readRawPkgJson(fs, pkg.packageJsonPath);
+				const binding = yield* readTargetsBinding(fs, pkg.path);
+				const targets = SilkPublishability.detect(pkg.name, pkgJson, binding);
+				const isPublishable = targets.length > 0;
+				const isRoot = pkg.relativePath === ".";
+				const { versioned, tagged, released } = computeReleaseStatus(pkg.name, pkg.private, isPublishable, changesetConfig);
+				const analyzed = new AnalyzedWorkspace({
+					name: pkg.name,
+					version: { current: pkg.version },
+					path: pkg.path,
+					root: isRoot,
+					publishConfig: null,
+					publishable: isPublishable,
+					targets: [...targets],
+					versioned,
+					tagged,
+					released,
+					linked: [],
+					fixed: []
+				});
+				analyzedWorkspaces.push(analyzed);
+			}
+			if (changesetConfig) {
+				const fixedGroups = changesetConfig.fixed ?? [];
+				const linkedGroups = changesetConfig.linked ?? [];
+				const fixedByName = /* @__PURE__ */ new Map();
+				for (const group of fixedGroups) {
+					const members = analyzedWorkspaces.filter((w) => group.includes(w.name));
+					for (const member of members) fixedByName.set(member.name, members.filter((m) => m !== member));
+				}
+				const linkedByName = /* @__PURE__ */ new Map();
+				for (const group of linkedGroups) {
+					const members = analyzedWorkspaces.filter((w) => group.includes(w.name));
+					for (const member of members) linkedByName.set(member.name, members.filter((m) => m !== member));
+				}
+				for (let i = 0; i < analyzedWorkspaces.length; i++) {
+					const ws = analyzedWorkspaces[i];
+					const fixedRefs = fixedByName.get(ws.name) ?? [];
+					const linkedRefs = linkedByName.get(ws.name) ?? [];
+					if (fixedRefs.length > 0 || linkedRefs.length > 0) analyzedWorkspaces[i] = new AnalyzedWorkspace({
+						...ws,
+						fixed: fixedRefs,
+						linked: linkedRefs
+					});
+				}
+			}
+			const publishableNames = analyzedWorkspaces.filter((w) => w.publishable).map((w) => w.name);
+			const versioning = VersioningStrategy.classify({
+				packages: publishableNames,
+				fixedGroups: changesetConfig?.fixed ?? []
+			});
+			const tagStrategyType = versioning.tagStyle;
+			return new WorkspaceAnalysis({
+				root,
+				runtime: pm.runtime,
+				packageManager: {
+					type: pm.name,
+					...Option.isSome(pm.version) ? { version: pm.version.value } : {}
+				},
+				workspaces: analyzedWorkspaces,
+				changesetConfig,
+				versioning,
+				tagStrategy: tagStrategyType
+			});
+		});
+		return { analyze };
+	}));
+};
 /**
 * Read the raw package.json from disk as an untyped record.
 *
@@ -99,112 +206,6 @@ function computeReleaseStatus(pkgName, isPrivate, isPublishable, config) {
 		released: versioned && tagged
 	};
 }
-/**
-* Live implementation of {@link SilkWorkspaceAnalyzer}.
-*
-* @remarks
-* Requires `WorkspaceDiscovery`, `PackageManagerDetector` and
-* {@link ChangesetConfigReader}. Versioning and tag classification are pure
-* `@effected/workspaces` value operations, so neither adds a requirement.
-*
-* @since 0.2.0
-* @public
-*/
-const SilkWorkspaceAnalyzerLive = Layer.effect(SilkWorkspaceAnalyzer, Effect.gen(function* () {
-	const fs = yield* FileSystem.FileSystem;
-	const discovery = yield* WorkspaceDiscovery;
-	const pmDetector = yield* PackageManagerDetector;
-	const configReader = yield* ChangesetConfigReader;
-	const analyze = (root) => Effect.gen(function* () {
-		const pm = yield* pmDetector.detect(root).pipe(Effect.mapError((err) => new WorkspaceAnalysisError({
-			root,
-			reason: `Package manager detection failed: ${String(err)}`
-		})));
-		const packages = yield* discovery.listPackages().pipe(Effect.mapError((err) => new WorkspaceAnalysisError({
-			root,
-			reason: `Workspace discovery failed: ${String(err)}`
-		})));
-		const topoOrder = yield* DependencyGraph.make({ packages }).sort().pipe(Effect.mapError((err) => new WorkspaceAnalysisError({
-			root,
-			reason: `Cyclic dependency detected: ${String(err)}`
-		})));
-		const packagesByName = new Map(packages.map((p) => [p.name, p]));
-		const reordered = topoOrder.flatMap((name) => {
-			const pkg = packagesByName.get(name);
-			return pkg ? [pkg] : [];
-		});
-		const sortedPackages = reordered.length > 0 ? reordered : [...packages];
-		const changesetConfigOption = yield* configReader.read(root).pipe(Effect.option);
-		const changesetConfig = Option.getOrNull(changesetConfigOption);
-		const analyzedWorkspaces = [];
-		for (const pkg of sortedPackages) {
-			const pkgJson = yield* readRawPkgJson(fs, pkg.packageJsonPath);
-			const binding = yield* readTargetsBinding(fs, pkg.path);
-			const targets = SilkPublishability.detect(pkg.name, pkgJson, binding);
-			const isPublishable = targets.length > 0;
-			const isRoot = pkg.relativePath === ".";
-			const { versioned, tagged, released } = computeReleaseStatus(pkg.name, pkg.private, isPublishable, changesetConfig);
-			const analyzed = new AnalyzedWorkspace({
-				name: pkg.name,
-				version: { current: pkg.version },
-				path: pkg.path,
-				root: isRoot,
-				publishConfig: null,
-				publishable: isPublishable,
-				targets: [...targets],
-				versioned,
-				tagged,
-				released,
-				linked: [],
-				fixed: []
-			});
-			analyzedWorkspaces.push(analyzed);
-		}
-		if (changesetConfig) {
-			const fixedGroups = changesetConfig.fixed ?? [];
-			const linkedGroups = changesetConfig.linked ?? [];
-			const fixedByName = /* @__PURE__ */ new Map();
-			for (const group of fixedGroups) {
-				const members = analyzedWorkspaces.filter((w) => group.includes(w.name));
-				for (const member of members) fixedByName.set(member.name, members.filter((m) => m !== member));
-			}
-			const linkedByName = /* @__PURE__ */ new Map();
-			for (const group of linkedGroups) {
-				const members = analyzedWorkspaces.filter((w) => group.includes(w.name));
-				for (const member of members) linkedByName.set(member.name, members.filter((m) => m !== member));
-			}
-			for (let i = 0; i < analyzedWorkspaces.length; i++) {
-				const ws = analyzedWorkspaces[i];
-				const fixedRefs = fixedByName.get(ws.name) ?? [];
-				const linkedRefs = linkedByName.get(ws.name) ?? [];
-				if (fixedRefs.length > 0 || linkedRefs.length > 0) analyzedWorkspaces[i] = new AnalyzedWorkspace({
-					...ws,
-					fixed: fixedRefs,
-					linked: linkedRefs
-				});
-			}
-		}
-		const publishableNames = analyzedWorkspaces.filter((w) => w.publishable).map((w) => w.name);
-		const versioning = VersioningStrategy.classify({
-			packages: publishableNames,
-			fixedGroups: changesetConfig?.fixed ?? []
-		});
-		const tagStrategyType = versioning.tagStyle;
-		return new WorkspaceAnalysis({
-			root,
-			runtime: pm.runtime,
-			packageManager: {
-				type: pm.name,
-				...Option.isSome(pm.version) ? { version: pm.version.value } : {}
-			},
-			workspaces: analyzedWorkspaces,
-			changesetConfig,
-			versioning,
-			tagStrategy: tagStrategyType
-		});
-	});
-	return { analyze };
-}));
 
 //#endregion
-export { SilkWorkspaceAnalyzer, SilkWorkspaceAnalyzerLive };
+export { SilkWorkspaceAnalyzer };

package/turbo/index.js

@@ -3,7 +3,7 @@ import { TurboDigest } from "./digest.js";
 import { DryRunParseError, NotATurboRepoError, TurboExecError, TurboNotInstalledError } from "./errors.js";
 import { TurboCache, TurboDryRun, TurboDryTask, TurboEnvVars, TurboGlobalCacheInputs } from "./schemas/DryRun.js";
 import { AffectedResult, CacheDiagnosis, GlobalHashSummary, GraphNode, MissExplanation, PackageCacheStatus, TaskGraphResult } from "./schemas/results.js";
-import { TurboInspector, TurboInspectorLive } from "./services/TurboInspector.js";
+import { TurboInspector } from "./services/TurboInspector.js";
 
 //#region src/turbo/index.ts
 var turbo_exports = /* @__PURE__ */ __exportAll({
@@ -24,9 +24,8 @@ var turbo_exports = /* @__PURE__ */ __exportAll({
 	TurboExecError: () => TurboExecError,
 	TurboGlobalCacheInputs: () => TurboGlobalCacheInputs,
 	TurboInspector: () => TurboInspector,
-	TurboInspectorLive: () => TurboInspectorLive,
 	TurboNotInstalledError: () => TurboNotInstalledError
 });
 
 //#endregion
-export { AffectedResult, CacheDiagnosis, DryRunParseError, GlobalHashSummary, GraphNode, MissExplanation, NotATurboRepoError, PackageCacheStatus, TaskGraphResult, TurboCache, TurboDigest, TurboDryRun, TurboDryTask, TurboEnvVars, TurboExecError, TurboGlobalCacheInputs, TurboInspector, TurboInspectorLive, TurboNotInstalledError, turbo_exports };
+export { AffectedResult, CacheDiagnosis, DryRunParseError, GlobalHashSummary, GraphNode, MissExplanation, NotATurboRepoError, PackageCacheStatus, TaskGraphResult, TurboCache, TurboDigest, TurboDryRun, TurboDryTask, TurboEnvVars, TurboExecError, TurboGlobalCacheInputs, TurboInspector, TurboNotInstalledError, turbo_exports };

package/turbo/services/TurboInspector.js

@@ -18,90 +18,91 @@ import { Run, Tool, ToolDiscovery } from "@effected/commands";
 *
 * @since 0.7.0
 */
-var TurboInspector = class extends Context.Service()("@savvy-web/silk-effects/TurboInspector") {};
-const TURBO = Tool.named("turbo");
-/** Default task used by {@link TurboInspector.taskGraph} and {@link TurboInspector.affected}. */
-const DEFAULT_BUILD_TASK = "build:dev";
-/** Default git ref `affected` compares against — matches Turborepo's own `--affected` default. */
-const DEFAULT_AFFECTED_BASE = "main";
-/**
-* Live implementation of {@link TurboInspector}.
-*
-* @remarks
-* Requires `ToolDiscovery` from `@effected/commands` to resolve the `turbo`
-* binary, plus `ChildProcessSpawner` and `FileSystem` from core (provide
-* `NodeServices.layer` at the app edge) and `Git` from `@effected/git`. The
-* spawner is captured at layer construction and discharged onto each `Run`
-* effect with `Effect.provideService`, keeping the public method effects at
-* `R = never`.
-*
-* @since 0.7.0
-*/
-const TurboInspectorLive = Layer.effect(TurboInspector, Effect.gen(function* () {
-	const discovery = yield* ToolDiscovery;
-	const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-	const fs = yield* FileSystem.FileSystem;
-	const git = yield* Git;
-	const runTurbo = (cwd, args, env) => discovery.resolve(TURBO).pipe(Effect.mapError((e) => new TurboNotInstalledError({ reason: e.message })), Effect.flatMap((resolved) => {
-		const base = ChildProcess.setCwd(resolved.command(...args), cwd);
-		const command = env ? Run.extendEnv(base, env) : base;
-		return Effect.provideService(Run.text(command), ChildProcessSpawner.ChildProcessSpawner, spawner).pipe(Effect.mapError((e) => new TurboExecError({
-			args: [...args],
-			reason: String(e)
+var TurboInspector = class extends Context.Service()("@savvy-web/silk-effects/TurboInspector") {
+	/**
+	* Production implementation of {@link TurboInspector}.
+	*
+	* @remarks
+	* Requires `ToolDiscovery` from `@effected/commands` to resolve the `turbo`
+	* binary, plus `ChildProcessSpawner` and `FileSystem` from core (provide
+	* `NodeServices.layer` at the app edge) and `Git` from `@effected/git`. The
+	* spawner is captured at layer construction and discharged onto each `Run`
+	* effect with `Effect.provideService`, keeping the public method effects at
+	* `R = never`.
+	*
+	* @since 0.7.0
+	*/
+	static layer = Layer.effect(this, Effect.gen(function* () {
+		const discovery = yield* ToolDiscovery;
+		const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+		const fs = yield* FileSystem.FileSystem;
+		const git = yield* Git;
+		const runTurbo = (cwd, args, env) => discovery.resolve(TURBO).pipe(Effect.mapError((e) => new TurboNotInstalledError({ reason: e.message })), Effect.flatMap((resolved) => {
+			const base = ChildProcess.setCwd(resolved.command(...args), cwd);
+			const command = env ? Run.extendEnv(base, env) : base;
+			return Effect.provideService(Run.text(command), ChildProcessSpawner.ChildProcessSpawner, spawner).pipe(Effect.mapError((e) => new TurboExecError({
+				args: [...args],
+				reason: String(e)
+			})));
+		}));
+		/** The paths changed between `base` and HEAD, via `@effected/git`. */
+		const changedPaths = (cwd, base) => git.changedFiles(cwd, {
+			base,
+			head: "HEAD"
+		}).pipe(Effect.mapError((e) => new TurboExecError({
+			args: [
+				"git",
+				"diff",
+				"--name-only",
+				`${base}...HEAD`
+			],
+			reason: e.message
 		})));
-	}));
-	/** The paths changed between `base` and HEAD, via `@effected/git`. */
-	const changedPaths = (cwd, base) => git.changedFiles(cwd, {
-		base,
-		head: "HEAD"
-	}).pipe(Effect.mapError((e) => new TurboExecError({
-		args: [
-			"git",
-			"diff",
-			"--name-only",
-			`${base}...HEAD`
-		],
-		reason: e.message
-	})));
-	const ensureTurboRepo = (cwd) => fs.exists(`${cwd}/turbo.json`).pipe(Effect.catch(() => Effect.succeed(false)), Effect.flatMap((ok) => ok ? Effect.void : Effect.fail(new NotATurboRepoError({ cwd }))));
-	const dryRun = (task, cwd, args, env) => ensureTurboRepo(cwd).pipe(Effect.flatMap(() => runTurbo(cwd, args, env)), Effect.flatMap((stdout) => Effect.try({
-		try: () => JSON.parse(stdout),
-		catch: (e) => new DryRunParseError({
-			task,
-			reason: `invalid JSON: ${String(e)}`
-		})
-	})), Effect.flatMap((json) => Schema.decodeUnknownEffect(TurboDryRun)(json).pipe(Effect.mapError((e) => new DryRunParseError({
-		task,
-		reason: String(e)
-	})))));
-	return {
-		diagnoseCache: (task, cwd) => dryRun(task, cwd, [
-			"run",
+		const ensureTurboRepo = (cwd) => fs.exists(`${cwd}/turbo.json`).pipe(Effect.catch(() => Effect.succeed(false)), Effect.flatMap((ok) => ok ? Effect.void : Effect.fail(new NotATurboRepoError({ cwd }))));
+		const dryRun = (task, cwd, args, env) => ensureTurboRepo(cwd).pipe(Effect.flatMap(() => runTurbo(cwd, args, env)), Effect.flatMap((stdout) => Effect.try({
+			try: () => JSON.parse(stdout),
+			catch: (e) => new DryRunParseError({
+				task,
+				reason: `invalid JSON: ${String(e)}`
+			})
+		})), Effect.flatMap((json) => Schema.decodeUnknownEffect(TurboDryRun)(json).pipe(Effect.mapError((e) => new DryRunParseError({
 			task,
-			"--dry=json"
-		]).pipe(Effect.map((dry) => TurboDigest.cacheDiagnosis(task, dry))),
-		taskGraph: (cwd, task) => {
-			const t = task ?? DEFAULT_BUILD_TASK;
-			return dryRun(t, cwd, [
+			reason: String(e)
+		})))));
+		return {
+			diagnoseCache: (task, cwd) => dryRun(task, cwd, [
 				"run",
-				t,
+				task,
 				"--dry=json"
-			]).pipe(Effect.map((dry) => TurboDigest.taskGraph(dry, task)));
-		},
-		affected: (cwd, base) => {
-			const ref = base ?? DEFAULT_AFFECTED_BASE;
-			return Effect.all({
-				changedFiles: changedPaths(cwd, ref),
-				dry: dryRun(`${DEFAULT_BUILD_TASK} --affected`, cwd, [
+			]).pipe(Effect.map((dry) => TurboDigest.cacheDiagnosis(task, dry))),
+			taskGraph: (cwd, task) => {
+				const t = task ?? DEFAULT_BUILD_TASK;
+				return dryRun(t, cwd, [
 					"run",
-					DEFAULT_BUILD_TASK,
-					"--affected",
+					t,
 					"--dry=json"
-				], { TURBO_SCM_BASE: ref })
-			}).pipe(Effect.map(({ changedFiles, dry }) => TurboDigest.affected(ref, changedFiles, dry)));
-		}
-	};
-}));
+				]).pipe(Effect.map((dry) => TurboDigest.taskGraph(dry, task)));
+			},
+			affected: (cwd, base) => {
+				const ref = base ?? DEFAULT_AFFECTED_BASE;
+				return Effect.all({
+					changedFiles: changedPaths(cwd, ref),
+					dry: dryRun(`${DEFAULT_BUILD_TASK} --affected`, cwd, [
+						"run",
+						DEFAULT_BUILD_TASK,
+						"--affected",
+						"--dry=json"
+					], { TURBO_SCM_BASE: ref })
+				}).pipe(Effect.map(({ changedFiles, dry }) => TurboDigest.affected(ref, changedFiles, dry)));
+			}
+		};
+	}));
+};
+const TURBO = Tool.named("turbo");
+/** Default task used by {@link TurboInspector.taskGraph} and {@link TurboInspector.affected}. */
+const DEFAULT_BUILD_TASK = "build:dev";
+/** Default git ref `affected` compares against — matches Turborepo's own `--affected` default. */
+const DEFAULT_AFFECTED_BASE = "main";
 
 //#endregion
-export { TurboInspector, TurboInspectorLive };
+export { TurboInspector };