Ready for V2

Author: Eventyret

src/index.ts

@@ -11,7 +11,7 @@ import {
   cancel,
 } from "@clack/prompts";
 import { detectStrapiProject } from "./utils/detection";
-import { runDockerizeWizard } from "./wizard";
+import { runWizard } from "./wizard";
 import { generatePluginCommand } from "./utils/plugin-generator";
 import { runPluginTests } from "./utils/plugin-tester";
 import { discoverPlugins, listDatabasePlugins } from "./plugins";
@@ -50,36 +50,8 @@ async function main() {
     }
   }
 
-  // Main dockerize flow
-  intro("🐳 Strapi Dockerize v2");
-
-  const project = await detectStrapiProject();
-
-  if (!project.isStrapi) {
-    outro("❌ This doesn't appear to be a Strapi project.");
-    process.exit(1);
-  }
-
-  // Show project details in a nice note
-  const projectInfo = [
-    `📦 Project: ${project.name}`,
-    `🚀 Strapi Version: ${project.version || "unknown"}`,
-    `📋 Package Manager: ${project.packageManager.toUpperCase()}`,
-    `🔧 Language: ${
-      project.type === "typescript" ? "TypeScript" : "JavaScript"
-    }`,
-  ];
-
-  note(projectInfo.join("\n"), "✅ Project detected");
-
-  await runDockerizeWizard(project);
-
-  outro("🎉 Docker setup complete!");
-
-  note(
-    "💙 Thanks for using Strapi Dockerize!\n\n⭐ If this tool helped you, please star it on GitHub:\n   https://github.com/strapi-community/strapi-tool-dockerize\n\n🐛 Found an issue? Report it:\n   https://github.com/strapi-community/strapi-tool-dockerize/issues",
-    "Support the project"
-  );
+  // Main dockerize flow - now simplified since runWizard handles everything
+  await runWizard();
 }
 
 async function testPluginsCommand() {

src/plugins/databases/mariadb/questions.ts

@@ -1,30 +1,70 @@
-import { text, select, password } from "@clack/prompts";
+import { text, select, password, note } from "@clack/prompts";
+
+export async function questions(defaults?: {
+  databaseName?: string;
+  databaseUser?: string;
+  databasePassword?: string;
+  databaseHost?: string;
+  databasePort?: number;
+}) {
+  // Generate secure random defaults if not provided
+  const randomDefaults = {
+    databaseName: defaults?.databaseName || generateRandomName("db"),
+    databaseUser: defaults?.databaseUser || generateRandomName("user"),
+    databasePassword: defaults?.databasePassword || generateSecurePassword(),
+    databaseHost: defaults?.databaseHost || "localhost",
+    databasePort: defaults?.databasePort || 3306,
+  };
 
-export async function questions() {
   const dbName = await text({
     message: "Database name (press Enter for default):",
-    placeholder: "strapi",
-    defaultValue: "strapi",
+    placeholder: randomDefaults.databaseName,
     validate: (value) => {
-      const val = value || "strapi";
+      const val =
+        (typeof value === "string" ? value.trim() : "") ||
+        randomDefaults.databaseName;
       if (!/^[a-zA-Z0-9_-]+$/.test(val)) {
         return "Database name can only contain letters, numbers, underscores and hyphens";
       }
     },
   });
 
+  const finalDbName =
+    (typeof dbName === "string" ? dbName.trim() : "") ||
+    randomDefaults.databaseName;
+
   const dbUser = await text({
     message: "Database user (press Enter for default):",
-    placeholder: "strapi",
-    defaultValue: "strapi",
+    placeholder: randomDefaults.databaseUser,
     validate: (value) => {
-      const val = value || "strapi";
+      const val =
+        (typeof value === "string" ? value.trim() : "") ||
+        randomDefaults.databaseUser;
       if (!/^[a-zA-Z0-9_-]+$/.test(val)) {
         return "Username can only contain letters, numbers, underscores and hyphens";
       }
     },
   });
 
+  const finalDbUser =
+    (typeof dbUser === "string" ? dbUser.trim() : "") ||
+    randomDefaults.databaseUser;
+
+  // Show what defaults were used if user left fields blank
+  const dbNameEmpty = !dbName || (typeof dbName === "string" && !dbName.trim());
+  const dbUserEmpty = !dbUser || (typeof dbUser === "string" && !dbUser.trim());
+
+  if (dbNameEmpty || dbUserEmpty) {
+    const usedDefaults = [];
+    if (dbNameEmpty) usedDefaults.push(`Database: ${finalDbName}`);
+    if (dbUserEmpty) usedDefaults.push(`User: ${finalDbUser}`);
+
+    note(
+      `Generated secure defaults:\n${usedDefaults.join("\n")}`,
+      "Auto-generated Values"
+    );
+  }
+
   const passwordType = await select({
     message: "How would you like to set the database password?",
     options: [
@@ -48,16 +88,17 @@ export async function questions() {
       },
     })) as string;
   } else {
-    dbPassword = generateSecurePassword();
-    console.log(`🔐 Generated password: ${dbPassword}`);
+    dbPassword = randomDefaults.databasePassword;
+    console.log(`🔐 Using secure password: ${dbPassword.substring(0, 4)}...`);
   }
 
   const dbPort = await text({
     message: "Database port (press Enter for default):",
-    placeholder: "3306",
-    defaultValue: "3306",
+    placeholder: String(randomDefaults.databasePort),
     validate: (value) => {
-      const val = value || "3306";
+      const val =
+        (typeof value === "string" ? value.trim() : "") ||
+        String(randomDefaults.databasePort);
       const port = parseInt(val);
       if (isNaN(port)) return "Port must be a number";
       if (port < 1024 || port > 65535)
@@ -66,14 +107,46 @@ export async function questions() {
   });
 
   return {
-    name: dbName || "strapi",
-    user: dbUser || "strapi",
+    name: finalDbName,
+    user: finalDbUser,
     password: dbPassword,
-    port: parseInt((dbPort as string) || "3306"),
-    host: "localhost",
+    port: parseInt(
+      (typeof dbPort === "string" ? dbPort.trim() : "") ||
+        String(randomDefaults.databasePort)
+    ),
+    host: randomDefaults.databaseHost,
   };
 }
 
+function generateRandomName(prefix: string): string {
+  const adjectives = [
+    "swift",
+    "bright",
+    "cosmic",
+    "noble",
+    "mystic",
+    "lunar",
+    "solar",
+    "crystal",
+  ];
+  const nouns = [
+    "falcon",
+    "phoenix",
+    "dragon",
+    "tiger",
+    "eagle",
+    "wolf",
+    "bear",
+    "lion",
+  ];
+
+  const adjective = adjectives[Math.floor(Math.random() * adjectives.length)];
+  const noun = nouns[Math.floor(Math.random() * nouns.length)];
+  const number = Math.floor(Math.random() * 100);
+
+  return `${prefix}_${adjective}_${noun}_${number}`;
+}
+
 function generateSecurePassword(): string {
   const chars =
     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*";

src/plugins/databases/mysql/questions.ts

@@ -1,30 +1,70 @@
-import { text, select, password } from "@clack/prompts";
+import { text, select, password, note } from "@clack/prompts";
+
+export async function questions(defaults?: {
+  databaseName?: string;
+  databaseUser?: string;
+  databasePassword?: string;
+  databaseHost?: string;
+  databasePort?: number;
+}) {
+  // Generate secure random defaults if not provided
+  const randomDefaults = {
+    databaseName: defaults?.databaseName || generateRandomName("db"),
+    databaseUser: defaults?.databaseUser || generateRandomName("user"),
+    databasePassword: defaults?.databasePassword || generateSecurePassword(),
+    databaseHost: defaults?.databaseHost || "localhost",
+    databasePort: defaults?.databasePort || 3306,
+  };
 
-export async function questions() {
   const dbName = await text({
     message: "Database name (press Enter for default):",
-    placeholder: "strapi",
-    defaultValue: "strapi",
+    placeholder: randomDefaults.databaseName,
     validate: (value) => {
-      const val = value || "strapi";
+      const val =
+        (typeof value === "string" ? value.trim() : "") ||
+        randomDefaults.databaseName;
       if (!/^[a-zA-Z0-9_-]+$/.test(val)) {
         return "Database name can only contain letters, numbers, underscores and hyphens";
       }
     },
   });
 
+  const finalDbName =
+    (typeof dbName === "string" ? dbName.trim() : "") ||
+    randomDefaults.databaseName;
+
   const dbUser = await text({
     message: "Database user (press Enter for default):",
-    placeholder: "strapi",
-    defaultValue: "strapi",
+    placeholder: randomDefaults.databaseUser,
     validate: (value) => {
-      const val = value || "strapi";
+      const val =
+        (typeof value === "string" ? value.trim() : "") ||
+        randomDefaults.databaseUser;
       if (!/^[a-zA-Z0-9_-]+$/.test(val)) {
         return "Username can only contain letters, numbers, underscores and hyphens";
       }
     },
   });
 
+  const finalDbUser =
+    (typeof dbUser === "string" ? dbUser.trim() : "") ||
+    randomDefaults.databaseUser;
+
+  // Show what defaults were used if user left fields blank
+  const dbNameEmpty = !dbName || (typeof dbName === "string" && !dbName.trim());
+  const dbUserEmpty = !dbUser || (typeof dbUser === "string" && !dbUser.trim());
+
+  if (dbNameEmpty || dbUserEmpty) {
+    const usedDefaults = [];
+    if (dbNameEmpty) usedDefaults.push(`Database: ${finalDbName}`);
+    if (dbUserEmpty) usedDefaults.push(`User: ${finalDbUser}`);
+
+    note(
+      `Generated secure defaults:\n${usedDefaults.join("\n")}`,
+      "Auto-generated Values"
+    );
+  }
+
   const passwordType = await select({
     message: "How would you like to set the database password?",
     options: [
@@ -48,16 +88,17 @@ export async function questions() {
       },
     })) as string;
   } else {
-    dbPassword = generateSecurePassword();
-    console.log(`🔐 Generated password: ${dbPassword}`);
+    dbPassword = randomDefaults.databasePassword;
+    console.log(`🔐 Using secure password: ${dbPassword.substring(0, 4)}...`);
   }
 
   const dbPort = await text({
     message: "Database port (press Enter for default):",
-    placeholder: "3306",
-    defaultValue: "3306",
+    placeholder: String(randomDefaults.databasePort),
     validate: (value) => {
-      const val = value || "3306";
+      const val =
+        (typeof value === "string" ? value.trim() : "") ||
+        String(randomDefaults.databasePort);
       const port = parseInt(val);
       if (isNaN(port)) return "Port must be a number";
       if (port < 1024 || port > 65535)
@@ -66,14 +107,46 @@ export async function questions() {
   });
 
   return {
-    name: dbName || "strapi",
-    user: dbUser || "strapi",
+    name: finalDbName,
+    user: finalDbUser,
     password: dbPassword,
-    port: parseInt((dbPort as string) || "3306"),
-    host: "localhost",
+    port: parseInt(
+      (typeof dbPort === "string" ? dbPort.trim() : "") ||
+        String(randomDefaults.databasePort)
+    ),
+    host: randomDefaults.databaseHost,
   };
 }
 
+function generateRandomName(prefix: string): string {
+  const adjectives = [
+    "swift",
+    "bright",
+    "cosmic",
+    "noble",
+    "mystic",
+    "lunar",
+    "solar",
+    "crystal",
+  ];
+  const nouns = [
+    "falcon",
+    "phoenix",
+    "dragon",
+    "tiger",
+    "eagle",
+    "wolf",
+    "bear",
+    "lion",
+  ];
+
+  const adjective = adjectives[Math.floor(Math.random() * adjectives.length)];
+  const noun = nouns[Math.floor(Math.random() * nouns.length)];
+  const number = Math.floor(Math.random() * 100);
+
+  return `${prefix}_${adjective}_${noun}_${number}`;
+}
+
 function generateSecurePassword(): string {
   const chars =
     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*";