create-bcp-app 0.1.10 → 0.1.12

package/bin/create-bcp-app.mjs

@@ -4,7 +4,6 @@ import path from "node:path";
 import {
     createInterface,
 } from "node:readline/promises";
-
 import {
     stdin as input,
     stdout as output,
@@ -20,288 +19,327 @@ import {
     normalizeDatabase,
 } from "../src/project-options.mjs";
 
-const args =
-    process.argv.slice(2);
+await main();
 
-if (
-    args.includes("--help") ||
-    args.includes("-h")
-) {
-    printHelp();
-    process.exit(0);
-}
-
-let projectDirectory =
-    null;
-let install =
-    true;
-let bcpPackage =
-    undefined;
-let tailwind =
-    undefined;
-let database =
-    undefined;
-let auth =
-    undefined;
-let acceptDefaults =
-    false;
-
-for (
-    let index = 0;
-    index < args.length;
-    index++
-) {
-    const value =
-        args[index];
+async function main() {
+    const args =
+        process.argv.slice(2);
 
     if (
-        value === "--no-install"
+        args.includes("--help") ||
+        args.includes("-h")
     ) {
-        install =
-            false;
-        continue;
+        printHelp();
+        return;
     }
 
-    if (
-        value === "--yes" ||
-        value === "-y"
-    ) {
-        acceptDefaults =
-            true;
-        continue;
-    }
+    let parsed;
 
-    if (
-        value === "--tailwind"
-    ) {
-        tailwind =
-            true;
-        continue;
+    try {
+        parsed =
+            parseArguments(
+                args
+            );
+    } catch (error) {
+        reportError(
+            error
+        );
+        return;
     }
 
-    if (
-        value === "--no-tailwind"
-    ) {
-        tailwind =
-            false;
-        continue;
+    if (!parsed.projectDirectory) {
+        printHelp();
+        process.exitCode =
+            1;
+        return;
     }
 
-    if (
-        value === "--database"
-    ) {
-        const nextValue =
-            args[
-                index + 1
-            ];
+    let prompt =
+        null;
 
-        if (!nextValue) {
-            fail(
-                "--database requires a value."
+    try {
+        const resolved =
+            await resolveOptions(
+                parsed
             );
-        }
 
-        database =
-            normalizeDatabase(
-                nextValue
-            );
-        index++;
-        continue;
-    }
+        prompt =
+            resolved.prompt;
 
-    if (
-        value === "--auth"
-    ) {
-        const nextValue =
-            args[
-                index + 1
-            ];
+        console.log("");
+        console.log(
+            parsed.install
+                ? `Creating BCP app and installing dependencies in ${path.resolve(parsed.projectDirectory)}...`
+                : `Creating BCP app in ${path.resolve(parsed.projectDirectory)}...`
+        );
+        console.log("");
 
-        if (!nextValue) {
-            fail(
-                "--auth requires a value."
-            );
-        }
+        const result =
+            await createBcpApp({
+                projectDirectory:
+                    parsed.projectDirectory,
+                install:
+                    parsed.install,
+                bcpPackage:
+                    parsed.bcpPackage,
+                tailwind:
+                    resolved.tailwind,
+                database:
+                    resolved.database,
+                auth:
+                    resolved.auth,
+                packageManager:
+                    "npm",
+            });
 
-        auth =
-            normalizeAuth(
-                nextValue
-            );
-        index++;
-        continue;
+        printSuccess(
+            result,
+            parsed.install
+        );
+    } catch (error) {
+        reportError(
+            error
+        );
+    } finally {
+        prompt?.close();
     }
+}
 
-    if (
-        value === "--bcp"
+function parseArguments(
+    args
+) {
+    let projectDirectory =
+        null;
+    let install =
+        true;
+    let bcpPackage =
+        undefined;
+    let tailwind =
+        undefined;
+    let database =
+        undefined;
+    let auth =
+        undefined;
+    let acceptDefaults =
+        false;
+
+    for (
+        let index = 0;
+        index < args.length;
+        index++
     ) {
-        const nextValue =
-            args[
-                index + 1
-            ];
+        const value =
+            args[index];
 
-        if (!nextValue) {
-            fail(
-                "--bcp requires a package specifier."
-            );
+        if (
+            value === "--no-install"
+        ) {
+            install =
+                false;
+            continue;
         }
 
-        bcpPackage =
-            nextValue;
-        index++;
-        continue;
-    }
+        if (
+            value === "--yes" ||
+            value === "-y"
+        ) {
+            acceptDefaults =
+                true;
+            continue;
+        }
 
-    if (
-        value.startsWith("-")
-    ) {
-        fail(
-            `Unknown option: ${value}`
-        );
-    }
+        if (
+            value === "--tailwind"
+        ) {
+            tailwind =
+                true;
+            continue;
+        }
 
-    if (
-        projectDirectory !==
-        null
-    ) {
-        fail(
-            "Only one project directory may be provided."
-        );
-    }
+        if (
+            value === "--no-tailwind"
+        ) {
+            tailwind =
+                false;
+            continue;
+        }
 
-    projectDirectory =
-        value;
-}
+        if (
+            value === "--database"
+        ) {
+            const nextValue =
+                args[
+                    index + 1
+                ];
+
+            if (!nextValue) {
+                throw new Error(
+                    "--database requires a value."
+                );
+            }
 
-if (!projectDirectory) {
-    printHelp();
-    process.exitCode =
-        1;
-} else {
-    try {
-        const selected =
-            await resolveInteractiveOptions({
-                tailwind,
-                database,
-                auth,
-                acceptDefaults,
-            });
+            database =
+                normalizeDatabase(
+                    nextValue
+                );
+            index++;
+            continue;
+        }
 
-        const result =
-            await createBcpApp({
-                projectDirectory,
-                install,
-                bcpPackage,
-                tailwind:
-                    selected.tailwind,
-                database:
-                    selected.database,
-                auth:
-                    selected.auth,
-                packageManager:
-                    "npm",
-            });
+        if (
+            value === "--auth"
+        ) {
+            const nextValue =
+                args[
+                    index + 1
+                ];
+
+            if (!nextValue) {
+                throw new Error(
+                    "--auth requires a value."
+                );
+            }
 
-        const relative =
-            path.relative(
-                process.cwd(),
-                result.targetDirectory
-            ) || ".";
+            auth =
+                normalizeAuth(
+                    nextValue
+                );
+            index++;
+            continue;
+        }
 
-        console.log("");
-        console.log(
-            `Created BCP app: ${result.projectName}`
-        );
-        console.log(
-            `Location: ${result.targetDirectory}`
-        );
-        console.log(
-            `Tailwind CSS: ${result.tailwind ? "Yes" : "No"}`
-        );
-        console.log(
-            `Database: ${formatDatabaseName(result.database)}`
-        );
-        console.log(
-            `Authentication: ${formatAuthName(result.auth)}`
-        );
-        console.log("");
-        console.log(
-            "Next steps:"
-        );
-        console.log(
-            `  cd ${quoteIfNeeded(relative)}`
-        );
+        if (
+            value === "--bcp"
+        ) {
+            const nextValue =
+                args[
+                    index + 1
+                ];
+
+            if (!nextValue) {
+                throw new Error(
+                    "--bcp requires a package specifier."
+                );
+            }
 
-        if (!install) {
-            console.log(
-                "  npm install"
+            bcpPackage =
+                nextValue;
+            index++;
+            continue;
+        }
+
+        if (
+            value.startsWith("-")
+        ) {
+            throw new Error(
+                `Unknown option: ${value}`
             );
         }
 
-        console.log(
-            "  npm run dev"
-        );
-        console.log("");
-    } catch (error) {
-        fail(
-            error instanceof Error
-                ? error.message
-                : String(error)
-        );
+        if (
+            projectDirectory !==
+            null
+        ) {
+            throw new Error(
+                "Only one project directory may be provided."
+            );
+        }
+
+        projectDirectory =
+            value;
     }
+
+    return {
+        projectDirectory,
+        install,
+        bcpPackage,
+        tailwind,
+        database,
+        auth,
+        acceptDefaults,
+    };
 }
 
-async function resolveInteractiveOptions({
+async function resolveOptions({
     tailwind: selectedTailwind,
     database: selectedDatabase,
     auth: selectedAuth,
-    acceptDefaults: useDefaults,
+    acceptDefaults,
 }) {
-    let resolvedTailwind =
+    let tailwind =
         selectedTailwind;
-    let resolvedDatabase =
+    let database =
         selectedDatabase;
-    let resolvedAuth =
+    let auth =
         selectedAuth;
 
+    if (acceptDefaults) {
+        return {
+            tailwind:
+                tailwind ??
+                true,
+            database:
+                normalizeDatabase(
+                    database ??
+                    "none"
+                ),
+            auth:
+                normalizeAuth(
+                    auth ??
+                    "none"
+                ),
+            prompt:
+                null,
+        };
+    }
+
     const interactive =
         Boolean(
             input.isTTY &&
             output.isTTY
         );
 
-    if (useDefaults) {
+    if (!interactive) {
         return {
             tailwind:
-                resolvedTailwind ??
-                true,
+                tailwind ??
+                false,
             database:
                 normalizeDatabase(
-                    resolvedDatabase ??
+                    database ??
                     "none"
                 ),
             auth:
                 normalizeAuth(
-                    resolvedAuth ??
+                    auth ??
                     "none"
                 ),
+            prompt:
+                null,
         };
     }
 
-    if (!interactive) {
+    const needsPrompt =
+        tailwind === undefined ||
+        database === undefined ||
+        auth === undefined;
+
+    if (!needsPrompt) {
         return {
             tailwind:
-                resolvedTailwind ??
-                false,
+                Boolean(
+                    tailwind
+                ),
             database:
                 normalizeDatabase(
-                    resolvedDatabase ??
-                    "none"
+                    database
                 ),
             auth:
                 normalizeAuth(
-                    resolvedAuth ??
-                    "none"
+                    auth
                 ),
+            prompt:
+                null,
         };
     }
 
@@ -319,10 +357,10 @@ async function resolveInteractiveOptions({
         console.log("");
 
         if (
-            resolvedTailwind ===
+            tailwind ===
             undefined
         ) {
-            resolvedTailwind =
+            tailwind =
                 await askYesNo(
                     prompt,
                     "Use Tailwind CSS?",
@@ -331,41 +369,43 @@ async function resolveInteractiveOptions({
         }
 
         if (
-            resolvedDatabase ===
+            database ===
             undefined
         ) {
-            resolvedDatabase =
+            database =
                 await askDatabase(
                     prompt
                 );
         }
 
         if (
-            resolvedAuth ===
+            auth ===
             undefined
         ) {
-            resolvedAuth =
+            auth =
                 await askAuth(
                     prompt
                 );
         }
-    } finally {
+    } catch (error) {
         prompt.close();
+        throw error;
     }
 
     return {
         tailwind:
             Boolean(
-                resolvedTailwind
+                tailwind
             ),
         database:
             normalizeDatabase(
-                resolvedDatabase
+                database
             ),
         auth:
             normalizeAuth(
-                resolvedAuth
+                auth
             ),
+        prompt,
     };
 }
 
@@ -451,22 +491,13 @@ async function askDatabase(
             return "none";
         }
 
-        const index =
-            Number(
-                answer
-            ) - 1;
-
-        if (
-            Number.isInteger(
-                index
-            ) &&
-            index >= 0 &&
-            index <
-                DATABASE_CHOICES.length
-        ) {
-            return DATABASE_CHOICES[
-                index
+        const choice =
+            DATABASE_CHOICES[
+                Number(answer) - 1
             ];
+
+        if (choice) {
+            return choice;
         }
 
         const normalized =
@@ -522,22 +553,13 @@ async function askAuth(
             return "none";
         }
 
-        const index =
-            Number(
-                answer
-            ) - 1;
-
-        if (
-            Number.isInteger(
-                index
-            ) &&
-            index >= 0 &&
-            index <
-                AUTH_CHOICES.length
-        ) {
-            return AUTH_CHOICES[
-                index
+        const choice =
+            AUTH_CHOICES[
+                Number(answer) - 1
             ];
+
+        if (choice) {
+            return choice;
         }
 
         const normalized =
@@ -557,6 +579,52 @@ async function askAuth(
     }
 }
 
+function printSuccess(
+    result,
+    installed
+) {
+    const relative =
+        path.relative(
+            process.cwd(),
+            result.targetDirectory
+        ) || ".";
+
+    console.log("");
+    console.log(
+        `Created BCP app: ${result.projectName}`
+    );
+    console.log(
+        `Location: ${result.targetDirectory}`
+    );
+    console.log(
+        `Tailwind CSS: ${result.tailwind ? "Yes" : "No"}`
+    );
+    console.log(
+        `Database: ${formatDatabaseName(result.database)}`
+    );
+    console.log(
+        `Authentication: ${formatAuthName(result.auth)}`
+    );
+    console.log("");
+    console.log(
+        "Next steps:"
+    );
+    console.log(
+        `  cd ${quoteIfNeeded(relative)}`
+    );
+
+    if (!installed) {
+        console.log(
+            "  npm install"
+        );
+    }
+
+    console.log(
+        "  npm run dev"
+    );
+    console.log("");
+}
+
 function formatDatabaseName(
     value
 ) {
@@ -613,7 +681,6 @@ Examples:
   npx create-bcp-app my-app --no-tailwind --database mongodb
   npx create-bcp-app my-app --yes
   npx create-bcp-app my-app --no-install
-  npx create-bcp-app my-app --bcp file:../bcp-0.1.8.tgz
 `);
 }
 
@@ -629,11 +696,19 @@ function quoteIfNeeded(
         : value;
 }
 
-function fail(
-    message
+function reportError(
+    error
 ) {
+    const message =
+        error instanceof Error
+            ? error.message
+            : String(
+                error
+            );
+
     console.error(
         `create-bcp-app: ${message}`
     );
-    process.exit(1);
+    process.exitCode =
+        1;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-bcp-app",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "description": "Create a new BCP Framework application.",
   "type": "module",
   "license": "MIT",

package/src/index.d.mts

@@ -28,6 +28,20 @@ export interface CreateBcpAppResult {
     auth: BcpAuthPreset;
 }
 
+export interface ResolveNpmInvocationOptions {
+    env?: Record<
+        string,
+        string | undefined
+    >;
+    platform?: string;
+    execPath?: string;
+}
+
+export interface NpmInvocation {
+    command: string;
+    args: string[];
+}
+
 export function createBcpApp(
     options: CreateBcpAppOptions
 ): Promise<CreateBcpAppResult>;
@@ -35,3 +49,8 @@ export function createBcpApp(
 export function validateProjectName(
     value: unknown
 ): string;
+
+export function resolveNpmInvocation(
+    args: string[],
+    options?: ResolveNpmInvocationOptions
+): NpmInvocation;

package/src/index.mjs

@@ -359,8 +359,11 @@ function runInstall(
                     {
                         cwd:
                             targetDirectory,
-                        stdio:
+                        stdio: [
+                            "ignore",
                             "inherit",
+                            "inherit",
+                        ],
                         env:
                             process.env,
                     }
@@ -371,7 +374,7 @@ function runInstall(
                 reject
             );
             child.once(
-                "exit",
+                "close",
                 (
                     code,
                     signal
@@ -396,16 +399,28 @@ function runInstall(
     );
 }
 
-function resolveNpmInvocation(
-    args
+export function resolveNpmInvocation(
+    args,
+    options = {}
 ) {
+    const environment =
+        options.env ??
+        process.env;
+    const platform =
+        options.platform ??
+        process.platform;
+    const execPath =
+        options.execPath ??
+        process.execPath;
     const npmExecPath =
-        process.env.npm_execpath;
+        resolveNpmCliPath(
+            environment.npm_execpath
+        );
 
     if (npmExecPath) {
         return {
             command:
-                process.execPath,
+                execPath,
             args: [
                 npmExecPath,
                 ...args,
@@ -414,11 +429,11 @@ function resolveNpmInvocation(
     }
 
     if (
-        process.platform === "win32"
+        platform === "win32"
     ) {
         return {
             command:
-                process.env.ComSpec ??
+                environment.ComSpec ??
                 "cmd.exe",
             args: [
                 "/d",
@@ -436,3 +451,51 @@ function resolveNpmInvocation(
         args,
     };
 }
+
+function resolveNpmCliPath(
+    npmExecPath
+) {
+    if (
+        typeof npmExecPath !==
+            "string" ||
+        npmExecPath.trim() ===
+            ""
+    ) {
+        return null;
+    }
+
+    const normalized =
+        npmExecPath.trim();
+    const baseName =
+        path.basename(
+            normalized
+        ).toLowerCase();
+
+    if (
+        baseName ===
+        "npm-cli.js"
+    ) {
+        return normalized;
+    }
+
+    if (
+        baseName ===
+        "npx-cli.js"
+    ) {
+        const npmCliPath =
+            path.join(
+                path.dirname(
+                    normalized
+                ),
+                "npm-cli.js"
+            );
+
+        return fs.existsSync(
+            npmCliPath
+        )
+            ? npmCliPath
+            : null;
+    }
+
+    return null;
+}