@expressots/cli 1.11.0 → 1.12.0

package/bin/cli.js

@@ -16,6 +16,7 @@ const new_1 = require("./new");
 const providers_1 = require("./providers");
 const cli_2 = require("./providers/create/cli");
 const cli_ui_1 = require("./utils/cli-ui");
+const scripts_1 = require("./scripts");
 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")
@@ -26,6 +27,7 @@ process_1.stdout.write(`\n${[chalk_1.default.bold.green("🐎 Expressots")]}\n\n
     .command((0, cli_2.createExternalProviderCMD)())
     .command((0, providers_1.addProviderCMD)())
     .command((0, generate_1.generateProject)())
+    .command((0, scripts_1.scriptsCommand)())
     .command((0, info_1.infoProject)())
     .command((0, cli_1.helpCommand)())
     .demandCommand(1, "You need at least one command before moving on")
@@ -33,7 +35,6 @@ process_1.stdout.write(`\n${[chalk_1.default.bold.green("🐎 Expressots")]}\n\n
     .fail((msg, err, yargs) => {
     if (msg) {
         if (msg.includes("Unknown argument")) {
-            // Get the command name
             const command = process.argv[2];
             if (command === "run") {
                 (0, cli_ui_1.printError)(`The "run" command has been removed. Use "dev", "prod" or "build" instead.`, "expressots help");

package/bin/commands/project.commands.js

@@ -34,11 +34,26 @@ const path_1 = __importStar(require("path"));
 const cli_ui_1 = require("../utils/cli-ui");
 const compiler_1 = __importDefault(require("../utils/compiler"));
 /**
- * Load tsconfig path and extract outDir
+ * Helper function to load and extract outDir from tsconfig.build.json
  */
-const tsconfigBuildPath = (0, path_1.join)(process.cwd(), "tsconfig.build.json");
-const tsconfig = JSON.parse((0, fs_1.readFileSync)(tsconfigBuildPath, "utf-8"));
-const outDir = tsconfig.compilerOptions.outDir;
+function getOutDir() {
+    const tsconfigBuildPath = (0, path_1.join)(process.cwd(), "tsconfig.build.json");
+    if (!(0, fs_1.existsSync)(tsconfigBuildPath)) {
+        (0, cli_ui_1.printError)("Cannot find tsconfig.build.json. Please create one in the root directory", "tsconfig-build-path");
+        process.exit(1);
+    }
+    const tsconfig = JSON.parse((0, fs_1.readFileSync)(tsconfigBuildPath, "utf-8"));
+    const outDir = tsconfig.compilerOptions.outDir;
+    if (!outDir) {
+        (0, cli_ui_1.printError)("Cannot find outDir in tsconfig.build.json. Please provide an outDir.", "tsconfig-build-path");
+        process.exit(1);
+    }
+    if (!(0, fs_1.existsSync)(outDir)) {
+        (0, fs_1.mkdirSync)(outDir, { recursive: true });
+        (0, cli_ui_1.printSuccess)(`Created outDir: ${outDir}`, "outdir-creation");
+    }
+    return outDir;
+}
 /**
  * Load the configuration from the compiler
  * @param compiler The compiler to load the configuration from
@@ -123,7 +138,7 @@ function execCmd(command, args, cwd = process.cwd()) {
 /**
  * Helper function to clean the dist directory
  */
-const cleanDist = async () => {
+const cleanDist = async (outDir) => {
     await fs_1.promises.rm(outDir, { recursive: true, force: true });
     (0, cli_ui_1.printSuccess)(`Clean ${outDir} directory`, "clean-dist");
 };
@@ -137,7 +152,7 @@ const compileTypescript = async () => {
 /**
  * Helper function to copy files to the dist directory
  */
-const copyFiles = async () => {
+const copyFiles = async (outDir) => {
     const { opinionated } = await compiler_1.default.loadConfig();
     let filesToCopy = [];
     if (opinionated) {
@@ -168,6 +183,7 @@ const clearScreen = () => {
  */
 const runCommand = async ({ command, }) => {
     const { opinionated } = await compiler_1.default.loadConfig();
+    const outDir = getOutDir();
     try {
         switch (command) {
             case "dev":
@@ -178,9 +194,9 @@ const runCommand = async ({ command, }) => {
                     (0, cli_ui_1.printError)("Cannot build project. Please provide an outDir in tsconfig.build.json", "build-command");
                     process.exit(1);
                 }
-                await cleanDist();
+                await cleanDist(outDir);
                 await compileTypescript();
-                await copyFiles();
+                await copyFiles(outDir);
                 break;
             case "prod": {
                 if (!outDir) {

package/bin/help/form.js

@@ -15,11 +15,11 @@ const helpForm = async () => {
         ],
         colWidths: [15, 15, 60],
     });
-    table.push(["new project", "new", "Generate a new project"], ["info", "i", "Provides project information"], ["resources", "r", "Displays cli commands and resources"], ["help", "h", "Show command help"], [
+    table.push(["new project", "new", "Generate a new project"], ["info", "i", "Provides project information"], ["resources", "r", "Displays cli commands and resources"], ["scripts", "scripts", "Run scripts list or specific scripts"], ["help", "h", "Show command help"], [
         "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", "add", "Add provider to the project"], ["provider", "create", "Create a 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", "g p", "Generate internal provider"], ["provider", "add", "Add external provider to the project"], ["provider", "create", "Create external 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/scripts/cli.d.ts

@@ -0,0 +1,3 @@
+import { CommandModule } from "yargs";
+declare const scriptsCommand: () => CommandModule;
+export { scriptsCommand };

package/bin/scripts/cli.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.scriptsCommand = void 0;
+const form_1 = require("./form");
+const scriptsCommand = () => {
+    return {
+        command: "scripts [scripts..]",
+        describe: "Run scripts list or specific scripts",
+        builder: (yargs) => {
+            return yargs.positional("scripts", {
+                describe: "The names of the scripts to run",
+                type: "string",
+                array: true,
+            });
+        },
+        handler: async (argv) => {
+            const scripts = Array.isArray(argv.scripts)
+                ? argv.scripts.filter((script) => typeof script === "string")
+                : [];
+            await (0, form_1.scriptsForm)(scripts);
+        },
+    };
+};
+exports.scriptsCommand = scriptsCommand;

package/bin/scripts/form.d.ts

@@ -0,0 +1 @@
+export declare const scriptsForm: (scriptArgs?: string[]) => Promise<void>;

package/bin/scripts/form.js

@@ -0,0 +1,107 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.scriptsForm = void 0;
+const child_process_1 = require("child_process");
+const fs_1 = __importDefault(require("fs"));
+const inquirer_1 = __importDefault(require("inquirer"));
+const path_1 = __importDefault(require("path"));
+const cli_ui_1 = require("../utils/cli-ui");
+const cwd = process.cwd();
+const packageJsonPath = path_1.default.join(cwd, "package.json");
+function readPackageJson() {
+    try {
+        return JSON.parse(fs_1.default.readFileSync(packageJsonPath, "utf8"));
+    }
+    catch (e) {
+        (0, cli_ui_1.printError)(`Error reading package.json`, "scripts-command");
+        process.exit(1);
+    }
+}
+function listScripts(packageJson) {
+    const scripts = packageJson.scripts || {};
+    if (Object.keys(scripts).length === 0) {
+        (0, cli_ui_1.printWarning)("No scripts found in package.json", "scripts-command");
+        process.exit(0);
+    }
+    return scripts;
+}
+async function promptUserToSelectScripts(scripts) {
+    const scriptChoices = Object.keys(scripts).map((key) => ({
+        name: `${key}`,
+        value: key,
+    }));
+    let selectionOrder = [];
+    const answers = await inquirer_1.default.prompt([
+        {
+            type: "checkbox",
+            name: "selectedScripts",
+            message: "Select scripts to run:",
+            choices: scriptChoices,
+            filter: (selected) => {
+                selectionOrder = selected;
+                return selected;
+            },
+            loop: false,
+        },
+    ]);
+    return answers;
+}
+function executeScripts(scripts, selectedScripts, runner) {
+    selectedScripts.forEach((script) => {
+        console.log(`Running ${script}...`);
+        try {
+            const command = `${runner} run ${script}`;
+            const options = {
+                stdio: "inherit",
+                env: { ...process.env },
+            };
+            (0, child_process_1.execSync)(command, options);
+        }
+        catch (e) {
+            (0, cli_ui_1.printWarning)(`Command ${script} cancelled or failed - ${e}`, "scripts-command");
+        }
+    });
+}
+process.stdin.on("keypress", (ch, key) => {
+    if (key && key.name === "escape") {
+        console.log("Exiting...");
+        process.exit(0);
+    }
+});
+const scriptsForm = async (scriptArgs = []) => {
+    const packageJson = readPackageJson();
+    const scripts = listScripts(packageJson);
+    const runner = fs_1.default.existsSync("package-lock.json")
+        ? "npm"
+        : fs_1.default.existsSync("yarn.lock")
+            ? "yarn"
+            : fs_1.default.existsSync("pnpm-lock.yaml")
+                ? "pnpm"
+                : null;
+    if (!runner) {
+        (0, cli_ui_1.printError)("No package manager found! Please ensure you have npm, yarn, or pnpm installed.", "scripts-command");
+        process.exit(1);
+    }
+    if (scriptArgs.length > 0) {
+        const validScripts = scriptArgs.filter((script) => scripts[script]);
+        const invalidScripts = scriptArgs.filter((script) => !scripts[script]);
+        if (invalidScripts.length > 0) {
+            console.error(`Scripts not found in package.json: ${invalidScripts.join(", ")}`);
+        }
+        if (validScripts.length > 0) {
+            executeScripts(scripts, validScripts, runner);
+        }
+    }
+    else {
+        const { selectedScripts } = await promptUserToSelectScripts(scripts);
+        if (selectedScripts.length === 0) {
+            console.log("No scripts selected.");
+            process.exit(0);
+        }
+        executeScripts(scripts, selectedScripts, runner);
+    }
+};
+exports.scriptsForm = scriptsForm;

package/bin/scripts/index.d.ts

@@ -0,0 +1 @@
+export * from "./cli";

package/bin/scripts/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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);

package/package.json

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