@savvy-web/cli 3.7.16 → 3.7.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cli/index.js +3 -3
- package/commands/changeset/commands/check.js +1 -1
- package/commands/changeset/commands/config-validate.js +1 -1
- package/commands/changeset/commands/deps-detect.js +1 -1
- package/commands/changeset/commands/deps-regen.js +1 -1
- package/commands/changeset/commands/init.js +3 -3
- package/commands/changeset/commands/lint.js +1 -1
- package/commands/changeset/commands/transform.js +1 -1
- package/commands/changeset/commands/validate-file.js +2 -2
- package/commands/changeset/commands/version.js +1 -1
- package/commands/check-section.js +1 -1
- package/commands/check.js +1 -1
- package/commands/clean/progress.js +1 -1
- package/commands/clean/view.js +1 -1
- package/commands/clean.js +3 -3
- package/commands/commit/check.js +1 -1
- package/commands/commit/index.js +2 -2
- package/commands/commit/init.js +1 -1
- package/commands/init.js +3 -3
- package/commands/lint/biome-version.js +1 -1
- package/commands/lint/check.js +1 -1
- package/commands/lint/index.js +2 -2
- package/commands/lint/init.js +1 -1
- package/commands/lint/text.js +1 -1
- package/commands/repos/commands/add.js +1 -1
- package/commands/repos/commands/deregister.js +2 -2
- package/commands/repos/commands/note.js +1 -1
- package/commands/repos/commands/pin.js +1 -1
- package/commands/repos/commands/remove.js +2 -2
- package/commands/repos/commands/rename.js +1 -1
- package/commands/repos/commands/restore.js +2 -2
- package/commands/repos/commands/status.js +1 -1
- package/commands/repos/shared.js +4 -4
- package/index.d.ts +4 -4
- package/internal/command-error.js +1 -1
- package/internal/confirm.js +1 -1
- package/internal/failure-line.js +1 -1
- package/internal/report.js +8 -9
- package/internal/version-line.js +12 -7
- package/main.d.ts +1 -1
- package/main.js +9 -9
- package/package.json +17 -17
- package/version.js +1 -1
package/cli/index.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { changesetCommand } from "../commands/changeset/index.js";
|
|
2
2
|
import { checkCommand } from "../commands/check.js";
|
|
3
|
+
import { cleanCommand } from "../commands/clean.js";
|
|
3
4
|
import { commitCommand } from "../commands/commit/index.js";
|
|
4
5
|
import { initCommand } from "../commands/init.js";
|
|
5
6
|
import { lintCommand } from "../commands/lint/index.js";
|
|
6
7
|
import { reposCommand } from "../commands/repos/index.js";
|
|
7
|
-
import { cleanCommand } from "../commands/clean.js";
|
|
8
8
|
import { CliConfig, Command, GlobalFlag } from "effect/cli";
|
|
9
|
-
import { CliAudience } from "@effected/cli";
|
|
9
|
+
import { CliAudience } from "@effected/cli-kit";
|
|
10
10
|
import { BiomeSchemaSync, ChangesetConfigReader, Changesets, ConfigDiscovery, Repos, SilkPublishability } from "@savvy-web/silk-effects";
|
|
11
11
|
import { Layer } from "effect";
|
|
12
12
|
import { Git } from "@effected/git";
|
|
@@ -132,7 +132,7 @@ const AppLive = Layer.mergeAll(ToolDiscoveryGroupLive, InspectorAndAnalyzerLive,
|
|
|
132
132
|
/**
|
|
133
133
|
* Core's built-in global flags for the whole program: `--help`, `--version`,
|
|
134
134
|
* `--completions` and `--log-level`. Core's generic `--wizard` is trimmed —
|
|
135
|
-
* savvy asks its own questions through `@effected/cli/ui` screens. Provided
|
|
135
|
+
* savvy asks its own questions through `@effected/cli-kit/ui` screens. Provided
|
|
136
136
|
* around the program by `main()`, inside `CliRuntime.main`'s environment, so
|
|
137
137
|
* help, parsing and `CliAudience`'s interactive `--wizard` restore all read
|
|
138
138
|
* it (the kit only restores a wizard its own gate removed, never one a
|
|
@@ -2,7 +2,7 @@ import { DisplayPath } from "../../../internal/display-path.js";
|
|
|
2
2
|
import { Report } from "../../../internal/report.js";
|
|
3
3
|
import { Argument, Command } from "effect/cli";
|
|
4
4
|
import { resolve } from "node:path";
|
|
5
|
-
import { CliExit, Doc } from "@effected/cli";
|
|
5
|
+
import { CliExit, Doc } from "@effected/cli-kit";
|
|
6
6
|
import { Changesets } from "@savvy-web/silk-effects";
|
|
7
7
|
import { Effect } from "effect";
|
|
8
8
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Report } from "../../../internal/report.js";
|
|
2
2
|
import { Argument, Command } from "effect/cli";
|
|
3
3
|
import { join, resolve } from "node:path";
|
|
4
|
-
import { CliExit } from "@effected/cli";
|
|
4
|
+
import { CliExit } from "@effected/cli-kit";
|
|
5
5
|
import { Changesets } from "@savvy-web/silk-effects";
|
|
6
6
|
import { Effect } from "effect";
|
|
7
7
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Report } from "../../../internal/report.js";
|
|
2
2
|
import { Command, Flag } from "effect/cli";
|
|
3
3
|
import { resolve } from "node:path";
|
|
4
|
-
import { CliExit, CliFormat } from "@effected/cli";
|
|
4
|
+
import { CliExit, CliFormat } from "@effected/cli-kit";
|
|
5
5
|
import { Changesets } from "@savvy-web/silk-effects";
|
|
6
6
|
import { Effect, Option } from "effect";
|
|
7
7
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Report } from "../../../internal/report.js";
|
|
2
2
|
import { Command, Flag } from "effect/cli";
|
|
3
3
|
import { resolve } from "node:path";
|
|
4
|
-
import { CliExit, Doc } from "@effected/cli";
|
|
4
|
+
import { CliExit, Doc } from "@effected/cli-kit";
|
|
5
5
|
import { Changesets } from "@savvy-web/silk-effects";
|
|
6
6
|
import { Console, Effect, Option } from "effect";
|
|
7
7
|
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { Report } from "../../../internal/report.js";
|
|
2
1
|
import { CommandError } from "../../../internal/command-error.js";
|
|
2
|
+
import { Report } from "../../../internal/report.js";
|
|
3
3
|
import { join } from "node:path";
|
|
4
|
-
import { CliDoc, CliExit, Doc, Fmt } from "@effected/cli";
|
|
4
|
+
import { CliDoc, CliExit, Doc, Fmt } from "@effected/cli-kit";
|
|
5
5
|
import { Changesets } from "@savvy-web/silk-effects";
|
|
6
6
|
import { Data, Effect, Option, Result, Schema } from "effect";
|
|
7
|
-
import { TerminalEnv } from "@effected/env";
|
|
8
7
|
import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
|
8
|
+
import { TerminalEnv } from "@effected/env";
|
|
9
9
|
import { Git, GitRemote } from "@effected/git";
|
|
10
10
|
import { Jsonc, JsoncEdit, JsoncModifier } from "@effected/jsonc";
|
|
11
11
|
import { WorkspaceRoot } from "@effected/workspaces";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Argument, Command, Flag } from "effect/cli";
|
|
2
2
|
import { resolve } from "node:path";
|
|
3
|
-
import { CliExit } from "@effected/cli";
|
|
3
|
+
import { CliExit } from "@effected/cli-kit";
|
|
4
4
|
import { Changesets } from "@savvy-web/silk-effects";
|
|
5
5
|
import { Console, Effect } from "effect";
|
|
6
6
|
|
|
@@ -2,7 +2,7 @@ import { Report } from "../../../internal/report.js";
|
|
|
2
2
|
import { requireValidConfig } from "../utils/config-gate.js";
|
|
3
3
|
import { Argument, Command, Flag } from "effect/cli";
|
|
4
4
|
import { dirname, resolve } from "node:path";
|
|
5
|
-
import { CliExit, Doc } from "@effected/cli";
|
|
5
|
+
import { CliExit, Doc } from "@effected/cli-kit";
|
|
6
6
|
import { Changesets } from "@savvy-web/silk-effects";
|
|
7
7
|
import { Effect } from "effect";
|
|
8
8
|
import { readFileSync, writeFileSync } from "node:fs";
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Report } from "../../../internal/report.js";
|
|
2
1
|
import { CommandError } from "../../../internal/command-error.js";
|
|
2
|
+
import { Report } from "../../../internal/report.js";
|
|
3
3
|
import { Argument, Command } from "effect/cli";
|
|
4
|
-
import { CliExit } from "@effected/cli";
|
|
4
|
+
import { CliExit } from "@effected/cli-kit";
|
|
5
5
|
import { Changesets } from "@savvy-web/silk-effects";
|
|
6
6
|
import { Effect } from "effect";
|
|
7
7
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Report } from "../../../internal/report.js";
|
|
2
2
|
import { requireValidConfig } from "../utils/config-gate.js";
|
|
3
3
|
import { Command, Flag } from "effect/cli";
|
|
4
|
-
import { Doc } from "@effected/cli";
|
|
4
|
+
import { Doc } from "@effected/cli-kit";
|
|
5
5
|
import { Changesets } from "@savvy-web/silk-effects";
|
|
6
6
|
import { Effect } from "effect";
|
|
7
7
|
|
package/commands/check.js
CHANGED
|
@@ -4,7 +4,7 @@ import "./changeset/index.js";
|
|
|
4
4
|
import { commitCheckSection } from "./commit/check.js";
|
|
5
5
|
import { lintCheckSection } from "./lint/check.js";
|
|
6
6
|
import { Command, Flag } from "effect/cli";
|
|
7
|
-
import { CliExit, Doc } from "@effected/cli";
|
|
7
|
+
import { CliExit, Doc } from "@effected/cli-kit";
|
|
8
8
|
import { Effect, Result } from "effect";
|
|
9
9
|
|
|
10
10
|
// src/commands/check.ts
|
package/commands/clean/view.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { initialCleanState, progressDoc, reduceClean, summaryDoc } from "./progress.js";
|
|
2
|
-
import { DocView, useGlyphs } from "@effected/cli/ui";
|
|
2
|
+
import { DocView, useGlyphs } from "@effected/cli-kit/ui";
|
|
3
3
|
import { jsx } from "react/jsx-runtime";
|
|
4
4
|
|
|
5
5
|
// src/commands/clean/view.tsx
|
package/commands/clean.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { Report } from "../internal/report.js";
|
|
2
1
|
import { CommandError } from "../internal/command-error.js";
|
|
2
|
+
import { Report } from "../internal/report.js";
|
|
3
3
|
import { Command, Flag } from "effect/cli";
|
|
4
4
|
import { join, sep } from "node:path";
|
|
5
|
-
import { CliInteractive, Fmt } from "@effected/cli";
|
|
5
|
+
import { CliInteractive, Fmt } from "@effected/cli-kit";
|
|
6
6
|
import { Console, Effect, PubSub } from "effect";
|
|
7
7
|
import { WorkspaceDiscovery } from "@effected/workspaces";
|
|
8
8
|
import { glob, realpath, rm } from "node:fs/promises";
|
|
9
|
-
import { CliUi } from "@effected/cli/ui";
|
|
9
|
+
import { CliUi } from "@effected/cli-kit/ui";
|
|
10
10
|
|
|
11
11
|
// src/commands/clean.ts
|
|
12
12
|
/**
|
package/commands/commit/check.js
CHANGED
|
@@ -2,7 +2,7 @@ import { Report } from "../../internal/report.js";
|
|
|
2
2
|
import { hookTable } from "../check-section.js";
|
|
3
3
|
import { HUSKY_HOOK_PATH, POST_CHECKOUT_HOOK_PATH, POST_COMMIT_HOOK_PATH, POST_MERGE_HOOK_PATH } from "./constants.js";
|
|
4
4
|
import { SECTION_DEF, savvyCommitBlock } from "./init.js";
|
|
5
|
-
import { CliExit } from "@effected/cli";
|
|
5
|
+
import { CliExit } from "@effected/cli-kit";
|
|
6
6
|
import { ChangesetConfigReader, Commitlint, SavvyBaseSection, SavvyHooksSection, SavvyToolchainSection, savvyBasePreamble, savvyHooksHygiene, savvyInstallBlock, savvyToolchainCheck } from "@savvy-web/silk-effects";
|
|
7
7
|
import { Effect, FileSystem, Option } from "effect";
|
|
8
8
|
import { VersioningStrategy } from "@effected/workspaces";
|
package/commands/commit/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { runCommitInit } from "./init.js";
|
|
2
|
-
import { runCommitCheck } from "./check.js";
|
|
3
1
|
import { hookCommand } from "./hook.js";
|
|
4
2
|
import { lintCommand } from "./lint.js";
|
|
3
|
+
import { runCommitCheck } from "./check.js";
|
|
4
|
+
import { runCommitInit } from "./init.js";
|
|
5
5
|
import { Command } from "effect/cli";
|
|
6
6
|
|
|
7
7
|
// src/commands/commit/index.ts
|
package/commands/commit/init.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Report } from "../../internal/report.js";
|
|
2
1
|
import { CommandError } from "../../internal/command-error.js";
|
|
2
|
+
import { Report } from "../../internal/report.js";
|
|
3
3
|
import { HUSKY_HOOK_PATH, POST_CHECKOUT_HOOK_PATH, POST_COMMIT_HOOK_PATH, POST_MERGE_HOOK_PATH } from "./constants.js";
|
|
4
4
|
import { dirname } from "node:path";
|
|
5
5
|
import { SavvyBaseSection, SavvyHooksSection, SavvyToolchainSection, savvyBasePreamble, savvyHooksHygiene, savvyInstallBlock, savvyToolSection, savvyToolchainCheck } from "@savvy-web/silk-effects";
|
package/commands/init.js
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
|
-
import { Report } from "../internal/report.js";
|
|
2
1
|
import { CommandError } from "../internal/command-error.js";
|
|
2
|
+
import { confirmDestructive, yesFlag } from "../internal/confirm.js";
|
|
3
3
|
import { runChangesetInit } from "./changeset/commands/init.js";
|
|
4
|
+
import { Report } from "../internal/report.js";
|
|
4
5
|
import "./changeset/index.js";
|
|
5
6
|
import { HUSKY_HOOK_PATH } from "./commit/constants.js";
|
|
6
7
|
import { runCommitInit } from "./commit/init.js";
|
|
7
|
-
import { confirmDestructive, yesFlag } from "../internal/confirm.js";
|
|
8
8
|
import { runLintInit } from "./lint/init.js";
|
|
9
9
|
import { Command, Flag } from "effect/cli";
|
|
10
10
|
import { Lint } from "@savvy-web/silk-effects";
|
|
11
11
|
import { Effect, FileSystem } from "effect";
|
|
12
|
-
import { CliUi, Select } from "@effected/cli/ui";
|
|
12
|
+
import { CliUi, Select } from "@effected/cli-kit/ui";
|
|
13
13
|
|
|
14
14
|
// src/commands/init.ts
|
|
15
15
|
const DEFAULT_COMMIT_CONFIG = "lib/configs/commitlint.config.ts";
|
package/commands/lint/check.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Report } from "../../internal/report.js";
|
|
2
2
|
import { hookTable } from "../check-section.js";
|
|
3
3
|
import { BIOME_VERSION } from "./biome-version.js";
|
|
4
|
-
import { CliExit } from "@effected/cli";
|
|
4
|
+
import { CliExit } from "@effected/cli-kit";
|
|
5
5
|
import { ConfigDiscovery, Lint, SavvyBaseSection, SavvyHooksSection, SavvyToolchainSection, savvyBasePreamble, savvyHooksHygiene, savvyInstallBlock, savvyOkfBlock, savvyToolchainCheck } from "@savvy-web/silk-effects";
|
|
6
6
|
import { Effect, FileSystem, Option } from "effect";
|
|
7
7
|
import { Jsonc } from "@effected/jsonc";
|
package/commands/lint/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { runLintCheck } from "./check.js";
|
|
2
|
-
import { runLintInit } from "./init.js";
|
|
3
1
|
import { fmtCommand } from "./fmt.js";
|
|
4
2
|
import { runLintText, textCommand } from "./text.js";
|
|
3
|
+
import { runLintCheck } from "./check.js";
|
|
4
|
+
import { runLintInit } from "./init.js";
|
|
5
5
|
import { Command } from "effect/cli";
|
|
6
6
|
|
|
7
7
|
// src/commands/lint/index.ts
|
package/commands/lint/init.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Report } from "../../internal/report.js";
|
|
2
1
|
import { CommandError } from "../../internal/command-error.js";
|
|
2
|
+
import { Report } from "../../internal/report.js";
|
|
3
3
|
import { BIOME_VERSION } from "./biome-version.js";
|
|
4
4
|
import { dirname, join } from "node:path";
|
|
5
5
|
import { BiomeSchemaSync, LIFECYCLE_SCRIPTS_CONFIG_KEY, Lint, SavvyBaseSection, SavvyHooksSection, SavvyToolchainSection, publishesBuiltLinkDirectory, savvyBasePreamble, savvyHooksHygiene, savvyInstallBlock, savvyOkfBlock, savvyToolchainCheck } from "@savvy-web/silk-effects";
|
package/commands/lint/text.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { DisplayPath } from "../../internal/display-path.js";
|
|
2
2
|
import { Report } from "../../internal/report.js";
|
|
3
3
|
import { Argument, Command, Flag } from "effect/cli";
|
|
4
|
-
import { CliExit, Doc } from "@effected/cli";
|
|
4
|
+
import { CliExit, Doc } from "@effected/cli-kit";
|
|
5
5
|
import { Lint } from "@savvy-web/silk-effects";
|
|
6
6
|
import { Effect } from "effect";
|
|
7
7
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Report } from "../../../internal/report.js";
|
|
2
2
|
import { ReposCli } from "../shared.js";
|
|
3
3
|
import { Argument, Command, Flag, Prompt } from "effect/cli";
|
|
4
|
-
import { CliPrompt } from "@effected/cli";
|
|
4
|
+
import { CliPrompt } from "@effected/cli-kit";
|
|
5
5
|
import { Repos } from "@savvy-web/silk-effects";
|
|
6
6
|
import { Effect, Option } from "effect";
|
|
7
7
|
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { Report } from "../../../internal/report.js";
|
|
2
2
|
import { ReposCli } from "../shared.js";
|
|
3
3
|
import { Argument, Command, Flag } from "effect/cli";
|
|
4
|
-
import { CliInteractive } from "@effected/cli";
|
|
4
|
+
import { CliInteractive } from "@effected/cli-kit";
|
|
5
5
|
import { Repos } from "@savvy-web/silk-effects";
|
|
6
6
|
import { Effect, Option } from "effect";
|
|
7
|
-
import { CliUi, Select } from "@effected/cli/ui";
|
|
7
|
+
import { CliUi, Select } from "@effected/cli-kit/ui";
|
|
8
8
|
|
|
9
9
|
// src/commands/repos/commands/deregister.ts
|
|
10
10
|
/**
|
|
@@ -3,7 +3,7 @@ import { ReposCli } from "../shared.js";
|
|
|
3
3
|
import { Argument, Command, Flag } from "effect/cli";
|
|
4
4
|
import { Repos } from "@savvy-web/silk-effects";
|
|
5
5
|
import { Effect, Option } from "effect";
|
|
6
|
-
import { CliUi, Select } from "@effected/cli/ui";
|
|
6
|
+
import { CliUi, Select } from "@effected/cli-kit/ui";
|
|
7
7
|
|
|
8
8
|
// src/commands/repos/commands/note.ts
|
|
9
9
|
/**
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Report } from "../../../internal/report.js";
|
|
2
2
|
import { ReposCli } from "../shared.js";
|
|
3
3
|
import { Argument, Command, Flag } from "effect/cli";
|
|
4
|
-
import { CliInteractive, Doc } from "@effected/cli";
|
|
4
|
+
import { CliInteractive, Doc } from "@effected/cli-kit";
|
|
5
5
|
import { Repos } from "@savvy-web/silk-effects";
|
|
6
6
|
import { Effect, Option } from "effect";
|
|
7
7
|
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { Report } from "../../../internal/report.js";
|
|
2
1
|
import { confirmDestructive, yesFlag } from "../../../internal/confirm.js";
|
|
2
|
+
import { Report } from "../../../internal/report.js";
|
|
3
3
|
import { ReposCli } from "../shared.js";
|
|
4
4
|
import { Argument, Command, Flag } from "effect/cli";
|
|
5
|
-
import { Doc } from "@effected/cli";
|
|
5
|
+
import { Doc } from "@effected/cli-kit";
|
|
6
6
|
import { Repos } from "@savvy-web/silk-effects";
|
|
7
7
|
import { Effect, Option } from "effect";
|
|
8
8
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Report } from "../../../internal/report.js";
|
|
2
2
|
import { ReposCli } from "../shared.js";
|
|
3
3
|
import { Argument, Command, Flag } from "effect/cli";
|
|
4
|
-
import { Doc } from "@effected/cli";
|
|
4
|
+
import { Doc } from "@effected/cli-kit";
|
|
5
5
|
import { Repos } from "@savvy-web/silk-effects";
|
|
6
6
|
import { Effect, Option } from "effect";
|
|
7
7
|
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { Report } from "../../../internal/report.js";
|
|
2
1
|
import { confirmDestructive, yesFlag } from "../../../internal/confirm.js";
|
|
2
|
+
import { Report } from "../../../internal/report.js";
|
|
3
3
|
import { ReposCli } from "../shared.js";
|
|
4
4
|
import { Argument, Command, Flag } from "effect/cli";
|
|
5
|
-
import { CliExit, CliInteractive } from "@effected/cli";
|
|
5
|
+
import { CliExit, CliInteractive } from "@effected/cli-kit";
|
|
6
6
|
import { Repos } from "@savvy-web/silk-effects";
|
|
7
7
|
import { Effect } from "effect";
|
|
8
8
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Report } from "../../../internal/report.js";
|
|
2
2
|
import { ReposCli } from "../shared.js";
|
|
3
3
|
import { Command, Flag } from "effect/cli";
|
|
4
|
-
import { CliExit, CliFormat, Doc, Status } from "@effected/cli";
|
|
4
|
+
import { CliExit, CliFormat, Doc, Status } from "@effected/cli-kit";
|
|
5
5
|
import { Repos } from "@savvy-web/silk-effects";
|
|
6
6
|
import { Effect } from "effect";
|
|
7
7
|
|
package/commands/repos/shared.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { Report } from "../../internal/report.js";
|
|
2
|
-
import { FailureLine } from "../../internal/failure-line.js";
|
|
3
1
|
import { CommandError } from "../../internal/command-error.js";
|
|
2
|
+
import { FailureLine } from "../../internal/failure-line.js";
|
|
3
|
+
import { Report } from "../../internal/report.js";
|
|
4
4
|
import { CliError } from "effect/cli";
|
|
5
|
-
import { CliInteractive } from "@effected/cli";
|
|
5
|
+
import { CliInteractive } from "@effected/cli-kit";
|
|
6
6
|
import { Repos } from "@savvy-web/silk-effects";
|
|
7
7
|
import { Effect } from "effect";
|
|
8
|
-
import { CliUi, MultiSelect, Select, TextInput } from "@effected/cli/ui";
|
|
8
|
+
import { CliUi, MultiSelect, Select, TextInput } from "@effected/cli-kit/ui";
|
|
9
9
|
|
|
10
10
|
// src/commands/repos/shared.ts
|
|
11
11
|
/** What a person can do about each repos failure. */
|
package/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Block, Cancelled, CliDoc, CliDocSource, CliExit, CliLinks, CliTheme, Document } from "@effected/cli";
|
|
1
|
+
import { Block, Cancelled, CliDoc, CliDocSource, CliExit, CliLinks, CliTheme, Document } from "@effected/cli-kit";
|
|
2
2
|
import { BiomeSchemaSync, ChangesetConfigReader, Changesets, ConfigDiscovery, Repos } from "@savvy-web/silk-effects";
|
|
3
3
|
import { Cause, Effect, FileSystem, Path } from "effect";
|
|
4
4
|
import { CliError, Command } from "effect/cli";
|
|
@@ -172,7 +172,7 @@ export declare function runCheck<EChangeset, RChangeset, ECommit, RCommit, ELint
|
|
|
172
172
|
export declare const checkCommand: Command.Command<"check", {
|
|
173
173
|
readonly changesetDir: string;
|
|
174
174
|
readonly quiet: boolean;
|
|
175
|
-
}, {}, Error | import("@effected/jsonc").JsoncParseError | import("effect/PlatformError").PlatformError | import("@effected/templates").SectionFileError | import("@effected/templates").SectionParseError, import("@effected/env").Audience | import("@savvy-web/silk-effects").ChangesetConfigReader | CliExit | import("@effected/cli").CliLinks | import("@effected/cli").CliTheme | import("@savvy-web/silk-effects").ConfigDiscovery | import("effect/FileSystem").FileSystem | import("@effected/templates").ManagedSection | import("@effected/workspaces").PublishabilityDetector | import("@effected/env").TerminalEnv | import("@effected/commands").ToolDiscovery | import("@effected/workspaces").WorkspaceDiscovery>;
|
|
175
|
+
}, {}, Error | import("@effected/jsonc").JsoncParseError | import("effect/PlatformError").PlatformError | import("@effected/templates").SectionFileError | import("@effected/templates").SectionParseError, import("@effected/env").Audience | import("@savvy-web/silk-effects").ChangesetConfigReader | CliExit | import("@effected/cli-kit").CliLinks | import("@effected/cli-kit").CliTheme | import("@savvy-web/silk-effects").ConfigDiscovery | import("effect/FileSystem").FileSystem | import("@effected/templates").ManagedSection | import("@effected/workspaces").PublishabilityDetector | import("@effected/env").TerminalEnv | import("@effected/commands").ToolDiscovery | import("@effected/workspaces").WorkspaceDiscovery>;
|
|
176
176
|
/** What {@link commitCheckSection} needs from the environment. */
|
|
177
177
|
type CommitCheckRequirements = ManagedSection | FileSystem.FileSystem | ChangesetConfigReader | PublishabilityDetector | WorkspaceDiscovery;
|
|
178
178
|
/**
|
|
@@ -239,7 +239,7 @@ export declare const initCommand: Command.Command<"init", {
|
|
|
239
239
|
readonly commitConfig: string;
|
|
240
240
|
readonly lintConfig: string;
|
|
241
241
|
readonly lintPreset: LintPreset;
|
|
242
|
-
}, {}, Cancelled | CommandError, import("@savvy-web/silk-effects").BiomeSchemaSync | import("@effected/cli").CliExit | FileSystem.FileSystem | import("@effected/git").Git | import("@effected/templates").ManagedSection | import("@effected/workspaces").WorkspaceDiscovery | import("@effected/workspaces").WorkspaceRoot | ReportEnv>;
|
|
242
|
+
}, {}, Cancelled | CommandError, import("@savvy-web/silk-effects").BiomeSchemaSync | import("@effected/cli-kit").CliExit | FileSystem.FileSystem | import("@effected/git").Git | import("@effected/templates").ManagedSection | import("@effected/workspaces").WorkspaceDiscovery | import("@effected/workspaces").WorkspaceRoot | ReportEnv>;
|
|
243
243
|
/** What {@link lintCheckSection} needs from the environment. */
|
|
244
244
|
type LintCheckRequirements = ManagedSection | FileSystem.FileSystem | ToolDiscovery | ConfigDiscovery;
|
|
245
245
|
/**
|
|
@@ -283,7 +283,7 @@ export declare function runLintInit(opts: {
|
|
|
283
283
|
* errors from Effect's internal types. Task B7 should import and use this directly
|
|
284
284
|
* as `Command.withSubcommands([lintCommand])` — the cast is for declaration emit only.
|
|
285
285
|
*/
|
|
286
|
-
export declare const lintCommand: Command.Command<"lint", {}, {}, import("@effected/git").GitCommandError | import("@effected/git").NotARepositoryError | import("effect/PlatformError").PlatformError | import("@effected/git").UnknownRefError | import("@effected/yaml").YamlParseError, import("effect/process/ChildProcessSpawner").ChildProcessSpawner | import("@effected/cli").CliExit | import("effect/FileSystem").FileSystem | import("@effected/git").Git | import("effect/Path").Path | ReportEnv>;
|
|
286
|
+
export declare const lintCommand: Command.Command<"lint", {}, {}, import("@effected/git").GitCommandError | import("@effected/git").NotARepositoryError | import("effect/PlatformError").PlatformError | import("@effected/git").UnknownRefError | import("@effected/yaml").YamlParseError, import("effect/process/ChildProcessSpawner").ChildProcessSpawner | import("@effected/cli-kit").CliExit | import("effect/FileSystem").FileSystem | import("@effected/git").Git | import("effect/Path").Path | ReportEnv>;
|
|
287
287
|
/**
|
|
288
288
|
* Drift report handler; exported for tests.
|
|
289
289
|
*
|
package/internal/confirm.js
CHANGED
package/internal/failure-line.js
CHANGED
package/internal/report.js
CHANGED
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
import { Doc, Status } from "@effected/cli";
|
|
2
|
-
import { Effect } from "effect";
|
|
3
|
-
import { TerminalEnv } from "@effected/env";
|
|
1
|
+
import { Doc, Status } from "@effected/cli-kit";
|
|
4
2
|
|
|
5
3
|
// src/internal/report.ts
|
|
6
4
|
/** A status line, with any detail lines muted and indented under it. */
|
|
@@ -28,7 +26,7 @@ const item = (status, text, detail) => {
|
|
|
28
26
|
* `Report` covers what every command repeats: status items, headings, detail
|
|
29
27
|
* lines, the summary and the audience-aware print. Anything richer — a
|
|
30
28
|
* table, a titled section, a callout, a tree, a file link, a GitHub Actions
|
|
31
|
-
* annotation — is built with `Doc.*` from `@effected/cli` directly and mixed
|
|
29
|
+
* annotation — is built with `Doc.*` from `@effected/cli-kit` directly and mixed
|
|
32
30
|
* into the same document (both build `Block`s); `Report` deliberately does not
|
|
33
31
|
* re-wrap those constructors.
|
|
34
32
|
*
|
|
@@ -89,12 +87,13 @@ var Report = class {
|
|
|
89
87
|
* Render `doc` for the run's audience and write it to stdout.
|
|
90
88
|
*
|
|
91
89
|
* @remarks
|
|
92
|
-
* A terminal wraps to its width. A pipe has no width to honour
|
|
93
|
-
*
|
|
94
|
-
*
|
|
95
|
-
*
|
|
90
|
+
* A terminal wraps to its width. A pipe has no width to honour, so off a
|
|
91
|
+
* terminal nothing is wrapped and a long path or a `file:line:col` finding
|
|
92
|
+
* a caller greps stays on one line — the kit's own default for a human
|
|
93
|
+
* whose stdout is not a terminal (an agent's and CI's width is unbounded
|
|
94
|
+
* too).
|
|
96
95
|
*/
|
|
97
|
-
static print = (doc) =>
|
|
96
|
+
static print = (doc) => Doc.print(doc);
|
|
98
97
|
};
|
|
99
98
|
|
|
100
99
|
export { Report };
|
package/internal/version-line.js
CHANGED
|
@@ -1,18 +1,23 @@
|
|
|
1
|
-
import { distributionSuffix } from "@effected/engine";
|
|
2
|
-
|
|
3
1
|
// src/internal/version-line.ts
|
|
4
2
|
/**
|
|
3
|
+
* The `--version` line.
|
|
4
|
+
*
|
|
5
|
+
* @packageDocumentation
|
|
6
|
+
*/
|
|
7
|
+
/**
|
|
5
8
|
* Renders the `savvy --version` line: the same `<name> v<version>` shape
|
|
6
|
-
* `effect/cli`'s default formatter prints,
|
|
7
|
-
* `" via <carrier> <version>"` suffix
|
|
8
|
-
* carrier such as `@savvy-web/silk
|
|
9
|
+
* `effect/cli`'s default formatter prints, but plain even at a terminal (core's
|
|
10
|
+
* default paints it). The `" via <carrier> <version>"` suffix for a bin
|
|
11
|
+
* installed through a carrier such as `@savvy-web/silk` is not added here:
|
|
12
|
+
* `CliRuntime.main`'s `distribution` option appends it to whatever
|
|
13
|
+
* `formatVersion` is in effect.
|
|
9
14
|
*
|
|
10
15
|
* @internal
|
|
11
16
|
*/
|
|
12
17
|
var VersionLine = class {
|
|
13
18
|
constructor() {}
|
|
14
|
-
/** `savvy v1.2.3
|
|
15
|
-
static format = (name, version
|
|
19
|
+
/** `savvy v1.2.3`. */
|
|
20
|
+
static format = (name, version) => `${name} v${version}`;
|
|
16
21
|
};
|
|
17
22
|
|
|
18
23
|
export { VersionLine };
|
package/main.d.ts
CHANGED
package/main.js
CHANGED
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
import { FailureLine } from "./internal/failure-line.js";
|
|
2
1
|
import { AppLive, CliConfigLive, CliPlatform, rootCommand } from "./cli/index.js";
|
|
2
|
+
import { FailureLine } from "./internal/failure-line.js";
|
|
3
3
|
import { VersionLine } from "./internal/version-line.js";
|
|
4
4
|
import { CLI_VERSION } from "./version.js";
|
|
5
|
-
import { CliAudience, CliRuntime } from "@effected/cli";
|
|
6
|
-
import { Effect, Layer
|
|
5
|
+
import { CliAudience, CliRuntime } from "@effected/cli-kit";
|
|
6
|
+
import { Effect, Layer } from "effect";
|
|
7
7
|
import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
|
|
8
|
-
import { CurrentDistribution } from "@effected/engine";
|
|
9
8
|
|
|
10
9
|
// src/main.ts
|
|
11
10
|
/**
|
|
@@ -16,12 +15,13 @@ import { CurrentDistribution } from "@effected/engine";
|
|
|
16
15
|
* Runs `rootCommand` through `CliAudience.run`, which resolves `--audience`,
|
|
17
16
|
* `--human`, `--agent` and `--ci` before core parses, provides the merged
|
|
18
17
|
* `AppLive` stack and `CliConfigLive` (core's built-in flags minus
|
|
19
|
-
* `--wizard`), and hands the program to `@effected/cli`'s
|
|
18
|
+
* `--wizard`), and hands the program to `@effected/cli-kit`'s
|
|
20
19
|
* `CliRuntime.main`. Its `env` builds the presentation environment once — the
|
|
21
20
|
* audience (overridable through `SAVVY_AUDIENCE`), the terminal, the theme,
|
|
22
21
|
* editor links and the prompt gate — installs `CliLog` (diagnostics opt-in
|
|
23
22
|
* through `SAVVY_LOG_LEVEL`, every log line on stderr) and the coloured help
|
|
24
|
-
* formatter with
|
|
23
|
+
* formatter with a plain `--version` line, to which `distribution` appends
|
|
24
|
+
* the carrier suffix. `main` reports failures
|
|
25
25
|
* through that logger (a typed failure as one line, a defect as a bug
|
|
26
26
|
* report), applies the `CliExit` code a command set, and exits `64` on a
|
|
27
27
|
* usage error with the help document on stderr, so stdout stays clean for a
|
|
@@ -37,16 +37,16 @@ import { CurrentDistribution } from "@effected/engine";
|
|
|
37
37
|
* @public
|
|
38
38
|
*/
|
|
39
39
|
const main = (options = {}) => {
|
|
40
|
-
const
|
|
41
|
-
const program = CliAudience.run(rootCommand, { version: CLI_VERSION }).pipe(Effect.provide(Layer.merge(AppLive, CliConfigLive)), Effect.provideService(CurrentDistribution, distribution));
|
|
40
|
+
const program = CliAudience.run(rootCommand, { version: CLI_VERSION }).pipe(Effect.provide(Layer.merge(AppLive, CliConfigLive)));
|
|
42
41
|
NodeRuntime.runMain(CliRuntime.main(program, {
|
|
43
42
|
platform: CliPlatform,
|
|
44
43
|
env: {
|
|
45
44
|
audienceEnvVar: "SAVVY_AUDIENCE",
|
|
46
45
|
stderrIsTerminal: Effect.sync(() => process.stderr.isTTY === true),
|
|
47
46
|
log: { envVar: "SAVVY_LOG_LEVEL" },
|
|
48
|
-
formatter: { formatVersion:
|
|
47
|
+
formatter: { formatVersion: VersionLine.format }
|
|
49
48
|
},
|
|
49
|
+
distribution: options.distribution ?? null,
|
|
50
50
|
render: FailureLine.render,
|
|
51
51
|
helpOnUsageError: "stderr"
|
|
52
52
|
}));
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@savvy-web/cli",
|
|
3
|
-
"version": "3.7.
|
|
3
|
+
"version": "3.7.18",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The savvy CLI — unified commit, changeset, and lint commands for the Silk Suite",
|
|
6
6
|
"homepage": "https://github.com/savvy-web/systems/tree/main/packages/cli",
|
|
@@ -36,22 +36,22 @@
|
|
|
36
36
|
"savvy": "bin/savvy.js"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@effect/platform-node": "
|
|
40
|
-
"@effected/cli": "^0.
|
|
41
|
-
"@effected/commands": "^0.
|
|
42
|
-
"@effected/config-file": "^0.
|
|
43
|
-
"@effected/
|
|
44
|
-
"@effected/
|
|
45
|
-
"@effected/
|
|
46
|
-
"@effected/
|
|
47
|
-
"@effected/
|
|
48
|
-
"@effected/templates": "^0.
|
|
49
|
-
"@effected/toml": "^0.
|
|
50
|
-
"@effected/walker": "^0.
|
|
51
|
-
"@effected/workspaces": "^0.
|
|
52
|
-
"@effected/yaml": "^0.
|
|
53
|
-
"@savvy-web/silk-effects": "^
|
|
54
|
-
"effect": "
|
|
39
|
+
"@effect/platform-node": "~4.1.2",
|
|
40
|
+
"@effected/cli-kit": "^0.26.0",
|
|
41
|
+
"@effected/commands": "^0.20.0",
|
|
42
|
+
"@effected/config-file": "^0.24.0",
|
|
43
|
+
"@effected/env": "^0.10.0",
|
|
44
|
+
"@effected/git": "^0.30.0",
|
|
45
|
+
"@effected/glob": "^0.18.0",
|
|
46
|
+
"@effected/jsonc": "^0.23.0",
|
|
47
|
+
"@effected/kit": "^0.12.0",
|
|
48
|
+
"@effected/templates": "^0.17.0",
|
|
49
|
+
"@effected/toml": "^0.19.0",
|
|
50
|
+
"@effected/walker": "^0.25.0",
|
|
51
|
+
"@effected/workspaces": "^0.42.0",
|
|
52
|
+
"@effected/yaml": "^0.28.0",
|
|
53
|
+
"@savvy-web/silk-effects": "^11.0.1",
|
|
54
|
+
"effect": "~4.1.2",
|
|
55
55
|
"ink": "^8.0.0",
|
|
56
56
|
"react": "^19.3.1"
|
|
57
57
|
}
|