joist-driver-bun-pg 2.3.0 → 2.4.0-next.2

package/build/BunPgDriver.cjs

@@ -0,0 +1,96 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+let bun = require("bun");
+let joist_core = require("joist-core");
+//#region src/BunPgDriver.ts
+const { getRuntimeConfig, cleanSql, generateOps } = joist_core.driverApi;
+/** Incomplete Bun SQL driver; raw-query execution is not implemented. */
+var BunPgDriver = class {
+	#idAssigner;
+	#sql;
+	constructor(_sql = bun.sql) {
+		this.#sql = _sql;
+		this.#idAssigner = new joist_core.SequenceIdAssigner((s) => this.#sql.unsafe(s));
+	}
+	executeFind(em, parsed, settings) {
+		throw new Error("Method not implemented.");
+	}
+	executeQuery(em, sql, bindings) {
+		throw new Error("BunPgDriver.executeQuery is not implemented; em.query and em.execute are unsupported.");
+	}
+	async transaction(em, fn) {
+		if (em.txn) return fn(em.txn);
+		else {
+			await (0, joist_core.driverBeforeBegin)(em, this.#sql);
+			const result = await this.#sql.begin(async (txn) => {
+				em.txn = txn;
+				try {
+					await (0, joist_core.driverAfterBegin)(em, txn);
+					const result = await fn(txn);
+					await (0, joist_core.driverBeforeCommit)(em, txn);
+					return result;
+				} finally {
+					em.txn = void 0;
+				}
+			});
+			await (0, joist_core.driverAfterCommit)(em, this.#sql);
+			return result;
+		}
+	}
+	assignNewIds(em, todos) {
+		throw new Error("Method not implemented.");
+	}
+	async flush(em, todos, joinRows) {
+		const sql = em.txn ?? (0, joist_core.fail)("Expected EntityManager.txn to be set");
+		await this.#idAssigner.assignNewIds(todos);
+		const ops = generateOps(todos);
+		await Promise.all([
+			...ops.inserts.map((op) => batchInsert(sql, op)),
+			...ops.updates.map((op) => batchUpdate(sql, op)),
+			...ops.deletes.map((op) => batchDelete(sql, op))
+		]);
+	}
+	get defaultPlugins() {
+		return {};
+	}
+};
+function batchInsert(txn, op) {
+	const { tableName, columns, columnValues } = op;
+	const { sql: cte, bindings } = (0, joist_core.buildCteSql)((0, joist_core.buildUnnestCte)("data", columns, columnValues));
+	return convertToSql(txn, cleanSql(`
+     ${cte}
+     INSERT INTO ${(0, joist_core.kq)(tableName)} (${columns.map((c) => (0, joist_core.kq)(c.columnName)).join(", ")})
+     SELECT * FROM data
+  `), bindings);
+}
+async function batchUpdate(txn, op) {
+	const { tableName, columns, columnValues, updatedAt } = op;
+	const { sql: cte, bindings } = (0, joist_core.buildCteSql)((0, joist_core.buildUnnestCte)("data", columns, columnValues));
+	const truncateToMills = !getRuntimeConfig().temporal;
+	const maybeUpdatedAt = updatedAt && truncateToMills ? ` AND date_trunc('milliseconds', ${(0, joist_core.kqDot)(tableName, updatedAt)}) = data.__original_updated_at` : updatedAt ? ` AND ${(0, joist_core.kqDot)(tableName, updatedAt)} = data.__original_updated_at` : "";
+	const results = await convertToSql(txn, `
+    ${cte}
+    UPDATE ${(0, joist_core.kq)(tableName)}
+    SET ${columns.filter((c) => c.columnName !== "id" && c.columnName !== "__original_updated_at").map((c) => `${(0, joist_core.kq)(c.columnName)} = data.${(0, joist_core.kq)(c.columnName)}`).join(", ")}
+    FROM data
+    WHERE ${(0, joist_core.kq)(tableName)}.id = data.id ${maybeUpdatedAt}
+    RETURNING ${(0, joist_core.kq)(tableName)}.id
+  `, bindings);
+	const ids = columnValues[0];
+	if (results.length !== ids.length) {
+		const updated = new Set(results.map((r) => r.id));
+		const missing = ids.filter((id) => !updated.has(id));
+		throw new Error(`Oplock failure for ${tableName} rows ${missing.join(", ")}`);
+	}
+}
+async function batchDelete(txn, op) {
+	const { tableName, ids } = op;
+}
+function convertToSql(sql, query, bindings) {
+	const fragments = query.split("?");
+	if (fragments.length - 1 !== bindings.length) throw new Error(`Mismatch between placeholders (${fragments.length - 1}) and bindings (${bindings.length})`);
+	return sql(Object.assign(fragments, { raw: fragments }), ...bindings);
+}
+//#endregion
+exports.BunPgDriver = BunPgDriver;
+
+//# sourceMappingURL=BunPgDriver.cjs.map

