bradb 1.2.2 → 1.2.4

package/dist/src/controller.d.ts

@@ -1,7 +1,21 @@
 import { PgTable } from "drizzle-orm/pg-core";
 import { Request, Response } from "express";
-import { z } from "zod";
-import { CRUDService } from "./types";
+import { z, ZodObject } from "zod";
+import { CreateService, DeleteService, UpdateService, FindOneService, RetrieverService, Filter } from "./types";
+export declare function findOneBuilder<TTable extends PgTable>(service: FindOneService<TTable>, hook?: (item: TTable["$inferSelect"]) => Response): (req: Request, res: Response) => Promise<Response<any, Record<string, any>> | undefined>;
+export declare function findAllBuilder<FSchema extends ZodObject, TTable extends PgTable>(service: RetrieverService<FSchema, TTable>, filter: FSchema, hook?: (items: TTable["$inferSelect"][], total: number) => Response): (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;
+export declare function createBuilder<TTable extends PgTable, Schema extends ZodObject>(service: CreateService<TTable>, schema: Schema): (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;
+export declare function updateBuilder<TTable extends PgTable, Schema extends ZodObject>(service: UpdateService<TTable>, schema: Schema): (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;
+export declare function deleteBuilder<TTable extends PgTable>(service: DeleteService<TTable>): (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;
+export declare function validate<T extends ZodObject>(schema: T, fn: (req: Request, res: Response, data: z.output<T>) => Promise<Response>): (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;
+interface CRUDService<FSchema extends ZodObject> {
+    findOne: (id: any) => Promise<any>;
+    findAll: (filters?: Filter<FSchema>, page?: number, pageSize?: number) => Promise<any>;
+    count: (filters: Filter<FSchema>) => Promise<number>;
+    create: (data: any) => Promise<any>;
+    update: (id: any, data: Partial<any>) => Promise<any>;
+    delete: (id: any) => Promise<any>;
+}
 export declare class BaseController<T extends PgTable, FSchema extends z.ZodObject> {
     protected service: CRUDService<FSchema>;
     private filterSchema;
@@ -14,3 +28,4 @@ export declare class BaseController<T extends PgTable, FSchema extends z.ZodObje
     update: (req: Request, res: Response) => Promise<void>;
     delete: (req: Request, res: Response) => Promise<void>;
 }
+export {};

package/dist/src/controller.js

@@ -1,6 +1,78 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseController = void 0;
+exports.findOneBuilder = findOneBuilder;
+exports.findAllBuilder = findAllBuilder;
+exports.createBuilder = createBuilder;
+exports.updateBuilder = updateBuilder;
+exports.deleteBuilder = deleteBuilder;
+exports.validate = validate;
+function findOneBuilder(service, hook) {
+    return async (req, res) => {
+        const item = await service.findOne(req.params.id);
+        if (hook !== undefined) {
+            return hook(item);
+        }
+        else {
+            res.status(200).json(item);
+        }
+    };
+}
+function findAllBuilder(service, filter, hook) {
+    return async (req, res) => {
+        const filters = filter.parse({
+            ...req.params,
+            ...req.query
+        });
+        const pagination = getPagination(req);
+        const [items, total] = await Promise.all([
+            service.findAll(filters, pagination.page, pagination.pageSize),
+            service.count(filters)
+        ]);
+        if (hook !== undefined) {
+            return hook(items, total);
+        }
+        else {
+            return res.status(200).json({
+                pagination,
+                items,
+                total
+            });
+        }
+    };
+}
+function createBuilder(service, schema) {
+    return validate(schema, async (req, res, data) => {
+        const item = await service.create(data);
+        return res.status(201).json(item);
+    });
+}
+function updateBuilder(service, schema) {
+    return validate(schema, async (req, res, data) => {
+        const item = await service.update(req.params.id, data);
+        return res.status(200).json(item);
+    });
+}
+function deleteBuilder(service) {
+    return async (req, res) => {
+        await service.delete(req.params.id);
+        return res.status(204).send();
+    };
+}
+function validate(schema, fn) {
+    return async (req, res) => {
+        const validated = schema.parse(req.body);
+        return fn(req, res, validated);
+    };
+}
+function getPagination(req) {
+    return {
+        page: req.query.page ? parseInt(req.query.page) : 1,
+        pageSize: req.query.pageSize
+            ? parseInt(req.query.pageSize)
+            : 10
+    };
+}
 class BaseController {
     constructor(service, base, filter) {
         this.getAll = async (req, res) => {
@@ -55,14 +127,3 @@ function getFilters(req, filter) {
         ...req.query
     });
 }
-/*
-    * Extract PaginationParams from the request
-*/
-function getPagination(req) {
-    return {
-        page: req.query.page ? parseInt(req.query.page) : 1,
-        pageSize: req.query.pageSize
-            ? parseInt(req.query.pageSize)
-            : 10
-    };
-}

package/dist/src/relational.d.ts

@@ -1,8 +1,8 @@
 import { Filter, FilterMap } from "../src/types";
-import { BuildQueryResult, DBQueryConfig, TableRelationalConfig, TablesRelationalConfig } from "drizzle-orm";
+import { BuildQueryResult, DBQueryConfig, KnownKeysOnly, TableRelationalConfig, TablesRelationalConfig } from "drizzle-orm";
 import { RelationalQueryBuilder } from "drizzle-orm/pg-core/query-builders/query";
 import { ZodObject } from "zod";
 export declare function RelationalBuilder<TSchema extends TablesRelationalConfig, TFields extends TableRelationalConfig, FSchema extends ZodObject>(q: RelationalQueryBuilder<TSchema, TFields>, filterMap: FilterMap<FSchema>): {
     findAll<TConfig extends DBQueryConfig<"many", true, TSchema, TFields>>(config?: TConfig): (filters?: Filter<FSchema>, page?: number, pageSize?: number) => Promise<BuildQueryResult<TSchema, TFields, TConfig>[]>;
-    findOne<TSelection extends Omit<DBQueryConfig<"many", true, TSchema, TFields>, "limit">>(config?: DBQueryConfig<any, true, TSchema, TFields>): (id: number) => Promise<BuildQueryResult<TSchema, TFields, TSelection>>;
+    findOne<TSelection extends Omit<DBQueryConfig<"many", true, TSchema, TFields>, "limit">>(config?: KnownKeysOnly<TSelection, Omit<DBQueryConfig<"many", true, TSchema, TFields>, "limit">>): (id: number) => Promise<BuildQueryResult<TSchema, TFields, TSelection>>;
 };

package/dist/src/standard.d.ts

@@ -9,8 +9,8 @@ export declare class ServiceBuilder<T extends Table, TSchema extends Record<stri
     private readonly map;
     readonly tableName: string;
     constructor(db: NodePgDatabase<TSchema>, table: T, map: FilterMap<FSchema>);
-    findOne<S extends PgSelect>(select: S): (id: number) => Promise<S>;
-    findAll<S extends PgSelect>(select: S): (filters?: Filter<FSchema>, page?: number, pageSize?: number) => Promise<S>;
+    findOne<S extends PgSelect>(select: S): (id: number) => Promise<Awaited<ReturnType<S["execute"]>>[number]>;
+    findAll<S extends PgSelect>(select: S): (filters?: Filter<FSchema>, page?: number, pageSize?: number) => Promise<Awaited<ReturnType<S["execute"]>>[number][]>;
     create(): (data: InferInsertModel<T>) => 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>>) => 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>;
     softDelete(): (id: PrimaryKeyType<T>) => Promise<void>;

package/dist/src/standard.js

@@ -14,9 +14,9 @@ class ServiceBuilder {
     findOne(select) {
         return async (id) => {
             const result = await select.where((0, drizzle_orm_1.eq)(this.table.id, id));
-            if (!result)
+            if (result.length == 0)
                 throw notFoundWithId(this.tableName, id);
-            return result;
+            return result[0];
         };
     }
     findAll(select) {

package/dist/src/types.d.ts

@@ -1,13 +1,21 @@
 import { SQL } from "drizzle-orm";
-import { AnyPgTable, PgColumn } from "drizzle-orm/pg-core";
+import { AnyPgTable, PgColumn, PgTable } from "drizzle-orm/pg-core";
 import z, { ZodObject } from "zod";
-export interface CRUDService<FSchema extends ZodObject> {
-    findOne: (id: any) => Promise<any>;
-    findAll: (filters?: Filter<FSchema>, page?: number, pageSize?: number) => Promise<any>;
+export interface RetrieverService<FSchema extends ZodObject, TTable extends PgTable> {
+    findAll: (filters?: Filter<FSchema>, page?: number, pageSize?: number) => Promise<TTable["$inferSelect"][]>;
     count: (filters: Filter<FSchema>) => Promise<number>;
-    create: (data: any) => Promise<any>;
-    update: (id: any, data: Partial<any>) => Promise<any>;
-    delete: (id: any) => Promise<any>;
+}
+export interface FindOneService<TTable extends PgTable> {
+    findOne: (id: any) => Promise<TTable["$inferSelect"]>;
+}
+export interface CreateService<TTable extends PgTable> {
+    create: (data: TTable["$inferInsert"]) => Promise<TTable["$inferSelect"]>;
+}
+export interface UpdateService<TTable extends PgTable> {
+    update: (id: any, data: Partial<TTable["$inferInsert"]>) => Promise<TTable["$inferSelect"]>;
+}
+export interface DeleteService<TTable extends PgTable> {
+    delete: (id: any) => Promise<TTable["$inferSelect"]>;
 }
 export type PrimaryKeyData<TTable extends AnyPgTable> = {
     [K in keyof TTable["_"]["columns"] as TTable["_"]["columns"][K] extends {

package/package.json

@@ -1,12 +1,11 @@
 {
     "name": "bradb",
-    "version": "1.2.2",
+    "version": "1.2.4",
     "description": "",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "files": [
-        "dist",
-        "index.d.ts"
+        "dist"
     ],
     "scripts": {
         "build": "rm -rf dist/ && tsc",