chore(config): cosmetic changes (prisma#26328)

* chore(config): rename Effect "schemas" as "shapes"

* chore(config): rename PrismaConfig -> PrismaConfigInternal, PrismaConfigInput -> PrismaConfig; minor cosmetic changes to defaultConfig

* fix(config): turn PrismaConfigInternal into a nominal type

* chore(config): address review commment

* chore(config): fix lint

* chore: re-trigger CI

---------

Co-authored-by: jkomyno <[email protected]>

packages/cli/src/CLI.ts

@@ -1,4 +1,4 @@
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import { ensureBinariesExist } from '@prisma/engines'
 import type { Command, Commands } from '@prisma/internals'
 import { arg, drawBox, format, HelpError, isError, link, logger, unknownCommand } from '@prisma/internals'
@@ -16,7 +16,7 @@ export class CLI implements Command {
 
   private constructor(private readonly cmds: Commands, private readonly ensureBinaries: string[]) {}
 
-  async parse(argv: string[], config: PrismaConfig): Promise<string | Error> {
+  async parse(argv: string[], config: PrismaConfigInternal): Promise<string | Error> {
     const args = arg(argv, {
       '--help': Boolean,
       '-h': '--help',

packages/cli/src/DebugInfo.ts

@@ -1,4 +1,4 @@
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import type { Command } from '@prisma/internals'
 import {
   arg,
@@ -37,7 +37,7 @@ export class DebugInfo implements Command {
     --schema       Custom path to your Prisma schema
 `)
 
-  async parse(argv: string[], config: PrismaConfig): Promise<string | Error> {
+  async parse(argv: string[], config: PrismaConfigInternal): Promise<string | Error> {
     const args = arg(argv, {
       '--help': Boolean,
       '-h': '--help',

packages/cli/src/Format.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs/promises'
 import path from 'node:path'
 
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import { arg, Command, format, formatms, formatSchema, HelpError, validate } from '@prisma/internals'
 import { getSchemaPathAndPrint } from '@prisma/migrate'
 import { bold, dim, red, underline } from 'kleur/colors'
@@ -37,7 +37,7 @@ Or specify a Prisma schema path
 
   `)
 
-  public async parse(argv: string[], _config: PrismaConfig): Promise<string | Error> {
+  public async parse(argv: string[], _config: PrismaConfigInternal): Promise<string | Error> {
     const before = Math.round(performance.now())
     const args = arg(argv, {
       '--help': Boolean,

packages/cli/src/Generate.ts

@@ -1,4 +1,4 @@
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import { enginesVersion } from '@prisma/engines'
 import { SqlQueryOutput } from '@prisma/generator-helper'
 import {
@@ -103,7 +103,7 @@ ${bold('Examples')}
     this.logText += message.join('\n')
   })
 
-  public async parse(argv: string[], config: PrismaConfig): Promise<string | Error> {
+  public async parse(argv: string[], config: PrismaConfigInternal): Promise<string | Error> {
     const args = arg(argv, {
       '--help': Boolean,
       '-h': '--help',

packages/cli/src/Init.ts

@@ -1,5 +1,5 @@
 import { confirm, input, select } from '@inquirer/prompts'
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import type { ConnectorType } from '@prisma/generator-helper'
 import {
   arg,
@@ -221,7 +221,7 @@ export class Init implements Command {
     ${dim('$')} prisma init --with-model
   `)
 
-  async parse(argv: string[], _config: PrismaConfig): Promise<string | Error> {
+  async parse(argv: string[], _config: PrismaConfigInternal): Promise<string | Error> {
     const args = arg(argv, {
       '--help': Boolean,
       '-h': '--help',

packages/cli/src/Studio.ts

@@ -1,4 +1,4 @@
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import Debug from '@prisma/debug'
 import { enginesVersion } from '@prisma/engines'
 import {
@@ -79,7 +79,7 @@ ${bold('Examples')}
    * @param argv Array of all arguments
    * @param _config The loaded Prisma config
    */
-  public async parse(argv: string[], config: PrismaConfig): Promise<string | Error> {
+  public async parse(argv: string[], config: PrismaConfigInternal): Promise<string | Error> {
     const args = arg(argv, {
       '--help': Boolean,
       '-h': '--help',

packages/cli/src/SubCommand.ts

@@ -1,5 +1,5 @@
 import { getCommand } from '@antfu/ni'
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import type { Command } from '@prisma/internals'
 import { command } from 'execa'
 import { existsSync } from 'fs'
@@ -9,7 +9,7 @@ import { tmpdir } from 'os'
  * Sub-CLIs that are installed on demand need to implement this interface
  */
 type Runnable = {
-  run: (args: string[], config: PrismaConfig) => Promise<void>
+  run: (args: string[], config: PrismaConfigInternal) => Promise<void>
 }
 
 /**
@@ -22,7 +22,7 @@ export class SubCommand implements Command {
     this.pkg = pkg
   }
 
-  async parse(argv: string[], config: PrismaConfig): Promise<string | Error> {
+  async parse(argv: string[], config: PrismaConfigInternal): Promise<string | Error> {
     // we accept forcing a version with @, eg. prisma policy @1.0.0 --help
     const [version, ...args] = argv[0]?.startsWith('@') ? argv : ['@latest', ...argv]
     const pkg = `${this.pkg}${version}`

packages/cli/src/Validate.ts

@@ -1,6 +1,6 @@
 import path from 'node:path'
 
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import {
   arg,
   Command,
@@ -51,7 +51,7 @@ ${bold('Examples')}
 
 `)
 
-  public async parse(argv: string[], config: PrismaConfig): Promise<string | Error> {
+  public async parse(argv: string[], config: PrismaConfigInternal): Promise<string | Error> {
     const args = arg(argv, {
       '--help': Boolean,
       '-h': '--help',

packages/cli/src/Version.ts

@@ -1,4 +1,4 @@
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import { enginesVersion, getCliQueryEngineBinaryType } from '@prisma/engines'
 import { getBinaryTargetForCurrentPlatform } from '@prisma/get-platform'
 import type { Command } from '@prisma/internals'
@@ -47,7 +47,7 @@ export class Version implements Command {
         --json     Output JSON
 `)
 
-  async parse(argv: string[], config: PrismaConfig): Promise<string | Error> {
+  async parse(argv: string[], config: PrismaConfigInternal): Promise<string | Error> {
     const args = arg(argv, {
       '--help': Boolean,
       '-h': '--help',

packages/cli/src/platform/$.ts

@@ -1,4 +1,4 @@
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import { Command, Commands, link } from '@prisma/internals'
 
 import { EarlyAccessFlagError } from '../utils/errors'
@@ -37,7 +37,7 @@ export class $ implements Command {
     ],
   })
 
-  public async parse(argv: string[], config: PrismaConfig): Promise<string | Error> {
+  public async parse(argv: string[], config: PrismaConfigInternal): Promise<string | Error> {
     const isHasEarlyAccessFeatureFlag = Boolean(argv.find((_) => _.match(/early-access/)))
     if (!isHasEarlyAccessFeatureFlag) throw new EarlyAccessFlagError()
 

packages/cli/src/platform/_lib/cli/dispatchToSubCommand.ts

@@ -1,7 +1,7 @@
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import { Commands, HelpError, link } from '@prisma/internals'
 
-export const dispatchToSubCommand = async (commands: Commands, argv: string[], config: PrismaConfig) => {
+export const dispatchToSubCommand = async (commands: Commands, argv: string[], config: PrismaConfigInternal) => {
   const commandName = argv[0]
   if (!commandName) return new HelpError(`Unknown command.`)
   const command = commands[commandName]

packages/cli/src/platform/_lib/cli/namespace.ts

@@ -1,4 +1,4 @@
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import { Command, Commands } from '@prisma/internals'
 
 import { dispatchToSubCommand } from './dispatchToSubCommand'
@@ -11,7 +11,7 @@ export const createNamespace = () => {
 
     private constructor(public readonly commands: Commands) {}
 
-    public async parse(argv: string[], config: PrismaConfig): Promise<string | Error> {
+    public async parse(argv: string[], config: PrismaConfigInternal): Promise<string | Error> {
       return await dispatchToSubCommand(this.commands, argv, config)
     }
   }

packages/cli/src/platform/accelerate/disable.ts

@@ -1,4 +1,4 @@
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import { Command } from '@prisma/internals'
 
 import { argOrThrow, getRequiredParameterOrThrow } from '../_lib/cli/parameters'
@@ -11,7 +11,7 @@ export class Disable implements Command {
     return new Disable()
   }
 
-  public async parse(argv: string[], _config: PrismaConfig): Promise<string | Error> {
+  public async parse(argv: string[], _config: PrismaConfigInternal): Promise<string | Error> {
     const args = argOrThrow(argv, {
       ...platformParameters.environment,
     })

packages/cli/src/platform/accelerate/enable.ts

@@ -1,4 +1,4 @@
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import { arg, Command, isError, link } from '@prisma/internals'
 
 import { getOptionalParameter, getRequiredParameterOrThrow } from '../_lib/cli/parameters'
@@ -11,7 +11,7 @@ export class Enable implements Command {
     return new Enable()
   }
 
-  public async parse(argv: string[], _config: PrismaConfig): Promise<string | Error> {
+  public async parse(argv: string[], _config: PrismaConfigInternal): Promise<string | Error> {
     const args = arg(argv, {
       ...platformParameters.environment,
       '--url': String,

packages/cli/src/platform/auth/login.ts

@@ -1,5 +1,5 @@
 import { select } from '@inquirer/prompts'
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import Debug from '@prisma/debug'
 import { arg, Command, getCommandWithExecutor, isError, link } from '@prisma/internals'
 import listen from 'async-listen'
@@ -29,7 +29,7 @@ export class Login implements Command {
     return new Login()
   }
 
-  public async parse(argv: string[], _config: PrismaConfig): Promise<string | Error> {
+  public async parse(argv: string[], _config: PrismaConfigInternal): Promise<string | Error> {
     const args = arg(argv, {
       // internal optimize flag to track signup attribution
       '--optimize': Boolean,

packages/cli/src/platform/auth/show.ts

@@ -1,4 +1,4 @@
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import { Command } from '@prisma/internals'
 import { green } from 'kleur/colors'
 
@@ -12,7 +12,7 @@ export class Show implements Command {
     return new Show()
   }
 
-  public async parse(argv: string[], _config: PrismaConfig): Promise<string | Error> {
+  public async parse(argv: string[], _config: PrismaConfigInternal): Promise<string | Error> {
     const args = argOrThrow(argv, {
       ...platformParameters.global,
       '--sensitive': Boolean,

packages/cli/src/platform/environment/create.ts

@@ -1,4 +1,4 @@
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import { Command } from '@prisma/internals'
 
 import { argOrThrow, getOptionalParameter, getRequiredParameterOrThrow } from '../_lib/cli/parameters'
@@ -11,7 +11,7 @@ export class Create implements Command {
     return new Create()
   }
 
-  public async parse(argv: string[], _config: PrismaConfig): Promise<string | Error> {
+  public async parse(argv: string[], _config: PrismaConfigInternal): Promise<string | Error> {
     const args = argOrThrow(argv, {
       ...platformParameters.project,
       '--name': String,

packages/cli/src/platform/environment/delete.ts

@@ -1,4 +1,4 @@
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import { arg, Command, isError } from '@prisma/internals'
 
 import { getRequiredParameterOrThrow } from '../_lib/cli/parameters'
@@ -11,7 +11,7 @@ export class Delete implements Command {
     return new Delete()
   }
 
-  public async parse(argv: string[], _config: PrismaConfig): Promise<string | Error> {
+  public async parse(argv: string[], _config: PrismaConfigInternal): Promise<string | Error> {
     const args = arg(argv, {
       ...platformParameters.environment,
     })

packages/cli/src/platform/environment/show.ts

@@ -1,4 +1,4 @@
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import { arg, Command, isError } from '@prisma/internals'
 
 import { getRequiredParameterOrThrow } from '../_lib/cli/parameters'
@@ -11,7 +11,7 @@ export class Show implements Command {
     return new Show()
   }
 
-  public async parse(argv: string[], _config: PrismaConfig): Promise<string | Error> {
+  public async parse(argv: string[], _config: PrismaConfigInternal): Promise<string | Error> {
     const args = arg(argv, {
       ...platformParameters.project,
     })

packages/cli/src/platform/project/create.ts

@@ -1,4 +1,4 @@
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import { Command } from '@prisma/internals'
 
 import { argOrThrow, getOptionalParameter, getRequiredParameterOrThrow } from '../_lib/cli/parameters'
@@ -11,7 +11,7 @@ export class Create implements Command {
     return new Create()
   }
 
-  public async parse(argv: string[], _config: PrismaConfig): Promise<string | Error> {
+  public async parse(argv: string[], _config: PrismaConfigInternal): Promise<string | Error> {
     const args = argOrThrow(argv, {
       ...platformParameters.workspace,
       '--name': String,

packages/cli/src/platform/project/delete.ts

@@ -1,4 +1,4 @@
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import { arg, Command, isError } from '@prisma/internals'
 
 import { getRequiredParameterOrThrow } from '../_lib/cli/parameters'
@@ -11,7 +11,7 @@ export class Delete implements Command {
     return new Delete()
   }
 
-  public async parse(argv: string[], _config: PrismaConfig): Promise<string | Error> {
+  public async parse(argv: string[], _config: PrismaConfigInternal): Promise<string | Error> {
     const args = arg(argv, {
       ...platformParameters.project,
     })

packages/cli/src/platform/project/show.ts

@@ -1,4 +1,4 @@
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import { arg, Command, isError } from '@prisma/internals'
 
 import { getRequiredParameterOrThrow } from '../_lib/cli/parameters'
@@ -11,7 +11,7 @@ export class Show implements Command {
     return new Show()
   }
 
-  public async parse(argv: string[], _config: PrismaConfig): Promise<string | Error> {
+  public async parse(argv: string[], _config: PrismaConfigInternal): Promise<string | Error> {
     const args = arg(argv, {
       ...platformParameters.workspace,
     })

packages/cli/src/platform/pulse/disable.ts

@@ -1,4 +1,4 @@
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import { Command } from '@prisma/internals'
 
 import { argOrThrow, getRequiredParameterOrThrow } from '../_lib/cli/parameters'
@@ -11,7 +11,7 @@ export class Disable implements Command {
     return new Disable()
   }
 
-  public async parse(argv: string[], _config: PrismaConfig): Promise<string | Error> {
+  public async parse(argv: string[], _config: PrismaConfigInternal): Promise<string | Error> {
     const args = argOrThrow(argv, {
       ...platformParameters.environment,
     })

packages/cli/src/platform/pulse/enable.ts

@@ -1,4 +1,4 @@
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import { arg, Command, isError, link } from '@prisma/internals'
 
 import { getOptionalParameter, getRequiredParameterOrThrow } from '../_lib/cli/parameters'
@@ -11,7 +11,7 @@ export class Enable implements Command {
     return new Enable()
   }
 
-  public async parse(argv: string[], _config: PrismaConfig): Promise<string | Error> {
+  public async parse(argv: string[], _config: PrismaConfigInternal): Promise<string | Error> {
     const args = arg(argv, {
       ...platformParameters.environment,
       '--url': String,

packages/cli/src/platform/serviceToken/create.ts

@@ -1,4 +1,4 @@
-import type { PrismaConfig } from '@prisma/config'
+import type { PrismaConfigInternal } from '@prisma/config'
 import { Command } from '@prisma/internals'
 
 import { argOrThrow, getOptionalParameter, getRequiredParameterOrThrow } from '../_lib/cli/parameters'
@@ -13,7 +13,7 @@ export class Create implements Command {
 
   constructor(private readonly legacy: boolean = false) {}
 
-  public async parse(argv: string[], _config: PrismaConfig): Promise<string | Error> {
+  public async parse(argv: string[], _config: PrismaConfigInternal): Promise<string | Error> {
     const args = argOrThrow(argv, {
       ...platformParameters.environment,
       '--name': String,