@dolphjs/cli 1.1.20 → 1.1.22

package/dist/daemon/watcher.js

@@ -7,6 +7,7 @@ import { join } from "path";
 import _ from "lodash";
 let fileExtension = "";
 let indexFilePath = "";
+let child;
 export const startApp = () => {
     console.log(`${chalk.bold(chalk.yellow("[DOLPH INFO]: "))} ${chalk.yellowBright("starting dolph server ...")}`);
     fileExtension = readConfig().language;
@@ -20,17 +21,20 @@ export const startApp = () => {
     if (fileExtension === "js") {
         spawnArgs = [indexFilePath];
     }
-    console.log(`${chalk.bold(chalk.green("[DOLPH INFO]: "))} ${chalk.greenBright("starting dolph server ...")}`);
-    const child = spawn(fileExtension === "ts" ? "ts-node" : "node", spawnArgs, {
+    if (child) {
+        // If child process is already running, gracefully close it before restarting
+        child.kill("SIGTERM");
+    }
+    child = spawn(fileExtension === "ts" ? "ts-node" : "node", spawnArgs, {
         stdio: "inherit",
     });
     child.on("error", (err) => {
-        `${chalk.bold(chalk.red("[DOLPH ERROR]: "))} ${chalk.redBright(`${err}`)}`;
+        console.error(`${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 ...")}`;
+            console.error(`${chalk.bold(chalk.red("[DOLPH ERROR]: "))} ${chalk.redBright("exiting watch mode ...")}`);
             process.exit(1);
         }
     });
@@ -66,7 +70,10 @@ export const startProdApp = () => {
         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, {
+        if (child) {
+            child.kill("SIGTERM");
+        }
+        child = spawn("swc", spawnArgs, {
             stdio: "inherit",
         });
         child.on("error", (err) => {

package/dist/utils/init_helper_function.js

@@ -87,8 +87,8 @@ export const initDolphCli = (appname) => {
             const yamlString = comment + yaml.dump(userConfig);
             writeFileSync(userConfigFilePath, yamlString, "utf8");
             if (userConfig.language === "ts") {
-                writeSwcrc();
-                writeTsConfigFile();
+                writeSwcrc(userConfig.routing === "spring" ? true : false);
+                writeTsConfigFile(userConfig.routing === "spring" ? true : false);
             }
             writeDolphConfig();
             writePackageJsonFile(projectName, userConfig.language);

package/dist/utils/write_swrcc.js

@@ -1,8 +1,10 @@
 import * as fs from "fs";
 import { getRootDirectory } from "./get_root_dir_path.js";
 import { join } from "path";
-export function writeSwcrc() {
-    const swcrcContent = `{
+export function writeSwcrc(isSpring) {
+    let swcrcContent = ``;
+    if (!isSpring) {
+        swcrcContent = `{
   "jsc": {
     "parser": {
       "syntax": "typescript",
@@ -43,6 +45,51 @@ export function writeSwcrc() {
   }
 }    
 `;
+    }
+    else {
+        swcrcContent = `{
+  "jsc": {
+    "parser": {
+      "syntax": "typescript",
+      "tsx": false,
+      "dynamicImport": true,
+      "decorators": true
+    },
+    "transform": {
+      "legacyDecorator": true,
+      "decoratorMetadata": true
+    },
+    "target": "es2022",
+    "externalHelpers": false,
+    "keepClassNames": true,
+    "loose": false,
+    "minify": {
+      "compress": false,
+      "mangle": false
+    },
+    "baseUrl": "src",
+    "paths": {
+      "@/*": ["*"],
+      "@/configs/*": ["shared/configs/*"],
+      "@/components/*": ["components/*"],
+      "@utils/*": ["shared/utils/*"],
+      "@shields/*": ["shared/shields/*"],
+      "@shared/*": ["shared/*"],
+      "@/helpers*": ["shared/helpers/*"],
+      "@/interfaces/*": ["shared/interfaces/*"],
+      "@/middlewares/*": ["shared/middlewares/*"],
+      "@/decorators/*": ["shared/decorators/*"],
+      "@/services/*": ["shared/services/*"],
+      "@/constants/*": ["shared/constants/*"],
+      "@/validations/*": ["shared/validations/*"]
+    }
+  },
+  "module": {
+    "type": "commonjs"
+  }
+}    
+`;
+    }
     const filePath = join(getRootDirectory(), ".swcrc");
     fs.writeFileSync(filePath, swcrcContent, { encoding: "utf-8" });
 }

package/dist/utils/write_tsconfig.js

@@ -1,8 +1,11 @@
 import * as fs from "fs";
 import { getRootDirectory } from "./get_root_dir_path.js";
 import { join } from "path";
-export function writeTsConfigFile() {
-    const tsConfigContent = `{
+export function writeTsConfigFile(isSpring) {
+    let tsConfigContent = ``;
+    if (!isSpring) {
+        tsConfigContent = `
+    {
   "exclude": ["node_modules"],
   "compilerOptions": {
     "allowJs": false,
@@ -39,7 +42,53 @@ export function writeTsConfigFile() {
       "module": "CommonJS"
     }
   }
-}`;
+}
+    `;
+    }
+    else {
+        tsConfigContent = `
+    {
+  "exclude": ["node_modules"],
+  "compilerOptions": {
+    "allowJs": false,
+    "declaration": false,
+    "experimentalDecorators": true,
+    "sourceMap": false,
+    "useUnknownInCatchVariables": false,
+    "strictFunctionTypes": false,
+    "forceConsistentCasingInFileNames": true,
+    "resolveJsonModule": true,
+    "esModuleInterop": true,
+    "target": "ES2022",
+    "baseUrl": "src",
+    "outDir": "app",
+    "pretty": true,
+    "module": "commonjs",
+    "paths": {
+      "@/*": ["*"],
+      "@/configs/*": ["shared/configs/*"],
+      "@/components/*": ["components/*"],
+      "@utils/*": ["shared/utils/*"],
+      "@shields/*": ["shared/shields/*"],
+      "@shared/*": ["shared/*"],
+      "@/helpers*": ["shared/helpers/*"],
+      "@/interfaces/*": ["shared/interfaces/*"],
+      "@/middlewares/*": ["shared/middlewares/*"],
+      "@/decorators/*": ["shared/decorators/*"],
+      "@/services/*": ["shared/services/*"],
+      "@/constants/*": ["shared/constants/*"],
+      "@/validations/*": ["shared/validations/*"]
+    }
+  },
+  "include": ["src/", ".env"],
+  "ts-node": {
+    "compilerOptions": {
+      "module": "CommonJS"
+    }
+  }
+}
+    `;
+    }
     const filePath = join(getRootDirectory(), "tsconfig.json");
     fs.writeFileSync(filePath, tsConfigContent, { encoding: "utf-8" });
 }

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 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);
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dolphjs/cli",
-  "version": "1.1.20",
+  "version": "1.1.22",
   "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",
@@ -38,6 +38,11 @@
     "dolph": "./dist/index.js",
     "dc": "./dist/index.js"
   },
+  "peerDependencies": {
+    "ts-node": "^10.9.2",
+    "@swc/cli": "^0.1.62",
+    "@swc/core": "^1.3.91"
+  },
   "dependencies": {
     "chalk": "^5.3.0",
     "chokidar": "^3.5.3",