chore: printWidth from 80 to 120 (#9458)

prisma · Oct 18, 2021 · bbdf1c2 · bbdf1c2
1 parent 14cdd28
commit bbdf1c2
Show file tree

Hide file tree

Showing 253 changed files with 1,597 additions and 5,084 deletions.
diff --git a/.prettierrc.yml b/.prettierrc.yml
@@ -2,4 +2,4 @@ tabWidth: 2
 trailingComma: all
 singleQuote: true
 semi: false
-printWidth: 80
+printWidth: 120
diff --git a/packages/cli/.prettierrc.yml b/packages/cli/.prettierrc.yml
@@ -2,4 +2,4 @@ tabWidth: 2
 trailingComma: all
 singleQuote: true
 semi: false
-printWidth: 80
+printWidth: 120
diff --git a/packages/cli/helpers/build.ts b/packages/cli/helpers/build.ts
@@ -47,29 +47,19 @@ const cliLifecyclePlugin: esbuild.Plugin = {
 
     build.onEnd(async () => {
       // we copy the contents from @prisma/studio to build
-      copySync(
-        path.join(require.resolve('@prisma/studio/package.json'), '../dist'),
-        './build/public',
-        {
-          recursive: true,
-          overwrite: true,
-        },
-      )
+      copySync(path.join(require.resolve('@prisma/studio/package.json'), '../dist'), './build/public', {
+        recursive: true,
+        overwrite: true,
+      })
 
       // we copy the contents from checkpoint-client to build
       await copyFile(
-        path.join(
-          require.resolve('checkpoint-client/package.json'),
-          '../dist/child.js',
-        ),
+        path.join(require.resolve('checkpoint-client/package.json'), '../dist/child.js'),
         './build/child.js',
       )
 
       // we copy the contents from xdg-open to build
-      await copyFile(
-        path.join(require.resolve('open/package.json'), '../xdg-open'),
-        './build/xdg-open',
-      )
+      await copyFile(path.join(require.resolve('open/package.json'), '../xdg-open'), './build/xdg-open')
 
       await replaceFirstLine('./build/index.js', '#!/usr/bin/env node\n')
 

diff --git a/packages/cli/helpers/copy-prisma-client.ts b/packages/cli/helpers/copy-prisma-client.ts
@@ -9,9 +9,7 @@ const clientPath = path.dirname(require.resolve('@prisma/client'))
 const clientPkg = require('@prisma/client/package.json')
 
 // we compute the paths of the files that would get npm published
-const clientFiles = (clientPkg.files ?? []).map((file: string) =>
-  path.join(clientPath, file),
-)
+const clientFiles = (clientPkg.files ?? []).map((file: string) => path.join(clientPath, file))
 
 // we copy each file that we found in pkg to a new destination
 for (const file of clientFiles) {

diff --git a/packages/cli/src/CLI.ts b/packages/cli/src/CLI.ts
@@ -1,13 +1,6 @@
 import chalk from 'chalk'
 import type { Command, Commands } from '@prisma/sdk'
-import {
-  arg,
-  isError,
-  format,
-  HelpError,
-  unknownCommand,
-  logger,
-} from '@prisma/sdk'
+import { arg, isError, format, HelpError, unknownCommand, logger } from '@prisma/sdk'
 import { Version } from './Version'
 import { link } from '@prisma/sdk'
 import { ensureBinariesExist } from '@prisma/engines'
@@ -19,10 +12,7 @@ export class CLI implements Command {
   static new(cmds: Commands, ensureBinaries: string[]): CLI {
     return new CLI(cmds, ensureBinaries)
   }
-  private constructor(
-    private readonly cmds: Commands,
-    private readonly ensureBinaries: string[],
-  ) {}
+  private constructor(private readonly cmds: Commands, private readonly ensureBinaries: string[]) {}
 
   async parse(argv: string[]): Promise<string | Error> {
     const args = arg(argv, {
@@ -55,20 +45,14 @@ export class CLI implements Command {
     const cmdName = args._[0]
     // Throw if "lift"
     if (cmdName === 'lift') {
-      throw new Error(
-        `${chalk.red('prisma lift')} has been renamed to ${chalk.green(
-          'prisma migrate',
-        )}`,
-      )
+      throw new Error(`${chalk.red('prisma lift')} has been renamed to ${chalk.green('prisma migrate')}`)
     }
     // warn if "introspect"
     else if (cmdName === 'introspect') {
       logger.warn('')
       logger.warn(
         `${chalk.bold(
-          `The ${chalk.underline(
-            'prisma introspect',
-          )} command is deprecated. Please use ${chalk.green(
+          `The ${chalk.underline('prisma introspect')} command is deprecated. Please use ${chalk.green(
             'prisma db pull',
           )} instead.`,
         )}`,
@@ -85,20 +69,11 @@ export class CLI implements Command {
 
       let argsForCmd: string[]
       if (args['--experimental']) {
-        argsForCmd = [
-          ...args._.slice(1),
-          `--experimental=${args['--experimental']}`,
-        ]
+        argsForCmd = [...args._.slice(1), `--experimental=${args['--experimental']}`]
       } else if (args['--preview-feature']) {
-        argsForCmd = argsForCmd = [
-          ...args._.slice(1),
-          `--preview-feature=${args['--preview-feature']}`,
-        ]
+        argsForCmd = argsForCmd = [...args._.slice(1), `--preview-feature=${args['--preview-feature']}`]
       } else if (args['--early-access-feature']) {
-        argsForCmd = argsForCmd = [
-          ...args._.slice(1),
-          `--early-access-feature=${args['--early-access-feature']}`,
-        ]
+        argsForCmd = argsForCmd = [...args._.slice(1), `--early-access-feature=${args['--early-access-feature']}`]
       } else {
         argsForCmd = args._.slice(1)
       }
@@ -119,9 +94,7 @@ export class CLI implements Command {
   private static help = format(`
     ${
       process.platform === 'win32' ? '' : chalk.bold.green('◭  ')
-    }Prisma is a modern DB toolkit to query, migrate and model your database (${link(
-    'https://prisma.io',
-  )})
+    }Prisma is a modern DB toolkit to query, migrate and model your database (${link('https://prisma.io')})
 
     ${chalk.bold('Usage')}
 

diff --git a/packages/cli/src/Dev.ts b/packages/cli/src/Dev.ts
@@ -10,18 +10,14 @@ export class Dev implements Command {
   // eslint-disable-next-line @typescript-eslint/require-await, @typescript-eslint/no-unused-vars
   async parse(argv: string[]): Promise<string> {
     return format(`
-      ${chalk.redBright(
-        'Prisma CLI does not include a `dev` command any more right now.',
-      )}
+      ${chalk.redBright('Prisma CLI does not include a `dev` command any more right now.')}
 
       If you want to run Prisma Studio, use ${chalk.green('prisma studio')}.
-      If you want to generate the Prisma Client, use ${chalk.green(
-        'prisma generate',
-      )} (or ${chalk.green('prisma generate --watch')})
+      If you want to generate the Prisma Client, use ${chalk.green('prisma generate')} (or ${chalk.green(
+      'prisma generate --watch',
+    )})
       If you want to update your schema, use ${chalk.green('prisma db pull')}.
-      If you want to migrate your database, use ${chalk.green(
-        'prisma migrate',
-      )}.
+      If you want to migrate your database, use ${chalk.green('prisma migrate')}.
     `)
   }
 }
diff --git a/packages/cli/src/Doctor.ts b/packages/cli/src/Doctor.ts
@@ -81,11 +81,7 @@ ${chalk.bold('Examples')}
       )
     }
 
-    console.log(
-      chalk.dim(
-        `Prisma schema loaded from ${path.relative(process.cwd(), schemaPath)}`,
-      ),
-    )
+    console.log(chalk.dim(`Prisma schema loaded from ${path.relative(process.cwd(), schemaPath)}`))
 
     const schema = await readFile(schemaPath, 'utf-8')
     const localDmmf = await getDMMF({ datamodel: schema })
@@ -94,10 +90,7 @@ ${chalk.bold('Examples')}
     console.error(`👩‍⚕️🏥 Prisma Doctor checking the database...`)
 
     const connectionString = config.datasources[0].url
-    const canConnect = await canConnectToDatabase(
-      connectionString.value,
-      path.dirname(schemaPath),
-    )
+    const canConnect = await canConnectToDatabase(connectionString.value, path.dirname(schemaPath))
     if (typeof canConnect !== 'boolean') {
       throw new Error(`${canConnect.code}: ${canConnect.message}`)
     }
@@ -116,18 +109,14 @@ ${chalk.bold('Examples')}
 
     const remoteDmmf = await getDMMF({ datamodel })
 
-    const remoteModels = keyBy(
-      remoteDmmf.datamodel.models,
-      (m) => m.dbName ?? m.name,
-    )
+    const remoteModels = keyBy(remoteDmmf.datamodel.models, (m) => m.dbName ?? m.name)
 
     const modelPairs = localDmmf.datamodel.models.map((localModel) => ({
       localModel,
       remoteModel: remoteModels[localModel.dbName ?? localModel.name],
     }))
 
-    const getFieldName = (f: DMMF.Field) =>
-      f.dbNames && f.dbNames.length > 0 ? f.dbNames[0] : f.name
+    const getFieldName = (f: DMMF.Field) => (f.dbNames && f.dbNames.length > 0 ? f.dbNames[0] : f.name)
 
     const messages: string[] = []
 
@@ -145,12 +134,7 @@ ${chalk.bold('Examples')}
           const remoteField = remoteFields[getFieldName(localField)]
           if (!remoteField) {
             missingFields.push(localField)
-          } else if (
-            !equal(
-              pick(localField, ['type', 'isList']),
-              pick(remoteField, ['type', 'isList']),
-            )
-          ) {
+          } else if (!equal(pick(localField, ['type', 'isList']), pick(remoteField, ['type', 'isList']))) {
             incorrectFieldType.push({ localField, remoteField })
           }
         }
@@ -194,11 +178,7 @@ function printModelMessage({
   missingFields: DMMF.Field[]
   incorrectFieldType: IncorrectFieldTypes
 }) {
-  if (
-    !missingModel &&
-    missingFields.length === 0 &&
-    incorrectFieldType.length === 0
-  ) {
+  if (!missingModel && missingFields.length === 0 && incorrectFieldType.length === 0) {
     return null
   }
   let msg = `${chalk.bold.underline(model.name)}\n`

diff --git a/packages/cli/src/Format.ts b/packages/cli/src/Format.ts
@@ -1,12 +1,5 @@
 import type { Command } from '@prisma/sdk'
-import {
-  arg,
-  format,
-  formatSchema,
-  getDMMF,
-  getSchemaPath,
-  HelpError,
-} from '@prisma/sdk'
+import { arg, format, formatSchema, getDMMF, getSchemaPath, HelpError } from '@prisma/sdk'
 import chalk from 'chalk'
 import fs from 'fs'
 import os from 'os'
@@ -74,11 +67,7 @@ Or specify a Prisma schema path
       )
     }
 
-    console.log(
-      chalk.dim(
-        `Prisma schema loaded from ${path.relative(process.cwd(), schemaPath)}`,
-      ),
-    )
+    console.log(chalk.dim(`Prisma schema loaded from ${path.relative(process.cwd(), schemaPath)}`))
 
     let output = await formatSchema({
       schemaPath,
@@ -93,9 +82,7 @@ Or specify a Prisma schema path
     fs.writeFileSync(schemaPath, output)
     const after = Date.now()
 
-    return `Formatted ${chalk.underline(schemaPath)} in ${formatms(
-      after - before,
-    )} 🚀`
+    return `Formatted ${chalk.underline(schemaPath)} in ${formatms(after - before)} 🚀`
   }
 
   public help(error?: string): string | HelpError {