@savvy-web/cli 2.1.12 → 2.1.15

package/cli/index.js

@@ -10,7 +10,7 @@ import { ToolDiscovery } from "@effected/commands";
 import { Git } from "@effected/git";
 import { ManagedSection } from "@effected/templates";
 import { PackageManagerDetector, WorkspaceDiscovery, WorkspaceRoot, Workspaces } from "@effected/workspaces";
-import { BiomeSchemaSyncLive, ChangesetConfigReaderLive, Changesets, ConfigDiscoveryLive, Repos, SilkPublishabilityDetectorLive } from "@savvy-web/silk-effects";
+import { BiomeSchemaSync, ChangesetConfigReader, Changesets, ConfigDiscovery, Repos, SilkPublishability } from "@savvy-web/silk-effects";
 import { Effect, Layer } from "effect";
 import { Command } from "effect/unstable/cli";
 
@@ -24,8 +24,8 @@ import { Command } from "effect/unstable/cli";
 * single `savvy` root command, then provides the merged runtime Layer stack
 * that satisfies every command's service requirements.
 *
-* The layer stack wires the silk-effects Lives over their v4 requirement
-* channels:
+* The layer stack wires the silk-effects service layers over their v4
+* requirement channels:
 *
 * - `NodeServices.layer` — `FileSystem`, `Path`, `ChildProcessSpawner`, `Stdio`,
 *   and `Terminal`, consumed by every config reader, workspace service, git
@@ -38,17 +38,17 @@ import { Command } from "effect/unstable/cli";
 *   `WorkspaceDiscovery.layer()` (the kit resolves the root through
 *   `WorkspaceRoot` from `process.cwd()` lazily on first use, so the CLI's
 *   startup cwd is the discovery root).
-* - Flat silk-effects services — `ChangesetConfigReaderLive`,
-*   `SilkPublishabilityDetectorLive`, `ManagedSection.layer` (from
-*   `@effected/templates`), `BiomeSchemaSyncLive`,
-*   and `ConfigDiscoveryLive`. Tool resolution is the kit's
+* - Flat silk-effects services — `ChangesetConfigReader.layer`,
+*   `SilkPublishability.layer`, `ManagedSection.layer` (from
+*   `@effected/templates`), `BiomeSchemaSync.layer`,
+*   and `ConfigDiscovery.layer`. Tool resolution is the kit's
 *   `ToolDiscovery.layer` over `ChildProcessSpawner` plus a `LocalExec`, which
 *   `Workspaces.localExecLayer()` supplies from the detected package manager.
 *   Versioning classification
 *   is a pure `@effected/workspaces` value operation over `WorkspaceDiscovery`
 *   and the silk `PublishabilityDetector`, so it needs no layer of its own.
-* - Changesets-namespace services — `Changesets.ConfigInspectorLive`,
-*   `Changesets.ReleasePlannerLive`, and `Changesets.BranchAnalyzerLive`
+* - Changesets-namespace services — `Changesets.ConfigInspector.layer`,
+*   `Changesets.ReleasePlanner.layer`, and `Changesets.BranchAnalyzer.layer`
 *   sharing a single `ConfigInspector` via `provideMerge`. `DepsRegen` is NOT
 *   part of AppLive: its graph is root-bound at layer build, so the deps
 *   commands compose `Changesets.makeDepsRegenDefault({ cwd })` per invocation
