bun-query-builder 0.2.45 → 0.2.47

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;
@@ -15596,6 +15600,10 @@ function createQueryBuilder(state) {
             const newBase = fromIdx !== -1 ? `${baseText2.slice(0, fromIdx)}, ${frag}${baseText2.slice(fromIdx)}` : `${baseText2}, ${frag}`;
             return makeSub(newBase, terms, params, tail);
           },
+          $call(callback) {
+            const next = callback(this);
+            return next ?? this;
+          },
           where(expr, op, value) {
             return withTerm("AND", expr, op, value);
           },
@@ -18634,14 +18642,26 @@ class MySQLDriver {
   ${columns}
 );`;
   }
-  createIndex(tableName, index) {
+  static KEY_PREFIX_CHARACTERS = 255;
+  needsKeyPrefix(column) {
+    const rendered = this.getColumnType(column).toLowerCase();
+    if (rendered.includes("text") || rendered.includes("blob") || rendered === "json")
+      return true;
+    const width = rendered.match(/^(?:var)?char\((\d+)\)$/)?.[1];
+    return width !== undefined && Number(width) >= 768;
+  }
+  createIndex(tableName, index, columns) {
     if (index.where) {
       throw new Error(`[migrations] Partial indexes (CompositeIndex.where) are not supported on MySQL. Index '${index.name}' on table '${tableName}' uses WHERE clause: ${index.where}`);
     }
     const kind = index.type === "unique" ? "UNIQUE " : "";
     const idxName = qualifiedIndexName(tableName, index.name);
-    const columns = index.columns.map((c) => this.quoteIdentifier(c)).join(", ");
-    return `CREATE ${kind}INDEX ${this.quoteIdentifier(idxName)} ON ${this.quoteIdentifier(tableName)} (${columns});`;
+    const keyParts = index.columns.map((name) => {
+      const column = columns?.find((one) => one.name === name);
+      const quoted = this.quoteIdentifier(name);
+      return column && this.needsKeyPrefix(column) ? `${quoted}(${MySQLDriver.KEY_PREFIX_CHARACTERS})` : quoted;
+    }).join(", ");
+    return `CREATE ${kind}INDEX ${this.quoteIdentifier(idxName)} ON ${this.quoteIdentifier(tableName)} (${keyParts});`;
   }
   addForeignKey(tableName, columnName, refTable, refColumn, onDelete, onUpdate, existingConstraintNames = []) {
     const fkName = `${tableName}_${columnName}_fk`;
@@ -19020,11 +19040,11 @@ var init_singlestore = __esm(() => {
     addForeignKey() {
       return "";
     }
-    createIndex(tableName, index) {
+    createIndex(tableName, index, columns) {
       if (index.where) {
         throw new Error(`[migrations] Partial indexes (CompositeIndex.where) are not supported on SingleStore. Index '${index.name}' on table '${tableName}' uses WHERE clause: ${index.where}`);
       }
-      return super.createIndex(tableName, index);
+      return super.createIndex(tableName, index, columns);
     }
   };
 });
@@ -26792,6 +26812,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 +27073,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 +27082,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 +27183,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 +27203,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;
   }
@@ -29693,7 +29730,7 @@ function generateSql(plan, opts = {}) {
     const createTableStatement = driver.createTable(t2);
     tableStatements.push(createTableStatement);
     for (const idx of t2.indexes)
-      tableStatements.push(driver.createIndex(t2.table, idx));
+      tableStatements.push(driver.createIndex(t2.table, idx, t2.columns));
     if (tableIndex === tables.length - 1) {
       for (const deferredTable of tables) {
         for (const column of deferredTable.columns) {
@@ -30028,7 +30065,7 @@ function generateDiffOperations(previous, next, opts = {}) {
     const createTableStatement = driver.createTable(t2);
     tableStatements.push(createTableStatement);
     for (const idx of t2.indexes) {
-      const createIndexStatement = driver.createIndex(t2.table, idx);
+      const createIndexStatement = driver.createIndex(t2.table, idx, t2.columns);
       tableStatements.push(createIndexStatement);
       operations.push({ kind: "create_index", table: t2.table, column: idx.name, destructive: false, sql: createIndexStatement });
     }
@@ -30232,7 +30269,7 @@ function generateDiffOperations(previous, next, opts = {}) {
     for (const key of Object.keys(currIdx)) {
       if (!prevIdx[key]) {
         const idx = currIdx[key];
-        const createIndexStatement = driver.createIndex(curr.table, idx);
+        const createIndexStatement = driver.createIndex(curr.table, idx, curr.columns);
         tableChanges.push(createIndexStatement);
         chunks.push(createIndexStatement);
         operations.push({ kind: "create_index", table: curr.table, column: idx.name, destructive: false, sql: createIndexStatement });
@@ -32523,7 +32560,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version2 = "0.2.45";
+var version2 = "0.2.47";
 
 // 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/drivers/mysql.d.ts

@@ -3,7 +3,7 @@ import type { DateBucketGrain } from './postgres';
 export declare interface DialectDriver {
   createEnumType: (enumTypeName: string, values: string[]) => string
   createTable: (table: TablePlan) => string
-  createIndex: (tableName: string, index: IndexPlan) => string
+  createIndex: (tableName: string, index: IndexPlan, columns?: readonly ColumnPlan[]) => string
   addForeignKey: (tableName: string, columnName: string, refTable: string, refColumn: string, onDelete?: string, onUpdate?: string, existingConstraintNames?: string[]) => string
   addColumn: (tableName: string, column: ColumnPlan) => string
   modifyColumn: (tableName: string, column: ColumnPlan) => string
@@ -26,7 +26,9 @@ export declare class MySQLDriver implements DialectDriver {
   protected getDefaultValue(column: ColumnPlan): string;
   createEnumType(_enumTypeName: string, _values: string[]): string;
   createTable(table: TablePlan): string;
-  createIndex(tableName: string, index: IndexPlan): string;
+  protected static readonly KEY_PREFIX_CHARACTERS: 255;
+  protected needsKeyPrefix(column: ColumnPlan): boolean;
+  createIndex(tableName: string, index: IndexPlan, columns?: readonly ColumnPlan[]): string;
   addForeignKey(tableName: string, columnName: string, refTable: string, refColumn: string, onDelete?: string, onUpdate?: string, existingConstraintNames?: string[]): string;
   addColumn(tableName: string, column: ColumnPlan): string;
   modifyColumn(tableName: string, column: ColumnPlan): string;

package/dist/drivers/postgres.d.ts

@@ -9,7 +9,7 @@ export declare const DATE_BUCKET_FORMAT: 'YYYY-MM-DDTHH:MM:SS.000Z';
 export declare interface DialectDriver {
   createEnumType: (enumTypeName: string, values: string[]) => string
   createTable: (table: TablePlan) => string
-  createIndex: (tableName: string, index: IndexPlan) => string
+  createIndex: (tableName: string, index: IndexPlan, columns?: readonly ColumnPlan[]) => string
   addForeignKey: (tableName: string, columnName: string, refTable: string, refColumn: string, onDelete?: string, onUpdate?: string, existingConstraintNames?: string[]) => string
   addColumn: (tableName: string, column: ColumnPlan) => string
   modifyColumn: (tableName: string, column: ColumnPlan) => string

package/dist/drivers/singlestore.d.ts

@@ -1,5 +1,5 @@
 import { MySQLDriver } from './mysql';
-import type { IndexPlan, TablePlan } from '../migrations';
+import type { ColumnPlan, IndexPlan, TablePlan } from '../migrations';
 /**
  * SingleStore DDL driver.
  *
@@ -24,5 +24,5 @@ import type { IndexPlan, TablePlan } from '../migrations';
 export declare class SingleStoreDriver extends MySQLDriver {
   createTable(table: TablePlan): string;
   addForeignKey(): string;
-  createIndex(tableName: string, index: IndexPlan): string;
+  createIndex(tableName: string, index: IndexPlan, columns?: readonly ColumnPlan[]): string;
 }

package/dist/drivers/sqlite.d.ts

@@ -4,7 +4,7 @@ import type { DateBucketGrain } from './postgres';
 export declare interface DialectDriver {
   createEnumType: (enumTypeName: string, values: string[]) => string
   createTable: (table: TablePlan) => string
-  createIndex: (tableName: string, index: IndexPlan) => string
+  createIndex: (tableName: string, index: IndexPlan, columns?: readonly ColumnPlan[]) => string
   addForeignKey: (tableName: string, columnName: string, refTable: string, refColumn: string, onDelete?: string, onUpdate?: string) => string
   addColumn: (tableName: string, column: ColumnPlan) => string
   modifyColumn: (tableName: string, column: ColumnPlan) => string

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;
@@ -15595,6 +15599,10 @@ function createQueryBuilder(state) {
             const newBase = fromIdx !== -1 ? `${baseText2.slice(0, fromIdx)}, ${frag}${baseText2.slice(fromIdx)}` : `${baseText2}, ${frag}`;
             return makeSub(newBase, terms, params, tail);
           },
+          $call(callback) {
+            const next = callback(this);
+            return next ?? this;
+          },
           where(expr, op, value) {
             return withTerm("AND", expr, op, value);
           },
@@ -18633,14 +18641,26 @@ class MySQLDriver {
   ${columns}
 );`;
   }
