express-modular-monolith 1.2.0 → 1.2.1

package/bin/cli.js

@@ -6,52 +6,19 @@ import { exec as execCallback } from "node:child_process";
 import { promisify } from "node:util";
 import fs from "node:fs/promises";
 import process from "node:process";
-import { select } from "@inquirer/prompts";
-import { projectName, language, DB } from "./cliQuestions.js";
+import { projectName, language, DB, selectToolByDB } from "./cliQuestions.js";
 import { dbPackages } from "./packages.js";
-import ora from "ora";
-import { addEnvBasedOnDBs, JSboilerPlateCodeSetUp, DBboilerCodeSetUp, TSboilerPlateCodeSetUp } from "./config.js";
+import chalk from "chalk"
+import { addEnvBasedOnDBs, JSboilerPlateCodeSetUp, DBboilerCodeSetUp, TSboilerPlateCodeSetUp, spinnerDiscardingStdin } from "./config.js";
 
 
 const exec = promisify(execCallback);
 
-const spinnerDiscardingStdin = ora({
-	text: "Loading Packages",
-	spinner: process.argv[2],
-    color: "cyan"
-});
-
-
-let modelTool;
-
-if (DB === "mongodb") {
-  modelTool = await select({
-    message: "Choose ODM:",
-    choices: [
-      {
-        name: "Mongoose",
-        value: "mongoose"
-      }
-    ]
-  });
-} else {
-  modelTool = await select({
-    message: "Choose ORM:",
-    choices: [
-      {
-        name: "Drizzle",
-        value: "drizzle"
-      },
-      {
-        name: "Prisma",
-        value: "prisma"
-      }
-    ]
-  });
-}
+const modelTool = await selectToolByDB()
 
 spinnerDiscardingStdin.start("Installing required packages, wait for a while");
 
+
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
@@ -68,29 +35,38 @@ const packageJson = JSON.parse(
 
 if (projectName === ".") {
   packageJson.name = path.basename(process.cwd());
-}else{
+} else{
   packageJson.name = projectName;
 }
 
-const selectedPackages = dbPackages[DB][modelTool];
+const loadDependenciesByDB = async () => {
 
-packageJson.dependencies = {
-  ...packageJson.dependencies,
-  ...selectedPackages.dependencies
-};
+  if(DB === "none") return;
 
-packageJson.devDependencies = {
-  ...packageJson.devDependencies,
-  ...selectedPackages.devDependencies
-};
+  const selectedPackages = dbPackages[DB][modelTool];
+
+  packageJson.dependencies = {
+    ...packageJson.dependencies,
+    ...selectedPackages.dependencies
+  };
+
+  packageJson.devDependencies = {
+    ...packageJson.devDependencies,
+    ...selectedPackages.devDependencies
+  };
+
+  await fs.writeFile(
+    packageJsonPath,
+    JSON.stringify(packageJson, null, 2)
+  ).catch((err)=>{
+    spinnerDiscardingStdin.fail(err)
+    spinnerDiscardingStdin.start()
+  });
+
+}
+
+await loadDependenciesByDB()
 
-await fs.writeFile(
-  packageJsonPath,
-  JSON.stringify(packageJson, null, 2)
-).catch((err)=>{
-  spinnerDiscardingStdin.fail(err)
-  spinnerDiscardingStdin.start()
-});
 
 let lang;
 
@@ -109,6 +85,7 @@ if (templatePath.includes("typescript")) {
   }
 }
 
