create-better-t-stack 3.9.0 → 3.11.0-pr749.0

package/src/utils/template-processor.ts

@@ -0,0 +1,64 @@
+import path from "node:path";
+import consola from "consola";
+import fs from "fs-extra";
+import handlebars from "handlebars";
+import type { ProjectConfig } from "../types";
+import { formatFile } from "./file-formatter";
+
+const BINARY_EXTENSIONS = new Set([".png", ".ico", ".svg"]);
+
+function isBinaryFile(filePath: string): boolean {
+  const ext = path.extname(filePath).toLowerCase();
+  return BINARY_EXTENSIONS.has(ext);
+}
+
+export async function processTemplate(srcPath: string, destPath: string, context: ProjectConfig) {
+  try {
+    await fs.ensureDir(path.dirname(destPath));
+
+    if (isBinaryFile(srcPath) && !srcPath.endsWith(".hbs")) {
+      await fs.copy(srcPath, destPath);
+      return;
+    }
+
+    let content: string;
+
+    if (srcPath.endsWith(".hbs")) {
+      const templateContent = await fs.readFile(srcPath, "utf-8");
+      const template = handlebars.compile(templateContent);
+      content = template(context);
+    } else {
+      content = await fs.readFile(srcPath, "utf-8");
+    }
+
+    try {
+      const formattedContent = await formatFile(destPath, content);
+      if (formattedContent) {
+        content = formattedContent;
+      }
+    } catch (formatError) {
+      consola.debug(`Failed to format ${destPath}:`, formatError);
+    }
+
+    await fs.writeFile(destPath, content);
+  } catch (error) {
+    consola.error(`Error processing template ${srcPath}:`, error);
+    throw new Error(`Failed to process template ${srcPath}`);
+  }
+}
+
+handlebars.registerHelper("eq", (a, b) => a === b);
+handlebars.registerHelper("ne", (a, b) => a !== b);
+handlebars.registerHelper("and", (...args) => {
+  const values = args.slice(0, -1);
+  return values.every((value) => value);
+});
+handlebars.registerHelper("or", (...args) => {
+  const values = args.slice(0, -1);
+  return values.some((value) => value);
+});
+
+handlebars.registerHelper(
+  "includes",
+  (array, value) => Array.isArray(array) && array.includes(value),
+);

package/src/utils/templates.ts

@@ -0,0 +1,94 @@
+import type { CreateInput, Template } from "../types";
+
+export const TEMPLATE_PRESETS: Record<Template, CreateInput | null> = {
+  mern: {
+    database: "mongodb",
+    orm: "mongoose",
+    backend: "express",
+    runtime: "node",
+    frontend: ["react-router"],
+    api: "orpc",
+    auth: "better-auth",
+    payments: "none",
+    addons: ["turborepo"],
+    examples: ["todo"],
+    dbSetup: "mongodb-atlas",
+    webDeploy: "none",
+    serverDeploy: "none",
+  },
+  pern: {
+    database: "postgres",
+    orm: "drizzle",
+    backend: "express",
+    runtime: "node",
+    frontend: ["tanstack-router"],
+    api: "trpc",
+    auth: "better-auth",
+    payments: "none",
+    addons: ["turborepo"],
+    examples: ["todo"],
+    dbSetup: "none",
+    webDeploy: "none",
+    serverDeploy: "none",
+  },
+  t3: {
+    database: "postgres",
+    orm: "prisma",
+    backend: "self",
+    runtime: "none",
+    frontend: ["next"],
+    api: "trpc",
+    auth: "better-auth",
+    payments: "none",
+    addons: ["biome", "turborepo"],
+    examples: ["none"],
+    dbSetup: "none",
+    webDeploy: "none",
+    serverDeploy: "none",
+  },
+  uniwind: {
+    database: "none",
+    orm: "none",
+    backend: "none",
+    runtime: "none",
+    frontend: ["native-uniwind"],
+    api: "none",
+    auth: "none",
+    payments: "none",
+    addons: ["none"],
+    examples: ["none"],
+    dbSetup: "none",
+    webDeploy: "none",
+    serverDeploy: "none",
+  },
+  none: null,
+};
+
+export function getTemplateConfig(template: Template) {
+  if (template === "none" || !template) {
+    return null;
+  }
+
+  const config = TEMPLATE_PRESETS[template];
+  if (!config) {
+    throw new Error(`Unknown template: ${template}`);
+  }
+
+  return config;
+}
+
+export function getTemplateDescription(template: Template) {
+  const descriptions: Record<Template, string> = {
+    mern: "MongoDB + Express + React + Node.js - Classic MERN stack",
+    pern: "PostgreSQL + Express + React + Node.js - Popular PERN stack",
+    t3: "T3 Stack - Next.js + tRPC + Prisma + PostgreSQL + Better Auth",
+    uniwind: "Expo + Uniwind native app with no backend services",
+    none: "No template - Full customization",
+  };
+
+  return descriptions[template] || "";
+}
+
+export function listAvailableTemplates() {
+  return Object.keys(TEMPLATE_PRESETS).filter((t) => t !== "none") as Template[];
+}