package/build/BunPgDriver.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"BunPgDriver.cjs","names":["driverApi","#idAssigner","#sql","sql","SequenceIdAssigner","driverBeforeBegin","driverAfterBegin","driverBeforeCommit","driverAfterCommit","fail","buildCteSql","buildUnnestCte","kq","kqDot"],"sources":["../src/BunPgDriver.ts"],"sourcesContent":["import { type SQL, type SQLQuery, type TransactionSQL, sql } from \"bun\";\nimport {\n  type Driver,\n  type DriverQueryResult,\n  type EntityManager,\n  type IdAssigner,\n  type JoinRowTodo,\n  type ParsedFindQuery,\n  SequenceIdAssigner,\n  type Todo,\n  buildCteSql,\n  buildUnnestCte,\n  driverAfterBegin,\n  driverAfterCommit,\n  driverApi,\n  driverBeforeBegin,\n  driverBeforeCommit,\n  fail,\n  kq,\n  kqDot,\n} from \"joist-core\";\n\nconst { getRuntimeConfig, cleanSql, generateOps } = driverApi;\ntype DeleteOp = any;\ntype InsertOp = any;\ntype UpdateOp = any;\n\n/** Incomplete Bun SQL driver; raw-query execution is not implemented. */\nexport class BunPgDriver implements Driver<TransactionSQL> {\n  readonly #idAssigner: IdAssigner;\n  readonly #sql: SQL;\n\n  constructor(_sql: SQL = sql) {\n    this.#sql = _sql;\n    this.#idAssigner = new SequenceIdAssigner((s) => this.#sql.unsafe(s));\n  }\n\n  executeFind(\n    em: EntityManager,\n    parsed: ParsedFindQuery,\n    settings: { limit?: number; offset?: number },\n  ): Promise<any[]> {\n    throw new Error(\"Method not implemented.\");\n  }\n\n  executeQuery(em: EntityManager, sql: string, bindings: any[]): Promise<DriverQueryResult> {\n    throw new Error(\"BunPgDriver.executeQuery is not implemented; em.query and em.execute are unsupported.\");\n  }\n\n  async transaction<T>(em: EntityManager, fn: (txn: TransactionSQL) => Promise<T>): Promise<T> {\n    if (em.txn) {\n      return fn(em.txn as TransactionSQL);\n    } else {\n      // This should be done on a reserved connection...\n      await driverBeforeBegin(em, this.#sql);\n      const result = await this.#sql.begin(async (txn) => {\n        em.txn = txn;\n        try {\n          await driverAfterBegin(em, txn);\n          const result = await fn(txn);\n          await driverBeforeCommit(em, txn);\n          return result;\n        } finally {\n          em.txn = undefined;\n        }\n      });\n      await driverAfterCommit(em, this.#sql);\n      return result;\n    }\n  }\n\n  assignNewIds(em: EntityManager, todos: Record<string, Todo>): Promise<void> {\n    throw new Error(\"Method not implemented.\");\n  }\n\n  async flush(em: EntityManager, todos: Record<string, Todo>, joinRows: Record<string, JoinRowTodo>): Promise<void> {\n    const sql = (em.txn ?? fail(\"Expected EntityManager.txn to be set\")) as TransactionSQL;\n    await this.#idAssigner.assignNewIds(todos);\n    const ops = generateOps(todos);\n    // Do INSERTs+UPDATEs first so that we avoid DELETE cascades invalidating oplocks\n    // See https://github.com/joist-orm/joist-orm/issues/591\n    await Promise.all([\n      ...ops.inserts.map((op) => batchInsert(sql, op)),\n      ...ops.updates.map((op) => batchUpdate(sql, op)),\n      ...ops.deletes.map((op) => batchDelete(sql, op)),\n    ]);\n  }\n\n  get defaultPlugins() {\n    return {};\n  }\n}\n\nfunction batchInsert(txn: TransactionSQL, op: InsertOp): Promise<unknown> {\n  const { tableName, columns, columnValues } = op;\n  const { sql: cte, bindings } = buildCteSql(buildUnnestCte(\"data\", columns, columnValues));\n  const sql = cleanSql(`\n     ${cte}\n     INSERT INTO ${kq(tableName)} (${columns.map((c: any) => kq(c.columnName)).join(\", \")})\n     SELECT * FROM data\n  `);\n  return convertToSql(txn, sql, bindings);\n}\n\nasync function batchUpdate(txn: TransactionSQL, op: UpdateOp): Promise<void> {\n  const { tableName, columns, columnValues, updatedAt } = op;\n\n  const { sql: cte, bindings } = buildCteSql(buildUnnestCte(\"data\", columns, columnValues));\n\n  // JS Dates only have millisecond-level precision, so we may have dropped/lost accuracy when\n  // reading Postgres's microsecond-level `timestamptz` values; using `date_trunc` \"downgrades\"\n  // the pg data to match what we have in the JS Date.\n  //\n  // ...but Temporal's types don't have this flaw.\n  const truncateToMills = !getRuntimeConfig().temporal;\n  const maybeUpdatedAt =\n    updatedAt && truncateToMills\n      ? ` AND date_trunc('milliseconds', ${kqDot(tableName, updatedAt)}) = data.__original_updated_at`\n      : updatedAt\n        ? ` AND ${kqDot(tableName, updatedAt)} = data.__original_updated_at`\n        : \"\";\n\n  const sql = `\n    ${cte}\n    UPDATE ${kq(tableName)}\n    SET ${columns\n      .filter((c: any) => c.columnName !== \"id\" && c.columnName !== \"__original_updated_at\")\n      .map((c: any) => `${kq(c.columnName)} = data.${kq(c.columnName)}`)\n      .join(\", \")}\n    FROM data\n    WHERE ${kq(tableName)}.id = data.id ${maybeUpdatedAt}\n    RETURNING ${kq(tableName)}.id\n  `;\n\n  const results = await convertToSql(txn, sql, bindings);\n\n  const ids = columnValues[0]; // assume id is the 1st column\n  if (results.length !== ids.length) {\n    const updated = new Set(results.map((r: any) => r.id));\n    const missing = ids.filter((id: any) => !updated.has(id));\n    throw new Error(`Oplock failure for ${tableName} rows ${missing.join(\", \")}`);\n  }\n}\n\nasync function batchDelete(txn: TransactionSQL, op: DeleteOp): Promise<void> {\n  const { tableName, ids } = op;\n  // await txn(tableName).del().whereIn(\"id\", ids);\n}\n\nfunction convertToSql(sql: TransactionSQL, query: string, bindings: readonly any[]): SQLQuery {\n  // Split the query string by the placeholder character '?'\n  const fragments = query.split(\"?\");\n  if (fragments.length - 1 !== bindings.length) {\n    throw new Error(`Mismatch between placeholders (${fragments.length - 1}) and bindings (${bindings.length})`);\n  }\n  // postgres.js does runtime detection of the `raw` property to determine if it's a template string\n  const templateStrings = Object.assign(fragments, {\n    raw: fragments,\n  }) as unknown as TemplateStringsArray;\n  return sql(templateStrings, ...bindings);\n}\n"],"mappings":"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"}

