@expressots/cli 1.5.0 → 1.6.0

package/bin/cli.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CLI_VERSION = void 0;
 const yargs_1 = __importDefault(require("yargs"));
 const helpers_1 = require("yargs/helpers");
+const project_commands_1 = require("./commands/project.commands");
 const generate_1 = require("./generate");
 const info_1 = require("./info");
 const new_1 = require("./new");
@@ -15,6 +16,7 @@ exports.CLI_VERSION = "1.3.4";
 console.log(`\n[🐎 Expressots]\n`);
 (0, yargs_1.default)((0, helpers_1.hideBin)(process.argv))
     .scriptName("expressots")
+    .command(project_commands_1.runCommandModule)
     .command((0, new_1.createProject)())
     .command((0, providers_1.generateProviders)())
     .command((0, generate_1.generateProject)())

package/bin/commands/project.commands.d.ts

@@ -0,0 +1,8 @@
+import { CommandModule } from "yargs";
+export declare const runCommandModule: CommandModule<{}, {
+    command: string;
+}>;
+declare const runCommand: ({ command }: {
+    command: string;
+}) => Promise<void>;
+export { runCommand };

package/bin/commands/project.commands.js

@@ -0,0 +1,136 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runCommand = exports.runCommandModule = void 0;
+const child_process_1 = require("child_process");
+const fs_1 = require("fs");
+const path_1 = __importDefault(require("path"));
+const compiler_1 = __importDefault(require("../utils/compiler"));
+/**
+ * Load the configuration from the compiler
+ * @param compiler The compiler to load the configuration from
+ * @returns The configuration
+ */
+const opinionatedConfig = [
+    "--transpile-only",
+    "-r",
+    "dotenv/config",
+    "-r",
+    "tsconfig-paths/register",
+    "./src/main.ts",
+];
+const nonOpinionatedConfig = [
+    "--transpile-only",
+    "-r",
+    "dotenv/config",
+    "./src/main.ts",
+];
+/**
+ * Helper function to execute a command
+ * @param command The command to execute
+ * @param args The arguments to pass to the command
+ * @param cwd The current working directory to execute the command in
+ * @returns A promise that resolves when the command completes successfully
+ */
+function execCmd(command, args, cwd = process.cwd()) {
+    return new Promise((resolve, reject) => {
+        const proc = (0, child_process_1.spawn)(command, args, {
+            stdio: "inherit",
+            shell: true,
+            cwd,
+        });
+        proc.on("close", (code) => {
+            if (code === 0) {
+                resolve();
+            }
+            else {
+                reject(new Error(`Command failed with code ${code}`));
+            }
+        });
+    });
+}
+// Helper to delete the dist directory
+const cleanDist = async () => {
+    await fs_1.promises.rm("./dist", { recursive: true, force: true });
+};
+// Helper to compile TypeScript
+const compileTypescript = async () => {
+    await execCmd("npx", ["tsc", "-p", "tsconfig.build.json"]);
+};
+// Helper to copy files
+const copyFiles = async () => {
+    const { opinionated } = await compiler_1.default.loadConfig();
+    let filesToCopy = [];
+    if (opinionated) {
+        filesToCopy = [
+            "./register-path.js",
+            "tsconfig.build.json",
+            "package.json",
+        ];
+    }
+    else {
+        filesToCopy = ["tsconfig.json", "package.json"];
+    }
+    filesToCopy.forEach((file) => {
+        fs_1.promises.copyFile(file, path_1.default.join("./dist", path_1.default.basename(file)));
+    });
+};
+// eslint-disable-next-line @typescript-eslint/ban-types
+exports.runCommandModule = {
+    command: "run <command>",
+    describe: "Runs a specified command (dev, build, prod)",
+    builder: (yargs) => {
+        return yargs.positional("command", {
+            describe: "The command to run",
+            type: "string",
+            choices: ["dev", "build", "prod"],
+        });
+    },
+    handler: async (argv) => {
+        const { command } = argv;
+        // Now call your original runCommand function with the command
+        // Ensure runCommand is properly defined to handle these commands
+        await runCommand({ command });
+    },
+};
+const runCommand = async ({ command }) => {
+    const { opinionated } = await compiler_1.default.loadConfig();
+    try {
+        switch (command) {
+            case "dev":
+                // Use execSync or spawn to run ts-node-dev programmatically
+                execCmd("tsnd", opinionated ? opinionatedConfig : nonOpinionatedConfig);
+                break;
+            case "build":
+                await cleanDist();
+                await compileTypescript();
+                await copyFiles();
+                break;
+            case "prod":
+                let config = [];
+                if (opinionated) {
+                    config = [
+                        "-r",
+                        "dotenv/config",
+                        "-r",
+                        "./dist/register-path.js",
+                        "./dist/src/main.js",
+                    ];
+                }
+                else {
+                    config = ["-r", "dotenv/config", "./dist/main.js"];
+                }
+                // Ensure environment variables are set
+                execCmd("node", config);
+                break;
+            default:
+                console.log(`Unknown command: ${command}`);
+        }
+    }
+    catch (error) {
+        console.error("Error executing command:", error);
+    }
+};
+exports.runCommand = runCommand;

