create-m5kdev 0.33.0 → 0.35.0

package/templates/minimal-app/apps/server/src/modules/test-harness/test-harness.module.ts.tpl

@@ -1,279 +1,279 @@
-import {
-  BaseModule,
-  type ModuleExpressContext,
-  type TableMap,
-} from "@m5kdev/backend/modules/base/base.module";
-import { and, desc, eq, isNotNull } from "drizzle-orm";
-import type { Request, Response } from "express";
-import { v4 as uuidv4 } from "uuid";
-
-type TestHarnessTables = TableMap;
-
-function normalizedEmail(value: unknown) {
-  return typeof value === "string" ? value.trim().toLowerCase() : "";
-}
-
-function normalizedText(value: unknown, fallback: string) {
-  return typeof value === "string" && value.trim() ? value.trim() : fallback;
-}
-
-function slugPart(value: string) {
-  return value
-    .trim()
-    .toLowerCase()
-    .replace(/[^a-z0-9]+/g, "-")
-    .replace(/^-+|-+$/g, "")
-    .slice(0, 48);
-}
-
-function sendJson(res: Response, status: number, body: unknown) {
-  res
-    .status(status)
-    .type("application/json")
-    .send(JSON.stringify(body, null, 2));
-}
-
-export class TestHarnessModule extends BaseModule<
-  Record<string, never>,
-  TestHarnessTables,
-  Record<string, never>,
-  Record<string, never>,
-  never
-> {
-  readonly id = "auth-e2e-test-harness";
-  override readonly dbDependsOn = ["auth"] as const;
-
-  override express({ db, infra }: ModuleExpressContext<Record<string, never>>) {
-    infra.express.get("/__auth-e2e/user.json", async (req: Request, res: Response) => {
-      const email = normalizedEmail(req.query.email);
-      if (!email) {
-        sendJson(res, 400, { error: "email is required" });
-        return;
-      }
-
-      const [user] = await db.orm
-        .select({
-          id: db.schema.users.id,
-          name: db.schema.users.name,
-          email: db.schema.users.email,
-          emailVerified: db.schema.users.emailVerified,
-          role: db.schema.users.role,
-          banned: db.schema.users.banned,
-        })
-        .from(db.schema.users)
-        .where(eq(db.schema.users.email, email))
-        .limit(1);
-
-      if (!user) {
-        sendJson(res, 404, { error: "user not found" });
-        return;
-      }
-
-      const organizations = await db.orm
-        .select({
-          id: db.schema.organizations.id,
-          name: db.schema.organizations.name,
-          slug: db.schema.organizations.slug,
-          type: db.schema.organizations.type,
-          parentId: db.schema.organizations.parentId,
-          role: db.schema.members.role,
-        })
-        .from(db.schema.members)
-        .innerJoin(
-          db.schema.organizations,
-          eq(db.schema.members.organizationId, db.schema.organizations.id)
-        )
-        .where(eq(db.schema.members.userId, user.id));
-
-      const [credentialAccount] = await db.orm
-        .select({ id: db.schema.accounts.id })
-        .from(db.schema.accounts)
-        .where(
-          and(
-            eq(db.schema.accounts.userId, user.id),
-            eq(db.schema.accounts.providerId, "credential"),
-            isNotNull(db.schema.accounts.password)
-          )
-        )
-        .limit(1);
-
-      const accountClaims = await db.orm
-        .select({
-          id: db.schema.waitlist.id,
-          status: db.schema.waitlist.status,
-          claimUserId: db.schema.waitlist.claimUserId,
-          claimedEmail: db.schema.waitlist.claimedEmail,
-          claimedAt: db.schema.waitlist.claimedAt,
-          expiresAt: db.schema.waitlist.expiresAt,
-        })
-        .from(db.schema.waitlist)
-        .where(
-          and(
-            eq(db.schema.waitlist.type, "ACCOUNT_CLAIM"),
-            eq(db.schema.waitlist.claimUserId, user.id)
-          )
-        )
-        .orderBy(desc(db.schema.waitlist.createdAt));
-
-      const [latestSession] = await db.orm
-        .select({
-          id: db.schema.sessions.id,
-          userId: db.schema.sessions.userId,
-          activeOrganizationId: db.schema.sessions.activeOrganizationId,
-          activeOrganizationRole: db.schema.sessions.activeOrganizationRole,
-          activeOrganizationMemberId: db.schema.sessions.activeOrganizationMemberId,
-          activeOrganizationType: db.schema.sessions.activeOrganizationType,
-          activeTeamId: db.schema.sessions.activeTeamId,
-          impersonatedBy: db.schema.sessions.impersonatedBy,
-          createdAt: db.schema.sessions.createdAt,
-        })
-        .from(db.schema.sessions)
-        .where(eq(db.schema.sessions.userId, user.id))
-        .orderBy(desc(db.schema.sessions.createdAt))
-        .limit(1);
-
-      sendJson(res, 200, {
-        user,
-        organizations,
-        credentialAccount: Boolean(credentialAccount),
-        accountClaims,
-        pendingAccountClaims: accountClaims.filter((claim) => claim.status === "INVITED").length,
-        acceptedAccountClaims: accountClaims.filter((claim) => claim.status === "ACCEPTED").length,
-        latestSession: latestSession ?? null,
-      });
-    });
-
-    infra.express.post(
-      "/__auth-e2e/provisioned-claim-user",
-      async (req: Request, res: Response) => {
-        const email = normalizedEmail((req.body as { email?: unknown }).email);
-        const expiresInHours =
-          typeof (req.body as { expiresInHours?: unknown }).expiresInHours === "number"
-            ? (req.body as { expiresInHours: number }).expiresInHours
-            : 24 * 14;
-        const createClaim = (req.body as { createClaim?: unknown }).createClaim === true;
-
-        if (!email.endsWith("@provisioned.auth-e2e.local")) {
-          sendJson(res, 400, { error: "email must use the provisioned auth-e2e domain" });
-          return;
-        }
-
-        const [existing] = await db.orm
-          .select({ id: db.schema.users.id })
-          .from(db.schema.users)
-          .where(eq(db.schema.users.email, email))
-          .limit(1);
-
-        if (existing) {
-          sendJson(res, 409, { error: "user already exists" });
-          return;
-        }
-
-        const now = new Date();
-        const userId = uuidv4();
-        const organizationId = uuidv4();
-        const teamId = uuidv4();
-        const claimId = createClaim ? uuidv4() : null;
-
-        await db.orm.transaction(async (tx) => {
-          await tx.insert(db.schema.users).values({
-            id: userId,
-            name: `Provisioned ${email}`,
-            email,
-            emailVerified: false,
-            role: "user",
-            createdAt: now,
-            updatedAt: now,
-          });
-
-          await tx.insert(db.schema.organizations).values({
-            id: organizationId,
-            name: `Provisioned ${userId.slice(0, 8)}`,
-            slug: `provisioned-${userId.slice(0, 8)}`,
-            type: "organization",
-            createdAt: now,
-          });
-
-          await tx.insert(db.schema.members).values({
-            id: uuidv4(),
-            organizationId,
-            userId,
-            role: "owner",
-            createdAt: now,
-          });
-
-          await tx.insert(db.schema.teams).values({
-            id: teamId,
-            name: "Editorial",
-            organizationId,
-            createdAt: now,
-            updatedAt: now,
-          });
-
-          await tx.insert(db.schema.teamMembers).values({
-            id: uuidv4(),
-            teamId,
-            userId,
-            role: "owner",
-            createdAt: now,
-          });
-
-          if (claimId) {
-            await tx.insert(db.schema.waitlist).values({
-              id: claimId,
-              type: "ACCOUNT_CLAIM",
-              status: "INVITED",
-              claimUserId: userId,
-              code: uuidv4(),
-              expiresAt: new Date(Date.now() + expiresInHours * 60 * 60 * 1000),
-              createdAt: now,
-              updatedAt: now,
-            });
-          }
-        });
-
-        sendJson(res, 201, {
-          user: { id: userId, email },
-          organization: { id: organizationId },
-          claim: claimId ? { id: claimId } : null,
-        });
-      }
-    );
-
-    infra.express.post("/__auth-e2e/organizations", async (req: Request, res: Response) => {
-      const body = req.body as { count?: unknown; prefix?: unknown };
-      const count = typeof body.count === "number" ? Math.trunc(body.count) : 12;
-      const prefix = normalizedText(body.prefix, "Harness Organization");
-
-      if (count < 1 || count > 50) {
-        sendJson(res, 400, { error: "count must be between 1 and 50" });
-        return;
-      }
-
-      const now = Date.now();
-      const slugPrefix = slugPart(prefix) || "organization";
-      const organizations = Array.from({ length: count }, (_, index) => {
-        const id = uuidv4();
-        const displayIndex = String(index + 1).padStart(2, "0");
-
-        return {
-          id,
-          name: `${prefix} ${displayIndex}`,
-          slug: `${slugPrefix}-${displayIndex}-${id.slice(0, 8)}`,
-          type: "organization",
-          createdAt: new Date(now + index),
-        };
-      });
-
-      await db.orm.insert(db.schema.organizations).values(organizations);
-
-      sendJson(res, 201, {
-        organizations: organizations.map((organization) => ({
-          id: organization.id,
-          name: organization.name,
-          slug: organization.slug,
-        })),
-      });
-    });
-  }
-}
+import {
+  BaseModule,
+  type ModuleExpressContext,
+  type TableMap,
+} from "@m5kdev/backend/modules/base/base.module";
+import { and, desc, eq, isNotNull } from "drizzle-orm";
+import type { Request, Response } from "express";
+import { v4 as uuidv4 } from "uuid";
+
+type TestHarnessTables = TableMap;
+
+function normalizedEmail(value: unknown) {
+  return typeof value === "string" ? value.trim().toLowerCase() : "";
+}
+
+function normalizedText(value: unknown, fallback: string) {
+  return typeof value === "string" && value.trim() ? value.trim() : fallback;
+}
+
+function slugPart(value: string) {
+  return value
+    .trim()
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, "-")
+    .replace(/^-+|-+$/g, "")
+    .slice(0, 48);
+}
+
+function sendJson(res: Response, status: number, body: unknown) {
+  res
+    .status(status)
+    .type("application/json")
+    .send(JSON.stringify(body, null, 2));
+}
+
+export class TestHarnessModule extends BaseModule<
+  Record<string, never>,
+  TestHarnessTables,
+  Record<string, never>,
+  Record<string, never>,
+  never
+> {
+  readonly id = "auth-e2e-test-harness";
+  override readonly dbDependsOn = ["auth"] as const;
+
+  override express({ db, infra }: ModuleExpressContext<Record<string, never>>) {
+    infra.express.get("/__auth-e2e/user.json", async (req: Request, res: Response) => {
+      const email = normalizedEmail(req.query.email);
+      if (!email) {
+        sendJson(res, 400, { error: "email is required" });
+        return;
+      }
+
+      const [user] = await db.orm
+        .select({
+          id: db.schema.users.id,
+          name: db.schema.users.name,
+          email: db.schema.users.email,
+          emailVerified: db.schema.users.emailVerified,
+          role: db.schema.users.role,
+          banned: db.schema.users.banned,
+        })
+        .from(db.schema.users)
+        .where(eq(db.schema.users.email, email))
+        .limit(1);
+
+      if (!user) {
+        sendJson(res, 404, { error: "user not found" });
+        return;
+      }
+
+      const organizations = await db.orm
+        .select({
+          id: db.schema.organizations.id,
+          name: db.schema.organizations.name,
+          slug: db.schema.organizations.slug,
+          type: db.schema.organizations.type,
+          parentId: db.schema.organizations.parentId,
+          role: db.schema.members.role,
+        })
+        .from(db.schema.members)
+        .innerJoin(
+          db.schema.organizations,
+          eq(db.schema.members.organizationId, db.schema.organizations.id)
+        )
+        .where(eq(db.schema.members.userId, user.id));
+
+      const [credentialAccount] = await db.orm
+        .select({ id: db.schema.accounts.id })
+        .from(db.schema.accounts)
+        .where(
+          and(
+            eq(db.schema.accounts.userId, user.id),
+            eq(db.schema.accounts.providerId, "credential"),
+            isNotNull(db.schema.accounts.password)
+          )
+        )
+        .limit(1);
+
+      const accountClaims = await db.orm
+        .select({
+          id: db.schema.waitlist.id,
+          status: db.schema.waitlist.status,
+          claimUserId: db.schema.waitlist.claimUserId,
+          claimedEmail: db.schema.waitlist.claimedEmail,
+          claimedAt: db.schema.waitlist.claimedAt,
+          expiresAt: db.schema.waitlist.expiresAt,
+        })
+        .from(db.schema.waitlist)
+        .where(
+          and(
+            eq(db.schema.waitlist.type, "ACCOUNT_CLAIM"),
+            eq(db.schema.waitlist.claimUserId, user.id)
+          )
+        )
+        .orderBy(desc(db.schema.waitlist.createdAt));
+
+      const [latestSession] = await db.orm
+        .select({
+          id: db.schema.sessions.id,
+          userId: db.schema.sessions.userId,
+          activeOrganizationId: db.schema.sessions.activeOrganizationId,
+          activeOrganizationRole: db.schema.sessions.activeOrganizationRole,
+          activeOrganizationMemberId: db.schema.sessions.activeOrganizationMemberId,
+          activeOrganizationType: db.schema.sessions.activeOrganizationType,
+          activeTeamId: db.schema.sessions.activeTeamId,
+          impersonatedBy: db.schema.sessions.impersonatedBy,
+          createdAt: db.schema.sessions.createdAt,
+        })
+        .from(db.schema.sessions)
+        .where(eq(db.schema.sessions.userId, user.id))
+        .orderBy(desc(db.schema.sessions.createdAt))
+        .limit(1);
+
+      sendJson(res, 200, {
+        user,
+        organizations,
+        credentialAccount: Boolean(credentialAccount),
+        accountClaims,
+        pendingAccountClaims: accountClaims.filter((claim) => claim.status === "INVITED").length,
+        acceptedAccountClaims: accountClaims.filter((claim) => claim.status === "ACCEPTED").length,
+        latestSession: latestSession ?? null,
+      });
+    });
+
+    infra.express.post(
+      "/__auth-e2e/provisioned-claim-user",
+      async (req: Request, res: Response) => {
+        const email = normalizedEmail((req.body as { email?: unknown }).email);
+        const expiresInHours =
+          typeof (req.body as { expiresInHours?: unknown }).expiresInHours === "number"
+            ? (req.body as { expiresInHours: number }).expiresInHours
+            : 24 * 14;
+        const createClaim = (req.body as { createClaim?: unknown }).createClaim === true;
+
+        if (!email.endsWith("@provisioned.auth-e2e.local")) {
+          sendJson(res, 400, { error: "email must use the provisioned auth-e2e domain" });
+          return;
+        }
+
+        const [existing] = await db.orm
+          .select({ id: db.schema.users.id })
+          .from(db.schema.users)
+          .where(eq(db.schema.users.email, email))
+          .limit(1);
+
+        if (existing) {
+          sendJson(res, 409, { error: "user already exists" });
+          return;
+        }
+
+        const now = new Date();
+        const userId = uuidv4();
+        const organizationId = uuidv4();
+        const teamId = uuidv4();
+        const claimId = createClaim ? uuidv4() : null;
+
+        await db.orm.transaction(async (tx) => {
+          await tx.insert(db.schema.users).values({
+            id: userId,
+            name: `Provisioned ${email}`,
+            email,
+            emailVerified: false,
+            role: "user",
+            createdAt: now,
+            updatedAt: now,
+          });
+
+          await tx.insert(db.schema.organizations).values({
+            id: organizationId,
+            name: `Provisioned ${userId.slice(0, 8)}`,
+            slug: `provisioned-${userId.slice(0, 8)}`,
+            type: "organization",
+            createdAt: now,
+          });
+
+          await tx.insert(db.schema.members).values({
+            id: uuidv4(),
+            organizationId,
+            userId,
+            role: "owner",
+            createdAt: now,
+          });
+
+          await tx.insert(db.schema.teams).values({
+            id: teamId,
+            name: "Editorial",
+            organizationId,
+            createdAt: now,
+            updatedAt: now,
+          });
+
+          await tx.insert(db.schema.teamMembers).values({
+            id: uuidv4(),
+            teamId,
+            userId,
+            role: "owner",
+            createdAt: now,
+          });
+
+          if (claimId) {
+            await tx.insert(db.schema.waitlist).values({
+              id: claimId,
+              type: "ACCOUNT_CLAIM",
+              status: "INVITED",
+              claimUserId: userId,
+              code: uuidv4(),
+              expiresAt: new Date(Date.now() + expiresInHours * 60 * 60 * 1000),
+              createdAt: now,
+              updatedAt: now,
+            });
+          }
+        });
+
+        sendJson(res, 201, {
+          user: { id: userId, email },
+          organization: { id: organizationId },
+          claim: claimId ? { id: claimId } : null,
+        });
+      }
+    );
+
+    infra.express.post("/__auth-e2e/organizations", async (req: Request, res: Response) => {
+      const body = req.body as { count?: unknown; prefix?: unknown };
+      const count = typeof body.count === "number" ? Math.trunc(body.count) : 12;
+      const prefix = normalizedText(body.prefix, "Harness Organization");
+
+      if (count < 1 || count > 50) {
+        sendJson(res, 400, { error: "count must be between 1 and 50" });
+        return;
+      }
+
+      const now = Date.now();
+      const slugPrefix = slugPart(prefix) || "organization";
+      const organizations = Array.from({ length: count }, (_, index) => {
+        const id = uuidv4();
+        const displayIndex = String(index + 1).padStart(2, "0");
+
+        return {
+          id,
+          name: `${prefix} ${displayIndex}`,
+          slug: `${slugPrefix}-${displayIndex}-${id.slice(0, 8)}`,
+          type: "organization",
+          createdAt: new Date(now + index),
+        };
+      });
+
+      await db.orm.insert(db.schema.organizations).values(organizations);
+
+      sendJson(res, 201, {
+        organizations: organizations.map((organization) => ({
+          id: organization.id,
+          name: organization.name,
+          slug: organization.slug,
+        })),
+      });
+    });
+  }
+}

