@dolphjs/cli 1.0.26 → 1.1.1

package/dist/daemon/watcher.js

@@ -4,11 +4,6 @@ import chalk from "chalk";
 import { getRootDirectory } from "../utils/get_root_dir_path.js";
 import { readConfig } from "../utils/read_user_config_path.js";
 import { join } from "path";
-/**
- * TODO: add child2.on('error', (err) => {
-  console.error('Error spawning child process:', err);
-});
- */
 let fileExtension = "";
 let indexFilePath = "";
 export const startApp = () => {
@@ -25,6 +20,10 @@ export const startApp = () => {
     const child = spawn(fileExtension === "ts" ? "ts-node" : "node", 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) {
             `${chalk.bold(chalk.red("[DOLPH ERROR]: "))} ${chalk.redBright("exiting watch mode ...")}`;
@@ -32,27 +31,60 @@ export const startApp = () => {
         }
     });
 };
-export const startProdApp = () => {
+export const buildApp = () => {
     fileExtension = readConfig().language;
     if (fileExtension === "ts") {
         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"];
+        const child = spawn("swc", spawnArgs, {
+            stdio: "inherit",
+        });
+        console.log(`${chalk.bold(chalk.green("[DOLPH INFO]: "))} ${chalk.greenBright("compilation successful")}`);
+        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);
+            }
+        });
     }
-    indexFilePath = join(getRootDirectory(), "src", `server.${fileExtension}`);
-    const spawnArgs = ["src", "-d", "app", "--source-maps", "--copy-files"];
-    const child = spawn("swc", spawnArgs, {
-        stdio: "inherit",
-    });
-    child.on("close", (code) => {
-        if (code === 1) {
-            console.log(`${chalk.bold(chalk.red("[DOLPH ERROR]: "))} ${chalk.redBright("exiting compilation ...")}`);
+    else {
+        console.log(`${chalk.bold(chalk.red("[DOLPH ERROR]: "))} ${chalk.redBright("cannot compile javascript file, exiting compilation ...")}`);
+    }
+};
+export const startProdApp = () => {
+    fileExtension = readConfig().language;
+    if (fileExtension === "ts") {
+        console.log(`${chalk.bold(chalk.yellow("[DOLPH INFO]: "))} ${chalk.yellowBright("compiling to javascript ...")}`);
+        indexFilePath = join(getRootDirectory(), "src", `server.${fileExtension}`);
+        const spawnArgs = ["src", "-d", "app", "--source-maps", "--copy-files"];
+        const 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);
+            }
+        });
+    }
     indexFilePath = join(getRootDirectory(), "app", `server.js`);
     console.log(`${chalk.bold(chalk.green("[DOLPH INFO]: "))} ${chalk.greenBright("starting dolph server ...")}`);
     const child2 = spawn("node", [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 ...")}`;
@@ -60,7 +92,7 @@ export const startProdApp = () => {
         }
     });
 };
