Merge pull request #127 from 0xcadams/tx-types

fix: tx types

Author: 0xcadams

package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-zero",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "Generate Zero schemas from Drizzle ORM schemas",
   "type": "module",
   "scripts": {

src/node-postgres/index.ts

@@ -7,9 +7,12 @@ import type {
 import type { PgTransaction } from "drizzle-orm/pg-core";
 import type { ExtractTablesWithRelations } from "drizzle-orm/relations";
 
-export type NodePgZeroTransaction<
-  TDatabase extends NodePgDatabase<Record<string, unknown>>,
-> = Parameters<Parameters<TDatabase["transaction"]>[0]>[0] & {};
+export type NodePgZeroTransaction<TSchema extends Record<string, unknown>> =
+  PgTransaction<
+    NodePgQueryResultHKT,
+    TSchema,
+    ExtractTablesWithRelations<TSchema>
+  >;
 
 export class NodePgConnection<
   TDrizzle extends NodePgDatabase<Record<string, unknown>> & {
@@ -18,11 +21,7 @@ export class NodePgConnection<
   TSchema extends TDrizzle extends NodePgDatabase<infer TSchema>
     ? TSchema
     : never,
-  TTransaction extends PgTransaction<
-    NodePgQueryResultHKT,
-    TSchema,
-    ExtractTablesWithRelations<TSchema>
-  >,
+  TTransaction extends NodePgZeroTransaction<TSchema>,
 > implements DBConnection<TTransaction>
 {
   readonly #drizzle: TDrizzle;

src/postgres-js/index.ts

@@ -7,9 +7,12 @@ import type {
 import type { ExtractTablesWithRelations } from "drizzle-orm/relations";
 import type postgres from "postgres";
 
-export type PostgresJsZeroTransaction<
-  TDatabase extends PostgresJsDatabase<Record<string, unknown>>,
-> = Parameters<Parameters<TDatabase["transaction"]>[0]>[0] & {};
+export type PostgresJsZeroTransaction<TSchema extends Record<string, unknown>> =
+  PgTransaction<
+    PostgresJsQueryResultHKT,
+    TSchema,
+    ExtractTablesWithRelations<TSchema>
+  >;
 
 export class PostgresJsConnection<
   TDrizzle extends PostgresJsDatabase<Record<string, unknown>> & {
@@ -18,11 +21,7 @@ export class PostgresJsConnection<
   TSchema extends TDrizzle extends PostgresJsDatabase<infer TSchema>
     ? TSchema
     : never,
-  TTransaction extends PgTransaction<
-    PostgresJsQueryResultHKT,
-    TSchema,
-    ExtractTablesWithRelations<TSchema>
-  >,
+  TTransaction extends PostgresJsZeroTransaction<TSchema>,
 > implements DBConnection<TTransaction>
 {
   readonly #drizzle: TDrizzle;

tests/pg.test.ts

@@ -63,7 +63,7 @@ describe("node-postgres", () => {
   });
 
   test("types", async () => {
-    const s = null as unknown as NodePgZeroTransaction<typeof db>;
+    const s = null as unknown as NodePgZeroTransaction<typeof drizzleSchema>;
 
     const user = null as unknown as Awaited<
       ReturnType<typeof s.query.user.findFirst>
@@ -210,7 +210,7 @@ describe("postgres-js", () => {
   });
 
   test("types", async () => {
-    const s = null as unknown as PostgresJsZeroTransaction<typeof db>;
+    const s = null as unknown as PostgresJsZeroTransaction<typeof drizzleSchema>;
 
     const user = null as unknown as Awaited<
       ReturnType<typeof s.query.user.findFirst>