package/templates/minimal-app/apps/server/src/schema.ts.tpl

@@ -1,20 +1,31 @@
-export {
-  accountClaimMagicLinks,
-  accounts,
-  apikeys,
-  invitations,
-  members,
-  organizations,
-  sessions,
-  teamMembers,
-  teams,
-  users,
-  verifications,
-  waitlist,
-} from "@m5kdev/backend/modules/auth/auth.db";
-export {
-  notificationDevices,
-  notificationSendLogs,
-} from "@m5kdev/backend/modules/notification/notification.db";
-export { workflows } from "@m5kdev/backend/modules/workflow/workflow.db";
-export { posts } from "./modules/posts/posts.db";
+// biome-ignore-all assist/source/organizeImports: feature-gated table exports stay in marker blocks
+export {
+  accountClaimMagicLinks,
+  accounts,
+  apikeys,
+  invitations,
+  members,
+  organizations,
+  sessions,
+  teamMembers,
+  teams,
+  users,
+  verifications,
+  waitlist,
+} from "@m5kdev/backend/modules/auth/auth.db";
+// m5k:ai:start
+export { aiUsage, chats } from "@m5kdev/backend/modules/ai/ai.db";
+// m5k:ai:end
+// m5k:files:start
+export { files } from "@m5kdev/backend/modules/file/file.db";
+// m5k:files:end
+// m5k:notifications:start
+export {
+  notificationDevices,
+  notificationSendLogs,
+} from "@m5kdev/backend/modules/notification/notification.db";
+// m5k:notifications:end
+// m5k:workflows:start
+export { workflows } from "@m5kdev/backend/modules/workflow/workflow.db";
+// m5k:workflows:end
+export { posts } from "./modules/posts/posts.db";