package/bin/generate/cli.js

@@ -16,8 +16,10 @@ const coerceSchematicAliases = (arg) => {
             return "provider";
         case "e":
             return "entity";
-        case "m":
+        case "mo":
             return "module";
+        case "m":
+            return "middleware";
         default:
             return arg;
     }
@@ -37,6 +39,7 @@ const generateProject = () => {
                     "provider",
                     "entity",
                     "module",
+                    "middleware",
                 ],
                 describe: "The schematic to generate",
                 type: "string",

package/bin/generate/form.js

@@ -271,7 +271,6 @@ const splitTarget = async ({ target, schematic, }) => {
     if (target.includes("/") ||
         target.includes("\\") ||
         target.includes("//")) {
-        //pathContent = target.split("/").filter((item) => item !== "");
         if (schematic === "service")
             schematic = "controller";
         if (schematic === "service" ||
@@ -366,6 +365,10 @@ const schematicFolder = (schematic) => {
             return "providers";
         case "entity":
             return "entities";
+        case "middleware":
+            return "providers/middlewares";
+        case "module":
+            return "useCases";
     }
     return undefined;
 };

package/bin/generate/templates/middleware.tpl

@@ -0,0 +1,10 @@
+import { ExpressoMiddleware } from "@expressots/core";
+import { NextFunction, Request, Response } from "express";
+import { provide } from "inversify-binding-decorators";
+
+@provide({{className}}Middleware)
+export class {{className}}Middleware extends ExpressoMiddleware {
+    use(req: Request, res: Response, next: NextFunction): void | Promise<void> {
+        throw new Error("Method not implemented.");
+    }
+}

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

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

package/bin/generate/templates/module.tpl

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

package/bin/new/cli.d.ts

@@ -1,4 +1,4 @@
 import { CommandModule } from "yargs";
-type CommandModuleArgs = {};
+type CommandModuleArgs = object;
 declare const createProject: () => CommandModule<CommandModuleArgs, any>;
 export { createProject };

package/bin/new/cli.js

@@ -2,41 +2,43 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createProject = void 0;
 const form_1 = require("./form");
+const packageManagers = [
+    "npm",
+    "yarn",
+    "pnpm",
+    ...(process.platform !== "win32" ? ["bun"] : []),
+];
+const commandOptions = (yargs) => {
+    return yargs
+        .positional("project-name", {
+        describe: "The name of the project",
+        type: "string",
+    })
+        .option("template", {
+        describe: "The project template to use",
+        type: "string",
+        choices: ["opinionated", "non-opinionated"],
+        alias: "t",
+    })
+        .option("package-manager", {
+        describe: "The package manager to use",
+        type: "string",
+        choices: packageManagers,
+        alias: "p",
+    })
+        .option("directory", {
+        describe: "The directory for new project",
+        type: "string",
+        alias: "d",
+    })
+        .implies("package-manager", "template")
+        .implies("template", "package-manager");
+};
 const createProject = () => {
-    const packageManagers = ["npm", "yarn", "pnpm"];
-    if (process.platform !== "win32") {
-        packageManagers.push("bun");
-    }
     return {
         command: "new <project-name> [package-manager] [template] [directory]",
         describe: "Create a new project",
-        builder: (yargs) => {
-            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: packageManagers,
-                alias: "p",
-            })
-                .option("directory", {
-                describe: "The directory for new project",
-                type: "string",
-                alias: "d",
-            })
-                .implies("package-manager", "template")
-                .implies("template", "package-manager");
-            return yargs;
-        },
+        builder: commandOptions,
         handler: async ({ projectName, packageManager, template, directory, }) => {
             return await (0, form_1.projectForm)(projectName, [
                 packageManager,

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.",
                 ],
             },
             {
@@ -185,7 +185,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 +206,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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@expressots/cli",
-	"version": "1.5.0",
+	"version": "1.6.0",
 	"description": "Expressots CLI - modern, fast, lightweight nodejs web framework (@cli)",
 	"author": "Richard Zampieri",
 	"license": "MIT",
@@ -77,7 +77,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",