bun-query-builder 0.2.30 → 0.2.32

package/dist/bin/cli.js

@@ -12641,6 +12641,61 @@ function renderInPredicate(column, values, negated, placeholders) {
     return negated ? TRUE_PREDICATE : FALSE_PREDICATE;
   return `${column} ${negated ? "NOT IN" : "IN"} (${placeholders})`;
 }
+function toDialectPlaceholders(sql, dialect) {
+  if (dialect !== "postgres")
+    return sql;
+  let out = "";
+  let index = 0;
+  let position = 0;
+  while (position < sql.length) {
+    const char = sql[position];
+    if (char === "'") {
+      const end = closingQuote(sql, position, "'");
+      out += sql.slice(position, end);
+      position = end;
+      continue;
+    }
+    if (char === '"') {
+      const end = closingQuote(sql, position, '"');
+      out += sql.slice(position, end);
+      position = end;
+      continue;
+    }
+    if (char === "$") {
+      const tag = sql.slice(position).match(/^\$[A-Z_a-z]\w*\$|^\$\$/)?.[0];
+      if (tag) {
+        const close = sql.indexOf(tag, position + tag.length);
+        const end = close === -1 ? sql.length : close + tag.length;
+        out += sql.slice(position, end);
+        position = end;
+        continue;
+      }
+    }
+    if (char === "?") {
+      index++;
+      out += `$${index}`;
+      position++;
+      continue;
+    }
+    out += char;
+    position++;
+  }
+  return out;
+}
+function closingQuote(sql, start, quote) {
+  let position = start + 1;
+  while (position < sql.length) {
+    if (sql[position] === quote) {
+      if (sql[position + 1] === quote) {
+        position += 2;
+        continue;
+      }
+      return position + 1;
+    }
+    position++;
+  }
+  return sql.length;
+}
 var FALSE_PREDICATE = "1 = 0", TRUE_PREDICATE = "1 = 1";
 
 // src/client.ts
@@ -18518,6 +18573,28 @@ ${sql};` : `${sql};`;
   recordMigrationQuery() {
     return "INSERT INTO migrations (migration) VALUES (?)";
   }
+  jsonExtract(column, key) {
+    return `JSON_UNQUOTE(JSON_EXTRACT(${column}, CONCAT('$.', ${key})))`;
+  }
+  dateBucket(column, grain, offsetHours = 0) {
+    const shifted = offsetHours === 0 ? column : `DATE_ADD(${column}, INTERVAL ${offsetHours} HOUR)`;
+    switch (grain) {
+      case "hour":
+        return `DATE_FORMAT(${shifted}, '%Y-%m-%dT%H:00:00.000Z')`;
+      case "week":
+        return `DATE_FORMAT(DATE_SUB(${shifted}, INTERVAL WEEKDAY(${shifted}) DAY), '%Y-%m-%dT00:00:00.000Z')`;
+      case "month":
+        return `DATE_FORMAT(${shifted}, '%Y-%m-01T00:00:00.000Z')`;
+      case "year":
+        return `DATE_FORMAT(${shifted}, '%Y-01-01T00:00:00.000Z')`;
+      case "day":
+      default:
+        return `DATE_FORMAT(${shifted}, '%Y-%m-%dT00:00:00.000Z')`;
+    }
+  }
+  booleanLiteral(value) {
+    return value ? "TRUE" : "FALSE";
+  }
   renderColumn(column) {
     const typeSql = this.getColumnType(column);
     const parts = [this.quoteIdentifier(column.name), typeSql];
@@ -18715,6 +18792,28 @@ ${sql};` : `${sql};`;
   recordMigrationQuery() {
     return "INSERT INTO migrations (migration) VALUES ($1)";
   }
