Merge pull request #108 from giuseppesciacca/fix/106_issue_create_ano…

…ther_component_question_moment Fix/ #106 issue create another component question moment
Giuliano1993 · Apr 25, 2024 · bb3796c · bb3796c
2 parents f6d2589 + fa1e9ad
commit bb3796c
Show file tree

Hide file tree

Showing 16 changed files with 479 additions and 411 deletions.
diff --git a/src/utils/frameworks/angular/angular.mjs b/src/utils/frameworks/angular/angular.mjs
@@ -1,10 +1,10 @@
 const framework = "angular";
-export default function (componentName, folder, anotherComponent) {
-    return {
-        componentName: componentName,
-        framework: framework.toLowerCase(),
-        template: "component.component.ts",
-        folder: folder,
-        anotherComponent: anotherComponent,
-    };
+
+export default function (componentName, folder) {
+  return {
+    componentName,
+    framework: framework.toLowerCase(),
+    template: "component.component.ts",
+    folder: folder,
+  };
 }
diff --git a/src/utils/frameworks/angular/angular.mts b/src/utils/frameworks/angular/angular.mts
@@ -1,13 +1,10 @@
-import { Answers } from "../../wizard.mjs";
-
 const framework = "angular";
 
-export default function (componentName: string, folder: string, anotherComponent: boolean): Answers {
+export default function (componentName: string, folder: string) {
 	return {
-		componentName: componentName,
+		componentName,
 		framework: framework.toLowerCase(),
 		template: "component.component.ts",
 		folder: folder,
-		anotherComponent: anotherComponent,
 	};
 }
diff --git a/src/utils/frameworks/astro/astro.mjs b/src/utils/frameworks/astro/astro.mjs
@@ -1,10 +1,9 @@
 const framework = "astro";
-export default function (componentName, folder, anotherComponent) {
-    return {
-        componentName: componentName,
-        framework: framework.toLowerCase(),
-        template: "component.astro",
-        folder: folder,
-        anotherComponent: anotherComponent,
-    };
+export default function (componentName, folder) {
+  return {
+    componentName: componentName,
+    framework: framework.toLowerCase(),
+    template: "component.astro",
+    folder: folder,
+  };
 }
diff --git a/src/utils/frameworks/astro/astro.mts b/src/utils/frameworks/astro/astro.mts
@@ -1,11 +1,10 @@
 const framework = "astro";
 
-export default function (componentName: string, folder: string, anotherComponent: boolean) {
+export default function (componentName: string, folder: string) {
 	return {
 		componentName: componentName,
 		framework: framework.toLowerCase(),
 		template: "component.astro",
 		folder: folder,
-		anotherComponent: anotherComponent,
 	};
 }
diff --git a/src/utils/frameworks/qwik/qwik.mjs b/src/utils/frameworks/qwik/qwik.mjs
@@ -1,28 +1,28 @@
 import inquirer from "inquirer";
 const framework = "qwik";
-export default function (componentName, folder, anotherComponent) {
-    return inquirer
-        .prompt([
-        {
-            type: "list",
-            name: "type",
-            message: "Choose wich type of component to create",
-            choices: ["Hello World", "useStore", "useStyles"],
-        },
+export default function (componentName, folder) {
+  return inquirer
+    .prompt([
+      {
+        type: "list",
+        name: "type",
+        message: "Choose wich type of component to create",
+        choices: ["Hello World", "useStore", "useStyles"],
+      },
     ])
-        .then(answers => {
-        return {
-            componentName: componentName,
-            framework: framework.toLowerCase(),
-            template: answers.type === "Hello World"
-                ? "hello-world-component.tsx"
-                : answers.type === "useStore"
-                    ? "usestore-component.tsx"
-                    : answers.type === "useStyles"
-                        ? "usestyles-component.tsx"
-                        : "hello-world-component.tsx",
-            folder: folder,
-            anotherComponent: anotherComponent,
-        };
+    .then((answers) => {
+      return {
+        componentName: componentName,
+        framework: framework.toLowerCase(),
+        template:
+          answers.type === "Hello World"
+            ? "hello-world-component.tsx"
+            : answers.type === "useStore"
+            ? "usestore-component.tsx"
+            : answers.type === "useStyles"
+            ? "usestyles-component.tsx"
+            : "hello-world-component.tsx",
+        folder: folder,
+      };
     });
 }
diff --git a/src/utils/frameworks/qwik/qwik.mts b/src/utils/frameworks/qwik/qwik.mts
@@ -1,7 +1,7 @@
 import inquirer from "inquirer";
 
 const framework = "qwik";
-export default function (componentName: string, folder: string, anotherComponent: boolean) {
+export default function (componentName: string, folder: string) {
 	return inquirer
 		.prompt([
 			{
@@ -11,7 +11,7 @@ export default function (componentName: string, folder: string, anotherComponent
 				choices: ["Hello World", "useStore", "useStyles"],
 			},
 		])
-		.then(answers => {
+		.then((answers: { type: string }) => {
 			return {
 				componentName: componentName,
 				framework: framework.toLowerCase(),
@@ -24,7 +24,6 @@ export default function (componentName: string, folder: string, anotherComponent
 							  ? "usestyles-component.tsx"
 							  : "hello-world-component.tsx",
 				folder: folder,
-				anotherComponent: anotherComponent,
 			};
 		});
 }
diff --git a/src/utils/frameworks/react/react.mjs b/src/utils/frameworks/react/react.mjs
@@ -1,52 +1,48 @@
 import inquirer from "inquirer";
 const framework = "react";
-export default function (componentName, folder, anotherComponent) {
-    return inquirer
-        .prompt([
-        {
-            type: "confirm",
-            name: "typescript",
-            message: "Do you want to use Typescript?",
-            default: true,
-        },
+export default function (componentName, folder) {
+  return inquirer
+    .prompt([
+      {
+        type: "confirm",
+        name: "typescript",
+        message: "Do you want to use Typescript?",
+        default: true,
+      },
+      {
+        type: "list",
+        name: "css",
+        message: "Do you want to use any CSS framework?",
+        choices: ["Tailwind", "Styled Components", "CSS Module", "No"],
+        default: "No",
+      },
     ])
-        .then((answers) => {
-        const { typescript } = answers;
-        return inquirer
-            .prompt([
-            {
-                type: "list",
-                name: "css",
-                message: "Do you want to use any CSS framework?",
-                choices: ["Tailwind", "Styled Components", "CSS Module", "No"],
-                default: "No",
-            },
-        ])
-            .then((answers) => {
-            const { css } = answers;
-            const extension = typescript ? "tsx" : "jsx";
-            let templateBase = "function-component";
-            switch (css) {
-                case "Tailwind":
-                    templateBase += "-tailwind";
-                    break;
-                case "Styled Components":
-                    templateBase += "-styled-components";
-                    break;
-                case "CSS Module":
-                    templateBase += "-css-module";
-                    break;
-                default:
-                    break;
-            }
-            const template = `${templateBase}.${extension}`;
-            return {
-                componentName: componentName,
-                framework: framework.toLowerCase(),
-                template: template,
-                folder: folder,
-                anotherComponent: anotherComponent,
-            };
-        });
+    .then((answers) => {
+      const { typescript } = answers;
+      const { css } = answers;
+      const extension = typescript ? "tsx" : "jsx";
+      let templateBase = "function-component";
+
+      switch (css) {
+        case "Tailwind":
+          templateBase += "-tailwind";
+          break;
+        case "Styled Components":
+          templateBase += "-styled-components";
+          break;
+        case "CSS Module":
+          templateBase += "-css-module";
+          break;
+        default:
+          break;
+      }
+      const template = `${templateBase}.${extension}`;
+
+      return {
+        componentName: componentName,
+        framework: framework.toLowerCase(),
+        template: template,
+        folder: folder,
+      };
     });
 }
diff --git a/src/utils/frameworks/react/react.mts b/src/utils/frameworks/react/react.mts
@@ -2,7 +2,7 @@ import inquirer from "inquirer";
 
 const framework = "react";
 
-export default function (componentName: string, folder: string, anotherComponent: boolean) {
+export default function (componentName: string, folder: string) {
 	return inquirer
 		.prompt([
 			{
@@ -11,46 +11,40 @@ export default function (componentName: string, folder: string, anotherComponent
 				message: "Do you want to use Typescript?",
 				default: true,
 			},
+			{
+				type: "list",
+				name: "css",
+				message: "Do you want to use any CSS framework?",
+				choices: ["Tailwind", "Styled Components", "CSS Module", "No"],
+				default: "No",
+			},
 		])
-		.then((answers: { typescript: boolean }) => {
+		.then((answers: { typescript: boolean; css: string }) => {
 			const { typescript } = answers;
+			const { css } = answers;
+			const extension = typescript ? "tsx" : "jsx";
+			let templateBase = "function-component";
 
-			return inquirer
-				.prompt([
-					{
-						type: "list",
-						name: "css",
-						message: "Do you want to use any CSS framework?",
-						choices: ["Tailwind", "Styled Components", "CSS Module", "No"],
-						default: "No",
-					},
-				])
-				.then((answers: { css: string }) => {
-					const { css } = answers;
-					const extension = typescript ? "tsx" : "jsx";
-					let templateBase = "function-component";
-					switch (css) {
-						case "Tailwind":
-							templateBase += "-tailwind";
-							break;
-						case "Styled Components":
-							templateBase += "-styled-components";
-							break;
-						case "CSS Module":
-							templateBase += "-css-module";
-							break;
-						default:
-							break;
-					}
-					const template = `${templateBase}.${extension}`;
+			switch (css) {
+				case "Tailwind":
+					templateBase += "-tailwind";
+					break;
+				case "Styled Components":
+					templateBase += "-styled-components";
+					break;
+				case "CSS Module":
+					templateBase += "-css-module";
+					break;
+				default:
+					break;
+			}
+			const template = `${templateBase}.${extension}`;
 
-					return {
-						componentName: componentName,
-						framework: framework.toLowerCase(),
-						template: template,
-						folder: folder,
-						anotherComponent: anotherComponent,
-					};
-				});
+			return {
+				componentName: componentName,
+				framework: framework.toLowerCase(),
+				template: template,
+				folder: folder,
+			};
 		});
 }
diff --git a/src/utils/frameworks/svelte/svelte.mjs b/src/utils/frameworks/svelte/svelte.mjs
@@ -1,22 +1,23 @@
 import inquirer from "inquirer";
 const framework = "svelte";
-export default function (componentName, folder, anotherComponent) {
-    return inquirer
-        .prompt([
-        {
-            type: "confirm",
-            name: "typescript",
-            message: "Do you want to use Typescript?",
-            default: true,
-        },
+export default function (componentName, folder) {
+  return inquirer
+    .prompt([
+      {
+        type: "confirm",
+        name: "typescript",
+        message: "Do you want to use Typescript?",
+        default: true,
+      },
     ])
-        .then((answers) => {
-        return {
-            componentName: componentName,
-            framework: framework.toLowerCase(),
-            template: answers.typescript ? "component-ts.svelte" : "component-js.svelte",
-            folder: folder,
-            anotherComponent: anotherComponent,
-        };
+    .then((answers) => {
+      return {
+        componentName: componentName,
+        framework: framework.toLowerCase(),
+        template: answers.typescript
+          ? "component-ts.svelte"
+          : "component-js.svelte",
+        folder: folder,
+      };
     });
 }
diff --git a/src/utils/frameworks/svelte/svelte.mts b/src/utils/frameworks/svelte/svelte.mts
@@ -1,7 +1,7 @@
 import inquirer from "inquirer";
 
 const framework = "svelte";
-export default function (componentName: string, folder: string, anotherComponent: boolean) {
+export default function (componentName: string, folder: string) {
 	return inquirer
 		.prompt([
 			{
@@ -17,7 +17,6 @@ export default function (componentName: string, folder: string, anotherComponent
 				framework: framework.toLowerCase(),
 				template: answers.typescript ? "component-ts.svelte" : "component-js.svelte",
 				folder: folder,
-				anotherComponent: anotherComponent,
 			};
 		});
 }