stackkit 0.1.6 → 0.1.7

package/dist/cli/add.js

@@ -49,10 +49,10 @@ async function getAddConfig(module, options, projectInfo) {
     if (module === "database" || module === "auth") {
         if (!options?.provider) {
             if (module === "database") {
-                throw new Error('Provider is required for database. Use: `npx stackkit add database --provider <provider>`');
+                throw new Error("Provider is required for database. Use: `npx stackkit add database --provider <provider>`");
             }
             else {
-                throw new Error('Provider is required for auth. Use: `npx stackkit add auth --provider <provider>`');
+                throw new Error("Provider is required for auth. Use: `npx stackkit add auth --provider <provider>`");
             }
         }
         if (module === "database") {

package/dist/cli/create.js

@@ -306,7 +306,8 @@ async function processGeneratorEnvVars(config, targetDir) {
             const generator = await fs_extra_1.default.readJson(dbGeneratorPath);
             if (generator.operations) {
                 for (const operation of generator.operations) {
-                    if (operation.type === "add-env" && (!operation.condition || checkCondition(operation.condition, config))) {
+                    if (operation.type === "add-env" &&
+                        (!operation.condition || checkCondition(operation.condition, config))) {
                         for (const [key, value] of Object.entries(operation.envVars)) {
                             envVars.push({
                                 key,
@@ -326,7 +327,8 @@ async function processGeneratorEnvVars(config, targetDir) {
             const generator = await fs_extra_1.default.readJson(authGeneratorPath);
             if (generator.operations) {
                 for (const operation of generator.operations) {
-                    if (operation.type === "add-env" && (!operation.condition || checkCondition(operation.condition, config))) {
+                    if (operation.type === "add-env" &&
+                        (!operation.condition || checkCondition(operation.condition, config))) {
                         for (const [key, value] of Object.entries(operation.envVars)) {
                             envVars.push({
                                 key,

package/dist/index.js

@@ -7,11 +7,14 @@ const add_1 = require("./cli/add");
 const doctor_1 = require("./cli/doctor");
 const list_1 = require("./cli/list");
 const logger_1 = require("./lib/ui/logger");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const packageJson = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(__dirname, "../package.json"), "utf-8"));
 const program = new commander_1.Command();
 program
     .name("stackkit")
     .description("CLI for creating and managing StackKit projects")
-    .version("0.1.6")
+    .version(packageJson.version)
     .configureHelp({
     subcommandTerm: (cmd) => {
         const name = cmd.name();

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

@@ -175,7 +175,7 @@ class AdvancedCodeGenerator {
                     conditionMet = typeof actualVal === "string" && actualVal.endsWith(cleanExpectedVal);
                     break;
             }
-            const contentToProcess = conditionMet ? blockContent : (elseContent || "");
+            const contentToProcess = conditionMet ? blockContent : elseContent || "";
             return this.processTemplateRecursive(contentToProcess, context)
                 .replace(/^\n+/, "")
                 .replace(/\n+$/, "");
@@ -185,7 +185,7 @@ class AdvancedCodeGenerator {
             const conditionParts = condition.split("==");
             if (conditionParts.length === 2) {
                 const [varName, expectedValue] = conditionParts.map((s) => s.trim().replace(/['"]/g, ""));
-                const contentToProcess = context[varName] === expectedValue ? blockContent : (elseContent || "");
+                const contentToProcess = context[varName] === expectedValue ? blockContent : elseContent || "";
                 return this.processTemplateRecursive(contentToProcess, context)
                     .replace(/^\n+/, "")
                     .replace(/\n+$/, "");
@@ -195,7 +195,7 @@ class AdvancedCodeGenerator {
                 const [arrayName, item] = conditionFunc[0].split("(");
                 const itemValue = item.replace(")", "").replace(/['"]/g, "");
                 const array = context[arrayName] || [];
-                const contentToProcess = Array.isArray(array) && array.includes(itemValue) ? blockContent : (elseContent || "");
+                const contentToProcess = Array.isArray(array) && array.includes(itemValue) ? blockContent : elseContent || "";
                 return this.processTemplateRecursive(contentToProcess, context)
                     .replace(/^\n+/, "")
                     .replace(/\n+$/, "");

package/modules/auth/authjs/files/api/auth/[...nextauth]/route.ts

@@ -1,6 +1,2 @@
-import NextAuth from "next-auth";
-import { authOptions } from "@/lib/auth";
-
-const handler = NextAuth(authOptions);
-
-export { handler as GET, handler as POST };
+import { handlers } from "@/auth"
+export const { GET, POST } = handlers

package/modules/auth/authjs/files/lib/auth.ts

@@ -1,36 +1,22 @@
-import { NextAuthOptions } from "next-auth";
-import { PrismaAdapter } from "@auth/prisma-adapter";
-import { prisma } from "@/lib/prisma";
-import GoogleProvider from "next-auth/providers/google";
+import NextAuth from "next-auth"
+import { PrismaAdapter } from "@auth/prisma-adapter"
+import prisma from "@/lib/prisma"
+import Google from "next-auth/providers/google"
+import { encode, decode } from 'next-auth/jwt';
 
-export const authOptions: NextAuthOptions = {
+export const { handlers, signIn, signOut, auth } = NextAuth({
   adapter: PrismaAdapter(prisma),
   providers: [
-    GoogleProvider({
-      clientId: process.env.GOOGLE_CLIENT_ID!,
-      clientSecret: process.env.GOOGLE_CLIENT_SECRET!,
+    Google({
+      clientId: process.env.AUTH_GOOGLE_ID,
+      clientSecret: process.env.AUTH_GOOGLE_SECRET,
     }),
   ],
-  session: {
-    strategy: "jwt",
-  },
-  callbacks: {
-    async jwt({ token, user }) {
-      if (user) {
-        token.id = user.id;
-      }
-      return token;
-    },
-    async session({ session, token }) {
-      if (token) {
-        session.user.id = token.id as string;
-      }
-      return session;
-    },
-  },
+  session: { strategy: "jwt" },
+  secret: process.env.AUTH_SECRET,
+  jwt: { encode, decode },
   pages: {
-    signIn: "/auth/signin",
-    signOut: "/auth/signout",
-    error: "/auth/error",
+    signIn: '/sign-in',
+    error: '/error',
   },
-};
+})

package/modules/auth/authjs/files/{schemas/prisma-schema.prisma → prisma/schema.prisma}

@@ -1,10 +1,10 @@
-
+{{#var defaultId = {{#if prismaProvider == "mongodb"}}@default(auto()) @map("_id") @db.ObjectId{{else}}@default(cuid()){{/if}}}}
 model Account {
-  id                String  @id {{idDefault}}
-  userId            String {{userIdType}}
+  id                String  @id {{defaultId}}
+  userId            String  @map("user_id")
   type              String
   provider          String
-  providerAccountId String
+  providerAccountId String  @map("provider_account_id")
   refresh_token     String? @db.Text
   access_token      String? @db.Text
   expires_at        Int?
@@ -16,30 +16,36 @@ model Account {
   user User @relation(fields: [userId], references: [id], onDelete: Cascade)
 
   @@unique([provider, providerAccountId])
+  @@map("accounts")
 }
 
 model Session {
-  id           String   @id {{idDefault}}
-  sessionToken String   @unique
-  userId       String {{userIdType}}
+  id           String   @id {{defaultId}}
+  sessionToken String   @unique @map("session_token")
+  userId       String   {{#if prismaProvider == "mongodb"}} @db.ObjectId{{/if}} @map("user_id")
   expires      DateTime
   user         User     @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  @@map("sessions")
 }
 
 model User {
-  id            String    @id {{idDefault}}
+  id            String    @id {{defaultId}}
   name          String?
-  email         String    @unique
-  emailVerified DateTime?
+  email         String?   @unique
+  emailVerified DateTime? @map("email_verified")
   image         String?
   accounts      Account[]
   sessions      Session[]
+
+  @@map("users")
 }
 
 model VerificationToken {
   identifier String
-  token      String   @unique
+  token      String
   expires    DateTime
 
   @@unique([identifier, token])
+  @@map("verification_tokens")
 }

package/modules/auth/authjs/generator.json

@@ -2,8 +2,53 @@
   "name": "authjs",
   "type": "auth",
   "priority": 10,
-  "operations": [],
-  "dependencies": {},
+  "operations": [
+    {
+      "type": "create-file",
+      "source": "lib/auth.ts",
+      "destination": "lib/auth.ts"
+    },
+    {
+      "type": "create-file",
+      "source": "api/auth/[...nextauth]/route.ts",
+      "destination": "app/api/auth/[...nextauth]/route.ts"
+    },
+    {
+      "type": "create-file",
+      "destination": "proxy.ts",
+      "content": "export { auth as middleware } from \"@/auth\""
+    },
+    {
+      "type": "patch-file",
+      "destination": "prisma/schema.prisma",
+      "condition": { "database": "prisma" },
+      "operations": [
+        {
+          "type": "add-to-bottom",
+          "source": "prisma/schema.prisma"
+        }
+      ]
+    },
+    {
+      "type": "add-dependency",
+      "condition": { "database": "prisma" },
+      "dependencies": {
+        "@auth/prisma-adapter": "^0.5.0"
+      },
+      "devDependencies": {}
+    },
+    {
+      "type": "add-env",
+      "envVars": {
+        "AUTH_SECRET": "",
+        "AUTH_GOOGLE_ID": "",
+        "AUTH_GOOGLE_SECRET": ""
+      }
+    }
+  ],
+  "dependencies": {
+    "next-auth": "^5.0.0-beta.30"
+  },
   "devDependencies": {},
   "scripts": {}
 }

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

@@ -1,4 +1,4 @@
-{{#var defaultId = {{#if prismaProvider == mongodb}}@default(auto()) @map("_id") @db.ObjectId{{else}}@default(cuid()){{/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   {{#if prismaProvider == mongodb}} @db.ObjectId{{/if}}
+    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    {{#if prismaProvider == mongodb}} @db.ObjectId{{/if}}
+    userId                String    {{#if prismaProvider == "mongodb"}} @db.ObjectId{{/if}}
     user                  User      @relation(fields: [userId], references: [id], onDelete: Cascade)
     accessToken           String?
     refreshToken          String?

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

@@ -6,7 +6,7 @@ const globalForPrisma = globalThis as unknown as {
 }
 
 {{#switch prismaProvider}}
-{{#case postgresql}}
+{{#case "postgresql"}}
 import { PrismaPg } from '@prisma/adapter-pg'
 
 const connectionString = `${process.env.DATABASE_URL}`
@@ -16,13 +16,13 @@ const prisma = new PrismaClient({ adapter })
 
 export { prisma }
 {{/case}}
-{{#case mongodb}}
+{{#case "mongodb"}}
 
 const prisma = new PrismaClient()
 
 export { prisma }
 {{/case}}
-{{#case mysql}}
+{{#case "mysql"}}
 import { PrismaMariaDb } from '@prisma/adapter-mariadb';
 
 const adapter = new PrismaMariaDb({
@@ -36,7 +36,7 @@ const prisma = new PrismaClient({ adapter });
 
 export { prisma }
 {{/case}}
-{{#case sqlite}}
+{{#case "sqlite"}}
 import { PrismaBetterSqlite3 } from "@prisma/adapter-better-sqlite3";
 
 const connectionString = `${process.env.DATABASE_URL}`;

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

@@ -1,6 +1,6 @@
 import "dotenv/config";
 {{#switch prismaProvider}}
-{{#case mongodb}}
+{{#case "mongodb"}}
 import { defineConfig, env } from "prisma/config";
 {{/case}}
 {{#case default}}
@@ -14,7 +14,7 @@ export default defineConfig({
     path: "prisma/migrations",
   },
   {{#switch prismaProvider}}
-  {{#case mongodb}}
+  {{#case "mongodb"}}
   engine: "classic",
   datasource: {
     url: env('DATABASE_URL'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stackkit",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Production-ready CLI to create and extend JavaScript or TypeScript apps with modular stacks.",
   "main": "dist/index.js",
   "bin": {

package/modules/auth/authjs/files/lib/auth-client.ts

@@ -1,11 +0,0 @@
-import { getServerSession } from "next-auth/next";
-import { authOptions } from "@/lib/auth";
-
-export async function getSession() {
-  return await getServerSession(authOptions);
-}
-
-export async function getCurrentUser() {
-  const session = await getSession();
-  return session?.user;
-}