stackkit 0.1.4 → 0.1.6

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

@@ -40,23 +40,26 @@ const fs = __importStar(require("fs-extra"));
 const path = __importStar(require("path"));
 const package_root_1 = require("../utils/package-root");
 async function mergeModuleIntoGeneratorConfig(config, modulePath) {
-    const modulePathJson = path.join(modulePath, 'module.json');
+    const modulePathJson = path.join(modulePath, "module.json");
     if (await fs.pathExists(modulePathJson)) {
         try {
             const moduleConfig = await fs.readJson(modulePathJson);
             if (moduleConfig.postInstall && Array.isArray(moduleConfig.postInstall)) {
                 config.postInstall = moduleConfig.postInstall;
             }
-            if (moduleConfig.dependencies && typeof moduleConfig.dependencies === 'object') {
+            if (moduleConfig.dependencies && typeof moduleConfig.dependencies === "object") {
                 config.dependencies = { ...(config.dependencies || {}), ...moduleConfig.dependencies };
             }
-            if (moduleConfig.devDependencies && typeof moduleConfig.devDependencies === 'object') {
-                config.devDependencies = { ...(config.devDependencies || {}), ...moduleConfig.devDependencies };
+            if (moduleConfig.devDependencies && typeof moduleConfig.devDependencies === "object") {
+                config.devDependencies = {
+                    ...(config.devDependencies || {}),
+                    ...moduleConfig.devDependencies,
+                };
             }
-            if (moduleConfig.scripts && typeof moduleConfig.scripts === 'object') {
+            if (moduleConfig.scripts && typeof moduleConfig.scripts === "object") {
                 config.scripts = { ...(config.scripts || {}), ...moduleConfig.scripts };
             }
-            if (moduleConfig.envVars && typeof moduleConfig.envVars === 'object') {
+            if (moduleConfig.envVars && typeof moduleConfig.envVars === "object") {
                 config.envVars = { ...(config.envVars || {}), ...moduleConfig.envVars };
             }
         }
@@ -67,14 +70,24 @@ async function mergeModuleIntoGeneratorConfig(config, modulePath) {
     return config;
 }
 async function mergeGeneratorIntoModuleMetadata(metadata, modulePath) {
-    const generatorPath = path.join(modulePath, 'generator.json');
+    const generatorPath = path.join(modulePath, "generator.json");
     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) {
@@ -96,12 +109,12 @@ async function mergeGeneratorIntoModuleMetadata(metadata, modulePath) {
 }
 function locateOperationSource(generatorType, generatorName, sourceRel) {
     const packageRoot = (0, package_root_1.getPackageRoot)();
-    const modulesPath = path.join(packageRoot, 'modules');
-    const templatesPath = path.join(packageRoot, 'templates');
-    const moduleBasePath = generatorType === 'framework'
+    const modulesPath = path.join(packageRoot, "modules");
+    const templatesPath = path.join(packageRoot, "templates");
+    const moduleBasePath = generatorType === "framework"
         ? path.join(templatesPath, generatorName)
         : path.join(modulesPath, generatorType, generatorName);
-    const sourcePath = path.join(moduleBasePath, 'files', sourceRel);
+    const sourcePath = path.join(moduleBasePath, "files", sourceRel);
     try {
         return sourcePath;
     }

package/dist/lib/utils/package-root.js

@@ -37,9 +37,9 @@ exports.getPackageRoot = getPackageRoot;
 const path = __importStar(require("path"));
 function getPackageRoot() {
     try {
-        return path.dirname(require.resolve('stackkit/package.json'));
+        return path.dirname(require.resolve("stackkit/package.json"));
     }
     catch {
-        return path.resolve(__dirname, '..', '..', '..');
+        return path.resolve(__dirname, "..", "..", "..");
     }
 }

package/modules/auth/authjs/generator.json

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

package/modules/auth/better-auth/files/lib/auth.ts

@@ -1,24 +1,32 @@
 import { betterAuth } from "better-auth";
 import { sendEmail } from "./email/email-service";
 import { getVerificationEmailTemplate, getPasswordResetEmailTemplate } from "./email/email-templates";
-{{#if database == 'prisma'}}
+{{#switch database}}
+{{#case prisma}}
 import { prisma } from "{{framework == 'nextjs' ? '@/lib' : '.'}}/prisma";
 import { prismaAdapter } from "better-auth/adapters/prisma";
-{{/if}}
-{{#if database == 'mongoose'}}
-import { mongoClient, db } from "{{framework == 'nextjs' ? '@/lib' : '.'}}/db";
+{{/case}}
+{{#case mongoose}}
+import { mongoose } from "{{framework == 'nextjs' ? '@/lib' : '.'}}/mongoose";
 import { mongodbAdapter } from "better-auth/adapters/mongodb";
-{{/if}}
+{{/case}}
+{{/switch}}
 
-export const auth = betterAuth({
-{{#if database == 'prisma'}}
+export async function initAuth() {
+return betterAuth({
+{{#switch database}}
+{{#case prisma}}
   database: prismaAdapter(prisma, {
-      provider: "{{prismaProvider}}",
+    provider: "{{prismaProvider}}",
   }),
-{{/if}}
-{{#if database == 'mongoose'}}
-  database: mongodbAdapter(db),
-{{/if}}
+{{/case}}
+{{#case mongoose}}
+  const mongooseInstance = await mongoose();
+  const client = mongooseInstance.connection.getClient();
+  const db = client.db();
+  database: mongodbAdapter(db, { client }),
+{{/case}}
+{{/switch}}
   user: {
     additionalFields: {
       role: {
@@ -31,6 +39,15 @@ export const auth = betterAuth({
   emailAndPassword: {
     enabled: true,
     requireEmailVerification: true,
+    sendResetPassword: async ({ user, url }) => {
+    const { html, text } = getPasswordResetEmailTemplate(user, url);
+      await sendEmail({
+        to: user.email,
+        subject: "Reset Your Password",
+        text,
+        html,
+      });
+    },
   },
   socialProviders: {
     google: {
@@ -50,22 +67,9 @@ export const auth = betterAuth({
     },
     sendOnSignIn: true,
   },
-  password: {
-    reset: {
-      sendResetEmail: async ({ user, url }) => {
-        const { html, text } = getPasswordResetEmailTemplate(user, url);
-        await sendEmail({
-          to: user.email,
-          subject: "Reset Your Password",
-          text,
-          html,
-        });
-      },
-    },
-  },
   rateLimit: {
-    window: 10, // 10 seconds
-    max: 100, // max requests per window
+    window: 10,
+    max: 100,
   },
   account: {
     accountLinking: {
@@ -77,7 +81,10 @@ export const auth = betterAuth({
     cookieCache: {
       enabled: true,
     },
-    expiresIn: 60 * 60 * 24 * 7, // 7 days
-    updateAge: 60 * 60 * 24, // 1 day
+    expiresIn: 60 * 60 * 24 * 7,
+    updateAge: 60 * 60 * 24,
   }
-});
+ })
+};
+
+export const auth = await initAuth();

package/modules/auth/better-auth/files/prisma/schema.prisma

@@ -1,4 +1,4 @@
-{{#var defaultId = {{#if prismaProvider == postgresql}}@default(cuid()){{/if}}{{#if prismaProvider == mysql}}@default(uuid()){{/if}}{{#if prismaProvider == sqlite}}@default(uuid()){{/if}}}}
+{{#var defaultId = {{#if prismaProvider == mongodb}}@default(auto()) @map("_id") @db.ObjectId{{else}}@default(cuid()){{/if}}}}
 model User {
     id            String    @id {{defaultId}}
     name          String
@@ -23,7 +23,7 @@ model Session {
     updatedAt DateTime @updatedAt
     ipAddress String?
     userAgent String?
-    userId    String
+    userId    String   {{#if prismaProvider == mongodb}} @db.ObjectId{{/if}}
     user      User     @relation(fields: [userId], references: [id], onDelete: Cascade)
 
     @@index([userId])
@@ -34,7 +34,7 @@ model Account {
     id                    String    @id {{defaultId}}
     accountId             String
     providerId            String
-    userId                String
+    userId                String    {{#if prismaProvider == mongodb}} @db.ObjectId{{/if}}
     user                  User      @relation(fields: [userId], references: [id], onDelete: Cascade)
     accessToken           String?
     refreshToken          String?

package/modules/auth/better-auth/generator.json

@@ -33,12 +33,6 @@
       "destination": "lib/auth-client.ts",
       "condition": { "framework": ["nextjs", "react"] }
     },
-    {
-      "type": "create-file",
-      "destination": "proxy.ts",
-      "condition": { "framework": "nextjs" },
-      "content": "import { auth } from \"@/lib/auth\";\n\nexport default auth((req) => {\n  console.log('middleware', req.auth)\n})\n\nexport const config = {\n  matcher: ['/((?!api|_next/static|_next/image|favicon.ico).*)'],\n}"
-    },
     {
       "type": "patch-file",
       "destination": "prisma/schema.prisma",
@@ -50,6 +44,39 @@
         }
       ]
     },
+    {
+      "type": "patch-file",
+      "destination": "src/server.ts",
+      "condition": { "framework": "express" },
+      "operations": [
+        {
+          "type": "add-import",
+          "imports": ["import { initAuth } from \"@/lib/auth\";"]
+        },
+        {
+          "type": "add-code",
+          "before": "const port = env.port;",
+          "code": "await initAuth();"
+        }
+      ]
+    },
+    {
+      "type": "patch-file",
+      "destination": "src/app.ts",
+      "condition": { "framework": "express" },
+      "operations": [
+        {
+          "type": "add-import",
+          "imports": ["import { auth } from \"@/lib/auth\";",
+          "import { toNodeHandler } from \"better-auth/node\";"]
+        },
+        {
+          "type": "add-code",
+          "after": "// routes",
+          "code": "app.all(\"/api/auth/*splat\", toNodeHandler(auth));"
+        }
+      ]
+    },
     {
       "type": "add-dependency",
       "condition": { "framework": ["nextjs", "express"] },
@@ -59,20 +86,23 @@
       "devDependencies": {
         "@types/nodemailer": "^7.0.5"
       }
+    },
+    {
+      "type": "add-env",
+      "envVars": {
+        "BETTER_AUTH_SECRET": "",
+        "BETTER_AUTH_URL": "http://localhost:3000",
+        "EMAIL_HOST": "smtp.gmail.com",
+        "EMAIL_PORT": "587",
+        "EMAIL_USER": "",
+        "EMAIL_PASS": "",
+        "EMAIL_FROM": "noreply@yourapp.com"
+      }
     }
   ],
   "dependencies": {
     "better-auth": "^1.4.12"
   },
   "devDependencies": {},
-  "scripts": {},
-  "envVars": {
-    "BETTER_AUTH_SECRET": "",
-    "BETTER_AUTH_URL": "http://localhost:3000",
-    "EMAIL_HOST": "smtp.gmail.com",
-    "EMAIL_PORT": "587",
-    "EMAIL_USER": "",
-    "EMAIL_PASS": "",
-    "EMAIL_FROM": "noreply@yourapp.com"
-  }
+  "scripts": {}
 }

package/modules/database/mongoose/generator.json

@@ -12,13 +12,32 @@
       "type": "create-file",
       "source": "models/health.ts",
       "destination": "models/health.ts"
+    },
+    {
+      "type": "patch-file",
+      "destination": "src/server.ts",
+      "condition": { "framework": "express" },
+      "operations": [
+        {
+          "type": "add-import",
+          "imports": ["import { mongoose } from \"@/lib/mongoose\";"]
+        },
+        {
+          "type": "add-code",
+          "after": "async function startServer() {",
+          "code": "await mongoose();"
+        }
+      ]
+    },
+    {
+      "type": "add-env",
+      "envVars": {
+        "MONGODB_URI": "mongodb://localhost:27017/database_name"
+      }
     }
   ],
   "dependencies": {
     "mongoose": "^8.8.0"
   },
-  "devDependencies": {},
-  "envVars": {
-    "MONGODB_URI": "mongodb://localhost:27017/database_name"
-  }
+  "devDependencies": {}
 }

package/modules/database/prisma/files/lib/prisma.ts

@@ -1,27 +1,28 @@
-import 'dotenv/config'
+import 'dotenv/config';
 import { PrismaClient } from './generated/prisma/client'
 
 const globalForPrisma = globalThis as unknown as {
   prisma: PrismaClient | undefined
 }
 
-{{#if prismaProvider == "postgresql"}}
-import { PrismaPg } from "@prisma/adapter-pg";
+{{#switch prismaProvider}}
+{{#case postgresql}}
+import { PrismaPg } from '@prisma/adapter-pg'
 
-const adapter = new PrismaPg({
-  connectionString: process.env.DATABASE_URL!,
-});
+const connectionString = `${process.env.DATABASE_URL}`
 
-export const prisma = globalForPrisma.prisma ?? new PrismaClient({
-  adapter,
-});
-{{/if}}
+const adapter = new PrismaPg({ connectionString })
+const prisma = new PrismaClient({ adapter })
+
+export { prisma }
+{{/case}}
+{{#case mongodb}}
 
-{{#if prismaProvider == "mongodb"}}
-export const prisma = globalForPrisma.prisma ?? new PrismaClient();
-{{/if}}
+const prisma = new PrismaClient()
 
-{{#if prismaProvider == "mysql"}}
+export { prisma }
+{{/case}}
+{{#case mysql}}
 import { PrismaMariaDb } from '@prisma/adapter-mariadb';
 
 const adapter = new PrismaMariaDb({
@@ -31,16 +32,20 @@ const adapter = new PrismaMariaDb({
   database: process.env.DATABASE_NAME,
   connectionLimit: 5
 });
+const prisma = new PrismaClient({ adapter });
 
-export const prisma = globalForPrisma.prisma ?? new PrismaClient({ adapter });
-{{/if}}
-
-{{#if prismaProvider == "sqlite"}}
+export { prisma }
+{{/case}}
+{{#case sqlite}}
 import { PrismaBetterSqlite3 } from "@prisma/adapter-better-sqlite3";
 
-const adapter = new PrismaBetterSqlite3({ url: process.env.DATABASE_URL });
+const connectionString = `${process.env.DATABASE_URL}`;
+
+const adapter = new PrismaBetterSqlite3({ url: connectionString });
+const prisma = new PrismaClient({ adapter });
 
-export const prisma = globalForPrisma.prisma ?? new PrismaClient({ adapter });
-{{/if}}
+export { prisma };
+{{/case}}
+{{/switch}}
 
 if (process.env.NODE_ENV !== 'production') globalForPrisma.prisma = prisma

package/modules/database/prisma/files/prisma.config.ts

@@ -1,12 +1,29 @@
 import "dotenv/config";
+{{#switch prismaProvider}}
+{{#case mongodb}}
+import { defineConfig, env } from "prisma/config";
+{{/case}}
+{{#case default}}
 import { defineConfig } from "prisma/config";
+{{/case}}
+{{/switch}}
 
 export default defineConfig({
   schema: "prisma/schema.prisma",
   migrations: {
     path: "prisma/migrations",
   },
+  {{#switch prismaProvider}}
+  {{#case mongodb}}
+  engine: "classic",
+  datasource: {
+    url: env('DATABASE_URL'),
+  },
+  {{/case}}
+  {{#case default}}
   datasource: {
     url: process.env["DATABASE_URL"],
   },
+  {{/case}}
+  {{/switch}}
 });

package/modules/database/prisma/generator.json

@@ -22,47 +22,86 @@
       "type": "add-dependency",
       "condition": { "prismaProvider": "postgresql" },
       "dependencies": {
-        "@prisma/adapter-pg": "^5.0.0",
+        "@prisma/adapter-pg": "^7.0.0",
+        "@prisma/client": "^7.2.0",
         "pg": "^8.0.0"
+      },
+      "devDependencies": {
+        "prisma": "^7.2.0"
       }
     },
     {
       "type": "add-dependency",
       "condition": { "prismaProvider": "mysql" },
       "dependencies": {
-        "@prisma/adapter-mariadb": "^5.0.0",
+        "@prisma/adapter-mariadb": "^7.0.0",
+        "@prisma/client": "^7.2.0",
         "mysql2": "^3.0.0"
+      },
+      "devDependencies": {
+        "prisma": "^7.2.0"
       }
     },
     {
       "type": "add-dependency",
       "condition": { "prismaProvider": "sqlite" },
       "dependencies": {
-        "@prisma/adapter-better-sqlite3": "^5.0.0",
+        "@prisma/adapter-better-sqlite3": "^7.0.0",
+        "@prisma/client": "^7.2.0",
         "better-sqlite3": "^9.0.0"
+      },
+      "devDependencies": {
+        "prisma": "^7.2.0"
       }
     },
     {
       "type": "add-dependency",
       "condition": { "prismaProvider": "mongodb" },
-      "dependencies": {}
+      "dependencies": {
+        "@prisma/client": "^6.19.0"
+      },
+      "devDependencies": {
+        "prisma": "^6.19.0"
+      }
+    },
+    {
+      "type": "add-env",
+      "condition": { "prismaProvider": "postgresql" },
+      "envVars": {
+        "DATABASE_URL": "postgresql://username:password@localhost:5432/database_name"
+      }
+    },
+    {
+      "type": "add-env",
+      "condition": { "prismaProvider": "mysql" },
+      "envVars": {
+        "DATABASE_URL": "mysql://username:password@localhost:3306/database_name"
+      }
+    },
+    {
+      "type": "add-env",
+      "condition": { "prismaProvider": "sqlite" },
+      "envVars": {
+        "DATABASE_URL": "file:./dev.db"
+      }
+    },
+    {
+      "type": "add-env",
+      "condition": { "prismaProvider": "mongodb" },
+      "envVars": {
+        "DATABASE_URL": "mongodb://localhost:27017/database_name"
+      }
     }
   ],
   "dependencies": {
-    "@prisma/client": "^7.2.0",
     "dotenv": "^17.2.3"
   },
-  "devDependencies": {
-    "prisma": "^7.2.0"
-  },
+  "devDependencies": {},
   "scripts": {
     "db:generate": "npx prisma generate",
     "db:push": "npx prisma db push",
     "db:seed": "tsx prisma/seed.ts",
     "db:migrate": "npx prisma migrate dev",
     "db:studio": "npx prisma studio"
-  },
-  "envVars": {
-    "DATABASE_URL": "postgresql://username:password@localhost:5432/database_name"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stackkit",
-  "version": "0.1.4",
+  "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": [

package/templates/express/src/server.ts

@@ -1,8 +1,14 @@
 import app from "./app";
 import { env } from "./config/env";
 
-const port = env.port;
+async function startServer() {
+  const port = env.port;
+  app.listen(port, () => {
+    console.log(`Server is running on http://localhost:${port}`);
+  });
+}
 
-app.listen(port, () => {
-  console.log(`Server is running on http://localhost:${port}`);
+startServer().catch((err) => {
+  console.error("Failed to start server:", err);
+  process.exit(1);
 });

package/templates/express/tsconfig.json

@@ -4,6 +4,6 @@
     "moduleResolution": "node",
     "target": "ES2023",
     "strict": true,
-    "esModuleInterop": true,
+    "esModuleInterop": true
   }
-}
+}

package/templates/nextjs/lib/env.ts

@@ -5,4 +5,4 @@ export const env = {
 
   isDev: process.env.NODE_ENV === "development",
   isProd: process.env.NODE_ENV === "production",
-} as const;
+} as const;