@dolphjs/cli 1.1.13 → 1.1.15

package/dist/generators/generate_controller.js

@@ -5,6 +5,7 @@ import { promisify } from "util";
 import { readConfig } from "../utils/read_user_config_path.js";
 import { resolveControllerContent } from "./resolvers/resolve_controller_content.js";
 import { generateController as generateSpringController } from "./spring/generate_spring_controller.js";
+import { addControllerInComponentFIle } from "../registers/register_controllers_in_components.js";
 const writeFileAsync = promisify(writeFile);
 const createControllerDirectory = () => {
     const projectRoot = path.join(process.cwd());
@@ -31,6 +32,7 @@ export const generateControllerFile = async (name, controllerDir, readConfig) =>
 export const generateController = async (name) => {
     if (readConfig().routing === "spring") {
         await generateSpringController(name);
+        addControllerInComponentFIle(name);
     }
     else {
         if (!name) {

package/dist/registers/register_component.js

@@ -25,7 +25,7 @@ export const addComponentToServerFile = (componentName) => {
     }
     const serverPath = path.join(serverDir, "server.ts");
     const capitalizedString = componentName.charAt(0).toUpperCase() + componentName.slice(1);
-    const importStatement = `import { ${capitalizedString}Component } from "./${componentName}/${componentName}.component";`;
+    const importStatement = `import { ${capitalizedString}Component } from "./components/${componentName}/${componentName}.component";`;
     try {
         if (!existsSync(serverPath)) {
             const fileContent = `import { DolphFactory } from "@dolphjs/dolph";
@@ -48,7 +48,7 @@ dolph.start();
                 if (routesArrayMatch) {
                     const existingCode = routesArrayMatch[1].trim();
                     let fileContents;
-                    fileContents = fileContent.replace(existingCode, `[${existingCode.length > 0
+                    fileContents = fileContent.replace(existingCode, `${existingCode.length > 0
                         ? existingCode.slice(0, -1) + `, ${newComponentInstance}]`
                         : newComponentInstance}`);
                     const updatedContents = `${importStatement}\n${fileContents}`;

package/dist/registers/register_controllers_in_components.js

@@ -0,0 +1,57 @@
+import { existsSync, readFileSync, writeFileSync } from "fs";
+import path from "path";
+import { dolphMsg } from "../helpers/messages.js";
+const findComponentsDirectory = (componentName) => {
+    const rootDir = process.cwd();
+    const possibleDirs = [`src/components/${componentName}`];
+    const srcDir = possibleDirs.find((dir) => existsSync(path.join(rootDir, dir)));
+    return srcDir ? path.join(rootDir, srcDir) : null;
+};
+export const addControllerInComponentFIle = (componentName) => {
+    if (!componentName) {
+        dolphMsg.errorRed("component extension or name is required! 🤨");
+    }
+    const componentDir = findComponentsDirectory(componentName);
+    if (!componentDir) {
+        dolphMsg.errorRed("something went wrong, please make sure to use the `new` command when creating a dolph project.");
+        return;
+    }
+    const componentPath = path.join(componentDir, `${componentName}.component.ts`);
+    const capitalizedString = componentName.charAt(0).toUpperCase() + componentName.slice(1);
+    const importStatement = `import { ${capitalizedString}Controller } from "./${componentName}.controller";`;
+    try {
+        if (!existsSync(componentPath)) {
+            const fileContent = `import { Component } from "@dolphjs/dolph/decorators";
+@Component({ controllers: [${capitalizedString}Controller] })
+export class ${capitalizedString}Component {}
+`;
+            writeFileSync(componentPath, fileContent);
+        }
+        else {
+            const fileContent = readFileSync(componentPath, "utf8");
+            const newComponentInstance = `${capitalizedString}Controller`;
+            if (!fileContent.includes(importStatement)) {
+                const updatedContent = `${importStatement}\n\n${fileContent}`;
+                writeFileSync(componentPath, updatedContent);
+            }
+            if (fileContent.includes(`const dolph`)) {
+                // add new controller class to the existing array
+                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.slice(0, -1) + `, ${newComponentInstance}`
+                        : newComponentInstance}`);
+                    const updatedContents = `${importStatement}\n${fileContents}`;
+                    writeFileSync(componentPath, updatedContents);
+                }
+            }
+        }
+        dolphMsg.info(`registerd ${capitalizedString}Controller in ${capitalizedString}Component`);
+        process.exit(0);
+    }
+    catch (e) {
+        dolphMsg.errorRed(e.toString());
+    }
+};

package/dist/utils/package_generator.js

@@ -11,6 +11,7 @@ import { addServerFile } from "../registers/server_file_routes.js";
 import { dolphMsg } from "../helpers/messages.js";
 import { generateComponent } from "../generators/spring/generate_spring_component.js";
 import { addComponentToServerFile } from "../registers/register_component.js";
+import { addControllerInComponentFIle } from "../registers/register_controllers_in_components.js";
 export const packageGenerator = () => {
     program
         .command("generate")
@@ -66,6 +67,7 @@ export const packageGenerator = () => {
                 }
                 else {
                     generateComponent(value.toString());
+                    addControllerInComponentFIle(value.toString());
                     addComponentToServerFile(value.toString());
                 }
             }

package/package.json

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