create-prisma-php-app 1.18.502 → 1.18.504

package/dist/index.js

@@ -462,7 +462,7 @@ DATABASE_URL="postgresql://johndoe:randompassword@localhost:5432/mydb?schema=pub
   await createUpdateGitignoreFile(baseDir, ["vendor", ".env", "node_modules"]);
 }
 async function getAnswer(predefinedAnswers = {}) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
   console.log("🚀 ~ predefinedAnswers:", predefinedAnswers);
   const questionsArray = [];
   if (!predefinedAnswers.projectName) {
@@ -483,18 +483,9 @@ async function getAnswer(predefinedAnswers = {}) {
       inactive: "No",
     });
   }
-  if (!predefinedAnswers.backendOnly && !predefinedAnswers.tailwindcss) {
-    questionsArray.push({
-      type: "toggle",
-      name: "tailwindcss",
-      message: `Would you like to use ${chalk.blue("Tailwind CSS")}?`,
-      initial: true,
-      active: "Yes",
-      inactive: "No",
-    });
-  }
+  const nonBackendOnlyQuestionsArray = [];
   if (!predefinedAnswers.websocket) {
-    questionsArray.push({
+    nonBackendOnlyQuestionsArray.push({
       type: "toggle",
       name: "websocket",
       message: `Would you like to use ${chalk.blue("Websocket")}?`,
@@ -504,7 +495,7 @@ async function getAnswer(predefinedAnswers = {}) {
     });
   }
   if (!predefinedAnswers.prisma) {
-    questionsArray.push({
+    nonBackendOnlyQuestionsArray.push({
       type: "toggle",
       name: "prisma",
       message: `Would you like to use ${chalk.blue("Prisma PHP ORM")}?`,
@@ -514,7 +505,7 @@ async function getAnswer(predefinedAnswers = {}) {
     });
   }
   if (!predefinedAnswers.docker) {
-    questionsArray.push({
+    nonBackendOnlyQuestionsArray.push({
       type: "toggle",
       name: "docker",
       message: `Would you like to use ${chalk.blue("Docker")}?`,
@@ -523,52 +514,90 @@ async function getAnswer(predefinedAnswers = {}) {
       inactive: "No",
     });
   }
-  const questions = questionsArray;
-  console.log("🚀 ~ questions:", questions);
-  if (questions.length === 0 && predefinedAnswers.projectName) {
-    return predefinedAnswers;
-  }
+  // Execute the questionsArray first to determine the backendOnly option
   const onCancel = () => {
     console.log(chalk.red("Operation cancelled by the user."));
     process.exit(0);
   };
-  try {
-    const response = await prompts(questions, { onCancel });
-    console.log("🚀 ~ response:", response);
-    if (Object.keys(response).length === 0) {
-      return null;
-    }
+  const initialResponse = await prompts(questionsArray, { onCancel });
+  console.log("🚀 ~ initialResponse:", initialResponse);
+  if (initialResponse.backendOnly) {
     return {
-      projectName: response.projectName
-        ? String(response.projectName).trim().replace(/ /g, "-")
+      projectName: initialResponse.projectName
+        ? String(initialResponse.projectName).trim().replace(/ /g, "-")
         : (_a = predefinedAnswers.projectName) !== null && _a !== void 0
         ? _a
         : "my-app",
-      backendOnly:
-        (_b = response.backendOnly) !== null && _b !== void 0
-          ? _b
-          : predefinedAnswers.backendOnly,
-      tailwindcss:
-        (_c = response.tailwindcss) !== null && _c !== void 0
-          ? _c
-          : predefinedAnswers.tailwindcss,
+      backendOnly: initialResponse.backendOnly,
+      tailwindcss: false, // Automatically set to false if backendOnly is true
       websocket:
-        (_d = response.websocket) !== null && _d !== void 0
-          ? _d
-          : predefinedAnswers.websocket,
+        (_b = predefinedAnswers.websocket) !== null && _b !== void 0
+          ? _b
+          : false,
       prisma:
-        (_e = response.prisma) !== null && _e !== void 0
-          ? _e
-          : predefinedAnswers.prisma,
+        (_c = predefinedAnswers.prisma) !== null && _c !== void 0 ? _c : false,
       docker:
-        (_f = response.docker) !== null && _f !== void 0
-          ? _f
-          : predefinedAnswers.docker,
+        (_d = predefinedAnswers.docker) !== null && _d !== void 0 ? _d : false,
     };
-  } catch (error) {
-    console.error(chalk.red("Prompt error:"), error);
-    return null;
   }
+  // If it's not backend-only, add Tailwind CSS question to the front of nonBackendOnlyQuestionsArray
+  if (!predefinedAnswers.tailwindcss) {
+    nonBackendOnlyQuestionsArray.unshift({
+      type: "toggle",
+      name: "tailwindcss",
+      message: `Would you like to use ${chalk.blue("Tailwind CSS")}?`,
+      initial: true,
+      active: "Yes",
+      inactive: "No",
+    });
+  }
+  // Now ask the rest of the questions
+  const nonBackendOnlyResponse = await prompts(nonBackendOnlyQuestionsArray, {
+    onCancel,
+  });
+  console.log("🚀 ~ nonBackendOnlyResponse:", nonBackendOnlyResponse);
+  return {
+    projectName: initialResponse.projectName
+      ? String(initialResponse.projectName).trim().replace(/ /g, "-")
+      : (_e = predefinedAnswers.projectName) !== null && _e !== void 0
+      ? _e
+      : "my-app",
+    backendOnly:
+      (_g =
+        (_f = initialResponse.backendOnly) !== null && _f !== void 0
+          ? _f
+          : predefinedAnswers.backendOnly) !== null && _g !== void 0
+        ? _g
+        : false,
+    tailwindcss:
+      (_j =
+        (_h = nonBackendOnlyResponse.tailwindcss) !== null && _h !== void 0
+          ? _h
+          : predefinedAnswers.tailwindcss) !== null && _j !== void 0
+        ? _j
+        : false,
+    websocket:
+      (_l =
+        (_k = nonBackendOnlyResponse.websocket) !== null && _k !== void 0
+          ? _k
+          : predefinedAnswers.websocket) !== null && _l !== void 0
+        ? _l
+        : false,
+    prisma:
+      (_o =
+        (_m = nonBackendOnlyResponse.prisma) !== null && _m !== void 0
+          ? _m
+          : predefinedAnswers.prisma) !== null && _o !== void 0
+        ? _o
+        : false,
+    docker:
+      (_q =
+        (_p = nonBackendOnlyResponse.docker) !== null && _p !== void 0
+          ? _p
+          : predefinedAnswers.docker) !== null && _q !== void 0
+        ? _q
+        : false,
+  };
 }
 /**
  * Install dependencies in the specified directory.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-prisma-php-app",
-  "version": "1.18.502",
+  "version": "1.18.504",
   "description": "Prisma-PHP: A Revolutionary Library Bridging PHP with Prisma ORM",
   "main": "dist/index.js",
   "type": "module",