package/build/BunPgDriver.d.cts

@@ -0,0 +1,20 @@
+import { SQL, TransactionSQL } from "bun";
+import { Driver, DriverQueryResult, EntityManager, JoinRowTodo, ParsedFindQuery, Todo } from "joist-core";
+//#region src/BunPgDriver.d.ts
+/** Incomplete Bun SQL driver; raw-query execution is not implemented. */
+declare class BunPgDriver implements Driver<TransactionSQL> {
+  #private;
+  constructor(_sql?: SQL);
+  executeFind(em: EntityManager, parsed: ParsedFindQuery, settings: {
+    limit?: number;
+    offset?: number;
+  }): Promise<any[]>;
+  executeQuery(em: EntityManager, sql: string, bindings: any[]): Promise<DriverQueryResult>;
+  transaction<T>(em: EntityManager, fn: (txn: TransactionSQL) => Promise<T>): Promise<T>;
+  assignNewIds(em: EntityManager, todos: Record<string, Todo>): Promise<void>;
+  flush(em: EntityManager, todos: Record<string, Todo>, joinRows: Record<string, JoinRowTodo>): Promise<void>;
+  get defaultPlugins(): {};
+}
+//#endregion
+export { BunPgDriver };
+//# sourceMappingURL=BunPgDriver.d.cts.map

package/build/BunPgDriver.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"BunPgDriver.d.cts","names":[],"sources":["../src/BunPgDriver.ts"],"mappings":";;;;cA4Ba,uBAAuB,OAAO;;EAIzC,YAAY,OAAM;EAKlB,YACE,IAAI,eACJ,QAAQ,iBACR;IAAY;IAAgB;MAC3B;EAIH,aAAa,IAAI,eAAe,aAAa,kBAAkB,QAAQ;EAIjE,YAAY,GAAG,IAAI,eAAe,KAAK,KAAK,mBAAmB,QAAQ,KAAK,QAAQ;EAsB1F,aAAa,IAAI,eAAe,OAAO,eAAe,QAAQ;EAIxD,MAAM,IAAI,eAAe,OAAO,eAAe,OAAO,UAAU,eAAe,eAAe;MAahG"}

package/build/BunPgDriver.d.mts

