@prisma/client-generator-ts 6.6.0-dev.65 → 6.6.0-dev.67

package/dist/generator.d.ts

@@ -1,12 +1,11 @@
 import { Generator, GeneratorConfig, GeneratorManifest, GeneratorOptions } from '@prisma/generator';
 type PrismaClientTsGeneratorOptions = {
-    shouldResolvePrismaClient?: boolean;
     runtimePath?: string;
 };
 export declare class PrismaClientTsGenerator implements Generator {
     #private;
     readonly name = "prisma-client-ts";
-    constructor({ shouldResolvePrismaClient, runtimePath }?: PrismaClientTsGeneratorOptions);
+    constructor({ runtimePath }?: PrismaClientTsGeneratorOptions);
     getManifest(config: GeneratorConfig): Promise<GeneratorManifest>;
     generate(options: GeneratorOptions): Promise<void>;
 }

package/dist/index.d.mts

@@ -54,13 +54,12 @@ export declare function getDMMF(options: GetDMMFOptions): Promise<DMMF.Document>
 export declare class PrismaClientTsGenerator implements Generator_2 {
     #private;
     readonly name = "prisma-client-ts";
-    constructor({ shouldResolvePrismaClient, runtimePath }?: PrismaClientTsGeneratorOptions);
+    constructor({ runtimePath }?: PrismaClientTsGeneratorOptions);
     getManifest(config: GeneratorConfig): Promise<GeneratorManifest>;
     generate(options: GeneratorOptions): Promise<void>;
 }
 
 declare type PrismaClientTsGeneratorOptions = {
-    shouldResolvePrismaClient?: boolean;
     runtimePath?: string;
 };
 

package/dist/index.d.ts

@@ -54,13 +54,12 @@ export declare function getDMMF(options: GetDMMFOptions): Promise<DMMF.Document>
 export declare class PrismaClientTsGenerator implements Generator_2 {
     #private;
     readonly name = "prisma-client-ts";
-    constructor({ shouldResolvePrismaClient, runtimePath }?: PrismaClientTsGeneratorOptions);
+    constructor({ runtimePath }?: PrismaClientTsGeneratorOptions);
     getManifest(config: GeneratorConfig): Promise<GeneratorManifest>;
     generate(options: GeneratorOptions): Promise<void>;
 }
 
 declare type PrismaClientTsGeneratorOptions = {
-    shouldResolvePrismaClient?: boolean;
     runtimePath?: string;
 };
 

package/dist/index.js

@@ -2228,7 +2228,6 @@ var import_fetch_engine = require("@prisma/fetch-engine");
 var import_internals10 = require("@prisma/internals");
 var import_crypto2 = require("crypto");
 var import_env_paths = __toESM(require("env-paths"));
-var import_fs = require("fs");
 var import_promises = __toESM(require("fs/promises"));
 var import_fs_extra = __toESM(require_lib());
 
