Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

refactor(cli): inline the confirmation error at each prompt

Andrejf359b467110e
diff --git a/packages/cli/src/admin/confirm-slug.ts b/packages/cli/src/admin/confirm-slug.ts
index a1841db05..9f9c933e6 100644
--- a/packages/cli/src/admin/confirm-slug.ts
+++ b/packages/cli/src/admin/confirm-slug.ts
@@ -3,7 +3,6 @@ import { Prompt } from "effect/cli";
import { Cancelled, InvalidArgument } from "../errors/errors.js";
import { note } from "../output/emit.js";
import { Output } from "../output/output.js";
-import { needsConfirmation } from "../prompts/needs-confirmation.js";
import { promptTheme } from "../prompts/prompt-theme.js";
export const confirmBySlug = Effect.fnUntraced(function* (options: {
@@ -14,7 +13,11 @@ export const confirmBySlug = Effect.fnUntraced(function* (options: {
}) {
if (options.yes) return;
const output = yield* Output;
- if (!output.interactive) return yield* needsConfirmation(options.action);
+ if (!output.interactive) {
+ return yield* new InvalidArgument({
+ message: `${options.action} needs confirmation. Pass --yes to confirm.`,
+ });
+ }
yield* note((ui) => [
"",
` ${ui.theme.danger(ui.glyphs.warning)} ${options.warning}`,
diff --git a/packages/cli/src/projects-write/confirm-by-key.ts b/packages/cli/src/projects-write/confirm-by-key.ts
index 37d9917f3..d58e244aa 100644
--- a/packages/cli/src/projects-write/confirm-by-key.ts
+++ b/packages/cli/src/projects-write/confirm-by-key.ts
@@ -1,9 +1,8 @@
import { Effect } from "effect";
import { Prompt } from "effect/cli";
-import { Cancelled } from "../errors/errors.js";
+import { Cancelled, InvalidArgument } from "../errors/errors.js";
import { note } from "../output/emit.js";
import { Output } from "../output/output.js";
-import { needsConfirmation } from "../prompts/needs-confirmation.js";
import { promptTheme } from "../prompts/prompt-theme.js";
function same(a: string, b: string): boolean {
@@ -21,7 +20,11 @@ export const confirmByKey = Effect.fnUntraced(function* (options: {
}) {
if (options.yes) return;
const output = yield* Output;
- if (!output.interactive) return yield* needsConfirmation(options.action);
+ if (!output.interactive) {
+ return yield* new InvalidArgument({
+ message: `${options.action} needs confirmation. Pass --yes to confirm.`,
+ });
+ }
yield* note((ui) => [
"",
` ${ui.theme.warning(ui.glyphs.warning)} ${options.warning}`,
diff --git a/packages/cli/src/prompts/confirm-destructive.ts b/packages/cli/src/prompts/confirm-destructive.ts
index 2e5873e23..696ab2add 100644
--- a/packages/cli/src/prompts/confirm-destructive.ts
+++ b/packages/cli/src/prompts/confirm-destructive.ts
@@ -1,8 +1,7 @@
import { Effect } from "effect";
-import { Cancelled } from "../errors/errors.js";
+import { Cancelled, InvalidArgument } from "../errors/errors.js";
import { Output } from "../output/output.js";
import { confirm } from "./confirm.js";
-import { needsConfirmation } from "./needs-confirmation.js";
export const confirmDestructive = Effect.fnUntraced(function* (options: {
readonly yes: boolean;
@@ -11,7 +10,11 @@ export const confirmDestructive = Effect.fnUntraced(function* (options: {
}) {
if (options.yes) return;
const output = yield* Output;
- if (!output.interactive) return yield* needsConfirmation(options.action);
+ if (!output.interactive) {
+ return yield* new InvalidArgument({
+ message: `${options.action} needs confirmation. Pass --yes to confirm.`,
+ });
+ }
const confirmed = yield* confirm(options.question);
if (!confirmed) return yield* new Cancelled();
});
diff --git a/packages/cli/src/prompts/needs-confirmation.ts b/packages/cli/src/prompts/needs-confirmation.ts
deleted file mode 100644
index 8883a1b93..000000000
--- a/packages/cli/src/prompts/needs-confirmation.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { InvalidArgument } from "../errors/errors.js";
-
-export function needsConfirmation(action: string): InvalidArgument {
- return new InvalidArgument({
- message: `${action} needs confirmation. Pass --yes to confirm.`,
- });
-}