stackkit 0.1.5 → 0.1.6

package/dist/cli/add.js

@@ -17,7 +17,6 @@ const logger_1 = require("../lib/ui/logger");
 const package_manager_1 = require("../lib/pm/package-manager");
 const package_root_1 = require("../lib/utils/package-root");
 const framework_utils_1 = require("../lib/framework/framework-utils");
-const generator_utils_1 = require("../lib/generation/generator-utils");
 async function addCommand(module, options) {
     try {
         const projectRoot = process.cwd();
@@ -29,10 +28,6 @@ async function addCommand(module, options) {
         logger_1.logger.newLine();
         logger_1.logger.success(`Added ${chalk_1.default.bold(config.displayName)}`);
         logger_1.logger.newLine();
-        if (config.metadata.envVars && config.metadata.envVars.length > 0) {
-            logger_1.logger.log("Next: Fill in environment variables in .env");
-        }
-        logger_1.logger.newLine();
     }
     catch (error) {
         logger_1.logger.error(`Failed to add module: ${error.message}`);
@@ -44,88 +39,59 @@ async function addCommand(module, options) {
 }
 async function getAddConfig(module, options, projectInfo) {
     const modulesDir = path_1.default.join((0, package_root_1.getPackageRoot)(), "modules");
-    const argv = process.argv.slice(2);
-    const addIndex = argv.indexOf("add");
-    const argsAfterAdd = addIndex >= 0 ? argv.slice(addIndex + 1) : [];
-    const flagsProvided = argsAfterAdd.some((arg) => arg.startsWith("-"));
-    const optionsProvided = flagsProvided ||
-        !!(options && (options.yes || options.provider || options.force || options.dryRun));
-    if (optionsProvided) {
-        if (!module) {
-            throw new Error("Module name is required when using flags");
-        }
-        if (module === "database" || module === "auth") {
+    // 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 add better-auth` or
+    // `npx stackkit add auth prisma-postgresql` — require `--provider` flag.
+    if (module === "database" || module === "auth") {
+        if (!options?.provider) {
             if (module === "database") {
-                if (!options?.provider) {
-                    throw new Error("Provider is required for database. Use --provider <provider>");
-                }
-                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 moduleMetadata = await loadModuleMetadata(modulesDir, baseProvider, baseProvider);
-                if (!moduleMetadata) {
-                    throw new Error(`Database provider "${baseProvider}" not found`);
-                }
-                return {
-                    module: "database",
-                    provider: adapterProvider,
-                    displayName: `${moduleMetadata.displayName} (${adapterProvider.split("-")[1] || adapterProvider})`,
-                    metadata: moduleMetadata,
-                };
+                throw new Error('Provider is required for database. Use: `npx stackkit add database --provider <provider>`');
             }
-            else if (module === "auth") {
-                const provider = options?.provider || "better-auth";
-                const moduleMetadata = await loadModuleMetadata(modulesDir, provider, provider);
-                if (!moduleMetadata) {
-                    throw new Error(`Auth provider "${provider}" not found`);
-                }
-                return {
-                    module: "auth",
-                    provider,
-                    displayName: moduleMetadata.displayName,
-                    metadata: moduleMetadata,
-                };
+            else {
+                throw new Error('Provider is required for auth. Use: `npx stackkit add auth --provider <provider>`');
             }
         }
-        const moduleMetadata = await loadModuleMetadata(modulesDir, module, options?.provider);
-        if (!moduleMetadata) {
-            throw new Error(`Module "${module}" not found`);
-        }
-        let selectedProvider = options?.provider;
-        if (!selectedProvider && moduleMetadata.category !== module) {
-            selectedProvider = module;
-        }
-        if (moduleMetadata.category === "database" && !selectedProvider) {
-            if (typeof moduleMetadata.dependencies === "object" &&
-                "providers" in moduleMetadata.dependencies) {
-                const providers = Object.keys(moduleMetadata.dependencies.providers || {});
-                if (providers.length > 0) {
-                    const { provider } = await inquirer_1.default.prompt([
-                        {
-                            type: "list",
-                            name: "provider",
-                            message: "Select database provider:",
-                            choices: providers.map((p) => ({ name: p, value: p })),
-                        },
-                    ]);
-                    selectedProvider = provider;
-                }
+        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 moduleMetadata = await loadModuleMetadata(modulesDir, baseProvider, baseProvider);
+            if (!moduleMetadata) {
+                throw new Error(`Database provider "${baseProvider}" not found`);
             }
+            return {
+                module: "database",
+                provider: adapterProvider,
+                displayName: `${moduleMetadata.displayName} (${adapterProvider.split("-")[1] || adapterProvider})`,
+                metadata: moduleMetadata,
+            };
         }
-        if (projectInfo && !moduleMetadata.supportedFrameworks.includes(projectInfo.framework)) {
-            throw new Error(`Module "${module}" does not support ${projectInfo.framework}. Supported: ${moduleMetadata.supportedFrameworks.join(", ")}`);
+        else if (module === "auth") {
+            const provider = options.provider;
+            const moduleMetadata = await loadModuleMetadata(modulesDir, provider, provider);
+            if (!moduleMetadata) {
+                throw new Error(`Auth provider "${provider}" not found`);
+            }
+            return {
+                module: "auth",
+                provider,
+                displayName: moduleMetadata.displayName,
+                metadata: moduleMetadata,
+            };
         }
-        return {
-            module,
-            provider: selectedProvider,
-            displayName: moduleMetadata.displayName,
-            metadata: moduleMetadata,
-        };
     }
+    // Unknown module type
+    throw new Error(`Unknown module type "${module}". Use "database" or "auth", or specify a provider directly.`);
+}
+async function getInteractiveConfig(modulesDir, projectInfo) {
     const answers = await inquirer_1.default.prompt([
         {
             type: "list",
@@ -133,7 +99,7 @@ async function getAddConfig(module, options, projectInfo) {
             message: "What would you like to add?",
             choices: [
                 { name: "Database", value: "database" },
-                { name: "Authentication", value: "auth" },
+                { name: "Auth", value: "auth" },
             ],
         },
     ]);
@@ -167,7 +133,7 @@ async function getAddConfig(module, options, projectInfo) {
             ]);
             return {
                 module: "database",
-                provider: "prisma",
+                provider: `prisma-${providerAnswers.provider}`,
                 displayName: `Prisma (${providerAnswers.provider})`,
                 metadata: (await loadModuleMetadata(modulesDir, "prisma", "prisma")),
             };
@@ -210,6 +176,55 @@ async function getAddConfig(module, options, projectInfo) {
     }
     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`);
+}
 async function addModuleToProject(projectRoot, projectInfo, config, options) {
     const moduleMetadata = config.metadata;
     const selectedProvider = config.provider;
@@ -228,6 +243,21 @@ async function addModuleToProject(projectRoot, projectInfo, config, options) {
             return;
         }
     }
+    if (config.module === "database" && projectInfo.hasDatabase && !options?.force) {
+        logger_1.logger.warn("Database library already detected in this project");
+        const { proceed } = await inquirer_1.default.prompt([
+            {
+                type: "confirm",
+                name: "proceed",
+                message: "Continue anyway? (use --force to skip this prompt)",
+                default: false,
+            },
+        ]);
+        if (!proceed) {
+            logger_1.logger.info("Cancelled");
+            return;
+        }
+    }
     if (options?.dryRun) {
         logger_1.logger.warn("Dry run mode - no changes will be made");
         logger_1.logger.newLine();
@@ -413,10 +443,10 @@ async function loadModuleMetadata(modulesDir, moduleName, provider) {
             if (await fs_extra_1.default.pathExists(metadataPath)) {
                 const metadata = await fs_extra_1.default.readJSON(metadataPath);
                 if (provider && moduleDir === provider) {
-                    return await (0, generator_utils_1.mergeGeneratorIntoModuleMetadata)(metadata, modulePath);
+                    return metadata;
                 }
                 if (!provider && (metadata.category === moduleName || moduleDir === moduleName)) {
-                    return await (0, generator_utils_1.mergeGeneratorIntoModuleMetadata)(metadata, modulePath);
+                    return metadata;
                 }
             }
         }

package/dist/cli/doctor.js

@@ -137,7 +137,7 @@ async function runDoctorChecks() {
         summary: {
             errors: checks.filter((c) => c.status === "error").length,
             warnings: checks.filter((c) => c.status === "warning").length,
-            suggestions: generateSuggestions(),
+            suggestions: generateSuggestions(authModules, databaseModules),
         },
     };
     return report;
@@ -261,6 +261,7 @@ async function checkAuthRoutesExist(projectRoot, projectType) {
     if (projectType !== "nextjs")
         return true; // Skip for non-Next.js
     const possiblePaths = [
+        // NextAuth routes
         "app/api/auth/[...nextauth]/route.ts",
         "app/api/auth/[...nextauth]/route.js",
         "src/app/api/auth/[...nextauth]/route.ts",
@@ -269,6 +270,11 @@ async function checkAuthRoutesExist(projectRoot, projectType) {
         "pages/api/auth/[...nextauth].js",
         "src/pages/api/auth/[...nextauth].ts",
         "src/pages/api/auth/[...nextauth].js",
+        // Better Auth routes
+        "app/api/auth/[...all]/route.ts",
+        "app/api/auth/[...all]/route.js",
+        "src/app/api/auth/[...all]/route.ts",
+        "src/app/api/auth/[...all]/route.js",
     ];
     for (const routePath of possiblePaths) {
         if (await fs_extra_1.default.pathExists(path_1.default.join(projectRoot, routePath))) {
@@ -372,8 +378,10 @@ async function checkDependencies(packageJson) {
     const deps = { ...packageJson.dependencies, ...packageJson.devDependencies };
     for (const [name, version] of Object.entries(deps || {})) {
         if (typeof version === "string" && (version.startsWith("^") || version.startsWith("~"))) {
+            // Assume up to date if using flexible versioning
         }
         else {
+            // Assume outdated if using exact versions (simplified check)
             outdated.push(name);
         }
     }
@@ -406,11 +414,16 @@ async function checkEslintConfigExists(projectRoot) {
     }
     return false;
 }
-function generateSuggestions() {
+function generateSuggestions(authModules, databaseModules) {
     const suggestions = [];
+    // Show suggestions based on what's missing
+    if (authModules.length === 0) {
+        suggestions.push("stackkit add auth     - Add authentication module");
+    }
+    if (databaseModules.length === 0) {
+        suggestions.push("stackkit add db       - Add database module");
+    }
     // Always show available commands
-    suggestions.push("stackkit add auth     - Add authentication module");
-    suggestions.push("stackkit add db       - Add database module");
     suggestions.push("stackkit list         - View available modules");
     return suggestions;
 }

package/dist/index.js

@@ -11,7 +11,7 @@ const program = new commander_1.Command();
 program
     .name("stackkit")
     .description("CLI for creating and managing StackKit projects")
-    .version("0.1.5")
+    .version("0.1.6")
     .configureHelp({
     subcommandTerm: (cmd) => {
         const name = cmd.name();

package/dist/lib/generation/generator-utils.js

@@ -74,15 +74,20 @@ async function mergeGeneratorIntoModuleMetadata(metadata, modulePath) {
     if (await fs.pathExists(generatorPath)) {
         try {
             const generator = await fs.readJson(generatorPath);
-            if (generator.envVars) {
-                metadata.envVars = metadata.envVars || [];
-                for (const [key, value] of Object.entries(generator.envVars)) {
-                    metadata.envVars.push({
-                        key,
-                        value: value,
-                        description: `Environment variable for ${key}`,
-                        required: true,
-                    });
+            // Process add-env operations to extract envVars
+            if (generator.operations && Array.isArray(generator.operations)) {
+                for (const operation of generator.operations) {
+                    if (operation.type === "add-env" && operation.envVars) {
+                        metadata.envVars = metadata.envVars || [];
+                        for (const [key, value] of Object.entries(operation.envVars)) {
+                            metadata.envVars.push({
+                                key,
+                                value: value,
+                                description: `Environment variable for ${key}`,
+                                required: true,
+                            });
+                        }
+                    }
                 }
             }
             if (generator.dependencies) {

package/modules/auth/authjs/generator.json

@@ -5,6 +5,5 @@
   "operations": [],
   "dependencies": {},
   "devDependencies": {},
-  "scripts": {},
-  "envVars": {}
+  "scripts": {}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stackkit",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Production-ready CLI to create and extend JavaScript or TypeScript apps with modular stacks.",
   "main": "dist/index.js",
   "bin": {
@@ -28,6 +28,8 @@
     "copy-assets": "cp -r ../../templates . && cp -r ../../modules .",
     "clean": "rm -rf dist templates modules",
     "typecheck": "tsc --noEmit",
+    "lint": "eslint src --ext .ts",
+    "lint:fix": "eslint src --ext .ts --fix",
     "prepublishOnly": "npm run build"
   },
   "keywords": [