create-m5kdev 0.33.0 → 0.34.0

package/templates/minimal-app/apps/server/{drizzle/seed.e2e.ts.tpl → db.e2e.ts.tpl}

@@ -1,18 +1,39 @@
 /**
  * E2E fixture seed — used only by the e2e package's prepare scripts, never by
  * generated apps (the CLI excludes this file). The user-facing demo seed lives
- * in ./seed.ts.
+ * in ./db.ts.
  */
+import { type RunDbSeedContext, runDb } from "@m5kdev/backend/db";
 import { hashPassword } from "better-auth/crypto";
 import { eq } from "drizzle-orm";
 import { v4 as uuidv4 } from "uuid";
-import { orm, schema } from "./db";
-import { ensureDevServerStopped } from "./guard";
+import * as schema from "./src/schema";
 
 const profile = process.env.AUTH_E2E_PROFILE ?? "standard";
 const ADMIN_EMAIL = `admin.${profile}@auth-e2e.local`;
 const ADMIN_PASSWORD = "password1234";
 
+type SeedOrm = RunDbSeedContext<typeof schema>["orm"];
+
+void runDb({
+  schema,
+  seed: async ({ orm }) => {
+    const admin = await ensureUser({
+      orm,
+      id: `auth-e2e-admin-${profile}`,
+      name: "Auth E2E Admin",
+      email: ADMIN_EMAIL,
+      password: ADMIN_PASSWORD,
+      role: "admin",
+    });
+    const { organizationId } = await ensureOrganization({ orm, userId: admin.id });
+    await seedPosts({ orm, userId: admin.id, organizationId });
+    await seedExpiredWaitlistCode(orm);
+    await seedProvisionedClaimUser(orm);
+    console.info(`Seeded ${profile}. Admin login: ${ADMIN_EMAIL} / ${ADMIN_PASSWORD}`);
+  },
+});
+
 function slugify(value: string): string {
   return value
     .trim()
@@ -21,27 +42,24 @@ function slugify(value: string): string {
     .replace(/^-+|-+$/g, "");
 }
 
-async function ensureUser({
-  id,
-  name,
-  email,
-  password,
-  role = "user",
-  emailVerified = true,
-}: {
+async function ensureUser(input: {
+  orm: SeedOrm;
   id: string;
   name: string;
   email: string;
   password?: string;
   role?: string;
   emailVerified?: boolean;
-}) {
+}): Promise<typeof schema.users.$inferSelect> {
+  const { orm, id, name, email, password, role = "user", emailVerified = true } = input;
   const [existingUser] = await orm
     .select()
     .from(schema.users)
     .where(eq(schema.users.email, email))
     .limit(1);
-  if (existingUser) return existingUser;
+  if (existingUser) {
+    return existingUser;
+  }
 
   const [user] = await orm
     .insert(schema.users)
@@ -56,7 +74,9 @@ async function ensureUser({
     })
     .returning();
 
-  if (!user) throw new Error(`Failed to seed user ${email}`);
+  if (!user) {
+    throw new Error(`Failed to seed user ${email}`);
+  }
 
   if (password) {
     await orm.insert(schema.accounts).values({
@@ -73,7 +93,11 @@ async function ensureUser({
   return user;
 }
 
-async function ensureOrganization(userId: string) {
+async function ensureOrganization(input: {
+  orm: SeedOrm;
+  userId: string;
+}): Promise<{ organizationId: string; teamId: string }> {
+  const { orm, userId } = input;
   const organizationId = `auth-e2e-enterprise-${profile}`;
   const teamId = `auth-e2e-team-${profile}`;
 
@@ -144,9 +168,16 @@ async function ensureOrganization(userId: string) {
   return { organizationId, teamId };
 }
 
-async function seedPosts(userId: string, organizationId: string) {
+async function seedPosts(input: {
+  orm: SeedOrm;
+  userId: string;
+  organizationId: string;
+}): Promise<void> {
+  const { orm, userId, organizationId } = input;
   const existingPosts = await orm.select().from(schema.posts).limit(1);
-  if (existingPosts.length > 0) return;
+  if (existingPosts.length > 0) {
+    return;
+  }
 
   const posts = [
     {
@@ -175,13 +206,15 @@ async function seedPosts(userId: string, organizationId: string) {
   );
 }
 
-async function seedExpiredWaitlistCode() {
+async function seedExpiredWaitlistCode(orm: SeedOrm): Promise<void> {
   const [existing] = await orm
     .select()
     .from(schema.waitlist)
     .where(eq(schema.waitlist.code, "expired-waitlist-code"))
     .limit(1);
-  if (existing) return;
+  if (existing) {
+    return;
+  }
 
   await orm.insert(schema.waitlist).values({
     id: uuidv4(),
@@ -196,8 +229,9 @@ async function seedExpiredWaitlistCode() {
   });
 }
 
-async function seedProvisionedClaimUser() {
+async function seedProvisionedClaimUser(orm: SeedOrm): Promise<typeof schema.users.$inferSelect> {
   const user = await ensureUser({
+    orm,
     id: `auth-e2e-claim-user-${profile}`,
     name: "Provisioned Claim User",
     email: `claim.${profile}@provisioned.auth-e2e.local`,
@@ -210,7 +244,9 @@ async function seedProvisionedClaimUser() {
     .from(schema.waitlist)
     .where(eq(schema.waitlist.claimUserId, user.id))
     .limit(1);
-  if (existingClaim) return user;
+  if (existingClaim) {
+    return user;
+  }
 
   await orm.insert(schema.waitlist).values({
     id: `auth-e2e-claim-${profile}`,
@@ -225,22 +261,3 @@ async function seedProvisionedClaimUser() {
 
   return user;
 }
-
-async function seed() {
-  await ensureDevServerStopped();
-  const admin = await ensureUser({
-    id: `auth-e2e-admin-${profile}`,
-    name: "Auth E2E Admin",
-    email: ADMIN_EMAIL,
-    password: ADMIN_PASSWORD,
-    role: "admin",
-  });
-  const { organizationId } = await ensureOrganization(admin.id);
-  await seedPosts(admin.id, organizationId);
-  await seedExpiredWaitlistCode();
-  await seedProvisionedClaimUser();
-
-  console.info(`Seeded ${profile}. Admin login: ${ADMIN_EMAIL} / ${ADMIN_PASSWORD}`);
-}
-
-void seed();

package/templates/minimal-app/apps/server/{drizzle/seed.ts.tpl → db.ts.tpl}

@@ -1,15 +1,27 @@
+import { type RunDbSeedContext, runDb } from "@m5kdev/backend/db";
 import { hashPassword } from "better-auth/crypto";
 import { eq } from "drizzle-orm";
 import { v4 as uuidv4 } from "uuid";
-import { isRemote, orm, schema } from "./db";
-import { ensureDevServerStopped } from "./guard";
+import * as schema from "./src/schema";
 
 const DEMO_EMAIL = "admin{{PACKAGE_SCOPE}}.local";
 const DEMO_PASSWORD = "password1234";
 const ORGANIZATION_ID = "{{APP_SLUG}}-org";
 const TEAM_ID = "{{APP_SLUG}}-team";
 
-async function ensureDemoUser() {
+void runDb({
+  schema,
+  seed: async ({ orm }) => {
+    const user = await ensureDemoUser(orm);
+    const { organizationId, teamId } = await ensureOrganization({ orm, userId: user.id });
+    await seedPosts({ orm, userId: user.id, organizationId, teamId });
+    console.info(`Seed completed. Demo login: ${DEMO_EMAIL} / ${DEMO_PASSWORD}`);
+  },
+});
+
+type SeedOrm = RunDbSeedContext<typeof schema>["orm"];
+
+async function ensureDemoUser(orm: SeedOrm): Promise<typeof schema.users.$inferSelect> {
   const [existingUser] = await orm
     .select()
     .from(schema.users)
@@ -51,7 +63,11 @@ async function ensureDemoUser() {
   return user;
 }
 
-async function ensureOrganization(userId: string) {
+async function ensureOrganization(input: {
+  orm: SeedOrm;
+  userId: string;
+}): Promise<{ organizationId: string; teamId: string }> {
+  const { orm, userId } = input;
   const [existingOrganization] = await orm
     .select()
     .from(schema.organizations)
@@ -119,7 +135,13 @@ async function ensureOrganization(userId: string) {
   return { organizationId: ORGANIZATION_ID, teamId: TEAM_ID };
 }
 
-async function seedPosts(userId: string, organizationId: string | null, teamId: string | null) {
+async function seedPosts(input: {
+  orm: SeedOrm;
+  userId: string;
+  organizationId: string | null;
+  teamId: string;
+}): Promise<void> {
+  const { orm, userId, organizationId, teamId } = input;
   const existingPosts = await orm.select().from(schema.posts).limit(1);
   if (existingPosts.length > 0) {
     return;
@@ -166,18 +188,3 @@ async function seedPosts(userId: string, organizationId: string | null, teamId:
     },
   ]);
 }
-
-async function seed() {
-  await ensureDevServerStopped();
-  if (isRemote) {
-    await orm.$client.sync();
-  }
-  const user = await ensureDemoUser();
-  const { organizationId, teamId } = await ensureOrganization(user.id);
-
-  await seedPosts(user.id, organizationId, teamId);
-
-  console.info(`Seed completed. Demo login: ${DEMO_EMAIL} / ${DEMO_PASSWORD}`);
-}
-
-void seed();

package/templates/minimal-app/apps/server/drizzle/0003_silly_the_liberteens.sql

@@ -0,0 +1,27 @@
+CREATE TABLE `files` (
+	`id` text PRIMARY KEY NOT NULL,
+	`created_at` integer NOT NULL,
+	`updated_at` integer,
+	`deleted_at` integer,
+	`user_id` text,
+	`member_id` text,
+	`organization_id` text,
+	`team_id` text,
+	`bucket` text NOT NULL,
+	`key` text NOT NULL,
+	`original_name` text NOT NULL,
+	`original_extension` text,
+	`content_type` text NOT NULL,
+	`size_bytes` integer,
+	`etag` text,
+	`checksum_sha256` text,
+	`metadata` text,
+	`status` text NOT NULL,
+	`uploaded_at` integer,
+	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE set null,
+	FOREIGN KEY (`member_id`) REFERENCES `members`(`id`) ON UPDATE no action ON DELETE set null,
+	FOREIGN KEY (`organization_id`) REFERENCES `organizations`(`id`) ON UPDATE no action ON DELETE set null,
+	FOREIGN KEY (`team_id`) REFERENCES `teams`(`id`) ON UPDATE no action ON DELETE set null
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `files_bucket_key_unique` ON `files` (`bucket`,`key`);