@bjnstnkvc/db 2.0.0 → 2.0.1

package/README.md

@@ -16,7 +16,8 @@ The method names and their semantics follow Laravel closely enough that the docs
 - [Grouping](#grouping)
 - [Query plans](#query-plans)
 - [Transactions](#transactions)
-- [Events and the query log](#events-and-the-query-log)
+- [Events](#events)
+- [Query log](#query-log)
 - [Multiple tabs](#multiple-tabs)
 - [Connections](#connections)
 - [Storage quota](#storage-quota)
@@ -1098,26 +1099,49 @@ from this package.
 > The tables have to be declared up front, because an IndexedDB transaction fixes its scope when it
 > opens.
 
-### Events and the query log
+### Events
 
-```ts
-DB.onQueryExecuted((event: QueryExecuted): void => {
-    console.log(event.plan, event.duration, event.records);
-});
+Listen for an event by its key, and the listener receives an instance of the class it maps to:
 
+```ts
 DB.listen('migration-started', (event: MigrationStarted): void => console.log(event.migration));
 DB.listen('query', listener, { once: true });
 DB.forget('query', listener);
 ```
 
-Available events: `query`, `transaction-beginning`, `transaction-committed`,
-`transaction-rolled-back`, `migrations-started`, `migration-started`, `migration-ended`,
-`migrations-ended`, `no-pending-migrations`, `seeding-started`, `seeder-started`, `seeder-ended`,
-`seeding-ended`, `database-blocked`.
+Every event also has a shortcut named after its class, which takes the same options:
+
+```ts
+DB.onQueryExecuted((event: QueryExecuted): void => {
+    console.log(event.plan, event.duration, event.records);
+});
+```
+
+| Key                       | Class                   | Carries                                                                                |
+|---------------------------|-------------------------|----------------------------------------------------------------------------------------|
+| `query`                   | `QueryExecuted`         | `connection`, `table`, `plan`, `constraints`, `orders`, `limit`, `duration`, `records` |
+| `transaction-beginning`   | `TransactionBeginning`  | `connection`                                                                           |
+| `transaction-committed`   | `TransactionCommitted`  | `connection`                                                                           |
+| `transaction-rolled-back` | `TransactionRolledBack` | `connection`, `reason`                                                                 |
+| `migrations-started`      | `MigrationsStarted`     | `connection`, `migrations`                                                             |
+| `migration-started`       | `MigrationStarted`      | `migration`                                                                            |
+| `migration-ended`         | `MigrationEnded`        | `migration`                                                                            |
+| `migrations-ended`        | `MigrationsEnded`       | `connection`, `migrations`                                                             |
+| `no-pending-migrations`   | `NoPendingMigrations`   | `connection`                                                                           |
+| `seeding-started`         | `SeedingStarted`        | `connection`, `seeders`                                                                |
+| `seeder-started`          | `SeederStarted`         | `seeder`                                                                               |
+| `seeder-ended`            | `SeederEnded`           | `seeder`                                                                               |
+| `seeding-ended`           | `SeedingEnded`          | `connection`, `seeders`                                                                |
+| `database-blocked`        | `DatabaseBlocked`       | `database`                                                                             |
 
 A connection with no seeders announces nothing, so `seeding-started` firing always means at least
 one seeder is about to run.
 
+> Modeled on Laravel's [Migrations: Events](https://laravel.com/docs/12.x/migrations#events), with
+> each event dispatched as a browser event and listened for by key.
+
+### Query log
+
 ```ts
 DB.enableQueryLog();
 
@@ -1126,7 +1150,7 @@ await DB.table<User>('users').where('role', 'admin').get();
 DB.getQueryLog();
 ```
 
-Resolves to one entry per query that ran while the log was enabled:
+Resolves to one entry per `query` event dispatched while the log was enabled:
 
 ```
 [

package/dist/main.cjs

@@ -1170,7 +1170,7 @@ var Request = class {
 };
 
 // src/schema/Coercer.ts
-var FALSY = ["false", "0"];
+var FALSY = /* @__PURE__ */ new Set(["false", "0"]);
 var Coercer = class {
   /**
    * Coerce a value into its declared column type.
@@ -1187,7 +1187,7 @@ var Coercer = class {
       case "float":
         return this.#numeric(value, strict, false);
       case "boolean":
-        return typeof value === "string" && FALSY.includes(value) ? false : Boolean(value);
+        return typeof value === "string" && FALSY.has(value) ? false : Boolean(value);
       case "decimal":
         return this.#scaled(value, strict);
       case "enum":
@@ -1435,15 +1435,9 @@ var Join = class {
    * The conditions the tables are joined on.
    */
   #conditions = [];
-  /**
-   * Join on a pair of columns.
-   */
   on(first, operator, second) {
     return this.#condition("and", first, operator, second);
   }
-  /**
-   * Join on a pair of columns, disjunctively.
-   */
   orOn(first, operator, second) {
     return this.#condition("or", first, operator, second);
   }
@@ -1488,7 +1482,7 @@ var Predicate = class {
       if (index === 0 || constraint.conjunction === "or") {
         groups.push([]);
       }
-      groups[groups.length - 1]?.push(constraint);
+      groups.at(-1)?.push(constraint);
     }
     return groups;
   }
@@ -1748,7 +1742,7 @@ var Joiner = class {
 };
 
 // src/query/Planner.ts
-var RANGEABLE = ["=", "==", "===", ">", ">=", "<", "<="];
+var RANGEABLE = /* @__PURE__ */ new Set(["=", "==", "===", ">", ">=", "<", "<="]);
 var Planner = class {
   /**
    * Compile the constraints and orders into an execution plan.
@@ -1838,7 +1832,7 @@ var Planner = class {
       }
       return { constraint, ...target, range: IDBKeyRange.bound(constraint.from, constraint.to, false, false), values: null };
     }
-    if (!RANGEABLE.includes(constraint.operator) || !this.#keyable(constraint.value)) {
+    if (!RANGEABLE.has(constraint.operator) || !this.#keyable(constraint.value)) {
       return null;
     }
     return { constraint, ...target, range: this.#range(constraint.operator, constraint.value), values: null };
@@ -1914,7 +1908,7 @@ var Signature = class {
    * Build a signature identifying a record by every column it holds.
    */
   static of(record) {
-    return Object.keys(record).sort().map((column) => this.#segment(column) + this.#segment(this.value(record[column]))).join("");
+    return Object.keys(record).sort((a, b) => a < b ? -1 : 1).map((column) => this.#segment(column) + this.#segment(this.value(record[column]))).join("");
   }
   /**
    * Build a signature identifying an ordered list of values.
@@ -1997,17 +1991,11 @@ var Grouping = class _Grouping {
     grouping.#offset = this.#offset;
     return grouping;
   }
-  /**
-   * Constrain the groups the query returns.
-   */
-  having(column, operator, value) {
-    return this.#constrain("and", column, operator, value);
+  having(column, ...parameters) {
+    return this.#constrain("and", column, parameters);
   }
-  /**
-   * Add a disjunctive constraint on the groups the query returns.
-   */
-  orHaving(column, operator, value) {
-    return this.#constrain("or", column, operator, value);
+  orHaving(column, ...parameters) {
+    return this.#constrain("or", column, parameters);
   }
   /**
    * Sort the groups by a column or an aggregate.
@@ -2117,8 +2105,8 @@ var Grouping = class _Grouping {
   /**
    * Add a constraint on the groups the query returns.
    */
-  #constrain(conjunction, column, operator, value) {
-    const resolved = value === void 0 ? { operator: "=", value: operator } : { operator, value };
+  #constrain(conjunction, column, parameters) {
+    const resolved = parameters.length < 2 ? { operator: "=", value: parameters[0] } : { operator: parameters[0], value: parameters[1] };
     this.#constraints.push({ type: "basic", column, operator: resolved.operator, value: resolved.value, conjunction, not: false });
     return this;
   }
@@ -2186,23 +2174,14 @@ var Builder = class _Builder {
   get table() {
     return this.#table;
   }
-  /**
-   * Add a constraint to the query.
-   */
-  where(column, operator, value) {
-    return this.#constrain("and", false, column, operator, value);
+  where(column, ...parameters) {
+    return this.#constrain("and", false, column, parameters);
   }
-  /**
-   * Add a disjunctive constraint to the query.
-   */
-  orWhere(column, operator, value) {
-    return this.#constrain("or", false, column, operator, value);
+  orWhere(column, ...parameters) {
+    return this.#constrain("or", false, column, parameters);
   }
-  /**
-   * Add a negated constraint to the query.
-   */
-  whereNot(column, operator, value) {
-    return this.#constrain("and", true, column, operator, value);
+  whereNot(column, ...parameters) {
+    return this.#constrain("and", true, column, parameters);
   }
   /**
    * Constrain a column to one of the given values.
@@ -2327,21 +2306,12 @@ var Builder = class _Builder {
   whereDay(column, value) {
     return this.#part("and", column, "day", value);
   }
-  /**
-   * Join another table, keeping only the rows that match.
-   */
   join(table, first, operator, second) {
     return this.#join("inner", table, first, operator, second);
   }
-  /**
-   * Join another table, keeping every row of this one.
-   */
   leftJoin(table, first, operator, second) {
     return this.#join("left", table, first, operator, second);
   }
-  /**
-   * Join another table, keeping every row of it.
-   */
   rightJoin(table, first, operator, second) {
     return this.#join("right", table, first, operator, second);
   }
@@ -2352,15 +2322,9 @@ var Builder = class _Builder {
     this.#joins.push({ table, type: "cross", conditions: [] });
     return this;
   }
-  /**
-   * Constrain a column against another column of the same row.
-   */
   whereColumn(column, operator, other) {
     return this.#compared("and", column, operator, other);
   }
-  /**
-   * Constrain a column against another column of the same row, disjunctively.
-   */
   orWhereColumn(column, operator, other) {
     return this.#compared("or", column, operator, other);
   }
@@ -2983,7 +2947,7 @@ var Builder = class _Builder {
   /**
    * Add a constraint of the given shape to the query.
    */
-  #constrain(conjunction, not, column, operator, value) {
+  #constrain(conjunction, not, column, parameters) {
     if (typeof column === "function") {
       const nested = new _Builder(this.#connection, this.#table, this.#transaction);
       column(nested);
@@ -3000,7 +2964,7 @@ var Builder = class _Builder {
       }));
       return this.#push({ type: "nested", constraints, conjunction, not });
     }
-    const resolved = value === void 0 ? { operator: "=", value: operator } : { operator, value };
+    const resolved = parameters.length < 2 ? { operator: "=", value: parameters[0] } : { operator: parameters[0], value: parameters[1] };
     return this.#push({ type: "basic", column, operator: resolved.operator, value: resolved.value, conjunction, not });
   }
   /**
@@ -3060,6 +3024,8 @@ var Builder = class _Builder {
     const clause = new Join();
     if (typeof first === "function") {
       first(clause);
+    } else if (second === void 0) {
+      clause.on(first, operator);
     } else {
       clause.on(first, operator, second);
     }

package/dist/main.d.cts

@@ -302,11 +302,13 @@ declare class Join {
     /**
      * Join on a pair of columns.
      */
-    on(first: string, operator: Operator | string, second?: string): this;
+    on(first: string, second: string): this;
+    on(first: string, operator: Operator, second: string): this;
     /**
      * Join on a pair of columns, disjunctively.
      */
-    orOn(first: string, operator: Operator | string, second?: string): this;
+    orOn(first: string, second: string): this;
+    orOn(first: string, operator: Operator, second: string): this;
     /**
      * Get the conditions the tables are joined on.
      */
@@ -327,11 +329,13 @@ declare class Grouping<T, G extends (keyof T & string)[], A extends Aggregations
     /**
      * Constrain the groups the query returns.
      */
-    having(column: Key<Grouped<T, G, A>>, operator?: Operator | unknown, value?: unknown): this;
+    having(column: Key<Grouped<T, G, A>>, value: unknown): this;
+    having(column: Key<Grouped<T, G, A>>, operator: Operator, value: unknown): this;
     /**
      * Add a disjunctive constraint on the groups the query returns.
      */
-    orHaving(column: Key<Grouped<T, G, A>>, operator?: Operator | unknown, value?: unknown): this;
+    orHaving(column: Key<Grouped<T, G, A>>, value: unknown): this;
+    orHaving(column: Key<Grouped<T, G, A>>, operator: Operator, value: unknown): this;
     /**
      * Sort the groups by a column or an aggregate.
      */
@@ -518,7 +522,6 @@ declare class Connection {
 
 type Nested<T> = (query: Builder<T>) => void;
 type Joining = (join: Join) => void;
-type Column<T> = Key<T> | Partial<T> | Nested<T>;
 declare class Builder<T = Record<string, unknown>> {
     #private;
     /**
@@ -532,15 +535,21 @@ declare class Builder<T = Record<string, unknown>> {
     /**
      * Add a constraint to the query.
      */
-    where(column: Column<T>, operator?: Operator | unknown, value?: unknown): this;
+    where(column: Partial<T> | Nested<T>): this;
+    where(column: Key<T>, value: unknown): this;
+    where(column: Key<T>, operator: Operator, value: unknown): this;
     /**
      * Add a disjunctive constraint to the query.
      */
-    orWhere(column: Column<T>, operator?: Operator | unknown, value?: unknown): this;
+    orWhere(column: Partial<T> | Nested<T>): this;
+    orWhere(column: Key<T>, value: unknown): this;
+    orWhere(column: Key<T>, operator: Operator, value: unknown): this;
     /**
      * Add a negated constraint to the query.
      */
-    whereNot(column: Column<T>, operator?: Operator | unknown, value?: unknown): this;
+    whereNot(column: Partial<T> | Nested<T>): this;
+    whereNot(column: Key<T>, value: unknown): this;
+    whereNot(column: Key<T>, operator: Operator, value: unknown): this;
     /**
      * Constrain a column to one of the given values.
      */
@@ -624,15 +633,21 @@ declare class Builder<T = Record<string, unknown>> {
     /**
      * Join another table, keeping only the rows that match.
      */
-    join<R = Record<string, unknown>>(table: string, first: string | Joining, operator?: Operator | string, second?: string): Builder<R>;
+    join<R = Record<string, unknown>>(table: string, first: Joining): Builder<R>;
+    join<R = Record<string, unknown>>(table: string, first: string, second: string): Builder<R>;
+    join<R = Record<string, unknown>>(table: string, first: string, operator: Operator, second: string): Builder<R>;
     /**
      * Join another table, keeping every row of this one.
      */
-    leftJoin<R = Record<string, unknown>>(table: string, first: string | Joining, operator?: Operator | string, second?: string): Builder<R>;
+    leftJoin<R = Record<string, unknown>>(table: string, first: Joining): Builder<R>;
+    leftJoin<R = Record<string, unknown>>(table: string, first: string, second: string): Builder<R>;
+    leftJoin<R = Record<string, unknown>>(table: string, first: string, operator: Operator, second: string): Builder<R>;
     /**
      * Join another table, keeping every row of it.
      */
-    rightJoin<R = Record<string, unknown>>(table: string, first: string | Joining, operator?: Operator | string, second?: string): Builder<R>;
+    rightJoin<R = Record<string, unknown>>(table: string, first: Joining): Builder<R>;
+    rightJoin<R = Record<string, unknown>>(table: string, first: string, second: string): Builder<R>;
+    rightJoin<R = Record<string, unknown>>(table: string, first: string, operator: Operator, second: string): Builder<R>;
     /**
      * Pair every row of this table with every row of another.
      */
@@ -640,11 +655,13 @@ declare class Builder<T = Record<string, unknown>> {
     /**
      * Constrain a column against another column of the same row.
      */
-    whereColumn(column: Key<T>, operator: Operator | string, other?: string): this;
+    whereColumn(column: Key<T>, other: string): this;
+    whereColumn(column: Key<T>, operator: Operator, other: string): this;
     /**
      * Constrain a column against another column of the same row, disjunctively.
      */
-    orWhereColumn(column: Key<T>, operator: Operator | string, other?: string): this;
+    orWhereColumn(column: Key<T>, other: string): this;
+    orWhereColumn(column: Key<T>, operator: Operator, other: string): this;
     /**
      * Project only the given columns, which may alias what they select.
      */

package/dist/main.d.ts

@@ -302,11 +302,13 @@ declare class Join {
     /**
      * Join on a pair of columns.
      */
-    on(first: string, operator: Operator | string, second?: string): this;
+    on(first: string, second: string): this;
+    on(first: string, operator: Operator, second: string): this;
     /**
      * Join on a pair of columns, disjunctively.
      */
-    orOn(first: string, operator: Operator | string, second?: string): this;
+    orOn(first: string, second: string): this;
+    orOn(first: string, operator: Operator, second: string): this;
     /**
      * Get the conditions the tables are joined on.
      */
@@ -327,11 +329,13 @@ declare class Grouping<T, G extends (keyof T & string)[], A extends Aggregations
     /**
      * Constrain the groups the query returns.
      */
-    having(column: Key<Grouped<T, G, A>>, operator?: Operator | unknown, value?: unknown): this;
+    having(column: Key<Grouped<T, G, A>>, value: unknown): this;
+    having(column: Key<Grouped<T, G, A>>, operator: Operator, value: unknown): this;
     /**
      * Add a disjunctive constraint on the groups the query returns.
      */
-    orHaving(column: Key<Grouped<T, G, A>>, operator?: Operator | unknown, value?: unknown): this;
+    orHaving(column: Key<Grouped<T, G, A>>, value: unknown): this;
+    orHaving(column: Key<Grouped<T, G, A>>, operator: Operator, value: unknown): this;
     /**
      * Sort the groups by a column or an aggregate.
      */
@@ -518,7 +522,6 @@ declare class Connection {
 
 type Nested<T> = (query: Builder<T>) => void;
 type Joining = (join: Join) => void;
-type Column<T> = Key<T> | Partial<T> | Nested<T>;
 declare class Builder<T = Record<string, unknown>> {
     #private;
     /**
@@ -532,15 +535,21 @@ declare class Builder<T = Record<string, unknown>> {
     /**
      * Add a constraint to the query.
      */
-    where(column: Column<T>, operator?: Operator | unknown, value?: unknown): this;
+    where(column: Partial<T> | Nested<T>): this;
+    where(column: Key<T>, value: unknown): this;
+    where(column: Key<T>, operator: Operator, value: unknown): this;
     /**
      * Add a disjunctive constraint to the query.
      */
-    orWhere(column: Column<T>, operator?: Operator | unknown, value?: unknown): this;
+    orWhere(column: Partial<T> | Nested<T>): this;
+    orWhere(column: Key<T>, value: unknown): this;
+    orWhere(column: Key<T>, operator: Operator, value: unknown): this;
     /**
      * Add a negated constraint to the query.
      */
-    whereNot(column: Column<T>, operator?: Operator | unknown, value?: unknown): this;
+    whereNot(column: Partial<T> | Nested<T>): this;
+    whereNot(column: Key<T>, value: unknown): this;
+    whereNot(column: Key<T>, operator: Operator, value: unknown): this;
     /**
      * Constrain a column to one of the given values.
      */
@@ -624,15 +633,21 @@ declare class Builder<T = Record<string, unknown>> {
     /**
      * Join another table, keeping only the rows that match.
      */
-    join<R = Record<string, unknown>>(table: string, first: string | Joining, operator?: Operator | string, second?: string): Builder<R>;
+    join<R = Record<string, unknown>>(table: string, first: Joining): Builder<R>;
+    join<R = Record<string, unknown>>(table: string, first: string, second: string): Builder<R>;
+    join<R = Record<string, unknown>>(table: string, first: string, operator: Operator, second: string): Builder<R>;
     /**
      * Join another table, keeping every row of this one.
      */
-    leftJoin<R = Record<string, unknown>>(table: string, first: string | Joining, operator?: Operator | string, second?: string): Builder<R>;
+    leftJoin<R = Record<string, unknown>>(table: string, first: Joining): Builder<R>;
+    leftJoin<R = Record<string, unknown>>(table: string, first: string, second: string): Builder<R>;
+    leftJoin<R = Record<string, unknown>>(table: string, first: string, operator: Operator, second: string): Builder<R>;
     /**
      * Join another table, keeping every row of it.
      */
-    rightJoin<R = Record<string, unknown>>(table: string, first: string | Joining, operator?: Operator | string, second?: string): Builder<R>;
+    rightJoin<R = Record<string, unknown>>(table: string, first: Joining): Builder<R>;
+    rightJoin<R = Record<string, unknown>>(table: string, first: string, second: string): Builder<R>;
+    rightJoin<R = Record<string, unknown>>(table: string, first: string, operator: Operator, second: string): Builder<R>;
     /**
      * Pair every row of this table with every row of another.
      */
@@ -640,11 +655,13 @@ declare class Builder<T = Record<string, unknown>> {
     /**
      * Constrain a column against another column of the same row.
      */
-    whereColumn(column: Key<T>, operator: Operator | string, other?: string): this;
+    whereColumn(column: Key<T>, other: string): this;
+    whereColumn(column: Key<T>, operator: Operator, other: string): this;
     /**
      * Constrain a column against another column of the same row, disjunctively.
      */
-    orWhereColumn(column: Key<T>, operator: Operator | string, other?: string): this;
+    orWhereColumn(column: Key<T>, other: string): this;
+    orWhereColumn(column: Key<T>, operator: Operator, other: string): this;
     /**
      * Project only the given columns, which may alias what they select.
      */

package/dist/main.js

@@ -1106,7 +1106,7 @@ var Request = class {
 };
 
 // src/schema/Coercer.ts
-var FALSY = ["false", "0"];
+var FALSY = /* @__PURE__ */ new Set(["false", "0"]);
 var Coercer = class {
   /**
    * Coerce a value into its declared column type.
@@ -1123,7 +1123,7 @@ var Coercer = class {
       case "float":
         return this.#numeric(value, strict, false);
       case "boolean":
-        return typeof value === "string" && FALSY.includes(value) ? false : Boolean(value);
+        return typeof value === "string" && FALSY.has(value) ? false : Boolean(value);
       case "decimal":
         return this.#scaled(value, strict);
       case "enum":
@@ -1371,15 +1371,9 @@ var Join = class {
    * The conditions the tables are joined on.
    */
   #conditions = [];
-  /**
-   * Join on a pair of columns.
-   */
   on(first, operator, second) {
     return this.#condition("and", first, operator, second);
   }
-  /**
-   * Join on a pair of columns, disjunctively.
-   */
   orOn(first, operator, second) {
     return this.#condition("or", first, operator, second);
   }
@@ -1424,7 +1418,7 @@ var Predicate = class {
       if (index === 0 || constraint.conjunction === "or") {
         groups.push([]);
       }
-      groups[groups.length - 1]?.push(constraint);
+      groups.at(-1)?.push(constraint);
     }
     return groups;
   }
@@ -1684,7 +1678,7 @@ var Joiner = class {
 };
 
 // src/query/Planner.ts
-var RANGEABLE = ["=", "==", "===", ">", ">=", "<", "<="];
+var RANGEABLE = /* @__PURE__ */ new Set(["=", "==", "===", ">", ">=", "<", "<="]);
 var Planner = class {
   /**
    * Compile the constraints and orders into an execution plan.
@@ -1774,7 +1768,7 @@ var Planner = class {
       }
       return { constraint, ...target, range: IDBKeyRange.bound(constraint.from, constraint.to, false, false), values: null };
     }
-    if (!RANGEABLE.includes(constraint.operator) || !this.#keyable(constraint.value)) {
+    if (!RANGEABLE.has(constraint.operator) || !this.#keyable(constraint.value)) {
       return null;
     }
     return { constraint, ...target, range: this.#range(constraint.operator, constraint.value), values: null };
@@ -1850,7 +1844,7 @@ var Signature = class {
    * Build a signature identifying a record by every column it holds.
    */
   static of(record) {
-    return Object.keys(record).sort().map((column) => this.#segment(column) + this.#segment(this.value(record[column]))).join("");
+    return Object.keys(record).sort((a, b) => a < b ? -1 : 1).map((column) => this.#segment(column) + this.#segment(this.value(record[column]))).join("");
   }
   /**
    * Build a signature identifying an ordered list of values.
@@ -1933,17 +1927,11 @@ var Grouping = class _Grouping {
     grouping.#offset = this.#offset;
     return grouping;
   }
-  /**
-   * Constrain the groups the query returns.
-   */
-  having(column, operator, value) {
-    return this.#constrain("and", column, operator, value);
+  having(column, ...parameters) {
+    return this.#constrain("and", column, parameters);
   }
-  /**
-   * Add a disjunctive constraint on the groups the query returns.
-   */
-  orHaving(column, operator, value) {
-    return this.#constrain("or", column, operator, value);
+  orHaving(column, ...parameters) {
+    return this.#constrain("or", column, parameters);
   }
   /**
    * Sort the groups by a column or an aggregate.
@@ -2053,8 +2041,8 @@ var Grouping = class _Grouping {
   /**
    * Add a constraint on the groups the query returns.
    */
-  #constrain(conjunction, column, operator, value) {
-    const resolved = value === void 0 ? { operator: "=", value: operator } : { operator, value };
+  #constrain(conjunction, column, parameters) {
+    const resolved = parameters.length < 2 ? { operator: "=", value: parameters[0] } : { operator: parameters[0], value: parameters[1] };
     this.#constraints.push({ type: "basic", column, operator: resolved.operator, value: resolved.value, conjunction, not: false });
     return this;
   }
@@ -2122,23 +2110,14 @@ var Builder = class _Builder {
   get table() {
     return this.#table;
   }
-  /**
-   * Add a constraint to the query.
-   */
-  where(column, operator, value) {
-    return this.#constrain("and", false, column, operator, value);
+  where(column, ...parameters) {
+    return this.#constrain("and", false, column, parameters);
   }
-  /**
-   * Add a disjunctive constraint to the query.
-   */
-  orWhere(column, operator, value) {
-    return this.#constrain("or", false, column, operator, value);
+  orWhere(column, ...parameters) {
+    return this.#constrain("or", false, column, parameters);
   }
-  /**
-   * Add a negated constraint to the query.
-   */
-  whereNot(column, operator, value) {
-    return this.#constrain("and", true, column, operator, value);
+  whereNot(column, ...parameters) {
+    return this.#constrain("and", true, column, parameters);
   }
   /**
    * Constrain a column to one of the given values.
@@ -2263,21 +2242,12 @@ var Builder = class _Builder {
   whereDay(column, value) {
     return this.#part("and", column, "day", value);
   }
-  /**
-   * Join another table, keeping only the rows that match.
-   */
   join(table, first, operator, second) {
     return this.#join("inner", table, first, operator, second);
   }
-  /**
-   * Join another table, keeping every row of this one.
-   */
   leftJoin(table, first, operator, second) {
     return this.#join("left", table, first, operator, second);
   }
-  /**
-   * Join another table, keeping every row of it.
-   */
   rightJoin(table, first, operator, second) {
     return this.#join("right", table, first, operator, second);
   }
@@ -2288,15 +2258,9 @@ var Builder = class _Builder {
     this.#joins.push({ table, type: "cross", conditions: [] });
     return this;
   }
-  /**
-   * Constrain a column against another column of the same row.
-   */
   whereColumn(column, operator, other) {
     return this.#compared("and", column, operator, other);
   }
-  /**
-   * Constrain a column against another column of the same row, disjunctively.
-   */
   orWhereColumn(column, operator, other) {
     return this.#compared("or", column, operator, other);
   }
@@ -2919,7 +2883,7 @@ var Builder = class _Builder {
   /**
    * Add a constraint of the given shape to the query.
    */
-  #constrain(conjunction, not, column, operator, value) {
+  #constrain(conjunction, not, column, parameters) {
     if (typeof column === "function") {
       const nested = new _Builder(this.#connection, this.#table, this.#transaction);
       column(nested);
@@ -2936,7 +2900,7 @@ var Builder = class _Builder {
       }));
       return this.#push({ type: "nested", constraints, conjunction, not });
     }
-    const resolved = value === void 0 ? { operator: "=", value: operator } : { operator, value };
+    const resolved = parameters.length < 2 ? { operator: "=", value: parameters[0] } : { operator: parameters[0], value: parameters[1] };
     return this.#push({ type: "basic", column, operator: resolved.operator, value: resolved.value, conjunction, not });
   }
   /**
@@ -2996,6 +2960,8 @@ var Builder = class _Builder {
     const clause = new Join();
     if (typeof first === "function") {
       first(clause);
+    } else if (second === void 0) {
+      clause.on(first, operator);
     } else {
       clause.on(first, operator, second);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bjnstnkvc/db",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "TypeScript database layer for IndexedDB with an API modeled on Laravel.",
   "type": "module",
   "main": "./dist/main.cjs",
@@ -8,8 +8,14 @@
   "types": "./dist/main.d.ts",
   "exports": {
     ".": {
-      "import": { "types": "./dist/main.d.ts", "default": "./dist/main.js" },
-      "require": { "types": "./dist/main.d.cts", "default": "./dist/main.cjs" }
+      "import": {
+        "types": "./dist/main.d.ts",
+        "default": "./dist/main.js"
+      },
+      "require": {
+        "types": "./dist/main.d.cts",
+        "default": "./dist/main.cjs"
+      }
     }
   },
   "files": [