bradb 2.0.0 → 2.1.1

package/dist/src/service.d.ts

@@ -1,4 +1,4 @@
-import { Filter, FilterMap, PrimaryKeyData, PrimaryKeyType, Table } from "./types";
+import { Filter, FilterMap, PrimaryKeyType, Table } from "./types";
 import { PgSelect, PgTransaction } from "drizzle-orm/pg-core";
 import { NodePgDatabase } from "drizzle-orm/node-postgres";
 import { InferInsertModel, SQL } from "drizzle-orm";
@@ -13,10 +13,10 @@ export declare class ServiceBuilder<T extends Table, TSchema extends Record<stri
     readonly findOneConditions: (id: PrimaryKeyType<T>) => SQL | undefined;
     readonly tableName: string;
     constructor(db: NodePgDatabase<TSchema>, table: T, map: FilterMap<FSchema>);
-    findOne<S extends PgSelect>(select: S): (pkFilter: PrimaryKeyData<T>) => Promise<Awaited<ReturnType<S["execute"]>>[number]>;
+    findOne<S extends PgSelect>(select: S): (id: PrimaryKeyType<T>) => Promise<Awaited<ReturnType<S["execute"]>>[number]>;
     findAll<S extends PgSelect>(select: S, paginated?: boolean): (filters?: Filter<FSchema>, page?: number, pageSize?: number) => Promise<Awaited<ReturnType<S["execute"]>>[number][]>;
     count(): (filters?: Filter<FSchema>) => Promise<number>;
-    create(pre?: (data: any, tx?: PgTransaction<any, TSchema, any>) => Promise<InferInsertModel<T>>): (data: InferInsertModel<T>, tx?: PgTransaction<any, TSchema, any>) => Promise<{ [Key in keyof T["_"]["columns"] & string as Key]: T["_"]["columns"][Key]["_"]["notNull"] extends true ? T["_"]["columns"][Key]["_"]["data"] : T["_"]["columns"][Key]["_"]["data"] | null; } extends infer T_1 ? { [K in keyof T_1]: T_1[K]; } : never>;
+    create<S extends any>(pre?: (data: S extends Object ? S : InferInsertModel<T>, tx?: PgTransaction<any, TSchema, any>) => Promise<InferInsertModel<T>>): (data: S extends Object ? S : InferInsertModel<T>, tx?: PgTransaction<any, TSchema, any>) => Promise<{ [Key in keyof T["_"]["columns"] & string as Key]: T["_"]["columns"][Key]["_"]["notNull"] extends true ? T["_"]["columns"][Key]["_"]["data"] : T["_"]["columns"][Key]["_"]["data"] | null; } extends infer T_1 ? { [K in keyof T_1]: T_1[K]; } : never>;
     update(): (id: PrimaryKeyType<T>, data: Partial<InferInsertModel<T>>, tx?: PgTransaction<any, TSchema, any>) => Promise<{ [Key in keyof T["_"]["columns"] & string as Key]: T["_"]["columns"][Key]["_"]["notNull"] extends true ? T["_"]["columns"][Key]["_"]["data"] : T["_"]["columns"][Key]["_"]["data"] | null; } extends infer T_1 ? { [K in keyof T_1]: T_1[K]; } : never>;
     delete(): (id: PrimaryKeyType<T>, tx?: PgTransaction<any, TSchema, any>) => Promise<void>;
     softDelete(): (id: PrimaryKeyType<T>, tx?: PgTransaction<any, TSchema, any>) => Promise<void>;

package/dist/src/service.js

@@ -25,10 +25,10 @@ class ServiceBuilder {
         }
     }
     findOne(select) {
-        return async (pkFilter) => {
-            const result = await select.where(this.findOneConditions(pkFilter));
+        return async (id /* pkFilter: PrimaryKeyData<T> */) => {
+            const result = await select.where(this.findOneConditions(id));
             if (result.length == 0)
-                throw notFoundWithId(this.tableName, pkFilter);
+                throw notFoundWithId(this.tableName, { id: id });
             return result[0];
         };
     }
@@ -59,8 +59,9 @@ class ServiceBuilder {
     }
     create(pre) {
         return async (data, tx) => {
+            // If pre exists data is going to be InferInsertModel<T>
             if (pre) {
-                data = await pre(data);
+                data = await pre(data, tx);
             }
             const executor = tx || this.db;
             const [result] = await executor

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bradb",
-    "version": "2.0.0",
+    "version": "2.1.1",
     "description": "",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",