bradb 3.1.2 → 3.1.4

package/dist/src/generators.js

@@ -136,10 +136,6 @@ export const ${name}Controller = {
 };`;
 }
 function generateService(name, table, imports) {
-    const selection = `db
-            .select()
-            .from(${name}Table)
-            .$dynamic()`;
     return `import { ServiceBuilder } from "bradb";
 ${imports.join('\n')};
 
@@ -149,12 +145,8 @@ export const ${name}Service = {
     create: builder.create(),
     update: builder.update(),
     delete: builder.delete(),
-    findAll: builder.findAll(
-        ${selection}
-    ),
-    findOne: builder.findOne(
-        ${selection}
-    )
+    findAll: builder.findAll(),
+    findOne: builder.findOne()
 };`;
 }
 function generateFilter(name, table, imports) {

package/dist/src/service.d.ts

@@ -1,5 +1,5 @@
 import { Filter, FilterMap, PrimaryKeyData } from "./types";
-import { AnyPgColumn, AnyPgTable, PgColumn, PgSelect, PgTransaction, SelectedFields } from "drizzle-orm/pg-core";
+import { AnyPgTable, PgColumn, PgSelect, PgTransaction } from "drizzle-orm/pg-core";
 import { NodePgDatabase } from "drizzle-orm/node-postgres";
 import { InferInsertModel, SQL } from "drizzle-orm";
 import { ZodObject } from "zod";
@@ -14,9 +14,10 @@ export declare class ServiceBuilder<T extends AnyPgTable, TSchema extends Record
     readonly findOneConditions: (pkFilter: PKType) => SQL | undefined;
     readonly tableName: string;
     constructor(db: NodePgDatabase<TSchema>, table: T, map: FilterMap<FSchema>);
-    findOne<S extends PgSelect>(select: S): (pkValues: PKType) => Promise<S["_"]["result"][0]>;
-    TEST<F extends SelectedFields>(fields: F, cb: (qb: PgSelect) => PgSelect): (pkValues: PKType) => Promise<RowFromFields<F>>;
-    findAll<S extends PgSelect>(select: S, paginated?: boolean): (filters?: Filter<FSchema>, p?: Pagination) => Promise<S["_"]["result"][0][]>;
+    findOne(): (pkValues: PKType) => Promise<typeof this.table["$inferSelect"]>;
+    findOne<S extends () => PgSelect>(select: S): (pkValues: PKType) => Awaited<ReturnType<S>["_"]["result"][0]>;
+    findAll(): (filters?: Filter<FSchema>, p?: Pagination) => Promise<typeof this.table["$inferSelect"]>;
+    findAll<S extends () => PgSelect>(select: S, paginated: boolean): (filters?: Filter<FSchema>, p?: Pagination) => Promise<Awaited<ReturnType<S>["_"]["result"][0]>>;
     count<S extends PgSelect>(select?: S): (filters?: Filter<FSchema>) => Promise<number>;
     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 : Partial<InferInsertModel<T>>, tx?: PgTransaction<any, TSchema, any>) => Promise<InferInsertModel<T>>): (pks: PKType, data: S extends Object ? S : 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>;
@@ -24,7 +25,3 @@ export declare class ServiceBuilder<T extends AnyPgTable, TSchema extends Record
     softDelete(): (pks: PKType, tx?: PgTransaction<any, TSchema, any>) => Promise<void>;
     hardDelete(): (pks: PKType, tx?: PgTransaction<any, TSchema, any>) => Promise<void>;
 }
-type RowFromFields<T extends SelectedFields> = {
-    [K in keyof T]: T[K] extends AnyPgColumn ? T[K]['_']['data'] : never;
-};
-export {};

package/dist/src/service.js

@@ -24,35 +24,27 @@ class ServiceBuilder {
         }
     }
     findOne(select) {
+        const actualSelect = select ?? (() => this.db.select().from(this.table).$dynamic());
         return async (pkValues) => {
-            const result = await select.where(this.findOneConditions(pkValues));
-            if (result.length == 0)
-                throw notFoundWithId(this.tableName, pkValues);
-            return result[0];
-        };
-    }
-    TEST(fields, cb) {
-        return async (pkValues) => {
-            const pre = this.db.select(fields).from(this.table).$dynamic();
-            const result = await cb(pre).where(this.findOneConditions(pkValues));
-            if (result.length == 0)
+            const result = await actualSelect().where(this.findOneConditions(pkValues));
+            if (result.length === 0) {
                 throw notFoundWithId(this.tableName, pkValues);
+            }
             return result[0];
         };
     }
     findAll(select, paginated = true) {
-        const base = (f) => select.where(this.findAllConditions(f));
+        if (!select)
+            select = () => this.db.select().from(this.table).$dynamic();
+        const base = (f) => select().where(this.findAllConditions(f));
         if (paginated) {
             return async (filters, p) => {
                 if (!p)
-                    p = {
-                        page: 1,
-                        pageSize: 10
-                    };
+                    p = { page: 1, pageSize: 10 };
+                const sub = select().where(this.findAllConditions(filters)).as('sub'); // TODO: not any
                 const countQuery = this.db
                     .select({ count: (0, drizzle_orm_1.count)() })
-                    .from(this.table)
-                    .where(this.findAllConditions(filters));
+                    .from(sub);
                 const offset = (p.page - 1) * p.pageSize;
                 const items = await base(filters).limit(p.pageSize).offset(offset);
                 const [res] = await countQuery;

package/package.json

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