stackkit 0.2.0 → 0.2.2

package/README.md

@@ -2,8 +2,7 @@
 
 CLI for scaffolding and composing modular JavaScript applications.
 
-Quick Start
------------
+## Quick Start
 
 Create a new project without installing globally:
 
@@ -23,15 +22,13 @@ Check project health:
 npx stackkit@latest doctor
 ```
 
-Supported technologies
-----------------------
+## Supported technologies
 
 - Frameworks: Next.js, React, Express
 - Databases: Prisma, Mongoose
 - Auth: Auth.js / Better Auth
 
-Links
------
+## Links
 
 - Website: https://stackkit.tariqul.dev
-- Repo: https://github.com/tariqul420/stackkit
+- Repo: https://github.com/tariqul420/stackkit

package/dist/cli/add.js

@@ -9,14 +9,16 @@ const child_process_1 = require("child_process");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const inquirer_1 = __importDefault(require("inquirer"));
 const path_1 = __importDefault(require("path"));
-const code_generator_1 = require("../lib/generation/code-generator");
-const detect_1 = require("../lib/project/detect");
+const module_discovery_1 = require("../lib/discovery/module-discovery");
+const shared_1 = require("../lib/discovery/shared");
 const env_editor_1 = require("../lib/env/env-editor");
+const framework_utils_1 = require("../lib/framework/framework-utils");
 const files_1 = require("../lib/fs/files");
-const logger_1 = require("../lib/ui/logger");
+const code_generator_1 = require("../lib/generation/code-generator");
 const package_manager_1 = require("../lib/pm/package-manager");
+const detect_1 = require("../lib/project/detect");
+const logger_1 = require("../lib/ui/logger");
 const package_root_1 = require("../lib/utils/package-root");
-const framework_utils_1 = require("../lib/framework/framework-utils");
 async function addCommand(module, options) {
     try {
         const projectRoot = process.cwd();
@@ -39,13 +41,9 @@ async function addCommand(module, options) {
 }
 async function getAddConfig(module, options, projectInfo) {
     const modulesDir = path_1.default.join((0, package_root_1.getPackageRoot)(), "modules");
-    // If no module provided, go interactive
     if (!module) {
         return await getInteractiveConfig(modulesDir, projectInfo);
     }
-    // Only allow: no-arg interactive, or explicit category + --provider.
-    // Disallow positional provider names like `npx stackkit@latest add better-auth` or
-    // `npx stackkit@latest add auth prisma-postgresql` — require `--provider` flag.
     if (module === "database" || module === "auth") {
         if (!options?.provider) {
             if (module === "database") {
@@ -56,13 +54,11 @@ async function getAddConfig(module, options, projectInfo) {
             }
         }
         if (module === "database") {
-            let baseProvider = options.provider;
-            let adapterProvider = options.provider;
-            if (options.provider.includes("-")) {
-                const parts = options.provider.split("-");
-                baseProvider = parts[0]; // e.g., "prisma"
-                adapterProvider = options.provider; // e.g., "prisma-postgresql"
-            }
+            const parsed = (0, shared_1.parseDatabaseOption)(options.provider || "");
+            const baseProvider = parsed.database;
+            const adapterProvider = parsed.provider
+                ? `${parsed.database}-${parsed.provider}`
+                : parsed.database;
             const moduleMetadata = await loadModuleMetadata(modulesDir, baseProvider, baseProvider);
             if (!moduleMetadata) {
                 throw new Error(`Database provider "${baseProvider}" not found`);
@@ -70,7 +66,9 @@ async function getAddConfig(module, options, projectInfo) {
             return {
                 module: "database",
                 provider: adapterProvider,
-                displayName: `${moduleMetadata.displayName} (${adapterProvider.split("-")[1] || adapterProvider})`,
+                displayName: parsed.database === "prisma" && parsed.provider
+                    ? `${moduleMetadata.displayName} (${parsed.provider})`
+                    : moduleMetadata.displayName,
                 metadata: moduleMetadata,
             };
         }
@@ -80,6 +78,20 @@ async function getAddConfig(module, options, projectInfo) {
             if (!moduleMetadata) {
                 throw new Error(`Auth provider "${provider}" not found`);
             }
+            // Validate compatibility with existing project
+            if (projectInfo) {
+                // Auth.js requires Next.js + Prisma
+                if (provider === "authjs" &&
+                    (projectInfo.framework !== "nextjs" || !projectInfo.hasPrisma)) {
+                    throw new Error("Auth.js is only supported with Next.js and Prisma database in this project");
+                }
+                // Better-auth requires a database for server frameworks (non-react)
+                if (provider === "better-auth" &&
+                    !projectInfo.hasDatabase &&
+                    projectInfo.framework !== "react") {
+                    throw new Error("Better Auth requires a database for server frameworks in this project");
+                }
+            }
             return {
                 module: "auth",
                 provider,
@@ -92,139 +104,92 @@ async function getAddConfig(module, options, projectInfo) {
     throw new Error(`Unknown module type "${module}". Use "database" or "auth", or specify a provider directly.`);
 }
 async function getInteractiveConfig(modulesDir, projectInfo) {
+    // Discover modules once and use compatibility info to decide which categories to show
+    const discovered = await (0, module_discovery_1.discoverModules)(modulesDir);
+    const compatibleAuths = (0, module_discovery_1.getCompatibleAuthOptions)(discovered.auth || [], projectInfo?.framework || "nextjs", projectInfo?.hasPrisma ? "prisma" : "none");
+    const categories = [
+        { name: "Database", value: "database" },
+    ];
+    // Only show Auth category if there is at least one compatible auth option
+    if (compatibleAuths.length > 1) {
+        categories.push({ name: "Auth", value: "auth" });
+    }
     const answers = await inquirer_1.default.prompt([
         {
             type: "list",
             name: "category",
             message: "What would you like to add?",
-            choices: [
-                { name: "Database", value: "database" },
-                { name: "Auth", value: "auth" },
-            ],
+            choices: categories,
         },
     ]);
     const category = answers.category;
     if (category === "database") {
+        const dbChoices = (0, module_discovery_1.getDatabaseChoices)(discovered.databases || [], projectInfo?.framework || "nextjs");
         const dbAnswers = await inquirer_1.default.prompt([
             {
                 type: "list",
                 name: "database",
                 message: "Select database:",
-                choices: [
-                    { name: "Prisma", value: "prisma" },
-                    { name: "Mongoose", value: "mongoose" },
-                ],
+                choices: dbChoices,
             },
         ]);
         const selectedDb = dbAnswers.database;
-        if (selectedDb === "prisma") {
-            const providerAnswers = await inquirer_1.default.prompt([
-                {
-                    type: "list",
-                    name: "provider",
-                    message: "Select Prisma provider:",
-                    choices: [
-                        { name: "PostgreSQL", value: "postgresql" },
-                        { name: "MongoDB", value: "mongodb" },
-                        { name: "MySQL", value: "mysql" },
-                        { name: "SQLite", value: "sqlite" },
-                    ],
-                },
-            ]);
+        if (selectedDb.startsWith("prisma-")) {
+            const provider = selectedDb.split("-")[1];
             return {
                 module: "database",
-                provider: `prisma-${providerAnswers.provider}`,
-                displayName: `Prisma (${providerAnswers.provider})`,
+                provider: `prisma-${provider}`,
+                displayName: `Prisma (${provider})`,
                 metadata: (await loadModuleMetadata(modulesDir, "prisma", "prisma")),
             };
         }
-        else {
-            return {
-                module: "database",
-                provider: "mongoose",
-                displayName: "Mongoose",
-                metadata: (await loadModuleMetadata(modulesDir, "mongoose", "mongoose")),
-            };
-        }
+        // Other databases (mongoose, etc.)
+        const meta = (await loadModuleMetadata(modulesDir, selectedDb, selectedDb));
+        if (!meta)
+            throw new Error(`Database provider "${selectedDb}" not found`);
+        return {
+            module: "database",
+            provider: selectedDb,
+            displayName: meta.displayName || selectedDb,
+            metadata: meta,
+        };
     }
     else if (category === "auth") {
+        // Filter auth choices based on project compatibility (framework + database)
+        const dbString = projectInfo?.hasPrisma ? "prisma" : "none";
+        const authChoices = (0, module_discovery_1.getCompatibleAuthOptions)(discovered.auth || [], projectInfo?.framework || "nextjs", dbString);
         const authAnswers = await inquirer_1.default.prompt([
             {
                 type: "list",
                 name: "auth",
                 message: "Select authentication:",
-                choices: [
-                    { name: "Better Auth", value: "better-auth" },
-                    { name: "Auth.js", value: "authjs" },
-                ],
+                choices: authChoices,
             },
         ]);
         const selectedAuth = authAnswers.auth;
+        if (selectedAuth === "none") {
+            logger_1.logger.info("Cancelled");
+            process.exit(0);
+        }
         const metadata = await loadModuleMetadata(modulesDir, selectedAuth, selectedAuth);
         if (!metadata) {
             throw new Error(`Auth provider "${selectedAuth}" not found`);
         }
-        if (projectInfo && !metadata.supportedFrameworks.includes(projectInfo.framework)) {
+        if (projectInfo &&
+            metadata.supportedFrameworks &&
+            !metadata.supportedFrameworks.includes(projectInfo.framework)) {
             throw new Error(`Auth provider "${selectedAuth}" does not support ${projectInfo.framework}`);
         }
         return {
             module: "auth",
             provider: selectedAuth,
-            displayName: selectedAuth === "better-auth" ? "Better Auth" : "Auth.js",
+            displayName: metadata.displayName || selectedAuth,
             metadata,
         };
     }
     throw new Error("Invalid selection");
 }
-async function getProviderConfig(modulesDir, provider, projectInfo) {
-    if (provider.includes("-")) {
-        const parts = provider.split("-");
-        const baseProvider = parts[0];
-        const specificProvider = provider;
-        if (baseProvider === "prisma") {
-            const metadata = await loadModuleMetadata(modulesDir, "database", baseProvider);
-            if (!metadata) {
-                throw new Error(`Database provider "${baseProvider}" not found`);
-            }
-            return {
-                module: "database",
-                provider: specificProvider,
-                displayName: `Prisma (${parts[1]})`,
-                metadata,
-            };
-        }
-    }
-    else {
-        if (provider === "mongoose") {
-            const metadata = await loadModuleMetadata(modulesDir, "database", "mongoose");
-            if (!metadata) {
-                throw new Error(`Database provider "${provider}" not found`);
-            }
-            return {
-                module: "database",
-                provider: "mongoose",
-                displayName: "Mongoose",
-                metadata,
-            };
-        }
-        else if (provider === "better-auth" || provider === "authjs") {
-            const metadata = await loadModuleMetadata(modulesDir, provider, provider);
-            if (!metadata) {
-                throw new Error(`Auth provider "${provider}" not found`);
-            }
-            if (projectInfo && !metadata.supportedFrameworks.includes(projectInfo.framework)) {
-                throw new Error(`Auth provider "${provider}" does not support ${projectInfo.framework}`);
-            }
-            return {
-                module: "auth",
-                provider,
-                displayName: provider === "better-auth" ? "Better Auth" : "Auth.js",
-                metadata,
-            };
-        }
-    }
-    throw new Error(`Unknown provider "${provider}". Available providers: better-auth, authjs, mongoose, prisma-postgresql, prisma-mongodb, prisma-mysql, prisma-sqlite`);
-}
+/* removed unused getProviderConfig — discovery-based flows handle providers */
 async function addModuleToProject(projectRoot, projectInfo, config, options) {
     const moduleMetadata = config.metadata;
     const selectedProvider = config.provider;
@@ -297,18 +262,28 @@ async function addModuleToProject(projectRoot, projectInfo, config, options) {
         }
         const selectedModules = { framework: projectInfo.framework };
         if (config.module === "database" && config.provider) {
-            if (config.provider.startsWith("prisma-")) {
-                selectedModules.database = "prisma";
-                selectedModules.prismaProvider = config.provider.split("-")[1];
-            }
-            else {
-                selectedModules.database = config.provider;
+            const parsed = (0, shared_1.parseDatabaseOption)(config.provider);
+            selectedModules.database = parsed.database;
+            if (parsed.database === "prisma" && parsed.provider) {
+                selectedModules.prismaProvider = parsed.provider;
             }
         }
         if (config.module === "auth" && config.provider) {
             selectedModules.auth = config.provider;
         }
         const postInstall = await gen.applyToProject(selectedModules, [], projectRoot);
+        // Install dependencies first, then run post-install commands (e.g. prisma generate)
+        if (!options?.dryRun && options?.install !== false) {
+            const installSpinner = logger_1.logger.startSpinner("Installing dependencies...");
+            try {
+                await (0, package_manager_1.installDependencies)(projectRoot, projectInfo.packageManager);
+                installSpinner.succeed("Dependencies installed");
+            }
+            catch (err) {
+                installSpinner.fail("Failed to install dependencies");
+                throw err;
+            }
+        }
         if (postInstall && postInstall.length > 0 && !options?.dryRun) {
             const postInstallSpinner = logger_1.logger.startSpinner("Running post-install commands...");
             try {
@@ -322,17 +297,6 @@ async function addModuleToProject(projectRoot, projectInfo, config, options) {
                 throw error;
             }
         }
-        if (!options?.dryRun && options?.install !== false) {
-            const installSpinner = logger_1.logger.startSpinner("Installing dependencies...");
-            try {
-                await (0, package_manager_1.installDependencies)(projectRoot, projectInfo.packageManager);
-                installSpinner.succeed("Dependencies installed");
-            }
-            catch (err) {
-                installSpinner.fail("Failed to install dependencies");
-                throw err;
-            }
-        }
         return;
     }
     const mergedDeps = {};

package/dist/cli/create.js

@@ -10,15 +10,16 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const inquirer_1 = __importDefault(require("inquirer"));
 const path_1 = __importDefault(require("path"));
 const validate_npm_package_name_1 = __importDefault(require("validate-npm-package-name"));
-const git_utils_1 = require("../lib/git-utils");
 const js_conversion_1 = require("../lib/conversion/js-conversion");
-const package_manager_1 = require("../lib/pm/package-manager");
-const logger_1 = require("../lib/ui/logger");
-const framework_utils_1 = require("../lib/framework/framework-utils");
 const module_discovery_1 = require("../lib/discovery/module-discovery");
+const shared_1 = require("../lib/discovery/shared");
+const env_editor_1 = require("../lib/env/env-editor");
+const framework_utils_1 = require("../lib/framework/framework-utils");
 const code_generator_1 = require("../lib/generation/code-generator");
+const git_utils_1 = require("../lib/git-utils");
+const package_manager_1 = require("../lib/pm/package-manager");
+const logger_1 = require("../lib/ui/logger");
 const package_root_1 = require("../lib/utils/package-root");
-const env_editor_1 = require("../lib/env/env-editor");
 async function createProject(projectName, options) {
     logger_1.logger.newLine();
     logger_1.logger.log(chalk_1.default.bold.cyan("📦 Create StackKit App"));
@@ -91,7 +92,7 @@ async function getProjectConfig(projectName, options) {
         let database = "none";
         let prismaProvider;
         if (db && db !== "none") {
-            const parsed = (0, module_discovery_1.parseDatabaseOption)(db);
+            const parsed = (0, shared_1.parseDatabaseOption)(db);
             database = parsed.database;
             prismaProvider = parsed.provider;
         }
@@ -151,12 +152,16 @@ async function getProjectConfig(projectName, options) {
             name: "database",
             message: "Select database/ORM:",
             when: (answers) => answers.framework !== "react",
-            choices: [
-                { name: "Prisma", value: "prisma" },
-                { name: "Mongoose", value: "mongoose" },
-                { name: "None", value: "none" },
-            ],
+            choices: (answers) => discoveredModules.databases && discoveredModules.databases.length > 0
+                ? (0, module_discovery_1.getDatabaseChoices)(discoveredModules.databases, answers.framework)
+                : [
+                    { name: "Prisma", value: "prisma" },
+                    { name: "Mongoose", value: "mongoose" },
+                    { name: "None", value: "none" },
+                ],
         },
+        // If a prisma-* choice is selected above, `prismaProvider` will be derived from it,
+        // otherwise prompt for provider when `prisma` is selected directly.
         {
             type: "list",
             name: "prismaProvider",
@@ -199,13 +204,21 @@ async function getProjectConfig(projectName, options) {
             default: "pnpm",
         },
     ]));
+    // Normalize database answer (interactive flow): handle values like `prisma-postgresql`
+    let databaseAnswer = answers.framework === "react" ? "none" : answers.database;
+    let prismaProviderAnswer = answers.prismaProvider;
+    if (typeof databaseAnswer === "string" && databaseAnswer.startsWith("prisma-")) {
+        const parts = databaseAnswer.split("-");
+        if (parts.length >= 2) {
+            prismaProviderAnswer = parts[1];
+            databaseAnswer = "prisma";
+        }
+    }
     return {
         projectName: (projectName || answers.projectName),
         framework: answers.framework,
-        database: (answers.framework === "react"
-            ? "none"
-            : answers.database),
-        prismaProvider: answers.prismaProvider,
+        database: databaseAnswer,
+        prismaProvider: prismaProviderAnswer,
         auth: answers.auth || "none",
         language: answers.language,
         packageManager: answers.packageManager,