@dolphjs/cli 1.3.0 → 1.4.0

package/dist/daemon/watcher.js

@@ -5,35 +5,50 @@ import { getRootDirectory } from "../utils/get_root_dir_path.js";
 import { readConfig } from "../utils/read_user_config_path.js";
 import { join } from "path";
 import _ from "lodash";
+import { exec } from "child_process";
 let fileExtension = "";
 let indexFilePath = "";
-let child;
+let child = null;
+const killProcess = (processToKill) => {
+    if (processToKill) {
+        console.log(`${chalk.bold(chalk.yellow("[DOLPH INFO]: "))} ${chalk.yellowBright("Stopping previous Dolph server...")}`);
+        // Windows: Use taskkill
+        if (process.platform === "win32") {
+            exec(`taskkill /PID ${processToKill.pid} /F /T`, (err) => {
+                if (err) {
+                    console.error(`${chalk.bold(chalk.red("[DOLPH ERROR]: "))} ${chalk.redBright(`Failed to kill process: ${err}`)}`);
+                }
+            });
+        }
+        else {
+            // Linux/macOS: Kill process normally
+            processToKill.kill("SIGTERM");
+            setTimeout(() => {
+                processToKill.kill("SIGKILL");
+            }, 1000);
+        }
+    }
+};
 export const startApp = (useBun = false) => {
-    console.log(`${chalk.bold(chalk.yellow("[DOLPH INFO]: "))} ${chalk.yellowBright("starting dolph server ...")}`);
+    console.log(`${chalk.bold(chalk.yellow("[DOLPH INFO]: "))} ${chalk.yellowBright("Starting Dolph server...")}`);
     fileExtension = readConfig().language;
     indexFilePath = join(getRootDirectory(), "src", `server.${fileExtension}`);
-    const additionalOptions = [
+    // Kill previous process before starting a new one
+    if (child) {
+        killProcess(child);
+    }
+    let spawnArgs = [
         "-r",
         "tsconfig-paths/register",
         "--transpile-only",
+        indexFilePath,
     ];
-    let spawnArgs = [...additionalOptions, indexFilePath];
     if (fileExtension === "js") {
         spawnArgs = [indexFilePath];
     }
-    if (child) {
-        child.on("exit", () => {
-            child = null;
-        });
-        // If child process is already running, gracefully close it before restarting
-        // child.kill("SIGTERM");
-        child.kill("SIGKILL");
-    }
     if (useBun) {
-        console.log(`${chalk.bold(chalk.green("[DOLPH INFO:] "))} ${chalk.greenBright("using Bun to start the server ...")}`);
-        child = spawn("bun", [indexFilePath], {
-            stdio: "inherit",
-        });
+        console.log(`${chalk.bold(chalk.green("[DOLPH INFO:] "))} ${chalk.greenBright("Using Bun to start the server...")}`);
+        child = spawn("bun", [indexFilePath], { stdio: "inherit" });
     }
     else {
         child = spawn(fileExtension === "ts" ? "ts-node" : "node", spawnArgs, {
@@ -46,7 +61,7 @@ export const startApp = (useBun = false) => {
     });
     child.on("close", (code) => {
         if (code === 1) {
-            console.error(`${chalk.bold(chalk.red("[DOLPH ERROR]: "))} ${chalk.redBright("exiting watch mode ...")}`);
+            console.error(`${chalk.bold(chalk.red("[DOLPH ERROR]: "))} ${chalk.redBright("Exiting watch mode...")}`);
             child = null;
             process.exit(1);
         }
@@ -87,29 +102,14 @@ export const buildApp = () => {
 export const startProdApp = async (useBun = false) => {
     try {
         fileExtension = readConfig().language;
+        if (child) {
+            killProcess(child);
+        }
         if (fileExtension === "ts") {
-            console.log(`${chalk.bold(chalk.yellow("[DOLPH INFO]: "))} ${chalk.yellowBright("compiling to javascript ...")}`);
+            console.log(`${chalk.bold(chalk.yellow("[DOLPH INFO]: "))} ${chalk.yellowBright("Compiling to JavaScript...")}`);
             indexFilePath = join(getRootDirectory(), "src", `server.ts`);
             const spawnArgs = ["src", "-d", "app", "--source-maps", "--copy-files"];
-            if (child) {
-                child.on("exit", () => {
-                    child = null;
-                });
-                child.kill("SIGTERM");
-            }
-            child = spawn("swc", spawnArgs, {
-                stdio: "inherit",
-            });
-            child.on("error", (err) => {
-                `${chalk.bold(chalk.red("[DOLPH ERROR]: "))} ${chalk.redBright(`${err}`)}`;
-                process.exit(1);
-            });
-            child.on("close", (code) => {
-                if (code === 1) {
-                    console.log(`${chalk.bold(chalk.red("[DOLPH ERROR]: "))} ${chalk.redBright("exiting compilation ...")}`);
-                    process.exit(1);
-                }
-            });
+            child = spawn("swc", spawnArgs, { stdio: "inherit" });
             await new Promise((resolve, reject) => {
                 child.on("close", (code) => {
                     if (code === 0) {
@@ -125,38 +125,20 @@ export const startProdApp = async (useBun = false) => {
             fileExtension === "ts"
                 ? join(getRootDirectory(), "app", "src", "server.js")
                 : join(getRootDirectory(), "src", "server.js");
-        console.log(`${chalk.bold(chalk.green("[DOLPH INFO]: "))} ${chalk.greenBright("starting dolph server ...")}`);
-        if (useBun) {
-            console.log(`${chalk.bold(chalk.green("[DOLPH INFO]: "))} ${chalk.greenBright("using Bun to start the server ...")}`);
-            const child2 = spawn("bun", [indexFilePath], {
-                stdio: "inherit",
-            });
-            child2.on("error", (err) => {
-                `${chalk.bold(chalk.red("[DOLPH ERROR]: "))} ${chalk.redBright(`${err}`)}`;
-                process.exit(1);
-            });
-            child2.on("close", (code) => {
-                if (code === 1) {
-                    `${chalk.bold(chalk.red("[DOLPH ERROR]: "))} ${chalk.redBright("exiting watch mode ...")}`;
-                    process.exit(1);
-                }
-            });
-        }
-        else {
-            const child2 = spawn("node", [indexFilePath], {
-                stdio: "inherit",
-            });
-            child2.on("error", (err) => {
-                `${chalk.bold(chalk.red("[DOLPH ERROR]: "))} ${chalk.redBright(`${err}`)}`;
+        console.log(`${chalk.bold(chalk.green("[DOLPH INFO]: "))} ${chalk.greenBright("Starting Dolph server...")}`);
+        child = useBun
+            ? spawn("bun", [indexFilePath], { stdio: "inherit" })
+            : spawn("node", [indexFilePath], { stdio: "inherit" });
+        child.on("error", (err) => {
+            console.error(`${chalk.bold(chalk.red("[DOLPH ERROR]: "))} ${chalk.redBright(`${err}`)}`);
+            process.exit(1);
+        });
+        child.on("close", (code) => {
+            if (code === 1) {
+                console.error(`${chalk.bold(chalk.red("[DOLPH ERROR]: "))} ${chalk.redBright("Exiting production mode...")}`);
                 process.exit(1);
-            });
-            child2.on("close", (code) => {
-                if (code === 1) {
-                    `${chalk.bold(chalk.red("[DOLPH ERROR]: "))} ${chalk.redBright("exiting watch mode ...")}`;
-                    process.exit(1);
-                }
-            });
-        }
+            }
+        });
     }
     catch (e) {
         console.error(e);
@@ -172,26 +154,27 @@ let isWatcherActive = false;
 const debouncedStartApp = _.debounce((useBun) => startApp(useBun), 1000);
 export const watchFile = (useBun = false) => {
     if (!isWatcherActive) {
-        console.log(`${chalk.bold(chalk.green("[DOLPH INFO]: "))} ${chalk.greenBright("watching files for changes ...")}`);
+        console.log(`${chalk.bold(chalk.green("[DOLPH INFO]: "))} ${chalk.greenBright("Watching files for changes...")}`);
         isWatcherActive = true;
         fileExtension = readConfig().language;
         const srcDirectory = join(getRootDirectory(), "src");
         watcher.add(srcDirectory);
         watcher.on("all", (_event, path) => {
-            `${chalk.bold(chalk.green("[DOLPH INFO]: "))} ${chalk.greenBright("file changed" + `[${path}]`)}`;
-            if (path.endsWith(".ts") ||
-                path.endsWith(".js")
-            // path.startsWith("dolph_config")
-            ) {
+            console.log(`${chalk.bold(chalk.green("[DOLPH INFO]: "))} ${chalk.greenBright(`File changed: [${path}]`)}`);
+            if (path.endsWith(".ts") || path.endsWith(".js")) {
                 debouncedStartApp(useBun);
             }
         });
         process.on("SIGINT", () => {
+            console.log(`${chalk.bold(chalk.yellow("[DOLPH INFO]: "))} ${chalk.yellowBright("Shutting down watcher...")}`);
+            if (child) {
+                killProcess(child);
+            }
             watcher.close();
             process.exit(0);
         });
     }
     else {
-        console.log(`${chalk.bold(chalk.red("[DOLPH ERROR]: "))} ${chalk.redBright("watcher is already active.")}`);
+        console.log(`${chalk.bold(chalk.red("[DOLPH ERROR]: "))} ${chalk.redBright("Watcher is already active.")}`);
     }
 };

package/dist/utils/init_helper_function.js

@@ -43,6 +43,7 @@ export const initDolphCli = (appname) => {
         database: "mongo",
         generateFolder: true,
         routing: "express",
+        api: "rest",
     };
     if (!existsSync(userConfigFilePath)) {
         inquirer
@@ -75,6 +76,13 @@ export const initDolphCli = (appname) => {
                 choices: ["express", "spring"],
                 default: "express",
             },
+            {
+                type: "list",
+                name: "api",
+                message: "Will you be using REST or GraphQL to build?",
+                choices: ["graphql", "rest"],
+                default: "rest",
+            },
         ])
             .then((replies) => {
             // TODO: add this to the config file:

package/dist/utils/package_description.js

@@ -2,6 +2,6 @@ import chalk from "chalk";
 import { program } from "commander";
 export const packageDescription = () => {
     program
-        .version("1.3.0")
+        .version("1.4.0")
         .description(chalk.cyan("The dolph-cli is a tool for efficient initialization and management of a dolphjs project"));
 };

package/dist/utils/package_generator.js

@@ -23,7 +23,9 @@ export const packageGenerator = () => {
         .option("-m, --model" + chalk.bold(chalk.blue(" <name>")), "Generates a dolphjs models file.")
         .option("-com, --component" + chalk.bold(chalk.blue(" <name>")), "Generates a dolphjs spring component file.")
         .option("-soc, --socket" + chalk.bold(chalk.blue(" <name> ")), "Generate a dolphjs socket service and component.")
-        .option("-a, --all" + chalk.bold(chalk.blue(" <name> ")), "Generates dolphjs controllers, routes, models and services files for the name paramter.")
+        .option("-res, --resolver" + chalk.bold(chalk.blue(" <name> ")), "Generate a dolphjs resolver.")
+        .option("-res, --resolver" + chalk.bold(chalk.blue(" <name> ")), "Generate a dolphjs resolver.")
+        .option("-a, --all" + chalk.bold(chalk.blue(" <name> ")), "Generates dolphjs controllers, routes, models and services files for the name parameter.")
         .action(async (name, _options) => {
         const promises = Object.entries(name).map(async ([key, value]) => {
             if (key && key.toLowerCase().includes("controller") && value) {

package/dist/utils/write_package_json.js

@@ -22,7 +22,7 @@ export function writePackageJsonFile(name, extension) {
     "clean": "rm -r app && rm -r logs"
   },
   "dependencies": {
-    "@dolphjs/dolph": "^1.3.2"
+    "@dolphjs/dolph": "^1.4.3"
   },
   "devDependencies": {
     "@swc/cli": "^0.1.62",
@@ -53,7 +53,7 @@ export function writePackageJsonFile(name, extension) {
     "start": "dolph start"
   },
   "dependencies": {
-    "@dolphjs/dolph": "^1.3.2"
+    "@dolphjs/dolph": "^1.4.3"
   }
 }
 `;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dolphjs/cli",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "The dolphjs-cli is a tool for efficient initialization and management of a dolphjs project",
   "main": "./dist/index.js",
   "repository": "https://github.com/dolphjs/dolph-cli.git",