@prisma/adapter-d1 6.11.0-dev.43 → 6.11.0-dev.5

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { D1Database as D1Database_2 } from '@cloudflare/workers-types';
+import type { D1Database as D1Database_2 } from '@cloudflare/workers-types';
 import { SqlDriverAdapter } from '@prisma/driver-adapter-utils';
 import { SqlDriverAdapterFactory } from '@prisma/driver-adapter-utils';
 import { SqlMigrationAwareDriverAdapterFactory } from '@prisma/driver-adapter-utils';
@@ -10,15 +10,14 @@ declare type D1HTTPParams = {
     CLOUDFLARE_SHADOW_DATABASE_ID?: string;
 };
 
-export declare class PrismaD1<Args extends D1Database_2 | D1HTTPParams = D1Database_2> implements PrismaD1Interface<Args> {
+export declare class PrismaD1 implements SqlDriverAdapterFactory {
+    private client;
     readonly provider = "sqlite";
     readonly adapterName: string;
-    connect: PrismaD1Interface<Args>['connect'];
-    connectToShadowDb: PrismaD1Interface<Args>['connectToShadowDb'];
-    constructor(params: Args);
+    constructor(client: StdClient);
+    connect(): Promise<SqlDriverAdapter>;
 }
 
-/** @deprecated Use PrismaD1 instead */
 export declare class PrismaD1HTTP implements SqlMigrationAwareDriverAdapterFactory {
     private params;
     readonly provider = "sqlite";
@@ -28,8 +27,6 @@ export declare class PrismaD1HTTP implements SqlMigrationAwareDriverAdapterFacto
     connectToShadowDb(): Promise<SqlDriverAdapter>;
 }
 
-declare type PrismaD1Interface<Params> = SqlDriverAdapterFactory & {
-    connectToShadowDb: Params extends D1HTTPParams ? () => Promise<SqlDriverAdapter> : undefined;
-};
+declare type StdClient = D1Database_2;
 
 export { }

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { D1Database as D1Database_2 } from '@cloudflare/workers-types';
+import type { D1Database as D1Database_2 } from '@cloudflare/workers-types';
 import { SqlDriverAdapter } from '@prisma/driver-adapter-utils';
 import { SqlDriverAdapterFactory } from '@prisma/driver-adapter-utils';
 import { SqlMigrationAwareDriverAdapterFactory } from '@prisma/driver-adapter-utils';
@@ -10,15 +10,14 @@ declare type D1HTTPParams = {
     CLOUDFLARE_SHADOW_DATABASE_ID?: string;
 };
 
-export declare class PrismaD1<Args extends D1Database_2 | D1HTTPParams = D1Database_2> implements PrismaD1Interface<Args> {
+export declare class PrismaD1 implements SqlDriverAdapterFactory {
+    private client;
     readonly provider = "sqlite";
     readonly adapterName: string;
-    connect: PrismaD1Interface<Args>['connect'];
-    connectToShadowDb: PrismaD1Interface<Args>['connectToShadowDb'];
-    constructor(params: Args);
+    constructor(client: StdClient);
+    connect(): Promise<SqlDriverAdapter>;
 }
 
-/** @deprecated Use PrismaD1 instead */
 export declare class PrismaD1HTTP implements SqlMigrationAwareDriverAdapterFactory {
     private params;
     readonly provider = "sqlite";
@@ -28,8 +27,6 @@ export declare class PrismaD1HTTP implements SqlMigrationAwareDriverAdapterFacto
     connectToShadowDb(): Promise<SqlDriverAdapter>;
 }
 
-declare type PrismaD1Interface<Params> = SqlDriverAdapterFactory & {
-    connectToShadowDb: Params extends D1HTTPParams ? () => Promise<SqlDriverAdapter> : undefined;
-};
+declare type StdClient = D1Database_2;
 
 export { }

package/dist/index.js

@@ -30,15 +30,12 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
-  PrismaD1: () => PrismaD1,
+  PrismaD1: () => PrismaD1AdapterFactory,
   PrismaD1HTTP: () => PrismaD1HTTPAdapterFactory
 });
 module.exports = __toCommonJS(index_exports);
 
-// package.json
-var name = "@prisma/adapter-d1";
-
-// src/d1-http.ts
+// src/d1.ts
 var import_driver_adapter_utils2 = require("@prisma/driver-adapter-utils");
 
 // ../../node_modules/.pnpm/kleur@4.1.5/node_modules/kleur/colors.mjs
@@ -89,8 +86,8 @@ var bgMagenta = init(45, 49);
 var bgCyan = init(46, 49);
 var bgWhite = init(47, 49);
 
-// src/d1-http.ts
-var import_ky = __toESM(require("ky"));
+// package.json
+var name = "@prisma/adapter-d1";
 
 // src/constants.ts
 var MAX_BIND_VALUES = 98;
@@ -266,48 +263,14 @@ function cleanArg(arg, argType) {
   return arg;
 }
 
