chore: bump prettier and eslint-plugin-prettier

.prettierrc.yml

@@ -1,5 +1,4 @@
 tabWidth: 2
-trailingComma: all
 singleQuote: true
 semi: false
 printWidth: 120

helpers/blaze/pipe.ts

@@ -45,10 +45,9 @@ pipe.async = pipeAsync
 export declare type PipeMultiSync = {
   <R0, P extends any[]>(...fns: [F.Function<P, R0>]): F.Function<P, R0>
   <R0, R1, P extends any[]>(...fns: [F.Function<P, R0>, F.Function<[R0], R1>]): F.Function<P, R1>
-  <R0, R1, R2, P extends any[]>(...fns: [F.Function<P, R0>, F.Function<[R0], R1>, F.Function<[R1], R2>]): F.Function<
-    P,
-    R2
-  >
+  <R0, R1, R2, P extends any[]>(
+    ...fns: [F.Function<P, R0>, F.Function<[R0], R1>, F.Function<[R1], R2>]
+  ): F.Function<P, R2>
   <R0, R1, R2, R3, P extends any[]>(
     ...fns: [F.Function<P, R0>, F.Function<[R0], R1>, F.Function<[R1], R2>, F.Function<[R2], R3>]
   ): F.Function<P, R3>

package.json

@@ -51,7 +51,7 @@
     "eslint-plugin-eslint-comments": "3.2.0",
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-jest": "27.2.2",
-    "eslint-plugin-prettier": "4.2.1",
+    "eslint-plugin-prettier": "5.0.0",
     "eslint-plugin-simple-import-sort": "10.0.0",
     "eventemitter3": "5.0.1",
     "execa": "5.1.1",
@@ -68,7 +68,7 @@
     "p-reduce": "2.1.0",
     "p-retry": "4.6.2",
     "path-browserify": "1.0.1",
-    "prettier": "2.8.8",
+    "prettier": "3.0.0",
     "redis": "3.1.2",
     "redis-lock": "0.1.4",
     "regenerator-runtime": "0.13.11",

packages/cli/src/CLI.ts

@@ -12,7 +12,10 @@ 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, {

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

@@ -7,7 +7,10 @@ import { TAB_SIZE } from './constants'
 import type { Generatable } from './Generatable'
 
 export class Enum implements Generatable {
-  constructor(protected readonly type: DMMF.SchemaEnum, protected readonly useNamespace: boolean) {}
+  constructor(
+    protected readonly type: DMMF.SchemaEnum,
+    protected readonly useNamespace: boolean,
+  ) {}
 
   private isObjectEnum(): boolean {
     return this.useNamespace && objectEnumNames.includes(this.type.name)

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

@@ -130,7 +130,10 @@ function xorTypes(types: ts.TypeBuilder[]) {
 }
 
 export class InputType implements Generatable {
-  constructor(protected readonly type: DMMF.InputType, protected readonly genericsInfo: GenericArgsInfo) {}
+  constructor(
+    protected readonly type: DMMF.InputType,
+    protected readonly genericsInfo: GenericArgsInfo,
+  ) {}
 
   public toTS(): string {
     const { type } = this

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

@@ -445,8 +445,8 @@ ${
   availableActions.includes(DMMF.ModelAction.aggregate)
     ? `${indent(getMethodJSDoc(DMMF.ModelAction.aggregate, mapping, modelOrType), TAB_SIZE)}
   aggregate<T extends ${getAggregateArgsName(name)}>(args: Subset<T, ${getAggregateArgsName(
-        name,
-      )}>): Prisma.PrismaPromise<${getAggregateGetName(name)}<T>>
+    name,
+  )}>): Prisma.PrismaPromise<${getAggregateGetName(name)}<T>>
 `
     : ''
 }
@@ -511,8 +511,8 @@ ${
           : \`Error: Field "$\{P}" in "orderBy" needs to be provided in "by"\`
       }[OrderFields]
   >(args: SubsetIntersection<T, ${groupByArgsName}, OrderByArg> & InputErrors): {} extends InputErrors ? ${getGroupByPayloadName(
-        name,
-      )}<T> : Prisma.PrismaPromise<InputErrors>`
+    name,
+  )}<T> : Prisma.PrismaPromise<InputErrors>`
     : ''
 }
 /**

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

@@ -5,7 +5,10 @@ import { getFieldRefsTypeName, getRefAllowedTypeName } from '../utils'
 import { Generatable } from './Generatable'
 
 export class ModelFieldRefs implements Generatable {
-  constructor(protected generator: GeneratorConfig | undefined, protected outputType: DMMF.OutputType) {}
+  constructor(
+    protected generator: GeneratorConfig | undefined,
+    protected outputType: DMMF.OutputType,
+  ) {}
   toTS() {
     const { name } = this.outputType
     return `

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

@@ -79,7 +79,10 @@ export class OutputField implements Generatable {
 export class OutputType implements Generatable {
   public name: string
   public fields: DMMF.SchemaField[]
-  constructor(protected readonly dmmf: DMMFHelper, protected readonly type: DMMF.OutputType) {
+  constructor(
+    protected readonly dmmf: DMMFHelper,
+    protected readonly type: DMMF.OutputType,
+  ) {
     this.name = type.name
     this.fields = type.fields
   }

packages/client/src/generation/ts-builders/KeyType.ts

@@ -2,7 +2,10 @@ import { TypeBuilder } from './TypeBuilder'
 import { Writer } from './Writer'
 
 export class KeyType extends TypeBuilder {
-  constructor(public baseType: TypeBuilder, public key: string) {
+  constructor(
+    public baseType: TypeBuilder,
+    public key: string,
+  ) {
     super()
   }
   write(writer: Writer): void {

packages/client/src/generation/ts-builders/Parameter.ts

@@ -4,7 +4,10 @@ import { Writer } from './Writer'
 
 export class Parameter implements BasicBuilder {
   private isOptional = false
-  constructor(private name: string, private type: TypeBuilder) {}
+  constructor(
+    private name: string,
+    private type: TypeBuilder,
+  ) {}
 
   optional(): this {
     this.isOptional = true

packages/client/src/generation/ts-builders/Property.ts

@@ -8,7 +8,10 @@ export class Property implements BasicBuilder {
   private isReadonly = false
   private docComment?: DocComment
 
-  constructor(private name: string, private type: TypeBuilder) {}
+  constructor(
+    private name: string,
+    private type: TypeBuilder,
+  ) {}
 
   optional(): this {
     this.isOptional = true

packages/client/src/generation/ts-builders/TypeDeclaration.ts

@@ -8,7 +8,10 @@ export class TypeDeclaration<InnerType extends TypeBuilder = TypeBuilder> implem
   private genericParameters: GenericParameter[] = []
   private docComment?: DocComment
 
-  constructor(readonly name: string, readonly type: InnerType) {}
+  constructor(
+    readonly name: string,
+    readonly type: InnerType,
+  ) {}
 
   addGenericParameter(param: GenericParameter): this {
     this.genericParameters.push(param)

packages/client/src/generation/ts-builders/Writer.ts

@@ -12,7 +12,10 @@ export class Writer<ContextType = undefined> {
   private marginSymbol?: string
   private afterNextNewLineCallback?: () => void
 
-  constructor(startingIndent = 0, readonly context: ContextType) {
+  constructor(
+    startingIndent = 0,
+    readonly context: ContextType,
+  ) {
     this.currentIndent = startingIndent
   }
 

packages/client/src/runtime/core/errorRendering/ObjectField.ts

@@ -5,7 +5,10 @@ import { Value } from './Value'
 const separator = ': '
 export class ObjectField implements ErrorBasicBuilder {
   private hasError = false
-  constructor(readonly name: string, readonly value: Value) {}
+  constructor(
+    readonly name: string,
+    readonly value: Value,
+  ) {}
 
   markAsError() {
     this.hasError = true

packages/client/src/runtime/core/errorRendering/ObjectFieldSuggestion.ts

@@ -3,7 +3,10 @@ import { SuggestionObjectValue } from './SuggestionObjectValue'
 
 export class ObjectFieldSuggestion implements ErrorBasicBuilder {
   public isRequired = false
-  constructor(readonly name: string, readonly value: string | SuggestionObjectValue) {}
+  constructor(
+    readonly name: string,
+    readonly value: string | SuggestionObjectValue,
+  ) {}
 
   makeRequired() {
     this.isRequired = true

packages/client/src/runtime/core/extensions/MergedExtensionsList.ts

@@ -29,7 +29,10 @@ class MergedExtensionsListNode {
     return previous.concat(newCb)
   })
 
-  constructor(public extension: Args, public previous?: MergedExtensionsListNode) {}
+  constructor(
+    public extension: Args,
+    public previous?: MergedExtensionsListNode,
+  ) {}
 
   getAllComputedFields(dmmfModelName: string): ComputedFieldsMap | undefined {
     return this.computedFieldsCache.getOrCreate(dmmfModelName, () => {

packages/generator-helper/src/GeneratorProcess.ts

@@ -23,7 +23,11 @@ type GeneratorProcessOptions = {
 export class GeneratorError extends Error {
   name = 'GeneratorError'
 
-  constructor(message: string, public code?: number, public data?: any) {
+  constructor(
+    message: string,
+    public code?: number,
+    public data?: any,
+  ) {
     super(message)
     if (data?.stack) {
       this.stack = data.stack
@@ -44,7 +48,10 @@ export class GeneratorProcess {
   private errorLogs = ''
   private pendingError: Error | undefined
 
-  constructor(private pathOrCommand: string, { isNode = false }: GeneratorProcessOptions = {}) {
+  constructor(
+    private pathOrCommand: string,
+    { isNode = false }: GeneratorProcessOptions = {},
+  ) {
     this.isNode = isNode
   }
 

packages/get-platform/src/getPlatform.ts

@@ -133,7 +133,7 @@ export function parseDistro(osReleaseInput: string): DistroInfo {
           targetDistro: 'musl',
           familyDistro: originalDistro,
           originalDistro,
-        } as const),
+        }) as const,
     )
     .with(
       { id: 'raspbian' },
@@ -142,7 +142,7 @@ export function parseDistro(osReleaseInput: string): DistroInfo {
           targetDistro: 'arm',
           familyDistro: 'debian',
           originalDistro,
-        } as const),
+        }) as const,
     )
     .with(
       { id: 'nixos' },
@@ -151,7 +151,7 @@ export function parseDistro(osReleaseInput: string): DistroInfo {
           targetDistro: 'nixos',
           originalDistro,
           familyDistro: 'nixos',
-        } as const),
+        }) as const,
     )
     .with(
       { id: 'debian' },
@@ -161,7 +161,7 @@ export function parseDistro(osReleaseInput: string): DistroInfo {
           targetDistro: 'debian',
           familyDistro: 'debian',
           originalDistro,
-        } as const),
+        }) as const,
     )
     .with(
       { id: 'rhel' },
@@ -172,7 +172,7 @@ export function parseDistro(osReleaseInput: string): DistroInfo {
           targetDistro: 'rhel',
           familyDistro: 'rhel',
           originalDistro,
-        } as const),
+        }) as const,
     )
     .when(
       ({ idLike }) => idLike.includes('debian') || idLike.includes('ubuntu'),
@@ -181,7 +181,7 @@ export function parseDistro(osReleaseInput: string): DistroInfo {
           targetDistro: 'debian',
           familyDistro: 'debian',
           originalDistro,
-        } as const),
+        }) as const,
     )
     .when(
       ({ idLike }) => id === 'arch' || idLike.includes('arch'),
@@ -190,7 +190,7 @@ export function parseDistro(osReleaseInput: string): DistroInfo {
           targetDistro: 'debian',
           familyDistro: 'arch',
           originalDistro,
-        } as const),
+        }) as const,
     )
     .when(
       ({ idLike }) =>
@@ -200,7 +200,7 @@ export function parseDistro(osReleaseInput: string): DistroInfo {
           targetDistro: 'rhel',
           familyDistro: 'rhel',
           originalDistro,
-        } as const),
+        }) as const,
     )
     .otherwise(({ id: originalDistro }) => {
       /* Generic distro info fallback */

packages/internals/src/engine-commands/getDmmf.ts

@@ -80,7 +80,7 @@ export async function getDMMF(options: GetDMMFOptions): Promise<DMMF.Document> {
           reason: 'Error while trying to read the datamodel path',
           error: e as Error,
           datamodelPath: options.datamodelPath,
-        } as const),
+        }) as const,
     ),
     TE.chainW((datamodel) => {
       return pipe(
@@ -103,7 +103,7 @@ export async function getDMMF(options: GetDMMFOptions): Promise<DMMF.Document> {
               type: 'wasm-error' as const,
               reason: '(get-dmmf wasm)',
               error: e as Error | WasmPanic,
-            } as const),
+            }) as const,
         ),
         E.map((result) => ({ result })),
         E.chainW(({ result }) =>

packages/internals/src/engine-commands/validate.ts

@@ -69,7 +69,7 @@ export function validate(options: ValidateOptions): void {
           type: 'wasm-error' as const,
           reason: '(validate wasm)',
           error: e as Error | WasmPanic,
-        } as const),
+        }) as const,
     ),
   )
 

