Merge pull request #34 from expressots/refactor/cli-v290-adjustments

Refactor/cli v290 adjustments
expressots · Mar 20, 2024 · 51d675f · 51d675f
2 parents f758f1b + 1782206
commit 51d675f
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 40 deletions.
diff --git a/src/new/cli.ts b/src/new/cli.ts
@@ -1,47 +1,47 @@
 import { Argv, CommandModule } from "yargs";
 import { projectForm } from "./form";
 
-// eslint-disable-next-line @typescript-eslint/ban-types
-type CommandModuleArgs = {};
+type CommandModuleArgs = object;
 
-const createProject = (): CommandModule<CommandModuleArgs, any> => {
-	const packageManagers: Array<string> = ["npm", "yarn", "pnpm"];
+const packageManagers: Array<string> = [
+	"npm",
+	"yarn",
+	"pnpm",
+	...(process.platform !== "win32" ? ["bun"] : []),
+];
 
-	if (process.platform !== "win32") {
-		packageManagers.push("bun");
-	}
+const commandOptions = (yargs: Argv): Argv => {
+	return yargs
+		.positional("project-name", {
+			describe: "The name of the project",
+			type: "string",
+		})
+		.option("template", {
+			describe: "The project template to use",
+			type: "string",
+			choices: ["opinionated", "non-opinionated"],
+			alias: "t",
+		})
+		.option("package-manager", {
+			describe: "The package manager to use",
+			type: "string",
+			choices: packageManagers,
+			alias: "p",
+		})
+		.option("directory", {
+			describe: "The directory for new project",
+			type: "string",
+			alias: "d",
+		})
+		.implies("package-manager", "template")
+		.implies("template", "package-manager");
+};
 
+const createProject = (): CommandModule<CommandModuleArgs, any> => {
 	return {
 		command: "new <project-name> [package-manager] [template] [directory]",
 		describe: "Create a new project",
-		builder: (yargs: Argv): Argv => {
-			yargs
-				.positional("project-name", {
-					describe: "The name of the project",
-					type: "string",
-				})
-				.option("template", {
-					describe: "The project template to use",
-					type: "string",
-					choices: ["opinionated", "non-opinionated"],
-					alias: "t",
-				})
-				.option("package-manager", {
-					describe: "The package manager to use",
-					type: "string",
-					choices: packageManagers,
-					alias: "p",
-				})
-				.option("directory", {
-					describe: "The directory for new project",
-					type: "string",
-					alias: "d",
-				})
-				.implies("package-manager", "template")
-				.implies("template", "package-manager");
-
-			return yargs;
-		},
+		builder: commandOptions,
 		handler: async ({
 			projectName,
 			packageManager,

diff --git a/src/new/form.ts b/src/new/form.ts
@@ -80,8 +80,8 @@ function changePackageName({
 }
 
 enum Template {
-	"non-opinionated" = "Non-Opinionated :: A simple ExpressoTS project.",
-	opinionated = "Opinionated :: A complete ExpressoTS project with an opinionated structure and features.",
+	"non-opinionated" = "Non-Opinionated :: Allows users to choose where to scaffold resources, offering flexible project organization.",
+	opinionated = "Opinionated :: Automatically scaffolds resources into a preset project structure. (Recommended)",
 }
 
 const enum PackageManager {
@@ -145,8 +145,10 @@ const projectForm = async (projectName: string, args: any[]): Promise<void> => {
 				name: "template",
 				message: "Select a template",
 				choices: [
-					"Opinionated :: A complete ExpressoTS project with an opinionated structure and features.",
-					"Non-Opinionated :: A simple ExpressoTS project.",
+					`Opinionated :: Automatically scaffolds resources into a preset project structure. (${chalk.yellow(
+						"Recommended",
+					)})`,
+					"Non-Opinionated :: Allows users to choose where to scaffold resources, offering flexible project organization.",
 				],
 			},
 			{
@@ -239,7 +241,7 @@ const projectForm = async (projectName: string, args: any[]): Promise<void> => {
 
 		console.log("\n");
 		console.log(
-			"🐎 Project ",
+			"🐎 Project",
 			chalk.green(answer.name),
 			"created successfully!",
 		);
@@ -277,6 +279,7 @@ const projectForm = async (projectName: string, args: any[]): Promise<void> => {
 				),
 			),
 		);
+		console.log("\n");
 	}
 };