-  createIndex(tableName, index) {
+  static KEY_PREFIX_CHARACTERS = 255;
+  needsKeyPrefix(column) {
+    const rendered = this.getColumnType(column).toLowerCase();
+    if (rendered.includes("text") || rendered.includes("blob") || rendered === "json")
+      return true;
+    const width = rendered.match(/^(?:var)?char\((\d+)\)$/)?.[1];
+    return width !== undefined && Number(width) >= 768;
+  }
+  createIndex(tableName, index, columns) {
     if (index.where) {
       throw new Error(`[migrations] Partial indexes (CompositeIndex.where) are not supported on MySQL. Index '${index.name}' on table '${tableName}' uses WHERE clause: ${index.where}`);
     }
     const kind = index.type === "unique" ? "UNIQUE " : "";
     const idxName = qualifiedIndexName(tableName, index.name);
-    const columns = index.columns.map((c) => this.quoteIdentifier(c)).join(", ");
-    return `CREATE ${kind}INDEX ${this.quoteIdentifier(idxName)} ON ${this.quoteIdentifier(tableName)} (${columns});`;
+    const keyParts = index.columns.map((name) => {
+      const column = columns?.find((one) => one.name === name);
+      const quoted = this.quoteIdentifier(name);
+      return column && this.needsKeyPrefix(column) ? `${quoted}(${MySQLDriver.KEY_PREFIX_CHARACTERS})` : quoted;
+    }).join(", ");
+    return `CREATE ${kind}INDEX ${this.quoteIdentifier(idxName)} ON ${this.quoteIdentifier(tableName)} (${keyParts});`;
   }
   addForeignKey(tableName, columnName, refTable, refColumn, onDelete, onUpdate, existingConstraintNames = []) {
     const fkName = `${tableName}_${columnName}_fk`;
@@ -19019,11 +19039,11 @@ var init_singlestore = __esm(() => {
     addForeignKey() {
       return "";
     }
-    createIndex(tableName, index) {
+    createIndex(tableName, index, columns) {
       if (index.where) {
         throw new Error(`[migrations] Partial indexes (CompositeIndex.where) are not supported on SingleStore. Index '${index.name}' on table '${tableName}' uses WHERE clause: ${index.where}`);
       }
-      return super.createIndex(tableName, index);
+      return super.createIndex(tableName, index, columns);
     }
   };
 });
@@ -26791,6 +26811,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 +27072,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 +27081,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 +27182,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 +27202,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;
   }
@@ -29692,7 +29729,7 @@ function generateSql(plan, opts = {}) {
     const createTableStatement = driver.createTable(t2);
     tableStatements.push(createTableStatement);
     for (const idx of t2.indexes)
-      tableStatements.push(driver.createIndex(t2.table, idx));
+      tableStatements.push(driver.createIndex(t2.table, idx, t2.columns));
     if (tableIndex === tables.length - 1) {
       for (const deferredTable of tables) {
         for (const column of deferredTable.columns) {
@@ -30027,7 +30064,7 @@ function generateDiffOperations(previous, next, opts = {}) {
     const createTableStatement = driver.createTable(t2);
     tableStatements.push(createTableStatement);
     for (const idx of t2.indexes) {
-      const createIndexStatement = driver.createIndex(t2.table, idx);
+      const createIndexStatement = driver.createIndex(t2.table, idx, t2.columns);
       tableStatements.push(createIndexStatement);
       operations.push({ kind: "create_index", table: t2.table, column: idx.name, destructive: false, sql: createIndexStatement });
     }
@@ -30231,7 +30268,7 @@ function generateDiffOperations(previous, next, opts = {}) {
     for (const key of Object.keys(currIdx)) {
       if (!prevIdx[key]) {
         const idx = currIdx[key];
-        const createIndexStatement = driver.createIndex(curr.table, idx);
+        const createIndexStatement = driver.createIndex(curr.table, idx, curr.columns);
         tableChanges.push(createIndexStatement);
         chunks.push(createIndexStatement);
         operations.push({ kind: "create_index", table: curr.table, column: idx.name, destructive: false, sql: createIndexStatement });

package/package.json

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