-// src/d1-http.ts
-var debug = (0, import_driver_adapter_utils2.Debug)("prisma:driver-adapter:d1-http");
-function onUnsuccessfulD1HTTPResponse({ errors }) {
-  debug("D1 HTTP Errors: %O", errors);
-  const error = errors.at(0) ?? { message: "Unknown error", code: GENERIC_SQLITE_ERROR };
-  throw new import_driver_adapter_utils2.DriverAdapterError(convertDriverError(error));
-}
-function onGenericD1HTTPError(error) {
-  debug("HTTP Error: %O", error);
-  throw new import_driver_adapter_utils2.DriverAdapterError(convertDriverError(error));
-}
-function onError(error) {
-  console.error("Error in performIO: %O", error);
-  throw new import_driver_adapter_utils2.DriverAdapterError(convertDriverError(error));
-}
-async function performRawQuery(client, options) {
-  try {
-    const response = await client.post("raw", options).json();
-    const tag = "[js::performRawQuery]";
-    debug(`${tag} %O`, {
-      success: response.success,
-      errors: response.errors,
-      messages: response.messages,
-      result: response.result
-    });
-    if (!response.success) {
-      onUnsuccessfulD1HTTPResponse(response);
-    }
-    return response.result;
-  } catch (e) {
-    onGenericD1HTTPError(e);
-  }
-}
-function isD1HTTPParams(params) {
-  return typeof params === "object" && params !== null && "CLOUDFLARE_D1_TOKEN" in params && "CLOUDFLARE_ACCOUNT_ID" in params && "CLOUDFLARE_DATABASE_ID" in params;
-}
-var D1HTTPQueryable = class {
+// src/d1.ts
+var debug = (0, import_driver_adapter_utils2.Debug)("prisma:driver-adapter:d1");
+var D1Queryable = class {
   constructor(client) {
     this.client = client;
   }
   provider = "sqlite";
-  adapterName = `${name}-http`;
+  adapterName = name;
   /**
    * Execute a query given as SQL, interpolating the given parameters.
    */
@@ -318,7 +281,9 @@ var D1HTTPQueryable = class {
     const convertedData = this.convertData(data);
     return convertedData;
   }
-  convertData({ columnNames, rows: results }) {
+  convertData(ioResult) {
+    const columnNames = ioResult[0];
+    const results = ioResult[1];
     if (results.length === 0) {
       return {
         columnNames: [],
@@ -326,10 +291,14 @@ var D1HTTPQueryable = class {
         rows: []
       };
     }
-    const columnTypes = getColumnTypes(columnNames, results);
+    const columnTypes = Object.values(getColumnTypes(columnNames, results));
     const rows = results.map((value) => mapRow(value, columnTypes));
     return {
       columnNames,
+      // * Note: without Object.values the array looks like
+      // * columnTypes: [ id: 128 ],
+      // * and errors with:
+      // * ✘ [ERROR] A hanging Promise was canceled. This happens when the worker runtime is waiting for a Promise from JavaScript to resolve, but has detected that the Promise cannot possibly ever resolve because all code and events related to the Promise's I/O context have already finished.
       columnTypes,
       rows
     };
@@ -342,34 +311,25 @@ var D1HTTPQueryable = class {
   async executeRaw(query) {
     const tag = "[js::execute_raw]";
     debug(`${tag} %O`, query);
-    const result = await this.performIO(query);
-    return result.affectedRows ?? 0;
+    const result = await this.performIO(query, true);
+    return result.meta.changes ?? 0;
   }
-  async performIO(query) {
+  async performIO(query, executeRaw = false) {
     try {
       query.args = query.args.map((arg, i) => cleanArg(arg, query.argTypes[i]));
-      const body = {
-        json: {
-          sql: query.sql,
-          params: query.args
-        }
-      };
-      const tag = "[js::perform_io]";
-      debug(`${tag} %O`, body);
-      const results = await performRawQuery(this.client, body);
-      if (results.length !== 1) {
-        throw new Error("Expected exactly one result");
+      const stmt = this.client.prepare(query.sql).bind(...query.args);
+      if (executeRaw) {
+        return await stmt.run();
+      } else {
+        const [columnNames, ...rows] = await stmt.raw({ columnNames: true });
+        return [columnNames, rows];
       }
-      const result = results[0];
-      const { columns: columnNames = [], rows = [] } = result.results ?? {};
-      const affectedRows = result.meta?.changes;
-      return { rows, columnNames, affectedRows };
     } catch (e) {
       onError(e);
     }
   }
 };
-var D1HTTPTransaction = class extends D1HTTPQueryable {
+var D1Transaction = class extends D1Queryable {
   constructor(client, options) {
     super(client);
     this.options = options;
@@ -381,17 +341,8 @@ var D1HTTPTransaction = class extends D1HTTPQueryable {
     debug(`[js::rollback]`);
   }
 };
-var PrismaD1HTTPAdapter = class extends D1HTTPQueryable {
-  constructor(params, release) {
-    const D1_API_BASE_URL = `https://api.cloudflare.com/client/v4/accounts/${params.CLOUDFLARE_ACCOUNT_ID}/d1/database/${params.CLOUDFLARE_DATABASE_ID}`;
-    const client = import_ky.default.create({
-      prefixUrl: D1_API_BASE_URL,
-      headers: {
-        Authorization: `Bearer ${params.CLOUDFLARE_D1_TOKEN}`
-      },
-      // Don't automatically throw on non-2xx status codes
-      throwHttpErrors: false
-    });
+var PrismaD1Adapter = class extends D1Queryable {
+  constructor(client, release) {
     super(client);
     this.release = release;
   }
@@ -420,11 +371,7 @@ var PrismaD1HTTPAdapter = class extends D1HTTPQueryable {
   };
   async executeScript(script) {
     try {
-      await performRawQuery(this.client, {
-        json: {
-          sql: script
-        }
-      });
+      await this.client.exec(script);
     } catch (error) {
       onError(error);
     }
@@ -451,80 +398,69 @@ var PrismaD1HTTPAdapter = class extends D1HTTPQueryable {
     };
     const tag = "[js::startTransaction]";
     debug("%s options: %O", tag, options);
-    return new D1HTTPTransaction(this.client, options);
+    return new D1Transaction(this.client, options);
   }
   async dispose() {
     await this.release?.();
   }
 };
-var PrismaD1HTTPAdapterFactory = class {
-  constructor(params) {
-    this.params = params;
+var PrismaD1AdapterFactory = class {
+  constructor(client) {
+    this.client = client;
   }
   provider = "sqlite";
-  adapterName = `${name}-http`;
+  adapterName = name;
   async connect() {
-    return new PrismaD1HTTPAdapter(this.params, async () => {
+    return new PrismaD1Adapter(this.client, async () => {
     });
   }
-  async connectToShadowDb() {
-    const D1_API_BASE_URL = `https://api.cloudflare.com/client/v4/accounts/${this.params.CLOUDFLARE_ACCOUNT_ID}/d1/database`;
-    const client = import_ky.default.create({
-      headers: {
-        Authorization: `Bearer ${this.params.CLOUDFLARE_D1_TOKEN}`
-      },
-      // Don't throw on non-2xx status codes
-      throwHttpErrors: false
-    });
-    const createShadowDatabase = async () => {
-      const tag = "[js::connectToShadowDb::createShadowDatabase]";
-      const SHADOW_DATABASE_PREFIX = "_prisma_shadow_";
-      const CLOUDFLARE_SHADOW_DATABASE_NAME = `${SHADOW_DATABASE_PREFIX}${globalThis.crypto.randomUUID()}`;
-      debug(`${tag} creating database %s`, CLOUDFLARE_SHADOW_DATABASE_NAME);
-      try {
-        const response = await client.post(D1_API_BASE_URL, {
-          json: {
-            name: CLOUDFLARE_SHADOW_DATABASE_NAME
-          }
-        }).json();
-        debug(`${tag} %O`, response);
-        if (!response.success) {
-          onUnsuccessfulD1HTTPResponse(response);
-        }
-        const { uuid: CLOUDFLARE_SHADOW_DATABASE_ID2 } = response.result;
-        debug(`${tag} created database %s with ID %s`, CLOUDFLARE_SHADOW_DATABASE_NAME, CLOUDFLARE_SHADOW_DATABASE_ID2);
-        return CLOUDFLARE_SHADOW_DATABASE_ID2;
-      } catch (e) {
-        onGenericD1HTTPError(e);
-      }
-    };
-    const CLOUDFLARE_SHADOW_DATABASE_ID = this.params.CLOUDFLARE_SHADOW_DATABASE_ID ?? await createShadowDatabase();
-    const dispose = async () => {
-      const tag = "[js::connectToShadowDb::dispose]";
-      try {
-        debug(`${tag} deleting database %s`, CLOUDFLARE_SHADOW_DATABASE_ID);
-        const response = await client.delete(`${D1_API_BASE_URL}/${CLOUDFLARE_SHADOW_DATABASE_ID}`).json();
-        debug(`${tag} %O`, response);
-        if (!response.success) {
-          onUnsuccessfulD1HTTPResponse(response);
-        }
-      } catch (e) {
-        onGenericD1HTTPError(e);
-      }
-    };
-    return new PrismaD1HTTPAdapter(this.params, dispose);
-  }
 };
+function onError(error) {
+  console.error("Error in performIO: %O", error);
+  throw new import_driver_adapter_utils2.DriverAdapterError(convertDriverError(error));
+}
 
-// src/d1-worker.ts
+// src/d1-http.ts
 var import_driver_adapter_utils3 = require("@prisma/driver-adapter-utils");
-var debug2 = (0, import_driver_adapter_utils3.Debug)("prisma:driver-adapter:d1");
-var D1WorkerQueryable = class {
+var import_ky = __toESM(require("ky"));
+var debug2 = (0, import_driver_adapter_utils3.Debug)("prisma:driver-adapter:d1-http");
+function onUnsuccessfulD1HTTPResponse({ errors }) {
+  debug2("D1 HTTP Errors: %O", errors);
+  const error = errors.at(0) ?? { message: "Unknown error", code: GENERIC_SQLITE_ERROR };
+  throw new import_driver_adapter_utils3.DriverAdapterError(convertDriverError(error));
+}
+function onGenericD1HTTPError(error) {
+  debug2("HTTP Error: %O", error);
+  throw new import_driver_adapter_utils3.DriverAdapterError(convertDriverError(error));
+}
+function onError2(error) {
+  console.error("Error in performIO: %O", error);
+  throw new import_driver_adapter_utils3.DriverAdapterError(convertDriverError(error));
+}
+async function performRawQuery(client, options) {
+  try {
+    const response = await client.post("raw", options).json();
+    const tag = "[js::performRawQuery]";
+    debug2(`${tag} %O`, {
+      success: response.success,
+      errors: response.errors,
+      messages: response.messages,
+      result: response.result
+    });
+    if (!response.success) {
+      onUnsuccessfulD1HTTPResponse(response);
+    }
+    return response.result;
+  } catch (e) {
+    onGenericD1HTTPError(e);
+  }
+}
+var D1HTTPQueryable = class {
   constructor(client) {
     this.client = client;
   }
   provider = "sqlite";
-  adapterName = name;
+  adapterName = `${name}-http`;
   /**
    * Execute a query given as SQL, interpolating the given parameters.
    */
@@ -535,9 +471,7 @@ var D1WorkerQueryable = class {
     const convertedData = this.convertData(data);
     return convertedData;
   }
-  convertData(ioResult) {
-    const columnNames = ioResult[0];
-    const results = ioResult[1];
+  convertData({ columnNames, rows: results }) {
     if (results.length === 0) {
       return {
         columnNames: [],
@@ -545,14 +479,10 @@ var D1WorkerQueryable = class {
         rows: []
       };
     }
-    const columnTypes = Object.values(getColumnTypes(columnNames, results));
+    const columnTypes = getColumnTypes(columnNames, results);
     const rows = results.map((value) => mapRow(value, columnTypes));
     return {
       columnNames,
-      // * Note: without Object.values the array looks like
-      // * columnTypes: [ id: 128 ],
-      // * and errors with:
-      // * ✘ [ERROR] A hanging Promise was canceled. This happens when the worker runtime is waiting for a Promise from JavaScript to resolve, but has detected that the Promise cannot possibly ever resolve because all code and events related to the Promise's I/O context have already finished.
       columnTypes,
       rows
     };
@@ -565,25 +495,34 @@ var D1WorkerQueryable = class {
   async executeRaw(query) {
     const tag = "[js::execute_raw]";
     debug2(`${tag} %O`, query);
-    const result = await this.performIO(query, true);
-    return result.meta.changes ?? 0;
+    const result = await this.performIO(query);
+    return result.affectedRows ?? 0;
   }
-  async performIO(query, executeRaw = false) {
+  async performIO(query) {
     try {
       query.args = query.args.map((arg, i) => cleanArg(arg, query.argTypes[i]));
-      const stmt = this.client.prepare(query.sql).bind(...query.args);
-      if (executeRaw) {
-        return await stmt.run();
-      } else {
-        const [columnNames, ...rows] = await stmt.raw({ columnNames: true });
-        return [columnNames, rows];
+      const body = {
+        json: {
+          sql: query.sql,
+          params: query.args
+        }
+      };
+      const tag = "[js::perform_io]";
+      debug2(`${tag} %O`, body);
+      const results = await performRawQuery(this.client, body);
+      if (results.length !== 1) {
+        throw new Error("Expected exactly one result");
       }
+      const result = results[0];
+      const { columns: columnNames = [], rows = [] } = result.results ?? {};
+      const affectedRows = result.meta?.changes;
+      return { rows, columnNames, affectedRows };
     } catch (e) {
       onError2(e);
     }
   }
 };
-var D1WorkerTransaction = class extends D1WorkerQueryable {
+var D1HTTPTransaction = class extends D1HTTPQueryable {
   constructor(client, options) {
     super(client);
     this.options = options;
@@ -595,8 +534,17 @@ var D1WorkerTransaction = class extends D1WorkerQueryable {
     debug2(`[js::rollback]`);
   }
 };
-var PrismaD1WorkerAdapter = class extends D1WorkerQueryable {
-  constructor(client, release) {
+var PrismaD1HTTPAdapter = class extends D1HTTPQueryable {
+  constructor(params, release) {
+    const D1_API_BASE_URL = `https://api.cloudflare.com/client/v4/accounts/${params.CLOUDFLARE_ACCOUNT_ID}/d1/database/${params.CLOUDFLARE_DATABASE_ID}`;
+    const client = import_ky.default.create({
+      prefixUrl: D1_API_BASE_URL,
+      headers: {
+        Authorization: `Bearer ${params.CLOUDFLARE_D1_TOKEN}`
+      },
+      // Don't automatically throw on non-2xx status codes
+      throwHttpErrors: false
+    });
     super(client);
     this.release = release;
   }
@@ -625,7 +573,11 @@ var PrismaD1WorkerAdapter = class extends D1WorkerQueryable {
   };
   async executeScript(script) {
     try {
-      await this.client.exec(script);
+      await performRawQuery(this.client, {
+        json: {
+          sql: script
+        }
+      });
     } catch (error) {
       onError2(error);
     }
@@ -652,45 +604,68 @@ var PrismaD1WorkerAdapter = class extends D1WorkerQueryable {
     };
     const tag = "[js::startTransaction]";
     debug2("%s options: %O", tag, options);
-    return new D1WorkerTransaction(this.client, options);
+    return new D1HTTPTransaction(this.client, options);
   }
   async dispose() {
     await this.release?.();
   }
 };
-var PrismaD1WorkerAdapterFactory = class {
-  constructor(client) {
-    this.client = client;
+var PrismaD1HTTPAdapterFactory = class {
+  constructor(params) {
+    this.params = params;
   }
   provider = "sqlite";
-  adapterName = name;
+  adapterName = `${name}-http`;
   async connect() {
-    return new PrismaD1WorkerAdapter(this.client, async () => {
+    return new PrismaD1HTTPAdapter(this.params, async () => {
     });
   }
-};
-function onError2(error) {
-  console.error("Error in performIO: %O", error);
-  throw new import_driver_adapter_utils3.DriverAdapterError(convertDriverError(error));
-}
-
-// src/d1.ts
-var PrismaD1 = class {
-  provider = "sqlite";
-  adapterName = name;
-  connect;
-  connectToShadowDb;
-  constructor(params) {
-    if (isD1HTTPParams(params)) {
-      const factory = new PrismaD1HTTPAdapterFactory(params);
-      const self = this;
-      self.connect = factory.connect.bind(factory);
-      self.connectToShadowDb = factory.connectToShadowDb.bind(factory);
-    } else {
-      const factory = new PrismaD1WorkerAdapterFactory(params);
-      const self = this;
-      self.connect = factory.connect.bind(factory);
-    }
+  async connectToShadowDb() {
+    const D1_API_BASE_URL = `https://api.cloudflare.com/client/v4/accounts/${this.params.CLOUDFLARE_ACCOUNT_ID}/d1/database`;
+    const client = import_ky.default.create({
+      headers: {
+        Authorization: `Bearer ${this.params.CLOUDFLARE_D1_TOKEN}`
+      },
+      // Don't throw on non-2xx status codes
+      throwHttpErrors: false
+    });
+    const createShadowDatabase = async () => {
+      const tag = "[js::connectToShadowDb::createShadowDatabase]";
+      const SHADOW_DATABASE_PREFIX = "_prisma_shadow_";
+      const CLOUDFLARE_SHADOW_DATABASE_NAME = `${SHADOW_DATABASE_PREFIX}${globalThis.crypto.randomUUID()}`;
+      debug2(`${tag} creating database %s`, CLOUDFLARE_SHADOW_DATABASE_NAME);
+      try {
+        const response = await client.post(D1_API_BASE_URL, {
+          json: {
+            name: CLOUDFLARE_SHADOW_DATABASE_NAME
+          }
+        }).json();
+        debug2(`${tag} %O`, response);
+        if (!response.success) {
+          onUnsuccessfulD1HTTPResponse(response);
+        }
+        const { uuid: CLOUDFLARE_SHADOW_DATABASE_ID2 } = response.result;
+        debug2(`${tag} created database %s with ID %s`, CLOUDFLARE_SHADOW_DATABASE_NAME, CLOUDFLARE_SHADOW_DATABASE_ID2);
+        return CLOUDFLARE_SHADOW_DATABASE_ID2;
+      } catch (e) {
+        onGenericD1HTTPError(e);
+      }
+    };
+    const CLOUDFLARE_SHADOW_DATABASE_ID = this.params.CLOUDFLARE_SHADOW_DATABASE_ID ?? await createShadowDatabase();
+    const dispose = async () => {
+      const tag = "[js::connectToShadowDb::dispose]";
+      try {
+        debug2(`${tag} deleting database %s`, CLOUDFLARE_SHADOW_DATABASE_ID);
+        const response = await client.delete(`${D1_API_BASE_URL}/${CLOUDFLARE_SHADOW_DATABASE_ID}`).json();
+        debug2(`${tag} %O`, response);
+        if (!response.success) {
+          onUnsuccessfulD1HTTPResponse(response);
+        }
+      } catch (e) {
+        onGenericD1HTTPError(e);
+      }
+    };
+    return new PrismaD1HTTPAdapter(this.params, dispose);
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/index.mjs

@@ -1,7 +1,4 @@
-// package.json
-var name = "@prisma/adapter-d1";
-
-// src/d1-http.ts
+// src/d1.ts
 import {
   Debug,
   DriverAdapterError
@@ -55,8 +52,8 @@ var bgMagenta = init(45, 49);
 var bgCyan = init(46, 49);
 var bgWhite = init(47, 49);
 
-// src/d1-http.ts
-import ky from "ky";
+// package.json
+var name = "@prisma/adapter-d1";
 
 // src/constants.ts
 var MAX_BIND_VALUES = 98;
@@ -232,48 +229,14 @@ function cleanArg(arg, argType) {
   return arg;
 }
 
-// src/d1-http.ts
-var debug = Debug("prisma:driver-adapter:d1-http");
-function onUnsuccessfulD1HTTPResponse({ errors }) {
-  debug("D1 HTTP Errors: %O", errors);
-  const error = errors.at(0) ?? { message: "Unknown error", code: GENERIC_SQLITE_ERROR };
-  throw new DriverAdapterError(convertDriverError(error));
-}
-function onGenericD1HTTPError(error) {
-  debug("HTTP Error: %O", error);
-  throw new DriverAdapterError(convertDriverError(error));
-}
-function onError(error) {
-  console.error("Error in performIO: %O", error);
-  throw new DriverAdapterError(convertDriverError(error));
-}
-async function performRawQuery(client, options) {
-  try {
-    const response = await client.post("raw", options).json();
-    const tag = "[js::performRawQuery]";
-    debug(`${tag} %O`, {
-      success: response.success,
-      errors: response.errors,
-      messages: response.messages,
-      result: response.result
-    });
-    if (!response.success) {
-      onUnsuccessfulD1HTTPResponse(response);
-    }
-    return response.result;
-  } catch (e) {
-    onGenericD1HTTPError(e);
-  }
-}
-function isD1HTTPParams(params) {
-  return typeof params === "object" && params !== null && "CLOUDFLARE_D1_TOKEN" in params && "CLOUDFLARE_ACCOUNT_ID" in params && "CLOUDFLARE_DATABASE_ID" in params;
-}
-var D1HTTPQueryable = class {
+// src/d1.ts
+var debug = Debug("prisma:driver-adapter:d1");
+var D1Queryable = class {
   constructor(client) {
     this.client = client;
   }
   provider = "sqlite";
-  adapterName = `${name}-http`;
+  adapterName = name;
   /**
    * Execute a query given as SQL, interpolating the given parameters.
    */
@@ -284,7 +247,9 @@ var D1HTTPQueryable = class {
     const convertedData = this.convertData(data);
     return convertedData;
   }
-  convertData({ columnNames, rows: results }) {
+  convertData(ioResult) {
+    const columnNames = ioResult[0];
+    const results = ioResult[1];
     if (results.length === 0) {
       return {
         columnNames: [],
@@ -292,10 +257,14 @@ var D1HTTPQueryable = class {
         rows: []
       };
     }
-    const columnTypes = getColumnTypes(columnNames, results);
+    const columnTypes = Object.values(getColumnTypes(columnNames, results));
     const rows = results.map((value) => mapRow(value, columnTypes));
     return {
       columnNames,
+      // * Note: without Object.values the array looks like
+      // * columnTypes: [ id: 128 ],
+      // * and errors with:
+      // * ✘ [ERROR] A hanging Promise was canceled. This happens when the worker runtime is waiting for a Promise from JavaScript to resolve, but has detected that the Promise cannot possibly ever resolve because all code and events related to the Promise's I/O context have already finished.
       columnTypes,
       rows
     };
@@ -308,34 +277,25 @@ var D1HTTPQueryable = class {
   async executeRaw(query) {
     const tag = "[js::execute_raw]";
     debug(`${tag} %O`, query);
-    const result = await this.performIO(query);
-    return result.affectedRows ?? 0;
+    const result = await this.performIO(query, true);
+    return result.meta.changes ?? 0;
   }
-  async performIO(query) {
+  async performIO(query, executeRaw = false) {
     try {
       query.args = query.args.map((arg, i) => cleanArg(arg, query.argTypes[i]));
-      const body = {
-        json: {
-          sql: query.sql,
-          params: query.args
-        }
-      };
-      const tag = "[js::perform_io]";
-      debug(`${tag} %O`, body);
-      const results = await performRawQuery(this.client, body);
-      if (results.length !== 1) {
-        throw new Error("Expected exactly one result");
+      const stmt = this.client.prepare(query.sql).bind(...query.args);
+      if (executeRaw) {
+        return await stmt.run();
+      } else {
+        const [columnNames, ...rows] = await stmt.raw({ columnNames: true });
+        return [columnNames, rows];
       }
-      const result = results[0];
-      const { columns: columnNames = [], rows = [] } = result.results ?? {};
-      const affectedRows = result.meta?.changes;
-      return { rows, columnNames, affectedRows };
     } catch (e) {
       onError(e);
     }
   }
 };
-var D1HTTPTransaction = class extends D1HTTPQueryable {
+var D1Transaction = class extends D1Queryable {
   constructor(client, options) {
     super(client);
     this.options = options;
@@ -347,17 +307,8 @@ var D1HTTPTransaction = class extends D1HTTPQueryable {
     debug(`[js::rollback]`);
   }
 };
-var PrismaD1HTTPAdapter = class extends D1HTTPQueryable {
-  constructor(params, release) {
-    const D1_API_BASE_URL = `https://api.cloudflare.com/client/v4/accounts/${params.CLOUDFLARE_ACCOUNT_ID}/d1/database/${params.CLOUDFLARE_DATABASE_ID}`;
-    const client = ky.create({
-      prefixUrl: D1_API_BASE_URL,
-      headers: {
-        Authorization: `Bearer ${params.CLOUDFLARE_D1_TOKEN}`
-      },
-      // Don't automatically throw on non-2xx status codes
-      throwHttpErrors: false
-    });
+var PrismaD1Adapter = class extends D1Queryable {
+  constructor(client, release) {
     super(client);
     this.release = release;
   }
@@ -386,11 +337,7 @@ var PrismaD1HTTPAdapter = class extends D1HTTPQueryable {
   };
   async executeScript(script) {
     try {
-      await performRawQuery(this.client, {
-        json: {
-          sql: script
-        }
-      });
+      await this.client.exec(script);
     } catch (error) {
       onError(error);
     }
@@ -417,83 +364,72 @@ var PrismaD1HTTPAdapter = class extends D1HTTPQueryable {
     };
     const tag = "[js::startTransaction]";
     debug("%s options: %O", tag, options);
-    return new D1HTTPTransaction(this.client, options);
+    return new D1Transaction(this.client, options);
   }
   async dispose() {
     await this.release?.();
   }
 };
-var PrismaD1HTTPAdapterFactory = class {
-  constructor(params) {
-    this.params = params;
+var PrismaD1AdapterFactory = class {
+  constructor(client) {
+    this.client = client;
   }
   provider = "sqlite";
-  adapterName = `${name}-http`;
+  adapterName = name;
   async connect() {
-    return new PrismaD1HTTPAdapter(this.params, async () => {
+    return new PrismaD1Adapter(this.client, async () => {
     });
   }
-  async connectToShadowDb() {
-    const D1_API_BASE_URL = `https://api.cloudflare.com/client/v4/accounts/${this.params.CLOUDFLARE_ACCOUNT_ID}/d1/database`;
-    const client = ky.create({
-      headers: {
-        Authorization: `Bearer ${this.params.CLOUDFLARE_D1_TOKEN}`
-      },
-      // Don't throw on non-2xx status codes
-      throwHttpErrors: false
-    });
-    const createShadowDatabase = async () => {
-      const tag = "[js::connectToShadowDb::createShadowDatabase]";
-      const SHADOW_DATABASE_PREFIX = "_prisma_shadow_";
-      const CLOUDFLARE_SHADOW_DATABASE_NAME = `${SHADOW_DATABASE_PREFIX}${globalThis.crypto.randomUUID()}`;
-      debug(`${tag} creating database %s`, CLOUDFLARE_SHADOW_DATABASE_NAME);
-      try {
-        const response = await client.post(D1_API_BASE_URL, {
-          json: {
-            name: CLOUDFLARE_SHADOW_DATABASE_NAME
-          }
-        }).json();
-        debug(`${tag} %O`, response);
-        if (!response.success) {
-          onUnsuccessfulD1HTTPResponse(response);
-        }
-        const { uuid: CLOUDFLARE_SHADOW_DATABASE_ID2 } = response.result;
-        debug(`${tag} created database %s with ID %s`, CLOUDFLARE_SHADOW_DATABASE_NAME, CLOUDFLARE_SHADOW_DATABASE_ID2);
-        return CLOUDFLARE_SHADOW_DATABASE_ID2;
-      } catch (e) {
-        onGenericD1HTTPError(e);
-      }
-    };
-    const CLOUDFLARE_SHADOW_DATABASE_ID = this.params.CLOUDFLARE_SHADOW_DATABASE_ID ?? await createShadowDatabase();
-    const dispose = async () => {
-      const tag = "[js::connectToShadowDb::dispose]";
-      try {
-        debug(`${tag} deleting database %s`, CLOUDFLARE_SHADOW_DATABASE_ID);
-        const response = await client.delete(`${D1_API_BASE_URL}/${CLOUDFLARE_SHADOW_DATABASE_ID}`).json();
-        debug(`${tag} %O`, response);
-        if (!response.success) {
-          onUnsuccessfulD1HTTPResponse(response);
-        }
-      } catch (e) {
-        onGenericD1HTTPError(e);
-      }
-    };
-    return new PrismaD1HTTPAdapter(this.params, dispose);
-  }
 };
+function onError(error) {
+  console.error("Error in performIO: %O", error);
+  throw new DriverAdapterError(convertDriverError(error));
+}
 
-// src/d1-worker.ts
+// src/d1-http.ts
 import {
   Debug as Debug2,
   DriverAdapterError as DriverAdapterError2
 } from "@prisma/driver-adapter-utils";
-var debug2 = Debug2("prisma:driver-adapter:d1");
-var D1WorkerQueryable = class {
+import ky from "ky";
+var debug2 = Debug2("prisma:driver-adapter:d1-http");
+function onUnsuccessfulD1HTTPResponse({ errors }) {
+  debug2("D1 HTTP Errors: %O", errors);
+  const error = errors.at(0) ?? { message: "Unknown error", code: GENERIC_SQLITE_ERROR };
+  throw new DriverAdapterError2(convertDriverError(error));
+}
+function onGenericD1HTTPError(error) {
+  debug2("HTTP Error: %O", error);
+  throw new DriverAdapterError2(convertDriverError(error));
+}
+function onError2(error) {
+  console.error("Error in performIO: %O", error);
+  throw new DriverAdapterError2(convertDriverError(error));
+}
+async function performRawQuery(client, options) {
+  try {
+    const response = await client.post("raw", options).json();
+    const tag = "[js::performRawQuery]";
+    debug2(`${tag} %O`, {
+      success: response.success,
+      errors: response.errors,
+      messages: response.messages,
+      result: response.result
+    });
+    if (!response.success) {
+      onUnsuccessfulD1HTTPResponse(response);
+    }
+    return response.result;
+  } catch (e) {
+    onGenericD1HTTPError(e);
+  }
+}
+var D1HTTPQueryable = class {
   constructor(client) {
     this.client = client;
   }
   provider = "sqlite";
-  adapterName = name;
+  adapterName = `${name}-http`;
   /**
    * Execute a query given as SQL, interpolating the given parameters.
    */
@@ -504,9 +440,7 @@ var D1WorkerQueryable = class {
     const convertedData = this.convertData(data);
     return convertedData;
   }
-  convertData(ioResult) {
-    const columnNames = ioResult[0];
-    const results = ioResult[1];
+  convertData({ columnNames, rows: results }) {
     if (results.length === 0) {
       return {
         columnNames: [],
@@ -514,14 +448,10 @@ var D1WorkerQueryable = class {
         rows: []
       };
     }
-    const columnTypes = Object.values(getColumnTypes(columnNames, results));
+    const columnTypes = getColumnTypes(columnNames, results);
     const rows = results.map((value) => mapRow(value, columnTypes));
     return {
       columnNames,
-      // * Note: without Object.values the array looks like
-      // * columnTypes: [ id: 128 ],
-      // * and errors with:
-      // * ✘ [ERROR] A hanging Promise was canceled. This happens when the worker runtime is waiting for a Promise from JavaScript to resolve, but has detected that the Promise cannot possibly ever resolve because all code and events related to the Promise's I/O context have already finished.
       columnTypes,
       rows
     };
@@ -534,25 +464,34 @@ var D1WorkerQueryable = class {
   async executeRaw(query) {
     const tag = "[js::execute_raw]";
     debug2(`${tag} %O`, query);
-    const result = await this.performIO(query, true);
-    return result.meta.changes ?? 0;
+    const result = await this.performIO(query);
+    return result.affectedRows ?? 0;
   }
-  async performIO(query, executeRaw = false) {
+  async performIO(query) {
     try {
       query.args = query.args.map((arg, i) => cleanArg(arg, query.argTypes[i]));
-      const stmt = this.client.prepare(query.sql).bind(...query.args);
-      if (executeRaw) {
-        return await stmt.run();
-      } else {
-        const [columnNames, ...rows] = await stmt.raw({ columnNames: true });
-        return [columnNames, rows];
+      const body = {
+        json: {
+          sql: query.sql,
+          params: query.args
+        }
+      };
+      const tag = "[js::perform_io]";
+      debug2(`${tag} %O`, body);
+      const results = await performRawQuery(this.client, body);
+      if (results.length !== 1) {
+        throw new Error("Expected exactly one result");
       }
+      const result = results[0];
+      const { columns: columnNames = [], rows = [] } = result.results ?? {};
+      const affectedRows = result.meta?.changes;
+      return { rows, columnNames, affectedRows };
     } catch (e) {
       onError2(e);
     }
   }
 };
-var D1WorkerTransaction = class extends D1WorkerQueryable {
+var D1HTTPTransaction = class extends D1HTTPQueryable {
   constructor(client, options) {
     super(client);
     this.options = options;
@@ -564,8 +503,17 @@ var D1WorkerTransaction = class extends D1WorkerQueryable {
     debug2(`[js::rollback]`);
   }
 };
-var PrismaD1WorkerAdapter = class extends D1WorkerQueryable {
-  constructor(client, release) {
+var PrismaD1HTTPAdapter = class extends D1HTTPQueryable {
+  constructor(params, release) {
+    const D1_API_BASE_URL = `https://api.cloudflare.com/client/v4/accounts/${params.CLOUDFLARE_ACCOUNT_ID}/d1/database/${params.CLOUDFLARE_DATABASE_ID}`;
+    const client = ky.create({
+      prefixUrl: D1_API_BASE_URL,
+      headers: {
+        Authorization: `Bearer ${params.CLOUDFLARE_D1_TOKEN}`
+      },
+      // Don't automatically throw on non-2xx status codes
+      throwHttpErrors: false
+    });
     super(client);
     this.release = release;
   }
@@ -594,7 +542,11 @@ var PrismaD1WorkerAdapter = class extends D1WorkerQueryable {
   };
   async executeScript(script) {
     try {
-      await this.client.exec(script);
+      await performRawQuery(this.client, {
+        json: {
+          sql: script
+        }
+      });
     } catch (error) {
       onError2(error);
     }
@@ -621,48 +573,71 @@ var PrismaD1WorkerAdapter = class extends D1WorkerQueryable {
     };
     const tag = "[js::startTransaction]";
     debug2("%s options: %O", tag, options);
-    return new D1WorkerTransaction(this.client, options);
+    return new D1HTTPTransaction(this.client, options);
   }
   async dispose() {
     await this.release?.();
   }
 };
-var PrismaD1WorkerAdapterFactory = class {
-  constructor(client) {
-    this.client = client;
+var PrismaD1HTTPAdapterFactory = class {
+  constructor(params) {
+    this.params = params;
   }
   provider = "sqlite";
-  adapterName = name;
+  adapterName = `${name}-http`;
   async connect() {
-    return new PrismaD1WorkerAdapter(this.client, async () => {
+    return new PrismaD1HTTPAdapter(this.params, async () => {
     });
   }
-};
-function onError2(error) {
-  console.error("Error in performIO: %O", error);
-  throw new DriverAdapterError2(convertDriverError(error));
-}
-
-// src/d1.ts
-var PrismaD1 = class {
-  provider = "sqlite";
-  adapterName = name;
-  connect;
-  connectToShadowDb;
-  constructor(params) {
-    if (isD1HTTPParams(params)) {
-      const factory = new PrismaD1HTTPAdapterFactory(params);
-      const self = this;
-      self.connect = factory.connect.bind(factory);
-      self.connectToShadowDb = factory.connectToShadowDb.bind(factory);
-    } else {
-      const factory = new PrismaD1WorkerAdapterFactory(params);
-      const self = this;
-      self.connect = factory.connect.bind(factory);
-    }
+  async connectToShadowDb() {
+    const D1_API_BASE_URL = `https://api.cloudflare.com/client/v4/accounts/${this.params.CLOUDFLARE_ACCOUNT_ID}/d1/database`;
+    const client = ky.create({
+      headers: {
+        Authorization: `Bearer ${this.params.CLOUDFLARE_D1_TOKEN}`
+      },
+      // Don't throw on non-2xx status codes
+      throwHttpErrors: false
+    });
+    const createShadowDatabase = async () => {
+      const tag = "[js::connectToShadowDb::createShadowDatabase]";
+      const SHADOW_DATABASE_PREFIX = "_prisma_shadow_";
+      const CLOUDFLARE_SHADOW_DATABASE_NAME = `${SHADOW_DATABASE_PREFIX}${globalThis.crypto.randomUUID()}`;
+      debug2(`${tag} creating database %s`, CLOUDFLARE_SHADOW_DATABASE_NAME);
+      try {
+        const response = await client.post(D1_API_BASE_URL, {
+          json: {
+            name: CLOUDFLARE_SHADOW_DATABASE_NAME
+          }
+        }).json();
+        debug2(`${tag} %O`, response);
+        if (!response.success) {
+          onUnsuccessfulD1HTTPResponse(response);
+        }
+        const { uuid: CLOUDFLARE_SHADOW_DATABASE_ID2 } = response.result;
+        debug2(`${tag} created database %s with ID %s`, CLOUDFLARE_SHADOW_DATABASE_NAME, CLOUDFLARE_SHADOW_DATABASE_ID2);
+        return CLOUDFLARE_SHADOW_DATABASE_ID2;
+      } catch (e) {
+        onGenericD1HTTPError(e);
+      }
+    };
+    const CLOUDFLARE_SHADOW_DATABASE_ID = this.params.CLOUDFLARE_SHADOW_DATABASE_ID ?? await createShadowDatabase();
+    const dispose = async () => {
+      const tag = "[js::connectToShadowDb::dispose]";
+      try {
+        debug2(`${tag} deleting database %s`, CLOUDFLARE_SHADOW_DATABASE_ID);
+        const response = await client.delete(`${D1_API_BASE_URL}/${CLOUDFLARE_SHADOW_DATABASE_ID}`).json();
+        debug2(`${tag} %O`, response);
+        if (!response.success) {
+          onUnsuccessfulD1HTTPResponse(response);
+        }
+      } catch (e) {
+        onGenericD1HTTPError(e);
+      }
+    };
+    return new PrismaD1HTTPAdapter(this.params, dispose);
   }
 };
 export {
-  PrismaD1,
+  PrismaD1AdapterFactory as PrismaD1,
   PrismaD1HTTPAdapterFactory as PrismaD1HTTP
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/adapter-d1",
-  "version": "6.11.0-dev.43",
+  "version": "6.11.0-dev.5",
   "description": "Prisma's driver adapter for Cloudflare D1",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -37,14 +37,10 @@
   "dependencies": {
     "@cloudflare/workers-types": "4.20250214.0",
     "ky": "1.7.5",
-    "@prisma/driver-adapter-utils": "6.11.0-dev.43"
-  },
-  "devDependencies": {
-    "vitest": "3.0.9"
+    "@prisma/driver-adapter-utils": "6.11.0-dev.5"
   },
   "scripts": {
     "dev": "DEV=true tsx helpers/build.ts",
-    "build": "tsx helpers/build.ts",
-    "test": "vitest run"
+    "build": "tsx helpers/build.ts"
   }
 }