@expressots/cli 1.5.0 → 1.7.0

package/bin/new/form.js

@@ -61,8 +61,8 @@ function changePackageName({ directory, name, }) {
 }
 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["non-opinionated"] = "Non-Opinionated :: Allows users to choose where to scaffold resources, offering flexible project organization.";
+    Template["opinionated"] = "Opinionated :: Automatically scaffolds resources into a preset project structure. (Recommended)";
 })(Template || (Template = {}));
 const projectForm = async (projectName, args) => {
     let answer;
@@ -117,8 +117,8 @@ const projectForm = async (projectName, args) => {
                 name: "template",
                 message: "Select a template",
                 choices: [
-                    "Non-Opinionated :: A simple ExpressoTS project.",
-                    "Opinionated :: A complete ExpressoTS project with an opinionated structure and features.",
+                    `Opinionated :: Automatically scaffolds resources into a preset project structure. (${chalk_1.default.yellow("Recommended")})`,
+                    "Non-Opinionated :: Allows users to choose where to scaffold resources, offering flexible project organization.",
                 ],
             },
             {
@@ -166,6 +166,7 @@ const projectForm = async (projectName, args) => {
             await emitter.clone(answer.name);
         }
         catch (err) {
+            console.log("\n");
             (0, cli_ui_1.printError)("Project already exists or Folder is not empty", answer.name);
             process.exit(1);
         }
@@ -185,7 +186,7 @@ const projectForm = async (projectName, args) => {
         progressBar.update(100);
         progressBar.stop();
         console.log("\n");
-        console.log("🐎 Project ", chalk_1.default.green(answer.name), "created successfully!");
+        console.log("🐎 Project", chalk_1.default.green(answer.name), "created successfully!");
         console.log("🤙 Run the following commands to start the project:\n");
         console.log(chalk_1.default.bold.gray(`$ cd ${answer.name}`));
         switch (answer.packageManager) {
@@ -206,6 +207,7 @@ const projectForm = async (projectName, args) => {
         console.log(chalk_1.default.bold.green((0, center_text_1.centerText)("Happy coding!")));
         console.log(chalk_1.default.bold.gray((0, center_text_1.centerText)("Please consider donating to support the project.\n")));
         console.log(chalk_1.default.bold.white((0, center_text_1.centerText)("💖 Sponsor: https://github.com/sponsors/expressots")));
+        console.log("\n");
     }
 };
 exports.projectForm = projectForm;

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

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

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

@@ -1,2 +1,3 @@
 declare function addModuleToContainer(name: string, modulePath?: string, path?: string): Promise<void>;
-export { addModuleToContainer };
+declare function addModuleToContainerNestedPath(name: string, path?: string): Promise<void>;
+export { addModuleToContainer, addModuleToContainerNestedPath };

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addModuleToContainer = void 0;
+exports.addModuleToContainerNestedPath = exports.addModuleToContainer = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const glob_1 = require("glob");
 const node_fs_1 = __importDefault(require("node:fs"));
@@ -67,14 +67,14 @@ async function addModuleToContainer(name, modulePath, path) {
     const modulePathRegex = /^[^/]=$/;
     if (!modulePathRegex.test(modulePath)) {
         if (path.split("/").length > 1) {
-            newImport = `import { ${moduleName}Module } from "${usecaseDir}${modulePath}/${name}.module";`;
+            newImport = `import { ${moduleName}Module } from "${usecaseDir}${name.toLowerCase()}/${name.toLowerCase()}.module";`;
         }
         else {
-            newImport = `import { ${moduleName}Module } from "${usecaseDir}${name}.module";`;
+            newImport = `import { ${moduleName}Module } from "${usecaseDir}${name.toLowerCase()}.module";`;
         }
     }
     else {
-        newImport = `import { ${moduleName}Module } from "${usecaseDir}${name}/${name}.module";`;
+        newImport = `import { ${moduleName}Module } from "${usecaseDir}${name}/${name.toLowerCase()}.module";`;
     }
     if (containerData.imports.includes(newImport) &&
         containerData.modules.includes(`${moduleName}Module`)) {
@@ -94,3 +94,36 @@ async function addModuleToContainer(name, modulePath, path) {
     await node_fs_1.default.promises.writeFile(containerData.path, newFileContent, "utf8");
 }
 exports.addModuleToContainer = addModuleToContainer;
+async function addModuleToContainerNestedPath(name, path) {
+    const containerData = await validateAppContainer();
+    const moduleName = (name[0].toUpperCase() + name.slice(1)).trimStart();
+    const { opinionated } = await compiler_1.default.loadConfig();
+    let usecaseDir;
+    if (opinionated) {
+        usecaseDir = `@useCases/`;
+    }
+    else {
+        usecaseDir = `./`;
+    }
+    if (path.endsWith("/")) {
+        path = path.slice(0, -1);
+    }
+    const newImport = `import { ${moduleName}Module } from "${usecaseDir}${path}.module";`;
+    if (containerData.imports.includes(newImport) &&
+        containerData.modules.includes(`${moduleName}Module`)) {
+        return;
+    }
+    containerData.imports.push(newImport);
+    containerData.modules.push(`${moduleName}Module`);
+    const newModule = containerData.modules.join(", ");
+    const newModuleDeclaration = `.create([${newModule}]`;
+    const newFileContent = [
+        ...containerData.imports,
+        ...containerData.notImports,
+    ]
+        .join("\n")
+        .replace(containerData.regex, newModuleDeclaration);
+    console.log(" ", chalk_1.default.greenBright(`[container]`.padEnd(14)), chalk_1.default.bold.white(`${moduleName}Module added to ${APP_CONTAINER}! ✔️`));
+    await node_fs_1.default.promises.writeFile(containerData.path, newFileContent, "utf8");
+}
+exports.addModuleToContainerNestedPath = addModuleToContainerNestedPath;

package/bin/utils/cli-ui.d.ts

@@ -1 +1,3 @@
 export declare function printError(message: string, component: string): void;
+export declare function printGenerateError(schematic: string, file: string): Promise<void>;
+export declare function printGenerateSuccess(schematic: string, file: string): Promise<void>;

package/bin/utils/cli-ui.js

@@ -3,9 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printError = void 0;
+exports.printGenerateSuccess = exports.printGenerateError = exports.printError = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 function printError(message, component) {
-    console.error(chalk_1.default.red(`\n\n😞 ${message}:`, chalk_1.default.white(`[${component}]`)));
+    console.error(chalk_1.default.red(`${message}:`, chalk_1.default.bold(chalk_1.default.white(`[${component}] ❌`))));
 }
 exports.printError = printError;
+async function printGenerateError(schematic, file) {
+    console.error(" ", chalk_1.default.redBright(`[${schematic}]`.padEnd(14)), chalk_1.default.bold.white(`${file.split(".")[0]} not created! ❌`));
+}
+exports.printGenerateError = printGenerateError;
+async function printGenerateSuccess(schematic, file) {
+    console.log(" ", chalk_1.default.greenBright(`[${schematic}]`.padEnd(14)), chalk_1.default.bold.white(`${file.split(".")[0]} created! ✔️`));
+}
+exports.printGenerateSuccess = printGenerateSuccess;

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

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

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

@@ -7,20 +7,22 @@ exports.verifyIfFileExists = void 0;
 const inquirer_1 = __importDefault(require("inquirer"));
 const node_fs_1 = __importDefault(require("node:fs"));
 const cli_ui_1 = require("./cli-ui");
-async function verifyIfFileExists(path) {
+async function verifyIfFileExists(path, schematic) {
     const fileExists = node_fs_1.default.existsSync(path);
+    const fileName = path.split("/").pop();
     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?",
+                message: `File [${fileName}] exists. Overwrite?`,
                 default: true,
             },
         ]);
-        const fileName = path.split("/").pop();
         if (!answer.confirm) {
-            (0, cli_ui_1.printError)("File not created!", fileName);
+            schematic
+                ? (0, cli_ui_1.printGenerateError)(schematic, fileName)
+                : (0, cli_ui_1.printError)("File not created!", fileName);
             process.exit(1);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@expressots/cli",
-	"version": "1.5.0",
+	"version": "1.7.0",
 	"description": "Expressots CLI - modern, fast, lightweight nodejs web framework (@cli)",
 	"author": "Richard Zampieri",
 	"license": "MIT",
@@ -38,6 +38,7 @@
 		"build": "npm run clean && tsc -p tsconfig.json && yarn cp:templates && chmod +x ./bin/cli.js",
 		"cp:templates": "cp -r ./src/generate/templates ./bin/generate/templates && cp -r ./src/providers/prisma/templates ./bin/providers/prisma/templates",
 		"clean": "rimraf ./bin",
+		"prepublish": "npm run build && npm pack",
 		"format": "prettier --write \"./src/**/*.ts\" --cache",
 		"lint": "eslint \"./src/**/*.ts\"",
 		"lint:fix": "eslint \"./src/**/*.ts\" --fix",
@@ -50,6 +51,7 @@
 		"@expressots/boost-ts": "1.1.1",
 		"chalk-animation": "2.0.3",
 		"cli-progress": "3.11.2",
+		"cli-table3": "^0.6.4",
 		"degit": "2.8.4",
 		"glob": "10.2.6",
 		"inquirer": "8.0.0",
@@ -77,7 +79,8 @@
 		"husky": "^8.0.3",
 		"prettier": "^2.8.4",
 		"release-it": "^16.1.5",
-		"rimraf": "^4.1.2",
+		"rimraf": "^5.0.5",
+		"shx": "^0.3.4",
 		"ts-node-dev": "^2.0.0",
 		"typescript": "^4.9.5",
 		"vite": "^4.4.9",

package/bin/generate/templates/dto-op.tpl

@@ -1,7 +0,0 @@
-export interface I{{className}}RequestDTO {
-    id: string;
-}
-
-export interface I{{className}}ResponseDTO { }
-
-

package/bin/generate/templates/module-default.tpl

@@ -1,3 +0,0 @@
-import { CreateModule } from "@expressots/core";
-
-export const {{moduleName}}Module = CreateModule([]);

package/bin/generate/templates/module.tpl

@@ -1,4 +0,0 @@
-import { CreateModule } from "@expressots/core";
-import { {{className}}Controller } from "{{{path}}}";
-
-export const {{moduleName}}Module = CreateModule([{{className}}Controller]);

package/bin/generate/templates/usecase-post.tpl

@@ -1,9 +0,0 @@
-import { provide } from "inversify-binding-decorators";
-import { I{{className}}RequestDTO, I{{className}}ResponseDTO } from "./{{fileName}}.dto";
-
-@provide({{className}}UseCase)
-export class {{className}}UseCase {
-    execute(payload: I{{className}}RequestDTO): I{{className}}ResponseDTO {
-        return "Use Case";
-    }
-}