+
 await exec("npx gitignore node", {
   cwd: projectPath
 }).catch((err)=>{
@@ -116,7 +93,7 @@ await exec("npx gitignore node", {
   spinnerDiscardingStdin.start()
 });
 
-await fs.writeFile(".env", "PORT=8000\n").catch((err)=>{
+await fs.writeFile(path.join(projectPath ,".env"), "PORT=8000\n").catch((err)=>{
   spinnerDiscardingStdin.fail("Failed to create .env file")
   spinnerDiscardingStdin.start()
 }).then(async ()=>{
@@ -152,4 +129,8 @@ await exec(`git commit -m "Initial commit"`, {
   spinnerDiscardingStdin.start()
 });
 
-spinnerDiscardingStdin.succeed("Packages successfully installed");
+spinnerDiscardingStdin.succeed(chalk.green("Packages successfully installed"));
+
+if(DB !== "none") { 
+  spinnerDiscardingStdin.info(chalk.yellow("Before starting your dev server set your correct DATABASE_URL in .env"))
+}

package/bin/cliQuestions.js

@@ -1,38 +1,107 @@
 import { input, select } from "@inquirer/prompts";
+import chalk from "chalk"
 
+export let projectName;
 
-export const projectName = await input({
-  message: "Project name:"
-});
-
-export const language = await select({
-  message: "Choose a language:",
-  choices: [
-    {
-      name: "JavaScript",
-      value: "javascript"
-    },
-    {
-      name: "TypeScript",
-      value: "typescript"
-    }
-  ]
-});
-
-export const DB = await select({
-  message: "Choose a database:",
-  choices: [
-    {
-      name: "PostgreSQL",
-      value: "postgresql"
-    },
-    {
-      name: "MySQL",
-      value: "mysql"
-    },
-    {
-      name: "MongoDB",
-      value: "mongodb"
+try {
+  projectName = await input({
+    message: "Project name:"
+  });
+} catch (error) {
+  console.error(chalk.red(error?.message || "User force closed the prompt with SIGINT"))
+  process.exit(1)
+} 
+
+export let language;
+
+try {
+  language = await select({
+    message: "Choose a language:",
+    choices: [
+      {
+        name: "JavaScript",
+        value: "javascript"
+      },
+      {
+        name: "TypeScript",
+        value: "typescript"
+      }
+    ]
+  });
+} catch (error) {
+  console.error(chalk.red(error?.message || "User force closed the prompt with SIGINT"))
+  process.exit(1)
+}
+
+export let DB;
+
+try {
+  DB = await select({
+    message: "Choose a database:",
+    choices: [
+      {
+        name: "PostgreSQL",
+        value: "postgresql"
+      },
+      {
+        name: "MySQL",
+        value: "mysql"
+      },
+      {
+        name: "MongoDB",
+        value: "mongodb"
+      },
+      {
+        name: "None",
+        value: "none"
+      }
+    ]
+  });
+} catch (error) {
+  console.error(chalk.red(error?.message || "User force closed the prompt with SIGINT"))
+  process.exit(1)
+}
+
+let modelTool;
+
+export async function selectToolByDB (){
+  if(DB === "none") return;
+
+  try {
+    if (DB === "mongodb") {
+      modelTool = await select({
+        message: "Choose ODM:",
+        choices: [
+          {
+            name: "Mongoose",
+            value: "mongoose"
+          }
+        ]
+      });
+    } else {
+      modelTool = await select({
+        message: "Choose ORM:",
+        choices: [
+          {
+            name: "Drizzle",
+            value: "drizzle"
+          },
+          {
+            name: "Prisma",
+            value: "prisma"
+          }
+        ]
+      });
     }
-  ]
-});
+  } catch (error) {
+    console.error(chalk.red(error?.message || "User force closed the prompt with SIGINT"))
+    process.exit(1)
+  }
+
+  return modelTool;
+}
+
+
+
+
+

package/bin/config.js

@@ -4,13 +4,12 @@ import ora from "ora";
 import { drizzlePostgresBoilerPlate, mongodbConBoilerplateCode } from "./boilerPlateCodes.js";
 
 
-const spinnerDiscardingStdin = ora({
-    text: "Loading Packages",
-    spinner: process.argv[2],
+export const spinnerDiscardingStdin = ora({
+	text: "Loading Packages",
+	spinner: "dots14",
     color: "cyan"
 });
 
-
 export const JSboilerPlateCodeSetUp = async (projectPath) => {
     const appJsPath = path.join(projectPath, "/src/app.js")
 
@@ -167,7 +166,7 @@ export const DBboilerCodeSetUp = async (projectPath, DB, modelTool, language) =>
 
             const targetLine = [3, 9]
             const insertedData = [`import { db } from "./common/config/db.js";
-    import { sql } from "drizzle-orm"`,
+import { sql } from "drizzle-orm"`,
                 '        await db.execute(sql`select 1`)'];
 
             const lines = serverJsData.split(/\r?\n/);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-modular-monolith",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "This is a modular monolith project generator for Express.js",
   "type": "module",
   "bin": {
@@ -11,6 +11,7 @@
   "author": "Md Khalid Hossain",
   "dependencies": {
     "@inquirer/prompts": "^8.6.0",
+    "chalk": "^6.0.0",
     "ora": "^9.4.1"
   }
 }

package/templates/javascript/package.json

@@ -4,7 +4,7 @@
   "description": "",
   "main": "src/server.js",
   "scripts": {
-    "dev": "node src/server.js"
+    "dev": "node --watch src/server.js"
   },
   "dependencies": {
     "cors": "^2.8.6",