Use ./generated Prisma folder, update types to fix issues

Author: matt-aitken

apps/webapp/app/db.server.ts

@@ -1,18 +1,18 @@
 import {
   Prisma,
   PrismaClient,
-  PrismaClientOrTransaction,
-  PrismaReplicaClient,
-  PrismaTransactionClient,
-  PrismaTransactionOptions,
+  $transaction as transac,
+  type PrismaClientOrTransaction,
+  type PrismaReplicaClient,
+  type PrismaTransactionClient,
+  type PrismaTransactionOptions,
 } from "@trigger.dev/database";
 import invariant from "tiny-invariant";
 import { z } from "zod";
 import { env } from "./env.server";
 import { logger } from "./services/logger.server";
 import { isValidDatabaseUrl } from "./utils/db";
 import { singleton } from "./utils/singleton";
-import { $transaction as transac } from "@trigger.dev/database";
 import { startActiveSpan } from "./v3/tracer.server";
 import { Span } from "@opentelemetry/api";
 

apps/webapp/app/routes/api.v1.projects.$projectRef.background-workers.$envSlug.$version.ts

@@ -82,9 +82,9 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
   });
 }
 
-function decompressContent(compressedBuffer: Buffer): string {
-  // First, we need to decode the base64 Buffer to get the actual compressed data
-  const decodedBuffer = Buffer.from(compressedBuffer.toString("utf-8"), "base64");
+function decompressContent(compressedBuffer: Uint8Array): string {
+  // Convert Uint8Array to Buffer and decode base64 in one step
+  const decodedBuffer = Buffer.from(Buffer.from(compressedBuffer).toString("utf-8"), "base64");
 
   // Decompress the data
   const decompressedData = zlib.inflateSync(decodedBuffer);

internal-packages/database/.gitignore

@@ -1,3 +1,5 @@
 node_modules
 # Ensure the .env symlink is not removed by accident
 !.env
+
+generated/prisma

internal-packages/database/package.json

@@ -5,9 +5,11 @@
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {
-    "@prisma/client": "6.14.0"
+    "@prisma/client": "6.14.0",
+    "decimal.js": "^10.6.0"
   },
   "devDependencies": {
+    "@types/decimal.js": "^7.4.3",
     "prisma": "6.14.0",
     "rimraf": "6.0.1"
   },

internal-packages/database/prisma/schema.prisma

@@ -6,7 +6,7 @@ datasource db {
 
 generator client {
   provider        = "prisma-client-js"
-  output          = "../node_modules/.prisma/client"
+  output          = "../generated/prisma"
   binaryTargets   = ["native", "debian-openssl-1.1.x"]
   previewFeatures = ["metrics"]
 }

internal-packages/database/src/index.ts

@@ -1,2 +1,2 @@
-export * from "@prisma/client";
+export * from "../generated/prisma";
 export * from "./transaction";

internal-packages/database/src/transaction.ts

@@ -1,4 +1,13 @@
-import { Prisma, PrismaClient } from "@prisma/client";
+import { PrismaClient } from "../generated/prisma";
+import { Decimal } from "decimal.js";
+import { PrismaClientKnownRequestError } from "@prisma/client/runtime/library";
+
+// Define the isolation levels manually
+type TransactionIsolationLevel =
+  | "ReadUncommitted"
+  | "ReadCommitted"
+  | "RepeatableRead"
+  | "Serializable";
 
 export type PrismaTransactionClient = Omit<
   PrismaClient,
@@ -9,13 +18,13 @@ export type PrismaClientOrTransaction = PrismaClient | PrismaTransactionClient;
 
 export type PrismaReplicaClient = Omit<PrismaClient, "$transaction">;
 
-export const Decimal = Prisma.Decimal;
+export { Decimal };
 
 function isTransactionClient(prisma: PrismaClientOrTransaction): prisma is PrismaTransactionClient {
   return !("$transaction" in prisma);
 }
 
-export function isPrismaKnownError(error: unknown): error is Prisma.PrismaClientKnownRequestError {
+export function isPrismaKnownError(error: unknown): error is PrismaClientKnownRequestError {
   return (
     typeof error === "object" && error !== null && "code" in error && typeof error.code === "string"
   );
@@ -55,7 +64,7 @@ export type PrismaTransactionOptions = {
   timeout?: number;
 
   /**  Sets the transaction isolation level. By default this is set to the value currently configured in your database. */
-  isolationLevel?: Prisma.TransactionIsolationLevel;
+  isolationLevel?: TransactionIsolationLevel;
 
   swallowPrismaErrors?: boolean;
 
@@ -70,7 +79,7 @@ export type PrismaTransactionOptions = {
 export async function $transaction<R>(
   prisma: PrismaClientOrTransaction,
   fn: (prisma: PrismaTransactionClient) => Promise<R>,
-  prismaError: (error: Prisma.PrismaClientKnownRequestError) => void,
+  prismaError: (error: PrismaClientKnownRequestError) => void,
   options?: PrismaTransactionOptions,
   attempt = 0
 ): Promise<R | undefined> {