refactor: project prompts (#365)

* refactor: project prompts * fix: specs * 1.17.6
pankod · Sep 27, 2023 · 996db08 · 996db08
1 parent 671d16e
commit 996db08
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 18 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "superplate-cli",
-    "version": "1.17.5",
+    "version": "1.17.6",
     "description": "The frontend boilerplate with superpowers",
     "license": "MIT",
     "repository": {

diff --git a/src/Helper/humanize/index.ts b/src/Helper/humanize/index.ts
@@ -1,6 +1,7 @@
 export const HumanizeChoices = {
     get: (
         choice: string,
+        projectType?: string,
     ): { title: string; description: string; value: string } => {
         switch (choice) {
             case "react":
@@ -17,28 +18,35 @@ export const HumanizeChoices = {
                 };
             case "refine-vite":
                 return {
-                    title: "refine(Vite)",
+                    title: projectType === "refine" ? "Vite" : "refine (Vite)",
                     description:
                         "Creates a refine React Vite project (Recommended for CRUD applications).",
                     value: choice,
                 };
             case "refine-nextjs":
                 return {
-                    title: "refine(Next.js)",
+                    title:
+                        projectType === "refine"
+                            ? "Next.js"
+                            : "refine (Next.js)",
                     description:
                         "Creates a refine Next.js project with SSR support (Recommended for CRUD applications).",
                     value: choice,
                 };
             case "refine-remix":
                 return {
-                    title: "refine(Remix)",
+                    title:
+                        projectType === "refine" ? "Remix" : "refine (Remix)",
                     description:
                         "Creates a refine Remix project with SSR support (Recommended for CRUD applications)",
                     value: choice,
                 };
             case "refine-react":
                 return {
-                    title: "refine(CRA) [Legacy]",
+                    title:
+                        projectType === "refine"
+                            ? "CRA [Legacy]"
+                            : "refine (CRA) [Legacy]",
                     description:
                         "Creates a basic refine project (Recommended for CRUD applications)",
                     value: choice,

diff --git a/src/Helper/source/index.spec.ts b/src/Helper/source/index.spec.ts
@@ -39,12 +39,12 @@ describe("Source Helper", () => {
                     { title: "Refine Remix", value: "refine-remix" },
                 ],
                 expectedOutput: [
-                    { title: "React", value: "react" },
-                    { title: "Next.js", value: "nextjs" },
                     { title: "Refine Vite", value: "refine-vite" },
                     { title: "Refine Next.js", value: "refine-nextjs" },
                     { title: "Refine Remix", value: "refine-remix" },
                     { title: "Refine React", value: "refine-react" },
+                    { title: "React", value: "react" },
+                    { title: "Next.js", value: "nextjs" },
                 ],
             },
             {
@@ -57,12 +57,12 @@ describe("Source Helper", () => {
                     { title: "Refine Vite", value: "refine-vite" },
                 ],
                 expectedOutput: [
-                    { title: "React", value: "react" },
-                    { title: "Next.js", value: "nextjs" },
                     { title: "Refine Vite", value: "refine-vite" },
                     { title: "Refine Next.js", value: "refine-nextjs" },
                     { title: "Refine Remix", value: "refine-remix" },
                     { title: "Refine React", value: "refine-react" },
+                    { title: "React", value: "react" },
+                    { title: "Next.js", value: "nextjs" },
                 ],
             },
             {

diff --git a/src/Helper/source/index.ts b/src/Helper/source/index.ts
@@ -108,12 +108,12 @@ export const sort_project_types = (
     projectTypes: { title: string; value: string }[],
 ): { title: string; value: string }[] => {
     const order: Record<string, number> = {
-        react: 1,
-        nextjs: 2,
-        "refine-vite": 3,
-        "refine-nextjs": 4,
-        "refine-remix": 5,
-        "refine-react": 6,
+        "refine-vite": 1,
+        "refine-nextjs": 2,
+        "refine-remix": 3,
+        "refine-react": 4,
+        react: 5,
+        nextjs: 6,
     };
 
     const newProjectTypes = [...projectTypes];
@@ -174,7 +174,7 @@ export const prompt_project_types = async (
                 ? filteredWithContains
                 : types
             )
-                .map((p) => HumanizeChoices.get(p.title))
+                .map((p) => HumanizeChoices.get(p.title, typeFromArgs))
                 .map((p) => ({
                     type: "select",
                     name: p.value,