package/templates/minimal-app/apps/server/src/types.ts.tpl

@@ -1,12 +1,12 @@
-import type { inferRouterInputs, inferRouterOutputs } from "@trpc/server";
-import type { builtBackendApp } from "./app";
-
-export type AppRouter = typeof builtBackendApp.trpc.router;
-export type RouterInputs = inferRouterInputs<AppRouter>;
-export type RouterOutputs = inferRouterOutputs<AppRouter>;
-
-export type Orm = typeof builtBackendApp.db.orm;
-export type Schema = typeof builtBackendApp.db.schema;
-
-export type Session = NonNullable<typeof builtBackendApp.auth>["instance"]["$Infer"]["Session"];
-export type User = Session["user"];
+import type { inferRouterInputs, inferRouterOutputs } from "@trpc/server";
+import type { builtBackendApp } from "./app";
+
+export type AppRouter = typeof builtBackendApp.trpc.router;
+export type RouterInputs = inferRouterInputs<AppRouter>;
+export type RouterOutputs = inferRouterOutputs<AppRouter>;
+
+export type Orm = typeof builtBackendApp.db.orm;
+export type Schema = typeof builtBackendApp.db.schema;
+
+export type Session = NonNullable<typeof builtBackendApp.auth>["instance"]["$Infer"]["Session"];
+export type User = Session["user"];

package/templates/minimal-app/apps/server/tsconfig.json.tpl

@@ -9,5 +9,5 @@
     "rootDir": "."
   },
   "exclude": ["node_modules"],
-  "include": ["src/**/*.ts", "drizzle/**/*.ts", "drizzle.config.ts", "tsup.config.ts"]
+  "include": ["src/**/*.ts", "db.ts", "db.e2e.ts", "drizzle/**/*.ts", "drizzle.config.ts", "tsup.config.ts"]
 }