bradb 2.1.0 → 2.2.0

package/dist/src/controller.d.ts

@@ -5,11 +5,11 @@ import { Filter } from "./types";
 import { InferInsertModel } from "drizzle-orm";
 export declare function findOneBuilder<TReturn>(service: {
     findOne: (id: any) => Promise<TReturn>;
-}, hook?: (item: TReturn) => void): (req: Request, res: Response) => Promise<void>;
+}, hook?: (item: TReturn) => Promise<object>): (req: Request, res: Response) => Promise<Response<any, Record<string, any>> | undefined>;
 export declare function findAllBuilder<FSchema extends ZodObject, TReturn>(service: {
     findAll: (filters?: Filter<FSchema>, page?: number, pageSize?: number) => Promise<TReturn[]>;
     count: (filters?: Filter<FSchema>) => Promise<number>;
-}, filter: FSchema, hook?: (items: TReturn[], total: number) => void, hasPagination?: boolean): (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;
+}, filter: FSchema, hook?: (items: TReturn[], total: number) => Promise<object[]>, hasPagination?: boolean): (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;
 export declare function createBuilder<CSchema extends ZodObject, TReturn>(service: {
     create: (data: z.core.output<CSchema>) => Promise<TReturn>;
 }, schema: CSchema, hook?: (req: Request, res: Response, data: z.core.output<CSchema>, item: TReturn) => Promise<object>): (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;

package/dist/src/controller.js

@@ -11,7 +11,8 @@ function findOneBuilder(service, hook) {
     return async (req, res) => {
         const item = await service.findOne(req.params.id);
         if (hook !== undefined) {
-            hook(item);
+            const i = await hook(item);
+            return res.status(200).json(i);
         }
         res.status(200).json(item);
     };
@@ -32,17 +33,20 @@ function findAllBuilder(service, filter, hook, hasPagination = true) {
         }
         const totalProm = service.count(filters);
         const [items, total] = await Promise.all([itemsProm, totalProm]);
-        hook?.(items, total);
+        let resItems = items;
+        if (hook != undefined) {
+            resItems = await hook(items, total);
+        }
         if (hasPagination) {
             return res.status(200).json({
                 pagination,
-                items,
+                items: resItems,
                 total
             });
         }
         else {
             return res.status(200).json({
-                items,
+                items: resItems,
                 total
             });
         }

package/dist/src/service.d.ts

@@ -16,8 +16,8 @@ export declare class ServiceBuilder<T extends Table, TSchema extends Record<stri
     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>;
-    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>;
+    create<S extends any>(hook?: (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<S extends any>(pre?: (data: S extends Object ? S : InferInsertModel<T>, tx?: PgTransaction<any, TSchema, any>) => Promise<InferInsertModel<T>>): (id: PrimaryKeyType<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>;
     delete(): (id: PrimaryKeyType<T>, tx?: PgTransaction<any, TSchema, any>) => Promise<void>;
     softDelete(): (id: PrimaryKeyType<T>, tx?: PgTransaction<any, TSchema, any>) => Promise<void>;
     hardDelete(): (id: PrimaryKeyType<T>, tx?: PgTransaction<any, TSchema, any>) => Promise<void>;

package/dist/src/service.js

@@ -57,31 +57,35 @@ class ServiceBuilder {
             return result.count;
         };
     }
-    create(pre) {
+    create(hook) {
         return async (data, tx) => {
-            if (pre) {
-                data = await pre(data);
+            // If pre exists data is going to be InferInsertModel<T>
+            let values = data;
+            if (hook) {
+                values = await hook(data);
             }
             const executor = tx || this.db;
             const [result] = await executor
                 .insert(this.table)
-                .values(data)
+                .values(values)
                 .returning()
                 .catch(errors_1.handleSqlError);
             return result;
         };
     }
-    update() {
-        return async (
-        // pkFilter: PrimaryKeyData<T>,
-        id, data, tx) => {
+    update(pre) {
+        return async (id, data, tx) => {
+            let values = data;
+            if (pre) {
+                values = await pre(data);
+            }
             if (Object.keys(data).length == 0) {
                 throw new errors_1.BadRequest("update needs at least one field");
             }
             const executor = tx || this.db;
             const [result] = await executor
                 .update(this.table)
-                .set(data)
+                .set(values)
                 .where(this.findOneConditions(id))
                 .returning()
                 .catch(errors_1.handleSqlError);
@@ -148,6 +152,9 @@ function getPKs(table) {
     return pks;
 }
 function notFoundWithId(tableName, pkFilter) {
+    // for (const [key, val] of pkFilter.values()) {
+    //
+    // }
     // TODO: proper message
     return new errors_1.NotFound(`${tableName} not found`);
 }

package/package.json

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