chore: Prisma 7

biome.json

@@ -7,6 +7,6 @@
         "@lokalise/biome-config/configs/biome-package.jsonc"
     ],
     "files": {
-        "includes": ["**", "!**/dist", "!**/coverage"]
+        "includes": ["**", "!**/dist", "!**/coverage", "!packages/app/prisma-utils/test/db-client"]
     }
 }

packages/app/prisma-utils/.env

@@ -1 +1 @@
-DATABASE_URL=postgresql://testuser:pass@localhost:26257/test
+DATABASE_URL=postgresql://testuser:pass@localhost:26257/test?sslmode=no-verify

packages/app/prisma-utils/.gitignore

@@ -2,3 +2,4 @@ node_modules
 dist
 coverage
 .eslintcache
+test/db-client/**

packages/app/prisma-utils/README.md

@@ -2,26 +2,143 @@
 
 This package provides reusable helpers for Prisma query builder.
 
-# Usage
+## Installation
+
+```bash
+npm install @lokalise/prisma-utils
+```
+
+## Features
+
+### Prisma Client Factory
+
+Factory function to create a Prisma client instance with default configuration and optional Prometheus metrics integration.
+
+**Without metrics:**
+
+```typescript
+import { prismaClientFactory } from '@lokalise/prisma-utils'
+import { PrismaClient } from '@prisma/client'
+
+const prisma = prismaClientFactory(PrismaClient, {
+  // Your Prisma client options
+})
+```
+
+**With Prometheus metrics:**
+
+```typescript
+import { prismaClientFactory } from '@lokalise/prisma-utils'
+import { PrismaClient } from '@prisma/client'
+import * as promClient from 'prom-client'
+
+const prisma = prismaClientFactory(
+  PrismaClient,
+  {
+    // Your Prisma client options
+  },
+  { promClient }
+)
+```
+
+The factory automatically:
+- Sets default transaction isolation level to `ReadCommitted`
+- Extends the client with Prometheus metrics when `promClient` is provided
+
+#### Prisma Metrics Collection
+
+When you provide `promClient` to the factory, the following metrics are automatically collected:
+
+- **`prisma_queries_total`**: Total number of Prisma queries executed
+  - Labels: `model`, `operation`, `status` (success/error)
+- **`prisma_query_duration_seconds`**: Duration of Prisma queries in seconds
+  - Labels: `model`, `operation`
+  - Buckets: [0.001, 0.005, 0.01, 0.05, 0.1, 0.5, 1, 5]
+- **`prisma_errors_total`**: Total number of Prisma query errors
+  - Labels: `model`, `operation`, `error_code`
+
+These metrics are automatically exposed through the Prometheus registry and can be scraped by your monitoring system.
+
+### Prisma Transactions
+
+Helper for executing Prisma transactions with intelligent automatic retry mechanism, optimized for distributed databases like CockroachDB.
+
+#### Basic Usage
+
+**With multiple operations:**
 
 ```typescript
 import { prismaTransaction } from '@lokalise/prisma-utils'
+import type { Either } from '@lokalise/node-core'
 
-const result: Either<unknown, [Item, Segment]> = await prismaTransaction(prisma, [
-	prisma.item.create({ data: TEST_ITEM_1 }),
-	prisma.segment.create({ data: TEST_SEGMENT_1 }),
-])
+const result: Either<unknown, [Item, Segment]> = await prismaTransaction(
+  prisma,
+  { dbDriver: 'CockroachDb' },
+  [
+    prisma.item.create({ data: { value: 'item-1' } }),
+    prisma.segment.create({ data: { name: 'segment-1' } }),
+  ]
+)
 ```
 
-This implementation will retry the transaction on P2034 error, which satisfies Prisma recommendations for distributed databases such as CockroachDB.
+**With transaction callback:**
+
+```typescript
+const result: Either<unknown, User> = await prismaTransaction(
+  prisma,
+  { dbDriver: 'CockroachDb' },
+  async (tx) => {
+    const user = await tx.user.create({ data: { name: 'John' } })
+    await tx.profile.create({ data: { userId: user.id, bio: 'Developer' } })
+    return user
+  }
+)
+```
 
-### Prisma metrics plugin
+#### Automatic Retry Mechanism
 
-Plugin to collect and send metrics to prometheus. Prisma metrics will be added to our app metrics.
+The transaction helper automatically retries on the following error conditions:
 
-Add the plugin to your Fastify instance by registering it with the following options:
+**Prisma Error Codes:**
+- **P2034**: Write conflict / Serialization failure (common in distributed databases)
+- **P2028**: Transaction API error
+- **P1017**: Server closed the connection
+
+**CockroachDB-specific:**
+- Automatically detects and retries CockroachDB retry transaction errors.
+
+#### Retry Strategy
+
+1. **Exponential Backoff**: Delay between retries increases exponentially
+   - Formula: `2^(retry-1) × baseRetryDelayMs`
+   - Example: 100ms → 200ms → 400ms → 800ms...
+
+2. **Smart Timeout Adjustment**: If transaction times out (P2028 with "transaction is closed"), the timeout is 
+ automatically doubled on retry (up to `maxTimeout`)
+
+3. **Configurable Options**:
+
+```typescript
+const result = await prismaTransaction(
+  prisma,
+  {
+    dbDriver: 'CockroachDb',       // Enable CockroachDB-specific retries
+    retriesAllowed: 2,             // Default: 2 (total 3 attempts)
+    baseRetryDelayMs: 100,         // Default: 100ms
+    maxRetryDelayMs: 30000,        // Default: 30s (max delay between retries)
+    timeout: 5000,                 // Default: 5s (transaction timeout)
+    maxTimeout: 30000,             // Default: 30s (max transaction timeout)
+  },
+  [
+    // Your transaction operations
+  ]
+)
+```
 
-- `isEnabled`;
-- `collectionOptions` (by default we collect metrics `every 5 seconds`) to override default collector behaviour
+#### Why This Matters
 
-Once the plugin has been added to your Fastify instance and loaded, we will start collection prisma metrics.
+Distributed databases like CockroachDB use optimistic concurrency control, which can result in serialization errors 
+when multiple transactions compete for the same resources. This helper abstracts away the complexity of handling these 
+errors, providing a robust and efficient way to ensure your transactions succeed even under high contention.
+By automatically retrying failed transactions with an intelligent backoff strategy, you can significantly improve the 
+reliability and performance of your application when using distributed databases.

packages/app/prisma-utils/docker-compose.yml

@@ -10,4 +10,10 @@ services:
       - COCKROACH_PASSWORD=pass
       - COCKROACH_USER=testuser
       - COCKROACH_DATABASE=test
+    healthcheck:
+      test: [ "CMD-SHELL", "cockroach sql --host=127.0.0.1:26257 --certs-dir=certs -e 'SELECT 1;' || exit 1" ]
+      interval: 3s   # run check every 3 seconds
+      timeout: 5s    # fail if longer than 5s
+      retries: 10    # require 10 consecutive failures before unhealthy
+      start_period: 10s # grace period for initialization
     restart: on-failure

packages/app/prisma-utils/package.json

@@ -23,37 +23,34 @@
         "clean": "rimraf dist",
         "lint": "biome check . && tsc",
         "lint:fix": "biome check --write",
-        "db:migration:dev": "prisma migrate dev",
+        "db:migration:dev": "prisma migrate dev --config=./prisma/prisma.config",
         "db:update-client": "prisma generate",
-        "db:wait": "while ! echo \"SELECT 1;\" | prisma db execute --stdin --schema prisma/schema.prisma; do sleep 1; done",
         "test": "vitest run",
-        "test:migrate": "cross-env NODE_ENV=test prisma migrate reset --force",
-        "pretest:ci": "docker compose up -d && npm run db:wait && npm run test:migrate",
+        "test:migrate": "cross-env NODE_ENV=test prisma migrate reset --config=./prisma/prisma.config --force",
+        "pretest:ci": "docker compose up -d --wait && npm run test:migrate",
         "test:ci": "npm run test",
         "posttest:ci": "docker compose down",
         "prepublishOnly": "npm run build",
         "package-version": "echo $npm_package_version",
         "postversion": "biome check --write package.json"
     },
-    "dependencies": {
-        "@lokalise/node-core": "^14.4.2"
-    },
     "peerDependencies": {
-        "@prisma/client": ">=5.0.0 <7.0.0",
-        "prisma": ">=5.0.0 <7.0.0"
+        "@lokalise/node-core": ">=14.7.4",
+        "@prisma/client": "^7.0.0",
+        "prisma": "^7.0.0",
+        "prom-client": ">=15.0.0"
     },
     "devDependencies": {
         "@biomejs/biome": "^2.3.7",
         "@lokalise/biome-config": "^3.1.0",
-        "@lokalise/fastify-extras": "30.7.0",
         "@lokalise/tsconfig": "^3.1.0",
-        "@prisma/client": "~6.19.0",
+        "@prisma/adapter-pg": "^7.4.0",
+        "@prisma/client": "^7.4.0",
         "@vitest/coverage-v8": "^4.0.15",
         "cross-env": "^10.0.0",
-        "prisma": "~6.19.0",
+        "prisma": "^7.4.0",
         "rimraf": "^6.0.1",
         "typescript": "5.9.3",
-        "vitest": "^4.0.15",
-        "zod": "^4.3.6"
+        "vitest": "^4.0.15"
     }
 }

packages/app/prisma-utils/prisma/prisma.config.ts

@@ -0,0 +1,11 @@
+import 'dotenv/config'
+import { defineConfig, env } from 'prisma/config'
+
+// biome-ignore lint/style/noDefaultExport: prisma config requires default export
+export default defineConfig({
+  datasource: { url: env('DATABASE_URL') },
+  schema: './schema.prisma',
+  migrations: {
+    path: './migrations',
+  },
+})

packages/app/prisma-utils/prisma/schema.prisma

@@ -1,17 +1,16 @@
 // This is your Prisma schema file,
 // learn more about it in the docs: https://pris.ly/d/prisma-schema
 
-generator client {
-  provider        = "prisma-client-js"
-  previewFeatures = ["metrics"]
-}
-
 datasource db {
   provider     = "cockroachdb"
-  url          = env("DATABASE_URL")
   relationMode = "prisma"
 }
 
+generator client {
+  provider = "prisma-client"
+  output   = "../test/db-client"
+}
+
 model Item1 {
   id    String @id @unique @default(dbgenerated("gen_random_ulid()")) @db.Uuid
   value String

packages/app/prisma-utils/src/errors/cockroachdbError.spec.ts

@@ -1,4 +1,4 @@
-import { PrismaClientKnownRequestError } from '@prisma/client/runtime/library'
+import { PrismaClientKnownRequestError } from '@prisma/client/runtime/client'
 import { describe, expect, it } from 'vitest'
 import { isCockroachDBRetryTransaction } from './cockroachdbError.ts'
 import { PRISMA_SERIALIZATION_ERROR } from './prismaError.ts'

packages/app/prisma-utils/src/errors/cockroachdbError.ts

@@ -1,4 +1,4 @@
-import type { PrismaClientKnownRequestError } from '@prisma/client/runtime/library'
+import type { PrismaClientKnownRequestError } from '@prisma/client/runtime/client'
 
 /**
  * https://www.cockroachlabs.com/docs/stable/transaction-retry-error-reference#:~:text=To%20indicate%20that%20a%20transaction,the%20string%20%22restart%20transaction%22%20.

packages/app/prisma-utils/src/errors/prismaError.ts

@@ -1,5 +1,5 @@
 import { isError } from '@lokalise/node-core'
-import type { PrismaClientKnownRequestError } from '@prisma/client/runtime/library'
+import type { PrismaClientKnownRequestError } from '@prisma/client/runtime/client'
 
 /**
  * What is checked?