Support Prisma's official multi-file schema structure

Author: jackall3n

.changeset/unlucky-ghosts-do.md

@@ -0,0 +1,5 @@
+---
+"@trigger.dev/build": minor
+---
+
+Support Prisma's official multi-file schema structure

docs/config/extensions/prismaExtension.mdx

@@ -10,8 +10,7 @@ If you are using Prisma, you should use the prisma build extension.
 - Generates the Prisma client during the deploy process
 - Optionally will migrate the database during the deploy process
 - Support for TypedSQL and multiple schema files
-- You can use `prismaSchemaFolder` to specify just the directory containing your schema file, instead of the full path
-- You can add the extension twice if you have multiple separate schemas in the same project (example below)
+- You can set the schema to be a folder to use Prisma's multi-file schema feature (example [below](#multiple-schemas))
 
 You can use it for a simple Prisma setup like this:
 
@@ -141,17 +140,32 @@ These environment variables are only used during the build process and are not e
 
 ### Multiple schemas
 
-If you have multiple separate schemas in the same project you can add the extension multiple times:
+Prisma supports splitting your schema into multiple files. To use this, set `schema` to be the folder that contains your root schema (e.g. `schema.prisma`).
 
-```ts
-prismaExtension({
-  schema: 'prisma/schema/main.prisma',
-  version: '6.2.0',
-  migrate: false,
-}),
+For example, if your root schema is located at `./prisma/schema.prisma`, you would set the `schema` option to `prisma`:
+
+<CodeGroup>
+
+```ts trigger.config.ts
 prismaExtension({
-  schema: 'prisma/schema/secondary.prisma',
-  version: '6.2.0',
+  schema: 'prisma',
+  version: '6.7.0',
   migrate: false,
 }),
 ```
+
+```shell Example structure
+./prisma
+├── migrations
+├── models
+│   ├── posts.prisma
+│   ├── users.prisma
+│   └── ... other `.prisma` files
+└── schema.prisma
+```
+
+</CodeGroup>
+
+<Note>
+    To use this feature you must be using `[email protected]` or higher. Their official documentation can be found [here](https://www.prisma.io/docs/orm/prisma-schema/overview/location#multi-file-prisma-schema).
+</Note>

packages/build/package.json

@@ -78,6 +78,7 @@
   },
   "dependencies": {
     "@trigger.dev/core": "workspace:4.0.0",
+    "fast-glob": "^3.3.3",
     "pkg-types": "^1.1.3",
     "tinyglobby": "^0.2.2",
     "tsconfck": "3.1.3"

packages/build/src/extensions/prisma.ts

@@ -1,6 +1,7 @@
 import { BuildManifest, BuildTarget } from "@trigger.dev/core/v3";
 import { binaryForRuntime, BuildContext, BuildExtension } from "@trigger.dev/core/v3/build";
 import assert from "node:assert";
+import { glob } from 'tinyglobby';
 import { existsSync } from "node:fs";
 import { cp, readdir } from "node:fs/promises";
 import { dirname, join, resolve } from "node:path";
@@ -112,11 +113,18 @@ export class PrismaExtension implements BuildExtension {
 
     context.logger.debug(`PrismaExtension is generating the Prisma client for version ${version}`);
 
-    const usingSchemaFolder = dirname(this._resolvedSchemaPath).endsWith("schema");
+    // Multi-file schemas can be used by specifying a directory instead of a file. https://www.prisma.io/docs/orm/prisma-schema/overview/location#multi-file-prisma-schema
+    const usingSchemaFolder = !this._resolvedSchemaPath.endsWith(".prisma");
+
+    context.logger.debug(`Using schema folder: ${usingSchemaFolder}`);
 
     const commands: string[] = [];
 
-    let prismaDir: string | undefined;
+    const prismaSourceDir = usingSchemaFolder
+      ? this._resolvedSchemaPath
+      : dirname(this._resolvedSchemaPath);
+
+    const prismaDestinationDir = join(manifest.outputPath, "prisma");
 
     const generatorFlags: string[] = [];
 
@@ -127,26 +135,22 @@ export class PrismaExtension implements BuildExtension {
     if (this.options.typedSql) {
       generatorFlags.push(`--sql`);
 
-      const prismaDir = usingSchemaFolder
-        ? dirname(dirname(this._resolvedSchemaPath))
-        : dirname(this._resolvedSchemaPath);
-
       context.logger.debug(`Using typedSql`);
 
       // Find all the files prisma/sql/*.sql
-      const sqlFiles = await readdir(join(prismaDir, "sql")).then((files) =>
+      const sqlFiles = await readdir(join(prismaSourceDir, "sql")).then((files) =>
         files.filter((file) => file.endsWith(".sql"))
       );
 
       context.logger.debug(`Found sql files`, {
         sqlFiles,
       });
 
-      const sqlDestinationPath = join(manifest.outputPath, "prisma", "sql");
+      const sqlDestinationPath = join(prismaDestinationDir, "sql");
 
       for (const file of sqlFiles) {
         const destination = join(sqlDestinationPath, file);
-        const source = join(prismaDir, "sql", file);
+        const source = join(prismaSourceDir, "sql", file);
 
         context.logger.debug(`Copying the sql from ${source} to ${destination}`);
 
@@ -155,28 +159,20 @@ export class PrismaExtension implements BuildExtension {
     }
 
     if (usingSchemaFolder) {
-      const schemaDir = dirname(this._resolvedSchemaPath);
-
-      prismaDir = dirname(schemaDir);
-
-      context.logger.debug(`Using the schema folder: ${schemaDir}`);
+      context.logger.debug(`Using the schema folder: ${this._resolvedSchemaPath}`);
 
       // Find all the files in schemaDir that end with .prisma (excluding the schema.prisma file)
-      const prismaFiles = await readdir(schemaDir).then((files) =>
-        files.filter((file) => file.endsWith(".prisma"))
-      );
+      const prismaFiles = await glob(["**/*.prisma"], {
+        cwd: this._resolvedSchemaPath
+      })
 
       context.logger.debug(`Found prisma files in the schema folder`, {
         prismaFiles,
       });
 
-      const schemaDestinationPath = join(manifest.outputPath, "prisma", "schema");
-
-      const allPrismaFiles = [...prismaFiles];
-
-      for (const file of allPrismaFiles) {
-        const destination = join(schemaDestinationPath, file);
-        const source = join(schemaDir, file);
+      for (const file of prismaFiles) {
+        const destination = join(prismaDestinationDir, file);
+        const source = join(this._resolvedSchemaPath, file);
 
         context.logger.debug(`Copying the prisma schema from ${source} to ${destination}`);
 
@@ -186,15 +182,14 @@ export class PrismaExtension implements BuildExtension {
       commands.push(
         `${binaryForRuntime(
           manifest.runtime
-        )} node_modules/prisma/build/index.js generate ${generatorFlags.join(" ")}` // Don't add the --schema flag or this will fail
+        )} node_modules/prisma/build/index.js generate --schema ./prisma ${generatorFlags.join(" ")}`
       );
     } else {
-      prismaDir = dirname(this._resolvedSchemaPath);
       // Now we need to add a layer that:
       // Copies the prisma schema to the build outputPath
       // Adds the `prisma` CLI dependency to the dependencies
       // Adds the `prisma generate` command, which generates the Prisma client
-      const schemaDestinationPath = join(manifest.outputPath, "prisma", "schema.prisma");
+      const schemaDestinationPath = join(prismaDestinationDir, "schema.prisma");
       // Copy the prisma schema to the build output path
       context.logger.debug(
         `Copying the prisma schema from ${this._resolvedSchemaPath} to ${schemaDestinationPath}`
@@ -215,8 +210,8 @@ export class PrismaExtension implements BuildExtension {
 
     if (this.options.migrate) {
       // Copy the migrations directory to the build output path
-      const migrationsDir = join(prismaDir, "migrations");
-      const migrationsDestinationPath = join(manifest.outputPath, "prisma", "migrations");
+      const migrationsDir = join(prismaSourceDir, "migrations");
+      const migrationsDestinationPath = join(prismaDestinationDir, "migrations");
 
       context.logger.debug(
         `Copying the prisma migrations from ${migrationsDir} to ${migrationsDestinationPath}`

pnpm-lock.yaml

@@ -20,7 +20,7 @@
     "@effect/schema": "^0.75.5",
     "@infisical/sdk": "^2.3.5",
     "@opentelemetry/api": "1.4.1",
-    "@prisma/client": "5.19.0",
+    "@prisma/client": "6.8.2",
     "@react-email/components": "0.0.24",
     "@react-email/render": "1.0.1",
     "@sentry/esbuild-plugin": "^2.22.2",
@@ -87,7 +87,7 @@
     "@types/fluent-ffmpeg": "^2.1.26",
     "@types/react": "^18.3.1",
     "esbuild": "^0.19.11",
-    "prisma": "5.19.0",
+    "prisma": "6.8.2",
     "prisma-kysely": "^1.8.0",
     "trigger.dev": "workspace:*",
     "ts-node": "^10.9.2",

references/v3-catalog/package.json

@@ -6,7 +6,7 @@
 
 generator client {
   provider        = "prisma-client-js"
-  previewFeatures = ["prismaSchemaFolder", "typedSql"]
+  previewFeatures = ["typedSql"]
 }
 
 datasource db {

references/v3-catalog/prisma/schema/post.prisma renamed to references/v3-catalog/prisma/models/post.prisma

@@ -42,7 +42,7 @@ export default defineConfig({
       emitDecoratorMetadata(),
       audioWaveform(),
       prismaExtension({
-        schema: "prisma/schema/schema.prisma",
+        schema: "prisma",
         migrate: true,
         directUrlEnvVarName: "DATABASE_URL_UNPOOLED",
         clientGenerator: "client",