@fragno-dev/db 0.1.13 → 0.1.14

package/src/adapters/kysely/kysely-uow-compiler.test.ts

@@ -114,12 +114,12 @@ describe("kysely-uow-compiler", () => {
 
   // Helper to create UnitOfWork for testing
   function createTestUOW(name?: string) {
-    const mockCompiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+    const mockCompiler = createKyselyUOWCompiler(pool, "postgresql");
     const mockExecutor = {
       executeRetrievalPhase: async () => [],
       executeMutationPhase: async () => ({ success: true, createdInternalIds: [] }),
     };
-    const mockDecoder: UOWDecoder<typeof testSchema> = (rawResults, operations) => {
+    const mockDecoder: UOWDecoder = (rawResults, operations) => {
       if (rawResults.length !== operations.length) {
         throw new Error("rawResults and ops must have the same length");
       }
@@ -136,7 +136,7 @@ describe("kysely-uow-compiler", () => {
         b.whereIndex("idx_email", (eb) => eb("email", "=", "test@example.com")),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -152,7 +152,7 @@ describe("kysely-uow-compiler", () => {
         b.whereIndex("idx_name", (eb) => eb("name", "=", "Alice")).select(["id", "name"]),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -166,7 +166,7 @@ describe("kysely-uow-compiler", () => {
       const uow = createTestUOW();
       uow.find("users", (b) => b.whereIndex("primary").pageSize(10));
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -180,7 +180,7 @@ describe("kysely-uow-compiler", () => {
       const uow = createTestUOW();
       uow.find("users", (b) => b.whereIndex("primary").orderByIndex("primary", "desc"));
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -193,7 +193,7 @@ describe("kysely-uow-compiler", () => {
       const uow = createTestUOW();
       uow.find("users", (b) => b.whereIndex("idx_name").orderByIndex("idx_name", "desc"));
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -209,7 +209,7 @@ describe("kysely-uow-compiler", () => {
       );
       uow.find("posts", (b) => b.whereIndex("idx_title", (eb) => eb("title", "contains", "test")));
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(2);
@@ -228,7 +228,7 @@ describe("kysely-uow-compiler", () => {
         return b;
       });
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -241,7 +241,7 @@ describe("kysely-uow-compiler", () => {
       const uow = createTestUOW();
       uow.find("users", (b) => b.whereIndex("idx_age", (eb) => eb("age", ">", 25)).selectCount());
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -263,7 +263,7 @@ describe("kysely-uow-compiler", () => {
         b.whereIndex("idx_name").orderByIndex("idx_name", "asc").after(cursor).pageSize(10),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -285,7 +285,7 @@ describe("kysely-uow-compiler", () => {
         b.whereIndex("idx_name").orderByIndex("idx_name", "desc").before(cursor).pageSize(10),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -311,7 +311,7 @@ describe("kysely-uow-compiler", () => {
           .pageSize(5),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -331,7 +331,7 @@ describe("kysely-uow-compiler", () => {
         age: 30,
       });
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -357,7 +357,7 @@ describe("kysely-uow-compiler", () => {
         }),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -373,7 +373,7 @@ describe("kysely-uow-compiler", () => {
       const userId = FragnoId.fromExternal("user123", 5);
       uow.update("users", userId, (b) => b.set({ age: 18 }).check());
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -389,7 +389,7 @@ describe("kysely-uow-compiler", () => {
       const userId = FragnoId.fromExternal("user123", 0);
       uow.delete("users", userId);
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -405,7 +405,7 @@ describe("kysely-uow-compiler", () => {
       const userId = FragnoId.fromExternal("user123", 3);
       uow.delete("users", userId, (b) => b.check());
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -425,7 +425,7 @@ describe("kysely-uow-compiler", () => {
         }),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -440,7 +440,7 @@ describe("kysely-uow-compiler", () => {
       const uow = createTestUOW();
       uow.delete("users", "user123");
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -480,7 +480,7 @@ describe("kysely-uow-compiler", () => {
       const userId = FragnoId.fromExternal("user456", 0);
       uow.delete("posts", userId);
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
       const [createBatch, updateBatch, deleteBatch] = compiled.mutationBatch;
 
@@ -519,7 +519,7 @@ describe("kysely-uow-compiler", () => {
       const userId = FragnoId.fromExternal("user123", 3);
       uow.update("users", userId, (b) => b.set({ age: 31 }).check());
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.name).toBe("update-user-balance");
@@ -551,7 +551,7 @@ describe("kysely-uow-compiler", () => {
         ),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -565,7 +565,7 @@ describe("kysely-uow-compiler", () => {
       const uow = createTestUOW();
       uow.find("users", (b) => b.whereIndex("primary", () => false));
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       // When condition is false, the operation should return null and not be added to batch
@@ -576,7 +576,7 @@ describe("kysely-uow-compiler", () => {
       const uow = createTestUOW();
       uow.find("users", (b) => b.whereIndex("primary", () => true));
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -593,7 +593,7 @@ describe("kysely-uow-compiler", () => {
       const userId = FragnoId.fromExternal("user123", 5);
       uow.update("users", userId, (b) => b.set({ age: 31 }).check());
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -610,7 +610,7 @@ describe("kysely-uow-compiler", () => {
       const userId = FragnoId.fromExternal("user456", 3);
       uow.delete("users", userId, (b) => b.check());
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -630,7 +630,7 @@ describe("kysely-uow-compiler", () => {
       uow.update("users", userId, (b) => b.set({ age: 30 }).check());
       uow.update("posts", postId, (b) => b.set({ viewCount: 100 }).check());
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
       const [userBatch, postBatch] = compiled.mutationBatch;
 
@@ -657,7 +657,7 @@ describe("kysely-uow-compiler", () => {
       const userId = FragnoId.fromExternal("user1", 0);
       uow.update("users", userId, (b) => b.set({ age: 25 }));
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
       const [batch] = compiled.mutationBatch;
       assert(batch);
@@ -676,7 +676,7 @@ describe("kysely-uow-compiler", () => {
         b.whereIndex("primary").join((jb) => jb.author((ab) => ab.select(["name", "email"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -700,7 +700,7 @@ describe("kysely-uow-compiler", () => {
           ),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -719,7 +719,7 @@ describe("kysely-uow-compiler", () => {
           .join((jb) => jb.author((ab) => ab.select(["name"]).orderByIndex("idx_name", "desc"))),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -735,7 +735,7 @@ describe("kysely-uow-compiler", () => {
         b.whereIndex("primary").join((jb) => jb.author((ab) => ab.select(["name"]).pageSize(5))),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -766,7 +766,7 @@ describe("kysely-uow-compiler", () => {
         ),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -785,7 +785,7 @@ describe("kysely-uow-compiler", () => {
           .join((jb) => jb.post((pb) => pb.select(["title"])).author((ab) => ab.select(["name"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -803,7 +803,7 @@ describe("kysely-uow-compiler", () => {
         b.whereIndex("primary").join((jb) => jb.inviter((ib) => ib.select(["name", "email"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -833,7 +833,7 @@ describe("kysely-uow-compiler", () => {
           ),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -856,7 +856,7 @@ describe("kysely-uow-compiler", () => {
           .join((jb) => jb.post((pb) => pb.select(["title"])).tag((tb) => tb.select(["name"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -881,7 +881,7 @@ describe("kysely-uow-compiler", () => {
           ),
       );
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -897,7 +897,7 @@ describe("kysely-uow-compiler", () => {
     it("should handle UOW with no operations", () => {
       const uow = createTestUOW();
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(0);
@@ -908,7 +908,7 @@ describe("kysely-uow-compiler", () => {
       const uow = createTestUOW();
       uow.find("users");
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -922,7 +922,7 @@ describe("kysely-uow-compiler", () => {
         email: "test@example.com",
       });
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(0);
@@ -949,7 +949,7 @@ describe("kysely-uow-compiler", () => {
         content: "This is my first post",
       });
 
-      const compiler = createKyselyUOWCompiler(testSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       // Should have no retrieval operations

package/src/adapters/kysely/kysely-uow-compiler.ts

@@ -11,7 +11,7 @@ import { createKyselyQueryBuilder } from "./kysely-query-builder";
 import { buildCondition, type Condition } from "../../query/condition-builder";
 import { decodeCursor, serializeCursorValues } from "../../query/cursor";
 import type { AnySelectClause } from "../../query/query";
-import type { TableNameMapper } from "./kysely-shared";
+import { type TableNameMapper, createTableNameMapper } from "./kysely-shared";
 import type { ConnectionPool } from "../../shared/connection-pool";
 import type { SQLProvider } from "../../shared/providers";
 
@@ -24,24 +24,57 @@ type KyselyAny = Kysely<any>;
  * This compiler translates UOW operations into Kysely CompiledQuery objects
  * that can be executed as a batch/transaction.
  *
- * @param schema - The database schema
  * @param pool - Connection pool for acquiring database connections
  * @param provider - SQL provider (postgresql, mysql, sqlite, etc.)
- * @param mapper - Optional table name mapper for namespace prefixing
+ * @param mapper - Optional table name mapper for namespace prefixing (fallback for operations without explicit namespace)
  * @returns A UOWCompiler instance for Kysely
  */
-export function createKyselyUOWCompiler<TSchema extends AnySchema>(
-  schema: TSchema,
+export function createKyselyUOWCompiler(
   pool: ConnectionPool<KyselyAny>,
   provider: SQLProvider,
   mapper?: TableNameMapper,
-): UOWCompiler<TSchema, CompiledQuery> {
-  const queryCompiler = createKyselyQueryCompiler(schema, pool, provider, mapper);
+): UOWCompiler<CompiledQuery> {
   // Get kysely instance for query building (compilation doesn't execute, just builds SQL)
   const kysely = pool.getDatabaseSync();
-  const queryBuilder = createKyselyQueryBuilder(kysely, provider, mapper);
 
-  function toTable(name: unknown) {
+  /**
+   * Get the mapper for a specific operation
+   * Uses operation's namespace if provided, otherwise falls back to the default mapper
+   */
+  function getMapperForOperation(namespace: string | undefined): TableNameMapper | undefined {
+    if (namespace) {
+      return createTableNameMapper(namespace);
+    }
+    return mapper;
+  }
+
+  // Cache query compilers and builders by namespace for performance
+  const compilerCache = new Map<string | undefined, ReturnType<typeof createKyselyQueryCompiler>>();
+  const builderCache = new Map<string | undefined, ReturnType<typeof createKyselyQueryBuilder>>();
+
+  function getQueryCompiler(schema: AnySchema, namespace: string | undefined) {
+    const cacheKey = namespace;
+    let compiler = compilerCache.get(cacheKey);
+    if (!compiler) {
+      const opMapper = getMapperForOperation(namespace);
+      compiler = createKyselyQueryCompiler(schema, pool, provider, opMapper);
+      compilerCache.set(cacheKey, compiler);
+    }
+    return compiler;
+  }
+
+  function getQueryBuilder(namespace: string | undefined) {
+    const cacheKey = namespace;
+    let builder = builderCache.get(cacheKey);
+    if (!builder) {
+      const opMapper = getMapperForOperation(namespace);
+      builder = createKyselyQueryBuilder(kysely, provider, opMapper);
+      builderCache.set(cacheKey, builder);
+    }
+    return builder;
+  }
+
+  function toTable(schema: AnySchema, name: unknown) {
     const table = schema.tables[name as string];
     if (!table) {
       throw new Error(`Invalid table name ${name}.`);
@@ -50,7 +83,8 @@ export function createKyselyUOWCompiler<TSchema extends AnySchema>(
   }
 
   return {
-    compileRetrievalOperation(op: RetrievalOperation<TSchema>): CompiledQuery | null {
+    compileRetrievalOperation(op: RetrievalOperation<AnySchema>): CompiledQuery | null {
+      const queryCompiler = getQueryCompiler(op.schema, op.namespace);
       switch (op.type) {
         case "count": {
           return queryCompiler.count(op.table.name, {
@@ -159,8 +193,9 @@ export function createKyselyUOWCompiler<TSchema extends AnySchema>(
             }
           }
 
-          // When we have joins or need to bypass buildFindOptions, use queryBuilder directly
+          // When we have joins or need to bypass buildFindOptions, use operation-specific queryBuilder
           if (join && join.length > 0) {
+            const queryBuilder = getQueryBuilder(op.namespace);
             return queryBuilder.findMany(op.table, {
               // Safe cast: select from UOW matches SimplifyFindOptions requirement
               select: (findManyOptions.select ?? true) as AnySelectClause,
@@ -182,8 +217,9 @@ export function createKyselyUOWCompiler<TSchema extends AnySchema>(
     },
 
     compileMutationOperation(
-      op: MutationOperation<TSchema>,
+      op: MutationOperation<AnySchema>,
     ): CompiledMutation<CompiledQuery> | null {
+      const queryCompiler = getQueryCompiler(op.schema, op.namespace);
       switch (op.type) {
         case "create":
           // queryCompiler.create() calls encodeValues() which handles runtime defaults
@@ -193,7 +229,7 @@ export function createKyselyUOWCompiler<TSchema extends AnySchema>(
           };
 
         case "update": {
-          const table = toTable(op.table);
+          const table = toTable(op.schema, op.table);
           const idColumn = table.getIdColumn();
           const versionColumn = table.getVersionColumn();
 
@@ -226,7 +262,7 @@ export function createKyselyUOWCompiler<TSchema extends AnySchema>(
         }
 
         case "delete": {
-          const table = toTable(op.table);
+          const table = toTable(op.schema, op.table);
           const idColumn = table.getIdColumn();
           const versionColumn = table.getVersionColumn();