create-m5kdev 0.34.0 → 0.36.0

package/templates/minimal-app/apps/server/db.ts.tpl

@@ -7,14 +7,13 @@ 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";
 
 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 });
+    const { organizationId } = await ensureOrganization({ orm, userId: user.id });
+    await seedPosts({ orm, userId: user.id, organizationId });
     console.info(`Seed completed. Demo login: ${DEMO_EMAIL} / ${DEMO_PASSWORD}`);
   },
 });
@@ -66,7 +65,7 @@ async function ensureDemoUser(orm: SeedOrm): Promise<typeof schema.users.$inferS
 async function ensureOrganization(input: {
   orm: SeedOrm;
   userId: string;
-}): Promise<{ organizationId: string; teamId: string }> {
+}): Promise<{ organizationId: string }> {
   const { orm, userId } = input;
   const [existingOrganization] = await orm
     .select()
@@ -100,48 +99,15 @@ async function ensureOrganization(input: {
     });
   }
 
-  const [existingTeam] = await orm
-    .select()
-    .from(schema.teams)
-    .where(eq(schema.teams.id, TEAM_ID))
-    .limit(1);
-
-  if (!existingTeam) {
-    await orm.insert(schema.teams).values({
-      id: TEAM_ID,
-      name: "Editorial",
-      organizationId: ORGANIZATION_ID,
-      createdAt: new Date(),
-      updatedAt: new Date(),
-    });
-  }
-
-  const [existingTeamMember] = await orm
-    .select()
-    .from(schema.teamMembers)
-    .where(eq(schema.teamMembers.userId, userId))
-    .limit(1);
-
-  if (!existingTeamMember) {
-    await orm.insert(schema.teamMembers).values({
-      id: uuidv4(),
-      teamId: TEAM_ID,
-      userId,
-      role: "owner",
-      createdAt: new Date(),
-    });
-  }
-
-  return { organizationId: ORGANIZATION_ID, teamId: TEAM_ID };
+  return { organizationId: ORGANIZATION_ID };
 }
 
 async function seedPosts(input: {
   orm: SeedOrm;
   userId: string;
   organizationId: string | null;
-  teamId: string;
 }): Promise<void> {
-  const { orm, userId, organizationId, teamId } = input;
+  const { orm, userId, organizationId } = input;
   const existingPosts = await orm.select().from(schema.posts).limit(1);
   if (existingPosts.length > 0) {
     return;
@@ -151,7 +117,6 @@ async function seedPosts(input: {
     {
       authorUserId: userId,
       organizationId,
-      teamId,
       title: "An editorial workflow you can ship in an afternoon",
       slug: "editorial-workflow-in-an-afternoon",
       excerpt: "A first draft on how this minimal starter is wired together.",
@@ -164,7 +129,6 @@ async function seedPosts(input: {
     {
       authorUserId: userId,
       organizationId,
-      teamId,
       title: "Three habits that keep CRUD apps from drifting into chaos",
       slug: "three-habits-that-keep-crud{{PACKAGE_SCOPE}}s-focused",
       excerpt: "A draft about explicit composition, typed contracts, and URL state.",
@@ -176,7 +140,6 @@ async function seedPosts(input: {
     {
       authorUserId: userId,
       organizationId,
-      teamId,
       title: "What a minimal platform starter should still refuse to compromise on",
       slug: "minimal-platform-starter-non-negotiables",
       excerpt: "A published note on keeping the foundation opinionated without being heavy.",

package/templates/minimal-app/apps/server/drizzle/{0000_wealthy_absorbing_man.sql → 0000_whole_echo.sql}

@@ -28,6 +28,28 @@ CREATE TABLE `accounts` (
 	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE cascade
 );
 --> statement-breakpoint
+CREATE TABLE `ai_usage` (
+	`id` text PRIMARY KEY NOT NULL,
+	`user_id` text,
+	`member_id` text,
+	`team_id` text,
+	`organization_id` text,
+	`feature` text NOT NULL,
+	`provider` text NOT NULL,
+	`model` text NOT NULL,
+	`input_tokens` integer,
+	`output_tokens` integer,
+	`total_tokens` integer,
+	`cost` real,
+	`trace_id` text,
+	`created_at` integer NOT NULL,
+	`metadata` text,
+	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 (`team_id`) REFERENCES `teams`(`id`) ON UPDATE no action ON DELETE set null,
+	FOREIGN KEY (`organization_id`) REFERENCES `organizations`(`id`) ON UPDATE no action ON DELETE set null
+);
+--> statement-breakpoint
 CREATE TABLE `apikeys` (
 	`id` text PRIMARY KEY NOT NULL,
 	`name` text,
@@ -53,6 +75,44 @@ CREATE TABLE `apikeys` (
 	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE no action
 );
 --> statement-breakpoint
+CREATE TABLE `chats` (
+	`id` text PRIMARY KEY NOT NULL,
+	`user_id` text NOT NULL,
+	`title` text,
+	`type` text,
+	`conversation` text,
+	`created_at` integer,
+	`updated_at` integer NOT NULL,
+	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+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`);--> statement-breakpoint
 CREATE TABLE `invitations` (
 	`id` text PRIMARY KEY NOT NULL,
 	`organization_id` text NOT NULL,
@@ -72,8 +132,11 @@ CREATE TABLE `members` (
 	`id` text PRIMARY KEY NOT NULL,
 	`organization_id` text NOT NULL,
 	`user_id` text NOT NULL,
+	`name` text DEFAULT '' NOT NULL,
+	`image` text,
 	`role` text NOT NULL,
 	`created_at` integer NOT NULL,
+	`deleted_at` integer,
 	`preferences` text DEFAULT '{}',
 	`metadata` text DEFAULT '{}',
 	`onboarding` integer,
@@ -98,12 +161,25 @@ CREATE TABLE `notification_devices` (
 --> statement-breakpoint
 CREATE UNIQUE INDEX `notification_devices_endpoint_unique` ON `notification_devices` (`endpoint`);--> statement-breakpoint
 CREATE UNIQUE INDEX `notification_devices_token_unique` ON `notification_devices` (`token`);--> statement-breakpoint
+CREATE TABLE `notification_preferences` (
+	`id` text PRIMARY KEY NOT NULL,
+	`member_id` text NOT NULL,
+	`kind` text NOT NULL,
+	`channel` text NOT NULL,
+	`created_at` integer NOT NULL,
+	`updated_at` integer NOT NULL,
+	FOREIGN KEY (`member_id`) REFERENCES `members`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `notification_preferences_member_kind_channel_unique` ON `notification_preferences` (`member_id`,`kind`,`channel`);--> statement-breakpoint
 CREATE TABLE `notification_send_logs` (
 	`id` text PRIMARY KEY NOT NULL,
 	`batch_id` text NOT NULL,
+	`notification_id` text NOT NULL,
 	`user_id` text NOT NULL,
-	`device_id` text NOT NULL,
-	`provider` text NOT NULL,
+	`device_id` text,
+	`channel` text NOT NULL,
+	`provider` text,
 	`title` text NOT NULL,
 	`body` text NOT NULL,
 	`data` text,
@@ -112,8 +188,29 @@ CREATE TABLE `notification_send_logs` (
 	`job_id` text,
 	`created_at` integer NOT NULL,
 	`updated_at` integer NOT NULL,
+	FOREIGN KEY (`notification_id`) REFERENCES `notifications`(`id`) ON UPDATE no action ON DELETE cascade,
 	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE cascade,
-	FOREIGN KEY (`device_id`) REFERENCES `notification_devices`(`id`) ON UPDATE no action ON DELETE cascade
+	FOREIGN KEY (`device_id`) REFERENCES `notification_devices`(`id`) ON UPDATE no action ON DELETE set null
+);
+--> statement-breakpoint
+CREATE TABLE `notifications` (
+	`id` text PRIMARY KEY NOT NULL,
+	`member_id` text NOT NULL,
+	`user_id` text NOT NULL,
+	`kind` text NOT NULL,
+	`title` text NOT NULL,
+	`body` text NOT NULL,
+	`data` text,
+	`visible_in_inbox` integer DEFAULT false NOT NULL,
+	`armed_channels` text DEFAULT '[]' NOT NULL,
+	`web_pushed_at` integer,
+	`mobile_pushed_at` integer,
+	`emailed_at` integer,
+	`read_at` integer,
+	`created_at` integer NOT NULL,
+	`updated_at` integer NOT NULL,
+	FOREIGN KEY (`member_id`) REFERENCES `members`(`id`) ON UPDATE no action ON DELETE cascade,
+	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE cascade
 );
 --> statement-breakpoint
 CREATE TABLE `organizations` (
@@ -136,6 +233,7 @@ CREATE UNIQUE INDEX `organizations_slug_unique` ON `organizations` (`slug`);-->
 CREATE TABLE `posts` (
 	`id` text PRIMARY KEY NOT NULL,
 	`author_user_id` text,
+	`member_id` text,
 	`organization_id` text,
 	`team_id` text,
 	`title` text NOT NULL,
@@ -148,6 +246,7 @@ CREATE TABLE `posts` (
 	`updated_at` integer,
 	`deleted_at` integer,
 	FOREIGN KEY (`author_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
 );

package/templates/minimal-app/apps/server/drizzle/0001_yummy_spectrum.sql

@@ -0,0 +1,26 @@
+PRAGMA foreign_keys=OFF;--> statement-breakpoint
+CREATE TABLE `__new_members` (
+	`id` text PRIMARY KEY NOT NULL,
+	`organization_id` text NOT NULL,
+	`user_id` text,
+	`email` text,
+	`name` text DEFAULT '' NOT NULL,
+	`image` text,
+	`role` text NOT NULL,
+	`created_at` integer NOT NULL,
+	`deleted_at` integer,
+	`preferences` text DEFAULT '{}',
+	`metadata` text DEFAULT '{}',
+	`onboarding` integer,
+	`flags` text DEFAULT '[]',
+	FOREIGN KEY (`organization_id`) REFERENCES `organizations`(`id`) ON UPDATE no action ON DELETE no action,
+	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE no action
+);
+--> statement-breakpoint
+INSERT INTO `__new_members`("id", "organization_id", "user_id", "email", "name", "image", "role", "created_at", "deleted_at", "preferences", "metadata", "onboarding", "flags") SELECT "id", "organization_id", "user_id", NULL, "name", "image", "role", "created_at", "deleted_at", "preferences", "metadata", "onboarding", "flags" FROM `members`;--> statement-breakpoint
+DROP TABLE `members`;--> statement-breakpoint
+ALTER TABLE `__new_members` RENAME TO `members`;--> statement-breakpoint
+PRAGMA foreign_keys=ON;--> statement-breakpoint
+CREATE UNIQUE INDEX `members_attached_user_organization_unique` ON `members` (`user_id`,`organization_id`) WHERE "members"."user_id" is not null;--> statement-breakpoint
+CREATE UNIQUE INDEX `members_live_pending_email_organization_unique` ON `members` (`email`,`organization_id`) WHERE "members"."user_id" is null and "members"."deleted_at" is null;--> statement-breakpoint
+ALTER TABLE `invitations` ADD `member_id` text REFERENCES members(id);

package/templates/minimal-app/apps/server/drizzle/0002_crazy_lilith.sql

@@ -0,0 +1,47 @@
+CREATE TABLE `account_claims` (
+	`id` text PRIMARY KEY NOT NULL,
+	`claim_user_id` text NOT NULL,
+	`status` text NOT NULL,
+	`code` text,
+	`expires_at` integer,
+	`claimed_at` integer,
+	`claimed_email` text,
+	`created_at` integer NOT NULL,
+	`updated_at` integer,
+	FOREIGN KEY (`claim_user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE no action
+);
+--> statement-breakpoint
+PRAGMA foreign_keys=OFF;--> statement-breakpoint
+CREATE TABLE `__new_account_claim_magic_links` (
+	`id` text PRIMARY KEY NOT NULL,
+	`claim_id` text NOT NULL,
+	`user_id` text NOT NULL,
+	`email` text NOT NULL,
+	`token` text NOT NULL,
+	`url` text NOT NULL,
+	`expires_at` integer,
+	`created_at` integer NOT NULL,
+	FOREIGN KEY (`claim_id`) REFERENCES `account_claims`(`id`) ON UPDATE no action ON DELETE cascade,
+	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE cascade
+);
+--> statement-breakpoint
+INSERT INTO `__new_account_claim_magic_links`("id", "claim_id", "user_id", "email", "token", "url", "expires_at", "created_at") SELECT "id", "claim_id", "user_id", "email", "token", "url", "expires_at", "created_at" FROM `account_claim_magic_links`;--> statement-breakpoint
+DROP TABLE `account_claim_magic_links`;--> statement-breakpoint
+ALTER TABLE `__new_account_claim_magic_links` RENAME TO `account_claim_magic_links`;--> statement-breakpoint
+PRAGMA foreign_keys=ON;--> statement-breakpoint
+CREATE TABLE `__new_waitlist` (
+	`id` text PRIMARY KEY NOT NULL,
+	`name` text,
+	`email` text,
+	`created_at` integer NOT NULL,
+	`updated_at` integer,
+	`status` text DEFAULT 'WAITLIST' NOT NULL,
+	`code` text,
+	`expires_at` integer,
+	`user_id` text,
+	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE no action
+);
+--> statement-breakpoint
+INSERT INTO `__new_waitlist`("id", "name", "email", "created_at", "updated_at", "status", "code", "expires_at", "user_id") SELECT "id", "name", "email", "created_at", "updated_at", "status", "code", "expires_at", "user_id" FROM `waitlist`;--> statement-breakpoint
+DROP TABLE `waitlist`;--> statement-breakpoint
+ALTER TABLE `__new_waitlist` RENAME TO `waitlist`;

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

@@ -0,0 +1,4 @@
+DROP INDEX `users_payment_customer_id_unique`;--> statement-breakpoint
+ALTER TABLE `users` DROP COLUMN `payment_customer_id`;--> statement-breakpoint
+ALTER TABLE `users` DROP COLUMN `payment_plan_tier`;--> statement-breakpoint
+ALTER TABLE `users` DROP COLUMN `payment_plan_expires_at`;

package/templates/minimal-app/apps/server/drizzle/0004_slow_ezekiel_stane.sql

@@ -0,0 +1,99 @@
+DROP TABLE `teammembers`;--> statement-breakpoint
+DROP TABLE `teams`;--> statement-breakpoint
+PRAGMA foreign_keys=OFF;--> statement-breakpoint
+CREATE TABLE `__new_ai_usage` (
+	`id` text PRIMARY KEY NOT NULL,
+	`user_id` text,
+	`member_id` text,
+	`team_id` text,
+	`organization_id` text,
+	`feature` text NOT NULL,
+	`provider` text NOT NULL,
+	`model` text NOT NULL,
+	`input_tokens` integer,
+	`output_tokens` integer,
+	`total_tokens` integer,
+	`cost` real,
+	`trace_id` text,
+	`created_at` integer NOT NULL,
+	`metadata` text,
+	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
+);
+--> statement-breakpoint
+INSERT INTO `__new_ai_usage`("id", "user_id", "member_id", "team_id", "organization_id", "feature", "provider", "model", "input_tokens", "output_tokens", "total_tokens", "cost", "trace_id", "created_at", "metadata") SELECT "id", "user_id", "member_id", "team_id", "organization_id", "feature", "provider", "model", "input_tokens", "output_tokens", "total_tokens", "cost", "trace_id", "created_at", "metadata" FROM `ai_usage`;--> statement-breakpoint
+DROP TABLE `ai_usage`;--> statement-breakpoint
+ALTER TABLE `__new_ai_usage` RENAME TO `ai_usage`;--> statement-breakpoint
+PRAGMA foreign_keys=ON;--> statement-breakpoint
+CREATE TABLE `__new_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
+);
+--> statement-breakpoint
+INSERT INTO `__new_files`("id", "created_at", "updated_at", "deleted_at", "user_id", "member_id", "organization_id", "team_id", "bucket", "key", "original_name", "original_extension", "content_type", "size_bytes", "etag", "checksum_sha256", "metadata", "status", "uploaded_at") SELECT "id", "created_at", "updated_at", "deleted_at", "user_id", "member_id", "organization_id", "team_id", "bucket", "key", "original_name", "original_extension", "content_type", "size_bytes", "etag", "checksum_sha256", "metadata", "status", "uploaded_at" FROM `files`;--> statement-breakpoint
+DROP TABLE `files`;--> statement-breakpoint
+ALTER TABLE `__new_files` RENAME TO `files`;--> statement-breakpoint
+CREATE UNIQUE INDEX `files_bucket_key_unique` ON `files` (`bucket`,`key`);--> statement-breakpoint
+CREATE TABLE `__new_invitations` (
+	`id` text PRIMARY KEY NOT NULL,
+	`organization_id` text NOT NULL,
+	`member_id` text,
+	`email` text NOT NULL,
+	`role` text,
+	`status` text NOT NULL,
+	`created_at` integer NOT NULL,
+	`expires_at` integer NOT NULL,
+	`inviter_id` text NOT NULL,
+	FOREIGN KEY (`organization_id`) REFERENCES `organizations`(`id`) ON UPDATE no action ON DELETE no action,
+	FOREIGN KEY (`member_id`) REFERENCES `members`(`id`) ON UPDATE no action ON DELETE no action,
+	FOREIGN KEY (`inviter_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE no action
+);
+--> statement-breakpoint
+INSERT INTO `__new_invitations`("id", "organization_id", "member_id", "email", "role", "status", "created_at", "expires_at", "inviter_id") SELECT "id", "organization_id", "member_id", "email", "role", "status", "created_at", "expires_at", "inviter_id" FROM `invitations`;--> statement-breakpoint
+DROP TABLE `invitations`;--> statement-breakpoint
+ALTER TABLE `__new_invitations` RENAME TO `invitations`;--> statement-breakpoint
+CREATE TABLE `__new_posts` (
+	`id` text PRIMARY KEY NOT NULL,
+	`author_user_id` text,
+	`member_id` text,
+	`organization_id` text,
+	`team_id` text,
+	`title` text NOT NULL,
+	`slug` text NOT NULL,
+	`excerpt` text,
+	`content` text NOT NULL,
+	`status` text DEFAULT 'draft' NOT NULL,
+	`published_at` integer,
+	`created_at` integer NOT NULL,
+	`updated_at` integer,
+	`deleted_at` integer,
+	FOREIGN KEY (`author_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
+);
+--> statement-breakpoint
+INSERT INTO `__new_posts`("id", "author_user_id", "member_id", "organization_id", "team_id", "title", "slug", "excerpt", "content", "status", "published_at", "created_at", "updated_at", "deleted_at") SELECT "id", "author_user_id", "member_id", "organization_id", "team_id", "title", "slug", "excerpt", "content", "status", "published_at", "created_at", "updated_at", "deleted_at" FROM `posts`;--> statement-breakpoint
+DROP TABLE `posts`;--> statement-breakpoint
+ALTER TABLE `__new_posts` RENAME TO `posts`;--> statement-breakpoint
+CREATE UNIQUE INDEX `posts_slug_unique` ON `posts` (`slug`);

package/templates/minimal-app/apps/server/drizzle/0005_wonderful_the_professor.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `sessions` DROP COLUMN `active_team_id`;--> statement-breakpoint
+ALTER TABLE `sessions` DROP COLUMN `active_team_role`;