bun-query-builder 0.1.28 → 0.1.29

package/dist/bin/cli.js

@@ -25203,7 +25203,14 @@ class ModelQueryBuilder {
       sql2 += ` WHERE ${whereBody}`;
     }
     const row = await exec.get(sql2, params);
-    return row?.v == null ? null : Number(row.v);
+    const v2 = row?.v;
+    if (v2 == null)
+      return null;
+    if (typeof v2 === "string") {
+      const n2 = Number(v2);
+      return v2.trim() !== "" && !Number.isNaN(n2) ? n2 : v2;
+    }
+    return v2;
   }
   max(column) {
     return this.aggregate("MAX", column);
@@ -25212,10 +25219,10 @@ class ModelQueryBuilder {
     return this.aggregate("MIN", column);
   }
   async avg(column) {
-    return await this.aggregate("AVG", column) || 0;
+    return Number(await this.aggregate("AVG", column) ?? 0) || 0;
   }
   async sum(column) {
-    return await this.aggregate("SUM", column) || 0;
+    return Number(await this.aggregate("SUM", column) ?? 0) || 0;
   }
   async delete() {
     const exec = getExecutor();
@@ -29929,7 +29936,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version2 = "0.1.28";
+var version2 = "0.1.29";
 
 // bin/cli.ts
 init_actions();

package/dist/client.d.ts

@@ -104,8 +104,11 @@ export declare interface BaseSelectQueryBuilder<DB extends DatabaseSchema<any>,
   having: (expr: WhereExpression<any>) => SelectQueryBuilder<DB, TTable, TSelected, TJoined>
   havingRaw: (fragment: SqlFragment) => SelectQueryBuilder<DB, TTable, TSelected, TJoined>
   addSelect: (...columns: ((keyof DB[TTable]['columns'] & string) | string | SqlFragment)[]) => SelectQueryBuilder<DB, TTable, TSelected, TJoined>
-  select?: (columns: string | SqlFragment | ((keyof DB[TTable]['columns'] & string) | string | SqlFragment)[]) => SelectQueryBuilder<DB, TTable, TSelected, TJoined>
-  selectAll?: () => SelectQueryBuilder<DB, TTable, TSelected, TJoined>
+  select?: {
+    <K extends keyof DB[TTable]['columns'] & string>(columns: K[]): SelectQueryBuilder<DB, TTable, Pick<DB[TTable]['columns'], K>, TJoined>
+    (columns: string | SqlFragment | (string | SqlFragment)[]): SelectQueryBuilder<DB, TTable, TSelected, TJoined>
+  }
+  selectAll?: () => SelectQueryBuilder<DB, TTable, DB[TTable]['columns'], TJoined>
   orderByRaw: (fragment: SqlFragment) => SelectQueryBuilder<DB, TTable, TSelected, TJoined>
   union: (other: { toSQL: () => any }) => SelectQueryBuilder<DB, TTable, TSelected, TJoined>
   unionAll: (other: { toSQL: () => any }) => SelectQueryBuilder<DB, TTable, TSelected, TJoined>
@@ -146,7 +149,7 @@ export declare interface BaseSelectQueryBuilder<DB extends DatabaseSchema<any>,
   }
   exists: () => Promise<boolean>
   doesntExist: () => Promise<boolean>
-  cursorPaginate: (perPage: number, cursor?: string | number, column?: string, direction?: 'asc' | 'desc') => Promise<{ data: any[], meta: { perPage: number, nextCursor: string | number | null } }>
+  cursorPaginate: (perPage: number, cursor?: string | number, column?: string, direction?: 'asc' | 'desc') => Promise<{ data: SelectedRow<DB, TTable, TSelected>[], meta: { perPage: number, nextCursor: string | number | null } }>
   chunk: (size: number, handler: (rows: any[]) => Promise<void> | void) => Promise<void>
   chunkById: (size: number, column?: string, handler?: (rows: any[]) => Promise<void> | void) => Promise<void>
   eachById: (size: number, column?: string, handler?: (row: any) => Promise<void> | void) => Promise<void>
@@ -175,8 +178,8 @@ export declare interface BaseSelectQueryBuilder<DB extends DatabaseSchema<any>,
   count: () => Promise<number>
   avg: (column: keyof DB[TTable]['columns'] & string) => Promise<number>
   sum: (column: keyof DB[TTable]['columns'] & string) => Promise<number>
-  max: (column: keyof DB[TTable]['columns'] & string) => Promise<any>
-  min: (column: keyof DB[TTable]['columns'] & string) => Promise<any>
+  max: <K extends keyof DB[TTable]['columns'] & string>(column: K) => Promise<DB[TTable]['columns'][K] | null>
+  min: <K extends keyof DB[TTable]['columns'] & string>(column: K) => Promise<DB[TTable]['columns'][K] | null>
   readonly rows: TSelected[]
   readonly row: TSelected
   values: () => Promise<any[][]>
@@ -224,13 +227,19 @@ export declare interface TableQueryBuilder<DB extends DatabaseSchema<any>, TTabl
   insert: (data: Partial<DB[TTable]['columns']> | Partial<DB[TTable]['columns']>[]) => InsertQueryBuilder<DB, TTable>
   update: (values: Partial<DB[TTable]['columns']>) => UpdateQueryBuilder<DB, TTable>
   delete: () => DeleteQueryBuilder<DB, TTable>
-  select: (...columns: (keyof DB[TTable]['columns'] & string)[]) => SelectQueryBuilder<DB, TTable, any>
+  select: <K extends keyof DB[TTable]['columns'] & string>(...columns: K[]) => SelectQueryBuilder<DB, TTable, Pick<DB[TTable]['columns'], K>>
 }
 export declare interface QueryBuilder<DB extends DatabaseSchema<any>> {
-  select: <TTable extends keyof DB & string, K extends keyof DB[TTable]['columns'] & string>(
-    table: TTable,
-    ...columns: (K | `${string} as ${string}`)[]
-  ) => SelectQueryBuilder<DB, TTable, any>
+  select: {
+    <TTable extends keyof DB & string, K extends keyof DB[TTable]['columns'] & string>(
+      table: TTable,
+      ...columns: K[]
+    ): SelectQueryBuilder<DB, TTable, Pick<DB[TTable]['columns'], K>>
+    <TTable extends keyof DB & string>(
+      table: TTable,
+      ...columns: ((keyof DB[TTable]['columns'] & string) | `${string} as ${string}`)[]
+    ): SelectQueryBuilder<DB, TTable, any>
+  }
   selectFrom: <TTable extends keyof DB & string>(table: TTable) => TypedSelectQueryBuilder<DB, TTable, DB[TTable]['columns'], TTable, `SELECT * FROM ${TTable}`>
   insertInto: <TTable extends keyof DB & string>(table: TTable) => TypedInsertQueryBuilder<DB, TTable>
   updateTable: <TTable extends keyof DB & string>(table: TTable) => UpdateQueryBuilder<DB, TTable>
@@ -456,11 +465,15 @@ declare type _TypedDynamicWhereMethods<DB extends DatabaseSchema<any>, TTable ex
     value: DB[TTable]['columns'][K],
   ) => TypedSelectQueryBuilder<DB, TTable, TSelected, TJoined, `${TSql} AND ${K} = ?`>
 }
