bun-query-builder 0.2.45 → 0.2.46

package/dist/bin/cli.js

@@ -14944,6 +14944,10 @@ function createQueryBuilder(state) {
         built = null;
         return this;
       },
+      $call(callback) {
+        callback(this);
+        return this;
+      },
       union(other) {
         appendSetOp("UNION", other);
         return this;
@@ -26792,6 +26796,18 @@ class ModelQueryBuilder {
       return "";
     return this._trashed === "only" ? `${SOFT_DELETE_COLUMN} IS NOT NULL` : `${SOFT_DELETE_COLUMN} IS NULL`;
   }
+  assertNoUnappliedClauses(method) {
+    const ignored = [];
+    if (this._limit !== undefined)
+      ignored.push("limit()");
+    if (this._offset !== undefined)
+      ignored.push("offset()");
+    if (this._orderBy.length > 0)
+      ignored.push("orderBy()");
+    if (ignored.length > 0) {
+      throw new TypeError(`[orm] ${method}() cannot apply ${ignored.join(", ")} \u2014 an UPDATE/DELETE takes no ORDER BY or LIMIT on every supported dialect. ` + `Previously these were ignored, so the statement affected every matching row. Narrow it with where() instead.`);
+    }
+  }
   composeWhere(params) {
     const userClause = this._wheres.length > 0 ? this.buildWhereClauses(params) : "";
     const sd = this.softDeleteClause();
@@ -27041,6 +27057,7 @@ class ModelQueryBuilder {
   }
   async increment(column, amount = 1) {
     assertValidIdentifier(column, "increment(column)");
+    this.assertNoUnappliedClauses("increment");
     const exec = getExecutor();
     const params = [amount];
     const incCol = sqlColumn(column);
@@ -27049,9 +27066,9 @@ class ModelQueryBuilder {
       sql2 += `, updated_at = ?`;
       params.push(formatNow());
     }
-    if (this._wheres.length > 0) {
-      const clauses = this.buildWhereClauses(params);
-      sql2 += ` WHERE ${clauses}`;
+    const whereBody = this.composeWhere(params);
+    if (whereBody) {
+      sql2 += ` WHERE ${whereBody}`;
     }
     return (await exec.run(sql2, params)).changes;
   }
@@ -27150,15 +27167,18 @@ class ModelQueryBuilder {
     return Number(await this.aggregate("SUM", column) ?? 0) || 0;
   }
   async delete() {
+    this.assertNoUnappliedClauses("delete");
     const exec = getExecutor();
     const params = [];
     let sql2 = `DELETE FROM ${this._definition.table}`;
-    if (this._wheres.length > 0) {
-      sql2 += ` WHERE ${this.buildWhereClauses(params)}`;
+    const whereBody = this.composeWhere(params);
+    if (whereBody) {
+      sql2 += ` WHERE ${whereBody}`;
     }
     return (await exec.run(sql2, params)).changes;
   }
   async update(data) {
+    this.assertNoUnappliedClauses("update");
     const exec = getExecutor();
     const entries = Object.entries(data);
     const sets = entries.map(([k2]) => `${sqlColumn(k2)} = ?`).join(", ");
@@ -27167,8 +27187,9 @@ class ModelQueryBuilder {
       params.push(formatNow());
     }
     let sql2 = `UPDATE ${this._definition.table} SET ${sets}${timestampsEnabled(this._definition) ? ", updated_at = ?" : ""}`;
-    if (this._wheres.length > 0) {
-      sql2 += ` WHERE ${this.buildWhereClauses(params)}`;
+    const whereBody = this.composeWhere(params);
+    if (whereBody) {
+      sql2 += ` WHERE ${whereBody}`;
     }
     return (await exec.run(sql2, params)).changes;
   }
@@ -32523,7 +32544,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version2 = "0.2.45";
+var version2 = "0.2.46";
 
 // bin/cli.ts
 init_actions();

package/dist/client.d.ts

@@ -180,6 +180,7 @@ export declare interface BaseSelectQueryBuilder<DB extends AnyDatabaseSchema, TT
   }
   selectAll?: () => SelectQueryBuilder<DB, TTable, DB[TTable]['columns'], TJoined>
   orderByRaw: (fragment: SqlFragment) => SelectQueryBuilder<DB, TTable, TSelected, TJoined>
+  $call: (callback: (query: SelectQueryBuilder<DB, TTable, TSelected, TJoined>) => unknown) => SelectQueryBuilder<DB, TTable, TSelected, TJoined>
   union: (other: { toSQL: () => string }) => SelectQueryBuilder<DB, TTable, TSelected, TJoined>
   unionAll: (other: { toSQL: () => string }) => SelectQueryBuilder<DB, TTable, TSelected, TJoined>
   forPage: (page: number, perPage: number) => SelectQueryBuilder<DB, TTable, TSelected, TJoined>

package/dist/src/index.js

@@ -14943,6 +14943,10 @@ function createQueryBuilder(state) {
         built = null;
         return this;
       },
+      $call(callback) {
+        callback(this);
+        return this;
+      },
       union(other) {
         appendSetOp("UNION", other);
         return this;
@@ -26791,6 +26795,18 @@ class ModelQueryBuilder {
       return "";
     return this._trashed === "only" ? `${SOFT_DELETE_COLUMN} IS NOT NULL` : `${SOFT_DELETE_COLUMN} IS NULL`;
   }
+  assertNoUnappliedClauses(method) {
+    const ignored = [];
+    if (this._limit !== undefined)
+      ignored.push("limit()");
+    if (this._offset !== undefined)
+      ignored.push("offset()");
+    if (this._orderBy.length > 0)
+      ignored.push("orderBy()");
+    if (ignored.length > 0) {
+      throw new TypeError(`[orm] ${method}() cannot apply ${ignored.join(", ")} \u2014 an UPDATE/DELETE takes no ORDER BY or LIMIT on every supported dialect. ` + `Previously these were ignored, so the statement affected every matching row. Narrow it with where() instead.`);
+    }
+  }
   composeWhere(params) {
     const userClause = this._wheres.length > 0 ? this.buildWhereClauses(params) : "";
     const sd = this.softDeleteClause();
@@ -27040,6 +27056,7 @@ class ModelQueryBuilder {
   }
   async increment(column, amount = 1) {
     assertValidIdentifier(column, "increment(column)");
+    this.assertNoUnappliedClauses("increment");
     const exec = getExecutor();
     const params = [amount];
     const incCol = sqlColumn(column);
@@ -27048,9 +27065,9 @@ class ModelQueryBuilder {
       sql2 += `, updated_at = ?`;
       params.push(formatNow());
     }
-    if (this._wheres.length > 0) {
-      const clauses = this.buildWhereClauses(params);
-      sql2 += ` WHERE ${clauses}`;
+    const whereBody = this.composeWhere(params);
+    if (whereBody) {
+      sql2 += ` WHERE ${whereBody}`;
     }
     return (await exec.run(sql2, params)).changes;
   }
@@ -27149,15 +27166,18 @@ class ModelQueryBuilder {
     return Number(await this.aggregate("SUM", column) ?? 0) || 0;
   }
   async delete() {
+    this.assertNoUnappliedClauses("delete");
     const exec = getExecutor();
     const params = [];
     let sql2 = `DELETE FROM ${this._definition.table}`;
-    if (this._wheres.length > 0) {
-      sql2 += ` WHERE ${this.buildWhereClauses(params)}`;
+    const whereBody = this.composeWhere(params);
+    if (whereBody) {
+      sql2 += ` WHERE ${whereBody}`;
     }
     return (await exec.run(sql2, params)).changes;
   }
   async update(data) {
+    this.assertNoUnappliedClauses("update");
     const exec = getExecutor();
     const entries = Object.entries(data);
     const sets = entries.map(([k2]) => `${sqlColumn(k2)} = ?`).join(", ");
@@ -27166,8 +27186,9 @@ class ModelQueryBuilder {
       params.push(formatNow());
     }
     let sql2 = `UPDATE ${this._definition.table} SET ${sets}${timestampsEnabled(this._definition) ? ", updated_at = ?" : ""}`;
-    if (this._wheres.length > 0) {
-      sql2 += ` WHERE ${this.buildWhereClauses(params)}`;
+    const whereBody = this.composeWhere(params);
+    if (whereBody) {
+      sql2 += ` WHERE ${whereBody}`;
     }
     return (await exec.run(sql2, params)).changes;
   }

package/package.json

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