@fragno-dev/db 0.1.13 → 0.1.14

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

@@ -103,12 +103,12 @@ describe("kysely-uow-joins", () => {
 
   // Helper to create UnitOfWork for testing
   function createTestUOW(name?: string) {
-    const mockCompiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+    const mockCompiler = createKyselyUOWCompiler(pool, "postgresql");
     const mockExecutor = {
       executeRetrievalPhase: async () => [],
       executeMutationPhase: async () => ({ success: true, createdInternalIds: [] }),
     };
-    const mockDecoder: UOWDecoder<typeof userSchema> = (rawResults, operations) => {
+    const mockDecoder: UOWDecoder = (rawResults, operations) => {
       if (rawResults.length !== operations.length) {
         throw new Error("rawResults and ops must have the same length");
       }
@@ -127,7 +127,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.author()),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -147,7 +147,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.author((ab) => ab.select(["name", "email"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -171,7 +171,7 @@ describe("kysely-uow-joins", () => {
           ),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -191,7 +191,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.inviter((ib) => ib.select(["name"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -211,7 +211,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.post((pb) => pb.select(["title"])).author((ab) => ab.select(["name"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -231,7 +231,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.post((pb) => pb.select(["title"])).tag((tb) => tb.select(["name"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -261,7 +261,7 @@ describe("kysely-uow-joins", () => {
           ),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -281,7 +281,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.author((ab) => ab.select(["name"]).orderByIndex("idx_name", "asc"))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -302,7 +302,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.author((ab) => ab.select(["name"]).pageSize(1))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -330,7 +330,7 @@ describe("kysely-uow-joins", () => {
           ),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -353,7 +353,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.author((ab) => ab.select(["id", "name"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -376,7 +376,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.author((ab) => ab.select(["id", "name"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -401,7 +401,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.author((ab) => ab.select(["id"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -423,7 +423,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.author((ab) => ab.select(["id", "name"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -446,7 +446,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.author((ab) => ab.select(["name"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -466,7 +466,7 @@ describe("kysely-uow-joins", () => {
       const uow = createTestUOW();
       uow.find("posts", (b) => b.whereIndex("primary").join((jb) => jb.author()));
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -494,7 +494,7 @@ describe("kysely-uow-joins", () => {
           ),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -517,7 +517,7 @@ describe("kysely-uow-joins", () => {
           ),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -575,12 +575,12 @@ describe("kysely-uow-joins", () => {
     });
 
     function createCustomIdTestUOW() {
-      const mockCompiler = createKyselyUOWCompiler(customIdSchema, pool, "postgresql");
+      const mockCompiler = createKyselyUOWCompiler(pool, "postgresql");
       const mockExecutor = {
         executeRetrievalPhase: async () => [],
         executeMutationPhase: async () => ({ success: true, createdInternalIds: [] }),
       };
-      const mockDecoder: UOWDecoder<typeof customIdSchema> = (rawResults, operations) => {
+      const mockDecoder: UOWDecoder = (rawResults, operations) => {
         if (rawResults.length !== operations.length) {
           throw new Error("rawResults and ops must have the same length");
         }
@@ -602,7 +602,7 @@ describe("kysely-uow-joins", () => {
           ),
       );
 
-      const compiler = createKyselyUOWCompiler(customIdSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -636,7 +636,7 @@ describe("kysely-uow-joins", () => {
           ),
       );
 
-      const compiler = createKyselyUOWCompiler(customIdSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -655,7 +655,7 @@ describe("kysely-uow-joins", () => {
       const uow = createCustomIdTestUOW();
       uow.find("product_categories", (b) => b.whereIndex("primary").join((jb) => jb.product()));
 
-      const compiler = createKyselyUOWCompiler(customIdSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -685,7 +685,7 @@ describe("kysely-uow-joins", () => {
           ),
       );
 
-      const compiler = createKyselyUOWCompiler(customIdSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -717,7 +717,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.author((ab) => ab.select(["id"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -741,7 +741,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.author((ab) => ab.select(["id", "name"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -765,7 +765,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.post((pb) => pb.select(["id"])).author((ab) => ab.select(["id"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);
@@ -793,7 +793,7 @@ describe("kysely-uow-joins", () => {
           .join((jb) => jb.inviter((ib) => ib.select(["id", "name"]))),
       );
 
-      const compiler = createKyselyUOWCompiler(userSchema, pool, "postgresql");
+      const compiler = createKyselyUOWCompiler(pool, "postgresql");
       const compiled = uow.compile(compiler);
 
       expect(compiled.retrievalBatch).toHaveLength(1);

package/src/bind-services.test.ts

@@ -0,0 +1,214 @@
+import { describe, it, expect } from "vitest";
+import { bindServicesToContext } from "./bind-services";
+import { withUnitOfWork, type DatabaseRequestThisContext } from "./fragment";
+import type { IUnitOfWorkBase } from "./query/unit-of-work";
+import { schema, idColumn } from "./schema/create";
+
+// Create a simple test schema for tests
+const testSchema = schema((s) => {
+  return s.addTable("test", (t) => {
+    return t.addColumn("id", idColumn());
+  });
+});
+
+describe("bindServicesToContext", () => {
+  it("should bind simple function to context", async () => {
+    const mockSchemaView = { test: "schema-view" };
+    const mockUow = {
+      test: "uow",
+      forSchema: () => mockSchemaView,
+    } as unknown as IUnitOfWorkBase;
+
+    const services = {
+      testMethod: function (this: DatabaseRequestThisContext) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        return this.getUnitOfWork(testSchema as any);
+      },
+    };
+
+    const bound = bindServicesToContext(services);
+
+    const result = await withUnitOfWork(mockUow, () => bound.testMethod());
+
+    expect(result).toBe(mockSchemaView);
+  });
+
+  it("should bind multiple functions", async () => {
+    const mockSchemaView = { test: "schema-view" };
+    const mockUow = {
+      test: "uow",
+      forSchema: () => mockSchemaView,
+    } as unknown as IUnitOfWorkBase;
+
+    const services = {
+      method1: function (this: DatabaseRequestThisContext) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        return this.getUnitOfWork(testSchema as any);
+      },
+      method2: function (this: DatabaseRequestThisContext) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        return this.getUnitOfWork(testSchema as any);
+      },
+    };
+
+    const bound = bindServicesToContext(services);
+
+    await withUnitOfWork(mockUow, () => {
+      expect(bound.method1()).toBe(mockSchemaView);
+      expect(bound.method2()).toBe(mockSchemaView);
+    });
+  });
+
+  it("should bind nested service objects", async () => {
+    const mockSchemaView = { test: "schema-view" };
+    const mockUow = {
+      test: "uow",
+      forSchema: () => mockSchemaView,
+    } as unknown as IUnitOfWorkBase;
+
+    const services = {
+      nested: {
+        method: function (this: DatabaseRequestThisContext) {
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          return this.getUnitOfWork(testSchema as any);
+        },
+      },
+    };
+
+    const bound = bindServicesToContext(services);
+
+    const result = await withUnitOfWork(mockUow, () => bound.nested.method());
+
+    expect(result).toBe(mockSchemaView);
+  });
+
+  it("should preserve non-function properties", () => {
+    const services = {
+      method: function () {
+        return "test";
+      },
+      constant: "value",
+      number: 42,
+    };
+
+    const bound = bindServicesToContext(services);
+
+    expect(bound.constant).toBe("value");
+    expect(bound.number).toBe(42);
+    expect(bound.method()).toBe("test");
+  });
+
+  it("should handle functions with parameters", async () => {
+    const mockSchemaView = { test: "schema-view" };
+    const mockUow = {
+      test: "uow",
+      forSchema: () => mockSchemaView,
+    } as unknown as IUnitOfWorkBase;
+
+    const services = {
+      testMethod: function (this: DatabaseRequestThisContext, param1: string, param2: number) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const uow = this.getUnitOfWork(testSchema as any);
+        return { uow, param1, param2 };
+      },
+    };
+
+    const bound = bindServicesToContext(services);
+
+    const result = await withUnitOfWork(mockUow, () => bound.testMethod("hello", 123));
+
+    expect(result.uow).toBe(mockSchemaView);
+    expect(result.param1).toBe("hello");
+    expect(result.param2).toBe(123);
+  });
+
+  it("should handle async functions", async () => {
+    const mockSchemaView = { test: "schema-view" };
+    const mockUow = {
+      test: "uow",
+      forSchema: () => mockSchemaView,
+    } as unknown as IUnitOfWorkBase;
+
+    const services = {
+      asyncMethod: async function (this: DatabaseRequestThisContext) {
+        await new Promise((resolve) => setTimeout(resolve, 10));
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        return this.getUnitOfWork(testSchema as any);
+      },
+    };
+
+    const bound = bindServicesToContext(services);
+
+    const result = await withUnitOfWork(mockUow, async () => await bound.asyncMethod());
+
+    expect(result).toBe(mockSchemaView);
+  });
+
+  it("should not bind arrays", () => {
+    const services = {
+      array: [1, 2, 3],
+      method: function () {
+        return "test";
+      },
+    };
+
+    const bound = bindServicesToContext(services);
+
+    expect(bound.array).toEqual([1, 2, 3]);
+    expect(Array.isArray(bound.array)).toBe(true);
+  });
+
+  it("should handle deeply nested objects", async () => {
+    const mockSchemaView = { test: "schema-view" };
+    const mockUow = {
+      test: "uow",
+      forSchema: () => mockSchemaView,
+    } as unknown as IUnitOfWorkBase;
+
+    const services = {
+      level1: {
+        level2: {
+          level3: {
+            method: function (this: DatabaseRequestThisContext) {
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
+              return this.getUnitOfWork(testSchema as any);
+            },
+          },
+        },
+      },
+    };
+
+    const bound = bindServicesToContext(services);
+
+    const result = await withUnitOfWork(mockUow, () => bound.level1.level2.level3.method());
+
+    expect(result).toBe(mockSchemaView);
+  });
+
+  it("should allow bound services to access UOW independently", async () => {
+    const mockSchemaView = { test: "schema-view" };
+    const mockUow = {
+      test: "uow",
+      forSchema: () => mockSchemaView,
+    } as unknown as IUnitOfWorkBase;
+
+    const services = {
+      getUow: function (this: DatabaseRequestThisContext) {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        return this.getUnitOfWork(testSchema as any);
+      },
+      callOther: function (this: DatabaseRequestThisContext) {
+        // Both methods can access UOW via their own `this` context
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        return this.getUnitOfWork(testSchema as any);
+      },
+    };
+
+    const bound = bindServicesToContext(services);
+
+    await withUnitOfWork(mockUow, () => {
+      expect(bound.getUow()).toBe(mockSchemaView);
+      expect(bound.callOther()).toBe(mockSchemaView);
+    });
+  });
+});

package/src/bind-services.ts

@@ -0,0 +1,37 @@
+import { serviceContext } from "./fragment";
+
+// Type helper to remove 'this' parameter from functions
+type OmitThisParameter<T> = T extends (this: infer _This, ...args: infer A) => infer R
+  ? (...args: A) => R
+  : T;
+
+// Recursively remove 'this' parameter from all functions in an object
+export type BoundServices<T> = {
+  [K in keyof T]: T[K] extends (...args: never[]) => unknown
+    ? OmitThisParameter<T[K]>
+    : T[K] extends Record<string, unknown>
+      ? BoundServices<T[K]>
+      : T[K];
+};
+
+export function bindServicesToContext<T extends Record<string, unknown>>(
+  services: T,
+): BoundServices<T> {
+  const bound = {} as BoundServices<T>;
+
+  for (const [key, value] of Object.entries(services)) {
+    if (typeof value === "function") {
+      // Bind function to serviceContext
+      bound[key as keyof T] = value.bind(serviceContext) as BoundServices<T>[keyof T];
+    } else if (value && typeof value === "object" && !Array.isArray(value)) {
+      // Recursively bind nested service objects
+      bound[key as keyof T] = bindServicesToContext(
+        value as Record<string, unknown>,
+      ) as BoundServices<T>[keyof T];
+    } else {
+      bound[key as keyof T] = value as BoundServices<T>[keyof T];
+    }
+  }
+
+  return bound;
+}