@dolphjs/cli 1.1.17 → 1.1.19

package/dist/registers/register_component.js

@@ -14,7 +14,7 @@ const findSrcDirectory = () => {
     const srcDir = possibleDirs.find((dir) => existsSync(path.join(rootDir, dir)));
     return srcDir ? path.join(rootDir, srcDir) : null;
 };
-export const addComponentToServerFile = (componentName) => {
+export const addComponentToServerFile = async (componentName) => {
     if (!componentName) {
         dolphMsg.errorRed("component extension or name is required! 🤨");
     }

package/dist/registers/register_controllers_in_components.js

@@ -33,19 +33,12 @@ export class ${capitalizedString}Component {}
             const fileContent = readFileSync(componentPath, "utf8");
             const newComponentInstance = `${capitalizedString}Controller`;
             if (!fileContent.includes(importStatement)) {
-                const controllersArrayMatch = fileContent.match(/@Component\(\s*{\s*controllers:\s*\[([^\]]*)\]\s*}\s*\)/);
-                if (controllersArrayMatch) {
-                    const existingCode = controllersArrayMatch[1].trim();
-                    let fileContents;
-                    fileContents = fileContent.replace(existingCode, `${existingCode.length > 0
-                        ? existingCode + `, ${newComponentInstance}`
-                        : newComponentInstance}`);
-                    const updatedContents = `${importStatement}\n${fileContents}`;
-                    writeFileSync(componentPath, updatedContents);
-                }
+                // If import statement is not present, add it along with the new controller
+                const updatedContents = `${importStatement}\n${fileContent.replace(/@Component\(\s*{\s*controllers:\s*\[([^\]]*)\]\s*}\s*\)/, `@Component({ controllers: [${newComponentInstance}] })`)}`;
+                writeFileSync(componentPath, updatedContents);
             }
-            if (fileContent.includes(`const dolph`)) {
-                // add new controller class to the existing array
+            else if (fileContent.includes(`const dolph`)) {
+                // If import statement is present and contains `const dolph`
                 const controllersArrayMatch = fileContent.match(/@Component\(\s*{\s*controllers:\s*\[([^\]]*)\]\s*}\s*\)/);
                 if (controllersArrayMatch) {
                     const existingCode = controllersArrayMatch[1].trim();
@@ -58,10 +51,11 @@ export class ${capitalizedString}Component {}
                 }
             }
         }
-        dolphMsg.info(`registerd ${capitalizedString}Controller in ${capitalizedString}Component`);
+        dolphMsg.info(`registered ${capitalizedString}Controller in ${capitalizedString}Component`);
         process.exit(0);
     }
-    catch (e) {
-        dolphMsg.errorRed(e.toString());
+    catch (error) {
+        console.error(error);
+        process.exit(1);
     }
 };

package/dist/registers/server_file_spring.js

@@ -0,0 +1,72 @@
+import chalk from "chalk";
+import { existsSync, writeFileSync } from "fs";
+import path from "path";
+const findBaseDirectory = () => {
+    const rootDir = process.cwd();
+    const possibleDirs = ["/src"];
+    const routesDir = possibleDirs.find((dir) => existsSync(path.join(rootDir, dir)));
+    return routesDir ? path.join(rootDir, routesDir) : null;
+};
+export const addServerFile = async (database, name) => {
+    const baseDirectory = findBaseDirectory();
+    const indexPath = path.join(baseDirectory, `server.ts`);
+    let importStatement = ``;
+    let otherFileContent = "";
+    const capitalizedString = name.charAt(0).toUpperCase() + name.slice(1);
+    if (database === "mysql" && name.length) {
+        importStatement = `import { DolphFactory } from "@dolphjs/dolph";
+import { ${capitalizedString}Component } from "./components/${name}/${name}.component.ts";
+import { sequelizeInstance } from "@/shared/configs/db.configs";
+import { autoInitMySql } from "@dolphjs/dolph/packages";
+`;
+    }
+    else if (database === "mysql") {
+        importStatement = `import { DolphFactory } from "@dolphjs/dolph";
+import { sequelizeInstance } from "@/shared/configs/db.configs";
+import { autoInitMySql } from "@dolphjs/dolph/packages";`;
+    }
+    else if (database === "mongo" && name.length) {
+        importStatement = `import { DolphFactory } from "@dolphjs/dolph";
+import { ${capitalizedString}Component } from "./components/${name}/${name}.component.ts";
+import { autoInitMySql } from "@dolphjs/dolph/packages";`;
+    }
+    else if (database === "mongo") {
+        importStatement = `import { DolphFactory } from "@dolphjs/dolph";
+import { autoInitMySql } from "@dolphjs/dolph/packages";`;
+    }
+    if (database === "mysql" && name) {
+        otherFileContent = `const dolph = new DolphFactory([${capitalizedString}Component]);
+autoInitMySql(sequelizeInstance);
+
+dolph.start();`;
+    }
+    else if (database === "mysql") {
+        otherFileContent = `const dolph = new DolphFactory([]);
+autoInitMySql(sequelizeInstance);
+
+dolph.start();`;
+    }
+    else if (database === "mongo" && name) {
+        otherFileContent = `const dolph = new DolphFactory([${capitalizedString}Component]);
+dolph.start();`;
+    }
+    else if (database === "mongo") {
+        otherFileContent = `const dolph = new DolphFactory([]);
+dolph.start();`;
+    }
+    try {
+        // check if file exists
+        if (!existsSync(indexPath)) {
+            // if it doesn't exist, create file and add import statement
+            const fileContent = `${importStatement}\n\n${otherFileContent}\n`;
+            writeFileSync(indexPath, fileContent);
+        }
+        else {
+            const fileContent = `${importStatement}\n\n${otherFileContent}\n`;
+            writeFileSync(indexPath, fileContent);
+        }
+    }
+    catch (e) {
+        console.log(chalk.bold(chalk.red(e)));
+    }
+};

package/dist/utils/init_helper_function.js

@@ -8,6 +8,7 @@ import { writeDolphConfig } from "./write_dolph_config.js";
 import { writePackageJsonFile } from "./write_package_json.js";
 import { writeGitignore } from "./write_gitignore.js";
 import { dolphMsg } from "../helpers/messages.js";
+import { addServerFile as addSpringServerFile } from "../registers/server_file_spring.js";
 export const initDolphCli = (appname) => {
     let projectName = appname;
     if (appname.length === 0) {
@@ -99,6 +100,7 @@ export const initDolphCli = (appname) => {
                 if (!existsSync(sharedDirPath)) {
                     mkdirSync(sharedDirPath);
                 }
+                addSpringServerFile(userConfig.database, "");
             }
             dolphMsg.infoBlue("dolph configurations have been initialized successfully ✨.");
             dolphMsg.infoYellow("run `yarn install` to install dependencies in project directory and start building 🚀.");

package/dist/utils/package_generator.js

@@ -7,7 +7,7 @@ import * as modelGen from "../generators/generate_model.js";
 import * as mysqlGen from "../generators/generate_mysql.js";
 import { readConfig } from "./read_user_config_path.js";
 import { addRoutesIndexFile } from "../registers/register_routes.js";
-import { addServerFile } from "../registers/server_file_routes.js";
+import { addServerFile } from "../registers/server_file_express.js";
 import { dolphMsg } from "../helpers/messages.js";
 import { generateComponent } from "../generators/spring/generate_spring_component.js";
 import { addComponentToServerFile } from "../registers/register_component.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dolphjs/cli",
-  "version": "1.1.17",
+  "version": "1.1.19",
   "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",