diff --git a/.yarn/cache/prettier-npm-3.0.3-fced695dae-e10b9af02b.zip b/.yarn/cache/prettier-npm-3.0.3-fced695dae-e10b9af02b.zip deleted file mode 100644 index f1682d4dc..000000000 Binary files a/.yarn/cache/prettier-npm-3.0.3-fced695dae-e10b9af02b.zip and /dev/null differ diff --git a/.yarn/cache/prettier-npm-3.1.0-708d6027b1-44b556bd56.zip b/.yarn/cache/prettier-npm-3.1.0-708d6027b1-44b556bd56.zip new file mode 100644 index 000000000..a305cea6a Binary files /dev/null and b/.yarn/cache/prettier-npm-3.1.0-708d6027b1-44b556bd56.zip differ diff --git a/__tests__/__utils__/assertions.ts b/__tests__/__utils__/assertions.ts index ade8fde4e..64fcac98c 100644 --- a/__tests__/__utils__/assertions.ts +++ b/__tests__/__utils__/assertions.ts @@ -218,10 +218,10 @@ function destringifyProperties(value: unknown) { return Array.isArray(value) ? value.map(destringify) : typeof value === 'object' && value !== null - ? R.mapObjIndexed(destringify, value) - : value === 'null' - ? null - : value + ? R.mapObjIndexed(destringify, value) + : value === 'null' + ? null + : value } function destringify(value: unknown) { diff --git a/packages/server/src/internals/graphql/schema.ts b/packages/server/src/internals/graphql/schema.ts index b30f7d0fe..4003689ed 100644 --- a/packages/server/src/internals/graphql/schema.ts +++ b/packages/server/src/internals/graphql/schema.ts @@ -65,12 +65,12 @@ export type ModelMapping = { ? P[0] : never : '__isTypeOf' extends keyof GetResolver - ? NonNullable['__isTypeOf']> extends ( - ...args: infer P - ) => unknown - ? P[0] + ? NonNullable['__isTypeOf']> extends ( + ...args: infer P + ) => unknown + ? P[0] + : never : never - : never } /** diff --git a/packages/server/src/internals/model.ts b/packages/server/src/internals/model.ts index 0c9a51cc7..0c0cb2aaa 100644 --- a/packages/server/src/internals/model.ts +++ b/packages/server/src/internals/model.ts @@ -11,18 +11,18 @@ import { Connection } from '~/schema/connection/types' export type ModelOf = A.Equals extends 1 ? T : T extends boolean | string | number | null - ? T - : Typename extends keyof Models - ? Models[Typename] - : Typename extends `${string}${'Mutation' | 'Query'}` - ? Record - : T extends { nodes: Array; totalCount: number } - ? Connection> - : T extends (infer U)[] - ? ModelOf[] - : T extends object - ? { [P in keyof T]: ModelOf } - : never + ? T + : Typename extends keyof Models + ? Models[Typename] + : Typename extends `${string}${'Mutation' | 'Query'}` + ? Record + : T extends { nodes: Array; totalCount: number } + ? Connection> + : T extends (infer U)[] + ? ModelOf[] + : T extends object + ? { [P in keyof T]: ModelOf } + : never /** * Given a GraphQL type it returns the name of the GraphQL type as a string. diff --git a/packages/server/src/internals/sentry.ts b/packages/server/src/internals/sentry.ts index e1d32ef94..3f0cd88ce 100644 --- a/packages/server/src/internals/sentry.ts +++ b/packages/server/src/internals/sentry.ts @@ -120,10 +120,10 @@ function stringifyContextValue(value: unknown) { return Array.isArray(value) ? R.map(stringify, value) : typeof value === 'object' && value !== null - ? R.mapObjIndexed(stringify, value) - : value === null - ? JSON.stringify(value) - : value + ? R.mapObjIndexed(stringify, value) + : value === null + ? JSON.stringify(value) + : value } function stringify(value: unknown) { diff --git a/yarn.lock b/yarn.lock index 33d158970..8107c6e78 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16451,11 +16451,11 @@ __metadata: linkType: hard "prettier@npm:^3.0.3": - version: 3.0.3 - resolution: "prettier@npm:3.0.3" + version: 3.1.0 + resolution: "prettier@npm:3.1.0" bin: prettier: bin/prettier.cjs - checksum: e10b9af02b281f6c617362ebd2571b1d7fc9fb8a3bd17e371754428cda992e5e8d8b7a046e8f7d3e2da1dcd21aa001e2e3c797402ebb6111b5cd19609dd228e0 + checksum: 44b556bd56f74d7410974fbb2418bb4e53a894d3e7b42f6f87779f69f27a6c272fa7fc27cec0118cd11730ef3246478052e002cbd87e9a253f9cd04a56aa7d9b languageName: node linkType: hard