From abe3dddf2385d2d60019b0c92a158ffc20ea913d Mon Sep 17 00:00:00 2001
From: Abdallah <33910565+body20002@users.noreply.github.com>
Date: Mon, 25 Nov 2024 08:11:29 +0200
Subject: [PATCH] fix(cli): fix -y flag in generate.ts (#631)

---
 packages/cli/src/commands/generate.ts | 76 +++++++++------------------
 1 file changed, 24 insertions(+), 52 deletions(-)

diff --git a/packages/cli/src/commands/generate.ts b/packages/cli/src/commands/generate.ts
index 2de442ab78..e4654986c1 100644
--- a/packages/cli/src/commands/generate.ts
+++ b/packages/cli/src/commands/generate.ts
@@ -56,35 +56,20 @@ export async function generateAction(opts: any) {
 		process.exit(0);
 	}
 	if (schema.append || schema.overwrite) {
-		if (options.y) {
-			const exist = existsSync(path.join(cwd, schema.fileName));
-			if (!exist) {
-				await fs.mkdir(path.dirname(path.join(cwd, schema.fileName)), {
-					recursive: true,
-				});
-			}
-			if (schema.overwrite) {
-				await fs.writeFile(path.join(cwd, schema.fileName), schema.code);
-			} else {
-				await fs.appendFile(path.join(cwd, schema.fileName), schema.code);
-			}
-			logger.info(
-				`🚀 Schema was ${
-					schema.overwrite ? "overwritten" : "appended"
-				} successfully!`,
-			);
-			process.exit(0);
+		let confirm = options.y;
+		if (!confirm) {
+			const response = await prompts({
+				type: "confirm",
+				name: "confirm",
+				message: `The file ${
+					schema.fileName
+				} already exists. Do you want to ${chalk.yellow(
+					`${schema.overwrite ? "overwrite" : "append"}`,
+				)} the schema to the file?`,
+			});
+			confirm = response.confirm;
 		}
 
-		const { confirm } = await prompts({
-			type: "confirm",
-			name: "confirm",
-			message: `The file ${
-				schema.fileName
-			} already exists. Do you want to ${chalk.yellow(
-				`${schema.overwrite ? "overwrite" : "append"}`,
-			)} the schema to the file?`,
-		});
 		if (confirm) {
 			const exist = existsSync(path.join(cwd, schema.fileName));
 			if (!exist) {
@@ -109,32 +94,19 @@ export async function generateAction(opts: any) {
 		}
 	}
 
-	if (options.y) {
-		if (!options.output) {
-			const dirExist = existsSync(
-				path.dirname(path.join(cwd, schema.fileName)),
-			);
-			if (!dirExist) {
-				await fs.mkdir(path.dirname(path.join(cwd, schema.fileName)), {
-					recursive: true,
-				});
-			}
-		}
-		await fs.writeFile(
-			options.output || path.join(cwd, schema.fileName),
-			schema.code,
-		);
-		logger.success(`🚀 Schema was generated successfully!`);
-		process.exit(0);
+	let confirm = options.y;
+
+	if (!confirm) {
+		const response = await prompts({
+			type: "confirm",
+			name: "confirm",
+			message: `Do you want to generate the schema to ${chalk.yellow(
+				schema.fileName,
+			)}?`,
+		});
+		confirm = response.confirm;
 	}
 
-	const { confirm } = await prompts({
-		type: "confirm",
-		name: "confirm",
-		message: `Do you want to generate the schema to ${chalk.yellow(
-			schema.fileName,
-		)}?`,
-	});
 	if (!confirm) {
 		logger.error("Schema generation aborted.");
 		process.exit(1);
@@ -167,5 +139,5 @@ export const generate = new Command("generate")
 		"the path to the configuration file. defaults to the first configuration file found.",
 	)
 	.option("--output <output>", "the file to output to the generated schema")
-	.option("-y, --yes", "automatically answer yes to all prompts")
+	.option("-y, --y", "automatically answer yes to all prompts", false)
 	.action(generateAction);