@prisma/client-generator-js 6.19.0-integration-next.15 → 6.19.0-integration-next.16

package/dist/TSClient/TSClient.d.ts

@@ -1,4 +1,3 @@
-import { EnvPaths } from '@prisma/internals';
 import type { O } from 'ts-toolbelt';
 import { DMMFHelper } from '../dmmf';
 import { GenerateClientOptions } from '../generateClient';
@@ -20,8 +19,6 @@ export type TSClientOptions = O.Required<GenerateClientOptions, 'runtimeBase'> &
     reusedTs?: string;
     /** When js doesn't need to be regenerated */
     reusedJs?: string;
-    /** result of getEnvPaths call */
-    envPaths: EnvPaths;
 };
 export declare class TSClient implements Generable {
     protected readonly options: TSClientOptions;

package/dist/generateClient.d.ts

@@ -1,6 +1,5 @@
 import type * as DMMF from '@prisma/dmmf';
 import type { ActiveConnectorType, BinaryPaths, DataSource, GeneratorConfig, SqlQueryOutput } from '@prisma/generator';
-import { EnvPaths } from '@prisma/internals';
 import type { O } from 'ts-toolbelt';
 export declare class DenylistError extends Error {
     constructor(message: string);
@@ -22,7 +21,6 @@ export interface GenerateClientOptions {
     engineVersion: string;
     clientVersion: string;
     activeProvider: ActiveConnectorType;
-    envPaths?: EnvPaths;
     /** When --postinstall is passed via CLI */
     postinstall?: boolean;
     typedSql?: SqlQueryOutput[];
@@ -34,5 +32,5 @@ export interface BuildClientResult {
     fileMap: FileMap;
     prismaClientDmmf: DMMF.Document;
 }
-export declare function buildClient({ schemaPath, runtimeBase, runtimeSourcePath, datamodel, binaryPaths, outputDir, generator, dmmf, datasources, engineVersion, clientVersion, activeProvider, postinstall, envPaths, typedSql, }: O.Required<GenerateClientOptions, 'runtimeBase'>): Promise<BuildClientResult>;
+export declare function buildClient({ schemaPath, runtimeBase, runtimeSourcePath, datamodel, binaryPaths, outputDir, generator, dmmf, datasources, engineVersion, clientVersion, activeProvider, postinstall, typedSql, }: O.Required<GenerateClientOptions, 'runtimeBase'>): Promise<BuildClientResult>;
 export declare function generateClient(options: GenerateClientOptions): Promise<void>;

package/dist/index.d.mts

@@ -2,7 +2,6 @@ import type { ActiveConnectorType } from '@prisma/generator';
 import type { BinaryPaths } from '@prisma/generator';
 import type { DataSource } from '@prisma/generator';
 import * as DMMF from '@prisma/dmmf';
-import { EnvPaths } from '@prisma/internals';
 import { Generator as Generator_2 } from '@prisma/generator';
 import { GeneratorConfig } from '@prisma/generator';
 import { GeneratorManifest } from '@prisma/generator';
@@ -41,7 +40,6 @@ export declare interface GenerateClientOptions {
     engineVersion: string;
     clientVersion: string;
     activeProvider: ActiveConnectorType;
-    envPaths?: EnvPaths;
     /** When --postinstall is passed via CLI */
     postinstall?: boolean;
     typedSql?: SqlQueryOutput[];

package/dist/index.d.ts

@@ -2,7 +2,6 @@ import type { ActiveConnectorType } from '@prisma/generator';
 import type { BinaryPaths } from '@prisma/generator';
 import type { DataSource } from '@prisma/generator';
 import * as DMMF from '@prisma/dmmf';
-import { EnvPaths } from '@prisma/internals';
 import { Generator as Generator_2 } from '@prisma/generator';
 import { GeneratorConfig } from '@prisma/generator';
 import { GeneratorManifest } from '@prisma/generator';
@@ -41,7 +40,6 @@ export declare interface GenerateClientOptions {
     engineVersion: string;
     clientVersion: string;
     activeProvider: ActiveConnectorType;
-    envPaths?: EnvPaths;
     /** When --postinstall is passed via CLI */
     postinstall?: boolean;
     typedSql?: SqlQueryOutput[];

package/dist/index.js

@@ -3040,7 +3040,7 @@ var package_default = {
     "@prisma/dmmf": "workspace:*",
     "@prisma/driver-adapter-utils": "workspace:*",
     "@prisma/engines": "workspace:*",
-    "@prisma/engines-version": "6.19.0-29.next-ac95b5893b3c05bf39a2431fc1a748dd46152ab4",
+    "@prisma/engines-version": "6.19.0-31.next-6f525e2b254a97a9c547ae5f2b29c54a171f6b23",
     "@prisma/fetch-engine": "workspace:*",
     "@prisma/generator": "workspace:*",
     "@prisma/generator-helper": "workspace:*",
@@ -3048,8 +3048,8 @@ var package_default = {
     "@prisma/instrumentation": "workspace:*",
     "@prisma/internals": "workspace:*",
     "@prisma/migrate": "workspace:*",
-    "@prisma/query-compiler-wasm": "6.19.0-29.next-ac95b5893b3c05bf39a2431fc1a748dd46152ab4",
-    "@prisma/query-engine-wasm": "6.19.0-29.next-ac95b5893b3c05bf39a2431fc1a748dd46152ab4",
+    "@prisma/query-compiler-wasm": "6.19.0-31.next-6f525e2b254a97a9c547ae5f2b29c54a171f6b23",
+    "@prisma/query-engine-wasm": "6.19.0-31.next-6f525e2b254a97a9c547ae5f2b29c54a171f6b23",
     "@prisma/query-plan-executor": "workspace:*",
     "@prisma/ts-builders": "workspace:*",
     "@snaplet/copycat": "6.0.0",
@@ -5283,18 +5283,6 @@ function buildRequirePath(edge) {
   const path = require('path')`;
 }
 
-// src/utils/buildWarnEnvConflicts.ts
-function buildWarnEnvConflicts(edge, runtimeBase, runtimeNameJs) {
-  if (edge === true) return "";
-  return `
-const { warnEnvConflicts } = require('${runtimeBase}/${runtimeNameJs}.js')
-
-warnEnvConflicts({
-    rootEnvPath: config.relativeEnvPaths.rootEnvPath && path.resolve(config.dirname, config.relativeEnvPaths.rootEnvPath),
-    schemaEnvPath: config.relativeEnvPaths.schemaEnvPath && path.resolve(config.dirname, config.relativeEnvPaths.schemaEnvPath)
-})`;
-}
-
 // src/TSClient/common.ts
 var import_indent_string4 = __toESM(require("indent-string"));
 var commonCodeJS = ({
@@ -6507,26 +6495,19 @@ var TSClient = class {
       generator,
       outputDir,
       datamodel: inlineSchema,
-      runtimeBase,
       runtimeNameJs,
       datasources,
-      reusedJs,
-      envPaths
+      reusedJs
     } = this.options;
     if (reusedJs) {
       return `module.exports = { ...require('${reusedJs}') }`;
     }
-    const relativeEnvPaths = {
-      rootEnvPath: envPaths.rootEnvPath && (0, import_internals7.pathToPosix)(import_path2.default.relative(outputDir, envPaths.rootEnvPath)),
-      schemaEnvPath: envPaths.schemaEnvPath && (0, import_internals7.pathToPosix)(import_path2.default.relative(outputDir, envPaths.schemaEnvPath))
-    };
     const clientEngineType = (0, import_internals7.getClientEngineType)(generator);
     generator.config.engineType = clientEngineType;
     const binaryTargets = clientEngineType === import_internals7.ClientEngineType.Library ? Object.keys(binaryPaths.libqueryEngine ?? {}) : [];
     const datasourceFilePath = datasources[0].sourceFilePath;
     const config = {
       generator,
-      relativeEnvPaths,
       relativePath: (0, import_internals7.pathToPosix)(import_path2.default.relative(outputDir, import_path2.default.dirname(datasourceFilePath))),
       clientVersion: this.options.clientVersion,
       engineVersion: this.options.engineVersion,
@@ -6566,7 +6547,6 @@ ${buildRuntimeDataModel(this.dmmf.datamodel, runtimeNameJs)}
 ${buildQueryEngineWasmModule(runtimeNameJs)}
 ${buildQueryCompilerWasmModule(wasm, runtimeNameJs)}
 ${buildInjectableEdgeEnv(edge, datasources)}
-${buildWarnEnvConflicts(edge, runtimeBase, runtimeNameJs)}
 ${buildDebugInitialization(edge)}
 const PrismaClient = getPrismaClient(config)
 exports.PrismaClient = PrismaClient
@@ -7099,13 +7079,11 @@ async function buildClient({
   clientVersion,
   activeProvider,
   postinstall,
-  envPaths,
   typedSql
 }) {
   const clientEngineType = (0, import_internals10.getClientEngineType)(generator);
   const baseClientOptions = {
     dmmf: getPrismaClientDMMF(dmmf),
-    envPaths: envPaths ?? { rootEnvPath: null, schemaEnvPath: void 0 },
     datasources,
     generator,
     binaryPaths,
@@ -7299,7 +7277,6 @@ async function generateClient(options) {
     engineVersion,
     activeProvider,
     postinstall,
-    envPaths,
     typedSql
   } = options;
   const clientEngineType = (0, import_internals10.getClientEngineType)(generator);
@@ -7319,7 +7296,6 @@ async function generateClient(options) {
     activeProvider,
     postinstall,
     testMode,
-    envPaths,
     typedSql
   });
   const provider = datasources[0].provider;
@@ -7603,7 +7579,7 @@ var import_internals12 = require("@prisma/internals");
 var import_ts_pattern = require("ts-pattern");
 
 // package.json
-var version = "6.19.0-integration-next.15";
+var version = "6.19.0-integration-next.16";
 
 // src/resolvePrismaClient.ts
 var import_promises3 = __toESM(require("node:fs/promises"));
@@ -9364,7 +9340,6 @@ var PrismaClientJsGenerator = class {
       schemaPath: options.schemaPath,
       binaryPaths: options.binaryPaths,
       datasources: options.datasources,
-      envPaths: options.envPaths,
       outputDir,
       copyRuntime: Boolean(options.generator.config.copyRuntime),
       copyRuntimeSourceMaps: Boolean(process.env.PRISMA_COPY_RUNTIME_SOURCEMAPS),
@@ -9430,11 +9405,7 @@ function dmmfToTypes(dmmf) {
     datamodel: "",
     browser: false,
     edge: false,
-    wasm: false,
-    envPaths: {
-      rootEnvPath: null,
-      schemaEnvPath: void 0
-    }
+    wasm: false
   }).toTS();
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/index.mjs

@@ -2755,13 +2755,7 @@ function getMappings(mappings, datamodel) {
 // src/generateClient.ts
 var import_fs_extra = __toESM(require_lib());
 import { overwriteFile } from "@prisma/fetch-engine";
-import {
-  assertNever as assertNever3,
-  ClientEngineType as ClientEngineType3,
-  getClientEngineType as getClientEngineType2,
-  pathToPosix as pathToPosix4,
-  setClassName
-} from "@prisma/internals";
+import { assertNever as assertNever3, ClientEngineType as ClientEngineType3, getClientEngineType as getClientEngineType2, pathToPosix as pathToPosix4, setClassName } from "@prisma/internals";
 import { createHash } from "crypto";
 import paths from "env-paths";
 import { existsSync } from "fs";
@@ -3035,7 +3029,7 @@ var package_default = {
     "@prisma/dmmf": "workspace:*",
     "@prisma/driver-adapter-utils": "workspace:*",
     "@prisma/engines": "workspace:*",
-    "@prisma/engines-version": "6.19.0-29.next-ac95b5893b3c05bf39a2431fc1a748dd46152ab4",
+    "@prisma/engines-version": "6.19.0-31.next-6f525e2b254a97a9c547ae5f2b29c54a171f6b23",
     "@prisma/fetch-engine": "workspace:*",
     "@prisma/generator": "workspace:*",
     "@prisma/generator-helper": "workspace:*",
@@ -3043,8 +3037,8 @@ var package_default = {
     "@prisma/instrumentation": "workspace:*",
     "@prisma/internals": "workspace:*",
     "@prisma/migrate": "workspace:*",
-    "@prisma/query-compiler-wasm": "6.19.0-29.next-ac95b5893b3c05bf39a2431fc1a748dd46152ab4",
-    "@prisma/query-engine-wasm": "6.19.0-29.next-ac95b5893b3c05bf39a2431fc1a748dd46152ab4",
+    "@prisma/query-compiler-wasm": "6.19.0-31.next-6f525e2b254a97a9c547ae5f2b29c54a171f6b23",
+    "@prisma/query-engine-wasm": "6.19.0-31.next-6f525e2b254a97a9c547ae5f2b29c54a171f6b23",
     "@prisma/query-plan-executor": "workspace:*",
     "@prisma/ts-builders": "workspace:*",
     "@snaplet/copycat": "6.0.0",
@@ -5281,18 +5275,6 @@ function buildRequirePath(edge) {
   const path = require('path')`;
 }
 
-// src/utils/buildWarnEnvConflicts.ts
-function buildWarnEnvConflicts(edge, runtimeBase, runtimeNameJs) {
-  if (edge === true) return "";
-  return `
-const { warnEnvConflicts } = require('${runtimeBase}/${runtimeNameJs}.js')
-
-warnEnvConflicts({
-    rootEnvPath: config.relativeEnvPaths.rootEnvPath && path.resolve(config.dirname, config.relativeEnvPaths.rootEnvPath),
-    schemaEnvPath: config.relativeEnvPaths.schemaEnvPath && path.resolve(config.dirname, config.relativeEnvPaths.schemaEnvPath)
-})`;
-}
-
 // src/TSClient/common.ts
 import indent4 from "indent-string";
 var commonCodeJS = ({
@@ -6505,26 +6487,19 @@ var TSClient = class {
       generator,
       outputDir,
       datamodel: inlineSchema,
-      runtimeBase,
       runtimeNameJs,
       datasources,
-      reusedJs,
-      envPaths
+      reusedJs
     } = this.options;
     if (reusedJs) {
       return `module.exports = { ...require('${reusedJs}') }`;
     }
-    const relativeEnvPaths = {
-      rootEnvPath: envPaths.rootEnvPath && pathToPosix3(path2.relative(outputDir, envPaths.rootEnvPath)),
-      schemaEnvPath: envPaths.schemaEnvPath && pathToPosix3(path2.relative(outputDir, envPaths.schemaEnvPath))
-    };
     const clientEngineType = getClientEngineType(generator);
     generator.config.engineType = clientEngineType;
     const binaryTargets = clientEngineType === ClientEngineType2.Library ? Object.keys(binaryPaths.libqueryEngine ?? {}) : [];
     const datasourceFilePath = datasources[0].sourceFilePath;
     const config = {
       generator,
-      relativeEnvPaths,
       relativePath: pathToPosix3(path2.relative(outputDir, path2.dirname(datasourceFilePath))),
       clientVersion: this.options.clientVersion,
       engineVersion: this.options.engineVersion,
@@ -6564,7 +6539,6 @@ ${buildRuntimeDataModel(this.dmmf.datamodel, runtimeNameJs)}
 ${buildQueryEngineWasmModule(runtimeNameJs)}
 ${buildQueryCompilerWasmModule(wasm, runtimeNameJs)}
 ${buildInjectableEdgeEnv(edge, datasources)}
-${buildWarnEnvConflicts(edge, runtimeBase, runtimeNameJs)}
 ${buildDebugInitialization(edge)}
 const PrismaClient = getPrismaClient(config)
 exports.PrismaClient = PrismaClient
@@ -7097,13 +7071,11 @@ async function buildClient({
   clientVersion,
   activeProvider,
   postinstall,
-  envPaths,
   typedSql
 }) {
   const clientEngineType = getClientEngineType2(generator);
   const baseClientOptions = {
     dmmf: getPrismaClientDMMF(dmmf),
-    envPaths: envPaths ?? { rootEnvPath: null, schemaEnvPath: void 0 },
     datasources,
     generator,
     binaryPaths,
@@ -7297,7 +7269,6 @@ async function generateClient(options) {
     engineVersion,
     activeProvider,
     postinstall,
-    envPaths,
     typedSql
   } = options;
   const clientEngineType = getClientEngineType2(generator);
@@ -7317,7 +7288,6 @@ async function generateClient(options) {
     activeProvider,
     postinstall,
     testMode,
-    envPaths,
     typedSql
   });
   const provider = datasources[0].provider;
@@ -7601,7 +7571,7 @@ import { ClientEngineType as ClientEngineType4, getClientEngineType as getClient
 import { match } from "ts-pattern";
 
 // package.json
-var version = "6.19.0-integration-next.15";
+var version = "6.19.0-integration-next.16";
 
 // src/resolvePrismaClient.ts
 import fs2 from "node:fs/promises";
@@ -9362,7 +9332,6 @@ var PrismaClientJsGenerator = class {
       schemaPath: options.schemaPath,
       binaryPaths: options.binaryPaths,
       datasources: options.datasources,
-      envPaths: options.envPaths,
       outputDir,
       copyRuntime: Boolean(options.generator.config.copyRuntime),
       copyRuntimeSourceMaps: Boolean(process.env.PRISMA_COPY_RUNTIME_SOURCEMAPS),
@@ -9428,11 +9397,7 @@ function dmmfToTypes(dmmf) {
     datamodel: "",
     browser: false,
     edge: false,
-    wasm: false,
-    envPaths: {
-      rootEnvPath: null,
-      schemaEnvPath: void 0
-    }
+    wasm: false
   }).toTS();
 }
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/client-generator-js",
-  "version": "6.19.0-integration-next.15",
+  "version": "6.19.0-integration-next.16",
   "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.19.0-29.next-ac95b5893b3c05bf39a2431fc1a748dd46152ab4",
+    "@prisma/engines-version": "6.19.0-31.next-6f525e2b254a97a9c547ae5f2b29c54a171f6b23",
     "ci-info": "4.2.0",
     "env-paths": "2.2.1",
     "indent-string": "4.0.0",
@@ -33,14 +33,14 @@
     "package-up": "5.0.0",
     "pluralize": "8.0.0",
     "ts-pattern": "5.6.2",
-    "@prisma/client-common": "6.19.0-integration-next.15",
-    "@prisma/debug": "6.19.0-integration-next.15",
-    "@prisma/dmmf": "6.19.0-integration-next.15",
-    "@prisma/fetch-engine": "6.19.0-integration-next.15",
-    "@prisma/generator": "6.19.0-integration-next.15",
-    "@prisma/get-platform": "6.19.0-integration-next.15",
-    "@prisma/internals": "6.19.0-integration-next.15",
-    "@prisma/ts-builders": "6.19.0-integration-next.15"
+    "@prisma/client-common": "6.19.0-integration-next.16",
+    "@prisma/debug": "6.19.0-integration-next.16",
+    "@prisma/dmmf": "6.19.0-integration-next.16",
+    "@prisma/fetch-engine": "6.19.0-integration-next.16",
+    "@prisma/get-platform": "6.19.0-integration-next.16",
+    "@prisma/internals": "6.19.0-integration-next.16",
+    "@prisma/generator": "6.19.0-integration-next.16",
+    "@prisma/ts-builders": "6.19.0-integration-next.16"
   },
   "devDependencies": {
     "@types/pluralize": "0.0.33",

package/dist/utils/buildWarnEnvConflicts.d.ts

@@ -1,10 +0,0 @@
-import { TSClientOptions } from '../TSClient/TSClient';
-/**
- * Builds the necessary bits so that our users can get a helpful warning during
- * "generate" in case of conflicts between their environment & their env files.
- * @param edge
- * @param runtimeBase
- * @param runtimeNameJs
- * @returns
- */
-export declare function buildWarnEnvConflicts(edge: boolean, runtimeBase: string, runtimeNameJs: TSClientOptions['runtimeNameJs']): string;