@stacksjs/database 0.70.73 → 0.70.75

package/dist/types.d.ts

@@ -35,6 +35,7 @@ export declare interface Sql {
  */
 export declare interface ColumnRef {
   readonly raw: string
+  as: (alias: string) => ColumnRef
 }
 /**
  * Fluent aggregate-function builder accessible via
@@ -59,6 +60,7 @@ export declare interface AggregateExpression {
  * genuinely needed.
  */
 export declare interface ExpressionFunctions {
+  countAll: () => AggregateExpression
   count: (column: string) => AggregateExpression
   sum: (column: string) => AggregateExpression
   avg: (column: string) => AggregateExpression
@@ -91,6 +93,7 @@ export declare interface ExpressionFunctions {
  * implementation in one place rather than re-typing every call site.
  */
 export declare interface StacksExpressionBuilder {
+  (left: unknown, op: ExpressionOperator | string, right: unknown): unknown
   or: (expressions: ReadonlyArray<unknown>) => unknown
   and?: (expressions: ReadonlyArray<unknown>) => unknown
   cmpr: (left: unknown, op: ExpressionOperator, right: unknown) => unknown

package/dist/utils.d.ts

@@ -1,9 +1,9 @@
 import { createQueryBuilder, setConfig } from '@stacksjs/query-builder';
-import type { DatabaseSchema } from '@stacksjs/query-builder';
 export declare function acquireDbConfigLock(): Promise<() => void>;
 // Function to initialize the config when it's available
 export declare function initializeDbConfig(config: any): void;
 export declare function ensureDatabaseConfigLoaded(): Promise<void>;
+declare function getDb(): ReturnType<typeof createQueryBuilder>;
 /**
  * Lazy proxy for the query builder - connection is only made when first used.
  * This is the main entry point for database operations.
@@ -23,7 +23,8 @@ export declare const db: Proxy;
  * with no schema). Tests cover the runtime semantics.
  */
 export declare interface FluentChain {
-  where: (...args: any[]) => FluentChain
+  where(callback: (eb: import('./types').StacksExpressionBuilder) => unknown): FluentChain
+  where(...args: any[]): FluentChain
   whereNull: (...args: any[]) => FluentChain
   whereNotNull: (...args: any[]) => FluentChain
   whereIn: (...args: any[]) => FluentChain
@@ -51,7 +52,8 @@ export declare interface FluentChain {
   orderBy: (...args: any[]) => FluentChain
   limit: (...args: any[]) => FluentChain
   offset: (...args: any[]) => FluentChain
-  select: (...args: any[]) => FluentChain
+  select(selection: ((eb: import('./types').StacksExpressionBuilder) => unknown) | ReadonlyArray<string | ((eb: import('./types').StacksExpressionBuilder) => unknown) | unknown>): FluentChain
+  select(...args: any[]): FluentChain
   selectAll: () => FluentChain
   selectAllRelations: () => FluentChain
   selectRaw: (...args: any[]) => FluentChain
@@ -87,6 +89,7 @@ export declare interface FluentChain {
   max: (...args: any[]) => Promise<any>
   exists: () => Promise<boolean>
   doesntExist: () => Promise<boolean>
+  $call: (callback: (query: FluentChain) => FluentChain) => FluentChain
   [key: string]: any
 }
 /*.ts` and
@@ -109,9 +112,17 @@ export declare interface FluentChain {
  */
 // eslint-disable-next-line ts/no-empty-object-type
 export declare interface DatabaseSchema {}
-// Permissive schema type that accepts any table name with any columns
-// This allows the query builder to work before model types are generated
-declare type AnySchema = DatabaseSchema<any> & Record<string, { columns: Record<string, any>, primaryKey: string }>;
+declare interface Db extends Pick<Required<RawQueryBuilder>, GenericPassthroughKeys> {
+  fn: import('./types').ExpressionFunctions
+  selectFrom: (table: TableName) => FluentChain
+  insertInto: (table: TableName) => FluentChain
+  updateTable: (table: TableName) => FluentChain
+  deleteFrom: (table: TableName) => FluentChain
+  table: (table: TableName) => FluentChain
+  selectFromSub: (sub: any, alias: string) => FluentChain
+  select: (table: TableName, ...columns: string[]) => FluentChain
+  unsafe: (query: string, params?: any[]) => UnsafeReturn
+}
 // The bun-query-builder types `unsafe()` as returning `Promise<any>`, but at
 // runtime it returns a Bun SQL Statement that has `.execute()`. This interface
 // corrects the return type so callers can chain `.execute()` without type errors.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/database",
   "type": "module",
-  "version": "0.70.73",
+  "version": "0.70.75",
   "description": "The Stacks database integration.",
   "author": "Chris Breuer",
   "contributors": [
@@ -54,18 +54,18 @@
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
-    "bun-query-builder": "^0.1.38"
+    "bun-query-builder": "^0.1.47"
   },
   "devDependencies": {
-    "@stacksjs/cli": "0.70.73",
-    "@stacksjs/config": "0.70.73",
-    "@stacksjs/logging": "0.70.73",
-    "@stacksjs/router": "0.70.73",
-    "better-dx": "^0.2.12",
-    "@stacksjs/path": "0.70.73",
-    "@stacksjs/query-builder": "0.70.73",
-    "@stacksjs/storage": "0.70.73",
-    "@stacksjs/strings": "0.70.73",
-    "@stacksjs/utils": "0.70.73"
+    "@stacksjs/cli": "0.70.75",
+    "@stacksjs/config": "0.70.75",
+    "@stacksjs/logging": "0.70.75",
+    "@stacksjs/router": "0.70.75",
+    "better-dx": "^0.2.16",
+    "@stacksjs/path": "0.70.75",
+    "@stacksjs/query-builder": "0.70.75",
+    "@stacksjs/storage": "0.70.75",
+    "@stacksjs/strings": "0.70.75",
+    "@stacksjs/utils": "0.70.75"
   }
 }