@dolphjs/cli 1.1.15 → 1.1.17

package/dist/generators/spring/generate_spring_component.js

@@ -38,7 +38,7 @@ export const generateComponent = async (name) => {
     }
     const componentFilePath = path.join(componentDir + `/${name}.component.ts`);
     try {
-        await generateSpringComponentFile(name, path.join(componentFilePath));
+        generateSpringComponentFile(name, path.join(componentFilePath));
         dolphMsg.info(`${chalk.blue(`${name}.component.ts`)} generated successfully for ${chalk.blue(`${name}`)} component.`);
     }
     catch (e) {

package/dist/registers/register_controllers_in_components.js

@@ -7,7 +7,7 @@ const findComponentsDirectory = (componentName) => {
     const srcDir = possibleDirs.find((dir) => existsSync(path.join(rootDir, dir)));
     return srcDir ? path.join(rootDir, srcDir) : null;
 };
-export const addControllerInComponentFIle = (componentName) => {
+export const addControllerInComponentFIle = async (componentName) => {
     if (!componentName) {
         dolphMsg.errorRed("component extension or name is required! 🤨");
     }
@@ -22,6 +22,8 @@ export const addControllerInComponentFIle = (componentName) => {
     try {
         if (!existsSync(componentPath)) {
             const fileContent = `import { Component } from "@dolphjs/dolph/decorators";
+import { ${capitalizedString}Controller } from "./${componentName}.controller";
+
 @Component({ controllers: [${capitalizedString}Controller] })
 export class ${capitalizedString}Component {}
 `;
@@ -31,8 +33,16 @@ export class ${capitalizedString}Component {}
             const fileContent = readFileSync(componentPath, "utf8");
             const newComponentInstance = `${capitalizedString}Controller`;
             if (!fileContent.includes(importStatement)) {
-                const updatedContent = `${importStatement}\n\n${fileContent}`;
-                writeFileSync(componentPath, updatedContent);
+                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 (fileContent.includes(`const dolph`)) {
                 // add new controller class to the existing array

package/dist/utils/package_generator.js

@@ -23,54 +23,50 @@ export const packageGenerator = () => {
         .option("-com, --component" + chalk.bold(chalk.blue(" <name>")), "Generates a dolphjs spring component file.")
         .option("-a, --all" + chalk.bold(chalk.blue(" <name> ")), "Generates dolphjs controllers, routes, models and services files for the name paramter.")
         .action(async (name, _options) => {
-        Object.entries(name).forEach(([key, value]) => {
-            // generates controller files for the paramter name
+        const promises = Object.entries(name).map(async ([key, value]) => {
             if (key && key.toLowerCase().includes("controller") && value) {
-                controllerGen.generateController(value.toString());
+                await controllerGen.generateController(value.toString());
             }
-            // generates service files for the paramter name
             if (key && key.toLowerCase().includes("service") && value) {
-                serviceGen.generateService(value.toString());
+                await serviceGen.generateService(value.toString());
             }
-            // generatess routes files for the paramter name
             if (key && key.toLowerCase().includes("route") && value) {
                 if (readConfig().routing === "spring") {
                     dolphMsg.errorGray("cannot create routes file for spring routing.");
                 }
                 else {
-                    routesGen.generateRouter(value.toString());
-                    addRoutesIndexFile(value.toString(), readConfig);
+                    await routesGen.generateRouter(value.toString());
+                    await addRoutesIndexFile(value.toString(), readConfig);
                 }
             }
-            // generatess model fles for the paramter name
             if (key && key.toLowerCase().includes("model") && value) {
-                modelGen.generateModel(value.toString());
+                await modelGen.generateModel(value.toString());
                 if (readConfig().database === "mysql") {
-                    mysqlGen.generateConfig(value.toString());
+                    await mysqlGen.generateConfig(value.toString());
                 }
             }
             if (key && key.toLowerCase().includes("component") && value) {
-                generateComponent(value.toString());
+                await generateComponent(value.toString());
             }
-            // generates files for all the above options
             if (key && key.toLowerCase().includes("all") && value) {
-                modelGen.generateModel(value.toString());
+                await modelGen.generateModel(value.toString());
                 if (readConfig().database === "mysql") {
-                    mysqlGen.generateConfig(value.toString());
+                    await mysqlGen.generateConfig(value.toString());
                 }
-                serviceGen.generateService(value.toString());
-                controllerGen.generateController(value.toString());
+                await serviceGen.generateService(value.toString());
+                await controllerGen.generateController(value.toString());
                 if (readConfig().routing === "express") {
-                    routesGen.generateRouter(value.toString());
-                    addRoutesIndexFile(value.toString(), readConfig);
-                    addServerFile(readConfig);
+                    await routesGen.generateRouter(value.toString());
+                    await addRoutesIndexFile(value.toString(), readConfig);
+                    await addServerFile(readConfig);
                 }
                 else {
-                    generateComponent(value.toString());
-                    addControllerInComponentFIle(value.toString());
-                    addComponentToServerFile(value.toString());
+                    await generateComponent(value.toString());
+                    await addControllerInComponentFIle(value.toString());
+                    await addComponentToServerFile(value.toString());
                 }
             }
         });
+        await Promise.all(promises);
     });
 };

package/package.json

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