@prisma/adapter-planetscale 5.20.0-dev.2 → 5.20.0-dev.21

package/dist/index.d.mts

@@ -5,9 +5,9 @@ import type { Query } from '@prisma/driver-adapter-utils';
 import type { Queryable } from '@prisma/driver-adapter-utils';
 import type { Result } from '@prisma/driver-adapter-utils';
 import type { ResultSet } from '@prisma/driver-adapter-utils';
-import type { Transaction } from '@prisma/driver-adapter-utils';
+import type { TransactionContext } from '@prisma/driver-adapter-utils';
 
-declare class PlanetScaleQueryable<ClientT extends planetScale.Client | planetScale.Transaction> implements Queryable {
+declare class PlanetScaleQueryable<ClientT extends planetScale.Client | planetScale.Transaction | planetScale.Connection> implements Queryable {
     protected client: ClientT;
     readonly provider = "mysql";
     readonly adapterName: string;
@@ -33,7 +33,7 @@ declare class PlanetScaleQueryable<ClientT extends planetScale.Client | planetSc
 export declare class PrismaPlanetScale extends PlanetScaleQueryable<planetScale.Client> implements DriverAdapter {
     constructor(client: planetScale.Client);
     getConnectionInfo(): Result<ConnectionInfo>;
-    startTransaction(): Promise<Result<Transaction>>;
+    transactionContext(): Promise<Result<TransactionContext>>;
 }
 
 export { }

package/dist/index.d.ts

@@ -5,9 +5,9 @@ import type { Query } from '@prisma/driver-adapter-utils';
 import type { Queryable } from '@prisma/driver-adapter-utils';
 import type { Result } from '@prisma/driver-adapter-utils';
 import type { ResultSet } from '@prisma/driver-adapter-utils';
-import type { Transaction } from '@prisma/driver-adapter-utils';
+import type { TransactionContext } from '@prisma/driver-adapter-utils';
 
-declare class PlanetScaleQueryable<ClientT extends planetScale.Client | planetScale.Transaction> implements Queryable {
+declare class PlanetScaleQueryable<ClientT extends planetScale.Client | planetScale.Transaction | planetScale.Connection> implements Queryable {
     protected client: ClientT;
     readonly provider = "mysql";
     readonly adapterName: string;
@@ -33,7 +33,7 @@ declare class PlanetScaleQueryable<ClientT extends planetScale.Client | planetSc
 export declare class PrismaPlanetScale extends PlanetScaleQueryable<planetScale.Client> implements DriverAdapter {
     constructor(client: planetScale.Client);
     getConnectionInfo(): Result<ConnectionInfo>;
-    startTransaction(): Promise<Result<Transaction>>;
+    transactionContext(): Promise<Result<TransactionContext>>;
 }
 
 export { }

package/dist/index.js

@@ -44,6 +44,20 @@ var name = "@prisma/adapter-planetscale";
 // src/conversion.ts
 var import_database = require("@planetscale/database");
 var import_driver_adapter_utils = require("@prisma/driver-adapter-utils");
+
+// src/text.ts
+var decoder = new TextDecoder("utf-8");
+function decodeUtf8(text) {
+  return text ? decoder.decode(uint8Array(text)) : "";
+}
+function uint8Array(text) {
+  return Uint8Array.from(bytes(text));
+}
+function bytes(text) {
+  return text.split("").map((c) => c.charCodeAt(0));
+}
+
+// src/conversion.ts
 function fieldToColumnType(field) {
   switch (field) {
     case "INT8":
@@ -97,7 +111,7 @@ function fieldToColumnType(field) {
 }
 var cast = (field, value) => {
   if (field.type === "JSON") {
-    return value;
+    return typeof value === "string" && value.length ? decodeUtf8(value) : value;
   }
   const defaultValue = (0, import_database.cast)(field, value);
   if (defaultValue instanceof Uint8Array) {
@@ -216,40 +230,27 @@ var PlanetScaleTransaction = class extends PlanetScaleQueryable {
   async commit() {
     debug(`[js::commit]`);
     this.txDeferred.resolve();
-    return Promise.resolve((0, import_driver_adapter_utils2.ok)(await this.txResultPromise));
+    return (0, import_driver_adapter_utils2.ok)(await this.txResultPromise);
   }
   async rollback() {
     debug(`[js::rollback]`);
     this.txDeferred.reject(new RollbackError());
-    return Promise.resolve((0, import_driver_adapter_utils2.ok)(await this.txResultPromise));
+    return (0, import_driver_adapter_utils2.ok)(await this.txResultPromise);
   }
 };
-var PrismaPlanetScale = class extends PlanetScaleQueryable {
-  constructor(client) {
-    if (!(client instanceof planetScale.Client)) {
-      throw new TypeError(`PrismaPlanetScale must be initialized with an instance of Client:
-import { Client } from '@planetscale/database'
-const client = new Client({ url })
-const adapter = new PrismaPlanetScale(client)
-`);
-    }
-    super(client);
-  }
-  getConnectionInfo() {
-    const url = this.client.connection()["url"];
-    const dbName = new URL(url).pathname.slice(1);
-    return (0, import_driver_adapter_utils2.ok)({
-      schemaName: dbName
-    });
+var PlanetScaleTransactionContext = class extends PlanetScaleQueryable {
+  constructor(conn) {
+    super(conn);
+    this.conn = conn;
   }
   async startTransaction() {
     const options = {
       usePhantomQuery: true
     };
     const tag = "[js::startTransaction]";
-    debug(`${tag} options: %O`, options);
+    debug("%s options: %O", tag, options);
     return new Promise((resolve, reject) => {
-      const txResultPromise = this.client.transaction(async (tx) => {
+      const txResultPromise = this.conn.transaction(async (tx) => {
         const [txDeferred, deferredPromise] = createDeferred();
         const txWrapper = new PlanetScaleTransaction(tx, options, txDeferred, txResultPromise);
         resolve((0, import_driver_adapter_utils2.ok)(txWrapper));
@@ -263,6 +264,30 @@ const adapter = new PrismaPlanetScale(client)
     });
   }
 };
+var PrismaPlanetScale = class extends PlanetScaleQueryable {
+  constructor(client) {
+    if (!(client instanceof planetScale.Client)) {
+      throw new TypeError(`PrismaPlanetScale must be initialized with an instance of Client:
+import { Client } from '@planetscale/database'
+const client = new Client({ url })
+const adapter = new PrismaPlanetScale(client)
+`);
+    }
+    super(client);
+  }
+  getConnectionInfo() {
+    const url = this.client.connection()["url"];
+    const dbName = new URL(url).pathname.slice(1);
+    return (0, import_driver_adapter_utils2.ok)({
+      schemaName: dbName
+    });
+  }
+  async transactionContext() {
+    const conn = this.client.connection();
+    const ctx = new PlanetScaleTransactionContext(conn);
+    return (0, import_driver_adapter_utils2.ok)(ctx);
+  }
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PrismaPlanetScale

package/dist/index.mjs

@@ -8,6 +8,20 @@ var name = "@prisma/adapter-planetscale";
 // src/conversion.ts
 import { cast as defaultCast } from "@planetscale/database";
 import { ColumnTypeEnum } from "@prisma/driver-adapter-utils";
+
+// src/text.ts
+var decoder = new TextDecoder("utf-8");
+function decodeUtf8(text) {
+  return text ? decoder.decode(uint8Array(text)) : "";
+}
+function uint8Array(text) {
+  return Uint8Array.from(bytes(text));
+}
+function bytes(text) {
+  return text.split("").map((c) => c.charCodeAt(0));
+}
+
+// src/conversion.ts
 function fieldToColumnType(field) {
   switch (field) {
     case "INT8":
@@ -61,7 +75,7 @@ function fieldToColumnType(field) {
 }
 var cast = (field, value) => {
   if (field.type === "JSON") {
-    return value;
+    return typeof value === "string" && value.length ? decodeUtf8(value) : value;
   }
   const defaultValue = defaultCast(field, value);
   if (defaultValue instanceof Uint8Array) {
@@ -180,40 +194,27 @@ var PlanetScaleTransaction = class extends PlanetScaleQueryable {
   async commit() {
     debug(`[js::commit]`);
     this.txDeferred.resolve();
-    return Promise.resolve(ok(await this.txResultPromise));
+    return ok(await this.txResultPromise);
   }
   async rollback() {
     debug(`[js::rollback]`);
     this.txDeferred.reject(new RollbackError());
-    return Promise.resolve(ok(await this.txResultPromise));
+    return ok(await this.txResultPromise);
   }
 };
-var PrismaPlanetScale = class extends PlanetScaleQueryable {
-  constructor(client) {
-    if (!(client instanceof planetScale.Client)) {
-      throw new TypeError(`PrismaPlanetScale must be initialized with an instance of Client:
-import { Client } from '@planetscale/database'
-const client = new Client({ url })
-const adapter = new PrismaPlanetScale(client)
-`);
-    }
-    super(client);
-  }
-  getConnectionInfo() {
-    const url = this.client.connection()["url"];
-    const dbName = new URL(url).pathname.slice(1);
-    return ok({
-      schemaName: dbName
-    });
+var PlanetScaleTransactionContext = class extends PlanetScaleQueryable {
+  constructor(conn) {
+    super(conn);
+    this.conn = conn;
   }
   async startTransaction() {
     const options = {
       usePhantomQuery: true
     };
     const tag = "[js::startTransaction]";
-    debug(`${tag} options: %O`, options);
+    debug("%s options: %O", tag, options);
     return new Promise((resolve, reject) => {
-      const txResultPromise = this.client.transaction(async (tx) => {
+      const txResultPromise = this.conn.transaction(async (tx) => {
         const [txDeferred, deferredPromise] = createDeferred();
         const txWrapper = new PlanetScaleTransaction(tx, options, txDeferred, txResultPromise);
         resolve(ok(txWrapper));
@@ -227,6 +228,30 @@ const adapter = new PrismaPlanetScale(client)
     });
   }
 };
+var PrismaPlanetScale = class extends PlanetScaleQueryable {
+  constructor(client) {
+    if (!(client instanceof planetScale.Client)) {
+      throw new TypeError(`PrismaPlanetScale must be initialized with an instance of Client:
+import { Client } from '@planetscale/database'
+const client = new Client({ url })
+const adapter = new PrismaPlanetScale(client)
+`);
+    }
+    super(client);
+  }
+  getConnectionInfo() {
+    const url = this.client.connection()["url"];
+    const dbName = new URL(url).pathname.slice(1);
+    return ok({
+      schemaName: dbName
+    });
+  }
+  async transactionContext() {
+    const conn = this.client.connection();
+    const ctx = new PlanetScaleTransactionContext(conn);
+    return ok(ctx);
+  }
+};
 export {
   PrismaPlanetScale
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/adapter-planetscale",
-  "version": "5.20.0-dev.2",
+  "version": "5.20.0-dev.21",
   "description": "Prisma's driver adapter for \"@planetscale/database\"",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -31,7 +31,7 @@
   "license": "Apache-2.0",
   "sideEffects": false,
   "dependencies": {
-    "@prisma/driver-adapter-utils": "5.20.0-dev.2"
+    "@prisma/driver-adapter-utils": "5.20.0-dev.21"
   },
   "devDependencies": {
     "@planetscale/database": "1.18.0",