@@ -0,0 +1,20 @@
+import { SQL, TransactionSQL } from "bun";
+import { Driver, DriverQueryResult, EntityManager, JoinRowTodo, ParsedFindQuery, Todo } from "joist-core";
+//#region src/BunPgDriver.d.ts
+/** Incomplete Bun SQL driver; raw-query execution is not implemented. */
+declare class BunPgDriver implements Driver<TransactionSQL> {
+  #private;
+  constructor(_sql?: SQL);
+  executeFind(em: EntityManager, parsed: ParsedFindQuery, settings: {
+    limit?: number;
+    offset?: number;
+  }): Promise<any[]>;
+  executeQuery(em: EntityManager, sql: string, bindings: any[]): Promise<DriverQueryResult>;
+  transaction<T>(em: EntityManager, fn: (txn: TransactionSQL) => Promise<T>): Promise<T>;
+  assignNewIds(em: EntityManager, todos: Record<string, Todo>): Promise<void>;
+  flush(em: EntityManager, todos: Record<string, Todo>, joinRows: Record<string, JoinRowTodo>): Promise<void>;
+  get defaultPlugins(): {};
+}
+//#endregion
+export { BunPgDriver };
+//# sourceMappingURL=BunPgDriver.d.mts.map

package/build/BunPgDriver.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"BunPgDriver.d.mts","names":[],"sources":["../src/BunPgDriver.ts"],"mappings":";;;;cA4Ba,uBAAuB,OAAO;;EAIzC,YAAY,OAAM;EAKlB,YACE,IAAI,eACJ,QAAQ,iBACR;IAAY;IAAgB;MAC3B;EAIH,aAAa,IAAI,eAAe,aAAa,kBAAkB,QAAQ;EAIjE,YAAY,GAAG,IAAI,eAAe,KAAK,KAAK,mBAAmB,QAAQ,KAAK,QAAQ;EAsB1F,aAAa,IAAI,eAAe,OAAO,eAAe,QAAQ;EAIxD,MAAM,IAAI,eAAe,OAAO,eAAe,OAAO,UAAU,eAAe,eAAe;MAahG"}

package/build/BunPgDriver.js

