@cosmicdrift/kumiko-bundled-features 0.14.0 → 0.16.0

package/src/subscription-stripe/verify-webhook.ts

@@ -72,7 +72,7 @@ export function verifyAndParseStripeWebhook(
     //    mapped throw → HTTP 401.
     let event: Stripe.Event;
     try {
-      event = stripe.webhooks.constructEvent(rawBody, sigHeader, options.webhookSecret);
+      event = await stripe.webhooks.constructEventAsync(rawBody, sigHeader, options.webhookSecret);
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e);
       throw new Error(`subscription-stripe: webhook signature verify failed — ${msg}`);

package/src/template-resolver/__tests__/handlers.integration.ts

@@ -1,3 +1,4 @@
+import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import type { DbConnection } from "@cosmicdrift/kumiko-framework/db";
 import { SYSTEM_TENANT_ID } from "@cosmicdrift/kumiko-framework/engine";
 import { createEventsTable } from "@cosmicdrift/kumiko-framework/event-store";
@@ -10,7 +11,6 @@ import {
   unsafeCreateEntityTable,
 } from "@cosmicdrift/kumiko-framework/stack";
 import { expectErrorIncludes } from "@cosmicdrift/kumiko-framework/testing";
-import { afterAll, beforeAll, describe, expect, test } from "vitest";
 import { createTemplateResolverFeature } from "../feature";
 import { TemplateResolverHandlers, TemplateResolverQueries } from "../qualified-names";
 import { templateResourceEntity } from "../table";

package/src/template-resolver/__tests__/template-resolver.integration.ts

@@ -1,10 +1,11 @@
+import { afterAll, beforeAll, describe, expect, test } from "bun:test";
+import { insertOne } from "@cosmicdrift/kumiko-framework/bun-db";
 import type { DbConnection } from "@cosmicdrift/kumiko-framework/db";
 import {
   setupTestStack,
   type TestStack,
   unsafeCreateEntityTable,
 } from "@cosmicdrift/kumiko-framework/stack";
-import { afterAll, beforeAll, describe, expect, test } from "vitest";
 import { createTemplateResolverApi, TemplateNotFoundError, type TemplateResolverApi } from "../api";
 import {
   type ContentFormat,
@@ -55,7 +56,7 @@ async function seedTemplate(args: {
   linkedResources?: Record<string, string>;
   parentTemplateId?: string;
 }) {
-  await db.insert(templateResourcesTable).values({
+  await insertOne(db, templateResourcesTable, {
     tenantId: args.tenantId,
     slug: args.slug,
     kind: args.kind,

package/src/template-resolver/api.ts

@@ -3,10 +3,10 @@
 // runtime aus ctx.templateResolver. Pattern symmetrisch zu textContent
 // (siehe text-content/api.ts).
 
+import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
 import type { DbConnection } from "@cosmicdrift/kumiko-framework/db";
 import type { SessionUser, TenantId } from "@cosmicdrift/kumiko-framework/engine";
 import { InternalError } from "@cosmicdrift/kumiko-framework/errors";
-import { and, eq } from "drizzle-orm";
 import type { ContentFormat, RenderKind } from "./constants";
 import { FALLBACK_LOCALE, SYSTEM_TENANT_ID } from "./constants";
 import { type TemplateResourceRow, templateResourcesTable } from "./table";
@@ -111,18 +111,12 @@ async function fetchTemplate(
   kind: RenderKind,
   locale: string,
 ): Promise<TemplateResourceRow | null> {
-  const rows = await db
-    .select()
-    .from(templateResourcesTable)
-    .where(
-      and(
-        eq(templateResourcesTable["tenantId"], tenantId),
-        eq(templateResourcesTable["slug"], slug),
-        eq(templateResourcesTable["kind"], kind),
-        eq(templateResourcesTable["locale"], locale),
-      ),
-    )
-    .limit(1);
+  const rows = await selectMany(
+    db,
+    templateResourcesTable,
+    { tenantId, slug, kind, locale },
+    { limit: 1 },
+  );
   // @cast-boundary db-row — db.select returnt unbenanntes unknown[],
   // Row-Shape ist via templateResourcesTable + buildBaseColumns garantiert.
   return (rows[0] as TemplateResourceRow | undefined) ?? null;

package/src/template-resolver/handlers/archive.write.ts

@@ -1,7 +1,6 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
 import { defineWriteHandler } from "@cosmicdrift/kumiko-framework/engine";
 import { NotFoundError, writeFailure } from "@cosmicdrift/kumiko-framework/errors";
-import { eq } from "drizzle-orm";
 import { z } from "zod";
 import type { TemplateResourceRow } from "../table";
 import { templateResourcesTable } from "../table";
@@ -15,11 +14,9 @@ export const archiveWrite = defineWriteHandler({
   schema: z.object({ id: z.string().min(1) }),
   access: { roles: ["TenantAdmin", "SystemAdmin"] },
   handler: async (event, ctx) => {
-    const existing = await fetchOne<TemplateResourceRow>(
-      ctx.db,
-      templateResourcesTable,
-      eq(templateResourcesTable["id"], event.payload.id),
-    );
+    const existing = await fetchOne<TemplateResourceRow>(ctx.db, templateResourcesTable, {
+      id: event.payload.id,
+    });
     // ctx.db ist via createTenantDb tenant-scoped — existing ist null wenn
     // das Template einem fremden Tenant gehört (SystemAdmin-Cross-Tenant
     // braucht tenantIdOverride im Schema, M2-Erweiterung).

package/src/template-resolver/handlers/find-by-id.query.ts

@@ -1,6 +1,5 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
 import { defineQueryHandler } from "@cosmicdrift/kumiko-framework/engine";
-import { eq } from "drizzle-orm";
 import { z } from "zod";
 import { type TemplateResourceRow, templateResourcesTable } from "../table";
 
@@ -14,11 +13,9 @@ export const findByIdQuery = defineQueryHandler({
   schema: z.object({ id: z.string().min(1) }),
   access: { roles: ["TenantAdmin", "SystemAdmin", "User"] },
   handler: async (query, ctx) => {
-    const row = await fetchOne<TemplateResourceRow>(
-      ctx.db,
-      templateResourcesTable,
-      eq(templateResourcesTable["id"], query.payload.id),
-    );
+    const row = await fetchOne<TemplateResourceRow>(ctx.db, templateResourcesTable, {
+      id: query.payload.id,
+    });
     if (!row) return null;
     const isSystemAdmin = query.user.roles.includes("SystemAdmin");
     const isOwnTenant = row.tenantId === query.user.tenantId;

package/src/template-resolver/handlers/list.query.ts

@@ -1,5 +1,5 @@
+import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
 import { defineQueryHandler, SYSTEM_TENANT_ID } from "@cosmicdrift/kumiko-framework/engine";
-import { and, eq, or, type SQL } from "drizzle-orm";
 import { z } from "zod";
 import { RENDER_KINDS, TEMPLATE_STATUSES } from "../constants";
 import { type TemplateResourceRow, templateResourcesTable } from "../table";
@@ -18,43 +18,35 @@ export const listQuery = defineQueryHandler({
   access: { roles: ["TenantAdmin", "SystemAdmin", "User"] },
   handler: async (query, ctx) => {
     const isSystemAdmin = query.user.roles.includes("SystemAdmin");
-    const conditions: SQL<unknown>[] = [];
+    const where: Record<string, unknown> = {};
 
     // Tenant-Scope: SystemAdmin sieht alles, andere nur eigener Tenant + System
     if (!isSystemAdmin) {
       if (query.payload.includeSystem) {
-        const scopeCondition = or(
-          eq(templateResourcesTable["tenantId"], query.user.tenantId),
-          eq(templateResourcesTable["tenantId"], SYSTEM_TENANT_ID),
-        );
-        if (scopeCondition) conditions.push(scopeCondition);
+        where["tenantId"] = [query.user.tenantId, SYSTEM_TENANT_ID];
       } else {
-        conditions.push(eq(templateResourcesTable["tenantId"], query.user.tenantId));
+        where["tenantId"] = query.user.tenantId;
       }
     } else if (!query.payload.includeSystem) {
-      // SystemAdmin mit includeSystem=false → noch eigener Tenant only
-      conditions.push(eq(templateResourcesTable["tenantId"], query.user.tenantId));
+      // SystemAdmin mit includeSystem=false → nur eigener Tenant
+      where["tenantId"] = query.user.tenantId;
     }
 
     if (query.payload.kind) {
-      conditions.push(eq(templateResourcesTable["kind"], query.payload.kind));
+      where["kind"] = query.payload.kind;
     }
     if (query.payload.locale) {
-      conditions.push(eq(templateResourcesTable["locale"], query.payload.locale));
+      where["locale"] = query.payload.locale;
     }
     if (query.payload.status) {
-      conditions.push(eq(templateResourcesTable["status"], query.payload.status));
+      where["status"] = query.payload.status;
     }
 
-    const whereExpr = conditions.length > 0 ? and(...conditions) : undefined;
-
-    // @cast-boundary db-row — db.select returnt unknown[]; Row-Shape ist
+    // @cast-boundary db-row — selectMany returnt unknown[]; Row-Shape ist
     // durch templateResourcesTable + buildBaseColumns garantiert.
-    const rows = (await ctx.db
-      .select()
-      .from(templateResourcesTable)
-      .where(whereExpr)
-      .limit(500)) as TemplateResourceRow[];
+    const rows = (await selectMany(ctx.db, templateResourcesTable, where, {
+      limit: 500,
+    })) as TemplateResourceRow[];
 
     return rows.map((row) => ({
       id: String(row.id),

package/src/template-resolver/handlers/publish.write.ts

@@ -1,7 +1,6 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
 import { defineWriteHandler } from "@cosmicdrift/kumiko-framework/engine";
 import { NotFoundError, writeFailure } from "@cosmicdrift/kumiko-framework/errors";
-import { eq } from "drizzle-orm";
 import { z } from "zod";
 import type { TemplateResourceRow } from "../table";
 import { templateResourcesTable } from "../table";
@@ -18,11 +17,9 @@ export const publishWrite = defineWriteHandler({
   schema: z.object({ id: z.string().min(1) }),
   access: { roles: ["TenantAdmin", "SystemAdmin"] },
   handler: async (event, ctx) => {
-    const existing = await fetchOne<TemplateResourceRow>(
-      ctx.db,
-      templateResourcesTable,
-      eq(templateResourcesTable["id"], event.payload.id),
-    );
+    const existing = await fetchOne<TemplateResourceRow>(ctx.db, templateResourcesTable, {
+      id: event.payload.id,
+    });
     // ctx.db ist via createTenantDb tenant-scoped — existing ist null wenn
     // das Template einem fremden Tenant gehört (SystemAdmin-Cross-Tenant
     // braucht tenantIdOverride im Schema, M2-Erweiterung).

package/src/template-resolver/handlers/upsert-system.write.ts

@@ -1,10 +1,9 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
 import {
   defineWriteHandler,
   SYSTEM_TENANT_ID,
   type TenantId,
 } from "@cosmicdrift/kumiko-framework/engine";
-import { eq } from "drizzle-orm";
 import type { TemplateResourceRow } from "../table";
 import { templateResourcesTable } from "../table";
 import { executor, upsertPayloadSchema } from "./shared";
@@ -27,14 +26,12 @@ export const upsertSystemWrite = defineWriteHandler({
     // Pattern symmetrisch zu text-content setWrite Override-Branch.
     const executorUser = { ...event.user, tenantId };
 
-    const existing = await fetchOne<TemplateResourceRow>(
-      db,
-      templateResourcesTable,
-      eq(templateResourcesTable["tenantId"], tenantId),
-      eq(templateResourcesTable["slug"], event.payload.slug),
-      eq(templateResourcesTable["kind"], event.payload.kind),
-      eq(templateResourcesTable["locale"], event.payload.locale),
-    );
+    const existing = await fetchOne<TemplateResourceRow>(db, templateResourcesTable, {
+      tenantId,
+      slug: event.payload.slug,
+      kind: event.payload.kind,
+      locale: event.payload.locale,
+    });
 
     const fields = {
       slug: event.payload.slug,

package/src/template-resolver/handlers/upsert-tenant.write.ts

@@ -1,11 +1,10 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
 import {
   defineWriteHandler,
   SYSTEM_TENANT_ID,
   type TenantId,
 } from "@cosmicdrift/kumiko-framework/engine";
 import { AccessDeniedError, writeFailure } from "@cosmicdrift/kumiko-framework/errors";
-import { eq } from "drizzle-orm";
 import { z } from "zod";
 import type { TemplateResourceRow } from "../table";
 import { templateResourcesTable } from "../table";
@@ -52,14 +51,12 @@ export const upsertTenantWrite = defineWriteHandler({
     const tenantId = (override ?? event.user.tenantId) as TenantId;
     const executorUser = override !== undefined ? { ...event.user, tenantId } : event.user;
 
-    const existing = await fetchOne<TemplateResourceRow>(
-      db,
-      templateResourcesTable,
-      eq(templateResourcesTable["tenantId"], tenantId),
-      eq(templateResourcesTable["slug"], event.payload.slug),
-      eq(templateResourcesTable["kind"], event.payload.kind),
-      eq(templateResourcesTable["locale"], event.payload.locale),
-    );
+    const existing = await fetchOne<TemplateResourceRow>(db, templateResourcesTable, {
+      tenantId,
+      slug: event.payload.slug,
+      kind: event.payload.kind,
+      locale: event.payload.locale,
+    });
 
     const fields = {
       slug: event.payload.slug,

package/src/template-resolver/table.ts

@@ -1,4 +1,4 @@
-import { buildDrizzleTable } from "@cosmicdrift/kumiko-framework/db";
+import { buildEntityTable } from "@cosmicdrift/kumiko-framework/db";
 import {
   createEntity,
   createLongTextField,
@@ -40,10 +40,7 @@ export const templateResourceEntity = createEntity({
   ],
 });
 
-export const templateResourcesTable = buildDrizzleTable(
-  "template-resource",
-  templateResourceEntity,
-);
+export const templateResourcesTable = buildEntityTable("template-resource", templateResourceEntity);
 
 // Concrete Row-Type — single-source dafür dass die unknown-Werte die
 // Drizzle aus `Record<string, unknown>` liefert genau einmal benannt

package/src/tenant/__tests__/multi-tenant.integration.ts

@@ -1,3 +1,4 @@
+import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { buildServer, type JwtHelper } from "@cosmicdrift/kumiko-framework/api";
 import { createTenantDb, type DbConnection } from "@cosmicdrift/kumiko-framework/db";
 import {
@@ -21,7 +22,6 @@ import {
 } from "@cosmicdrift/kumiko-framework/stack";
 import { bridgeStub, sleep } from "@cosmicdrift/kumiko-framework/testing";
 import type { Hono } from "hono";
-import { afterAll, beforeAll, describe, expect, test } from "vitest";
 import { createConfigFeature } from "../../config/feature";
 import { createConfigResolver } from "../../config/resolver";
 import { configValuesTable } from "../../config/table";

package/src/tenant/__tests__/seed-testing.integration.ts

@@ -11,6 +11,8 @@
 //   4. The `by`-user shows up as insertedById on the projection — so
 //      audit-queries that join events→users actually find the actor.
 
+import { afterAll, beforeAll, beforeEach, describe, expect, test } from "bun:test";
+import { asRawClient, selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
 import type { TenantId } from "@cosmicdrift/kumiko-framework/engine";
 import { createEventsTable, eventsTable } from "@cosmicdrift/kumiko-framework/event-store";
 import {
@@ -21,8 +23,6 @@ import {
   unsafeCreateEntityTable,
   unsafePushTables,
 } from "@cosmicdrift/kumiko-framework/stack";
-import { and, eq } from "drizzle-orm";
-import { afterAll, beforeAll, beforeEach, describe, expect, test } from "vitest";
 import { createConfigFeature } from "../../config/feature";
 import { createConfigResolver } from "../../config/resolver";
 import { configValuesTable } from "../../config/table";
@@ -53,11 +53,11 @@ afterAll(async () => {
 });
 
 beforeEach(async () => {
-  await stack.db.delete(tenantMembershipsTable);
-  await stack.db.delete(tenantTable);
+  await asRawClient(stack.db).unsafe(`DELETE FROM "${tenantMembershipsTable.tableName}"`);
+  await asRawClient(stack.db).unsafe(`DELETE FROM "${tenantTable.tableName}"`);
   // Events stay — the idempotency test below inspects how many .created
   // events exist for the same aggregate-key pair across runs.
-  await stack.db.delete(eventsTable);
+  await asRawClient(stack.db).unsafe(`DELETE FROM "${eventsTable.tableName}"`);
 });
 
 describe("seedTenant", () => {
@@ -69,7 +69,7 @@ describe("seedTenant", () => {
     });
     expect(id).toBe(TENANT_A);
 
-    const rows = await stack.db.select().from(tenantTable).where(eq(tenantTable["id"], TENANT_A));
+    const rows = await selectMany(stack.db, tenantTable, { id: TENANT_A });
     expect(rows).toHaveLength(1);
     expect(rows[0]?.["id"]).toBe(TENANT_A);
     expect(rows[0]?.["key"]).toBe("tenant-a");
@@ -78,10 +78,7 @@ describe("seedTenant", () => {
 
   test("emittiert tenant.created-Event auf den Aggregate-Stream", async () => {
     await seedTenant(stack.db, { id: TENANT_A, key: "tenant-a", name: "Tenant A" });
-    const events = await stack.db
-      .select()
-      .from(eventsTable)
-      .where(eq(eventsTable.aggregateType, "tenant"));
+    const events = await selectMany(stack.db, eventsTable, { aggregateType: "tenant" });
     const createdEvents = events.filter((e) => e.type === "tenant.created");
     expect(createdEvents).toHaveLength(1);
     // Aggregate-id steht im event-row (aggregateId), nicht im payload —
@@ -97,21 +94,18 @@ describe("seedTenant", () => {
     await seedTenant(stack.db, { id: TENANT_A, key: "tenant-a", name: "Tenant A v2" });
 
     // Projection bleibt bei Original-name (zweiter Call wurde geskippt, kein update).
-    const rows = await stack.db.select().from(tenantTable).where(eq(tenantTable["id"], TENANT_A));
+    const rows = await selectMany(stack.db, tenantTable, { id: TENANT_A });
     expect(rows).toHaveLength(1);
     expect(rows[0]?.["name"]).toBe("Tenant A");
 
-    const events = await stack.db
-      .select()
-      .from(eventsTable)
-      .where(eq(eventsTable.aggregateType, "tenant"));
+    const events = await selectMany(stack.db, eventsTable, { aggregateType: "tenant" });
     expect(events.filter((e) => e.type === "tenant.created")).toHaveLength(1);
   });
 
   test("zwei verschiedene Tenants in einem Test — beide in der Projection", async () => {
     await seedTenant(stack.db, { id: TENANT_A, key: "a", name: "A" });
     await seedTenant(stack.db, { id: TENANT_B, key: "b", name: "B" });
-    const rows = await stack.db.select().from(tenantTable);
+    const rows = await selectMany(stack.db, tenantTable);
     expect(rows.map((r) => r["id"]).sort()).toEqual([TENANT_A, TENANT_B].sort());
   });
 });
@@ -124,15 +118,10 @@ describe("seedTenantMembership", () => {
       roles: ["Admin", "Billing"],
     });
 
-    const rows = await stack.db
-      .select()
-      .from(tenantMembershipsTable)
-      .where(
-        and(
-          eq(tenantMembershipsTable.userId, ALICE_ID),
-          eq(tenantMembershipsTable.tenantId, TENANT_A),
-        ),
-      );
+    const rows = await selectMany(stack.db, tenantMembershipsTable, {
+      userId: ALICE_ID,
+      tenantId: TENANT_A,
+    });
     expect(rows).toHaveLength(1);
     expect(rows[0]?.["userId"]).toBe(ALICE_ID);
     expect(rows[0]?.["tenantId"]).toBe(TENANT_A);
@@ -146,10 +135,7 @@ describe("seedTenantMembership", () => {
       roles: ["User"],
     });
 
-    const events = await stack.db
-      .select()
-      .from(eventsTable)
-      .where(eq(eventsTable.aggregateType, "tenant-membership"));
+    const events = await selectMany(stack.db, eventsTable, { aggregateType: "tenant-membership" });
     const createdEvents = events.filter((e) => e.type === "tenant-membership.created");
     expect(createdEvents).toHaveLength(1);
     // Payload should carry the seeded data — MSPs/audit rely on this.
@@ -180,16 +166,10 @@ describe("seedTenantMembership", () => {
       roles: ["User"],
     });
 
-    const projectionRows = await stack.db
-      .select()
-      .from(tenantMembershipsTable)
-      .where(eq(tenantMembershipsTable.userId, ALICE_ID));
+    const projectionRows = await selectMany(stack.db, tenantMembershipsTable, { userId: ALICE_ID });
     expect(projectionRows).toHaveLength(1);
 
-    const events = await stack.db
-      .select()
-      .from(eventsTable)
-      .where(eq(eventsTable.aggregateType, "tenant-membership"));
+    const events = await selectMany(stack.db, eventsTable, { aggregateType: "tenant-membership" });
     expect(events.filter((e) => e.type === "tenant-membership.created")).toHaveLength(1);
   });
 
@@ -205,10 +185,7 @@ describe("seedTenantMembership", () => {
       by: seedActor,
     });
 
-    const [row] = await stack.db
-      .select()
-      .from(tenantMembershipsTable)
-      .where(eq(tenantMembershipsTable.userId, ALICE_ID));
+    const [row] = await selectMany(stack.db, tenantMembershipsTable, { userId: ALICE_ID });
     expect(row?.["insertedById"]).toBe(seedActor.id);
   });
 
@@ -220,10 +197,7 @@ describe("seedTenantMembership", () => {
       tenantId: TENANT_A,
       roles: ["User"],
     });
-    const [row] = await stack.db
-      .select()
-      .from(tenantMembershipsTable)
-      .where(eq(tenantMembershipsTable.userId, ALICE_ID));
+    const [row] = await selectMany(stack.db, tenantMembershipsTable, { userId: ALICE_ID });
     expect(row?.["insertedById"]).toBe(TestUsers.systemAdmin.id);
   });
 });

package/src/tenant/__tests__/tenant.integration.ts

@@ -1,3 +1,4 @@
+import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { randomBytes } from "node:crypto";
 import { createEncryptionProvider, type DbConnection } from "@cosmicdrift/kumiko-framework/db";
 import { createEventsTable } from "@cosmicdrift/kumiko-framework/event-store";
@@ -10,7 +11,6 @@ import {
   unsafePushTables,
 } from "@cosmicdrift/kumiko-framework/stack";
 import { expectErrorIncludes, rolesOf } from "@cosmicdrift/kumiko-framework/testing";
-import { afterAll, beforeAll, describe, expect, test } from "vitest";
 import { createConfigAccessor, createConfigFeature } from "../../config";
 import { ConfigHandlers, ConfigQueries } from "../../config/constants";
 import { type ConfigResolver, createConfigResolver } from "../../config/resolver";

package/src/tenant/handlers/active-tenant-ids.query.ts

@@ -1,6 +1,5 @@
-import type { DbRow } from "@cosmicdrift/kumiko-framework/db";
+import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
 import { defineQueryHandler, SYSTEM_ROLE } from "@cosmicdrift/kumiko-framework/engine";
-import { eq } from "drizzle-orm";
 import { z } from "zod";
 import { tenantTable } from "../schema/tenant";
 
@@ -9,11 +8,7 @@ export const activeTenantIdsQuery = defineQueryHandler({
   schema: z.object({}),
   access: { roles: [SYSTEM_ROLE, "SystemAdmin"] },
   handler: async (_query, ctx) => {
-    const rows = await ctx.db
-      ?.select({ id: tenantTable["id"] })
-      .from(tenantTable)
-      .where(eq(tenantTable["isEnabled"], true));
-
-    return rows.map((row) => (row as DbRow)["id"] as number); // @cast-boundary db-row
+    const rows = await selectMany<{ id: number }>(ctx.db, tenantTable, { isEnabled: true });
+    return rows.map((r) => r.id);
   },
 });

package/src/tenant/handlers/add-member.write.ts

@@ -1,7 +1,7 @@
-import { createEventStoreExecutor, fetchOne } from "@cosmicdrift/kumiko-framework/db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { createEventStoreExecutor } from "@cosmicdrift/kumiko-framework/db";
 import { defineWriteHandler } from "@cosmicdrift/kumiko-framework/engine";
 import { ConflictError, writeFailure } from "@cosmicdrift/kumiko-framework/errors";
-import { eq } from "drizzle-orm";
 import { z } from "zod";
 import { TenantErrors } from "../constants";
 import { tenantMembershipEntity, tenantMembershipsTable } from "../membership-table";
@@ -20,12 +20,10 @@ export const addMemberWrite = defineWriteHandler({
   access: { roles: ["SystemAdmin"] },
   handler: async (event, ctx) => {
     const db = ctx.db;
-    const existing = await fetchOne(
-      db,
-      tenantMembershipsTable,
-      eq(tenantMembershipsTable.userId, event.payload.userId),
-      eq(tenantMembershipsTable.tenantId, event.payload.tenantId),
-    );
+    const existing = await fetchOne(db, tenantMembershipsTable, {
+      userId: event.payload.userId,
+      tenantId: event.payload.tenantId,
+    });
     if (existing) {
       return writeFailure(
         new ConflictError({

package/src/tenant/handlers/cancel-invitation.write.ts

@@ -10,10 +10,10 @@
 // invitation = no-op + 200. Cancellen einer non-existent invitation
 // = invitation_not_found.
 
-import { createEventStoreExecutor, fetchOne } from "@cosmicdrift/kumiko-framework/db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { createEventStoreExecutor } from "@cosmicdrift/kumiko-framework/db";
 import { defineWriteHandler } from "@cosmicdrift/kumiko-framework/engine";
 import { NotFoundError, writeFailure } from "@cosmicdrift/kumiko-framework/errors";
-import { eq } from "drizzle-orm";
 import { z } from "zod";
 // kumiko-lint-ignore cross-feature-import cancel needs invite-token-store für Redis-cleanup
 import {
@@ -39,11 +39,9 @@ export const cancelInvitationWrite = defineWriteHandler({
   schema: CancelInvitationSchema,
   access: { roles: ["Admin"] },
   handler: async (event, ctx) => {
-    const invitation = await fetchOne(
-      ctx.db.raw,
-      tenantInvitationsTable,
-      eq(tenantInvitationsTable.id, event.payload.invitationId),
-    );
+    const invitation = await fetchOne(ctx.db.raw, tenantInvitationsTable, {
+      id: event.payload.invitationId,
+    });
     if (!invitation || invitation["tenantId"] !== event.user.tenantId) {
       return writeFailure(
         new NotFoundError("tenantInvitation", event.payload.invitationId, {

package/src/tenant/handlers/invitations.query.ts

@@ -1,5 +1,5 @@
+import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
 import { defineQueryHandler } from "@cosmicdrift/kumiko-framework/engine";
-import { and, eq } from "drizzle-orm";
 import { z } from "zod";
 import { INVITATION_STATUS, tenantInvitationsTable } from "../invitation-table";
 
@@ -17,15 +17,10 @@ export const invitationsQuery = defineQueryHandler({
   schema: z.object({}),
   access: { roles: ["Admin", "SystemAdmin"] },
   handler: async (query, ctx) => {
-    const rows = await ctx.db
-      ?.select()
-      .from(tenantInvitationsTable)
-      .where(
-        and(
-          eq(tenantInvitationsTable.tenantId, query.user.tenantId),
-          eq(tenantInvitationsTable.status, INVITATION_STATUS.pending),
-        ),
-      );
+    const rows = await selectMany(ctx.db, tenantInvitationsTable, {
+      tenantId: query.user.tenantId,
+      status: INVITATION_STATUS.pending,
+    });
     return rows ?? [];
   },
 });

package/src/tenant/handlers/me.query.ts

@@ -1,6 +1,5 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
 import { defineQueryHandler } from "@cosmicdrift/kumiko-framework/engine";
-import { eq } from "drizzle-orm";
 import { z } from "zod";
 import { tenantTable } from "../schema/tenant";
 
@@ -11,7 +10,7 @@ export const meQuery = defineQueryHandler({
   schema: z.object({}),
   access: { openToAll: true },
   handler: async (query, ctx) => {
-    const row = await fetchOne(ctx.db, tenantTable, eq(tenantTable["id"], query.user.tenantId));
+    const row = await fetchOne(ctx.db, tenantTable, { id: query.user.tenantId });
     return row ?? null;
   },
 });

package/src/tenant/handlers/members.query.ts

@@ -1,6 +1,6 @@
+import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
 import { defineQueryHandler } from "@cosmicdrift/kumiko-framework/engine";
 import { parseRoles } from "@cosmicdrift/kumiko-framework/utils";
-import { eq } from "drizzle-orm";
 import { z } from "zod";
 import { tenantMembershipsTable } from "../membership-table";
 
@@ -9,10 +9,9 @@ export const membersQuery = defineQueryHandler({
   schema: z.object({}),
   access: { roles: ["Admin", "SystemAdmin"] },
   handler: async (query, ctx) => {
-    const rows = await ctx.db
-      ?.select()
-      .from(tenantMembershipsTable)
-      .where(eq(tenantMembershipsTable.tenantId, query.user.tenantId));
+    const rows = await selectMany(ctx.db, tenantMembershipsTable, {
+      tenantId: query.user.tenantId,
+    });
 
     return rows.map((row) => ({
       ...row,