@rocicorp/zero 0.25.0-canary.7 → 0.25.0-canary.8

package/out/zqlite/src/internal/statement-cache.js

@@ -1,119 +1,95 @@
 import { assert } from "../../../shared/src/asserts.js";
-/**
- * SQLite statement preparation isn't cheap as it involves evaluating possible
- * query plans and picking the best one (in addition to parsing the SQL).
- *
- * This statement cache prevents the need to re-prepare the same statement
- * multiple times.
- *
- * One extra wrinkle is that a single statement cannot be used by multiple
- * callers at the same time. As in, we can't `iterate` the same statement
- * many times concurrently.
- *
- * Given that, statements are removed from the cache while in use.
- * - `get` removes the statement from the cache
- * - `return` adds it back.
- *
- * If a request for the same sql is made while a
- * statement is gotten, a new statement will be prepared.
- * Both statements can be returned to the cache even though they both
- * serve the same SQL. Having both copies returned to the cache allows
- * the cache to serve multiple callers concurrently in the future.
- *
- * It is not an error to fail to call `return` on a statement.
- * Failing to call return will only prevent the statement from being reused
- * by other callers. It will not cause a resource leak.
- */
-export class StatementCache {
-    #cache = new Map();
-    #db;
-    #size = 0;
-    /**
-     * The db connection used to prepare the statement.
-     * It is an error to use a statement prepared on one connection with another connection.
-     * @param db
-     */
-    constructor(db) {
-        this.#db = db;
+class StatementCache {
+  #cache = /* @__PURE__ */ new Map();
+  #db;
+  #size = 0;
+  /**
+   * The db connection used to prepare the statement.
+   * It is an error to use a statement prepared on one connection with another connection.
+   * @param db
+   */
+  constructor(db) {
+    this.#db = db;
+  }
+  // the number of statements in the cache
+  get size() {
+    return this.#size;
+  }
+  drop(n) {
+    assert(n >= 0, "Cannot drop a negative number of items");
+    assert(n <= this.#size, "Cannot drop more items than are in the cache");
+    let remaining = n;
+    for (const [sql, statements] of this.#cache.entries()) {
+      if (remaining >= statements.length) {
+        this.#cache.delete(sql);
+        remaining -= statements.length;
+        this.#size -= statements.length;
+      } else {
+        statements.splice(0, remaining);
+        this.#size -= remaining;
+        break;
+      }
     }
-    // the number of statements in the cache
-    get size() {
-        return this.#size;
+  }
+  /**
+   * Prepares a statement for the given sql unless one is already cached.
+   * If one is cached, it is removed from the cache and returned.
+   *
+   * Since `get` removes the item from the cache it is not an error to fail to call
+   * `return`. The gotten statement will be correctly garbage collected.
+   *
+   * When a gotten statement is not returned, future calls to
+   * `get` with the same `sql` will prepare a new statement.
+   *
+   * @param sql
+   * @returns
+   */
+  get(sql) {
+    sql = normalizeWhitespace(sql);
+    const statements = this.#cache.get(sql);
+    if (statements && statements.length > 0) {
+      const statement2 = statements.pop();
+      this.#size--;
+      if (statements.length === 0) {
+        this.#cache.delete(sql);
+      }
+      return { sql, statement: statement2 };
     }
-    drop(n) {
-        assert(n >= 0, 'Cannot drop a negative number of items');
-        assert(n <= this.#size, 'Cannot drop more items than are in the cache');
-        let remaining = n;
-        for (const [sql, statements] of this.#cache.entries()) {
-            if (remaining >= statements.length) {
-                this.#cache.delete(sql);
-                remaining -= statements.length;
-                this.#size -= statements.length;
-            }
-            else {
-                statements.splice(0, remaining);
-                this.#size -= remaining;
-                break;
-            }
-        }
+    const statement = this.#db.prepare(sql);
+    return { sql, statement };
+  }
+  /**
+   * Handles `get` and `return` for the caller by invoking them before
+   * and after the callback.
+   */
+  use(sql, cb) {
+    const statement = this.get(sql);
+    try {
+      return cb(statement);
+    } finally {
+      this.return(statement);
     }
-    /**
-     * Prepares a statement for the given sql unless one is already cached.
-     * If one is cached, it is removed from the cache and returned.
-     *
-     * Since `get` removes the item from the cache it is not an error to fail to call
-     * `return`. The gotten statement will be correctly garbage collected.
-     *
-     * When a gotten statement is not returned, future calls to
-     * `get` with the same `sql` will prepare a new statement.
-     *
-     * @param sql
-     * @returns
-     */
-    get(sql) {
-        sql = normalizeWhitespace(sql);
-        const statements = this.#cache.get(sql);
-        if (statements && statements.length > 0) {
-            const statement = statements.pop();
-            this.#size--;
-            if (statements.length === 0) {
-                this.#cache.delete(sql);
-            }
-            return { sql, statement };
-        }
-        const statement = this.#db.prepare(sql);
-        return { sql, statement };
+  }
+  /**
+   * Add a statement back to the cache so someone else can use it later.
+   * @param statement
+   */
+  return(statement) {
+    const { sql } = statement;
+    if (!this.#cache.has(sql)) {
+      this.#cache.set(sql, []);
     }
-    /**
-     * Handles `get` and `return` for the caller by invoking them before
-     * and after the callback.
-     */
-    use(sql, cb) {
-        const statement = this.get(sql);
-        try {
-            return cb(statement);
-        }
-        finally {
-            this.return(statement);
-        }
-    }
-    /**
-     * Add a statement back to the cache so someone else can use it later.
-     * @param statement
-     */
-    return(statement) {
-        const { sql } = statement;
-        if (!this.#cache.has(sql)) {
-            this.#cache.set(sql, []);
-        }
-        const statements = this.#cache.get(sql);
-        if (statements) {
-            statements.push(statement.statement);
-            this.#size++;
-        }
+    const statements = this.#cache.get(sql);
+    if (statements) {
+      statements.push(statement.statement);
+      this.#size++;
     }
+  }
 }
 function normalizeWhitespace(sql) {
-    return sql.replaceAll(/\s+/g, ' ');
+  return sql.replaceAll(/\s+/g, " ");
 }
-//# sourceMappingURL=statement-cache.js.map
+export {
+  StatementCache
+};
+//# sourceMappingURL=statement-cache.js.map

package/out/zqlite/src/internal/statement-cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"statement-cache.js","sourceRoot":"","sources":["../../../../../zqlite/src/internal/statement-cache.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"statement-cache.js","sources":["../../../../../zqlite/src/internal/statement-cache.ts"],"sourcesContent":["import {assert} from '../../../shared/src/asserts.ts';\nimport type {Database, Statement} from '../db.ts';\n\nexport type CachedStatementMap = Map<string, Statement[]>;\nexport type CachedStatement = {\n  sql: string;\n  statement: Statement;\n};\n/**\n * SQLite statement preparation isn't cheap as it involves evaluating possible\n * query plans and picking the best one (in addition to parsing the SQL).\n *\n * This statement cache prevents the need to re-prepare the same statement\n * multiple times.\n *\n * One extra wrinkle is that a single statement cannot be used by multiple\n * callers at the same time. As in, we can't `iterate` the same statement\n * many times concurrently.\n *\n * Given that, statements are removed from the cache while in use.\n * - `get` removes the statement from the cache\n * - `return` adds it back.\n *\n * If a request for the same sql is made while a\n * statement is gotten, a new statement will be prepared.\n * Both statements can be returned to the cache even though they both\n * serve the same SQL. Having both copies returned to the cache allows\n * the cache to serve multiple callers concurrently in the future.\n *\n * It is not an error to fail to call `return` on a statement.\n * Failing to call return will only prevent the statement from being reused\n * by other callers. It will not cause a resource leak.\n */\nexport class StatementCache {\n  #cache: CachedStatementMap = new Map<string, Statement[]>();\n  readonly #db: Database;\n  #size: number = 0;\n\n  /**\n   * The db connection used to prepare the statement.\n   * It is an error to use a statement prepared on one connection with another connection.\n   * @param db\n   */\n  constructor(db: Database) {\n    this.#db = db;\n  }\n\n  // the number of statements in the cache\n  get size() {\n    return this.#size;\n  }\n\n  drop(n: number) {\n    assert(n >= 0, 'Cannot drop a negative number of items');\n    assert(n <= this.#size, 'Cannot drop more items than are in the cache');\n\n    let remaining = n;\n    for (const [sql, statements] of this.#cache.entries()) {\n      if (remaining >= statements.length) {\n        this.#cache.delete(sql);\n        remaining -= statements.length;\n        this.#size -= statements.length;\n      } else {\n        statements.splice(0, remaining);\n        this.#size -= remaining;\n        break;\n      }\n    }\n  }\n\n  /**\n   * Prepares a statement for the given sql unless one is already cached.\n   * If one is cached, it is removed from the cache and returned.\n   *\n   * Since `get` removes the item from the cache it is not an error to fail to call\n   * `return`. The gotten statement will be correctly garbage collected.\n   *\n   * When a gotten statement is not returned, future calls to\n   * `get` with the same `sql` will prepare a new statement.\n   *\n   * @param sql\n   * @returns\n   */\n  get(sql: string): CachedStatement {\n    sql = normalizeWhitespace(sql);\n    const statements = this.#cache.get(sql);\n    if (statements && statements.length > 0) {\n      const statement = statements.pop()!;\n      this.#size--;\n      if (statements.length === 0) {\n        this.#cache.delete(sql);\n      }\n      return {sql, statement};\n    }\n    const statement = this.#db.prepare(sql);\n    return {sql, statement};\n  }\n\n  /**\n   * Handles `get` and `return` for the caller by invoking them before\n   * and after the callback.\n   */\n  use<T>(sql: string, cb: (statement: CachedStatement) => T) {\n    const statement = this.get(sql);\n    try {\n      return cb(statement);\n    } finally {\n      this.return(statement);\n    }\n  }\n\n  /**\n   * Add a statement back to the cache so someone else can use it later.\n   * @param statement\n   */\n  return(statement: CachedStatement) {\n    const {sql} = statement;\n    if (!this.#cache.has(sql)) {\n      this.#cache.set(sql, []);\n    }\n    const statements = this.#cache.get(sql);\n    if (statements) {\n      statements.push(statement.statement);\n      this.#size++;\n    }\n  }\n}\n\nfunction normalizeWhitespace(sql: string) {\n  return sql.replaceAll(/\\s+/g, ' ');\n}\n"],"names":["statement"],"mappings":";AAiCO,MAAM,eAAe;AAAA,EAC1B,6BAAiC,IAAA;AAAA,EACxB;AAAA,EACT,QAAgB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOhB,YAAY,IAAc;AACxB,SAAK,MAAM;AAAA,EACb;AAAA;AAAA,EAGA,IAAI,OAAO;AACT,WAAO,KAAK;AAAA,EACd;AAAA,EAEA,KAAK,GAAW;AACd,WAAO,KAAK,GAAG,wCAAwC;AACvD,WAAO,KAAK,KAAK,OAAO,8CAA8C;AAEtE,QAAI,YAAY;AAChB,eAAW,CAAC,KAAK,UAAU,KAAK,KAAK,OAAO,WAAW;AACrD,UAAI,aAAa,WAAW,QAAQ;AAClC,aAAK,OAAO,OAAO,GAAG;AACtB,qBAAa,WAAW;AACxB,aAAK,SAAS,WAAW;AAAA,MAC3B,OAAO;AACL,mBAAW,OAAO,GAAG,SAAS;AAC9B,aAAK,SAAS;AACd;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAeA,IAAI,KAA8B;AAChC,UAAM,oBAAoB,GAAG;AAC7B,UAAM,aAAa,KAAK,OAAO,IAAI,GAAG;AACtC,QAAI,cAAc,WAAW,SAAS,GAAG;AACvC,YAAMA,aAAY,WAAW,IAAA;AAC7B,WAAK;AACL,UAAI,WAAW,WAAW,GAAG;AAC3B,aAAK,OAAO,OAAO,GAAG;AAAA,MACxB;AACA,aAAO,EAAC,KAAK,WAAAA,WAAAA;AAAAA,IACf;AACA,UAAM,YAAY,KAAK,IAAI,QAAQ,GAAG;AACtC,WAAO,EAAC,KAAK,UAAA;AAAA,EACf;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,IAAO,KAAa,IAAuC;AACzD,UAAM,YAAY,KAAK,IAAI,GAAG;AAC9B,QAAI;AACF,aAAO,GAAG,SAAS;AAAA,IACrB,UAAA;AACE,WAAK,OAAO,SAAS;AAAA,IACvB;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,OAAO,WAA4B;AACjC,UAAM,EAAC,QAAO;AACd,QAAI,CAAC,KAAK,OAAO,IAAI,GAAG,GAAG;AACzB,WAAK,OAAO,IAAI,KAAK,CAAA,CAAE;AAAA,IACzB;AACA,UAAM,aAAa,KAAK,OAAO,IAAI,GAAG;AACtC,QAAI,YAAY;AACd,iBAAW,KAAK,UAAU,SAAS;AACnC,WAAK;AAAA,IACP;AAAA,EACF;AACF;AAEA,SAAS,oBAAoB,KAAa;AACxC,SAAO,IAAI,WAAW,QAAQ,GAAG;AACnC;"}

package/out/zqlite/src/query-builder.js

@@ -1,162 +1,191 @@
 import { sql } from "./internal/sql.js";
-export function buildSelectQuery(tableName, columns, constraint, filters, order, reverse, start) {
-    let query = sql `SELECT ${sql.join(Object.keys(columns).map(c => sql.ident(c)), sql `,`)} FROM ${sql.ident(tableName)}`;
-    const constraints = constraintsToSQL(constraint, columns);
-    if (start) {
-        constraints.push(gatherStartConstraints(start, reverse, order, columns));
-    }
-    if (filters) {
-        constraints.push(filtersToSQL(filters));
-    }
-    if (constraints.length > 0) {
-        query = sql `${query} WHERE ${sql.join(constraints, sql ` AND `)}`;
-    }
-    return sql `${query} ${orderByToSQL(order, !!reverse)}`;
+function buildSelectQuery(tableName, columns, constraint, filters, order, reverse, start) {
+  let query = sql`SELECT ${sql.join(
+    Object.keys(columns).map((c) => sql.ident(c)),
+    sql`,`
+  )} FROM ${sql.ident(tableName)}`;
+  const constraints = constraintsToSQL(constraint, columns);
+  if (start) {
+    constraints.push(gatherStartConstraints(start, reverse, order, columns));
+  }
+  if (filters) {
+    constraints.push(filtersToSQL(filters));
+  }
+  if (constraints.length > 0) {
+    query = sql`${query} WHERE ${sql.join(constraints, sql` AND `)}`;
+  }
+  return sql`${query} ${orderByToSQL(order, !!reverse)}`;
 }
-export function constraintsToSQL(constraint, columns) {
-    if (!constraint) {
-        return [];
-    }
-    const constraints = [];
-    for (const [key, value] of Object.entries(constraint)) {
-        constraints.push(sql `${sql.ident(key)} = ${toSQLiteType(value, columns[key].type)}`);
-    }
-    return constraints;
+function constraintsToSQL(constraint, columns) {
+  if (!constraint) {
+    return [];
+  }
+  const constraints = [];
+  for (const [key, value] of Object.entries(constraint)) {
+    constraints.push(
+      sql`${sql.ident(key)} = ${toSQLiteType(value, columns[key].type)}`
+    );
+  }
+  return constraints;
 }
-export function orderByToSQL(order, reverse) {
-    if (reverse) {
-        return sql `ORDER BY ${sql.join(order.map(s => sql `${sql.ident(s[0])} ${sql.__dangerous__rawValue(s[1] === 'asc' ? 'desc' : 'asc')}`), sql `, `)}`;
-    }
-    else {
-        return sql `ORDER BY ${sql.join(order.map(s => sql `${sql.ident(s[0])} ${sql.__dangerous__rawValue(s[1])}`), sql `, `)}`;
-    }
+function orderByToSQL(order, reverse) {
+  if (reverse) {
+    return sql`ORDER BY ${sql.join(
+      order.map(
+        (s) => sql`${sql.ident(s[0])} ${sql.__dangerous__rawValue(
+          s[1] === "asc" ? "desc" : "asc"
+        )}`
+      ),
+      sql`, `
+    )}`;
+  } else {
+    return sql`ORDER BY ${sql.join(
+      order.map(
+        (s) => sql`${sql.ident(s[0])} ${sql.__dangerous__rawValue(s[1])}`
+      ),
+      sql`, `
+    )}`;
+  }
 }
-/**
- * Converts filters (conditions) to SQL WHERE clause.
- * This applies all filters present in the AST for a query to the source.
- */
-export function filtersToSQL(filters) {
-    switch (filters.type) {
-        case 'simple':
-            return simpleConditionToSQL(filters);
-        case 'and':
-            return filters.conditions.length > 0
-                ? sql `(${sql.join(filters.conditions.map(condition => filtersToSQL(condition)), sql ` AND `)})`
-                : sql `TRUE`;
-        case 'or':
-            return filters.conditions.length > 0
-                ? sql `(${sql.join(filters.conditions.map(condition => filtersToSQL(condition)), sql ` OR `)})`
-                : sql `FALSE`;
-    }
+function filtersToSQL(filters) {
+  switch (filters.type) {
+    case "simple":
+      return simpleConditionToSQL(filters);
+    case "and":
+      return filters.conditions.length > 0 ? sql`(${sql.join(
+        filters.conditions.map(
+          (condition) => filtersToSQL(condition)
+        ),
+        sql` AND `
+      )})` : sql`TRUE`;
+    case "or":
+      return filters.conditions.length > 0 ? sql`(${sql.join(
+        filters.conditions.map(
+          (condition) => filtersToSQL(condition)
+        ),
+        sql` OR `
+      )})` : sql`FALSE`;
+  }
 }
 function simpleConditionToSQL(filter) {
-    const { op } = filter;
-    if (op === 'IN' || op === 'NOT IN') {
-        switch (filter.right.type) {
-            case 'literal':
-                return sql `${valuePositionToSQL(filter.left)} ${sql.__dangerous__rawValue(filter.op)} (SELECT value FROM json_each(${JSON.stringify(filter.right.value)}))`;
-            case 'static':
-                throw new Error('Static parameters must be replaced before conversion to SQL');
-        }
+  const { op } = filter;
+  if (op === "IN" || op === "NOT IN") {
+    switch (filter.right.type) {
+      case "literal":
+        return sql`${valuePositionToSQL(
+          filter.left
+        )} ${sql.__dangerous__rawValue(
+          filter.op
+        )} (SELECT value FROM json_each(${JSON.stringify(
+          filter.right.value
+        )}))`;
+      case "static":
+        throw new Error(
+          "Static parameters must be replaced before conversion to SQL"
+        );
     }
-    return sql `${valuePositionToSQL(filter.left)} ${sql.__dangerous__rawValue(
+  }
+  return sql`${valuePositionToSQL(filter.left)} ${sql.__dangerous__rawValue(
     // SQLite's LIKE operator is case-insensitive by default, so we
     // convert ILIKE to LIKE and NOT ILIKE to NOT LIKE.
-    filter.op === 'ILIKE'
-        ? 'LIKE'
-        : filter.op === 'NOT ILIKE'
-            ? 'NOT LIKE'
-            : filter.op)} ${valuePositionToSQL(filter.right)}`;
+    filter.op === "ILIKE" ? "LIKE" : filter.op === "NOT ILIKE" ? "NOT LIKE" : filter.op
+  )} ${valuePositionToSQL(filter.right)}`;
 }
 function valuePositionToSQL(value) {
-    switch (value.type) {
-        case 'column':
-            return sql.ident(value.name);
-        case 'literal':
-            return sql `${toSQLiteType(value.value, getJsType(value.value))}`;
-        case 'static':
-            throw new Error('Static parameters must be replaced before conversion to SQL');
-    }
+  switch (value.type) {
+    case "column":
+      return sql.ident(value.name);
+    case "literal":
+      return sql`${toSQLiteType(value.value, getJsType(value.value))}`;
+    case "static":
+      throw new Error(
+        "Static parameters must be replaced before conversion to SQL"
+      );
+  }
 }
 function getJsType(value) {
-    if (value === null) {
-        return 'null';
-    }
-    return typeof value === 'string'
-        ? 'string'
-        : typeof value === 'number'
-            ? 'number'
-            : typeof value === 'boolean'
-                ? 'boolean'
-                : 'json';
+  if (value === null) {
+    return "null";
+  }
+  return typeof value === "string" ? "string" : typeof value === "number" ? "number" : typeof value === "boolean" ? "boolean" : "json";
 }
-export function toSQLiteType(v, type) {
-    switch (type) {
-        case 'boolean':
-            return v === null ? null : v ? 1 : 0;
-        case 'number':
-        case 'string':
-        case 'null':
-            return v;
-        case 'json':
-            return JSON.stringify(v);
-    }
+function toSQLiteType(v, type) {
+  switch (type) {
+    case "boolean":
+      return v === null ? null : v ? 1 : 0;
+    case "number":
+    case "string":
+    case "null":
+      return v;
+    case "json":
+      return JSON.stringify(v);
+  }
 }
-/**
- * The ordering could be complex such as:
- * `ORDER BY a ASC, b DESC, c ASC`
- *
- * In those cases, we need to encode the constraints as various
- * `OR` clauses.
- *
- * E.g.,
- *
- * to get the row after (a = 1, b = 2, c = 3) would be:
- *
- * `WHERE a > 1 OR (a = 1 AND b < 2) OR (a = 1 AND b = 2 AND c > 3)`
- *
- * - after vs before flips the comparison operators.
- * - inclusive adds a final `OR` clause for the exact match.
- */
 function gatherStartConstraints(start, reverse, order, columnTypes) {
-    const constraints = [];
-    const { row: from, basis } = start;
-    for (let i = 0; i < order.length; i++) {
-        const group = [];
-        const [iField, iDirection] = order[i];
-        for (let j = 0; j <= i; j++) {
-            if (j === i) {
-                const constraintValue = toSQLiteType(from[iField], columnTypes[iField].type);
-                if (iDirection === 'asc') {
-                    if (!reverse) {
-                        group.push(sql `(${constraintValue} IS NULL OR ${sql.ident(iField)} > ${constraintValue})`);
-                    }
-                    else {
-                        reverse;
-                        group.push(sql `(${sql.ident(iField)} IS NULL OR ${sql.ident(iField)} < ${constraintValue})`);
-                    }
-                }
-                else {
-                    iDirection;
-                    if (!reverse) {
-                        group.push(sql `(${sql.ident(iField)} IS NULL OR ${sql.ident(iField)} < ${constraintValue})`);
-                    }
-                    else {
-                        reverse;
-                        group.push(sql `(${constraintValue} IS NULL OR ${sql.ident(iField)} > ${constraintValue})`);
-                    }
-                }
-            }
-            else {
-                const [jField] = order[j];
-                group.push(sql `${sql.ident(jField)} IS ${toSQLiteType(from[jField], columnTypes[jField].type)}`);
-            }
+  const constraints = [];
+  const { row: from, basis } = start;
+  for (let i = 0; i < order.length; i++) {
+    const group = [];
+    const [iField, iDirection] = order[i];
+    for (let j = 0; j <= i; j++) {
+      if (j === i) {
+        const constraintValue = toSQLiteType(
+          from[iField],
+          columnTypes[iField].type
+        );
+        if (iDirection === "asc") {
+          if (!reverse) {
+            group.push(
+              sql`(${constraintValue} IS NULL OR ${sql.ident(iField)} > ${constraintValue})`
+            );
+          } else {
+            group.push(
+              sql`(${sql.ident(iField)} IS NULL OR ${sql.ident(iField)} < ${constraintValue})`
+            );
+          }
+        } else {
+          if (!reverse) {
+            group.push(
+              sql`(${sql.ident(iField)} IS NULL OR ${sql.ident(iField)} < ${constraintValue})`
+            );
+          } else {
+            group.push(
+              sql`(${constraintValue} IS NULL OR ${sql.ident(iField)} > ${constraintValue})`
+            );
+          }
         }
-        constraints.push(sql `(${sql.join(group, sql ` AND `)})`);
-    }
-    if (basis === 'at') {
-        constraints.push(sql `(${sql.join(order.map(s => sql `${sql.ident(s[0])} IS ${toSQLiteType(from[s[0]], columnTypes[s[0]].type)}`), sql ` AND `)})`);
+      } else {
+        const [jField] = order[j];
+        group.push(
+          sql`${sql.ident(jField)} IS ${toSQLiteType(
+            from[jField],
+            columnTypes[jField].type
+          )}`
+        );
+      }
     }
-    return sql `(${sql.join(constraints, sql ` OR `)})`;
+    constraints.push(sql`(${sql.join(group, sql` AND `)})`);
+  }
+  if (basis === "at") {
+    constraints.push(
+      sql`(${sql.join(
+        order.map(
+          (s) => sql`${sql.ident(s[0])} IS ${toSQLiteType(
+            from[s[0]],
+            columnTypes[s[0]].type
+          )}`
+        ),
+        sql` AND `
+      )})`
+    );
+  }
+  return sql`(${sql.join(constraints, sql` OR `)})`;
 }
-//# sourceMappingURL=query-builder.js.map
+export {
+  buildSelectQuery,
+  constraintsToSQL,
+  filtersToSQL,
+  orderByToSQL,
+  toSQLiteType
+};
+//# sourceMappingURL=query-builder.js.map

package/out/zqlite/src/query-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"query-builder.js","sourceRoot":"","sources":["../../../../zqlite/src/query-builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"query-builder.js","sources":["../../../../zqlite/src/query-builder.ts"],"sourcesContent":["import type {SQLQuery} from '@databases/sql';\nimport type {\n  Condition,\n  Ordering,\n  SimpleCondition,\n  ValuePosition,\n} from '../../zero-protocol/src/ast.ts';\nimport type {\n  SchemaValue,\n  ValueType,\n} from '../../zero-schema/src/table-schema.ts';\nimport {sql} from './internal/sql.ts';\nimport type {Constraint} from '../../zql/src/ivm/constraint.ts';\nimport type {Start} from '../../zql/src/ivm/operator.ts';\n\n/**\n * Condition type without correlated subqueries.\n * This matches the output of transformFilters from zql/builder/filter.ts\n */\nexport type NoSubqueryCondition = Exclude<\n  Condition,\n  {type: 'correlatedSubquery'}\n>;\n\nexport function buildSelectQuery(\n  tableName: string,\n  columns: Record<string, SchemaValue>,\n  constraint: Constraint | undefined,\n  filters: NoSubqueryCondition | undefined,\n  order: Ordering,\n  reverse: boolean | undefined,\n  start: Start | undefined,\n) {\n  let query = sql`SELECT ${sql.join(\n    Object.keys(columns).map(c => sql.ident(c)),\n    sql`,`,\n  )} FROM ${sql.ident(tableName)}`;\n  const constraints: SQLQuery[] = constraintsToSQL(constraint, columns);\n\n  if (start) {\n    constraints.push(gatherStartConstraints(start, reverse, order, columns));\n  }\n\n  if (filters) {\n    constraints.push(filtersToSQL(filters));\n  }\n\n  if (constraints.length > 0) {\n    query = sql`${query} WHERE ${sql.join(constraints, sql` AND `)}`;\n  }\n\n  return sql`${query} ${orderByToSQL(order, !!reverse)}`;\n}\n\nexport function constraintsToSQL(\n  constraint: Constraint | undefined,\n  columns: Record<string, SchemaValue>,\n) {\n  if (!constraint) {\n    return [];\n  }\n\n  const constraints: SQLQuery[] = [];\n  for (const [key, value] of Object.entries(constraint)) {\n    constraints.push(\n      sql`${sql.ident(key)} = ${toSQLiteType(value, columns[key].type)}`,\n    );\n  }\n\n  return constraints;\n}\n\nexport function orderByToSQL(order: Ordering, reverse: boolean): SQLQuery {\n  if (reverse) {\n    return sql`ORDER BY ${sql.join(\n      order.map(\n        s =>\n          sql`${sql.ident(s[0])} ${sql.__dangerous__rawValue(\n            s[1] === 'asc' ? 'desc' : 'asc',\n          )}`,\n      ),\n      sql`, `,\n    )}`;\n  } else {\n    return sql`ORDER BY ${sql.join(\n      order.map(\n        s => sql`${sql.ident(s[0])} ${sql.__dangerous__rawValue(s[1])}`,\n      ),\n      sql`, `,\n    )}`;\n  }\n}\n\n/**\n * Converts filters (conditions) to SQL WHERE clause.\n * This applies all filters present in the AST for a query to the source.\n */\nexport function filtersToSQL(filters: NoSubqueryCondition): SQLQuery {\n  switch (filters.type) {\n    case 'simple':\n      return simpleConditionToSQL(filters);\n    case 'and':\n      return filters.conditions.length > 0\n        ? sql`(${sql.join(\n            filters.conditions.map(condition =>\n              filtersToSQL(condition as NoSubqueryCondition),\n            ),\n            sql` AND `,\n          )})`\n        : sql`TRUE`;\n    case 'or':\n      return filters.conditions.length > 0\n        ? sql`(${sql.join(\n            filters.conditions.map(condition =>\n              filtersToSQL(condition as NoSubqueryCondition),\n            ),\n            sql` OR `,\n          )})`\n        : sql`FALSE`;\n  }\n}\n\nfunction simpleConditionToSQL(filter: SimpleCondition): SQLQuery {\n  const {op} = filter;\n  if (op === 'IN' || op === 'NOT IN') {\n    switch (filter.right.type) {\n      case 'literal':\n        return sql`${valuePositionToSQL(\n          filter.left,\n        )} ${sql.__dangerous__rawValue(\n          filter.op,\n        )} (SELECT value FROM json_each(${JSON.stringify(\n          filter.right.value,\n        )}))`;\n      case 'static':\n        throw new Error(\n          'Static parameters must be replaced before conversion to SQL',\n        );\n    }\n  }\n  return sql`${valuePositionToSQL(filter.left)} ${sql.__dangerous__rawValue(\n    // SQLite's LIKE operator is case-insensitive by default, so we\n    // convert ILIKE to LIKE and NOT ILIKE to NOT LIKE.\n    filter.op === 'ILIKE'\n      ? 'LIKE'\n      : filter.op === 'NOT ILIKE'\n        ? 'NOT LIKE'\n        : filter.op,\n  )} ${valuePositionToSQL(filter.right)}`;\n}\n\nfunction valuePositionToSQL(value: ValuePosition): SQLQuery {\n  switch (value.type) {\n    case 'column':\n      return sql.ident(value.name);\n    case 'literal':\n      return sql`${toSQLiteType(value.value, getJsType(value.value))}`;\n    case 'static':\n      throw new Error(\n        'Static parameters must be replaced before conversion to SQL',\n      );\n  }\n}\n\nfunction getJsType(value: unknown): ValueType {\n  if (value === null) {\n    return 'null';\n  }\n  return typeof value === 'string'\n    ? 'string'\n    : typeof value === 'number'\n      ? 'number'\n      : typeof value === 'boolean'\n        ? 'boolean'\n        : 'json';\n}\n\nexport function toSQLiteType(v: unknown, type: ValueType): unknown {\n  switch (type) {\n    case 'boolean':\n      return v === null ? null : v ? 1 : 0;\n    case 'number':\n    case 'string':\n    case 'null':\n      return v;\n    case 'json':\n      return JSON.stringify(v);\n  }\n}\n\n/**\n * The ordering could be complex such as:\n * `ORDER BY a ASC, b DESC, c ASC`\n *\n * In those cases, we need to encode the constraints as various\n * `OR` clauses.\n *\n * E.g.,\n *\n * to get the row after (a = 1, b = 2, c = 3) would be:\n *\n * `WHERE a > 1 OR (a = 1 AND b < 2) OR (a = 1 AND b = 2 AND c > 3)`\n *\n * - after vs before flips the comparison operators.\n * - inclusive adds a final `OR` clause for the exact match.\n */\nfunction gatherStartConstraints(\n  start: Start,\n  reverse: boolean | undefined,\n  order: Ordering,\n  columnTypes: Record<string, SchemaValue>,\n): SQLQuery {\n  const constraints: SQLQuery[] = [];\n  const {row: from, basis} = start;\n\n  for (let i = 0; i < order.length; i++) {\n    const group: SQLQuery[] = [];\n    const [iField, iDirection] = order[i];\n    for (let j = 0; j <= i; j++) {\n      if (j === i) {\n        const constraintValue = toSQLiteType(\n          from[iField],\n          columnTypes[iField].type,\n        );\n        if (iDirection === 'asc') {\n          if (!reverse) {\n            group.push(\n              sql`(${constraintValue} IS NULL OR ${sql.ident(iField)} > ${constraintValue})`,\n            );\n          } else {\n            reverse satisfies true;\n            group.push(\n              sql`(${sql.ident(iField)} IS NULL OR ${sql.ident(iField)} < ${constraintValue})`,\n            );\n          }\n        } else {\n          iDirection satisfies 'desc';\n          if (!reverse) {\n            group.push(\n              sql`(${sql.ident(iField)} IS NULL OR ${sql.ident(iField)} < ${constraintValue})`,\n            );\n          } else {\n            reverse satisfies true;\n            group.push(\n              sql`(${constraintValue} IS NULL OR ${sql.ident(iField)} > ${constraintValue})`,\n            );\n          }\n        }\n      } else {\n        const [jField] = order[j];\n        group.push(\n          sql`${sql.ident(jField)} IS ${toSQLiteType(\n            from[jField],\n            columnTypes[jField].type,\n          )}`,\n        );\n      }\n    }\n    constraints.push(sql`(${sql.join(group, sql` AND `)})`);\n  }\n\n  if (basis === 'at') {\n    constraints.push(\n      sql`(${sql.join(\n        order.map(\n          s =>\n            sql`${sql.ident(s[0])} IS ${toSQLiteType(\n              from[s[0]],\n              columnTypes[s[0]].type,\n            )}`,\n        ),\n        sql` AND `,\n      )})`,\n    );\n  }\n\n  return sql`(${sql.join(constraints, sql` OR `)})`;\n}\n"],"names":[],"mappings":"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"}

package/out/zqlite/src/query-delegate.d.ts

@@ -5,10 +5,10 @@ import type { Source } from '../../zql/src/ivm/source.ts';
 import { QueryDelegateBase } from '../../zql/src/query/query-delegate-base.ts';
 import type { CommitListener } from '../../zql/src/query/query-delegate.ts';
 import type { Database } from './db.ts';
-export declare class QueryDelegateImpl<TContext> extends QueryDelegateBase<TContext> {
+export declare class QueryDelegateImpl extends QueryDelegateBase {
     #private;
     readonly defaultQueryComplete = true;
-    constructor(lc: LogContext, db: Database, schema: Schema, context: TContext, logConfig?: LogConfig);
+    constructor(lc: LogContext, db: Database, schema: Schema, logConfig?: LogConfig);
     getSource(tableName: string): Source;
     onTransactionCommit(cb: CommitListener): () => void;
     batchViewUpdates<T>(applyViewUpdates: () => T): T;

package/out/zqlite/src/query-delegate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-delegate.d.ts","sourceRoot":"","sources":["../../../../zqlite/src/query-delegate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAC3D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAC,iBAAiB,EAAC,MAAM,4CAA4C,CAAC;AAC7E,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,uCAAuC,CAAC;AAC1E,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,SAAS,CAAC;AAGtC,qBAAa,iBAAiB,CAAC,QAAQ,CAAE,SAAQ,iBAAiB,CAAC,QAAQ,CAAC;;IAM1E,QAAQ,CAAC,oBAAoB,QAAQ;gBAInC,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,QAAQ,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,QAAQ,EACjB,SAAS,CAAC,EAAE,SAAS;IAevB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAqBpC,mBAAmB,CAAC,EAAE,EAAE,cAAc;IAM7B,gBAAgB,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,CAAC,GAAG,CAAC;CAO3D"}
+{"version":3,"file":"query-delegate.d.ts","sourceRoot":"","sources":["../../../../zqlite/src/query-delegate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,gCAAgC,CAAC;AAC3D,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAC,iBAAiB,EAAC,MAAM,4CAA4C,CAAC;AAC7E,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,uCAAuC,CAAC;AAC1E,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,SAAS,CAAC;AAGtC,qBAAa,iBAAkB,SAAQ,iBAAiB;;IAMtD,QAAQ,CAAC,oBAAoB,QAAQ;gBAInC,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,QAAQ,EACZ,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,SAAS;IAevB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAqBpC,mBAAmB,CAAC,EAAE,EAAE,cAAc;IAM7B,gBAAgB,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,CAAC,GAAG,CAAC;CAO3D"}