@beignet/cli 0.0.50 → 0.0.52

package/src/templates/db/postgres.ts

@@ -15,7 +15,7 @@
 // lives outside the app schema, so `db generate` never diffs against it.
 //
 // The Better Auth tables were generated with
-// `bunx @better-auth/cli generate` against a scratch app configured with
+// `bunx auth generate` against a scratch app configured with
 // drizzleAdapter(db, { provider: "pg" }), then normalized to the starter's
 // conventions (tabs, no relations, no extra indexes, no column defaults).
 
@@ -51,7 +51,7 @@ export function closeDatabaseClient(): Promise<void> {
 	return closePromise;
 }
 `,
-    dbSchema: `import { boolean, index, pgTable, text, timestamp } from "drizzle-orm/pg-core";
+    dbSchema: `import { boolean, index, pgTable, text, timestamp, uniqueIndex } from "drizzle-orm/pg-core";
 
 export const user = pgTable("user", {
 	id: text("id").primaryKey(),
@@ -76,23 +76,33 @@ export const session = pgTable("session", {
 		.references(() => user.id, { onDelete: "cascade" }),
 });
 
-export const account = pgTable("account", {
-	id: text("id").primaryKey(),
-	accountId: text("account_id").notNull(),
-	providerId: text("provider_id").notNull(),
-	userId: text("user_id")
-		.notNull()
-		.references(() => user.id, { onDelete: "cascade" }),
-	accessToken: text("access_token"),
-	refreshToken: text("refresh_token"),
-	idToken: text("id_token"),
-	accessTokenExpiresAt: timestamp("access_token_expires_at"),
-	refreshTokenExpiresAt: timestamp("refresh_token_expires_at"),
-	scope: text("scope"),
-	password: text("password"),
-	createdAt: timestamp("created_at").notNull(),
-	updatedAt: timestamp("updated_at").notNull(),
-});
+export const account = pgTable(
+	"account",
+	{
+		id: text("id").primaryKey(),
+		issuer: text("issuer").notNull(),
+		accountId: text("account_id").notNull(),
+		providerId: text("provider_id").notNull(),
+		userId: text("user_id")
+			.notNull()
+			.references(() => user.id, { onDelete: "cascade" }),
+		accessToken: text("access_token"),
+		refreshToken: text("refresh_token"),
+		idToken: text("id_token"),
+		accessTokenExpiresAt: timestamp("access_token_expires_at"),
+		refreshTokenExpiresAt: timestamp("refresh_token_expires_at"),
+		scope: text("scope"),
+		password: text("password"),
+		createdAt: timestamp("created_at").notNull(),
+		updatedAt: timestamp("updated_at").notNull(),
+	},
+	(table) => [
+		uniqueIndex("account_issuer_accountId_uidx").on(
+			table.issuer,
+			table.accountId,
+		),
+	],
+);
 
 export const verification = pgTable("verification", {
 	id: text("id").primaryKey(),
@@ -413,6 +423,7 @@ const postgresStarterMigration = {
   // above, with the provider idempotency setup statements appended.
   starterMigrationSql: `CREATE TABLE "account" (
 	"id" text PRIMARY KEY NOT NULL,
+	"issuer" text NOT NULL,
 	"account_id" text NOT NULL,
 	"provider_id" text NOT NULL,
 	"user_id" text NOT NULL,
@@ -470,6 +481,7 @@ CREATE TABLE "verification" (
 ALTER TABLE "account" ADD CONSTRAINT "account_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
 ALTER TABLE "session" ADD CONSTRAINT "session_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
 ALTER TABLE "todos" ADD CONSTRAINT "todos_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+CREATE UNIQUE INDEX "account_issuer_accountId_uidx" ON "account" USING btree ("issuer","account_id");--> statement-breakpoint
 CREATE INDEX "todos_user_idx" ON "todos" USING btree ("user_id","created_at");
 --> statement-breakpoint
 CREATE TABLE IF NOT EXISTS "idempotency_records" (
@@ -517,6 +529,12 @@ CREATE INDEX IF NOT EXISTS "idempotency_records_expires_idx" ON "idempotency_rec
           "primaryKey": true,
           "notNull": true
         },
+        "issuer": {
+          "name": "issuer",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
         "account_id": {
           "name": "account_id",
           "type": "text",
@@ -590,7 +608,29 @@ CREATE INDEX IF NOT EXISTS "idempotency_records_expires_idx" ON "idempotency_rec
           "notNull": true
         }
       },
-      "indexes": {},
+      "indexes": {
+        "account_issuer_accountId_uidx": {
+          "name": "account_issuer_accountId_uidx",
+          "columns": [
+            {
+              "expression": "issuer",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "account_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
       "foreignKeys": {
         "account_user_id_user_id_fk": {
           "name": "account_user_id_user_id_fk",

package/src/templates/db/sqlite.ts

@@ -42,7 +42,7 @@ export function closeDatabaseClient(): Promise<void> {
 	return closePromise;
 }
 `,
-  dbSchema: `import { index, integer, sqliteTable, text } from "drizzle-orm/sqlite-core";
+  dbSchema: `import { index, integer, sqliteTable, text, uniqueIndex } from "drizzle-orm/sqlite-core";
 
 export const user = sqliteTable("user", {
 	id: text("id").primaryKey(),
@@ -69,27 +69,37 @@ export const session = sqliteTable("session", {
 		.references(() => user.id, { onDelete: "cascade" }),
 });
 
-export const account = sqliteTable("account", {
-	id: text("id").primaryKey(),
-	accountId: text("account_id").notNull(),
-	providerId: text("provider_id").notNull(),
-	userId: text("user_id")
-		.notNull()
-		.references(() => user.id, { onDelete: "cascade" }),
-	accessToken: text("access_token"),
-	refreshToken: text("refresh_token"),
-	idToken: text("id_token"),
-	accessTokenExpiresAt: integer("access_token_expires_at", {
-		mode: "timestamp",
-	}),
-	refreshTokenExpiresAt: integer("refresh_token_expires_at", {
-		mode: "timestamp",
-	}),
-	scope: text("scope"),
-	password: text("password"),
-	createdAt: integer("created_at", { mode: "timestamp" }).notNull(),
-	updatedAt: integer("updated_at", { mode: "timestamp" }).notNull(),
-});
+export const account = sqliteTable(
+	"account",
+	{
+		id: text("id").primaryKey(),
+		issuer: text("issuer").notNull(),
+		accountId: text("account_id").notNull(),
+		providerId: text("provider_id").notNull(),
+		userId: text("user_id")
+			.notNull()
+			.references(() => user.id, { onDelete: "cascade" }),
+		accessToken: text("access_token"),
+		refreshToken: text("refresh_token"),
+		idToken: text("id_token"),
+		accessTokenExpiresAt: integer("access_token_expires_at", {
+			mode: "timestamp",
+		}),
+		refreshTokenExpiresAt: integer("refresh_token_expires_at", {
+			mode: "timestamp",
+		}),
+		scope: text("scope"),
+		password: text("password"),
+		createdAt: integer("created_at", { mode: "timestamp" }).notNull(),
+		updatedAt: integer("updated_at", { mode: "timestamp" }).notNull(),
+	},
+	(table) => [
+		uniqueIndex("account_issuer_accountId_uidx").on(
+			table.issuer,
+			table.accountId,
+		),
+	],
+);
 
 export const verification = sqliteTable("verification", {
 	id: text("id").primaryKey(),
@@ -452,6 +462,7 @@ export async function createTestDatabase(): Promise<TestDatabase> {
   // above, with the provider idempotency setup statements appended.
   starterMigrationSql: `CREATE TABLE \`account\` (
 	\`id\` text PRIMARY KEY NOT NULL,
+	\`issuer\` text NOT NULL,
 	\`account_id\` text NOT NULL,
 	\`provider_id\` text NOT NULL,
 	\`user_id\` text NOT NULL,
@@ -467,6 +478,7 @@ export async function createTestDatabase(): Promise<TestDatabase> {
 	FOREIGN KEY (\`user_id\`) REFERENCES \`user\`(\`id\`) ON UPDATE no action ON DELETE cascade
 );
 --> statement-breakpoint
+CREATE UNIQUE INDEX \`account_issuer_accountId_uidx\` ON \`account\` (\`issuer\`,\`account_id\`);--> statement-breakpoint
 CREATE TABLE \`session\` (
 	\`id\` text PRIMARY KEY NOT NULL,
 	\`expires_at\` integer NOT NULL,
@@ -555,6 +567,13 @@ CREATE INDEX IF NOT EXISTS "idempotency_records_expires_idx" ON "idempotency_rec
           "notNull": true,
           "autoincrement": false
         },
+        "issuer": {
+          "name": "issuer",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
         "account_id": {
           "name": "account_id",
           "type": "text",
@@ -640,7 +659,16 @@ CREATE INDEX IF NOT EXISTS "idempotency_records_expires_idx" ON "idempotency_rec
           "autoincrement": false
         }
       },
-      "indexes": {},
+      "indexes": {
+        "account_issuer_accountId_uidx": {
+          "name": "account_issuer_accountId_uidx",
+          "columns": [
+            "issuer",
+            "account_id"
+          ],
+          "isUnique": true
+        }
+      },
       "foreignKeys": {
         "account_user_id_user_id_fk": {
           "name": "account_user_id_user_id_fk",

package/src/templates/shadcn.ts

@@ -561,7 +561,7 @@ export const shadcnDependencies: Record<string, string> = {
   clsx: "^2.1.1",
   "lucide-react": "^1.16.0",
   "radix-ui": "^1.4.3",
-  shadcn: "^4.7.0",
+  shadcn: "^4.19.0",
   "tailwind-merge": "^3.6.0",
   "tw-animate-css": "^1.4.0",
 };

package/src/templates/shared.ts

@@ -32,7 +32,7 @@ export type TemplateContext = {
 
 export const externalVersions = {
   biome: "^2.4.14",
-  next: "^16.2.10",
+  next: "^16.3.2",
   react: "^19.2.5",
   reactDom: "^19.2.5",
   tsx: "^4.22.4",
@@ -44,13 +44,13 @@ export const externalVersions = {
   tanstackReactQuery: "^5.100.7",
   hookformResolvers: "^5.0.0",
   reactHookForm: "^7.74.0",
-  betterAuth: "1.6.25",
+  betterAuth: "1.7.1",
   bullmq: "^5.0.0",
   drizzleKit: "^0.31.10",
   drizzleOrm: "^0.45.2",
-  inngest: "^4.12.1",
+  inngest: "^4.18.1",
   libsqlClient: "^0.14.0",
-  vercelBlob: "^2.5.0",
+  vercelBlob: "^2.8.0",
   mysql2: "^3.12.0",
   pg: "^8.13.0",
   pglite: "^0.5.2",

package/src/templates/testing.ts

@@ -1,3 +1,9 @@
+import {
+  appTestFilePattern,
+  configuredTestDirectoryPathKeys,
+  configuredTestFilePathKeys,
+  defaultAppTestRoots,
+} from "../test-discovery.js";
 import type { TemplateFile } from "./shared.js";
 
 export const testHelperTemplateFile: TemplateFile = {
@@ -408,16 +414,9 @@ import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 
-const defaultTestRoots = [
-  "app",
-  "features",
-  "infra",
-  "lib",
-  "ports",
-  "server",
-  "tests",
-  "src/tests",
-];
+const defaultTestRoots = ${JSON.stringify(defaultAppTestRoots, null, 2)};
+const configuredTestDirectoryPathKeys = ${JSON.stringify(configuredTestDirectoryPathKeys)};
+const configuredTestFilePathKeys = ${JSON.stringify(configuredTestFilePathKeys)};
 const ignoredDirectories = new Set([
   ".beignet-local",
   ".git",
@@ -427,7 +426,7 @@ const ignoredDirectories = new Set([
   "dist",
   "node_modules",
 ]);
-const testFilePattern = /\\.(test|spec)\\.[cm]?[tj]sx?$/;
+const testFilePattern = /${appTestFilePattern.source}/;
 
 const configFileNames = [
   "beignet.config.ts",
@@ -532,14 +531,8 @@ async function configuredRoots(cwd: string): Promise<string[]> {
   }
   const paths = isObjectRecord(config.paths) ? config.paths : {};
   return [
-    paths.tests,
-    paths.features,
-    parentPath(paths.routes),
-    parentPath(paths.server),
-    parentPath(paths.portWiring),
-    parentPath(paths.ports),
-    parentPath(paths.useCaseBuilder),
-    parentPath(paths.routesBuilder),
+    ...configuredTestDirectoryPathKeys.map((key) => paths[key]),
+    ...configuredTestFilePathKeys.map((key) => parentPath(paths[key])),
   ].filter((root): root is string => Boolean(root) && root !== ".");
 }
 

package/src/test-discovery.ts

@@ -0,0 +1,53 @@
+import path from "node:path";
+import { type BeignetPaths, directoryPath } from "./config.js";
+
+export const defaultAppTestRoots = [
+  "app",
+  "features",
+  "infra",
+  "lib",
+  "ports",
+  "server",
+  "tests",
+  "src/tests",
+] as const;
+
+export const configuredTestDirectoryPathKeys = [
+  "tests",
+  "features",
+] as const satisfies readonly (keyof BeignetPaths)[];
+
+export const configuredTestFilePathKeys = [
+  "routes",
+  "server",
+  "portWiring",
+  "ports",
+  "useCaseBuilder",
+  "routesBuilder",
+] as const satisfies readonly (keyof BeignetPaths)[];
+
+export const appTestFilePattern = /\.(test|spec)\.[cm]?[jt]sx?$/;
+
+export function appTestRoots(paths: BeignetPaths): string[] {
+  const roots = [
+    ...defaultAppTestRoots,
+    ...configuredTestDirectoryPathKeys.map((key) => paths[key]),
+    ...configuredTestFilePathKeys.map((key) =>
+      directoryPath(path.posix.dirname(paths[key])),
+    ),
+  ];
+  return Array.from(
+    new Set(roots.map(directoryPath).filter((root) => root && root !== ".")),
+  );
+}
+
+export function isAppTestFile(file: string): boolean {
+  return appTestFilePattern.test(file);
+}
+
+export function isWithinAppTestRoots(
+  file: string,
+  roots: readonly string[],
+): boolean {
+  return roots.some((root) => file.startsWith(`${root}/`));
+}