@@ -76,7 +76,7 @@ const rootCommand = Command.make("savvy").pipe(Command.withSubcommands([
 * CLI application: reads argv from the Stdio service provided by NodeServices.
 * (v4's `Command.run` takes only `version` — the name comes from the root command.)
 */
-const cli = Command.run(rootCommand, { version: "2.1.12" });
+const cli = Command.run(rootCommand, { version: "2.1.15" });
 /**
 * Shared workspace services from `@effected/workspaces`, wired as a
 * self-contained unit and built ONCE (layers memoize by reference).
@@ -100,22 +100,22 @@ const GitLive = Git.layer;
 * (`WorkspaceLive`, `ChangesetConfigReader`, `GitLive`) that `AppLive`'s
 * upper services build upon.
 */
-const BaseLive = Layer.mergeAll(WorkspaceLive, GitLive, ChangesetConfigReaderLive, ManagedSection.layer, BiomeSchemaSyncLive, ConfigDiscoveryLive, SilkPublishabilityDetectorLive);
+const BaseLive = Layer.mergeAll(WorkspaceLive, GitLive, ChangesetConfigReader.layer, ManagedSection.layer, BiomeSchemaSync.layer, ConfigDiscovery.layer, SilkPublishability.layer);
 /**
-* `ConfigInspectorLive` is built once via {@link Layer.provideMerge}: the merge
-* feeds that single `ConfigInspector` instance into `ReleasePlannerLive` and
-* `BranchAnalyzerLive` AND re-exposes it for the surviving `config validate`
+* `ConfigInspector.layer` is built once via {@link Layer.provideMerge}: the merge
+* feeds that single `ConfigInspector` instance into `ReleasePlanner.layer` and
+* `BranchAnalyzer.layer` AND re-exposes it for the surviving `config validate`
 * handler that yields it directly, so it is never constructed twice per run.
-* `BranchAnalyzerLive`'s v4 requirements are `ConfigInspector |
+* `BranchAnalyzer.layer`'s v4 requirements are `ConfigInspector |
 * ChildProcessSpawner` (the spawner flows up to `NodeServices.layer`).
 */
-const InspectorAndAnalyzerLive = Changesets.BranchAnalyzerLive.pipe(Layer.provideMerge(Changesets.ReleasePlannerLive), Layer.provideMerge(Changesets.ConfigInspectorLive));
+const InspectorAndAnalyzerLive = Changesets.BranchAnalyzer.layer.pipe(Layer.provideMerge(Changesets.ReleasePlanner.layer), Layer.provideMerge(Changesets.ConfigInspector.layer));
 /**
-* `Repos.ReposManager`, provided its `Repos.ReposConfigStoreLive` dependency
+* `Repos.ReposManager`, provided its `Repos.ReposConfigStore.layer` dependency
 * and the shared `Git` service. Platform requirements (`FileSystem`, `Path`)
 * flow up to `NodeServices.layer`.
 */
-const ReposGroupLive = Repos.ReposManagerLive.pipe(Layer.provide(Repos.ReposConfigStoreLive), Layer.provide(GitLive));
+const ReposGroupLive = Repos.ReposManager.layer.pipe(Layer.provide(Repos.ReposConfigStore.layer), Layer.provide(GitLive));
 /**
 * `ToolDiscovery` from `@effected/commands`, wired to this workspace. Its
 * `LocalExec` contract — the argv prefix that runs a project-local binary — is

package/commands/changeset/commands/init.js

@@ -420,7 +420,8 @@ function handleChangesetMarkdownlint(changesetDir, root, force) {
 * @internal
 */
 function checkChangesetDir(root) {
-	if (!existsSync(join(root, ".changeset"))) return [{
+	const dir = join(root, ".changeset");
+	if (!existsSync(dir)) return [{
 		file: ".changeset/",
 		message: "directory does not exist"
 	}];

package/commands/changeset/utils/config-gate.js

@@ -47,7 +47,8 @@ const { ConfigInspector } = Changesets;
 function requireValidConfig(cwd) {
 	return Effect.gen(function* () {
 		const projectDir = resolve(cwd);
-		if (!existsSync(join(projectDir, ".changeset", "config.json"))) return;
+		const configPath = join(projectDir, ".changeset", "config.json");
+		if (!existsSync(configPath)) return;
 		yield* (yield* ConfigInspector).inspect(projectDir).pipe(Effect.catchTag("ConfigurationError", (err) => {
 			process.exitCode = 1;
 			return Effect.fail(err);

package/commands/commit/hooks/post-commit-verify.js

@@ -35,7 +35,9 @@ const getRepoRoot = Effect.gen(function* () {
 });
 function runCommitlintLast(root) {
 	return (async () => {
-		const { command, args } = buildCommitlintInvocation(await Commitlint.detectPackageManager(root), await Commitlint.readCommitlintConfigPath(root), ["--last"]);
+		const pm = await Commitlint.detectPackageManager(root);
+		const configPath = await Commitlint.readCommitlintConfigPath(root);
+		const { command, args } = buildCommitlintInvocation(pm, configPath, ["--last"]);
 		try {
 			await execFileP(command, args, { cwd: root });
 			return false;

package/commands/commit/lint.js

@@ -36,7 +36,9 @@ const getRepoRoot = Effect.gen(function* () {
 */
 function runCommitlintEdit(root, file) {
 	return (async () => {
-		const { command, args } = buildCommitlintInvocation(await Commitlint.detectPackageManager(root), await Commitlint.readCommitlintConfigPath(root), ["--edit", file]);
+		const pm = await Commitlint.detectPackageManager(root);
+		const configPath = await Commitlint.readCommitlintConfigPath(root);
+		const { command, args } = buildCommitlintInvocation(pm, configPath, ["--edit", file]);
 		try {
 			const { stdout, stderr } = await execFileP(command, args, { cwd: root });
 			return {

package/commands/lint/fmt.js

@@ -32,7 +32,8 @@ const pnpmWorkspaceCommand = Command.make("pnpm-workspace", {}, () => Effect.gen
 	const content = readFileSync(filepath, "utf-8");
 	const parsed = yield* Yaml.parse(content);
 	const sorted = Lint.PnpmWorkspace.sortContent(parsed);
-	writeFileSync(filepath, yield* Effect.promise(() => Lint.PnpmWorkspace.formatContent(sorted)), "utf-8");
+	const formatted = yield* Effect.promise(() => Lint.PnpmWorkspace.formatContent(sorted));
+	writeFileSync(filepath, formatted, "utf-8");
 }));
 /** Format YAML files with Prettier. */
 const yamlCommand = Command.make("yaml", { files: filesArg }, ({ files }) => Effect.gen(function* () {

package/index.d.ts

@@ -18,8 +18,8 @@ import { JsoncParseError } from "@effected/jsonc";
  * single `savvy` root command, then provides the merged runtime Layer stack
  * that satisfies every command's service requirements.
  *
- * The layer stack wires the silk-effects Lives over their v4 requirement
- * channels:
+ * The layer stack wires the silk-effects service layers over their v4
+ * requirement channels:
  *
  * - `NodeServices.layer` — `FileSystem`, `Path`, `ChildProcessSpawner`, `Stdio`,
  *   and `Terminal`, consumed by every config reader, workspace service, git
@@ -32,17 +32,17 @@ import { JsoncParseError } from "@effected/jsonc";
  *   `WorkspaceDiscovery.layer()` (the kit resolves the root through
  *   `WorkspaceRoot` from `process.cwd()` lazily on first use, so the CLI's
  *   startup cwd is the discovery root).
- * - Flat silk-effects services — `ChangesetConfigReaderLive`,
- *   `SilkPublishabilityDetectorLive`, `ManagedSection.layer` (from
- *   `@effected/templates`), `BiomeSchemaSyncLive`,
- *   and `ConfigDiscoveryLive`. Tool resolution is the kit's
+ * - Flat silk-effects services — `ChangesetConfigReader.layer`,
+ *   `SilkPublishability.layer`, `ManagedSection.layer` (from
+ *   `@effected/templates`), `BiomeSchemaSync.layer`,
+ *   and `ConfigDiscovery.layer`. Tool resolution is the kit's
  *   `ToolDiscovery.layer` over `ChildProcessSpawner` plus a `LocalExec`, which
  *   `Workspaces.localExecLayer()` supplies from the detected package manager.
  *   Versioning classification
  *   is a pure `@effected/workspaces` value operation over `WorkspaceDiscovery`
  *   and the silk `PublishabilityDetector`, so it needs no layer of its own.
- * - Changesets-namespace services — `Changesets.ConfigInspectorLive`,
- *   `Changesets.ReleasePlannerLive`, and `Changesets.BranchAnalyzerLive`
+ * - Changesets-namespace services — `Changesets.ConfigInspector.layer`,
+ *   `Changesets.ReleasePlanner.layer`, and `Changesets.BranchAnalyzer.layer`
  *   sharing a single `ConfigInspector` via `provideMerge`. `DepsRegen` is NOT
  *   part of AppLive: its graph is root-bound at layer build, so the deps
  *   commands compose `Changesets.makeDepsRegenDefault({ cwd })` per invocation

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/cli",
-	"version": "2.1.12",
+	"version": "2.1.15",
 	"private": false,
 	"description": "The savvy CLI — unified commit, changeset, and lint commands for the Silk Suite",
 	"homepage": "https://github.com/savvy-web/systems/tree/main/packages/cli",
@@ -32,13 +32,13 @@
 	},
 	"dependencies": {
 		"@effect/platform-node": "4.0.0-beta.101",
-		"@effected/commands": "^0.1.0",
+		"@effected/commands": "^0.2.0",
 		"@effected/git": "^0.5.1",
 		"@effected/jsonc": "^0.5.1",
 		"@effected/templates": "^0.1.0",
-		"@effected/workspaces": "^0.9.0",
+		"@effected/workspaces": "^0.9.3",
 		"@effected/yaml": "^0.6.0",
-		"@savvy-web/silk-effects": "5.1.1",
+		"@savvy-web/silk-effects": "5.2.0",
 		"effect": "4.0.0-beta.101"
 	}
 }