@expressots/cli 1.7.1 → 1.8.1

package/bin/new/form.js

@@ -1,213 +1,238 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.projectForm = void 0;
-const chalk_1 = __importDefault(require("chalk"));
-const child_process_1 = require("child_process");
-const cli_progress_1 = require("cli-progress");
-const degit_1 = __importDefault(require("degit"));
-const inquirer_1 = __importDefault(require("inquirer"));
-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");
-async function packageManagerInstall({ packageManager, directory, progressBar, }) {
-    return new Promise((resolve, reject) => {
-        const isWindows = process.platform === "win32";
-        const command = isWindows
-            ? `${packageManager}.cmd`
-            : packageManager;
-        const installProcess = (0, child_process_1.spawn)(command, ["install"], {
-            cwd: directory,
-        });
-        installProcess.stdout.on("data", (data) => {
-            progressBar.increment(5, {
-                doing: `${data.toString().trim()}`,
-            });
-        });
-        installProcess.on("close", (code) => {
-            if (code === 0) {
-                resolve("Installation Done!");
-            }
-            else {
-                reject(new Error(`${packageManager} install exited with code ${code}`));
-            }
-        });
-    });
-}
-async function checkIfPackageManagerExists(packageManager) {
-    try {
-        (0, child_process_1.execSync)(`${packageManager} --version`);
-        return true;
-    }
-    catch (error) {
-        (0, cli_ui_1.printError)("Package manager not found!", packageManager);
-        process.exit(1);
-    }
-}
-function changePackageName({ directory, name, }) {
-    // Get the absolute path of the input directory parameter
-    const absDirPath = node_path_1.default.resolve(directory);
-    // Load the package.json file
-    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);
-    // Change the name
-    packageJson.name = name;
-    // Save the package.json file
-    node_fs_1.default.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
-}
-var Template;
-(function (Template) {
-    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;
-    const projName = projectName;
-    let packageManager;
-    let template;
-    let directory;
-    // Resolving the argument order problem
-    for (const arg of args) {
-        if (args.length >= 3) {
-            if (arg === "npm" ||
-                arg === "yarn" ||
-                arg === "pnpm" ||
-                arg === "bun") {
-                packageManager = arg;
-            }
-            else if (arg === "non-opinionated" || arg === "opinionated") {
-                template = arg;
-            }
-            else {
-                directory = arg;
-            }
-        }
-    }
-    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", "bun"],
-            },
-            {
-                type: "list",
-                name: "template",
-                message: "Select a template",
-                choices: [
-                    `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.",
-                ],
-            },
-            {
-                type: "confirm",
-                name: "confirm",
-                message: "Do you want to create this project?",
-                default: true,
-            },
-        ]);
-    }
-    if (directory) {
-        if (!node_fs_1.default.existsSync(node_path_1.default.join(directory, answer.name))) {
-            answer.name = node_path_1.default.join(directory, answer.name);
-        }
-        else {
-            (0, cli_ui_1.printError)("Directory already exists", directory);
-            process.exit(1);
-        }
-    }
-    // Hashmap of templates and their directories
-    const templates = {
-        "Non-Opinionated": "non_opinionated",
-        Opinionated: "opinionated",
-    };
-    if (answer.confirm) {
-        // Check if package manager is bun and OS is Windows
-        if (answer.packageManager === "bun" && process.platform === "win32") {
-            (0, cli_ui_1.printError)("bun is not supported on Windows. Please use", "npm, yarn or pnpm");
-            process.exit(1);
-        }
-        await checkIfPackageManagerExists(answer.packageManager);
-        console.log("\n");
-        const progressBar = new cli_progress_1.SingleBar({
-            format: "Progress |" +
-                chalk_1.default.green("{bar}") +
-                "| {percentage}% || {doing}",
-            hideCursor: true,
-        }, cli_progress_1.Presets.shades_classic);
-        progressBar.start(100, 0, {
-            doing: "Cloning project",
-        });
-        const [_, template] = answer.template.match(/(.*) ::/);
-        try {
-            const emitter = (0, degit_1.default)(`expressots/expressots/templates/${templates[template]}`);
-            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);
-        }
-        progressBar.update(50, {
-            doing: "Installing dependencies",
-        });
-        await packageManagerInstall({
-            packageManager: answer.packageManager,
-            directory: answer.name,
-            progressBar,
-        });
-        progressBar.update(90);
-        changePackageName({
-            directory: answer.name,
-            name: projName,
-        });
-        progressBar.update(100);
-        progressBar.stop();
-        console.log("\n");
-        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) {
-            case "npm":
-                console.log(chalk_1.default.bold.gray("$ npm run dev"));
-                break;
-            case "yarn":
-                console.log(chalk_1.default.bold.gray("$ yarn dev"));
-                break;
-            case "pnpm":
-                console.log(chalk_1.default.bold.gray("$ pnpm run dev"));
-                break;
-            case "bun":
-                console.log(chalk_1.default.bold.gray("$ bun dev"));
-                break;
-        }
-        console.log("\n");
-        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;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.projectForm = void 0;
+const chalk_1 = __importDefault(require("chalk"));
+const node_child_process_1 = require("node:child_process");
+const cli_progress_1 = require("cli-progress");
+const degit_1 = __importDefault(require("degit"));
+const inquirer_1 = __importDefault(require("inquirer"));
+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");
+async function packageManagerInstall({ packageManager, directory, progressBar, }) {
+    return new Promise((resolve, reject) => {
+        const isWindows = process.platform === "win32";
+        const command = isWindows
+            ? `${packageManager}.cmd`
+            : packageManager;
+        const installProcess = (0, node_child_process_1.spawn)(command, ["install"], {
+            cwd: directory,
+        });
+        installProcess.on("error", (error) => {
+            reject(new Error(`Failed to start subprocess: ${error.message}`));
+        });
+        installProcess.stdout?.on("data", (data) => {
+            const output = data.toString().trim();
+            const npmProgressMatch = output.match(/\[(\d+)\/(\d+)\] (?:npm )?([\w\s]+)\.{3}/);
+            if (npmProgressMatch) {
+                const [, current, total, task] = npmProgressMatch;
+                const progress = Math.round((parseInt(current) / parseInt(total)) * 100);
+                progressBar.update(progress, { doing: task });
+            }
+            else {
+                progressBar.increment(5, { doing: output });
+            }
+        });
+        installProcess.on("close", (code) => {
+            if (code === 0) {
+                resolve("Installation Done!");
+            }
+            else {
+                reject(new Error(`${packageManager} install exited with code ${code}`));
+            }
+        });
+    });
+}
+async function checkIfPackageManagerExists(packageManager) {
+    try {
+        (0, node_child_process_1.execSync)(`${packageManager} --version`);
+        return true;
+    }
+    catch (error) {
+        (0, cli_ui_1.printError)("Package manager not found!", packageManager);
+        process.exit(1);
+    }
+}
+function changePackageName({ directory, name, }) {
+    // Get the absolute path of the input directory parameter
+    const absDirPath = node_path_1.default.resolve(directory);
+    // Load the package.json file
+    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);
+    // Change the name
+    packageJson.name = name;
+    // Save the package.json file
+    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");
+        const envPath = node_path_1.default.join(directory, ".env");
+        if (!node_fs_1.default.existsSync(envExamplePath)) {
+            throw new Error(`File not found: ${envExamplePath}`);
+        }
+        node_fs_1.default.renameSync(envExamplePath, envPath);
+    }
+    catch (error) {
+        (0, cli_ui_1.printError)("Error renaming .env.example file", ".env.example to .env");
+        process.exit(1);
+    }
+}
+var Template;
+(function (Template) {
+    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;
+    const projName = projectName;
+    let packageManager;
+    let template;
+    let directory;
+    // Resolving the argument order problem
+    for (const arg of args) {
+        if (args.length >= 3) {
+            if (arg === "npm" ||
+                arg === "yarn" ||
+                arg === "pnpm" ||
+                arg === "bun") {
+                packageManager = arg;
+            }
+            else if (arg === "non-opinionated" || arg === "opinionated") {
+                template = arg;
+            }
+            else {
+                directory = arg;
+            }
+        }
+    }
+    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", "bun"],
+            },
+            {
+                type: "list",
+                name: "template",
+                message: "Select a template",
+                choices: [
+                    `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.",
+                ],
+            },
+            {
+                type: "confirm",
+                name: "confirm",
+                message: "Do you want to create this project?",
+                default: true,
+            },
+        ]);
+    }
+    if (directory) {
+        if (!node_fs_1.default.existsSync(node_path_1.default.join(directory, answer.name))) {
+            answer.name = node_path_1.default.join(directory, answer.name);
+        }
+        else {
+            (0, cli_ui_1.printError)("Directory already exists", directory);
+            process.exit(1);
+        }
+    }
+    // Hashmap of templates and their directories
+    const templates = {
+        "Non-Opinionated": "non_opinionated",
+        Opinionated: "opinionated",
+    };
+    if (answer.confirm) {
+        // Check if package manager is bun and OS is Windows
+        if (answer.packageManager === "bun" && process.platform === "win32") {
+            (0, cli_ui_1.printError)("bun is not supported on Windows. Please use", "npm, yarn or pnpm");
+            process.exit(1);
+        }
+        await checkIfPackageManagerExists(answer.packageManager);
+        console.log("\n");
+        const progressBar = new cli_progress_1.SingleBar({
+            format: "Progress |" +
+                chalk_1.default.green("{bar}") +
+                "| {percentage}% || {doing}",
+            hideCursor: true,
+        }, cli_progress_1.Presets.rect);
+        progressBar.start(100, 0, {
+            doing: "Cloning project",
+        });
+        const [_, template] = answer.template.match(/(.*) ::/);
+        try {
+            const emitter = (0, degit_1.default)(`expressots/expressots/templates/${templates[template]}`);
+            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);
+        }
+        progressBar.update(50, {
+            doing: "Installing dependencies",
+        });
+        await packageManagerInstall({
+            packageManager: answer.packageManager,
+            directory: answer.name,
+            progressBar,
+        });
+        progressBar.update(90);
+        changePackageName({
+            directory: answer.name,
+            name: projName,
+        });
+        renameEnvFile(answer.name);
+        progressBar.update(100);
+        progressBar.stop();
+        console.log("\n");
+        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) {
+            case "npm":
+                console.log(chalk_1.default.bold.gray("$ npm run dev"));
+                break;
+            case "yarn":
+                console.log(chalk_1.default.bold.gray("$ yarn dev"));
+                break;
+            case "pnpm":
+                console.log(chalk_1.default.bold.gray("$ pnpm run dev"));
+                break;
+            case "bun":
+                console.log(chalk_1.default.bold.gray("$ bun dev"));
+                break;
+        }
+        console.log("\n");
+        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/new/index.d.ts

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

package/bin/new/index.js

@@ -1,17 +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);
+"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/bin/providers/cli.d.ts

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

package/bin/providers/cli.js

@@ -1,38 +1,43 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateProviders = void 0;
-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"],
-                describe: "The provider to add to the project",
-                type: "string",
-            })
-                .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);
-            }
-        },
-    };
-};
-exports.generateProviders = generateProviders;
+"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

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