@expressots/cli 1.1.1 → 1.2.0

package/bin/generate/cli.js

@@ -8,7 +8,7 @@ const form_1 = require("./form");
 const chalk_1 = __importDefault(require("chalk"));
 const generateProject = () => {
     return {
-        command: "generate [schematic] [path..]",
+        command: "generate [schematic] [path]",
         describe: "Generate a schematic",
         aliases: ["g"],
         builder: (yargs) => {
@@ -24,14 +24,14 @@ const generateProject = () => {
                 type: "string",
                 coerce: coerceSchematicAliases,
             });
-            yargs.positional("path..", {
+            yargs.positional("path", {
                 describe: "The path to generate the schematic",
                 type: "string",
             });
             return yargs;
         },
         handler: async ({ schematic, path }) => {
-            const file = await (0, form_1.createTemplate)({ schematic, path: path.join(" ") });
+            const file = await (0, form_1.createTemplate)({ schematic, path });
             console.log(chalk_1.default.green(`> ${file.split(".")[0]} ${schematic} created! 🚀`));
         },
     };

package/bin/generate/form.js

@@ -41,6 +41,8 @@ const fs_1 = require("fs");
 const chalk_1 = __importDefault(require("chalk"));
 const boost_ts_1 = require("@expressots/boost-ts");
 const compiler_1 = __importDefault(require("../utils/compiler"));
+const add_controller_to_module_1 = require("../utils/add-controller-to-module");
+const verify_file_exists_1 = require("../utils/verify-file-exists");
 function getFileNameWithoutExtension(filePath) {
     return filePath.split('.')[0];
 }
@@ -60,6 +62,7 @@ const createTemplate = async ({ schematic, path: target, }) => {
     const { path, file, className } = await splitTarget({ target, schematic });
     const { sourceRoot } = await compiler_1.default.loadConfig();
     const usecaseDir = `${sourceRoot}/${withinSource}`;
+    await (0, verify_file_exists_1.verifyIfFileExists)(`${usecaseDir}/${path}${file}`);
     (0, node_fs_1.mkdirSync)(`${usecaseDir}/${path}`, { recursive: true });
     if (schematic !== "service") {
         console.log(messageColors[schematic](`> [${schematic}] Creating ${file}...`));
@@ -81,11 +84,12 @@ const createTemplate = async ({ schematic, path: target, }) => {
                 _c = _f.value;
                 _d = false;
                 try {
-                    const currentSchematic = _c;
+                    const resource = _c;
+                    const currentSchematic = resource.replace("controller-service", "controller");
                     const schematicFile = file.replace(`controller.ts`, `${currentSchematic}.ts`);
-                    console.log(messageColors[currentSchematic](`> [${currentSchematic}] Creating ${schematicFile.replace("controller-service", "controller")}...`));
+                    console.log(messageColors[currentSchematic](`> [${currentSchematic}] Creating ${schematicFile}...`));
                     writeTemplate({
-                        outputPath: `${usecaseDir}/${path}${schematicFile.replace("controller-service", "controller")}`,
+                        outputPath: `${usecaseDir}/${path}${schematicFile}`,
                         template: {
                             path: `./templates/${currentSchematic}.tpl`,
                             data: {
@@ -112,19 +116,26 @@ const createTemplate = async ({ schematic, path: target, }) => {
         }
     }
     const moduleName = path.split("/")[0];
-    if (["controller", "service"].includes(schematic) && !(0, fs_1.existsSync)(`${usecaseDir}/${moduleName}/${moduleName}.module.ts`)) {
-        console.log(messageColors.module(`> [module] Creating ${moduleName}.module.ts...`));
-        writeTemplate({
-            outputPath: `${usecaseDir}/${moduleName}/${moduleName}.module.ts`,
-            template: {
-                path: `./templates/module.tpl`,
-                data: {
-                    moduleName: moduleName[0].toUpperCase() + moduleName.slice(1),
-                    className,
-                    path: `${path.split("/")[1]}/${file.slice(0, file.lastIndexOf('.'))}`
+    if (["controller", "service"].includes(schematic)) {
+        if ((0, fs_1.existsSync)(`${usecaseDir}/${moduleName}/${moduleName}.module.ts`)) {
+            console.log(messageColors.module(`> [module] Adding controller to ${moduleName}.module.ts...`));
+            const controllerPath = `./${path.split("/")[1]}/${file.slice(0, file.lastIndexOf('.'))}`;
+            await (0, add_controller_to_module_1.addControllerToModule)(`${usecaseDir}/${moduleName}/${moduleName}.module.ts`, `${className}Controller`, controllerPath);
+        }
+        else {
+            console.log(messageColors.module(`> [module] Creating ${moduleName}.module.ts...`));
+            writeTemplate({
+                outputPath: `${usecaseDir}/${moduleName}/${moduleName}.module.ts`,
+                template: {
+                    path: `./templates/module.tpl`,
+                    data: {
+                        moduleName: moduleName[0].toUpperCase() + moduleName.slice(1),
+                        className,
+                        path: `${path.split("/")[1]}/${file.slice(0, file.lastIndexOf('.'))}`
+                    },
                 },
-            },
-        });
+            });
+        }
     }
     return file;
 };

package/bin/new/cli.js

@@ -4,17 +4,30 @@ exports.createProject = void 0;
 const form_1 = require("./form");
 const createProject = () => {
     return {
-        command: "new [project-name]",
+        command: "new <project-name> [package-manager] [template]",
         describe: "Create a new Expresso TS project",
         builder: (yargs) => {
-            yargs.positional("project-name", {
+            yargs
+                .positional("project-name", {
                 describe: "The name of the project",
                 type: "string",
+            })
+                .option("template", {
+                describe: "The project template to use",
+                type: "string",
+                choices: ["non-opinionated", "opinionated"],
+                alias: "t",
+            })
+                .option("package-manager", {
+                describe: "The package manager to use",
+                type: "string",
+                choices: ["npm", "yarn", "pnpm"],
+                alias: "p",
             });
             return yargs;
         },
-        handler: async ({ projectName }) => {
-            return await (0, form_1.projectForm)(projectName);
+        handler: async ({ projectName, packageManager, template }) => {
+            return await (0, form_1.projectForm)(projectName, packageManager, template);
         },
     };
 };

package/bin/new/form.d.ts

@@ -1,2 +1,11 @@
-declare const projectForm: (projectName: string) => Promise<void>;
+declare enum Template {
+    "non-opinionated" = "Non-Opinionated :: A simple ExpressoTS project.",
+    opinionated = "Opinionated :: A complete ExpressoTS project with an opinionated structure and features."
+}
+declare const enum PackageManager {
+    npm = 0,
+    yarn = 1,
+    pnpm = 2
+}
+declare const projectForm: (projectName: string, packageManager: PackageManager, template: keyof typeof Template) => Promise<void>;
 export { projectForm };

package/bin/new/form.js

@@ -57,39 +57,55 @@ function changePackageName({ directory, name, }) {
     // Save the package.json file
     node_fs_1.default.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
 }
-const projectForm = async (projectName) => {
-    const answer = await inquirer_1.default.prompt([
-        {
-            type: "input",
-            name: "name",
-            message: "Project name",
-            default: projectName,
-            transformer: (input) => {
-                return chalk_1.default.yellow(chalk_1.default.bold(input));
+var Template;
+(function (Template) {
+    Template["non-opinionated"] = "Non-Opinionated :: A simple ExpressoTS project.";
+    Template["opinionated"] = "Opinionated :: A complete ExpressoTS project with an opinionated structure and features.";
+})(Template || (Template = {}));
+const projectForm = async (projectName, packageManager, template) => {
+    let answer;
+    if (packageManager && template) {
+        answer = {
+            name: projectName,
+            packageManager: packageManager,
+            template: Template[template],
+            confirm: true,
+        };
+    }
+    else {
+        answer = await inquirer_1.default.prompt([
+            {
+                type: "input",
+                name: "name",
+                message: "Project name",
+                default: projectName,
+                transformer: (input) => {
+                    return chalk_1.default.yellow(chalk_1.default.bold(input));
+                },
+            },
+            {
+                type: "list",
+                name: "packageManager",
+                message: "Package manager",
+                choices: ["npm", "yarn", "pnpm"],
+            },
+            {
+                type: "list",
+                name: "template",
+                message: "Select a template",
+                choices: [
+                    "Non-Opinionated :: A simple ExpressoTS project.",
+                    "Opinionated :: A complete ExpressoTS project with an opinionated structure and features.",
+                ],
             },
-        },
-        {
-            type: "list",
-            name: "packageManager",
-            message: "Package manager",
-            choices: ["npm", "yarn", "pnpm"],
-        },
-        {
-            type: "list",
-            name: "template",
-            message: "Select a template",
-            choices: [
-                "Non-Opinionated :: A simple ExpressoTS project.",
-                "Opinionated :: A complete ExpressoTS project with an opinionated structure and features.",
-            ],
-        },
-        {
-            type: "confirm",
-            name: "confirm",
-            message: "Do you want to create this project?",
-            default: true,
-        },
-    ]);
+            {
+                type: "confirm",
+                name: "confirm",
+                message: "Do you want to create this project?",
+                default: true,
+            },
+        ]);
+    }
     // Hashmap of templates and their directories
     const templates = {
         "Non-Opinionated": "non_opinionated",

package/bin/utils/add-controller-to-module.d.ts

@@ -0,0 +1,2 @@
+declare function addControllerToModule(filePath: string, controllerName: string, controllerPath: string): Promise<void>;
+export { addControllerToModule };

package/bin/utils/add-controller-to-module.js

@@ -0,0 +1,40 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addControllerToModule = void 0;
+const node_fs_1 = __importDefault(require("node:fs"));
+async function addControllerToModule(filePath, controllerName, controllerPath) {
+    const fileContent = await node_fs_1.default.promises.readFile(filePath, 'utf8');
+    const imports = [];
+    const notImports = [];
+    fileContent.split('\n').forEach((line) => {
+        if (line.startsWith('import')) {
+            imports.push(line);
+        }
+        else {
+            notImports.push(line);
+        }
+    });
+    const newImport = `import { ${controllerName} } from "${controllerPath}";`;
+    if (imports.includes(newImport)) {
+        return;
+    }
+    imports.push(newImport);
+    const moduleDeclarationRegex = /CreateModule\(\[(.*)\]\);/s;
+    const moduleDeclarationMatch = fileContent.match(moduleDeclarationRegex);
+    if (!moduleDeclarationMatch) {
+        return;
+    }
+    const controllers = moduleDeclarationMatch[1].trim().split(',').map((c) => c.trim());
+    if (controllers.includes(controllerName)) {
+        return;
+    }
+    controllers.push(controllerName);
+    const newControllers = controllers.join(', ');
+    const newModuleDeclaration = `CreateModule([${newControllers}]);`;
+    const newFileContent = [...imports, ...notImports].join('\n').replace(moduleDeclarationRegex, newModuleDeclaration);
+    await node_fs_1.default.promises.writeFile(filePath, newFileContent, 'utf8');
+}
+exports.addControllerToModule = addControllerToModule;

package/bin/utils/verify-file-exists.d.ts

@@ -0,0 +1,2 @@
+declare function verifyIfFileExists(path: string): Promise<void>;
+export { verifyIfFileExists };

package/bin/utils/verify-file-exists.js

@@ -0,0 +1,27 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.verifyIfFileExists = void 0;
+const chalk_1 = __importDefault(require("chalk"));
+const inquirer_1 = __importDefault(require("inquirer"));
+const node_fs_1 = __importDefault(require("node:fs"));
+async function verifyIfFileExists(path) {
+    const fileExists = node_fs_1.default.existsSync(path);
+    if (fileExists) {
+        const answer = await inquirer_1.default.prompt([
+            {
+                type: "confirm",
+                name: "confirm",
+                message: "File with this path already exists. Do you want to create it anyway?",
+                default: true,
+            },
+        ]);
+        if (!answer.confirm) {
+            console.log(chalk_1.default.green('> File not created!'));
+            process.exit(1);
+        }
+    }
+}
+exports.verifyIfFileExists = verifyIfFileExists;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expressots/cli",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Expressots CLI - modern, fast, lightweight nodejs web framework (@cli)",
   "author": "Richard Zampieri",
   "license": "MIT",