+  jsonExtract(column, key) {
+    return `(${column}::jsonb ->> ${key})`;
+  }
+  dateBucket(column, grain, offsetHours = 0) {
+    const shifted = offsetHours === 0 ? `${column}::timestamp` : `(${column}::timestamp ${offsetHours >= 0 ? "+" : "-"} interval '${Math.abs(offsetHours)} hours')`;
+    const truncated = grain === "week" ? `date_trunc('week', ${shifted})` : shifted;
+    switch (grain) {
+      case "hour":
+        return `to_char(${truncated}, 'YYYY-MM-DD"T"HH24:00:00.000"Z"')`;
+      case "month":
+        return `to_char(${truncated}, 'YYYY-MM-01"T"00:00:00.000"Z"')`;
+      case "year":
+        return `to_char(${truncated}, 'YYYY-01-01"T"00:00:00.000"Z"')`;
+      case "week":
+      case "day":
+      default:
+        return `to_char(${truncated}, 'YYYY-MM-DD"T"00:00:00.000"Z"')`;
+    }
+  }
+  booleanLiteral(value) {
+    return value ? "TRUE" : "FALSE";
+  }
   renderColumn(column) {
     const typeSql = column.isPrimaryKey ? this.getPrimaryKeyType(column) : this.getColumnType(column);
     const parts = [this.quoteIdentifier(column.name), typeSql];
@@ -18998,6 +19097,28 @@ class SQLiteDriver {
   recordMigrationQuery() {
     return "INSERT INTO migrations (migration) VALUES (?)";
   }
+  jsonExtract(column, key) {
+    return `json_extract(${column}, '$.' || ${key})`;
+  }
+  dateBucket(column, grain, offsetHours = 0) {
+    const shifted = offsetHours === 0 ? column : `datetime(${column}, '${offsetHours >= 0 ? "+" : "-"}${Math.abs(offsetHours)} hours')`;
+    switch (grain) {
+      case "hour":
+        return `strftime('%Y-%m-%dT%H:00:00.000Z', ${shifted})`;
+      case "week":
+        return `strftime('%Y-%m-%dT00:00:00.000Z', ${shifted}, '-6 days', 'weekday 1')`;
+      case "month":
+        return `strftime('%Y-%m-01T00:00:00.000Z', ${shifted})`;
+      case "year":
+        return `strftime('%Y-01-01T00:00:00.000Z', ${shifted})`;
+      case "day":
+      default:
+        return `strftime('%Y-%m-%dT00:00:00.000Z', ${shifted})`;
+    }
+  }
+  booleanLiteral(value) {
+    return value ? "TRUE" : "FALSE";
+  }
   renderColumn(column) {
     const typeSql = this.getColumnType(column);
     const parts = [this.quoteIdentifier(column.name), typeSql];
@@ -32067,7 +32188,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version2 = "0.2.30";
+var version2 = "0.2.32";
 
 // bin/cli.ts
 init_actions();

package/dist/drivers/mysql.d.ts

@@ -1,4 +1,5 @@
 import type { ColumnPlan, IndexPlan, RebuildTableSpec, TablePlan } from '../migrations';
+import type { DateBucketGrain } from './postgres';
 export declare interface DialectDriver {
   createEnumType: (enumTypeName: string, values: string[]) => string
   createTable: (table: TablePlan) => string
@@ -39,5 +40,8 @@ export declare class MySQLDriver implements DialectDriver {
   createMigrationsTable(): string;
   getExecutedMigrationsQuery(): string;
   recordMigrationQuery(): string;
+  jsonExtract(column: string, key: string): string;
+  dateBucket(column: string, grain: DateBucketGrain, offsetHours?: number): string;
+  booleanLiteral(value: boolean): string;
   protected renderColumn(column: ColumnPlan): string;
 }

package/dist/drivers/postgres.d.ts

@@ -1,4 +1,11 @@
 import type { ColumnPlan, IndexPlan, RebuildTableSpec, TablePlan } from '../migrations';
+/**
+ * The ISO shape every driver's {@link DialectDriver.dateBucket} must produce.
+ *
+ * Exported so a driver's tests can assert against one definition rather than
+ * each restating the format it happens to emit.
+ */
+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
@@ -16,7 +23,12 @@ export declare interface DialectDriver {
   createMigrationsTable: () => string
   getExecutedMigrationsQuery: () => string
   recordMigrationQuery: () => string
+  jsonExtract: (column: string, key: string) => string
+  dateBucket: (column: string, grain: DateBucketGrain, offsetHours?: number) => string
+  booleanLiteral: (value: boolean) => string
 }
+/** The buckets {@link DialectDriver.dateBucket} can truncate to. */
+export type DateBucketGrain = 'hour' | 'day' | 'week' | 'month' | 'year';
 export declare class PostgresDriver implements DialectDriver {
   createEnumType(enumTypeName: string, values: string[]): string;
   createTable(table: TablePlan): string;
@@ -34,4 +46,7 @@ export declare class PostgresDriver implements DialectDriver {
   createMigrationsTable(): string;
   getExecutedMigrationsQuery(): string;
   recordMigrationQuery(): string;
+  jsonExtract(column: string, key: string): string;
+  dateBucket(column: string, grain: DateBucketGrain, offsetHours?: number): string;
+  booleanLiteral(value: boolean): string;
 }

package/dist/drivers/sqlite.d.ts

@@ -1,4 +1,5 @@
 import type { ColumnPlan, IndexPlan, RebuildTableSpec, TablePlan } from '../migrations';
+import type { DateBucketGrain } from './postgres';
 /**
  * Whether a plan type belongs to the numeric family. Used by the `_id`
  * safety net (numeric ids must store as INTEGER on SQLite) — non-numeric
@@ -40,4 +41,7 @@ export declare class SQLiteDriver implements DialectDriver {
   createMigrationsTable(): string;
   getExecutedMigrationsQuery(): string;
   recordMigrationQuery(): string;
+  jsonExtract(column: string, key: string): string;
+  dateBucket(column: string, grain: DateBucketGrain, offsetHours?: number): string;
+  booleanLiteral(value: boolean): string;
 }

package/dist/index.d.ts

@@ -50,3 +50,4 @@ export * from './types';
 export { type ModelDefinition, defineModel } from './model';
 // Explicit re-exports for model registry functions
 export { getModel, getAllModels, getModelRegistry, hasModel, clearModelRegistry, registerModel } from './model';
+export { toDialectPlaceholders } from './sql-fragments';

package/dist/sql-fragments.d.ts

@@ -1,3 +1,4 @@
+import type { SupportedDialect } from './types';
 /**
  * Render a WHERE body (without the `WHERE` keyword) from an ordered term list.
  *
@@ -32,6 +33,25 @@ export declare function renderWhereTerms(terms: readonly WhereTerm[]): string;
  * failure as the `IN ()` bug itself.
  */
 export declare function renderInPredicate(column: string, values: any[], negated: boolean, placeholders: string): string;
+/**
+ * Rewrite `?` placeholders into the numbered form Postgres requires.
+ *
+ * Raw SQL written with `?` runs on SQLite and MySQL and is a syntax error on
+ * Postgres, which reports it as a problem with whatever token follows: a WHERE
+ * built as `project_id = ? AND …` is rejected with `syntax error at or near
+ * "AND"`, which sends the reader looking at the wrong part of the query. An
+ * application that developed against SQLite therefore finds out at the point
+ * its raw queries first meet Postgres, and the error does not name the cause.
+ *
+ * Only unquoted placeholders are rewritten. A `?` inside a string literal, a
+ * quoted identifier, or a dollar-quoted block is data and is left exactly as
+ * written — the naive global replace is the reason this needs to be a function
+ * with tests rather than one line at a call site.
+ *
+ * Dialects that already take `?` get the string back unchanged, so this is safe
+ * to apply unconditionally.
+ */
+export declare function toDialectPlaceholders(sql: string, dialect: SupportedDialect): string;
 /**
  * Constant predicates, for the cases where a collection is empty.
  *

package/dist/src/index.js

@@ -12640,6 +12640,61 @@ function renderInPredicate(column, values, negated, placeholders) {
     return negated ? TRUE_PREDICATE : FALSE_PREDICATE;
   return `${column} ${negated ? "NOT IN" : "IN"} (${placeholders})`;
 }
+function toDialectPlaceholders(sql, dialect) {
+  if (dialect !== "postgres")
+    return sql;
+  let out = "";
+  let index = 0;
+  let position = 0;
+  while (position < sql.length) {
+    const char = sql[position];
+    if (char === "'") {
+      const end = closingQuote(sql, position, "'");
+      out += sql.slice(position, end);
+      position = end;
+      continue;
+    }
+    if (char === '"') {
+      const end = closingQuote(sql, position, '"');
+      out += sql.slice(position, end);
+      position = end;
+      continue;
+    }
+    if (char === "$") {
+      const tag = sql.slice(position).match(/^\$[A-Z_a-z]\w*\$|^\$\$/)?.[0];
+      if (tag) {
+        const close = sql.indexOf(tag, position + tag.length);
+        const end = close === -1 ? sql.length : close + tag.length;
+        out += sql.slice(position, end);
+        position = end;
+        continue;
+      }
+    }
+    if (char === "?") {
+      index++;
+      out += `$${index}`;
+      position++;
+      continue;
+    }
+    out += char;
+    position++;
+  }
+  return out;
+}
+function closingQuote(sql, start, quote) {
+  let position = start + 1;
+  while (position < sql.length) {
+    if (sql[position] === quote) {
+      if (sql[position + 1] === quote) {
+        position += 2;
+        continue;
+      }
+      return position + 1;
+    }
+    position++;
+  }
+  return sql.length;
+}
 var FALSE_PREDICATE = "1 = 0", TRUE_PREDICATE = "1 = 1";
 
 // src/client.ts
@@ -18517,6 +18572,28 @@ ${sql};` : `${sql};`;
   recordMigrationQuery() {
     return "INSERT INTO migrations (migration) VALUES (?)";
   }
+  jsonExtract(column, key) {
+    return `JSON_UNQUOTE(JSON_EXTRACT(${column}, CONCAT('$.', ${key})))`;
+  }
+  dateBucket(column, grain, offsetHours = 0) {
+    const shifted = offsetHours === 0 ? column : `DATE_ADD(${column}, INTERVAL ${offsetHours} HOUR)`;
+    switch (grain) {
+      case "hour":
+        return `DATE_FORMAT(${shifted}, '%Y-%m-%dT%H:00:00.000Z')`;
+      case "week":
+        return `DATE_FORMAT(DATE_SUB(${shifted}, INTERVAL WEEKDAY(${shifted}) DAY), '%Y-%m-%dT00:00:00.000Z')`;
+      case "month":
+        return `DATE_FORMAT(${shifted}, '%Y-%m-01T00:00:00.000Z')`;
+      case "year":
+        return `DATE_FORMAT(${shifted}, '%Y-01-01T00:00:00.000Z')`;
+      case "day":
+      default:
+        return `DATE_FORMAT(${shifted}, '%Y-%m-%dT00:00:00.000Z')`;
+    }
+  }
+  booleanLiteral(value) {
+    return value ? "TRUE" : "FALSE";
+  }
   renderColumn(column) {
     const typeSql = this.getColumnType(column);
     const parts = [this.quoteIdentifier(column.name), typeSql];
@@ -18714,6 +18791,28 @@ ${sql};` : `${sql};`;
   recordMigrationQuery() {
     return "INSERT INTO migrations (migration) VALUES ($1)";
   }
+  jsonExtract(column, key) {
+    return `(${column}::jsonb ->> ${key})`;
+  }
+  dateBucket(column, grain, offsetHours = 0) {
+    const shifted = offsetHours === 0 ? `${column}::timestamp` : `(${column}::timestamp ${offsetHours >= 0 ? "+" : "-"} interval '${Math.abs(offsetHours)} hours')`;
+    const truncated = grain === "week" ? `date_trunc('week', ${shifted})` : shifted;
+    switch (grain) {
+      case "hour":
+        return `to_char(${truncated}, 'YYYY-MM-DD"T"HH24:00:00.000"Z"')`;
+      case "month":
+        return `to_char(${truncated}, 'YYYY-MM-01"T"00:00:00.000"Z"')`;
+      case "year":
+        return `to_char(${truncated}, 'YYYY-01-01"T"00:00:00.000"Z"')`;
+      case "week":
+      case "day":
+      default:
+        return `to_char(${truncated}, 'YYYY-MM-DD"T"00:00:00.000"Z"')`;
+    }
+  }
+  booleanLiteral(value) {
+    return value ? "TRUE" : "FALSE";
+  }
   renderColumn(column) {
     const typeSql = column.isPrimaryKey ? this.getPrimaryKeyType(column) : this.getColumnType(column);
     const parts = [this.quoteIdentifier(column.name), typeSql];
@@ -18997,6 +19096,28 @@ class SQLiteDriver {
   recordMigrationQuery() {
     return "INSERT INTO migrations (migration) VALUES (?)";
   }
+  jsonExtract(column, key) {
+    return `json_extract(${column}, '$.' || ${key})`;
+  }
+  dateBucket(column, grain, offsetHours = 0) {
+    const shifted = offsetHours === 0 ? column : `datetime(${column}, '${offsetHours >= 0 ? "+" : "-"}${Math.abs(offsetHours)} hours')`;
+    switch (grain) {
+      case "hour":
+        return `strftime('%Y-%m-%dT%H:00:00.000Z', ${shifted})`;
+      case "week":
+        return `strftime('%Y-%m-%dT00:00:00.000Z', ${shifted}, '-6 days', 'weekday 1')`;
+      case "month":
+        return `strftime('%Y-%m-01T00:00:00.000Z', ${shifted})`;
+      case "year":
+        return `strftime('%Y-01-01T00:00:00.000Z', ${shifted})`;
+      case "day":
+      default:
+        return `strftime('%Y-%m-%dT00:00:00.000Z', ${shifted})`;
+    }
+  }
+  booleanLiteral(value) {
+    return value ? "TRUE" : "FALSE";
+  }
   renderColumn(column) {
     const typeSql = this.getColumnType(column);
     const parts = [this.quoteIdentifier(column.name), typeSql];
@@ -30002,6 +30123,7 @@ export {
   toTableName,
   toModelInstance,
   toDynamoDBItem,
+  toDialectPlaceholders,
   tinker,
   tableNameFor,
   tableInfo,

package/package.json

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