package/src/utils/ts-morph.ts

@@ -0,0 +1,26 @@
+import {
+  type ArrayLiteralExpression,
+  IndentationText,
+  type ObjectLiteralExpression,
+  Project,
+  QuoteKind,
+  SyntaxKind,
+} from "ts-morph";
+
+export const tsProject = new Project({
+  useInMemoryFileSystem: false,
+  skipAddingFilesFromTsConfig: true,
+  manipulationSettings: {
+    quoteKind: QuoteKind.Single,
+    indentationText: IndentationText.TwoSpaces,
+  },
+});
+
+export function ensureArrayProperty(obj: ObjectLiteralExpression, name: string) {
+  return (obj.getProperty(name)?.getFirstDescendantByKind(SyntaxKind.ArrayLiteralExpression) ??
+    obj
+      .addPropertyAssignment({ name, initializer: "[]" })
+      .getFirstDescendantByKindOrThrow(
+        SyntaxKind.ArrayLiteralExpression,
+      )) as ArrayLiteralExpression;
+}

package/src/validation.ts

@@ -0,0 +1,117 @@
+import type { CLIInput, ProjectConfig } from "./types";
+import { getProvidedFlags, processFlags, validateArrayOptions } from "./utils/config-processing";
+import { validateConfigForProgrammaticUse, validateFullConfig } from "./utils/config-validation";
+import { exitWithError } from "./utils/errors";
+import { extractAndValidateProjectName } from "./utils/project-name-validation";
+
+const CORE_STACK_FLAGS = new Set([
+  "database",
+  "orm",
+  "backend",
+  "runtime",
+  "frontend",
+  "addons",
+  "examples",
+  "auth",
+  "dbSetup",
+  "payments",
+  "api",
+  "webDeploy",
+  "serverDeploy",
+]);
+
+function validateYesFlagCombination(options: CLIInput, providedFlags: Set<string>) {
+  if (!options.yes) return;
+
+  if (options.template && options.template !== "none") {
+    return;
+  }
+
+  const coreStackFlagsProvided = Array.from(providedFlags).filter((flag) =>
+    CORE_STACK_FLAGS.has(flag),
+  );
+
+  if (coreStackFlagsProvided.length > 0) {
+    exitWithError(
+      `Cannot combine --yes with core stack configuration flags: ${coreStackFlagsProvided.map((f) => `--${f}`).join(", ")}. ` +
+        "The --yes flag uses default configuration. Remove these flags or use --yes without them.",
+    );
+  }
+}
+
+export function processAndValidateFlags(
+  options: CLIInput,
+  providedFlags: Set<string>,
+  projectName?: string,
+) {
+  if (options.yolo) {
+    const cfg = processFlags(options, projectName);
+    const validatedProjectName = extractAndValidateProjectName(
+      projectName,
+      options.projectDirectory,
+      true,
+    );
+    if (validatedProjectName) {
+      cfg.projectName = validatedProjectName;
+    }
+    return cfg;
+  }
+
+  validateYesFlagCombination(options, providedFlags);
+
+  try {
+    validateArrayOptions(options);
+  } catch (error) {
+    exitWithError(error instanceof Error ? error.message : String(error));
+  }
+
+  const config = processFlags(options, projectName);
+
+  const validatedProjectName = extractAndValidateProjectName(
+    projectName,
+    options.projectDirectory,
+    false,
+  );
+  if (validatedProjectName) {
+    config.projectName = validatedProjectName;
+  }
+
+  validateFullConfig(config, providedFlags, options);
+
+  return config;
+}
+
+export function processProvidedFlagsWithoutValidation(options: CLIInput, projectName?: string) {
+  if (!options.yolo) {
+    const providedFlags = getProvidedFlags(options);
+    validateYesFlagCombination(options, providedFlags);
+  }
+
+  const config = processFlags(options, projectName);
+
+  const validatedProjectName = extractAndValidateProjectName(
+    projectName,
+    options.projectDirectory,
+    true,
+  );
+  if (validatedProjectName) {
+    config.projectName = validatedProjectName;
+  }
+
+  return config;
+}
+
+export function validateConfigCompatibility(
+  config: Partial<ProjectConfig>,
+  providedFlags?: Set<string>,
+  options?: CLIInput,
+) {
+  if (options?.yolo) return;
+  if (options && providedFlags) {
+    validateFullConfig(config, providedFlags, options);
+  } else {
+    validateConfigForProgrammaticUse(config);
+  }
+}
+
+export { getProvidedFlags };

