workers-qb 1.11.0 → 1.11.2

package/README.md

@@ -35,10 +35,10 @@ workers-qb is a lightweight query builder designed specifically for Cloudflare W
 
 ## Supported Databases
 
-- ☁️ [Cloudflare D1](https://workers-qb.massadas.com/databases/cloudflare-d1/)
-- 💾 [Cloudflare Durable Objects](https://workers-qb.massadas.com/databases/cloudflare-do/)
+- ☁️ [Cloudflare D1](https://workers-qb.massadas.com/databases/d1/)
+- 💾 [Cloudflare Durable Objects](https://workers-qb.massadas.com/databases/do/)
 - 🐘 [PostgreSQL (via node-postgres)](https://workers-qb.massadas.com/databases/postgresql/)
-- 🔌 [Bring Your Own Database](https://workers-qb.massadas.com/databases/bring-your-own-database/)
+- 🔌 [Bring Your Own Database](https://workers-qb.massadas.com/databases/byodb/)
 
 ## Features
 

package/dist/index.d.mts

@@ -196,9 +196,15 @@ type D1Result = {
     duration: number;
     last_row_id?: string | number;
     served_by: string;
+    rowsRead?: number;
+    rowsWritten?: number;
     meta?: D1Meta;
     success: boolean;
 };
+type DOResult = {
+    rowsRead: number;
+    rowsWritten: number;
+};
 type PGResult = {
     command: string;
     lastRowId?: string | number;
@@ -325,14 +331,34 @@ declare class asyncMigrationsBuilder<GenericResultWrapper> {
     apply(): Promise<Array<Migration>>;
 }
 
+interface D1Database {
+    prepare: any;
+    batch: any;
+    exec: any;
+}
 declare class D1QB extends QueryBuilder<D1Result> {
     db: any;
-    constructor(db: any, options?: QueryBuilderOptions);
+    constructor(db: D1Database, options?: QueryBuilderOptions);
     migrations(options: MigrationOptions): asyncMigrationsBuilder<D1Result>;
     execute(query: Query): Promise<any>;
     batchExecute(queryArray: Query[]): Promise<any>;
 }
 
+interface SqlStorage {
+    exec: any;
+    get databaseSize(): number;
+    Cursor: any;
+    Statement: any;
+}
+declare class DOQB extends QueryBuilder<DOResult, false> {
+    db: SqlStorage;
+    loggerWrapper: typeof syncLoggerWrapper;
+    constructor(db: SqlStorage, options?: QueryBuilderOptions<false>);
+    migrations(options: MigrationOptions): syncMigrationsBuilder<DOResult>;
+    execute(query: Query<any, false>): any;
+    lazyExecute(query: Query<any, false>): Iterable<any>;
+}
+
 declare class PGQB extends QueryBuilder<PGResult> {
     db: any;
     _migrationsBuilder: typeof asyncMigrationsBuilder;
@@ -343,13 +369,4 @@ declare class PGQB extends QueryBuilder<PGResult> {
     execute(query: Query): Promise<any>;
 }
 
-declare class DOQB extends QueryBuilder<{}, false> {
-    db: any;
-    loggerWrapper: typeof syncLoggerWrapper;
-    constructor(db: any, options?: QueryBuilderOptions<false>);
-    migrations(options: MigrationOptions): syncMigrationsBuilder<{}>;
-    execute(query: Query<any, false>): any;
-    lazyExecute(query: Query<any, false>): Iterable<any>;
-}
-
-export { type ArrayResult, type AsyncType, ConflictTypes, type ConflictUpsert, type CountResult, type D1Meta, D1QB, type D1Result, DOQB, type DefaultObject, type DefaultReturnObject, type Delete, type DeleteReturning, type DeleteWithoutReturning, FetchTypes, type FullArrayResult, type Insert, type InsertMultiple, type InsertOne, type InsertWithoutReturning, type IterableResult, type Join, JoinTypes, type MaybeAsync, type Migration, type MigrationEntry, type MigrationOptions, type OneResult, OrderTypes, PGQB, type PGResult, type Primitive, Query, QueryBuilder, type QueryBuilderOptions, type QueryLoggerMeta, QueryWithExtra, Raw, type RawQuery, type RawQueryFetchAll, type RawQueryFetchOne, type RawQueryWithoutFetching, type SelectAll, type SelectOne, type SyncType, type Update, type UpdateReturning, type UpdateWithoutReturning, type Where, asyncLoggerWrapper, asyncMigrationsBuilder, defaultLogger, syncLoggerWrapper, syncMigrationsBuilder, type test, trimQuery };
+export { type ArrayResult, type AsyncType, ConflictTypes, type ConflictUpsert, type CountResult, type D1Meta, D1QB, type D1Result, DOQB, type DOResult, type DefaultObject, type DefaultReturnObject, type Delete, type DeleteReturning, type DeleteWithoutReturning, FetchTypes, type FullArrayResult, type Insert, type InsertMultiple, type InsertOne, type InsertWithoutReturning, type IterableResult, type Join, JoinTypes, type MaybeAsync, type Migration, type MigrationEntry, type MigrationOptions, type OneResult, OrderTypes, PGQB, type PGResult, type Primitive, Query, QueryBuilder, type QueryBuilderOptions, type QueryLoggerMeta, QueryWithExtra, Raw, type RawQuery, type RawQueryFetchAll, type RawQueryFetchOne, type RawQueryWithoutFetching, type SelectAll, type SelectOne, type SyncType, type Update, type UpdateReturning, type UpdateWithoutReturning, type Where, asyncLoggerWrapper, asyncMigrationsBuilder, defaultLogger, syncLoggerWrapper, syncMigrationsBuilder, type test, trimQuery };

package/dist/index.d.ts

@@ -196,9 +196,15 @@ type D1Result = {
     duration: number;
     last_row_id?: string | number;
     served_by: string;
+    rowsRead?: number;
+    rowsWritten?: number;
     meta?: D1Meta;
     success: boolean;
 };
+type DOResult = {
+    rowsRead: number;
+    rowsWritten: number;
+};
 type PGResult = {
     command: string;
     lastRowId?: string | number;
@@ -325,14 +331,34 @@ declare class asyncMigrationsBuilder<GenericResultWrapper> {
     apply(): Promise<Array<Migration>>;
 }
 
+interface D1Database {
+    prepare: any;
+    batch: any;
+    exec: any;
+}
 declare class D1QB extends QueryBuilder<D1Result> {
     db: any;
-    constructor(db: any, options?: QueryBuilderOptions);
+    constructor(db: D1Database, options?: QueryBuilderOptions);
     migrations(options: MigrationOptions): asyncMigrationsBuilder<D1Result>;
     execute(query: Query): Promise<any>;
     batchExecute(queryArray: Query[]): Promise<any>;
 }
 
+interface SqlStorage {
+    exec: any;
+    get databaseSize(): number;
+    Cursor: any;
+    Statement: any;
+}
+declare class DOQB extends QueryBuilder<DOResult, false> {
+    db: SqlStorage;
+    loggerWrapper: typeof syncLoggerWrapper;
+    constructor(db: SqlStorage, options?: QueryBuilderOptions<false>);
+    migrations(options: MigrationOptions): syncMigrationsBuilder<DOResult>;
+    execute(query: Query<any, false>): any;
+    lazyExecute(query: Query<any, false>): Iterable<any>;
+}
+
 declare class PGQB extends QueryBuilder<PGResult> {
     db: any;
     _migrationsBuilder: typeof asyncMigrationsBuilder;
@@ -343,13 +369,4 @@ declare class PGQB extends QueryBuilder<PGResult> {
     execute(query: Query): Promise<any>;
 }
 
-declare class DOQB extends QueryBuilder<{}, false> {
-    db: any;
-    loggerWrapper: typeof syncLoggerWrapper;
-    constructor(db: any, options?: QueryBuilderOptions<false>);
-    migrations(options: MigrationOptions): syncMigrationsBuilder<{}>;
-    execute(query: Query<any, false>): any;
-    lazyExecute(query: Query<any, false>): Iterable<any>;
-}
-
-export { type ArrayResult, type AsyncType, ConflictTypes, type ConflictUpsert, type CountResult, type D1Meta, D1QB, type D1Result, DOQB, type DefaultObject, type DefaultReturnObject, type Delete, type DeleteReturning, type DeleteWithoutReturning, FetchTypes, type FullArrayResult, type Insert, type InsertMultiple, type InsertOne, type InsertWithoutReturning, type IterableResult, type Join, JoinTypes, type MaybeAsync, type Migration, type MigrationEntry, type MigrationOptions, type OneResult, OrderTypes, PGQB, type PGResult, type Primitive, Query, QueryBuilder, type QueryBuilderOptions, type QueryLoggerMeta, QueryWithExtra, Raw, type RawQuery, type RawQueryFetchAll, type RawQueryFetchOne, type RawQueryWithoutFetching, type SelectAll, type SelectOne, type SyncType, type Update, type UpdateReturning, type UpdateWithoutReturning, type Where, asyncLoggerWrapper, asyncMigrationsBuilder, defaultLogger, syncLoggerWrapper, syncMigrationsBuilder, type test, trimQuery };
+export { type ArrayResult, type AsyncType, ConflictTypes, type ConflictUpsert, type CountResult, type D1Meta, D1QB, type D1Result, DOQB, type DOResult, type DefaultObject, type DefaultReturnObject, type Delete, type DeleteReturning, type DeleteWithoutReturning, FetchTypes, type FullArrayResult, type Insert, type InsertMultiple, type InsertOne, type InsertWithoutReturning, type IterableResult, type Join, JoinTypes, type MaybeAsync, type Migration, type MigrationEntry, type MigrationOptions, type OneResult, OrderTypes, PGQB, type PGResult, type Primitive, Query, QueryBuilder, type QueryBuilderOptions, type QueryLoggerMeta, QueryWithExtra, Raw, type RawQuery, type RawQueryFetchAll, type RawQueryFetchOne, type RawQueryWithoutFetching, type SelectAll, type SelectOne, type SyncType, type Update, type UpdateReturning, type UpdateWithoutReturning, type Where, asyncLoggerWrapper, asyncMigrationsBuilder, defaultLogger, syncLoggerWrapper, syncMigrationsBuilder, type test, trimQuery };

package/dist/index.js

@@ -615,7 +615,8 @@ var QueryBuilder = class {
     }
     const columns = Object.keys(data[0]).join(", ");
     let index = 1;
-    let orConflict = "", onConflict = "";
+    let orConflict = "";
+    let onConflict = "";
     if (params.onConflict && typeof params.onConflict === "object") {
       onConflict = this._onConflict(params.onConflict);
       if (typeof params.onConflict?.where === "object" && !Array.isArray(params.onConflict?.where) && params.onConflict?.where?.params) {
@@ -670,11 +671,12 @@ var QueryBuilder = class {
             FROM ${params.tableName}` + this._where(params.where) + this._returning(params.returning) + this._orderBy(params.orderBy) + this._limit(params.limit) + this._offset(params.offset);
   }
   _select(params, queryArgs) {
+    let newQueryArgs = queryArgs;
     const isTopLevelCall = queryArgs === void 0;
     if (isTopLevelCall) {
-      queryArgs = [];
+      newQueryArgs = [];
     }
-    const currentQueryArgs = queryArgs;
+    const currentQueryArgs = newQueryArgs;
     const context = {
       subQueryPlaceholders: params.subQueryPlaceholders,
       queryArgs: currentQueryArgs,
@@ -848,9 +850,8 @@ var QueryBuilder = class {
           objs.push(`${key} ${item}`);
         });
         return objs.join(", ");
-      } else {
-        return obj;
       }
+      return obj;
     });
     return ` ORDER BY ${result.join(", ")}`;
   }
@@ -995,11 +996,14 @@ var D1QB = class extends QueryBuilder {
       }
       if (query.fetchType === "ONE" /* ONE */ || query.fetchType === "ALL" /* ALL */) {
         const resp = await stmt.all();
+        const meta = resp.meta;
         return {
-          changes: resp.meta?.changes,
-          duration: resp.meta?.duration,
-          last_row_id: resp.meta?.last_row_id,
-          served_by: resp.meta?.served_by,
+          changes: meta?.changes,
+          duration: meta?.duration,
+          last_row_id: meta?.last_row_id,
+          served_by: meta?.served_by,
+          rowsRead: meta?.rows_read,
+          rowsWritten: meta?.rows_written,
           meta: resp.meta,
           success: resp.success,
           results: query.fetchType === "ONE" /* ONE */ ? resp.results[0] : resp.results
@@ -1026,26 +1030,78 @@ var D1QB = class extends QueryBuilder {
               duration: resp.meta?.duration,
               last_row_id: resp.meta?.last_row_id,
               served_by: resp.meta?.served_by,
+              rowsRead: resp.meta?.rows_read,
+              rowsWritten: resp.meta?.rows_written,
               meta: resp.meta,
               success: resp.success,
               results: queryArray[i]?.fetchType === "ONE" /* ONE */ ? resp.results?.[0] : resp.results
             };
-          } else {
-            return {
-              changes: resp.meta?.changes,
-              duration: resp.meta?.duration,
-              last_row_id: resp.meta?.last_row_id,
-              served_by: resp.meta?.served_by,
-              meta: resp.meta,
-              success: resp.success
-            };
           }
+          return {
+            changes: resp.meta?.changes,
+            duration: resp.meta?.duration,
+            last_row_id: resp.meta?.last_row_id,
+            served_by: resp.meta?.served_by,
+            rowsRead: resp.meta?.rows_read,
+            rowsWritten: resp.meta?.rows_written,
+            meta: resp.meta,
+            success: resp.success
+          };
         }
       );
     });
   }
 };
 
+// src/databases/do.ts
+var DOQB = class extends QueryBuilder {
+  db;
+  loggerWrapper = syncLoggerWrapper;
+  constructor(db, options) {
+    super(options);
+    this.db = db;
+  }
+  migrations(options) {
+    return new syncMigrationsBuilder(options, this);
+  }
+  execute(query) {
+    return this.loggerWrapper(query, this.options.logger, () => {
+      let cursor;
+      if (query.arguments) {
+        cursor = this.db.exec(query.query, ...query.arguments);
+      } else {
+        cursor = this.db.exec(query.query);
+      }
+      const result = cursor.toArray();
+      const rowsRead = cursor.rowsRead;
+      const rowsWritten = cursor.rowsWritten;
+      if (query.fetchType == "ONE" /* ONE */) {
+        return {
+          results: result.length > 0 ? result[0] : void 0,
+          rowsRead,
+          rowsWritten
+        };
+      }
+      return {
+        results: result,
+        rowsRead,
+        rowsWritten
+      };
+    });
+  }
+  lazyExecute(query) {
+    return this.loggerWrapper(query, this.options.logger, () => {
+      let cursor;
+      if (query.arguments) {
+        cursor = this.db.exec(query.query, ...query.arguments);
+      } else {
+        cursor = this.db.exec(query.query);
+      }
+      return cursor;
+    });
+  }
+};
+
 // src/databases/pg.ts
 var PGQB = class extends QueryBuilder {
   db;
@@ -1093,49 +1149,6 @@ var PGQB = class extends QueryBuilder {
     });
   }
 };
-
-// src/databases/do.ts
-var DOQB = class extends QueryBuilder {
-  db;
-  loggerWrapper = syncLoggerWrapper;
-  constructor(db, options) {
-    super(options);
-    this.db = db;
-  }
-  migrations(options) {
-    return new syncMigrationsBuilder(options, this);
-  }
-  execute(query) {
-    return this.loggerWrapper(query, this.options.logger, () => {
-      let cursor;
-      if (query.arguments) {
-        cursor = this.db.exec(query.query, ...query.arguments);
-      } else {
-        cursor = this.db.exec(query.query);
-      }
-      const result = cursor.toArray();
-      if (query.fetchType == "ONE" /* ONE */) {
-        return {
-          results: result.length > 0 ? result[0] : void 0
-        };
-      }
-      return {
-        results: result
-      };
-    });
-  }
-  lazyExecute(query) {
-    return this.loggerWrapper(query, this.options.logger, () => {
-      let cursor;
-      if (query.arguments) {
-        cursor = this.db.exec(query.query, ...query.arguments);
-      } else {
-        cursor = this.db.exec(query.query);
-      }
-      return cursor;
-    });
-  }
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ConflictTypes,

package/dist/index.mjs

@@ -573,7 +573,8 @@ var QueryBuilder = class {
     }
     const columns = Object.keys(data[0]).join(", ");
     let index = 1;
-    let orConflict = "", onConflict = "";
+    let orConflict = "";
+    let onConflict = "";
     if (params.onConflict && typeof params.onConflict === "object") {
       onConflict = this._onConflict(params.onConflict);
       if (typeof params.onConflict?.where === "object" && !Array.isArray(params.onConflict?.where) && params.onConflict?.where?.params) {
@@ -628,11 +629,12 @@ var QueryBuilder = class {
             FROM ${params.tableName}` + this._where(params.where) + this._returning(params.returning) + this._orderBy(params.orderBy) + this._limit(params.limit) + this._offset(params.offset);
   }
   _select(params, queryArgs) {
+    let newQueryArgs = queryArgs;
     const isTopLevelCall = queryArgs === void 0;
     if (isTopLevelCall) {
-      queryArgs = [];
+      newQueryArgs = [];
     }
-    const currentQueryArgs = queryArgs;
+    const currentQueryArgs = newQueryArgs;
     const context = {
       subQueryPlaceholders: params.subQueryPlaceholders,
       queryArgs: currentQueryArgs,
@@ -806,9 +808,8 @@ var QueryBuilder = class {
           objs.push(`${key} ${item}`);
         });
         return objs.join(", ");
-      } else {
-        return obj;
       }
+      return obj;
     });
     return ` ORDER BY ${result.join(", ")}`;
   }
@@ -953,11 +954,14 @@ var D1QB = class extends QueryBuilder {
       }
       if (query.fetchType === "ONE" /* ONE */ || query.fetchType === "ALL" /* ALL */) {
         const resp = await stmt.all();
+        const meta = resp.meta;
         return {
-          changes: resp.meta?.changes,
-          duration: resp.meta?.duration,
-          last_row_id: resp.meta?.last_row_id,
-          served_by: resp.meta?.served_by,
+          changes: meta?.changes,
+          duration: meta?.duration,
+          last_row_id: meta?.last_row_id,
+          served_by: meta?.served_by,
+          rowsRead: meta?.rows_read,
+          rowsWritten: meta?.rows_written,
           meta: resp.meta,
           success: resp.success,
           results: query.fetchType === "ONE" /* ONE */ ? resp.results[0] : resp.results
@@ -984,26 +988,78 @@ var D1QB = class extends QueryBuilder {
               duration: resp.meta?.duration,
               last_row_id: resp.meta?.last_row_id,
               served_by: resp.meta?.served_by,
+              rowsRead: resp.meta?.rows_read,
+              rowsWritten: resp.meta?.rows_written,
               meta: resp.meta,
               success: resp.success,
               results: queryArray[i]?.fetchType === "ONE" /* ONE */ ? resp.results?.[0] : resp.results
             };
-          } else {
-            return {
-              changes: resp.meta?.changes,
-              duration: resp.meta?.duration,
-              last_row_id: resp.meta?.last_row_id,
-              served_by: resp.meta?.served_by,
-              meta: resp.meta,
-              success: resp.success
-            };
           }
+          return {
+            changes: resp.meta?.changes,
+            duration: resp.meta?.duration,
+            last_row_id: resp.meta?.last_row_id,
+            served_by: resp.meta?.served_by,
+            rowsRead: resp.meta?.rows_read,
+            rowsWritten: resp.meta?.rows_written,
+            meta: resp.meta,
+            success: resp.success
+          };
         }
       );
     });
   }
 };
 
+// src/databases/do.ts
+var DOQB = class extends QueryBuilder {
+  db;
+  loggerWrapper = syncLoggerWrapper;
+  constructor(db, options) {
+    super(options);
+    this.db = db;
+  }
+  migrations(options) {
+    return new syncMigrationsBuilder(options, this);
+  }
+  execute(query) {
+    return this.loggerWrapper(query, this.options.logger, () => {
+      let cursor;
+      if (query.arguments) {
+        cursor = this.db.exec(query.query, ...query.arguments);
+      } else {
+        cursor = this.db.exec(query.query);
+      }
+      const result = cursor.toArray();
+      const rowsRead = cursor.rowsRead;
+      const rowsWritten = cursor.rowsWritten;
+      if (query.fetchType == "ONE" /* ONE */) {
+        return {
+          results: result.length > 0 ? result[0] : void 0,
+          rowsRead,
+          rowsWritten
+        };
+      }
+      return {
+        results: result,
+        rowsRead,
+        rowsWritten
+      };
+    });
+  }
+  lazyExecute(query) {
+    return this.loggerWrapper(query, this.options.logger, () => {
+      let cursor;
+      if (query.arguments) {
+        cursor = this.db.exec(query.query, ...query.arguments);
+      } else {
+        cursor = this.db.exec(query.query);
+      }
+      return cursor;
+    });
+  }
+};
+
 // src/databases/pg.ts
 var PGQB = class extends QueryBuilder {
   db;
@@ -1051,49 +1107,6 @@ var PGQB = class extends QueryBuilder {
     });
   }
 };
-
-// src/databases/do.ts
-var DOQB = class extends QueryBuilder {
-  db;
-  loggerWrapper = syncLoggerWrapper;
-  constructor(db, options) {
-    super(options);
-    this.db = db;
-  }
-  migrations(options) {
-    return new syncMigrationsBuilder(options, this);
-  }
-  execute(query) {
-    return this.loggerWrapper(query, this.options.logger, () => {
-      let cursor;
-      if (query.arguments) {
-        cursor = this.db.exec(query.query, ...query.arguments);
-      } else {
-        cursor = this.db.exec(query.query);
-      }
-      const result = cursor.toArray();
-      if (query.fetchType == "ONE" /* ONE */) {
-        return {
-          results: result.length > 0 ? result[0] : void 0
-        };
-      }
-      return {
-        results: result
-      };
-    });
-  }
-  lazyExecute(query) {
-    return this.loggerWrapper(query, this.options.logger, () => {
-      let cursor;
-      if (query.arguments) {
-        cursor = this.db.exec(query.query, ...query.arguments);
-      } else {
-        cursor = this.db.exec(query.query);
-      }
-      return cursor;
-    });
-  }
-};
 export {
   ConflictTypes,
   D1QB,