@dolphjs/cli 1.1.12 → 1.1.14

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());
@@ -30,7 +31,8 @@ export const generateControllerFile = async (name, controllerDir, readConfig) =>
 };
 export const generateController = async (name) => {
     if (readConfig().routing === "spring") {
-        generateSpringController(name);
+        await generateSpringController(name);
+        addControllerInComponentFIle(name);
     }
     else {
         if (!name) {
@@ -48,7 +50,7 @@ export const generateController = async (name) => {
             if (readConfig().generateFolder === "true" || true) {
                 mkdirSync(controllerDirName);
             }
-            generateControllerFile(name, path.join(controllerFilePath), readConfig);
+            await generateControllerFile(name, path.join(controllerFilePath), readConfig);
         }
         catch (e) {
             console.log(chalk.bold(chalk.red(e)));

package/dist/generators/generate_model.js

@@ -30,7 +30,7 @@ export const generateModelFile = async (name, modelDir, readConfig) => {
 };
 export const generateModel = async (name) => {
     if (readConfig().routing === "spring") {
-        generateSpringModel(name, readConfig().database === "mongo" ? true : false, readConfig().database === "mysql" ? true : false);
+        await generateSpringModel(name, readConfig().database === "mongo" ? true : false, readConfig().database === "mysql" ? true : false);
     }
     else {
         if (!name) {
@@ -46,7 +46,7 @@ export const generateModel = async (name) => {
         const modelFilePath = path.join(modelDirName + `/${name}.model.${readConfig().language}`);
         try {
             mkdirSync(modelDirName);
-            generateModelFile(name, path.join(modelFilePath), readConfig);
+            await generateModelFile(name, path.join(modelFilePath), readConfig);
         }
         catch (e) {
             console.log(chalk.bold(chalk.red(e)));

package/dist/generators/generate_mysql.js

@@ -4,6 +4,7 @@ import chalk from "chalk";
 import { promisify } from "util";
 import { readConfig } from "../utils/read_user_config_path.js";
 import { resolveMySqlContent } from "./resolvers/resolve_model_content.js";
+import { generateConfig as generateSpringConfig } from "./spring/generate_spring_mysql.js";
 const writeFileAsync = promisify(writeFile);
 const createConfigDirectory = () => {
     const projectRoot = path.join(process.cwd());
@@ -32,17 +33,22 @@ export const generateConfig = async (name) => {
         console.log(chalk.bold(chalk.red("Config extension or name is required! 🤨")));
         return;
     }
-    let configDir = findConfigDirectory();
-    if (!configDir) {
-        createConfigDirectory();
-        configDir = findConfigDirectory();
+    if (readConfig().routing === "spring") {
+        await generateSpringConfig(name);
     }
-    const configDirName = configDir;
-    const configFilePath = path.join(configDirName + `/db.configs.${readConfig().language}`);
-    try {
-        generateConfigFile(name, path.join(configFilePath), readConfig);
-    }
-    catch (e) {
-        console.log(chalk.bold(chalk.red(e)));
+    else {
+        let configDir = findConfigDirectory();
+        if (!configDir) {
+            createConfigDirectory();
+            configDir = findConfigDirectory();
+        }
+        const configDirName = configDir;
+        const configFilePath = path.join(configDirName + `/db.configs.${readConfig().language}`);
+        try {
+            await generateConfigFile(name, path.join(configFilePath), readConfig);
+        }
+        catch (e) {
+            console.log(chalk.bold(chalk.red(e)));
+        }
     }
 };

package/dist/generators/generate_routes.js

@@ -43,7 +43,7 @@ export const generateRouter = async (name) => {
         if (readConfig().generateFolder === "true" || true) {
             mkdirSync(routesDirName);
         }
-        generateRoutesFile(name, path.join(routesFilePath), readConfig);
+        await generateRoutesFile(name, path.join(routesFilePath), readConfig);
     }
     catch (e) {
         console.log(chalk.bold(chalk.red(e)));

package/dist/generators/generate_service.js

@@ -30,7 +30,7 @@ export const generateServiceFile = async (name, serviceDir, readConfig) => {
 };
 export const generateService = async (name) => {
     if (readConfig().routing === "spring") {
-        generateSpringService(name, readConfig().database === "mongo" ? true : false, readConfig().database === "mysql" ? true : false);
+        await generateSpringService(name, readConfig().database === "mongo" ? true : false, readConfig().database === "mysql" ? true : false);
     }
     else {
         if (!name) {
@@ -48,7 +48,7 @@ export const generateService = async (name) => {
             if (readConfig().generateFolder === "true" || true) {
                 mkdirSync(serviceDirName);
             }
-            generateServiceFile(name, path.join(serviceFilePath), readConfig);
+            await generateServiceFile(name, path.join(serviceFilePath), readConfig);
         }
         catch (e) {
             console.log(chalk.bold(chalk.red(e)));

package/dist/generators/spring/generate_spring_component.js

@@ -7,14 +7,14 @@ import { promisify } from "util";
 const writeFileAsync = promisify(writeFile);
 const createComponentDirectory = (componentName) => {
     const projectRoot = path.join(process.cwd());
-    const userComponentPath = path.join(projectRoot, `/src/${componentName}`);
+    const userComponentPath = path.join(projectRoot, `/src/components/${componentName}`);
     if (!existsSync(userComponentPath)) {
         mkdirSync(userComponentPath);
     }
 };
 const findComponentDirectory = (componentName) => {
     const rootDir = process.cwd();
-    const possibleDirs = [`src/${componentName}`];
+    const possibleDirs = [`src/components/${componentName}`];
     const componentDir = possibleDirs.find((dir) => existsSync(path.join(rootDir, dir)));
     return componentDir ? path.join(rootDir, componentDir) : null;
 };

package/dist/generators/spring/generate_spring_controller.js

@@ -7,14 +7,14 @@ import { promisify } from "util";
 const writeFileAsync = promisify(writeFile);
 const createControllerDirectory = (componentName) => {
     const projectRoot = path.join(process.cwd());
-    const userCompontrollerPath = path.join(projectRoot, `/src/${componentName}`);
+    const userCompontrollerPath = path.join(projectRoot, `/src/components/${componentName}`);
     if (!existsSync(userCompontrollerPath)) {
         mkdirSync(userCompontrollerPath);
     }
 };
 const findControllerDirectory = (componentName) => {
     const rootDir = process.cwd();
-    const possibleDirs = [`src/${componentName}`];
+    const possibleDirs = [`src/components/${componentName}`];
     const controllerDir = possibleDirs.find((dir) => existsSync(path.join(rootDir, dir)));
     return controllerDir ? path.join(rootDir, controllerDir) : null;
 };

package/dist/generators/spring/generate_spring_model.js

@@ -7,14 +7,14 @@ import { promisify } from "util";
 const writeFileAsync = promisify(writeFile);
 const createModelDirectory = (componentName) => {
     const projectRoot = path.join(process.cwd());
-    const userModelPath = path.join(projectRoot, `/src/${componentName}`);
+    const userModelPath = path.join(projectRoot, `/src/components/${componentName}`);
     if (!existsSync(userModelPath)) {
         mkdirSync(userModelPath);
     }
 };
 const findModelDirectory = (componentName) => {
     const rootDir = process.cwd();
-    const possibleDirs = [`src/${componentName}`];
+    const possibleDirs = [`src/components/${componentName}`];
     const modelDir = possibleDirs.find((dir) => existsSync(path.join(rootDir, dir)));
     return modelDir ? path.join(rootDir, modelDir) : null;
 };

package/dist/generators/spring/generate_spring_mysql.js

@@ -0,0 +1,48 @@
+import { existsSync, mkdirSync, writeFile } from "fs";
+import path from "path";
+import chalk from "chalk";
+import { promisify } from "util";
+import { readConfig } from "../../utils/read_user_config_path.js";
+import { resolveMySqlContent } from "./../resolvers/resolve_model_content.js";
+const writeFileAsync = promisify(writeFile);
+const createConfigDirectory = () => {
+    const projectRoot = path.join(process.cwd());
+    const userConfigFilePath = path.join(projectRoot, "/src/shared/configs");
+    if (!existsSync(userConfigFilePath)) {
+        mkdirSync(userConfigFilePath);
+    }
+};
+const findConfigDirectory = () => {
+    const rootDir = process.cwd();
+    const possibleDirs = ["/src/shared/configs"];
+    const configDir = possibleDirs.find((dir) => existsSync(path.join(rootDir, dir)));
+    return configDir ? path.join(rootDir, configDir) : null;
+};
+export const generateConfigFile = async (name, configDir, readConfig) => {
+    try {
+        await writeFileAsync(configDir, resolveMySqlContent(readConfig));
+        console.log(`${chalk.bold(chalk.green(`db.config.${readConfig().language} generated successfully! 🙃`))}`);
+    }
+    catch (error) {
+        console.log(chalk.bold(chalk.red(error.toString())));
+    }
+};
+export const generateConfig = async (name) => {
+    if (!name) {
+        console.log(chalk.bold(chalk.red("Config extension or name is required! 🤨")));
+        return;
+    }
+    let configDir = findConfigDirectory();
+    if (!configDir) {
+        createConfigDirectory();
+        configDir = findConfigDirectory();
+    }
+    const configDirName = configDir;
+    const configFilePath = path.join(configDirName + `/db.configs.${readConfig().language}`);
+    try {
+        await generateConfigFile(name, path.join(configFilePath), readConfig);
+    }
+    catch (e) {
+        console.log(chalk.bold(chalk.red(e)));
+    }
+};

package/dist/generators/spring/generate_spring_service.js

@@ -7,14 +7,14 @@ import { promisify } from "util";
 const writeFileAsync = promisify(writeFile);
 const createServiceDirectory = (componentName) => {
     const projectRoot = path.join(process.cwd());
-    const userServicePath = path.join(projectRoot, `/src/${componentName}`);
+    const userServicePath = path.join(projectRoot, `/src/components/${componentName}`);
     if (!existsSync(userServicePath)) {
         mkdirSync(userServicePath);
     }
 };
 const findServiceDirectory = (componentName) => {
     const rootDir = process.cwd();
-    const possibleDirs = [`src/${componentName}`];
+    const possibleDirs = [`src/components/${componentName}`];
     const serviceDir = possibleDirs.find((dir) => existsSync(path.join(rootDir, dir)));
     return serviceDir ? path.join(rootDir, serviceDir) : null;
 };

package/dist/registers/register_component.js

@@ -1,9 +1,9 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
 import { dolphMsg } from "../helpers/messages.js";
 import path from "path";
-const createSrcDirectory = () => {
+const createComponentDirectory = () => {
     const projectRoot = path.join(process.cwd());
-    const userComponentPath = path.join(projectRoot, `/src`);
+    const userComponentPath = path.join(projectRoot, `/src/components`);
     if (!existsSync(userComponentPath)) {
         mkdirSync(userComponentPath);
     }
@@ -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,9 @@ dolph.start();
                 if (routesArrayMatch) {
                     const existingCode = routesArrayMatch[1].trim();
                     let fileContents;
-                    fileContents = fileContent.replace(existingCode, `${existingCode.length > 0 ? existingCode + ", " : ""}${newComponentInstance}`);
+                    fileContents = fileContent.replace(existingCode, `${existingCode.length > 0
+                        ? existingCode.slice(0, -1) + `, ${newComponentInstance}]`
+                        : newComponentInstance}`);
                     const updatedContents = `${importStatement}\n${fileContents}`;
                     writeFileSync(serverPath, updatedContents);
                 }

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 = () => {
+    const rootDir = process.cwd();
+    const possibleDirs = [`src/components`];
+    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();
+    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/init_helper_function.js

@@ -24,12 +24,18 @@ 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 testPath = path.join(configFolderPath, "tests");
+    const sharedDirPath = path.join(srcPath, "shared");
+    const componentDirPath = path.join(srcPath, "components");
     if (!existsSync(configFolderPath)) {
         mkdirSync(configFolderPath);
     }
     if (!existsSync(srcPath)) {
         mkdirSync(srcPath);
     }
+    if (!existsSync(testPath)) {
+        mkdirSync(testPath);
+    }
     const defaultConfig = {
         language: "ts",
         paradigm: "oop",
@@ -72,7 +78,7 @@ export const initDolphCli = (appname) => {
             .then((replies) => {
             // TODO: add this to the config file:
             const comment = "# this is an auto-generated file, please do not edit manually\n";
-            if ((replies.routing = "spring")) {
+            if (replies.routing === "spring") {
                 replies.paradigm = "oop";
                 replies.language = "ts";
             }
@@ -86,6 +92,14 @@ export const initDolphCli = (appname) => {
             writeDolphConfig();
             writePackageJsonFile(projectName, userConfig.language);
             writeGitignore();
+            if (userConfig.routing === "spring") {
+                if (!existsSync(componentDirPath)) {
+                    mkdirSync(componentDirPath);
+                }
+                if (!existsSync(sharedDirPath)) {
+                    mkdirSync(sharedDirPath);
+                }
+            }
             dolphMsg.infoBlue("dolph configurations have been initialized successfully ✨.");
             dolphMsg.infoYellow("run `yarn install` to install dependencies in project directory and start building 🚀.");
             process.exit(0);

package/dist/utils/package_generator.js

@@ -11,15 +11,16 @@ 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")
         .alias("g")
-        .option("-s, --service" + chalk.bold(chalk.blue("<name>")), "Generates a dolphjs service file.")
-        .option("-c, --controller" + chalk.bold(chalk.blue("<name>")), "Generates a dolphjs controller file.")
-        .option("-r, --route" + chalk.bold(chalk.blue("<name>")), "Generates a dolphjs routes file.")
-        .option("-m, --model" + chalk.bold(chalk.blue("<name>")), "Generates a dolphjs models file.")
-        .option("-com, --component" + chalk.bold(chalk.blue("<name>")), "Generates a dolphjs spring component file.")
+        .option("-s, --service" + chalk.bold(chalk.blue(" <name>")), "Generates a dolphjs service file.")
+        .option("-c, --controller" + chalk.bold(chalk.blue(" <name>")), "Generates a dolphjs controller file.")
+        .option("-r, --route" + chalk.bold(chalk.blue(" <name>")), "Generates a dolphjs routes file.")
+        .option("-m, --model" + chalk.bold(chalk.blue(" <name>")), "Generates a dolphjs models file.")
+        .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]) => {
@@ -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.12",
+  "version": "1.1.14",
   "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",