package/templates/auth/better-auth/convex/backend/convex/auth.config.ts.hbs

@@ -1,8 +1,6 @@
+import { getAuthConfigProvider } from "@convex-dev/better-auth/auth-config";
+import type { AuthConfig } from "convex/server";
+
 export default {
-    providers: [
-        {
-            domain: process.env.CONVEX_SITE_URL,
-            applicationID: "convex",
-        },
-    ],
-};
+  providers: [getAuthConfigProvider()],
+} satisfies AuthConfig;

package/templates/auth/better-auth/convex/backend/convex/auth.ts.hbs

@@ -2,19 +2,21 @@ import { createClient, type GenericCtx } from "@convex-dev/better-auth";
 {{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
 import { convex } from "@convex-dev/better-auth/plugins";
 import { expo } from "@better-auth/expo";
+{{else if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
+import { convex, crossDomain } from "@convex-dev/better-auth/plugins";
 {{else}}
 import { convex } from "@convex-dev/better-auth/plugins";
 {{/if}}
-{{#if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
-import { crossDomain } from "@convex-dev/better-auth/plugins";
-{{/if}}
 import { components } from "./_generated/api";
 import { DataModel } from "./_generated/dataModel";
 import { query } from "./_generated/server";
 import { betterAuth } from "better-auth";
 import { v } from "convex/values";
+import authConfig from "./auth.config";
 
-{{#if (or (includes frontend "tanstack-start") (includes frontend "next") (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
+{{#if (or (includes frontend "tanstack-start") (includes frontend "next"))}}
+const siteUrl = process.env.SITE_URL!;
+{{else if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
 const siteUrl = process.env.SITE_URL!;
 {{/if}}
 {{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
@@ -23,23 +25,19 @@ const nativeAppUrl = process.env.NATIVE_APP_URL || "mybettertapp://";
 
 export const authComponent = createClient<DataModel>(components.betterAuth);
 
-function createAuth(
-  ctx: GenericCtx<DataModel>,
-  { optionsOnly }: { optionsOnly?: boolean } = { optionsOnly: false }
-) {
+function createAuth(ctx: GenericCtx<DataModel>) {
   return betterAuth({
-    logger: {
-      disabled: optionsOnly,
-    },
     {{#if (and (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles")) (or (includes frontend "tanstack-start") (includes frontend "next")))}}
     baseURL: siteUrl,
     trustedOrigins: [siteUrl, nativeAppUrl],
+    {{else if (and (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles")) (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid")))}}
+    trustedOrigins: [siteUrl, nativeAppUrl],
     {{else if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
     trustedOrigins: [nativeAppUrl],
     {{else if (or (includes frontend "tanstack-start") (includes frontend "next"))}}
     baseURL: siteUrl,
     trustedOrigins: [siteUrl],
-    {{else}}
+    {{else if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
     trustedOrigins: [siteUrl],
     {{/if}}
     database: authComponent.adapter(ctx),
@@ -50,11 +48,13 @@ function createAuth(
     plugins: [
       {{#if (or (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
       expo(),
-      {{/if}}
-      {{#if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
+      {{else if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
       crossDomain({ siteUrl }),
       {{/if}}
-      convex(),
+      convex({
+        authConfig,
+        jwksRotateOnTokenGenerationError: true,
+      }),
     ],
   });
 }
@@ -64,7 +64,7 @@ export { createAuth };
 export const getCurrentUser = query({
   args: {},
   returns: v.any(),
-  handler: async function (ctx, args) {
+  handler: async function (ctx) {
     return authComponent.getAuthUser(ctx);
   },
-});
+});

package/templates/auth/better-auth/convex/backend/convex/http.ts.hbs

@@ -3,10 +3,10 @@ import { authComponent, createAuth } from "./auth";
 
 const http = httpRouter();
 
-{{#if (or (includes frontend "tanstack-start") (includes frontend "next") (includes frontend "native-bare") (includes frontend "native-uniwind") (includes frontend "native-unistyles"))}}
-authComponent.registerRoutes(http, createAuth);
-{{else}}
+{{#if (or (includes frontend "tanstack-router") (includes frontend "react-router") (includes frontend "nuxt") (includes frontend "svelte") (includes frontend "solid"))}}
 authComponent.registerRoutes(http, createAuth, { cors: true });
+{{else}}
+authComponent.registerRoutes(http, createAuth);
 {{/if}}
 
-export default http;
+export default http;

package/templates/auth/better-auth/convex/web/react/next/src/app/api/auth/[...all]/route.ts.hbs

@@ -1,3 +1,3 @@
-import { nextJsHandler } from "@convex-dev/better-auth/nextjs";
+import { handler } from "@/lib/auth-server";
 
-export const { GET, POST } = nextJsHandler();
+export const { GET, POST } = handler;

package/templates/auth/better-auth/convex/web/react/next/src/components/user-menu.tsx.hbs

@@ -1,6 +1,7 @@
 import {
 	DropdownMenu,
 	DropdownMenuContent,
+	DropdownMenuGroup,
 	DropdownMenuItem,
 	DropdownMenuLabel,
 	DropdownMenuSeparator,
@@ -18,17 +19,16 @@ export default function UserMenu() {
 
 	return (
 		<DropdownMenu>
-			<DropdownMenuTrigger asChild>
-				<Button variant="outline">{user?.name}</Button>
+			<DropdownMenuTrigger render={<Button variant="outline" />}>
+				{user?.name}
 			</DropdownMenuTrigger>
 			<DropdownMenuContent className="bg-card">
-				<DropdownMenuLabel>My Account</DropdownMenuLabel>
-				<DropdownMenuSeparator />
-				<DropdownMenuItem>{user?.email}</DropdownMenuItem>
-				<DropdownMenuItem asChild>
-					<Button
+				<DropdownMenuGroup>
+					<DropdownMenuLabel>My Account</DropdownMenuLabel>
+					<DropdownMenuSeparator />
+					<DropdownMenuItem>{user?.email}</DropdownMenuItem>
+					<DropdownMenuItem
 						variant="destructive"
-						className="w-full"
 						onClick={() => {
 							authClient.signOut({
 								fetchOptions: {
@@ -40,8 +40,8 @@ export default function UserMenu() {
 						}}
 					>
 						Sign Out
-					</Button>
-				</DropdownMenuItem>
+					</DropdownMenuItem>
+				</DropdownMenuGroup>
 			</DropdownMenuContent>
 		</DropdownMenu>
 	);

package/templates/auth/better-auth/convex/web/react/next/src/lib/auth-server.ts.hbs

@@ -1,6 +1,14 @@
-import { createAuth } from "@{{projectName}}/backend/convex/auth";
-import { getToken as getTokenNextjs } from "@convex-dev/better-auth/nextjs";
+import { convexBetterAuthNextJs } from "@convex-dev/better-auth/nextjs";
 
-export const getToken = () => {
-    return getTokenNextjs(createAuth);
-};
+export const {
+  handler,
+  preloadAuthQuery,
+  isAuthenticated,
+  getToken,
+  fetchAuthQuery,
+  fetchAuthMutation,
+  fetchAuthAction,
+} = convexBetterAuthNextJs({
+  convexUrl: process.env.NEXT_PUBLIC_CONVEX_URL!,
+  convexSiteUrl: process.env.NEXT_PUBLIC_CONVEX_SITE_URL!,
+});

package/templates/auth/better-auth/convex/web/react/tanstack-router/src/components/user-menu.tsx.hbs

@@ -1,34 +1,36 @@
+import { useNavigate } from "@tanstack/react-router";
+
 import {
     DropdownMenu,
     DropdownMenuContent,
+    DropdownMenuGroup,
     DropdownMenuItem,
     DropdownMenuLabel,
     DropdownMenuSeparator,
     DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { authClient } from "@/lib/auth-client";
-import { useNavigate } from "@tanstack/react-router";
-import { Button } from "./ui/button";
 import { useQuery } from "convex/react";
 import { api } from "@{{projectName}}/backend/convex/_generated/api";
 
+import { Button } from "./ui/button";
+
 export default function UserMenu() {
     const navigate = useNavigate();
     const user = useQuery(api.auth.getCurrentUser)
 
     return (
         <DropdownMenu>
-            <DropdownMenuTrigger asChild>
-                <Button variant="outline">{user?.name}</Button>
+            <DropdownMenuTrigger render={<Button variant="outline" />}>
+                {user?.name}
             </DropdownMenuTrigger>
             <DropdownMenuContent className="bg-card">
-                <DropdownMenuLabel>My Account</DropdownMenuLabel>
-                <DropdownMenuSeparator />
-                <DropdownMenuItem>{user?.email}</DropdownMenuItem>
-                <DropdownMenuItem asChild>
-                    <Button
+                <DropdownMenuGroup>
+                    <DropdownMenuLabel>My Account</DropdownMenuLabel>
+                    <DropdownMenuSeparator />
+                    <DropdownMenuItem>{user?.email}</DropdownMenuItem>
+                    <DropdownMenuItem
                         variant="destructive"
-                        className="w-full"
                         onClick={() => {
                             authClient.signOut({
                                 fetchOptions: {
@@ -42,8 +44,8 @@ export default function UserMenu() {
                         }}
                     >
                         Sign Out
-                    </Button>
-                </DropdownMenuItem>
+                    </DropdownMenuItem>
+                </DropdownMenuGroup>
             </DropdownMenuContent>
         </DropdownMenu>
     );

package/templates/auth/better-auth/convex/web/react/tanstack-start/src/components/user-menu.tsx.hbs

@@ -1,49 +1,46 @@
 import {
     DropdownMenu,
     DropdownMenuContent,
+    DropdownMenuGroup,
     DropdownMenuItem,
     DropdownMenuLabel,
     DropdownMenuSeparator,
     DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { authClient } from "@/lib/auth-client";
-import { useNavigate } from "@tanstack/react-router";
-import { Button } from "./ui/button";
 import { useQuery } from "convex/react";
 import { api } from "@{{projectName}}/backend/convex/_generated/api";
 
+import { Button } from "./ui/button";
+
 export default function UserMenu() {
-    const navigate = useNavigate();
     const user = useQuery(api.auth.getCurrentUser)
 
     return (
         <DropdownMenu>
-            <DropdownMenuTrigger asChild>
-                <Button variant="outline">{user?.name}</Button>
+            <DropdownMenuTrigger render={<Button variant="outline" />}>
+                {user?.name}
             </DropdownMenuTrigger>
             <DropdownMenuContent className="bg-card">
-                <DropdownMenuLabel>My Account</DropdownMenuLabel>
-                <DropdownMenuSeparator />
-                <DropdownMenuItem>{user?.email}</DropdownMenuItem>
-                <DropdownMenuItem asChild>
-                    <Button
+                <DropdownMenuGroup>
+                    <DropdownMenuLabel>My Account</DropdownMenuLabel>
+                    <DropdownMenuSeparator />
+                    <DropdownMenuItem>{user?.email}</DropdownMenuItem>
+                    <DropdownMenuItem
                         variant="destructive"
-                        className="w-full"
                         onClick={() => {
                             authClient.signOut({
                                 fetchOptions: {
                                     onSuccess: () => {
-                                        navigate({
-                                            to: "/dashboard",
-                                        });
+                                        location.reload();
                                     },
                                 },
                             });
                         }}
                     >
                         Sign Out
-                    </Button>
-                </DropdownMenuItem>
+                    </DropdownMenuItem>
+                </DropdownMenuGroup>
             </DropdownMenuContent>
         </DropdownMenu>
     );

package/templates/auth/better-auth/convex/web/react/tanstack-start/src/lib/auth-server.ts.hbs

@@ -1,6 +1,12 @@
-import { createAuth } from "@{{projectName}}/backend/convex/auth";
-import { setupFetchClient } from "@convex-dev/better-auth/react-start";
-import { getCookie } from "@tanstack/react-start/server";
+import { convexBetterAuthReactStart } from "@convex-dev/better-auth/react-start";
 
-export const { fetchQuery, fetchMutation, fetchAction } =
-	await setupFetchClient(createAuth, getCookie);
+export const {
+  handler,
+  getToken,
+  fetchAuthQuery,
+  fetchAuthMutation,
+  fetchAuthAction,
+} = convexBetterAuthReactStart({
+  convexUrl: process.env.VITE_CONVEX_URL!,
+  convexSiteUrl: process.env.VITE_CONVEX_SITE_URL!,
+});

package/templates/auth/better-auth/convex/web/react/tanstack-start/src/routes/api/auth/$.ts.hbs

@@ -1,11 +1,11 @@
-import { reactStartHandler } from "@convex-dev/better-auth/react-start";
 import { createFileRoute } from "@tanstack/react-router";
+import { handler } from "@/lib/auth-server";
 
 export const Route = createFileRoute("/api/auth/$")({
   server: {
     handlers: {
-      GET: ({ request }) => reactStartHandler(request),
-      POST: ({ request }) => reactStartHandler(request),
+      GET: ({ request }) => handler(request),
+      POST: ({ request }) => handler(request),
     },
   },
-});
+});

package/templates/auth/better-auth/fullstack/tanstack-start/src/routes/api/auth/$.ts.hbs

@@ -12,4 +12,4 @@ export const Route = createFileRoute('/api/auth/$')({
       },
     },
   },
-})
+})