+// NOTE: TypedSelectQueryBuilder must NOT also intersect DynamicWhereMethods —
+// _TypedDynamicWhereMethods declares the same `where<Column>` keys, and the
+// untyped variant (returning a plain SelectQueryBuilder) would win overload
+// resolution, silently downgrading `toSQL()` from the composed literal SQL
+// type back to `string` after any dynamic-where call.
 export type TypedSelectQueryBuilder<DB extends DatabaseSchema<any>, TTable extends keyof DB & string, TSelected, TJoined extends string = TTable, TSql extends string = `SELECT * FROM ${TTable}`,> = Omit<
   BaseSelectQueryBuilder<DB, TTable, TSelected, TJoined>,
   'toSQL' | 'where' | 'andWhere' | 'orWhere' | 'orderBy' | 'limit'
-> & DynamicWhereMethods<DB, TTable, TSelected, TJoined>
-& _TypedDynamicWhereMethods<DB, TTable, TSelected, TJoined, TSql>
+> & _TypedDynamicWhereMethods<DB, TTable, TSelected, TJoined, TSql>
 & {
   toSQL: () => TSql
   where: (<K extends keyof DB[TTable]['columns'] & string>(

package/dist/orm.d.ts

@@ -317,8 +317,8 @@ declare class ModelInstance<TDef extends ModelDefinition, TSelected extends Colu
   getAttribute<K extends TSelected>(key: K): K extends keyof ModelAttributes<TDef> ? ModelAttributes<TDef>[K] : unknown;
   getAttributes(): Pick<ModelAttributes<TDef>, TSelected & keyof ModelAttributes<TDef>>;
   set<K extends ColumnName<TDef>>(key: K, value: K extends keyof ModelAttributes<TDef> ? ModelAttributes<TDef>[K] : unknown): void;
-  only<K extends TSelected>(keys: ReadonlyArray<K>): Partial<ModelAttributes<TDef>>;
-  except<K extends TSelected>(keys: ReadonlyArray<K>): Partial<ModelAttributes<TDef>>;
+  only<K extends TSelected>(keys: ReadonlyArray<K>): Pick<ModelAttributes<TDef>, K & keyof ModelAttributes<TDef>>;
+  except<K extends TSelected>(keys: ReadonlyArray<K>): Omit<Pick<ModelAttributes<TDef>, TSelected & keyof ModelAttributes<TDef>>, K>;
   getRelation<R extends InferRelationNames<TDef> & string>(name: R): LoadedRelationValue<TDef, R>;
   setRelation(name: string, data: ModelInstance<any, any>[] | ModelInstance<any, any> | null): void;
   getLoadedRelations(): Record<string, ModelInstance<any, any>[] | ModelInstance<any, any> | null>;
@@ -440,8 +440,8 @@ declare class ModelQueryBuilder<TDef extends ModelDefinition, TSelected extends
     to: number | null
   }>;
   pluck<K extends ColumnName<TDef>>(column: K): Promise<(K extends keyof ModelAttributes<TDef> ? ModelAttributes<TDef>[K] : unknown)[]>;
-  max<K extends ColumnName<TDef>>(column: K): Promise<number | null>;
-  min<K extends ColumnName<TDef>>(column: K): Promise<number | null>;
+  max<K extends ColumnName<TDef>>(column: K): Promise<(K extends keyof ModelAttributes<TDef> ? ModelAttributes<TDef>[K] : number) | null>;
+  min<K extends ColumnName<TDef>>(column: K): Promise<(K extends keyof ModelAttributes<TDef> ? ModelAttributes<TDef>[K] : number) | null>;
   avg<K extends NumericColumns<TDef>>(column: K): Promise<number>;
   sum<K extends NumericColumns<TDef>>(column: K): Promise<number>;
   delete(): Promise<number>;

package/dist/src/index.js

@@ -25203,7 +25203,14 @@ class ModelQueryBuilder {
       sql2 += ` WHERE ${whereBody}`;
     }
     const row = await exec.get(sql2, params);
-    return row?.v == null ? null : Number(row.v);
+    const v2 = row?.v;
+    if (v2 == null)
+      return null;
+    if (typeof v2 === "string") {
+      const n2 = Number(v2);
+      return v2.trim() !== "" && !Number.isNaN(n2) ? n2 : v2;
+    }
+    return v2;
   }
   max(column) {
     return this.aggregate("MAX", column);
@@ -25212,10 +25219,10 @@ class ModelQueryBuilder {
     return this.aggregate("MIN", column);
   }
   async avg(column) {
-    return await this.aggregate("AVG", column) || 0;
+    return Number(await this.aggregate("AVG", column) ?? 0) || 0;
   }
   async sum(column) {
-    return await this.aggregate("SUM", column) || 0;
+    return Number(await this.aggregate("SUM", column) ?? 0) || 0;
   }
   async delete() {
     const exec = getExecutor();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bun-query-builder",
   "type": "module",
-  "version": "0.1.28",
+  "version": "0.1.29",
   "description": "A simple yet performant query builder for TypeScript. Built with Bun.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",