@expressots/cli 1.9.0 → 1.10.0

package/bin/cli.js

@@ -11,24 +11,24 @@ const generate_1 = require("./generate");
 const cli_1 = require("./help/cli");
 const info_1 = require("./info");
 const new_1 = require("./new");
+const cli_2 = require("./providers/create/cli");
 const providers_1 = require("./providers");
-console.log(`\n[🐎 Expressots]\n`);
+const chalk_1 = __importDefault(require("chalk"));
+const process_1 = require("process");
+process_1.stdout.write(`\n${[chalk_1.default.bold.green("🐎 Expressots")]}\n\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(project_commands_1.devCommand)
+    .command(project_commands_1.buildCommand)
+    .command(project_commands_1.prodCommand)
+    .command((0, cli_2.createExternalProviderCMD)())
+    .command((0, providers_1.addProviderCMD)())
     .command((0, generate_1.generateProject)())
     .command((0, info_1.infoProject)())
     .command((0, cli_1.helpCommand)())
-    .example("$0 new expressots-demo", "Create interactively")
-    .example("$0 new expressots-demo -d ./", "Create interactively with path")
-    .example("$0 new expressots-demo -p yarn -t opinionated", "Create silently")
-    .example("$0 new expressots-demo -p yarn -t opinionated -d ./", "Create silently with path")
-    .example("$0 generate service user-create", "Scaffold a service")
-    .example("$0 info", "Show CLI details")
     .demandCommand(1, "You need at least one command before moving on")
-    .epilog("For more information: \n" +
+    .epilog(`${chalk_1.default.bold.green("For more information:")} \n\n` +
     "🌐 visit:\t https://expresso-ts.com\n" +
     "💖 Sponsor:\t https://github.com/sponsors/expressots")
     .help("help", "Show command help")

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

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

package/bin/commands/project.commands.js

@@ -3,11 +3,13 @@ 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;
+exports.runCommand = exports.prodCommand = exports.buildCommand = exports.devCommand = void 0;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
+const cli_ui_1 = require("../utils/cli-ui");
 const compiler_1 = __importDefault(require("../utils/compiler"));
+const os_1 = __importDefault(require("os"));
 /**
  * Load the configuration from the compiler
  * @param compiler The compiler to load the configuration from
@@ -15,6 +17,7 @@ const compiler_1 = __importDefault(require("../utils/compiler"));
  */
 const opinionatedConfig = [
     "--transpile-only",
+    "--clear",
     "-r",
     "dotenv/config",
     "-r",
@@ -23,6 +26,7 @@ const opinionatedConfig = [
 ];
 const nonOpinionatedConfig = [
     "--transpile-only",
+    "--clear",
     "-r",
     "dotenv/config",
     "./src/main.ts",
@@ -54,10 +58,12 @@ function execCmd(command, args, cwd = process.cwd()) {
 // Helper to delete the dist directory
 const cleanDist = async () => {
     await fs_1.promises.rm("./dist", { recursive: true, force: true });
+    (0, cli_ui_1.printSuccess)("Deleted dist directory", "clean-dist");
 };
 // Helper to compile TypeScript
 const compileTypescript = async () => {
     await execCmd("npx", ["tsc", "-p", "tsconfig.build.json"]);
+    (0, cli_ui_1.printSuccess)("Built successfully", "compile-typescript");
 };
 // Helper to copy files
 const copyFiles = async () => {
@@ -77,30 +83,38 @@ const copyFiles = async () => {
         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"],
-        });
+// Helper clear screen
+const clearScreen = () => {
+    const platform = os_1.default.platform();
+    const command = platform === "win32" ? "cls" : "clear";
+    (0, child_process_1.spawn)(command, { stdio: "inherit", shell: true });
+};
+exports.devCommand = {
+    command: "dev",
+    describe: "Start development server.",
+    handler: async () => {
+        await (0, exports.runCommand)({ command: "dev" });
+    },
+};
+exports.buildCommand = {
+    command: "build",
+    describe: "Build the project.",
+    handler: async () => {
+        await (0, exports.runCommand)({ command: "build" });
     },
-    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 });
+};
+exports.prodCommand = {
+    command: "prod",
+    describe: "Run in production mode.",
+    handler: async () => {
+        await (0, exports.runCommand)({ command: "prod" });
     },
 };
-const runCommand = async ({ 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":
@@ -122,16 +136,17 @@ const runCommand = async ({ command }) => {
                 else {
                     config = ["-r", "dotenv/config", "./dist/main.js"];
                 }
-                // Ensure environment variables are set
+                clearScreen();
                 execCmd("node", config);
                 break;
             }
             default:
-                console.log(`Unknown command: ${command}`);
+                (0, cli_ui_1.printError)(`Unknown command: `, command);
+                break;
         }
     }
     catch (error) {
-        console.error("Error executing command:", error);
+        (0, cli_ui_1.printError)("Error executing command:", error.message);
     }
 };
 exports.runCommand = runCommand;

package/bin/generate/cli.js

@@ -27,7 +27,7 @@ const coerceSchematicAliases = (arg) => {
 const generateProject = () => {
     return {
         command: "generate [schematic] [path] [method]",
-        describe: "Scaffold a new resource",
+        describe: "Generate ExpressoTS resource.",
         aliases: ["g"],
         builder: (yargs) => {
             yargs.positional("schematic", {

package/bin/help/cli.js

@@ -5,7 +5,7 @@ const form_1 = require("./form");
 const helpCommand = () => {
     return {
         command: "resources",
-        describe: "Resource list",
+        describe: "Resource list.",
         aliases: ["r"],
         handler: async () => {
             await (0, form_1.helpForm)();

package/bin/help/form.js

@@ -19,7 +19,7 @@ const helpForm = async () => {
         "service",
         "g s",
         "Generate a service [controller, usecase, dto, module]",
-    ], ["controller", "g c", "Generate a controller"], ["usecase", "g u", "Generate a usecase"], ["dto", "g d", "Generate a dto"], ["entity", "g e", "Generate an entity"], ["provider", "g p", "Generate a provider"], ["provider external", "a provider", "Generate an external provider"], ["module", "g mo", "Generate a module"], ["middleware", "g mi", "Generate a middleware"]);
+    ], ["controller", "g c", "Generate a controller"], ["usecase", "g u", "Generate a usecase"], ["dto", "g d", "Generate a dto"], ["entity", "g e", "Generate an entity"], ["provider", "add", "Add provider to the project"], ["provider", "create", "Create a provider"], ["module", "g mo", "Generate a module"], ["middleware", "g mi", "Generate a middleware"]);
     console.log(chalk_1.default.bold.white("ExpressoTS:", `${chalk_1.default.green("Resources List")}`));
     console.log(chalk_1.default.whiteBright(table.toString()));
     console.log(chalk_1.default.bold.white(`📝 More info: ${chalk_1.default.green("https://doc.expresso-ts.com/docs/category/cli")}`));

package/bin/info/cli.js

@@ -5,7 +5,7 @@ const form_1 = require("./form");
 const infoProject = () => {
     return {
         command: "info",
-        describe: "Displays project details",
+        describe: "Displays project info.",
         aliases: ["i"],
         handler: async () => {
             await (0, form_1.infoForm)();

package/bin/new/cli.js

@@ -52,7 +52,7 @@ const checkNodeVersion = () => {
 const createProject = () => {
     return {
         command: "new <project-name> [package-manager] [template] [directory]",
-        describe: "Create a new project",
+        describe: "Create ExpressoTS application.",
         builder: commandOptions,
         handler: async ({ projectName, packageManager, template, directory, }) => {
             checkNodeVersion();

package/bin/new/form.js

@@ -13,6 +13,7 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const center_text_1 = require("../utils/center-text");
 const cli_ui_1 = require("../utils/cli-ui");
+const change_package_info_1 = require("../utils/change-package-info");
 async function packageManagerInstall({ packageManager, directory, progressBar, }) {
     return new Promise((resolve, reject) => {
         const isWindows = process.platform === "win32";
@@ -67,14 +68,6 @@ async function checkIfPackageManagerExists(packageManager) {
         process.exit(1);
     }
 }
-function changePackageName({ directory, name, }) {
-    const absDirPath = node_path_1.default.resolve(directory);
-    const packageJsonPath = node_path_1.default.join(absDirPath, "package.json");
-    const fileContents = node_fs_1.default.readFileSync(packageJsonPath, "utf-8");
-    const packageJson = JSON.parse(fileContents);
-    packageJson.name = name;
-    node_fs_1.default.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
-}
 function renameEnvFile(directory) {
     try {
         const envExamplePath = node_path_1.default.join(directory, ".env.example");
@@ -189,7 +182,7 @@ const projectForm = async (projectName, args) => {
             progressBar,
         });
         progressBar.update(90);
-        changePackageName({
+        (0, change_package_info_1.changePackageName)({
             directory: answer.name,
             name: projectName,
         });

package/bin/providers/add/cli.d.ts

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

package/bin/providers/add/cli.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addProviderCMD = void 0;
+const form_1 = require("./form");
+const addProviderCMD = () => {
+    return {
+        command: "add <provider> [version]",
+        describe: "Add provider to the project.",
+        builder: (yargs) => {
+            yargs
+                .positional("provider", {
+                describe: "The provider to be added to the project",
+                type: "string",
+            })
+                .option("version", {
+                describe: "The provider version to be installed",
+                type: "string",
+                default: "latest",
+                alias: "v",
+            });
+            return yargs;
+        },
+        handler: async ({ provider, version }) => {
+            await (0, form_1.addExternalProvider)(provider, version);
+        },
+    };
+};
+exports.addProviderCMD = addProviderCMD;

package/bin/providers/add/form.d.ts

@@ -0,0 +1 @@
+export declare const addExternalProvider: (provider: string, version: string) => Promise<void>;

package/bin/providers/add/form.js

@@ -0,0 +1,68 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addExternalProvider = void 0;
+const chalk_1 = __importDefault(require("chalk"));
+const node_child_process_1 = require("node:child_process");
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_process_1 = require("node:process");
+const cli_ui_1 = require("../../utils/cli-ui");
+const addExternalProvider = async (provider, version) => {
+    await installProvider(provider, version);
+};
+exports.addExternalProvider = addExternalProvider;
+async function installProvider(provider, version) {
+    const packageManager = node_fs_1.default.existsSync("package-lock.json" || "yarn.lock" || "pnpm-lock.yaml")
+        ? "npm"
+        : node_fs_1.default.existsSync("yarn.lock")
+            ? "yarn"
+            : node_fs_1.default.existsSync("pnpm-lock.yaml")
+                ? "pnpm"
+                : null;
+    if (packageManager) {
+        console.log(`Installing ${provider} provider ...`);
+        const currentVersion = version === "latest" ? "" : `@${version}`;
+        await execProcess({
+            commandArg: packageManager,
+            args: ["add", `${provider}${currentVersion}`, "--prefer-offline"],
+            directory: process.cwd(),
+        });
+    }
+    else {
+        (0, cli_ui_1.printError)("No package manager found in the project", "install-provider");
+        return;
+    }
+}
+async function execProcess({ commandArg, args, directory, }) {
+    return new Promise((resolve, reject) => {
+        const isWindows = process.platform === "win32";
+        const command = isWindows ? `${commandArg}.cmd` : commandArg;
+        const installProcess = (0, node_child_process_1.spawn)(command, args, {
+            cwd: directory,
+            shell: true,
+        });
+        console.log(chalk_1.default.bold.blue(`Executing: ${commandArg} ${args.join(" ")}`));
+        console.log(chalk_1.default.yellow("-------------------------------------------------"));
+        installProcess.stdout.on("data", (data) => {
+            console.log(chalk_1.default.green(data.toString().trim())); // Display regular messages in green
+        });
+        installProcess.stderr.on("data", (data) => {
+            console.error(chalk_1.default.red(data.toString().trim())); // Display error messages in red
+        });
+        installProcess.on("close", (code) => {
+            if (code === 0) {
+                console.log(chalk_1.default.bold.green("-------------------------------------------------"));
+                console.log(chalk_1.default.bold.green("Installation Done!\n"));
+                resolve("Installation Done!");
+            }
+            else {
+                console.error(chalk_1.default.bold.red("---------------------------------------"));
+                console.error(chalk_1.default.bold.red(`Command ${command} ${args.join(" ")} exited with code ${code}`));
+                reject(new Error(`Command ${command} ${args.join(" ")} exited with code ${code}`));
+                (0, node_process_1.exit)(1);
+            }
+        });
+    });
+}

package/bin/providers/create/cli.d.ts

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

package/bin/providers/create/cli.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createExternalProviderCMD = void 0;
+const form_1 = require("./form");
+const createExternalProviderCMD = () => {
+    return {
+        command: "create [provider]",
+        describe: "Create a provider.",
+        builder: (yargs) => {
+            yargs.option("provider", {
+                describe: "Provider name",
+                type: "string",
+            });
+            return yargs;
+        },
+        handler: async ({ provider }) => {
+            await (0, form_1.createExternalProvider)(provider);
+        },
+    };
+};
+exports.createExternalProviderCMD = createExternalProviderCMD;

package/bin/providers/create/form.d.ts

@@ -0,0 +1 @@
+export declare const createExternalProvider: (provider: string) => Promise<void>;

package/bin/providers/{external/external.provider.js → create/form.js}

@@ -3,11 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.externalProvider = void 0;
+exports.createExternalProvider = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const degit_1 = __importDefault(require("degit"));
 const inquirer_1 = __importDefault(require("inquirer"));
 const center_text_1 = require("../../utils/center-text");
+const change_package_info_1 = require("../../utils/change-package-info");
 const cli_ui_1 = require("../../utils/cli-ui");
 async function printInfo(providerName) {
     console.log("\n");
@@ -20,30 +21,38 @@ async function printInfo(providerName) {
     console.log(chalk_1.default.bold.white((0, center_text_1.centerText)("💖 Sponsor: https://github.com/sponsors/expressots")));
     console.log("\n");
 }
-const externalProvider = async () => {
+const createExternalProvider = async (provider) => {
     return new Promise(async (resolve, reject) => {
-        const providerInfo = await inquirer_1.default.prompt([
-            {
-                type: "input",
-                name: "providerName",
-                message: "Type the name of your provider:",
-                default: "expressots-provider",
-                transformer: (input) => {
-                    return chalk_1.default.yellow(chalk_1.default.bold(input));
+        let providerInfo = {};
+        providerInfo.providerName = provider;
+        if (!provider) {
+            providerInfo = await inquirer_1.default.prompt([
+                {
+                    type: "input",
+                    name: "providerName",
+                    message: "Provider name",
+                    default: "expressots-provider",
+                    transformer: (input) => {
+                        return chalk_1.default.yellow(chalk_1.default.bold(input));
+                    },
                 },
-            },
-        ]);
+            ]);
+        }
         try {
             const emitter = (0, degit_1.default)(`expressots/expressots-provider-template`);
             await emitter.clone(providerInfo.providerName);
+            (0, change_package_info_1.changePackageName)({
+                directory: providerInfo.providerName,
+                name: providerInfo.providerName,
+            });
             await printInfo(providerInfo.providerName);
             resolve();
         }
         catch (err) {
             console.log("\n");
-            (0, cli_ui_1.printError)("Project already exists or Folder is not empty", "generate-external-provider");
+            (0, cli_ui_1.printError)("Project already exists or Folder is not empty", "");
             reject(err);
         }
     });
 };
-exports.externalProvider = externalProvider;
+exports.createExternalProvider = createExternalProvider;

package/bin/providers/index.d.ts

@@ -1 +1,2 @@
-export * from "./cli";
+export * from "./add/cli";
+export * from "./create/cli";

package/bin/providers/index.js

@@ -14,4 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./cli"), exports);
+__exportStar(require("./add/cli"), exports);
+__exportStar(require("./create/cli"), exports);

package/bin/utils/change-package-info.d.ts

@@ -0,0 +1,4 @@
+export declare function changePackageName({ directory, name, }: {
+    directory: string;
+    name: string;
+}): void;

package/bin/utils/change-package-info.js

@@ -0,0 +1,17 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.changePackageName = void 0;
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
+function changePackageName({ directory, name, }) {
+    const absDirPath = node_path_1.default.resolve(directory);
+    const packageJsonPath = node_path_1.default.join(absDirPath, "package.json");
+    const fileContents = node_fs_1.default.readFileSync(packageJsonPath, "utf-8");
+    const packageJson = JSON.parse(fileContents);
+    packageJson.name = name;
+    node_fs_1.default.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
+}
+exports.changePackageName = changePackageName;

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

@@ -1,4 +1,5 @@
 export declare function printError(message: string, component: string): void;
+export declare function printSuccess(message: string, component: string): void;
 export declare function printWarning(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,13 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printGenerateSuccess = exports.printGenerateError = exports.printWarning = exports.printError = void 0;
+exports.printGenerateSuccess = exports.printGenerateError = exports.printWarning = exports.printSuccess = exports.printError = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const process_1 = require("process");
 function printError(message, component) {
     console.error(chalk_1.default.red(`${message}:`, chalk_1.default.bold(chalk_1.default.white(`[${component}] ❌`))));
 }
 exports.printError = printError;
+function printSuccess(message, component) {
+    process_1.stdout.write(chalk_1.default.green(`${message}:`, chalk_1.default.bold(chalk_1.default.white(`[${component}] ✔️\n`))));
+}
+exports.printSuccess = printSuccess;
 function printWarning(message, component) {
     if (component === undefined) {
         process_1.stdout.write(chalk_1.default.yellow(`${message} ⚠️\n`));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@expressots/cli",
-	"version": "1.9.0",
+	"version": "1.10.0",
 	"description": "Expressots CLI - modern, fast, lightweight nodejs web framework (@cli)",
 	"author": "Richard Zampieri",
 	"license": "MIT",
@@ -54,7 +54,7 @@
 		"cli-progress": "3.12.0",
 		"cli-table3": "0.6.5",
 		"degit": "2.8.4",
-		"glob": "10.4.1",
+		"glob": "10.4.5",
 		"inquirer": "8.2.6",
 		"mustache": "4.2.0",
 		"semver": "7.6.2",

package/bin/providers/cli.d.ts

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

package/bin/providers/cli.js

@@ -1,43 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateProviders = void 0;
-const external_provider_1 = require("./external/external.provider");
-const prisma_provider_1 = require("./prisma/prisma.provider");
-const generateProviders = () => {
-    return {
-        command: "add <provider> [library-version] [provider-version]",
-        describe: "Scaffold a new provider",
-        aliases: ["a"],
-        builder: (yargs) => {
-            yargs
-                .positional("provider", {
-                choices: ["prisma", "provider"],
-                describe: "The provider to add to the project",
-                type: "string",
-                alias: "p",
-            })
-                .option("library-version", {
-                describe: "The library version to install",
-                type: "string",
-                default: "latest",
-                alias: "v",
-            })
-                .option("provider-version", {
-                describe: "The version of the provider to install",
-                type: "string",
-                default: "latest",
-                alias: "vp",
-            });
-            return yargs;
-        },
-        handler: async ({ provider, libraryVersion, providerVersion }) => {
-            if (provider === "prisma") {
-                await (0, prisma_provider_1.prismaProvider)(libraryVersion, providerVersion);
-            }
-            else if (provider === "provider") {
-                await (0, external_provider_1.externalProvider)();
-            }
-        },
-    };
-};
-exports.generateProviders = generateProviders;

package/bin/providers/external/external.provider.d.ts

@@ -1,2 +0,0 @@
-declare const externalProvider: () => Promise<void>;
-export { externalProvider };