prisma-extension-kysely 3.0.0 → 4.0.0

package/README.md

@@ -2,11 +2,15 @@
 
 [![npm version](https://badge.fury.io/js/prisma-extension-kysely.svg)](https://badge.fury.io/js/prisma-extension-kysely)
 [![npm downloads](https://img.shields.io/npm/dm/prisma-extension-kysely.svg)](https://www.npmjs.com/package/prisma-extension-kysely)
-[![GitHub license](https://img.shields.io/github/license/eoin-obrien/prisma-extension-kysely.svg)](https://www.npmjs.com/package/prisma-extension-kysely)
+[![npm type definitions](https://img.shields.io/npm/types/prisma-extension-kysely)](https://www.npmjs.com/package/prisma-extension-kysely)
+[![Bundle size](https://img.shields.io/bundlephobia/minzip/prisma-extension-kysely)](https://bundlephobia.com/package/prisma-extension-kysely)
 [![Node.js CI](https://github.com/eoin-obrien/prisma-extension-kysely/actions/workflows/ci.yml/badge.svg)](https://github.com/eoin-obrien/prisma-extension-kysely/actions/workflows/ci.yml)
-[![Node.js Package](https://github.com/eoin-obrien/prisma-extension-kysely/actions/workflows/npm-publish.yml/badge.svg)](https://github.com/eoin-obrien/prisma-extension-kysely/actions/workflows/npm-publish.yml)
 [![codecov](https://codecov.io/gh/eoin-obrien/prisma-extension-kysely/graph/badge.svg?token=C18C7BGISJ)](https://codecov.io/gh/eoin-obrien/prisma-extension-kysely)
-[![Maintainability](https://api.codeclimate.com/v1/badges/241b8b2b35abafc8af6e/maintainability)](https://codeclimate.com/github/eoin-obrien/prisma-extension-kysely/maintainability)
+[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-%23FE5196?logo=conventionalcommits&logoColor=white)](https://conventionalcommits.org)
+[![GitHub license](https://img.shields.io/github/license/eoin-obrien/prisma-extension-kysely.svg)](https://github.com/eoin-obrien/prisma-extension-kysely/blob/main/LICENSE)
+
+> [!IMPORTANT]
+> **v4.0 now requires Prisma 7.** Prisma 7 makes driver adapters a required part of `PrismaClient` — see the [Prisma 7 upgrade guide](https://www.prisma.io/docs/guides/upgrade-prisma-orm/v7) to migrate your project. If you are on Prisma 5 or 6, continue using `prisma-extension-kysely` v3.
 
 Writing and maintaining raw SQL queries for Prisma can be a tedious and error-prone task. The moment you need to write a query that is not supported out-of-the-box by Prisma, you lose all of that type-safety and autocompletion. This is where `prisma-extension-kysely` comes in! It allows you to easily write raw SQL queries in a type-safe manner with [`kysely`](https://kysely.dev/) and integrate them seamlessly with Prisma.
 
@@ -27,9 +31,14 @@ You don't have to take our word for it, though:
 - **Autocompletion** — Get autocompletion for your queries in your IDE
 - **Type inference** — Get type inference for your queries in your IDE
 
-## Get started
+## Compatibility
 
-Click the **Use this template** button and provide details for your Client extension
+| prisma-extension-kysely | Prisma       | Kysely         |
+| ----------------------- | ------------ | -------------- |
+| v3.x                    | ^5.0 \| ^6.0 | ^0.27 \| ^0.28 |
+| v4.x                    | ^7.0         | ^0.27 \| ^0.28 |
+
+## Get started
 
 Install the dependencies:
 
@@ -37,6 +46,12 @@ Install the dependencies:
 npm install prisma-extension-kysely kysely
 ```
 
+Install the driver adapter for your database. For example, for PostgreSQL:
+
+```shell
+npm install @prisma/adapter-pg pg
+```
+
 Set up the excellent [`prisma-kysely`](https://www.npmjs.com/package/prisma-kysely) library to automatically generate types for your database:
 
 ```shell
@@ -60,10 +75,21 @@ npx prisma generate
 Extend your Prisma Client:
 
 ```typescript
+import { PrismaPg } from "@prisma/adapter-pg";
+import {
+  Kysely,
+  PostgresAdapter,
+  PostgresIntrospector,
+  PostgresQueryCompiler,
+} from "kysely";
 import kyselyExtension from "prisma-extension-kysely";
-import type { DB } from "./prisma/generated/types";
+import type { DB } from "./generated/kysely/types"; // Your path may vary depending on your setup in schema.prisma
+
+const adapter = new PrismaPg({
+  connectionString: process.env.DATABASE_URL,
+});
 
-const prisma = new PrismaClient().$extends(
+const prisma = new PrismaClient({ adapter }).$extends(
   kyselyExtension({
     kysely: (driver) =>
       new Kysely<DB>({
@@ -104,7 +130,7 @@ await prisma.$kysely.deleteFrom("User").where("id", "=", id).execute();
 
 ## Transactions
 
-Prisma's interactive transactions are fully supported by `prisma-extension-kysely`! Just remeber to use `tx.$kysely` instead of `prisma.$kysely`, and you're good to go:
+Prisma's interactive transactions are fully supported by `prisma-extension-kysely`! Just remember to use `tx.$kysely` instead of `prisma.$kysely`, and you're good to go:
 
 ```typescript
 await prisma.$transaction(async (tx) => {
@@ -132,7 +158,11 @@ await prisma.$kysely.transaction().execute(async (trx) => {});
 Do you love Kysely's plugins? So do we! You can use them with `prisma-extension-kysely` as well:
 
 ```typescript
-const prisma = new PrismaClient().$extends(
+const adapter = new PrismaPg({
+  connectionString: process.env.DATABASE_URL,
+});
+
+const prisma = new PrismaClient({ adapter }).$extends(
   kyselyExtension({
     kysely: (driver) =>
       new Kysely<DB>({
@@ -172,22 +202,28 @@ const kyselyExtensionArgs: PrismaKyselyExtensionArgs<DB> = {
   kysely: (driver) =>
     new Kysely<DB>({
       dialect: {
-        createAdapter: () => new SqliteAdapter(),
+        createAdapter: () => new PostgresAdapter(),
         createDriver: () => driver,
-        createIntrospector: (db) => new SqliteIntrospector(db),
-        createQueryCompiler: () => new SqliteQueryCompiler(),
+        createIntrospector: (db) => new PostgresIntrospector(db),
+        createQueryCompiler: () => new PostgresQueryCompiler(),
       },
     }),
 };
 
-// Initialize the replica client(s) and add the Kysely extension
-const replicaClient = new PrismaClient({
-  datasourceUrl: "YOUR_REPLICA_URL", // Replace this with your replica's URL!
-  log: [{ level: "query", emit: "event" }],
-}).$extends(kyselyExtension(kyselyExtensionArgs));
+// Initialize the replica client(s) with its own adapter and add the Kysely extension
+const replicaAdapter = new PrismaPg({
+  connectionString: process.env.REPLICA_DATABASE_URL,
+});
+const replicaClient = new PrismaClient({ adapter: replicaAdapter }).$extends(
+  kyselyExtension(kyselyExtensionArgs),
+);
 
-// Initialize the primary client and add the Kysely extension and the read replicas extension
-const prisma = new PrismaClient()
+// Initialize the primary client with its own adapter, then add the Kysely
+// extension and the read replicas extension
+const primaryAdapter = new PrismaPg({
+  connectionString: process.env.DATABASE_URL,
+});
+const prisma = new PrismaClient({ adapter: primaryAdapter })
   .$extends(kyselyExtension(kyselyExtensionArgs)) // Apply the Kysely extension before the read replicas extension!
   .$extends(
     readReplicas({
@@ -197,19 +233,12 @@ const prisma = new PrismaClient()
 ```
 
 See how we're setting up the replica client as a fully-fledged Prisma client and extending it separately? That's the secret sauce!
-It make sure that the replica client has a separate Kysely instance. If you try to use bare URLs, you'll run into trouble;
+It makes sure that the replica client has a separate Kysely instance. If you try to use bare URLs, you'll run into trouble;
 it'll share the same Kysely instance as the primary client, and you'll get unpleasant surprises!
 
-```typescript
-// Don't do this! It won't work as expected.
-readReplicas({
-  url: "postgresql://user:password@localhost:5432/dbname",
-});
-```
-
 Also, note that we're applying the Kysely extension before the read replicas extension. This is important! If you apply the read replicas extension first, you won't get `.$kysely` on the primary client.
 
-Check out the [read replicas example](examples/read-replicas/) for a runnable example!
+Check out the [read replicas example](examples/read-replica/) for a runnable example!
 
 ## Examples
 
@@ -218,14 +247,14 @@ Check out the [examples](examples) directory for a sample project!
 ```shell
 cd examples/basic
 npm install
-npx prisma db push
-npm run dev
+npm start
 ```
 
 ## Learn more
 
 - [Kysely](https://kysely.dev/)
 - [`prisma-kysely`](https://www.npmjs.com/package/prisma-kysely)
+- [Prisma 7 upgrade guide](https://www.prisma.io/docs/guides/upgrade-prisma-orm/v7)
 
 ## License
 

package/dist/cjs/connection.d.ts

@@ -1,5 +1,5 @@
-import { PrismaClient } from "@prisma/client/extension";
-import { CompiledQuery, DatabaseConnection, QueryResult } from "kysely";
+import type { PrismaClient } from "@prisma/client/extension";
+import { type CompiledQuery, type DatabaseConnection, type QueryResult } from "kysely";
 /**
  * A Kysely database connection that uses Prisma as the driver
  */

package/dist/cjs/connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../src/connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EACL,aAAa,EACb,kBAAkB,EAGlB,WAAW,EAEZ,MAAM,QAAQ,CAAC;AAEhB;;GAEG;AACH,qBAAa,gBAAiB,YAAW,kBAAkB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,YAAY;IAE3C,YAAY,CAAC,CAAC,EAClB,aAAa,EAAE,aAAa,CAAC,OAAO,CAAC,GACpC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IA2B1B,WAAW,CAAC,CAAC,EACX,cAAc,EAAE,aAAa,CAAC,OAAO,CAAC,EACtC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,GAC9B,qBAAqB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;CAKzC"}
+{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../src/connection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,kBAAkB,EAGvB,KAAK,WAAW,EAEjB,MAAM,QAAQ,CAAC;AAEhB;;GAEG;AACH,qBAAa,gBAAiB,YAAW,kBAAkB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,YAAY;IAE3C,YAAY,CAAC,CAAC,EAClB,aAAa,EAAE,aAAa,CAAC,OAAO,CAAC,GACpC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IA2C1B,WAAW,CAAC,CAAC,EACX,cAAc,EAAE,aAAa,CAAC,OAAO,CAAC,EACtC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,GAC9B,qBAAqB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;CAKzC"}

package/dist/cjs/connection.js

@@ -20,24 +20,38 @@ class PrismaConnection {
     }
     executeQuery(compiledQuery) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const { sql, parameters, query } = compiledQuery;
+            // Capture the caller stack trace to provide better error messages when a query fails
+            const callerStack = {};
+            Error.captureStackTrace(callerStack, PrismaConnection.prototype.executeQuery);
             // Delete, update and insert queries return the number of affected rows if no returning clause is specified
             const supportsReturning = kysely_1.DeleteQueryNode.is(query) ||
                 kysely_1.UpdateQueryNode.is(query) ||
                 kysely_1.InsertQueryNode.is(query);
             const shouldReturnAffectedRows = supportsReturning && !query.returning;
-            // Execute the query with $executeRawUnsafe to get the number of affected rows
-            if (shouldReturnAffectedRows) {
-                const numAffectedRows = BigInt(yield this.prisma.$executeRawUnsafe(sql, ...parameters));
-                return {
-                    rows: [],
-                    numAffectedRows: numAffectedRows,
-                    numUpdatedOrDeletedRows: numAffectedRows,
-                };
+            try {
+                // Execute the query with $executeRawUnsafe to get the number of affected rows
+                if (shouldReturnAffectedRows) {
+                    const numAffectedRows = BigInt(yield this.prisma.$executeRawUnsafe(sql, ...parameters));
+                    return {
+                        rows: [],
+                        numAffectedRows: numAffectedRows,
+                    };
+                }
+                // Otherwise, execute it with $queryRawUnsafe to get the query results
+                const rows = yield this.prisma.$queryRawUnsafe(sql, ...parameters);
+                return { rows };
+            }
+            catch (err) {
+                if (err instanceof Error && callerStack.stack) {
+                    err.stack =
+                        ((_a = err.stack) !== null && _a !== void 0 ? _a : "") +
+                            "\nFrom prisma-extension-kysely:\n" +
+                            callerStack.stack;
+                }
+                throw err;
             }
-            // Otherwise, execute it with $queryRawUnsafe to get the query results
-            const rows = yield this.prisma.$queryRawUnsafe(sql, ...parameters);
-            return { rows };
         });
     }
     streamQuery(_compiledQuery, _chunkSize) {

package/dist/cjs/driver.d.ts

@@ -1,5 +1,5 @@
 import type { PrismaClient } from "@prisma/client/extension";
-import { DatabaseConnection, Driver, TransactionSettings } from "kysely";
+import type { DatabaseConnection, Driver, TransactionSettings } from "kysely";
 export declare class PrismaDriver<T extends PrismaClient> implements Driver {
     private readonly prisma;
     constructor(prisma: T);

package/dist/cjs/driver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/driver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAGzE,qBAAa,YAAY,CAAC,CAAC,SAAS,YAAY,CAAE,YAAW,MAAM;IACrD,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,CAAC;IAEhC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAErB,iBAAiB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAIhD,gBAAgB,CACpB,WAAW,EAAE,kBAAkB,EAC/B,SAAS,EAAE,mBAAmB,GAC7B,OAAO,CAAC,IAAI,CAAC;IAIV,iBAAiB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjE,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAInE,iBAAiB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAEjE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAC/B"}
+{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/driver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAG9E,qBAAa,YAAY,CAAC,CAAC,SAAS,YAAY,CAAE,YAAW,MAAM;IACrD,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,CAAC;IAEhC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAErB,iBAAiB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAIhD,gBAAgB,CACpB,WAAW,EAAE,kBAAkB,EAC/B,SAAS,EAAE,mBAAmB,GAC7B,OAAO,CAAC,IAAI,CAAC;IAIV,iBAAiB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjE,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAInE,iBAAiB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAEjE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAC/B"}

package/dist/cjs/index.d.ts

@@ -1,4 +1,4 @@
-import { Kysely } from "kysely";
+import type { Kysely } from "kysely";
 import { PrismaDriver } from "./driver.js";
 /**
  * The configuration object for the Prisma Kysely extension
@@ -16,17 +16,11 @@ export declare class PrismaKyselyExtensionError extends Error {
  * Define a Prisma extension that adds Kysely query builder methods to the Prisma client
  * @param extensionArgs The extension configuration object
  */
-declare const _default: <Database>(extensionArgs: PrismaKyselyExtensionArgs<Database>) => (client: any) => {
-    $extends: {
-        extArgs: {
-            result: {};
-            model: {};
-            query: {};
-            client: {
-                $kysely: () => Kysely<Database>;
-            };
-        };
-    };
-};
+declare const _default: <Database>(extensionArgs: PrismaKyselyExtensionArgs<Database>) => (client: any) => import("@prisma/client/extension").PrismaClientExtends<import("@prisma/client/runtime/client.js").InternalArgs<{}, {}, {}, {
+    /**
+     * The Kysely instance used by the Prisma client
+     */
+    $kysely: Kysely<Database>;
+}> & import("@prisma/client/runtime/client.js").DefaultArgs>;
 export default _default;
 //# sourceMappingURL=index.d.ts.map

package/dist/cjs/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C;;GAEG;AACH,MAAM,MAAM,yBAAyB,CAAC,QAAQ,IAAI;IAChD;;OAEG;IAEH,MAAM,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,KAAK,MAAM,CAAC,QAAQ,CAAC,CAAC;CAC7D,CAAC;AAEF,qBAAa,0BAA2B,SAAQ,KAAK;gBACvC,OAAO,EAAE,MAAM;CAI5B;AAED;;;GAGG;yBACa,QAAQ,iBAAiB,yBAAyB,CAAC,QAAQ,CAAC;;;;;;;;;;;;AAA5E,wBAsDK"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C;;GAEG;AACH,MAAM,MAAM,yBAAyB,CAAC,QAAQ,IAAI;IAChD;;OAEG;IACH,MAAM,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,KAAK,MAAM,CAAC,QAAQ,CAAC,CAAC;CAC7D,CAAC;AAEF,qBAAa,0BAA2B,SAAQ,KAAK;gBACvC,OAAO,EAAE,MAAM;CAI5B;AAED;;;GAGG;yBACa,QAAQ,EAAE,eAAe,yBAAyB,CAAC,QAAQ,CAAC;IAepE;;OAEG;;;AAjBX,wBA0DK"}

package/dist/cjs/index.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PrismaKyselyExtensionError = void 0;
-const client_1 = require("@prisma/client");
+const extension_1 = require("@prisma/client/extension");
 const driver_js_1 = require("./driver.js");
 class PrismaKyselyExtensionError extends Error {
     constructor(message) {
@@ -23,7 +23,7 @@ exports.PrismaKyselyExtensionError = PrismaKyselyExtensionError;
  * Define a Prisma extension that adds Kysely query builder methods to the Prisma client
  * @param extensionArgs The extension configuration object
  */
-exports.default = (extensionArgs) => client_1.Prisma.defineExtension((client) => {
+exports.default = (extensionArgs) => extension_1.Prisma.defineExtension((client) => {
     // Check if the client is already extended
     if ("$kysely" in client) {
         throw new PrismaKyselyExtensionError("The Prisma client is already extended with Kysely");
@@ -42,12 +42,13 @@ exports.default = (extensionArgs) => client_1.Prisma.defineExtension((client) =>
     // Wrap the $transaction method to attach a fresh Kysely instance to the transaction client
     const kyselyTransaction = (target) => (...args) => {
         if (typeof args[0] === "function") {
-            // If the first argument is a function, add a fresh Kysely instance to the transaction client
             const [fn, options] = args;
             return target.$transaction((tx) => __awaiter(void 0, void 0, void 0, function* () {
                 // The Kysely instance should call the transaction client, not the original client
                 const driver = new driver_js_1.PrismaDriver(tx);
                 const kysely = extensionArgs.kysely(driver);
+                // Attach the Kysely instance to the transaction client so that it can be accessed in the transaction function
+                // biome-ignore lint/suspicious/noExplicitAny: @prisma/client/extension types $transaction overloads differently
                 tx.$kysely = kysely;
                 return fn(tx);
             }), options);

package/dist/cjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-extension-kysely",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "author": {
     "name": "Eoin O'Brien",
     "url": "https://eoin.ai",
@@ -31,23 +31,23 @@
   ],
   "type": "commonjs",
   "files": [
-    "dist"
+    "dist",
+    "!**/*.tsbuildinfo"
   ],
   "scripts": {
-    "pretest": "prisma db push",
-    "test": "jest",
-    "test:watch": "npm run test -- --watch",
-    "test:coverage": "npm run test -- --coverage",
+    "pretest": "prisma db push && prisma generate",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "pretest:coverage": "prisma db push && prisma generate",
+    "test:coverage": "vitest run --coverage",
     "build:clean": "rm -rf ./dist",
     "build:compile": "tsc -b tsconfig.json tsconfig.cjs.json && tsconfig-to-dual-package",
     "build": "npm run build:clean && npm run build:compile",
     "prepack": "npm run build",
-    "prepare": "husky install",
+    "prepare": "husky || true",
     "commit": "git-cz",
-    "lint": "eslint .",
-    "lint:fix": "eslint --fix .",
-    "format": "prettier --write .",
-    "format:check": "prettier --check ."
+    "check": "biome check .",
+    "check:write": "biome check --write ."
   },
   "config": {
     "commitizen": {
@@ -55,31 +55,30 @@
     }
   },
   "peerDependencies": {
-    "@prisma/client": "latest"
+    "@prisma/client": "^7.0.0",
+    "kysely": "^0.27.0 || ^0.28.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^18.4.3",
-    "@commitlint/config-conventional": "^18.4.3",
-    "@commitlint/cz-commitlint": "^18.4.3",
-    "@prisma/client": "latest",
-    "@prisma/extension-read-replicas": "^0.4.0",
-    "@types/jest": "^29.5.10",
-    "@typescript-eslint/eslint-plugin": "^8.0.0",
-    "@typescript-eslint/parser": "^8.0.0",
+    "@biomejs/biome": "^2.4.4",
+    "@commitlint/cli": "^20.0.0",
+    "@commitlint/config-conventional": "^20.0.0",
+    "@commitlint/cz-commitlint": "^20.0.0",
+    "@prisma/adapter-better-sqlite3": "^7.4.1",
+    "@prisma/client": "^7.0.0",
+    "@prisma/extension-read-replicas": "^0.5.0",
+    "@semantic-release/changelog": "^6.0.0",
+    "@semantic-release/git": "^10.0.0",
+    "@vitest/coverage-v8": "^3.0.0",
     "commitizen": "^4.3.0",
-    "eslint": "^9.0.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-require-extensions": "^0.1.3",
+    "dotenv": "^17.3.1",
     "husky": "^9.0.0",
-    "inquirer": "^8.2.6",
-    "jest": "^29.7.0",
-    "jest-mock-extended": "^3.0.5",
-    "kysely": "^0.27.0",
-    "prettier": "3.3.3",
-    "prisma": "latest",
-    "prisma-kysely": "^1.7.1",
-    "ts-jest": "^29.1.1",
+    "inquirer": "^9.0.0",
+    "kysely": "^0.28.0",
+    "prisma": "^7.0.0",
+    "prisma-kysely": "^3.0.0",
+    "semantic-release": "^25.0.3",
     "tsconfig-to-dual-package": "^1.2.0",
-    "typescript": "^5.0.0"
+    "typescript": "^5.0.0",
+    "vitest": "^3.0.0"
   }
 }

package/dist/esm/connection.d.ts

@@ -1,5 +1,5 @@
-import { PrismaClient } from "@prisma/client/extension";
-import { CompiledQuery, DatabaseConnection, QueryResult } from "kysely";
+import type { PrismaClient } from "@prisma/client/extension";
+import { type CompiledQuery, type DatabaseConnection, type QueryResult } from "kysely";
 /**
  * A Kysely database connection that uses Prisma as the driver
  */

package/dist/esm/connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../src/connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EACL,aAAa,EACb,kBAAkB,EAGlB,WAAW,EAEZ,MAAM,QAAQ,CAAC;AAEhB;;GAEG;AACH,qBAAa,gBAAiB,YAAW,kBAAkB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,YAAY;IAE3C,YAAY,CAAC,CAAC,EAClB,aAAa,EAAE,aAAa,CAAC,OAAO,CAAC,GACpC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IA2B1B,WAAW,CAAC,CAAC,EACX,cAAc,EAAE,aAAa,CAAC,OAAO,CAAC,EACtC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,GAC9B,qBAAqB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;CAKzC"}
+{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../src/connection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,kBAAkB,EAGvB,KAAK,WAAW,EAEjB,MAAM,QAAQ,CAAC;AAEhB;;GAEG;AACH,qBAAa,gBAAiB,YAAW,kBAAkB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,YAAY;IAE3C,YAAY,CAAC,CAAC,EAClB,aAAa,EAAE,aAAa,CAAC,OAAO,CAAC,GACpC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IA2C1B,WAAW,CAAC,CAAC,EACX,cAAc,EAAE,aAAa,CAAC,OAAO,CAAC,EACtC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,GAC9B,qBAAqB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;CAKzC"}

package/dist/esm/connection.js

@@ -17,24 +17,38 @@ export class PrismaConnection {
     }
     executeQuery(compiledQuery) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const { sql, parameters, query } = compiledQuery;
+            // Capture the caller stack trace to provide better error messages when a query fails
+            const callerStack = {};
+            Error.captureStackTrace(callerStack, PrismaConnection.prototype.executeQuery);
             // Delete, update and insert queries return the number of affected rows if no returning clause is specified
             const supportsReturning = DeleteQueryNode.is(query) ||
                 UpdateQueryNode.is(query) ||
                 InsertQueryNode.is(query);
             const shouldReturnAffectedRows = supportsReturning && !query.returning;
-            // Execute the query with $executeRawUnsafe to get the number of affected rows
-            if (shouldReturnAffectedRows) {
-                const numAffectedRows = BigInt(yield this.prisma.$executeRawUnsafe(sql, ...parameters));
-                return {
-                    rows: [],
-                    numAffectedRows: numAffectedRows,
-                    numUpdatedOrDeletedRows: numAffectedRows,
-                };
+            try {
+                // Execute the query with $executeRawUnsafe to get the number of affected rows
+                if (shouldReturnAffectedRows) {
+                    const numAffectedRows = BigInt(yield this.prisma.$executeRawUnsafe(sql, ...parameters));
+                    return {
+                        rows: [],
+                        numAffectedRows: numAffectedRows,
+                    };
+                }
+                // Otherwise, execute it with $queryRawUnsafe to get the query results
+                const rows = yield this.prisma.$queryRawUnsafe(sql, ...parameters);
+                return { rows };
+            }
+            catch (err) {
+                if (err instanceof Error && callerStack.stack) {
+                    err.stack =
+                        ((_a = err.stack) !== null && _a !== void 0 ? _a : "") +
+                            "\nFrom prisma-extension-kysely:\n" +
+                            callerStack.stack;
+                }
+                throw err;
             }
-            // Otherwise, execute it with $queryRawUnsafe to get the query results
-            const rows = yield this.prisma.$queryRawUnsafe(sql, ...parameters);
-            return { rows };
         });
     }
     streamQuery(_compiledQuery, _chunkSize) {

package/dist/esm/driver.d.ts

@@ -1,5 +1,5 @@
 import type { PrismaClient } from "@prisma/client/extension";
-import { DatabaseConnection, Driver, TransactionSettings } from "kysely";
+import type { DatabaseConnection, Driver, TransactionSettings } from "kysely";
 export declare class PrismaDriver<T extends PrismaClient> implements Driver {
     private readonly prisma;
     constructor(prisma: T);

package/dist/esm/driver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/driver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAGzE,qBAAa,YAAY,CAAC,CAAC,SAAS,YAAY,CAAE,YAAW,MAAM;IACrD,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,CAAC;IAEhC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAErB,iBAAiB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAIhD,gBAAgB,CACpB,WAAW,EAAE,kBAAkB,EAC/B,SAAS,EAAE,mBAAmB,GAC7B,OAAO,CAAC,IAAI,CAAC;IAIV,iBAAiB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjE,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAInE,iBAAiB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAEjE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAC/B"}
+{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/driver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAG9E,qBAAa,YAAY,CAAC,CAAC,SAAS,YAAY,CAAE,YAAW,MAAM;IACrD,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,CAAC;IAEhC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAErB,iBAAiB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAIhD,gBAAgB,CACpB,WAAW,EAAE,kBAAkB,EAC/B,SAAS,EAAE,mBAAmB,GAC7B,OAAO,CAAC,IAAI,CAAC;IAIV,iBAAiB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjE,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAInE,iBAAiB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAEjE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAC/B"}

package/dist/esm/index.d.ts

@@ -1,4 +1,4 @@
-import { Kysely } from "kysely";
+import type { Kysely } from "kysely";
 import { PrismaDriver } from "./driver.js";
 /**
  * The configuration object for the Prisma Kysely extension
@@ -16,17 +16,11 @@ export declare class PrismaKyselyExtensionError extends Error {
  * Define a Prisma extension that adds Kysely query builder methods to the Prisma client
  * @param extensionArgs The extension configuration object
  */
-declare const _default: <Database>(extensionArgs: PrismaKyselyExtensionArgs<Database>) => (client: any) => {
-    $extends: {
-        extArgs: {
-            result: {};
-            model: {};
-            query: {};
-            client: {
-                $kysely: () => Kysely<Database>;
-            };
-        };
-    };
-};
+declare const _default: <Database>(extensionArgs: PrismaKyselyExtensionArgs<Database>) => (client: any) => import("@prisma/client/extension").PrismaClientExtends<import("@prisma/client/runtime/client.js").InternalArgs<{}, {}, {}, {
+    /**
+     * The Kysely instance used by the Prisma client
+     */
+    $kysely: Kysely<Database>;
+}> & import("@prisma/client/runtime/client.js").DefaultArgs>;
 export default _default;
 //# sourceMappingURL=index.d.ts.map

package/dist/esm/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C;;GAEG;AACH,MAAM,MAAM,yBAAyB,CAAC,QAAQ,IAAI;IAChD;;OAEG;IAEH,MAAM,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,KAAK,MAAM,CAAC,QAAQ,CAAC,CAAC;CAC7D,CAAC;AAEF,qBAAa,0BAA2B,SAAQ,KAAK;gBACvC,OAAO,EAAE,MAAM;CAI5B;AAED;;;GAGG;yBACa,QAAQ,iBAAiB,yBAAyB,CAAC,QAAQ,CAAC;;;;;;;;;;;;AAA5E,wBAsDK"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C;;GAEG;AACH,MAAM,MAAM,yBAAyB,CAAC,QAAQ,IAAI;IAChD;;OAEG;IACH,MAAM,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,KAAK,MAAM,CAAC,QAAQ,CAAC,CAAC;CAC7D,CAAC;AAEF,qBAAa,0BAA2B,SAAQ,KAAK;gBACvC,OAAO,EAAE,MAAM;CAI5B;AAED;;;GAGG;yBACa,QAAQ,EAAE,eAAe,yBAAyB,CAAC,QAAQ,CAAC;IAepE;;OAEG;;;AAjBX,wBA0DK"}

package/dist/esm/index.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { Prisma } from "@prisma/client";
+import { Prisma } from "@prisma/client/extension";
 import { PrismaDriver } from "./driver.js";
 export class PrismaKyselyExtensionError extends Error {
     constructor(message) {
@@ -38,12 +38,13 @@ export default (extensionArgs) => Prisma.defineExtension((client) => {
     // Wrap the $transaction method to attach a fresh Kysely instance to the transaction client
     const kyselyTransaction = (target) => (...args) => {
         if (typeof args[0] === "function") {
-            // If the first argument is a function, add a fresh Kysely instance to the transaction client
             const [fn, options] = args;
             return target.$transaction((tx) => __awaiter(void 0, void 0, void 0, function* () {
                 // The Kysely instance should call the transaction client, not the original client
                 const driver = new PrismaDriver(tx);
                 const kysely = extensionArgs.kysely(driver);
+                // Attach the Kysely instance to the transaction client so that it can be accessed in the transaction function
+                // biome-ignore lint/suspicious/noExplicitAny: @prisma/client/extension types $transaction overloads differently
                 tx.$kysely = kysely;
                 return fn(tx);
             }), options);

package/dist/esm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-extension-kysely",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "author": {
     "name": "Eoin O'Brien",
     "url": "https://eoin.ai",
@@ -31,23 +31,23 @@
   ],
   "type": "module",
   "files": [
-    "dist"
+    "dist",
+    "!**/*.tsbuildinfo"
   ],
   "scripts": {
-    "pretest": "prisma db push",
-    "test": "jest",
-    "test:watch": "npm run test -- --watch",
-    "test:coverage": "npm run test -- --coverage",
+    "pretest": "prisma db push && prisma generate",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "pretest:coverage": "prisma db push && prisma generate",
+    "test:coverage": "vitest run --coverage",
     "build:clean": "rm -rf ./dist",
     "build:compile": "tsc -b tsconfig.json tsconfig.cjs.json && tsconfig-to-dual-package",
     "build": "npm run build:clean && npm run build:compile",
     "prepack": "npm run build",
-    "prepare": "husky install",
+    "prepare": "husky || true",
     "commit": "git-cz",
-    "lint": "eslint .",
-    "lint:fix": "eslint --fix .",
-    "format": "prettier --write .",
-    "format:check": "prettier --check ."
+    "check": "biome check .",
+    "check:write": "biome check --write ."
   },
   "config": {
     "commitizen": {
@@ -55,31 +55,30 @@
     }
   },
   "peerDependencies": {
-    "@prisma/client": "latest"
+    "@prisma/client": "^7.0.0",
+    "kysely": "^0.27.0 || ^0.28.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^18.4.3",
-    "@commitlint/config-conventional": "^18.4.3",
-    "@commitlint/cz-commitlint": "^18.4.3",
-    "@prisma/client": "latest",
-    "@prisma/extension-read-replicas": "^0.4.0",
-    "@types/jest": "^29.5.10",
-    "@typescript-eslint/eslint-plugin": "^8.0.0",
-    "@typescript-eslint/parser": "^8.0.0",
+    "@biomejs/biome": "^2.4.4",
+    "@commitlint/cli": "^20.0.0",
+    "@commitlint/config-conventional": "^20.0.0",
+    "@commitlint/cz-commitlint": "^20.0.0",
+    "@prisma/adapter-better-sqlite3": "^7.4.1",
+    "@prisma/client": "^7.0.0",
+    "@prisma/extension-read-replicas": "^0.5.0",
+    "@semantic-release/changelog": "^6.0.0",
+    "@semantic-release/git": "^10.0.0",
+    "@vitest/coverage-v8": "^3.0.0",
     "commitizen": "^4.3.0",
-    "eslint": "^9.0.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-require-extensions": "^0.1.3",
+    "dotenv": "^17.3.1",
     "husky": "^9.0.0",
-    "inquirer": "^8.2.6",
-    "jest": "^29.7.0",
-    "jest-mock-extended": "^3.0.5",
-    "kysely": "^0.27.0",
-    "prettier": "3.3.3",
-    "prisma": "latest",
-    "prisma-kysely": "^1.7.1",
-    "ts-jest": "^29.1.1",
+    "inquirer": "^9.0.0",
+    "kysely": "^0.28.0",
+    "prisma": "^7.0.0",
+    "prisma-kysely": "^3.0.0",
+    "semantic-release": "^25.0.3",
     "tsconfig-to-dual-package": "^1.2.0",
-    "typescript": "^5.0.0"
+    "typescript": "^5.0.0",
+    "vitest": "^3.0.0"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prisma-extension-kysely",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "author": {
     "name": "Eoin O'Brien",
     "url": "https://eoin.ai",
@@ -48,23 +48,23 @@
     "./package.json": "./package.json"
   },
   "files": [
-    "dist"
+    "dist",
+    "!**/*.tsbuildinfo"
   ],
   "scripts": {
-    "pretest": "prisma db push",
-    "test": "jest",
-    "test:watch": "npm run test -- --watch",
-    "test:coverage": "npm run test -- --coverage",
+    "pretest": "prisma db push && prisma generate",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "pretest:coverage": "prisma db push && prisma generate",
+    "test:coverage": "vitest run --coverage",
     "build:clean": "rm -rf ./dist",
     "build:compile": "tsc -b tsconfig.json tsconfig.cjs.json && tsconfig-to-dual-package",
     "build": "npm run build:clean && npm run build:compile",
     "prepack": "npm run build",
-    "prepare": "husky install",
+    "prepare": "husky || true",
     "commit": "git-cz",
-    "lint": "eslint .",
-    "lint:fix": "eslint --fix .",
-    "format": "prettier --write .",
-    "format:check": "prettier --check ."
+    "check": "biome check .",
+    "check:write": "biome check --write ."
   },
   "config": {
     "commitizen": {
@@ -72,31 +72,30 @@
     }
   },
   "peerDependencies": {
-    "@prisma/client": "latest"
+    "@prisma/client": "^7.0.0",
+    "kysely": "^0.27.0 || ^0.28.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^18.4.3",
-    "@commitlint/config-conventional": "^18.4.3",
-    "@commitlint/cz-commitlint": "^18.4.3",
-    "@prisma/client": "latest",
-    "@prisma/extension-read-replicas": "^0.4.0",
-    "@types/jest": "^29.5.10",
-    "@typescript-eslint/eslint-plugin": "^8.0.0",
-    "@typescript-eslint/parser": "^8.0.0",
+    "@biomejs/biome": "^2.4.4",
+    "@commitlint/cli": "^20.0.0",
+    "@commitlint/config-conventional": "^20.0.0",
+    "@commitlint/cz-commitlint": "^20.0.0",
+    "@prisma/adapter-better-sqlite3": "^7.4.1",
+    "@prisma/client": "^7.0.0",
+    "@prisma/extension-read-replicas": "^0.5.0",
+    "@semantic-release/changelog": "^6.0.0",
+    "@semantic-release/git": "^10.0.0",
+    "@vitest/coverage-v8": "^3.0.0",
     "commitizen": "^4.3.0",
-    "eslint": "^9.0.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-require-extensions": "^0.1.3",
+    "dotenv": "^17.3.1",
     "husky": "^9.0.0",
-    "inquirer": "^8.2.6",
-    "jest": "^29.7.0",
-    "jest-mock-extended": "^3.0.5",
-    "kysely": "^0.27.0",
-    "prettier": "3.3.3",
-    "prisma": "latest",
-    "prisma-kysely": "^1.7.1",
-    "ts-jest": "^29.1.1",
+    "inquirer": "^9.0.0",
+    "kysely": "^0.28.0",
+    "prisma": "^7.0.0",
+    "prisma-kysely": "^3.0.0",
+    "semantic-release": "^25.0.3",
     "tsconfig-to-dual-package": "^1.2.0",
-    "typescript": "^5.0.0"
+    "typescript": "^5.0.0",
+    "vitest": "^3.0.0"
   }
 }

package/dist/cjs/tsconfig.cjs.tsbuildinfo

@@ -1 +0,0 @@
-{"root":["../../src/connection.ts","../../src/driver.ts","../../src/index.ts"],"version":"5.6.3"}

package/dist/esm/tsconfig.tsbuildinfo

@@ -1 +0,0 @@
-{"root":["../../src/connection.ts","../../src/driver.ts","../../src/index.ts"],"version":"5.6.3"}