@@ -1,122 +1,95 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BunPgDriver = void 0;
-const bun_1 = require("bun");
-const joist_core_1 = require("joist-core");
-const { getRuntimeConfig, cleanSql, generateOps } = joist_core_1.driverApi;
-class BunPgDriver {
-    #idAssigner;
-    #sql;
-    constructor(_sql = bun_1.sql) {
-        this.#sql = _sql;
-        this.#idAssigner = new joist_core_1.SequenceIdAssigner((s) => this.#sql.unsafe(s));
-    }
-    executeFind(em, parsed, settings) {
-        throw new Error("Method not implemented.");
-    }
-    executeQuery(em, sql, bindings) {
-        throw new Error("Method not implemented.");
-    }
-    async transaction(em, fn) {
-        if (em.txn) {
-            return fn(em.txn);
-        }
-        else {
-            // This should be done on a reserved connection...
-            await (0, joist_core_1.driverBeforeBegin)(em, this.#sql);
-            const result = await this.#sql.begin(async (txn) => {
-                em.txn = txn;
-                try {
-                    await (0, joist_core_1.driverAfterBegin)(em, txn);
-                    const result = await fn(txn);
-                    await (0, joist_core_1.driverBeforeCommit)(em, txn);
-                    return result;
-                }
-                finally {
-                    em.txn = undefined;
-                }
-            });
-            await (0, joist_core_1.driverAfterCommit)(em, this.#sql);
-            return result;
-        }
-    }
-    assignNewIds(em, todos) {
-        throw new Error("Method not implemented.");
-    }
-    async flush(em, todos, joinRows) {
-        const sql = (em.txn ?? (0, joist_core_1.fail)("Expected EntityManager.txn to be set"));
-        await this.#idAssigner.assignNewIds(todos);
-        const ops = generateOps(todos);
-        // Do INSERTs+UPDATEs first so that we avoid DELETE cascades invalidating oplocks
-        // See https://github.com/joist-orm/joist-orm/issues/591
-        await Promise.all([
-            ...ops.inserts.map((op) => batchInsert(sql, op)),
-            ...ops.updates.map((op) => batchUpdate(sql, op)),
-            ...ops.deletes.map((op) => batchDelete(sql, op)),
-        ]);
-    }
-    get defaultPlugins() {
-        return {};
-    }
-}
-exports.BunPgDriver = BunPgDriver;
+import { sql } from "bun";
+import { SequenceIdAssigner, buildCteSql, buildUnnestCte, driverAfterBegin, driverAfterCommit, driverApi, driverBeforeBegin, driverBeforeCommit, fail, kq, kqDot } from "joist-core";
+//#region src/BunPgDriver.ts
+const { getRuntimeConfig, cleanSql, generateOps } = driverApi;
+/** Incomplete Bun SQL driver; raw-query execution is not implemented. */
+var BunPgDriver = class {
+	#idAssigner;
+	#sql;
+	constructor(_sql = sql) {
+		this.#sql = _sql;
+		this.#idAssigner = new SequenceIdAssigner((s) => this.#sql.unsafe(s));
+	}
+	executeFind(em, parsed, settings) {
+		throw new Error("Method not implemented.");
+	}
+	executeQuery(em, sql, bindings) {
+		throw new Error("BunPgDriver.executeQuery is not implemented; em.query and em.execute are unsupported.");
+	}
+	async transaction(em, fn) {
+		if (em.txn) return fn(em.txn);
+		else {
+			await driverBeforeBegin(em, this.#sql);
+			const result = await this.#sql.begin(async (txn) => {
+				em.txn = txn;
+				try {
+					await driverAfterBegin(em, txn);
+					const result = await fn(txn);
+					await driverBeforeCommit(em, txn);
+					return result;
+				} finally {
+					em.txn = void 0;
+				}
+			});
+			await driverAfterCommit(em, this.#sql);
+			return result;
+		}
+	}
+	assignNewIds(em, todos) {
+		throw new Error("Method not implemented.");
+	}
+	async flush(em, todos, joinRows) {
+		const sql = em.txn ?? fail("Expected EntityManager.txn to be set");
+		await this.#idAssigner.assignNewIds(todos);
+		const ops = generateOps(todos);
+		await Promise.all([
+			...ops.inserts.map((op) => batchInsert(sql, op)),
+			...ops.updates.map((op) => batchUpdate(sql, op)),
+			...ops.deletes.map((op) => batchDelete(sql, op))
+		]);
+	}
+	get defaultPlugins() {
+		return {};
+	}
+};
 function batchInsert(txn, op) {
-    const { tableName, columns, columnValues } = op;
-    const { sql: cte, bindings } = (0, joist_core_1.buildCteSql)((0, joist_core_1.buildUnnestCte)("data", columns, columnValues));
-    const sql = cleanSql(`
+	const { tableName, columns, columnValues } = op;
+	const { sql: cte, bindings } = buildCteSql(buildUnnestCte("data", columns, columnValues));
+	return convertToSql(txn, cleanSql(`
      ${cte}
-     INSERT INTO ${(0, joist_core_1.kq)(tableName)} (${columns.map((c) => (0, joist_core_1.kq)(c.columnName)).join(", ")})
+     INSERT INTO ${kq(tableName)} (${columns.map((c) => kq(c.columnName)).join(", ")})
      SELECT * FROM data
-  `);
-    return convertToSql(txn, sql, bindings);
+  `), bindings);
 }
 async function batchUpdate(txn, op) {
-    const { tableName, columns, columnValues, updatedAt } = op;
-    const { sql: cte, bindings } = (0, joist_core_1.buildCteSql)((0, joist_core_1.buildUnnestCte)("data", columns, columnValues));
-    // JS Dates only have millisecond-level precision, so we may have dropped/lost accuracy when
-    // reading Postgres's microsecond-level `timestamptz` values; using `date_trunc` "downgrades"
-    // the pg data to match what we have in the JS Date.
-    //
-    // ...but Temporal's types don't have this flaw.
-    const truncateToMills = !getRuntimeConfig().temporal;
-    const maybeUpdatedAt = updatedAt && truncateToMills
-        ? ` AND date_trunc('milliseconds', ${(0, joist_core_1.kqDot)(tableName, updatedAt)}) = data.__original_updated_at`
-        : updatedAt
-            ? ` AND ${(0, joist_core_1.kqDot)(tableName, updatedAt)} = data.__original_updated_at`
-            : "";
-    const sql = `
+	const { tableName, columns, columnValues, updatedAt } = op;
+	const { sql: cte, bindings } = buildCteSql(buildUnnestCte("data", columns, columnValues));
+	const truncateToMills = !getRuntimeConfig().temporal;
+	const maybeUpdatedAt = updatedAt && truncateToMills ? ` AND date_trunc('milliseconds', ${kqDot(tableName, updatedAt)}) = data.__original_updated_at` : updatedAt ? ` AND ${kqDot(tableName, updatedAt)} = data.__original_updated_at` : "";
+	const results = await convertToSql(txn, `
     ${cte}
-    UPDATE ${(0, joist_core_1.kq)(tableName)}
-    SET ${columns
-        .filter((c) => c.columnName !== "id" && c.columnName !== "__original_updated_at")
-        .map((c) => `${(0, joist_core_1.kq)(c.columnName)} = data.${(0, joist_core_1.kq)(c.columnName)}`)
-        .join(", ")}
+    UPDATE ${kq(tableName)}
+    SET ${columns.filter((c) => c.columnName !== "id" && c.columnName !== "__original_updated_at").map((c) => `${kq(c.columnName)} = data.${kq(c.columnName)}`).join(", ")}
     FROM data
-    WHERE ${(0, joist_core_1.kq)(tableName)}.id = data.id ${maybeUpdatedAt}
-    RETURNING ${(0, joist_core_1.kq)(tableName)}.id
-  `;
-    const results = await convertToSql(txn, sql, bindings);
-    const ids = columnValues[0]; // assume id is the 1st column
-    if (results.length !== ids.length) {
-        const updated = new Set(results.map((r) => r.id));
-        const missing = ids.filter((id) => !updated.has(id));
-        throw new Error(`Oplock failure for ${tableName} rows ${missing.join(", ")}`);
-    }
+    WHERE ${kq(tableName)}.id = data.id ${maybeUpdatedAt}
+    RETURNING ${kq(tableName)}.id
+  `, bindings);
+	const ids = columnValues[0];
+	if (results.length !== ids.length) {
+		const updated = new Set(results.map((r) => r.id));
+		const missing = ids.filter((id) => !updated.has(id));
+		throw new Error(`Oplock failure for ${tableName} rows ${missing.join(", ")}`);
+	}
 }
 async function batchDelete(txn, op) {
-    const { tableName, ids } = op;
-    // await txn(tableName).del().whereIn("id", ids);
+	const { tableName, ids } = op;
 }
 function convertToSql(sql, query, bindings) {
-    // Split the query string by the placeholder character '?'
-    const fragments = query.split("?");
-    if (fragments.length - 1 !== bindings.length) {
-        throw new Error(`Mismatch between placeholders (${fragments.length - 1}) and bindings (${bindings.length})`);
-    }
-    // postgres.js does runtime detection of the `raw` property to determine if it's a template string
-    const templateStrings = Object.assign(fragments, {
-        raw: fragments,
-    });
-    return sql(templateStrings, ...bindings);
+	const fragments = query.split("?");
+	if (fragments.length - 1 !== bindings.length) throw new Error(`Mismatch between placeholders (${fragments.length - 1}) and bindings (${bindings.length})`);
+	return sql(Object.assign(fragments, { raw: fragments }), ...bindings);
 }