-const watcher = chokidar.watch(indexFilePath, {
+const watcher = chokidar.watch([], {
     ignored: "/node_modules",
     persistent: true,
     ignoreInitial: false,
@@ -73,7 +105,7 @@ export const watchFile = () => {
         fileExtension = readConfig().language;
         const srcDirectory = join(getRootDirectory(), "src");
         watcher.add(srcDirectory);
-        watcher.on("all", (_event, path) => {
+        watcher.on("", (_event, path) => {
             `${chalk.bold(chalk.green("[DOLPH INFO]: "))} ${chalk.greenBright("file changed" + `[${path}]`)}`;
             if (path.endsWith(".ts") || path.endsWith(".js")) {
                 startApp();

package/dist/daemon/watcherConfig.js

@@ -1,5 +1,5 @@
 import { program } from "commander";
-import { startProdApp, watchFile } from "./watcher.js";
+import { buildApp, startProdApp, watchFile } from "./watcher.js";
 export const watcherConfig = () => {
     program
         .command("start")
@@ -9,4 +9,8 @@ export const watcherConfig = () => {
         .command("watch")
         .description("starts the dolph application in watch mode")
         .action(() => watchFile());
+    program
+        .command("build")
+        .description("compile a typescript project to javascript")
+        .action(() => buildApp());
 };

package/dist/index.js

@@ -7,7 +7,7 @@ import { configurePackage } from "./utils/read_user_config.js";
 import { InitDolphCli } from "./utils/package_init.js";
 import { packageGenerator } from "./utils/package_generator.js";
 import { watcherConfig } from "./daemon/watcherConfig.js";
-figlet.text("dolphjs cli", {
+figlet.text("dolph cli", {
     font: "Big",
     horizontalLayout: "default",
     verticalLayout: "default",

package/dist/utils/get_user_config_path.js

@@ -1,10 +1,10 @@
 import { existsSync } from "fs";
 import path from "path";
+import { getRootDirectory } from "./get_root_dir_path.js";
 export const getUserConfigFilePath = () => {
-    const userConfigFolderPath = path.join(process.cwd());
-    const userConfigFilePath = path.join(userConfigFolderPath, "dolph-cli.yaml");
+    const userConfigFilePath = path.join(getRootDirectory(), "dolph_cli.yaml");
     if (existsSync(userConfigFilePath)) {
         return userConfigFilePath;
     }
-    return path.join(userConfigFilePath, "../../", "dolph-cli.yaml");
+    return path.join(userConfigFilePath, "../../", "dolph_cli.yaml");
 };

package/dist/utils/init_helper_function.js

@@ -23,7 +23,7 @@ export const initDolphCli = (appname) => {
     }
     const configFolderPath = path.join(process.cwd());
     const srcPath = path.join(configFolderPath, "src");
-    const userConfigFilePath = path.join(configFolderPath, "dolph-cli.yaml");
+    const userConfigFilePath = path.join(configFolderPath, "dolph_cli.yaml");
     if (!existsSync(configFolderPath)) {
         mkdirSync(configFolderPath);
     }
@@ -70,6 +70,8 @@ export const initDolphCli = (appname) => {
             // },
         ])
             .then((replies) => {
+            // TODO: add this to the config file:
+            // # this is an auto generate file, please do not edit manually
             const userConfig = { ...defaultConfig, ...replies };
             const yamlString = yaml.dump(userConfig);
             writeFileSync(userConfigFilePath, yamlString, "utf8");
@@ -82,6 +84,7 @@ export const initDolphCli = (appname) => {
             writeGitignore();
             console.log(chalk.green(chalk.bold("dolph cli configurations have been initialized successfully 😎.")));
             console.log(chalk.green(chalk.bold("run yarn install to install dependencies in project directory and start coding 😉.")));
+            process.exit(0);
         });
     }
     else {

package/dist/utils/package_description.js

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

package/dist/utils/package_init.js

@@ -4,7 +4,7 @@ export const InitDolphCli = () => {
     program
         .command("new <project-name>")
         .alias("nw")
-        .description("Creates a new dolphjs app")
+        .description("Creates a new dolph app")
         .action((appname) => {
         initDolphCli(appname);
     });

package/dist/utils/read_user_config.js

@@ -8,60 +8,74 @@ export const configurePackage = () => {
         .command("config")
         .alias("cf")
         .description("Set default configurations")
-        .option("-l, --language" + chalk.bold(chalk.blue("<language>")), "Set the default coding language (ts or js)")
-        .option("-p, --paradigm" + chalk.bold(chalk.blue("<paradigm>")), "Set the default programming paradigm (oop or functional)")
-        .option("-d, --database" + chalk.bold(chalk.blue("<database>")), "Set the default project database (mongo, mysql, postresql or other)")
+        .option("-lg, --language" + chalk.bold(chalk.blue("<language>")), "Set the default coding language (ts or js)")
+        .option("-pd, --paradigm" + chalk.bold(chalk.blue("<paradigm>")), "Set the default programming paradigm (oop or functional)")
+        .option("-db, --database" + chalk.bold(chalk.blue("<database>")), "Set the default project database (mongo, mysql, postresql or other)")
         .option("-gf, --generateFolder" + chalk.bold(chalk.blue("<boolean>")), "Generates a folder file for the Services, Models, Controllers and Routes (true or false)")
-        .action((options) => {
-        const config = readConfig();
-        // validate language choosen
-        if (options.language) {
-            if (options.language !== "js" && options.language !== "ts") {
-                console.log(options.language);
-                console.log(chalk.red(`Invalid project language, format must be either ${chalk.bold("js")} or ${chalk.bold("ts")}`));
+        .action(async (name, options) => {
+        let config = readConfig();
+        Object.entries(name).forEach(([key, value]) => {
+            if (key && key.toLocaleLowerCase().includes("language") && value) {
+                console.log(value.toString(), value);
+                if (value.toString() !== "js" && value.toString() !== "ts") {
+                    console.log(chalk.red(`Invalid project language, format must be either ${chalk.bold("js")} or ${chalk.bold("ts")}`));
+                    return;
+                }
+                config.language = value;
+                writeConfig(config);
+                console.log(chalk.cyan(`Default project language is now ${chalk.bold(config.language)}`));
                 return;
             }
-            config.language = options.language;
-            writeConfig(config);
-            console.log(chalk.cyan(`Default project language is now ${chalk.bold(config.language)}`));
-            return;
-        }
-        // validate paradigm choosen
-        if (options.paradigm) {
-            if (options.paradigm !== "oop" && options.paradigm !== "functional") {
-                console.log(chalk.red(`Invalid programming paradigm, must be either ${chalk.bold("oop")} or ${chalk.bold("functional")}`));
+            if (key && key.toLocaleLowerCase().includes("paradigm") && value) {
+                if (value.toString() !== "oop" && value.toString() !== "functional") {
+                    console.log(chalk.red(`Invalid programming paradigm, must be either ${chalk.bold("oop")} or ${chalk.bold("functional")}`));
+                    return;
+                }
+                config.paradigm = value;
+                writeConfig(config);
+                console.log(chalk.cyan(`Default programming paradigm is now ${chalk.bold(config.paradigm)}`));
                 return;
             }
-            config.paradigm = options.paradigm;
-            writeConfig(config);
-            console.log(chalk.cyan(`Default programming paradigm is now ${chalk.bold(config.paradigm)}`));
-            return;
-        }
-        // validate database choosen
-        if (options.database) {
-            if (!dbOptions.includes(options.database)) {
-                console.log(chalk.red(`Invalid database value, must be either of these: ${dbOptions.join(", ")} `));
+            if (key && key.toLocaleLowerCase().includes("database") && value) {
+                if (!dbOptions.includes(value.toString())) {
+                    console.log(chalk.red(`Invalid database value, must be either of these: ${dbOptions.join(", ")} `));
+                    return;
+                }
+                config.database = value;
+                writeConfig(config);
+                console.log(chalk.cyan(`Default project database is now ${chalk.bold(config.database)}`));
                 return;
             }
-            config.database = options.database;
-            writeConfig(config);
-            console.log(chalk.cyan(`Default project database is now ${chalk.bold(config.database)}`));
-            return;
-        }
+        });
         // validate generateFolder
-        if (options.generateFolder) {
-            if (options.generateFolder !== "true" &&
-                options.generateFolder !== "false") {
-                console.log(chalk.red(`Invalid folder generation value, value must be ${chalk.bold("true")} or ${chalk.bold("false")}`));
-                return;
-            }
-            config.generateFolder = options.generateFolder;
-            writeConfig(config);
-            console.log(chalk.cyan(`Generation of folder files for the Services, Models, Controllers and Routes  set to ${chalk.bold(config.generateFolder)}`));
-            return;
-        }
+        // if (options.generateFolder) {
+        //   if (
+        //     options.generateFolder !== "true" &&
+        //     options.generateFolder !== "false"
+        //   ) {
+        //     console.log(
+        //       chalk.red(
+        //         `Invalid folder generation value, value must be ${chalk.bold(
+        //           "true"
+        //         )} or ${chalk.bold("false")}`
+        //       )
+        //     );
+        //     return;
+        //   }
+        //   config.generateFolder = options.generateFolder;
+        //   writeConfig(config);
+        //   console.log(
+        //     chalk.cyan(
+        //       `Generation of folder files for the Services, Models, Controllers and Routes  set to ${chalk.bold(
+        //         config.generateFolder
+        //       )}`
+        //     )
+        //   );
+        //   return;
+        // }
         if (Object.keys(options).length === 0) {
-            console.log(chalk.yellow(chalk.bold(`No configurations applied, run ${chalk.white("dolph-cli config --help")} to see available commands`)));
+            console.log(chalk.yellow(chalk.bold(`No configurations applied, run ${chalk.white("dolph config --help")} to see available commands`)));
         }
+        process.exit(0);
     });
 };

package/dist/utils/read_user_config_path.js

@@ -12,8 +12,7 @@ export const readConfig = () => {
     }
     catch (e) {
         console.log(e);
-        console.log(chalk.bold(chalk.red("Error encountered reading config file, please run 'dolph-cli tr' to initialize config file 🥹")));
+        console.log(chalk.bold(chalk.red("Error encountered reading config file, please run 'dolph cf' to initialize config file 🥹")));
         process.exit(1);
-        return {};
     }
 };

package/dist/utils/write_package_json.js

@@ -13,14 +13,13 @@ export function writePackageJsonFile(name, extension) {
     "node": ">=18.0.0"
   },
   "scripts": {
-    "dev:start": "cross-env NODE_ENV=development nodemon",
+    "dev:start": "dolph watch",
     "dev:docker:start": "docker-compose -f docker-compose-dev.yml up",
     "dev:docker:stop": "docker-compose -f docker-compose-dev.yml down",
-    "build": "swc src -d app --source-maps --copy-files",
+    "build": "dolph build",
     "build:tsc": "tsc && tsc-alias",
-    "prod:start": "node app/server.js",
-    "clean": "rm -r app && rm -r logs",
-    "start": "npm run build && npm run prod:start"
+    "start": "dolph start",
+    "clean": "rm -r app && rm -r logs"
   },
   "dependencies": {
     "@dolphjs/dolph": "^1.1.0"
@@ -30,7 +29,6 @@ export function writePackageJsonFile(name, extension) {
     "@swc/core": "^1.3.91",
     "@types/express": "^4.17.18",
     "@types/node": "^20.8.2",
-    "cross-env": "^7.0.3",
     "ts-node": "^10.9.1",
     "tsc-alias": "^1.8.8",
     "tsconfig-paths": "^4.2.0",
@@ -48,18 +46,14 @@ export function writePackageJsonFile(name, extension) {
     "node": ">=18.0.0"
   },
   "scripts": {
-    "dev:start": "cross-env NODE_ENV=development nodemon",
+    "dev:start": "dolph watch",
     "dev:docker:start": "docker-compose -f docker-compose-dev.yml up",
     "dev:docker:stop": "docker-compose -f docker-compose-dev.yml down",
-    "prod:start": "node src/server.js",
     "clean": "rm -r logs",
-    "start": "npm run prod:start"
+    "start": "dolph start"
   },
   "dependencies": {
     "@dolphjs/dolph": "^1.1.0"
-  },
-  "devDependencies": {
-    "cross-env": "^7.0.3"
   }
 }
 `;

package/dist/utils/write_user_config.js

@@ -10,7 +10,7 @@ export const writeConfig = (config) => {
         console.log(chalk.green("Configurations saved successfully! 😎."));
     }
     catch (e) {
-        console.log(chalk.bold(chalk.red("Error encountered reading config file, please run 'dolph-cli tr' to initialize config file 🥹")));
+        console.log(chalk.bold(chalk.red("Error encountered reading config file, please run 'dolph tr' to initialize config file 🥹")));
         process.exit(1);
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dolphjs/cli",
-  "version": "1.0.26",
+  "version": "1.1.1",
   "description": "The dolphjs-cli is a tool for efficient intialization and management of a dolphjs project",
   "main": "./dist/index.js",
   "repository": "https://github.com/dolphjs/dolph-cli.git",
@@ -35,7 +35,7 @@
     "dist/**/*"
   ],
   "bin": {
-    "dolph-cli": "./dist/index.js",
+    "dolph": "./dist/index.js",
     "dc": "./dist/index.js"
   },
   "dependencies": {