@@ -2500,7 +2499,7 @@ var package_default = {
     "@prisma/dmmf": "workspace:*",
     "@prisma/driver-adapter-utils": "workspace:*",
     "@prisma/engines": "workspace:*",
-    "@prisma/engines-version": "6.6.0-30.baa69bfeca2f318076d19b6ce650fd8c9b4cb452",
+    "@prisma/engines-version": "6.6.0-31.d26022ad3b55e2aa7e4ffc189436e4c59aae0c29",
     "@prisma/fetch-engine": "workspace:*",
     "@prisma/generator": "workspace:*",
     "@prisma/generator-helper": "workspace:*",
@@ -2510,8 +2509,8 @@ var package_default = {
     "@prisma/migrate": "workspace:*",
     "@prisma/mini-proxy": "0.9.5",
     "@prisma/pg-worker": "workspace:*",
-    "@prisma/query-compiler-wasm": "6.6.0-30.baa69bfeca2f318076d19b6ce650fd8c9b4cb452",
-    "@prisma/query-engine-wasm": "6.6.0-30.baa69bfeca2f318076d19b6ce650fd8c9b4cb452",
+    "@prisma/query-compiler-wasm": "6.6.0-31.d26022ad3b55e2aa7e4ffc189436e4c59aae0c29",
+    "@prisma/query-engine-wasm": "6.6.0-31.d26022ad3b55e2aa7e4ffc189436e4c59aae0c29",
     "@prisma/ts-builders": "workspace:*",
     "@snaplet/copycat": "6.0.0",
     "@swc-node/register": "1.10.9",
@@ -6775,21 +6774,6 @@ function getTypedSqlRuntimeBase(runtimeBase) {
   }
   return `../${runtimeBase}`;
 }
-async function getDefaultOutdir(outputDir) {
-  if (outputDir.endsWith(import_path3.default.normalize("node_modules/@prisma/client"))) {
-    return import_path3.default.join(outputDir, "../../.prisma/client");
-  }
-  if (process.env.INIT_CWD && process.env.npm_lifecycle_event === "postinstall" && !process.env.PWD?.includes(".pnpm")) {
-    if ((0, import_fs.existsSync)(import_path3.default.join(process.env.INIT_CWD, "package.json"))) {
-      return import_path3.default.join(process.env.INIT_CWD, "node_modules/.prisma/client");
-    }
-    const packagePath = await (0, import_pkg_up.default)({ cwd: process.env.INIT_CWD });
-    if (packagePath) {
-      return import_path3.default.join(import_path3.default.dirname(packagePath), "node_modules/.prisma/client");
-    }
-  }
-  return import_path3.default.join(outputDir, "../../.prisma/client");
-}
 async function generateClient(options) {
   const {
     datamodel,
@@ -6853,7 +6837,7 @@ To learn more about how to rename models, check out https://pris.ly/d/naming-mod
     await (0, import_fs_extra.ensureDir)(import_path3.default.join(outputDir, "deno"));
   }
   await writeFileMap(outputDir, fileMap);
-  if (copyRuntime || generator.isCustomOutput === true) {
+  if (copyRuntime) {
     const copiedRuntimeDir = import_path3.default.join(outputDir, "runtime");
     await (0, import_fs_extra.ensureDir)(copiedRuntimeDir);
     await copyRuntimeFiles({
@@ -6997,79 +6981,20 @@ function validateDmmfAgainstDenylists(prismaClientDmmf) {
   }
   return errorArray.length > 0 ? errorArray : null;
 }
-async function getGenerationDirs({
-  runtimeBase,
-  generator,
-  outputDir,
-  datamodel,
-  schemaPath,
-  testMode
-}) {
-  const isCustomOutput = generator.isCustomOutput === true;
+async function getGenerationDirs({ runtimeBase, outputDir, testMode, copyRuntime }) {
   const normalizedOutputDir = import_path3.default.normalize(outputDir);
-  let userRuntimeImport = isCustomOutput ? "./runtime" : "@prisma/client/runtime";
-  let userOutputDir = isCustomOutput ? normalizedOutputDir : await getDefaultOutdir(normalizedOutputDir);
+  let userRuntimeImport = copyRuntime ? "./runtime" : "@prisma/client/runtime";
   if (testMode && runtimeBase) {
-    userOutputDir = outputDir;
     userRuntimeImport = (0, import_internals10.pathToPosix)(runtimeBase);
   }
-  if (isCustomOutput) {
-    await verifyOutputDirectory(userOutputDir, datamodel, schemaPath);
-  }
-  const userPackageRoot = await (0, import_pkg_up.default)({ cwd: import_path3.default.dirname(userOutputDir) });
+  const userPackageRoot = await (0, import_pkg_up.default)({ cwd: import_path3.default.dirname(normalizedOutputDir) });
   const userProjectRoot = userPackageRoot ? import_path3.default.dirname(userPackageRoot) : process.cwd();
   return {
     runtimeBase: userRuntimeImport,
-    outputDir: userOutputDir,
+    outputDir: normalizedOutputDir,
     projectRoot: userProjectRoot
   };
 }
-async function verifyOutputDirectory(directory, datamodel, schemaPath) {
-  let content;
-  try {
-    content = await import_promises.default.readFile(import_path3.default.join(directory, "package.json"), "utf8");
-  } catch (e) {
-    if (e.code === "ENOENT") {
-      return;
-    }
-    throw e;
-  }
-  const { name } = JSON.parse(content);
-  if (name === package_default.name) {
-    const message = [`Generating client into ${bold(directory)} is not allowed.`];
-    message.push("This package is used by `prisma generate` and overwriting its content is dangerous.");
-    message.push("");
-    message.push("Suggestion:");
-    const outputDeclaration = findOutputPathDeclaration(datamodel);
-    if (outputDeclaration && outputDeclaration.content.includes(package_default.name)) {
-      const outputLine = outputDeclaration.content;
-      message.push(`In ${bold(schemaPath)} replace:`);
-      message.push("");
-      message.push(`${dim(outputDeclaration.lineNumber)} ${replacePackageName(outputLine, red(package_default.name))}`);
-      message.push("with");
-      message.push(`${dim(outputDeclaration.lineNumber)} ${replacePackageName(outputLine, green(".prisma/client"))}`);
-    } else {
-      message.push(`Generate client into ${bold(replacePackageName(directory, green(".prisma/client")))} instead`);
-    }
-    message.push("");
-    message.push("You won't need to change your imports.");
-    message.push("Imports from `@prisma/client` will be automatically forwarded to `.prisma/client`");
-    const error = new Error(message.join("\n"));
-    throw error;
-  }
-}
-function replacePackageName(directoryPath, replacement) {
-  return directoryPath.replace(package_default.name, replacement);
-}
-function findOutputPathDeclaration(datamodel) {
-  const lines = datamodel.split(/\r?\n/);
-  for (const [i, line] of lines.entries()) {
-    if (/output\s*=/.test(line)) {
-      return { lineNumber: i + 1, content: line.trim() };
-    }
-  }
-  return null;
-}
 function getNodeRuntimeName(engineType) {
   if (engineType === import_internals10.ClientEngineType.Binary) {
     return "binary";
@@ -7136,7 +7061,7 @@ var import_internals12 = require("@prisma/internals");
 var import_ts_pattern = require("ts-pattern");
 
 // package.json
-var version = "6.6.0-dev.65";
+var version = "6.6.0-dev.67";
 
 // src/resolvePrismaClient.ts
 var import_promises2 = __toESM(require("node:fs/promises"));
@@ -7178,36 +7103,47 @@ async function getPackageCmd(cwd, cmd, ...args) {
 
 // src/generator.ts
 var debug3 = (0, import_debug3.default)("prisma:client:generator");
+var missingOutputErrorMessage = `An output path is required for the \`prisma-client-ts\` generator. Please provide an output path in your schema file:
+
+${dim(`generator client {
+  provider = "prisma-client-ts"`)}
+${green('  output   = "../src/generated"')}
+${dim("}")}
+
+${bold("Note:")} the output path is relative to the schema directory.
+`;
+function getOutputPath(config) {
+  if (!config.output) {
+    throw new Error(missingOutputErrorMessage);
+  }
+  return (0, import_internals12.parseEnvValue)(config.output);
+}
 var PrismaClientTsGenerator = class {
   name = "prisma-client-ts";
-  #shouldResolvePrismaClient = true;
   #runtimePath;
   #cachedPrismaClientPath;
-  constructor({ shouldResolvePrismaClient = true, runtimePath } = {}) {
-    this.#shouldResolvePrismaClient = shouldResolvePrismaClient;
+  constructor({ runtimePath } = {}) {
     this.#runtimePath = runtimePath;
   }
-  async getManifest(config) {
+  getManifest(config) {
     const requiresEngines = (0, import_ts_pattern.match)((0, import_internals12.getClientEngineType)(config)).with(import_internals12.ClientEngineType.Library, () => ["libqueryEngine"]).with(import_internals12.ClientEngineType.Binary, () => ["queryEngine"]).with(import_internals12.ClientEngineType.Client, () => []).exhaustive();
     debug3("requiresEngines", requiresEngines);
-    const defaultOutput = this.#shouldResolvePrismaClient ? await this.#getPrismaClientPath(config) : ".prisma/client";
-    return {
-      defaultOutput,
+    return Promise.resolve({
+      defaultOutput: getOutputPath(config),
       prettyName: "Prisma Client",
       version,
       requiresEngines,
       requiresEngineVersion: import_engines_version.enginesVersion
-    };
+    });
   }
   async generate(options) {
-    const outputDir = (0, import_internals12.parseEnvValue)(options.generator.output);
     await generateClient({
       datamodel: options.datamodel,
       schemaPath: options.schemaPath,
       binaryPaths: options.binaryPaths,
       datasources: options.datasources,
       envPaths: options.envPaths,
-      outputDir,
+      outputDir: getOutputPath(options.generator),
       copyRuntime: Boolean(options.generator.config.copyRuntime),
       copyRuntimeSourceMaps: Boolean(process.env.PRISMA_COPY_RUNTIME_SOURCEMAPS),
       runtimeSourcePath: await this.#getRuntimePath(options.generator),

package/dist/index.mjs

@@ -2224,7 +2224,6 @@ import {
 } from "@prisma/internals";
 import { createHash } from "crypto";
 import paths from "env-paths";
-import { existsSync } from "fs";
 import fs from "fs/promises";
 
 // ../../node_modules/.pnpm/kleur@4.1.5/node_modules/kleur/colors.mjs
@@ -2495,7 +2494,7 @@ var package_default = {
     "@prisma/dmmf": "workspace:*",
     "@prisma/driver-adapter-utils": "workspace:*",
     "@prisma/engines": "workspace:*",
-    "@prisma/engines-version": "6.6.0-30.baa69bfeca2f318076d19b6ce650fd8c9b4cb452",
+    "@prisma/engines-version": "6.6.0-31.d26022ad3b55e2aa7e4ffc189436e4c59aae0c29",
     "@prisma/fetch-engine": "workspace:*",
     "@prisma/generator": "workspace:*",
     "@prisma/generator-helper": "workspace:*",
@@ -2505,8 +2504,8 @@ var package_default = {
     "@prisma/migrate": "workspace:*",
     "@prisma/mini-proxy": "0.9.5",
     "@prisma/pg-worker": "workspace:*",
-    "@prisma/query-compiler-wasm": "6.6.0-30.baa69bfeca2f318076d19b6ce650fd8c9b4cb452",
-    "@prisma/query-engine-wasm": "6.6.0-30.baa69bfeca2f318076d19b6ce650fd8c9b4cb452",
+    "@prisma/query-compiler-wasm": "6.6.0-31.d26022ad3b55e2aa7e4ffc189436e4c59aae0c29",
+    "@prisma/query-engine-wasm": "6.6.0-31.d26022ad3b55e2aa7e4ffc189436e4c59aae0c29",
     "@prisma/ts-builders": "workspace:*",
     "@snaplet/copycat": "6.0.0",
     "@swc-node/register": "1.10.9",
@@ -6773,21 +6772,6 @@ function getTypedSqlRuntimeBase(runtimeBase) {
   }
   return `../${runtimeBase}`;
 }
-async function getDefaultOutdir(outputDir) {
-  if (outputDir.endsWith(path3.normalize("node_modules/@prisma/client"))) {
-    return path3.join(outputDir, "../../.prisma/client");
-  }
-  if (process.env.INIT_CWD && process.env.npm_lifecycle_event === "postinstall" && !process.env.PWD?.includes(".pnpm")) {
-    if (existsSync(path3.join(process.env.INIT_CWD, "package.json"))) {
-      return path3.join(process.env.INIT_CWD, "node_modules/.prisma/client");
-    }
-    const packagePath = await pkgUp({ cwd: process.env.INIT_CWD });
-    if (packagePath) {
-      return path3.join(path3.dirname(packagePath), "node_modules/.prisma/client");
-    }
-  }
-  return path3.join(outputDir, "../../.prisma/client");
-}
 async function generateClient(options) {
   const {
     datamodel,
@@ -6851,7 +6835,7 @@ To learn more about how to rename models, check out https://pris.ly/d/naming-mod
     await (0, import_fs_extra.ensureDir)(path3.join(outputDir, "deno"));
   }
   await writeFileMap(outputDir, fileMap);
-  if (copyRuntime || generator.isCustomOutput === true) {
+  if (copyRuntime) {
     const copiedRuntimeDir = path3.join(outputDir, "runtime");
     await (0, import_fs_extra.ensureDir)(copiedRuntimeDir);
     await copyRuntimeFiles({
@@ -6995,79 +6979,20 @@ function validateDmmfAgainstDenylists(prismaClientDmmf) {
   }
   return errorArray.length > 0 ? errorArray : null;
 }
-async function getGenerationDirs({
-  runtimeBase,
-  generator,
-  outputDir,
-  datamodel,
-  schemaPath,
-  testMode
-}) {
-  const isCustomOutput = generator.isCustomOutput === true;
+async function getGenerationDirs({ runtimeBase, outputDir, testMode, copyRuntime }) {
   const normalizedOutputDir = path3.normalize(outputDir);
-  let userRuntimeImport = isCustomOutput ? "./runtime" : "@prisma/client/runtime";
-  let userOutputDir = isCustomOutput ? normalizedOutputDir : await getDefaultOutdir(normalizedOutputDir);
+  let userRuntimeImport = copyRuntime ? "./runtime" : "@prisma/client/runtime";
   if (testMode && runtimeBase) {
-    userOutputDir = outputDir;
     userRuntimeImport = pathToPosix4(runtimeBase);
   }
-  if (isCustomOutput) {
-    await verifyOutputDirectory(userOutputDir, datamodel, schemaPath);
-  }
-  const userPackageRoot = await pkgUp({ cwd: path3.dirname(userOutputDir) });
+  const userPackageRoot = await pkgUp({ cwd: path3.dirname(normalizedOutputDir) });
   const userProjectRoot = userPackageRoot ? path3.dirname(userPackageRoot) : process.cwd();
   return {
     runtimeBase: userRuntimeImport,
-    outputDir: userOutputDir,
+    outputDir: normalizedOutputDir,
     projectRoot: userProjectRoot
   };
 }
-async function verifyOutputDirectory(directory, datamodel, schemaPath) {
-  let content;
-  try {
-    content = await fs.readFile(path3.join(directory, "package.json"), "utf8");
-  } catch (e) {
-    if (e.code === "ENOENT") {
-      return;
-    }
-    throw e;
-  }
-  const { name } = JSON.parse(content);
-  if (name === package_default.name) {
-    const message = [`Generating client into ${bold(directory)} is not allowed.`];
-    message.push("This package is used by `prisma generate` and overwriting its content is dangerous.");
-    message.push("");
-    message.push("Suggestion:");
-    const outputDeclaration = findOutputPathDeclaration(datamodel);
-    if (outputDeclaration && outputDeclaration.content.includes(package_default.name)) {
-      const outputLine = outputDeclaration.content;
-      message.push(`In ${bold(schemaPath)} replace:`);
-      message.push("");
-      message.push(`${dim(outputDeclaration.lineNumber)} ${replacePackageName(outputLine, red(package_default.name))}`);
-      message.push("with");
-      message.push(`${dim(outputDeclaration.lineNumber)} ${replacePackageName(outputLine, green(".prisma/client"))}`);
-    } else {
-      message.push(`Generate client into ${bold(replacePackageName(directory, green(".prisma/client")))} instead`);
-    }
-    message.push("");
-    message.push("You won't need to change your imports.");
-    message.push("Imports from `@prisma/client` will be automatically forwarded to `.prisma/client`");
-    const error = new Error(message.join("\n"));
-    throw error;
-  }
-}
-function replacePackageName(directoryPath, replacement) {
-  return directoryPath.replace(package_default.name, replacement);
-}
-function findOutputPathDeclaration(datamodel) {
-  const lines = datamodel.split(/\r?\n/);
-  for (const [i, line] of lines.entries()) {
-    if (/output\s*=/.test(line)) {
-      return { lineNumber: i + 1, content: line.trim() };
-    }
-  }
-  return null;
-}
 function getNodeRuntimeName(engineType) {
   if (engineType === ClientEngineType3.Binary) {
     return "binary";
@@ -7134,7 +7059,7 @@ import { ClientEngineType as ClientEngineType4, getClientEngineType as getClient
 import { match } from "ts-pattern";
 
 // package.json
-var version = "6.6.0-dev.65";
+var version = "6.6.0-dev.67";
 
 // src/resolvePrismaClient.ts
 import fs2 from "node:fs/promises";
@@ -7176,36 +7101,47 @@ async function getPackageCmd(cwd, cmd, ...args) {
 
 // src/generator.ts
 var debug3 = Debug3("prisma:client:generator");
+var missingOutputErrorMessage = `An output path is required for the \`prisma-client-ts\` generator. Please provide an output path in your schema file:
+
+${dim(`generator client {
+  provider = "prisma-client-ts"`)}
+${green('  output   = "../src/generated"')}
+${dim("}")}
+
+${bold("Note:")} the output path is relative to the schema directory.
+`;
+function getOutputPath(config) {
+  if (!config.output) {
+    throw new Error(missingOutputErrorMessage);
+  }
+  return parseEnvValue(config.output);
+}
 var PrismaClientTsGenerator = class {
   name = "prisma-client-ts";
-  #shouldResolvePrismaClient = true;
   #runtimePath;
   #cachedPrismaClientPath;
-  constructor({ shouldResolvePrismaClient = true, runtimePath } = {}) {
-    this.#shouldResolvePrismaClient = shouldResolvePrismaClient;
+  constructor({ runtimePath } = {}) {
     this.#runtimePath = runtimePath;
   }
-  async getManifest(config) {
+  getManifest(config) {
     const requiresEngines = match(getClientEngineType3(config)).with(ClientEngineType4.Library, () => ["libqueryEngine"]).with(ClientEngineType4.Binary, () => ["queryEngine"]).with(ClientEngineType4.Client, () => []).exhaustive();
     debug3("requiresEngines", requiresEngines);
-    const defaultOutput = this.#shouldResolvePrismaClient ? await this.#getPrismaClientPath(config) : ".prisma/client";
-    return {
-      defaultOutput,
+    return Promise.resolve({
+      defaultOutput: getOutputPath(config),
       prettyName: "Prisma Client",
       version,
       requiresEngines,
       requiresEngineVersion: enginesVersion
-    };
+    });
   }
   async generate(options) {
-    const outputDir = parseEnvValue(options.generator.output);
     await generateClient({
       datamodel: options.datamodel,
       schemaPath: options.schemaPath,
       binaryPaths: options.binaryPaths,
       datasources: options.datasources,
       envPaths: options.envPaths,
-      outputDir,
+      outputDir: getOutputPath(options.generator),
       copyRuntime: Boolean(options.generator.config.copyRuntime),
       copyRuntimeSourceMaps: Boolean(process.env.PRISMA_COPY_RUNTIME_SOURCEMAPS),
       runtimeSourcePath: await this.#getRuntimePath(options.generator),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/client-generator-ts",
-  "version": "6.6.0-dev.65",
+  "version": "6.6.0-dev.67",
   "description": "This package is intended for Prisma's internal use",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -25,7 +25,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@antfu/ni": "0.21.12",
-    "@prisma/engines-version": "6.6.0-30.baa69bfeca2f318076d19b6ce650fd8c9b4cb452",
+    "@prisma/engines-version": "6.6.0-31.d26022ad3b55e2aa7e4ffc189436e4c59aae0c29",
     "ci-info": "4.2.0",
     "env-paths": "2.2.1",
     "indent-string": "4.0.0",
@@ -33,14 +33,14 @@
     "pkg-up": "3.1.0",
     "pluralize": "8.0.0",
     "ts-pattern": "5.6.2",
-    "@prisma/client-common": "6.6.0-dev.65",
-    "@prisma/dmmf": "6.6.0-dev.65",
-    "@prisma/fetch-engine": "6.6.0-dev.65",
-    "@prisma/debug": "6.6.0-dev.65",
-    "@prisma/get-platform": "6.6.0-dev.65",
-    "@prisma/generator": "6.6.0-dev.65",
-    "@prisma/internals": "6.6.0-dev.65",
-    "@prisma/ts-builders": "6.6.0-dev.65"
+    "@prisma/client-common": "6.6.0-dev.67",
+    "@prisma/debug": "6.6.0-dev.67",
+    "@prisma/dmmf": "6.6.0-dev.67",
+    "@prisma/fetch-engine": "6.6.0-dev.67",
+    "@prisma/generator": "6.6.0-dev.67",
+    "@prisma/get-platform": "6.6.0-dev.67",
+    "@prisma/internals": "6.6.0-dev.67",
+    "@prisma/ts-builders": "6.6.0-dev.67"
   },
   "devDependencies": {
     "@types/pluralize": "0.0.33",