@dolphjs/cli 1.1.9 → 1.1.11

package/dist/generators/generate_model.js

@@ -3,6 +3,7 @@ import path from "path";
 import chalk from "chalk";
 import { readConfig } from "../utils/read_user_config_path.js";
 import { resolveModelContent } from "./resolvers/resolve_model_content.js";
+import { generateModel as generateSpringModel } from "./spring/generate_spring_model.js";
 const createModelDirectory = () => {
     const projectRoot = path.join(process.cwd());
     const userModelFilePath = path.join(projectRoot, "/src/models");
@@ -34,28 +35,33 @@ export const generateModelFile = async (name, modelDir, readConfig) => {
     });
 };
 export const generateModel = async (name) => {
-    if (!name)
-        chalk.bold(chalk.red("Model extension or name is required! 🤨"));
-    let modelDir = findModelDirectory();
-    if (!modelDir) {
-        //TODO: create one if it doesn't exist
-        // console.log(chalk.bold(chalk.red("Model directory doesn't exist 🤨")));
-        // return;
-        createModelDirectory();
-        modelDir = findModelDirectory();
+    if (readConfig().routing === "spring") {
+        generateSpringModel(name, readConfig().database === "mongo" ? true : false, readConfig().database === "mysql" ? true : false);
     }
-    const modelDirName = path.join(modelDir, name);
-    const modelFilePath = path.join(modelDirName + `/${name}.model.${readConfig().language}`);
-    try {
-        // Create the generate controller path
-        mkdirSync(modelDirName);
-        //TODO: if no index.ts file, create one too
-        generateModelFile(name, path.join(modelFilePath), readConfig
-        // modelDirName,
-        );
-    }
-    catch (e) {
-        console.log(chalk.bold(chalk.red(e)));
+    else {
+        if (!name)
+            chalk.bold(chalk.red("Model extension or name is required! 🤨"));
+        let modelDir = findModelDirectory();
+        if (!modelDir) {
+            //TODO: create one if it doesn't exist
+            // console.log(chalk.bold(chalk.red("Model directory doesn't exist 🤨")));
+            // return;
+            createModelDirectory();
+            modelDir = findModelDirectory();
+        }
+        const modelDirName = path.join(modelDir, name);
+        const modelFilePath = path.join(modelDirName + `/${name}.model.${readConfig().language}`);
+        try {
+            // Create the generate controller path
+            mkdirSync(modelDirName);
+            //TODO: if no index.ts file, create one too
+            generateModelFile(name, path.join(modelFilePath), readConfig
+            // modelDirName,
+            );
+        }
+        catch (e) {
+            console.log(chalk.bold(chalk.red(e)));
+        }
+        console.log(`${chalk.bold(chalk.green(`${name}.model.${readConfig().language} generated successfully! 🙃`))}`);
     }
-    console.log(`${chalk.bold(chalk.green(`${name}.model.${readConfig().language} generated successfully! 🙃`))}`);
 };

package/dist/generators/generate_service.js

@@ -3,6 +3,7 @@ import path from "path";
 import chalk from "chalk";
 import { readConfig } from "../utils/read_user_config_path.js";
 import { resolveServiceContent } from "./resolvers/resolve_service_content.js";
+import { generateService as generateSpringService } from "./spring/generate_spring_service.js";
 const createServiceDirectory = () => {
     const projectRoot = path.join(process.cwd());
     const userServiceFilePath = path.join(projectRoot, "/src/services");
@@ -34,30 +35,37 @@ export const generateServiceFile = async (name, serviceDir, readConfig) => {
     });
 };
 export const generateService = async (name) => {
-    if (!name)
-        chalk.bold(chalk.red("Service extension or name is required! 🤨"));
-    let serviceDir = findServiceDirectory();
-    if (!serviceDir) {
-        //TODO: create one if it doesn't exist
-        // console.log(chalk.bold(chalk.red("Service directory doesn't exist 🤨")));
-        // return;
-        createServiceDirectory();
-        serviceDir = findServiceDirectory();
+    if (readConfig().routing === "spring") {
+        generateSpringService(name, readConfig().database === "mongo" ? true : false, readConfig().database === "mysql" ? true : false);
     }
-    const serviceDirName = path.join(serviceDir, name);
-    const serviceFilePath = path.join(serviceDirName + `/${name}.service.${readConfig().language}`);
-    try {
-        // Create the generate controller path
-        if (readConfig().generateFolder === "true" || true) {
-            mkdirSync(serviceDirName);
+    else {
+        {
+            if (!name)
+                chalk.bold(chalk.red("Service extension or name is required! 🤨"));
+            let serviceDir = findServiceDirectory();
+            if (!serviceDir) {
+                //TODO: create one if it doesn't exist
+                // console.log(chalk.bold(chalk.red("Service directory doesn't exist 🤨")));
+                // return;
+                createServiceDirectory();
+                serviceDir = findServiceDirectory();
+            }
+            const serviceDirName = path.join(serviceDir, name);
+            const serviceFilePath = path.join(serviceDirName + `/${name}.service.${readConfig().language}`);
+            try {
+                // Create the generate controller path
+                if (readConfig().generateFolder === "true" || true) {
+                    mkdirSync(serviceDirName);
+                }
+                //TODO: if no index.ts file, create one too
+                generateServiceFile(name, path.join(serviceFilePath), readConfig
+                // serviceDirName,
+                );
+            }
+            catch (e) {
+                console.log(chalk.bold(chalk.red(e)));
+            }
         }
-        //TODO: if no index.ts file, create one too
-        generateServiceFile(name, path.join(serviceFilePath), readConfig
-        // serviceDirName,
-        );
+        console.log(`${chalk.bold(chalk.green(`${name}.service.${readConfig().language} generated successfully! 🙃`))}`);
     }
-    catch (e) {
-        console.log(chalk.bold(chalk.red(e)));
-    }
-    console.log(`${chalk.bold(chalk.green(`${name}.service.${readConfig().language} generated successfully! 🙃`))}`);
 };

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.ts";`;
+    const importStatement = `import { ${capitalizedString}Component } from "./${componentName}/${componentName}.component";`;
     try {
         if (!existsSync(serverPath)) {
             const fileContent = `import { DolphFactory } from "@dolphjs/dolph";
@@ -39,13 +39,12 @@ dolph.start();
             const fileContent = readFileSync(serverPath, "utf8");
             const newComponentInstance = `${capitalizedString}Component`;
             if (!fileContent.includes(importStatement)) {
-                const updatedContent = `
-        ${importStatement}\n${fileContent}}`;
+                const updatedContent = `${importStatement}\n${fileContent}`;
                 writeFileSync(serverPath, updatedContent);
             }
             if (fileContent.includes(`const dolph`)) {
                 // add new controller class to the existing array
-                const routesArrayMatch = fileContent.match(/const dolph = new DolphFactory\[([\s\S]]+?)\];/);
+                const routesArrayMatch = fileContent.match(/const dolph = new DolphFactory\(([^)]+)\);/);
                 if (routesArrayMatch) {
                     const existingCode = routesArrayMatch[1].trim();
                     let fileContents;

package/dist/utils/package_generator.js

@@ -10,8 +10,6 @@ import { addRoutesIndexFile } from "../registers/register_routes.js";
 import { addServerFile } from "../registers/server_file_routes.js";
 import { dolphMsg } from "../helpers/messages.js";
 import { generateComponent } from "../generators/spring/generate_spring_component.js";
-import { generateService } from "../generators/spring/generate_spring_service.js";
-import { generateModel } from "../generators/spring/generate_spring_model.js";
 import { addComponentToServerFile } from "../registers/register_component.js";
 export const packageGenerator = () => {
     program
@@ -31,12 +29,7 @@ export const packageGenerator = () => {
             }
             // generates service files for the paramter name
             if (key && key.toLowerCase().includes("service") && value) {
-                if (readConfig().routing === "express") {
-                    serviceGen.generateService(value.toString());
-                }
-                else {
-                    generateService(value.toString(), readConfig().database === "mongo" ? true : false, readConfig().database === "mysql" ? true : false);
-                }
+                serviceGen.generateService(value.toString());
             }
             // generatess routes files for the paramter name
             if (key && key.toLowerCase().includes("route") && value) {
@@ -50,14 +43,9 @@ export const packageGenerator = () => {
             }
             // generatess model fles for the paramter name
             if (key && key.toLowerCase().includes("model") && value) {
-                if (readConfig().routing === "express") {
-                    modelGen.generateModel(value.toString());
-                    if (readConfig().database === "mysql") {
-                        mysqlGen.generateConfig(value.toString());
-                    }
-                }
-                else {
-                    generateModel(value.toString(), readConfig().database === "mongo" ? true : false, readConfig().database === "mysql" ? true : false);
+                modelGen.generateModel(value.toString());
+                if (readConfig().database === "mysql") {
+                    mysqlGen.generateConfig(value.toString());
                 }
             }
             if (key && key.toLowerCase().includes("component") && value) {
@@ -65,22 +53,12 @@ export const packageGenerator = () => {
             }
             // generates files for all the above options
             if (key && key.toLowerCase().includes("all") && value) {
-                if (readConfig().routing === "express") {
-                    modelGen.generateModel(value.toString());
-                }
-                else {
-                    generateModel(value.toString(), readConfig().database === "mongo" ? true : false, readConfig().database === "mysql" ? true : false);
-                }
+                modelGen.generateModel(value.toString());
                 if (readConfig().database === "mysql") {
                     mysqlGen.generateConfig(value.toString());
                 }
-                if (readConfig().routing === "express") {
-                    serviceGen.generateService(value.toString());
-                    controllerGen.generateController(value.toString());
-                }
-                else {
-                    generateService(value.toString(), readConfig().database === "mongo" ? true : false, readConfig().database === "mysql" ? true : false);
-                }
+                serviceGen.generateService(value.toString());
+                controllerGen.generateController(value.toString());
                 if (readConfig().routing === "express") {
                     routesGen.generateRouter(value.toString());
                     addRoutesIndexFile(value.toString(), readConfig);

package/package.json

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