+//#endregion
+export { BunPgDriver };
+
 //# sourceMappingURL=BunPgDriver.js.map

package/build/BunPgDriver.js.map

@@ -1 +1 @@
-{"version":3,"file":"BunPgDriver.js","sourceRoot":"","sources":["../src/BunPgDriver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BunPgDriver.js","names":["#idAssigner","#sql"],"sources":["../src/BunPgDriver.ts"],"sourcesContent":["import { type SQL, type SQLQuery, type TransactionSQL, sql } from \"bun\";\nimport {\n  type Driver,\n  type DriverQueryResult,\n  type EntityManager,\n  type IdAssigner,\n  type JoinRowTodo,\n  type ParsedFindQuery,\n  SequenceIdAssigner,\n  type Todo,\n  buildCteSql,\n  buildUnnestCte,\n  driverAfterBegin,\n  driverAfterCommit,\n  driverApi,\n  driverBeforeBegin,\n  driverBeforeCommit,\n  fail,\n  kq,\n  kqDot,\n} from \"joist-core\";\n\nconst { getRuntimeConfig, cleanSql, generateOps } = driverApi;\ntype DeleteOp = any;\ntype InsertOp = any;\ntype UpdateOp = any;\n\n/** Incomplete Bun SQL driver; raw-query execution is not implemented. */\nexport class BunPgDriver implements Driver<TransactionSQL> {\n  readonly #idAssigner: IdAssigner;\n  readonly #sql: SQL;\n\n  constructor(_sql: SQL = sql) {\n    this.#sql = _sql;\n    this.#idAssigner = new SequenceIdAssigner((s) => this.#sql.unsafe(s));\n  }\n\n  executeFind(\n    em: EntityManager,\n    parsed: ParsedFindQuery,\n    settings: { limit?: number; offset?: number },\n  ): Promise<any[]> {\n    throw new Error(\"Method not implemented.\");\n  }\n\n  executeQuery(em: EntityManager, sql: string, bindings: any[]): Promise<DriverQueryResult> {\n    throw new Error(\"BunPgDriver.executeQuery is not implemented; em.query and em.execute are unsupported.\");\n  }\n\n  async transaction<T>(em: EntityManager, fn: (txn: TransactionSQL) => Promise<T>): Promise<T> {\n    if (em.txn) {\n      return fn(em.txn as TransactionSQL);\n    } else {\n      // This should be done on a reserved connection...\n      await driverBeforeBegin(em, this.#sql);\n      const result = await this.#sql.begin(async (txn) => {\n        em.txn = txn;\n        try {\n          await driverAfterBegin(em, txn);\n          const result = await fn(txn);\n          await driverBeforeCommit(em, txn);\n          return result;\n        } finally {\n          em.txn = undefined;\n        }\n      });\n      await driverAfterCommit(em, this.#sql);\n      return result;\n    }\n  }\n\n  assignNewIds(em: EntityManager, todos: Record<string, Todo>): Promise<void> {\n    throw new Error(\"Method not implemented.\");\n  }\n\n  async flush(em: EntityManager, todos: Record<string, Todo>, joinRows: Record<string, JoinRowTodo>): Promise<void> {\n    const sql = (em.txn ?? fail(\"Expected EntityManager.txn to be set\")) as TransactionSQL;\n    await this.#idAssigner.assignNewIds(todos);\n    const ops = generateOps(todos);\n    // Do INSERTs+UPDATEs first so that we avoid DELETE cascades invalidating oplocks\n    // See https://github.com/joist-orm/joist-orm/issues/591\n    await Promise.all([\n      ...ops.inserts.map((op) => batchInsert(sql, op)),\n      ...ops.updates.map((op) => batchUpdate(sql, op)),\n      ...ops.deletes.map((op) => batchDelete(sql, op)),\n    ]);\n  }\n\n  get defaultPlugins() {\n    return {};\n  }\n}\n\nfunction batchInsert(txn: TransactionSQL, op: InsertOp): Promise<unknown> {\n  const { tableName, columns, columnValues } = op;\n  const { sql: cte, bindings } = buildCteSql(buildUnnestCte(\"data\", columns, columnValues));\n  const sql = cleanSql(`\n     ${cte}\n     INSERT INTO ${kq(tableName)} (${columns.map((c: any) => kq(c.columnName)).join(\", \")})\n     SELECT * FROM data\n  `);\n  return convertToSql(txn, sql, bindings);\n}\n\nasync function batchUpdate(txn: TransactionSQL, op: UpdateOp): Promise<void> {\n  const { tableName, columns, columnValues, updatedAt } = op;\n\n  const { sql: cte, bindings } = buildCteSql(buildUnnestCte(\"data\", columns, columnValues));\n\n  // JS Dates only have millisecond-level precision, so we may have dropped/lost accuracy when\n  // reading Postgres's microsecond-level `timestamptz` values; using `date_trunc` \"downgrades\"\n  // the pg data to match what we have in the JS Date.\n  //\n  // ...but Temporal's types don't have this flaw.\n  const truncateToMills = !getRuntimeConfig().temporal;\n  const maybeUpdatedAt =\n    updatedAt && truncateToMills\n      ? ` AND date_trunc('milliseconds', ${kqDot(tableName, updatedAt)}) = data.__original_updated_at`\n      : updatedAt\n        ? ` AND ${kqDot(tableName, updatedAt)} = data.__original_updated_at`\n        : \"\";\n\n  const sql = `\n    ${cte}\n    UPDATE ${kq(tableName)}\n    SET ${columns\n      .filter((c: any) => c.columnName !== \"id\" && c.columnName !== \"__original_updated_at\")\n      .map((c: any) => `${kq(c.columnName)} = data.${kq(c.columnName)}`)\n      .join(\", \")}\n    FROM data\n    WHERE ${kq(tableName)}.id = data.id ${maybeUpdatedAt}\n    RETURNING ${kq(tableName)}.id\n  `;\n\n  const results = await convertToSql(txn, sql, bindings);\n\n  const ids = columnValues[0]; // assume id is the 1st column\n  if (results.length !== ids.length) {\n    const updated = new Set(results.map((r: any) => r.id));\n    const missing = ids.filter((id: any) => !updated.has(id));\n    throw new Error(`Oplock failure for ${tableName} rows ${missing.join(\", \")}`);\n  }\n}\n\nasync function batchDelete(txn: TransactionSQL, op: DeleteOp): Promise<void> {\n  const { tableName, ids } = op;\n  // await txn(tableName).del().whereIn(\"id\", ids);\n}\n\nfunction convertToSql(sql: TransactionSQL, query: string, bindings: readonly any[]): SQLQuery {\n  // Split the query string by the placeholder character '?'\n  const fragments = query.split(\"?\");\n  if (fragments.length - 1 !== bindings.length) {\n    throw new Error(`Mismatch between placeholders (${fragments.length - 1}) and bindings (${bindings.length})`);\n  }\n  // postgres.js does runtime detection of the `raw` property to determine if it's a template string\n  const templateStrings = Object.assign(fragments, {\n    raw: fragments,\n  }) as unknown as TemplateStringsArray;\n  return sql(templateStrings, ...bindings);\n}\n"],"mappings":"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"}

package/build/index.cjs

@@ -0,0 +1,3 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_BunPgDriver = require("./BunPgDriver.cjs");
+exports.BunPgDriver = require_BunPgDriver.BunPgDriver;

package/build/index.d.cts

@@ -0,0 +1,2 @@
+import { BunPgDriver } from "./BunPgDriver.cjs";
+export { BunPgDriver };

package/build/index.d.mts

@@ -0,0 +1,2 @@
+import { BunPgDriver } from "./BunPgDriver.mjs";
+export { BunPgDriver };

package/build/index.js

@@ -1,18 +1,2 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./BunPgDriver"), exports);
-//# sourceMappingURL=index.js.map
+import { BunPgDriver } from "./BunPgDriver.js";
+export { BunPgDriver };

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "joist-driver-bun-pg",
-  "version": "2.3.0",
+  "version": "2.4.0-next.2",
   "license": "MIT",
+  "type": "module",
   "repository": {
     "type": "git",
     "url": "https://github.com/joist-orm/joist-orm.git",
@@ -10,24 +11,41 @@
   "engines": {
     "node": "^12.17.0 || ^13.10.0 || ^14 || >= 16.0.0 < 16.2.0 || >= 16.3.0"
   },
-  "main": "build/index.js",
-  "types": "build/index.d.ts",
-  "scripts": {
-    "format": "prettier --ignore-path ../../.prettierignore  --write '{schema,migrations,src}/**/*.{ts,js,tsx,jsx,graphql}'"
+  "main": "build/index.cjs",
+  "module": "build/index.js",
+  "types": "build/index.d.mts",
+  "exports": {
+    ".": {
+      "bun": {
+        "types": "./build/index.d.mts",
+        "default": "./build/index.js"
+      },
+      "module-sync": {
+        "types": "./build/index.d.mts",
+        "default": "./build/index.js"
+      },
+      "import": {
+        "types": "./build/index.d.mts",
+        "default": "./build/index.js"
+      },
+      "require": {
+        "types": "./build/index.d.cts",
+        "default": "./build/index.cjs"
+      },
+      "default": "./build/index.js"
+    }
   },
   "files": [
     "build"
   ],
   "peerDependencies": {
-    "joist-core": "2.3.0"
+    "joist-core": "2.4.0-next.2"
   },
   "dependencies": {
     "bun-types": "^1.3.14"
   },
   "devDependencies": {
-    "prettier": "^3.8.4",
-    "prettier-plugin-organize-imports": "^4.3.0",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "6.0.3"
+    "typescript": "7.0.2"
   }
 }

package/build/BunPgDriver.d.ts

@@ -1,16 +0,0 @@
-import { SQL, type TransactionSQL } from "bun";
-import { Driver, EntityManager, JoinRowTodo, ParsedFindQuery, Todo } from "joist-core";
-export declare class BunPgDriver implements Driver<TransactionSQL> {
-    #private;
-    constructor(_sql?: SQL);
-    executeFind(em: EntityManager, parsed: ParsedFindQuery, settings: {
-        limit?: number;
-        offset?: number;
-    }): Promise<any[]>;
-    executeQuery(em: EntityManager, sql: string, bindings: any[]): Promise<any[]>;
-    transaction<T>(em: EntityManager, fn: (txn: TransactionSQL) => Promise<T>): Promise<T>;
-    assignNewIds(em: EntityManager, todos: Record<string, Todo>): Promise<void>;
-    flush(em: EntityManager, todos: Record<string, Todo>, joinRows: Record<string, JoinRowTodo>): Promise<void>;
-    get defaultPlugins(): {};
-}
-//# sourceMappingURL=BunPgDriver.d.ts.map

package/build/BunPgDriver.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"BunPgDriver.d.ts","sourceRoot":"","sources":["../src/BunPgDriver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,GAAG,EAAiB,KAAK,cAAc,EAAE,MAAM,KAAK,CAAC;AACnE,OAAO,EAGL,MAAM,EAMN,aAAa,EAGb,WAAW,EAGX,eAAe,EAEf,IAAI,EACL,MAAM,YAAY,CAAC;AAOpB,qBAAa,WAAY,YAAW,MAAM,CAAC,cAAc,CAAC;;gBAI5C,IAAI,GAAE,GAAS;IAK3B,WAAW,CACT,EAAE,EAAE,aAAa,EACjB,MAAM,EAAE,eAAe,EACvB,QAAQ,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAC5C,OAAO,CAAC,GAAG,EAAE,CAAC;IAIjB,YAAY,CAAC,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAIvE,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAsB5F,YAAY,CAAC,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrE,KAAK,CAAC,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAajH,IAAI,cAAc,OAEjB;CACF"}

package/build/index.d.ts

@@ -1,2 +0,0 @@
-export * from "./BunPgDriver";
-//# sourceMappingURL=index.d.ts.map

package/build/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC"}

package/build/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B"}