packages/internals/src/get-generators/generatorResolvers/prisma-client-js/auto-installation/getPackageCmd.ts

@@ -8,7 +8,7 @@ import { Command, detect, getCommand } from '@antfu/ni'
  * @returns
  */
 export async function getPackageCmd(cwd: string, cmd: Command, ...args: string[]) {
-  const agent = await detect({ autoInstall: false, cwd, programmatic: true})
+  const agent = await detect({ autoInstall: false, cwd, programmatic: true })
 
   return getCommand(agent ?? 'npm', cmd, args)
 }

packages/internals/src/utils/fs-functional.ts

@@ -41,5 +41,5 @@ function createTaggedSystemError<Tag extends string, Meta extends Record<string,
       type,
       error: e as Error & { code: string },
       meta,
-    } as const)
+    }) as const
 }

packages/internals/src/utils/pick.ts

@@ -1,8 +1,11 @@
 export function pick<T extends object, U extends keyof T>(obj: T, keys: U[]): Pick<T, U> {
-  return Object.entries(obj).reduce<Pick<T, U>>((acc, [key, value]) => {
-    if (keys.includes(key as U)) {
-      acc[key] = value
-    }
-    return acc
-  }, {} as Pick<T, U>)
+  return Object.entries(obj).reduce<Pick<T, U>>(
+    (acc, [key, value]) => {
+      if (keys.includes(key as U)) {
+        acc[key] = value
+      }
+      return acc
+    },
+    {} as Pick<T, U>,
+  )
 }