chore(client): fix isolated data proxy issues [DPGA, 3]

packages/cli/src/Generate.ts

@@ -138,7 +138,7 @@ ${chalk.bold('Examples')}
         printDownloadProgress: !watchMode,
         version: enginesVersion,
         cliVersion: pkg.version,
-        dataProxy: args['--data-proxy'],
+        dataProxy: !!args['--data-proxy'],
       })
 
       if (!generators || generators.length === 0) {
@@ -261,7 +261,7 @@ Please run \`${getCommandWithExecutor('prisma generate')}\` to see the errors.`)
               printDownloadProgress: !watchMode,
               version: enginesVersion,
               cliVersion: pkg.version,
-              dataProxy: args['--data-proxy'],
+              dataProxy: !!args['--data-proxy'],
             })
 
             if (!generatorsWatch || generatorsWatch.length === 0) {

packages/client/src/generation/TSClient/TSClient.ts

@@ -42,7 +42,7 @@ export interface TSClientOptions {
   schemaPath: string
   outputDir: string
   activeProvider: string
-  dataProxy?: boolean
+  dataProxy: boolean
 }
 
 export class TSClient implements Generatable {
@@ -53,7 +53,7 @@ export class TSClient implements Generatable {
     this.dmmf = new DMMFHelper(klona(options.document))
   }
 
-  public async toJS(edge?: boolean): Promise<string> {
+  public async toJS(edge = false): Promise<string> {
     const {
       platforms,
       generator,

packages/client/src/generation/generateClient.ts

@@ -46,7 +46,7 @@ export interface GenerateClientOptions {
   engineVersion: string
   clientVersion: string
   activeProvider: string
-  dataProxy?: boolean
+  dataProxy: boolean
 }
 
 export interface BuildClientResult {

packages/client/src/generation/utils/buildDirname.ts

@@ -7,7 +7,7 @@ import path from 'path'
  * @param runtimeDir
  * @returns
  */
-export function buildDirname(edge: boolean | undefined, relativeOutdir: string, runtimeDir: string) {
+export function buildDirname(edge: boolean, relativeOutdir: string, runtimeDir: string) {
   if (edge === true) {
     return buildDirnameDefault()
   }

packages/client/src/generation/utils/buildInjectableEdgeEnv.ts

@@ -16,7 +16,7 @@ type LoadedEnv = {
  * @param datasources
  * @returns
  */
-export function buildInjectableEdgeEnv(edge: boolean | undefined, datasources: InternalDatasource[]) {
+export function buildInjectableEdgeEnv(edge: boolean, datasources: InternalDatasource[]) {
   if (edge === true) {
     const envVarNames = getSelectedEnvVarNames(datasources)
     const loadedEnv = getEmptyEnvObjectForVars(envVarNames)

packages/client/src/generation/utils/buildInlineDatasources.ts

@@ -14,7 +14,7 @@ export type InlineDatasources = {
  * @param internalDatasources
  * @returns
  */
-export function buildInlineDatasource(dataProxy: boolean | undefined, internalDatasources: InternalDatasource[]) {
+export function buildInlineDatasource(dataProxy: boolean, internalDatasources: InternalDatasource[]) {
   if (dataProxy === true) {
     const datasources = internalToInlineDatasources(internalDatasources)
 

packages/client/src/generation/utils/buildInlineSchema.ts

@@ -10,7 +10,7 @@ const readFile = fs.promises.readFile
  * @param schemaPath
  * @returns
  */
-export async function buildInlineSchema(dataProxy: boolean | undefined, schemaPath: string) {
+export async function buildInlineSchema(dataProxy: boolean, schemaPath: string) {
   if (dataProxy === true) {
     const b64Schema = (await readFile(schemaPath)).toString('base64')
     const schemaHash = crypto.createHash('sha256').update(b64Schema).digest('hex')

packages/client/src/generation/utils/buildNFTAnnotations.ts

@@ -16,7 +16,7 @@ import { map } from '../../../../../helpers/blaze/map'
  * @returns
  */
 export function buildNFTAnnotations(
-  dataProxy: boolean | undefined,
+  dataProxy: boolean,
   engineType: ClientEngineType,
   platforms: Platform[] | undefined,
   relativeOutdir: string,

packages/client/src/generation/utils/buildRequirePath.ts

@@ -3,7 +3,7 @@
  * @param edge
  * @returns
  */
-export function buildRequirePath(edge: boolean | undefined) {
+export function buildRequirePath(edge: boolean) {
   if (edge === true) return ''
 
   return `

packages/client/src/generation/utils/buildWarnEnvConflicts.ts

@@ -6,7 +6,7 @@
  * @param runtimeName
  * @returns
  */
-export function buildWarnEnvConflicts(edge: boolean | undefined, runtimeDir: string, runtimeName: string) {
+export function buildWarnEnvConflicts(edge: boolean, runtimeDir: string, runtimeName: string) {
   if (edge === true) return ''
 
   return `

packages/client/src/runtime/getPrismaClient.ts

@@ -228,7 +228,7 @@ export interface GetPrismaClientConfig {
    * If enabled, we disregard the generator config engineType.
    * It means that `--data-proxy` binds you to the Data Proxy.
    */
-  dataProxy?: boolean
+  dataProxy: boolean
 
   /**
    * The contents of the schema encoded into a string
@@ -338,7 +338,7 @@ export function getPrismaClient(config: GetPrismaClientConfig) {
       this._rejectOnNotFound = optionsArg?.rejectOnNotFound
       this._clientVersion = config.clientVersion ?? clientVersion
       this._activeProvider = config.activeProvider
-      this._dataProxy = config.dataProxy ?? false
+      this._dataProxy = config.dataProxy
       this._clientEngineType = getClientEngineType(config.generator!)
       const envPaths = {
         rootEnvPath:

packages/client/src/utils/generateInFolder.ts

@@ -142,6 +142,7 @@ export async function generateInFolder({
     clientVersion: 'local',
     engineVersion: 'local',
     activeProvider: config.datasources[0].activeProvider,
+    dataProxy: !!process.env.DATA_PROXY,
   })
   const time = performance.now() - before
   debug(`Done generating client in ${time}`)

packages/client/tests/functional/_utils/setupTestSuiteClient.ts

@@ -53,6 +53,7 @@ export async function setupTestSuiteClient(suiteMeta: TestSuiteMeta, suiteConfig
       edge: [__dirname.replace(/\\/g, '/'), '..', '..', '..', 'runtime', 'edge'].join('/'),
     },
     projectRoot: suiteFolderPath,
+    dataProxy: !!process.env.DATA_PROXY,
   })
 
   return require(path.join(suiteFolderPath, 'node_modules/@prisma/client'))

packages/generator-helper/src/types.ts

@@ -89,7 +89,7 @@ export type GeneratorOptions = {
   // TODO is it really always version hash? Feature is unclear.
   version: string // version hash
   binaryPaths?: BinaryPaths
-  dataProxy?: boolean
+  dataProxy: boolean
 }
 
 export type EngineType = 'queryEngine' | 'libqueryEngine' | 'migrationEngine' | 'introspectionEngine' | 'prismaFmt'

packages/migrate/src/Migrate.ts

@@ -155,6 +155,7 @@ export class Migrate {
       printDownloadProgress: true,
       version: enginesVersion,
       cliVersion: packageJson.version,
+      dataProxy: false,
     })
 
     for (const generator of generators) {

packages/sdk/src/__tests__/getGenerators/getGenerators.test.ts

@@ -37,6 +37,7 @@ describe('getGenerators', () => {
     const generators = await getGenerators({
       schemaPath: path.join(__dirname, 'valid-minimal-schema.prisma'),
       providerAliases: aliases,
+      dataProxy: false,
     })
 
     expect(generators.map((g) => g.manifest)).toMatchInlineSnapshot(`
@@ -119,6 +120,7 @@ describe('getGenerators', () => {
     const generators = await getGenerators({
       schemaPath: path.join(__dirname, 'valid-minimal-schema-binaryTargets.prisma'),
       providerAliases: aliases,
+      dataProxy: false,
     })
 
     expect(generators.map((g) => g.manifest)).toMatchInlineSnapshot(`
@@ -209,6 +211,7 @@ describe('getGenerators', () => {
     const generators = await getGenerators({
       schemaPath: path.join(__dirname, 'valid-minimal-schema-binaryTargets-env-var.prisma'),
       providerAliases: aliases,
+      dataProxy: false,
     })
 
     expect(generators.map((g) => g.manifest)).toMatchInlineSnapshot(`
@@ -299,6 +302,7 @@ describe('getGenerators', () => {
     const generators = await getGenerators({
       schemaPath: path.join(__dirname, 'valid-minimal-schema-binaryTargets-env-var.prisma'),
       providerAliases: aliases,
+      dataProxy: false,
     })
 
     expect(generators.map((g) => g.manifest)).toMatchInlineSnapshot(`
@@ -389,6 +393,7 @@ describe('getGenerators', () => {
     const generators = await getGenerators({
       schemaPath: path.join(__dirname, 'valid-minimal-schema-binaryTargets-env-var.prisma'),
       providerAliases: aliases,
+      dataProxy: false,
     })
 
     expect(generators.map((g) => g.manifest)).toMatchInlineSnapshot(`
@@ -486,6 +491,7 @@ describe('getGenerators', () => {
     const generators = await getGenerators({
       schemaPath: path.join(__dirname, 'valid-minimal-schema-binaryTargets-env-var.prisma'),
       providerAliases: aliases,
+      dataProxy: false,
     })
 
     expect(generators.map((g) => g.manifest)).toMatchInlineSnapshot(`
@@ -583,6 +589,7 @@ describe('getGenerators', () => {
       binaryPathsOverride: {
         queryEngine: queryEnginePath,
       },
+      dataProxy: false,
     })
 
     const options = generators.map((g) => g.options?.binaryPaths)
@@ -609,6 +616,7 @@ describe('getGenerators', () => {
       getGenerators({
         schemaPath: path.join(__dirname, 'invalid-platforms-schema.prisma'),
         providerAliases: aliases,
+        dataProxy: false,
       }),
     ).rejects.toThrow('deprecated')
   })
@@ -625,6 +633,7 @@ describe('getGenerators', () => {
       getGenerators({
         schemaPath: path.join(__dirname, 'invalid-binary-target-schema.prisma'),
         providerAliases: aliases,
+        dataProxy: false,
       }),
     ).rejects.toThrow('Unknown')
 
@@ -647,6 +656,7 @@ describe('getGenerators', () => {
       await getGenerators({
         schemaPath: path.join(__dirname, 'missing-datasource-schema.prisma'),
         providerAliases: aliases,
+        dataProxy: false,
       })
     } catch (e) {
       expect(stripAnsi(e.message)).toMatchInlineSnapshot(`
@@ -684,6 +694,7 @@ describe('getGenerators', () => {
       await getGenerators({
         schemaPath: path.join(__dirname, 'missing-models-sqlite-schema.prisma'),
         providerAliases: aliases,
+        dataProxy: false,
       })
     } catch (e) {
       expect(stripAnsi(e.message)).toMatchInlineSnapshot(`
@@ -722,6 +733,7 @@ describe('getGenerators', () => {
       await getGenerators({
         schemaPath: path.join(__dirname, 'missing-models-mongodb-schema.prisma'),
         providerAliases: aliases,
+        dataProxy: false,
       })
     } catch (e) {
       expect(stripAnsi(e.message)).toMatchInlineSnapshot(`

packages/sdk/src/get-generators/getGenerators.ts

@@ -50,7 +50,7 @@ export type GetGeneratorOptions = {
   overrideGenerators?: GeneratorConfig[]
   skipDownload?: boolean
   binaryPathsOverride?: BinaryPathsOverride
-  dataProxy?: boolean
+  dataProxy: boolean
 }
 /**
  * Makes sure that all generators have the binaries they deserve and returns a