diff --git a/src/client/builderExtensions/scalar.test-d.ts b/src/client/builderExtensions/scalar.test-d.ts index 08051dda3..daa8a260c 100644 --- a/src/client/builderExtensions/scalar.test-d.ts +++ b/src/client/builderExtensions/scalar.test-d.ts @@ -16,5 +16,11 @@ Graffle.create({ schema: `foo`, schemaMap }).scalar(`Foo`, _) // @ts-expect-error "Foo" is not a scalar name in the schema. Graffle.create({ schema: `foo`, schemaMap }).scalar(FooScalar) Graffle.create({ schema: `foo`, schemaMap }).scalar(`Date`, _) -Graffle.create({ schema: `foo`, schemaMap }).scalar(DateScalar) Graffle.create({ schema: `foo`, schemaMap }).scalar(`Int`, _) +{ + const graffle = Graffle.create({ schema: `foo`, schemaMap }).scalar(DateScalar) + assertEqual< + typeof graffle._.scalars, + { typesDecoded: Date; typesEncoded: string; map: { Date: typeof DateScalar } } + >() +} diff --git a/src/client/builderExtensions/scalar.ts b/src/client/builderExtensions/scalar.ts index 5609be42e..9d9806c9e 100644 --- a/src/client/builderExtensions/scalar.ts +++ b/src/client/builderExtensions/scalar.ts @@ -40,7 +40,10 @@ type ScalarMethod<$Args extends Builder.Extension.Parameters> + Schema.Scalar.Registry.AddScalar< + $Args['context']['scalars'], + Schema.Scalar<$Name, $Decoded, string> + > > > > diff --git a/src/documentBuilder/InferResult/OutputField.ts b/src/documentBuilder/InferResult/OutputField.ts index 800a7d45f..b2e05202e 100644 --- a/src/documentBuilder/InferResult/OutputField.ts +++ b/src/documentBuilder/InferResult/OutputField.ts @@ -1,4 +1,3 @@ -import type { SimplifyNullable } from '../../lib/prelude.js' import type { TSErrorDescriptive } from '../../lib/ts-error.js' import type { Schema } from '../../types/Schema/__.js' import type { InlineType } from '../../types/SchemaDrivenDataMap/InlineType.js' @@ -15,12 +14,12 @@ export type OutputField<$SelectionSet, $Field extends Schema.OutputField, $Schem : ( | FieldDirectiveInclude<$SelectionSet> | FieldDirectiveSkip<$SelectionSet> - | SimplifyNullable< + | //SimplifyNullable< InlineType.Infer< $Field['inlineType'], FieldType<$Schema, Omit<$SelectionSet, '$'>, $Field['namedType']> > - > + //> ) // dprint-ignore diff --git a/src/documentBuilder/InferResult/OutputObject.ts b/src/documentBuilder/InferResult/OutputObject.ts index 05bab16ff..7e0a17b74 100644 --- a/src/documentBuilder/InferResult/OutputObject.ts +++ b/src/documentBuilder/InferResult/OutputObject.ts @@ -1,6 +1,6 @@ -import type { IsNever, Simplify } from 'type-fest' +import type { IsNever } from 'type-fest' import { assertEqual } from '../../lib/assert-equal.js' -import type { AssertExtendsObject, GetOrNever, SimplifyExcept, StringKeyof } from '../../lib/prelude.js' +import type { AssertExtendsObject, GetOrNever, StringKeyof } from '../../lib/prelude.js' import type { TSErrorDescriptive } from '../../lib/ts-error.js' import type { Schema } from '../../types/Schema/__.js' import type { Select } from '../Select/__.js' @@ -15,11 +15,11 @@ export type OutputObject< $Schema extends Schema, $Node extends Schema.OutputObject > = - SimplifyExcept< - $Schema['scalars']['typesDecoded'], + // SimplifyExcept< + // $Schema['scalars']['typesDecoded'], & OutputObject_<$SelectionSet, $Schema, $Node> & InlineFragmentKeys<$SelectionSet, $Schema, $Node> - > +// > // dprint-ignore type OutputObject_< @@ -27,7 +27,7 @@ type OutputObject_< $Schema extends Schema, $Node extends Schema.OutputObject, > = - Simplify< + // Simplify< Select.SelectScalarsWildcard.IsSelectScalarsWildcard<$SelectionSet> extends true // todo this needs to be an extension and/or only available when sddm is present // todo what about when scalars wildcard is combined with other fields like relations? @@ -35,7 +35,7 @@ type OutputObject_< : & NonAliasKeys<$SelectionSet, $Schema, $Node> & Alias<$Schema, $Node, $SelectionSet> - > +// > // dprint-ignore type NonAliasKeys<$SelectionSet, $Schema extends Schema, $Node extends Schema.OutputObject> = { diff --git a/src/documentBuilder/InferResult/__.test-d.ts b/src/documentBuilder/InferResult/__.test-d.ts index 1e96588bc..75bb08c2f 100644 --- a/src/documentBuilder/InferResult/__.test-d.ts +++ b/src/documentBuilder/InferResult/__.test-d.ts @@ -1,13 +1,13 @@ -import type { Simplify } from 'type-fest' import type { DateScalar } from '../../../tests/_/fixtures/scalars.js' import type { db } from '../../../tests/_/schemas/db.js' import type { Schema } from '../../../tests/_/schemas/kitchen-sink/graffle/modules/schema.js' import type * as SelectionSets from '../../../tests/_/schemas/kitchen-sink/graffle/modules/selection-sets.js' import { assertEqual } from '../../lib/assert-equal.js' +import type { SimplifyDeep } from '../../lib/prelude.js' import type { Registry } from '../../types/Schema/nodes/Scalar/helpers.js' import type { InferResult } from './__.js' -type $<$SelectionSet extends SelectionSets.Query> = Simplify> +type $<$SelectionSet extends SelectionSets.Query> = SimplifyDeep> type $Registry = Registry.AddScalar diff --git a/src/documentBuilder/requestMethods/document.ts b/src/documentBuilder/requestMethods/document.ts index 3e94f3700..e46f84207 100644 --- a/src/documentBuilder/requestMethods/document.ts +++ b/src/documentBuilder/requestMethods/document.ts @@ -1,10 +1,10 @@ -import type { Simplify, UnionToTuple } from 'type-fest' +import type { UnionToTuple } from 'type-fest' import type { Context } from '../../client/context.js' import { type HandleOutput } from '../../client/handleOutput.js' import type { InferResult } from '../../documentBuilder/InferResult/__.js' import type { Select } from '../../documentBuilder/Select/__.js' import type { Schema } from '../../entrypoints/schema.js' -import type { IsTupleMultiple } from '../../lib/prelude.js' +import type { IsTupleMultiple, SimplifyDeepExcept } from '../../lib/prelude.js' // dprint-ignore export type DocumentRunner< @@ -18,7 +18,8 @@ export type DocumentRunner< const $Name extends string = $Params extends [] ? $$Name : $Params[0], >(...params: $Params) => Promise< - Simplify< + SimplifyDeepExcept< + $$Context['scalars']['typesDecoded'], HandleOutput< $$Context, InferResult.Operation< diff --git a/src/documentBuilder/requestMethods/requestMethods.test-d.ts b/src/documentBuilder/requestMethods/requestMethods.test-d.ts index 794cb422f..5939a98a5 100644 --- a/src/documentBuilder/requestMethods/requestMethods.test-d.ts +++ b/src/documentBuilder/requestMethods/requestMethods.test-d.ts @@ -7,6 +7,7 @@ import * as Schema from '../../../tests/_/schemas/kitchen-sink/schema.js' // import { Graffle as Pokemon } from '../../../tests/_/schemas/pokemon/graffle/__.js' const graffle = Graffle.create({ schema: Schema.schema }).scalar(DateScalar) +graffle._.scalars.typesDecoded // dprint-ignore test(`query`, async () => { @@ -21,7 +22,6 @@ test(`query`, async () => { expectTypeOf>().toEqualTypeOf<[input: Graffle.SelectionSets.Query.stringWithRequiredArg]>() // scalar custom expectTypeOf(await graffle.query.date()).toMatchTypeOf() - // scalar with explicit indicators // positive indicator expectTypeOf(await graffle.query.idNonNull(true)).toEqualTypeOf() diff --git a/src/entrypoints/utilities-for-generated.ts b/src/entrypoints/utilities-for-generated.ts index 0c07cade7..9de94f48c 100644 --- a/src/entrypoints/utilities-for-generated.ts +++ b/src/entrypoints/utilities-for-generated.ts @@ -8,6 +8,8 @@ export { type AssertExtendsObject, type Exact, type ExactNonEmpty, + type SimplifyDeep, + type SimplifyDeepExcept, type SimplifyExcept, type UnionExpanded, } from '../lib/prelude.js' diff --git a/src/extensions/SchemaErrors/tests/fixture/graffle/modules/methods-root.ts b/src/extensions/SchemaErrors/tests/fixture/graffle/modules/methods-root.ts index cb7eb7e8e..897743b7a 100644 --- a/src/extensions/SchemaErrors/tests/fixture/graffle/modules/methods-root.ts +++ b/src/extensions/SchemaErrors/tests/fixture/graffle/modules/methods-root.ts @@ -7,7 +7,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { $batch: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutput< $Context, @@ -16,7 +16,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { > > __typename: () => Promise< - $$Utilities.Simplify< + $$Utilities.SimplifyDeep< $$Utilities.HandleOutputGraffleRootField< $Context, { __typename: 'Query' }, @@ -28,7 +28,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { InputObjectNested: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.InputObjectNested<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -41,7 +41,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { InputObjectNestedNonNull: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.InputObjectNestedNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -56,7 +56,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { abcEnum: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.abcEnum<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -69,7 +69,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { argInputObjectCircular: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.argInputObjectCircular<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -82,7 +82,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { date: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.date<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -95,7 +95,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateArg: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateArg<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -108,7 +108,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateArgInputObject: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateArgInputObject<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -121,7 +121,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateArgList: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateArgList<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -134,7 +134,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateArgNonNull: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateArgNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -147,7 +147,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateArgNonNullList: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateArgNonNullList<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -163,7 +163,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { $$SelectionSets.Query.dateArgNonNullListNonNull<$Context['scalars']> >, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -176,7 +176,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateInterface1: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateInterface1<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -189,7 +189,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateList: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateList<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -202,7 +202,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateListList: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateListList<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -215,7 +215,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateListNonNull: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateListNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -228,7 +228,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateNonNull: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -241,7 +241,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateObject1: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateObject1<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -254,7 +254,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateUnion: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateUnion<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -267,7 +267,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { error: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.error<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -280,7 +280,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { id: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.id<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -293,7 +293,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { idNonNull: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.idNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -306,7 +306,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { interface: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.$interface<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -319,7 +319,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { interfaceNonNull: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.interfaceNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -332,7 +332,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { interfaceWithArgs: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.interfaceWithArgs<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -345,7 +345,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { listInt: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.listInt<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -358,7 +358,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { listIntNonNull: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.listIntNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -371,7 +371,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { listListInt: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.listListInt<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -384,7 +384,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { listListIntNonNull: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.listListIntNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -397,7 +397,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { lowerCaseUnion: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.lowerCaseUnion<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -410,7 +410,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { object: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.$object<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -423,7 +423,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { objectList: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.objectList<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -436,7 +436,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { objectListNonNull: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.objectListNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -449,7 +449,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { objectNested: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.objectNested<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -462,7 +462,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { objectNonNull: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.objectNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -475,7 +475,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { objectWithArgs: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.objectWithArgs<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -488,7 +488,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { result: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.result<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -501,7 +501,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { resultNonNull: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.resultNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -514,7 +514,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { string: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.$string<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -527,7 +527,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { stringWithArgEnum: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.stringWithArgEnum<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -543,7 +543,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { $$SelectionSets.Query.stringWithArgInputObject<$Context['scalars']> >, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -559,7 +559,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { $$SelectionSets.Query.stringWithArgInputObjectRequired<$Context['scalars']> >, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -577,7 +577,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { stringWithArgs: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.stringWithArgs<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -590,7 +590,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { stringWithListArg: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.stringWithListArg<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -606,7 +606,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { $$SelectionSets.Query.stringWithListArgRequired<$Context['scalars']> >, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -619,7 +619,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { stringWithRequiredArg: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.stringWithRequiredArg<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -632,7 +632,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { unionFooBar: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.unionFooBar<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -645,7 +645,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { unionFooBarNonNull: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.unionFooBarNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -658,7 +658,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { unionFooBarWithArgs: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.unionFooBarWithArgs<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -671,7 +671,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { unionObject: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.unionObject<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -684,7 +684,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { unionObjectNonNull: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.unionObjectNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -699,7 +699,7 @@ export interface MutationMethods<$Context extends $$Utilities.Context> { $batch: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Mutation<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutput< $Context, @@ -711,7 +711,7 @@ export interface MutationMethods<$Context extends $$Utilities.Context> { > > __typename: () => Promise< - $$Utilities.Simplify< + $$Utilities.SimplifyDeep< $$Utilities.HandleOutputGraffleRootField< $Context, { __typename: 'Mutation' }, @@ -723,7 +723,7 @@ export interface MutationMethods<$Context extends $$Utilities.Context> { id: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Mutation.id<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -736,7 +736,7 @@ export interface MutationMethods<$Context extends $$Utilities.Context> { idNonNull: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Mutation.idNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, diff --git a/src/generator/generator/__snapshots__/generate.test.ts.snap b/src/generator/generator/__snapshots__/generate.test.ts.snap index 4e3fdb3da..edb7f262f 100644 --- a/src/generator/generator/__snapshots__/generate.test.ts.snap +++ b/src/generator/generator/__snapshots__/generate.test.ts.snap @@ -163,7 +163,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { $batch: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutput< $Context, @@ -172,7 +172,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { > > __typename: () => Promise< - $$Utilities.Simplify< + $$Utilities.SimplifyDeep< $$Utilities.HandleOutputGraffleRootField< $Context, { __typename: 'Query' }, @@ -184,7 +184,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { InputObjectNested: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.InputObjectNested<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -197,7 +197,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { InputObjectNestedNonNull: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.InputObjectNestedNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -212,7 +212,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { abcEnum: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.abcEnum<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -225,7 +225,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { argInputObjectCircular: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.argInputObjectCircular<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -238,7 +238,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { date: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.date<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -251,7 +251,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateArg: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateArg<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -264,7 +264,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateArgInputObject: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateArgInputObject<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -277,7 +277,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateArgList: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateArgList<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -290,7 +290,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateArgNonNull: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateArgNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -303,7 +303,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateArgNonNullList: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateArgNonNullList<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -319,7 +319,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { $$SelectionSets.Query.dateArgNonNullListNonNull<$Context['scalars']> >, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -332,7 +332,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateInterface1: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateInterface1<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -345,7 +345,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateList: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateList<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -358,7 +358,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateListList: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateListList<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -371,7 +371,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateListNonNull: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateListNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -384,7 +384,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateNonNull: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -397,7 +397,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateObject1: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateObject1<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -410,7 +410,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateUnion: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateUnion<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -423,7 +423,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { error: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.error<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -436,7 +436,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { id: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.id<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -449,7 +449,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { idNonNull: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.idNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -462,7 +462,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { interface: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.$interface<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -475,7 +475,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { interfaceNonNull: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.interfaceNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -488,7 +488,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { interfaceWithArgs: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.interfaceWithArgs<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -501,7 +501,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { listInt: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.listInt<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -514,7 +514,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { listIntNonNull: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.listIntNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -527,7 +527,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { listListInt: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.listListInt<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -540,7 +540,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { listListIntNonNull: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.listListIntNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -553,7 +553,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { lowerCaseUnion: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.lowerCaseUnion<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -566,7 +566,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { object: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.$object<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -579,7 +579,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { objectList: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.objectList<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -592,7 +592,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { objectListNonNull: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.objectListNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -605,7 +605,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { objectNested: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.objectNested<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -618,7 +618,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { objectNonNull: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.objectNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -631,7 +631,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { objectWithArgs: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.objectWithArgs<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -644,7 +644,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { result: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.result<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -657,7 +657,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { resultNonNull: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.resultNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -670,7 +670,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { string: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.$string<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -683,7 +683,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { stringWithArgEnum: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.stringWithArgEnum<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -699,7 +699,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { $$SelectionSets.Query.stringWithArgInputObject<$Context['scalars']> >, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -715,7 +715,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { $$SelectionSets.Query.stringWithArgInputObjectRequired<$Context['scalars']> >, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -733,7 +733,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { stringWithArgs: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.stringWithArgs<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -746,7 +746,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { stringWithListArg: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.stringWithListArg<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -762,7 +762,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { $$SelectionSets.Query.stringWithListArgRequired<$Context['scalars']> >, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -775,7 +775,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { stringWithRequiredArg: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.stringWithRequiredArg<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -788,7 +788,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { unionFooBar: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.unionFooBar<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -801,7 +801,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { unionFooBarNonNull: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.unionFooBarNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -814,7 +814,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { unionFooBarWithArgs: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.unionFooBarWithArgs<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -827,7 +827,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { unionObject: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.unionObject<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -840,7 +840,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { unionObjectNonNull: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.unionObjectNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -855,7 +855,7 @@ export interface MutationMethods<$Context extends $$Utilities.Context> { $batch: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Mutation<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutput< $Context, @@ -867,7 +867,7 @@ export interface MutationMethods<$Context extends $$Utilities.Context> { > > __typename: () => Promise< - $$Utilities.Simplify< + $$Utilities.SimplifyDeep< $$Utilities.HandleOutputGraffleRootField< $Context, { __typename: 'Mutation' }, @@ -879,7 +879,7 @@ export interface MutationMethods<$Context extends $$Utilities.Context> { id: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Mutation.id<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -892,7 +892,7 @@ export interface MutationMethods<$Context extends $$Utilities.Context> { idNonNull: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Mutation.idNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -7731,7 +7731,7 @@ export interface QueryRootMethods<$Context extends $$Utilities.Context> { $$SelectionSets.QueryRoot<$Context["scalars"]> >, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context["scalars"]["typesDecoded"], $$Utilities.HandleOutput< $Context, @@ -7743,7 +7743,7 @@ export interface QueryRootMethods<$Context extends $$Utilities.Context> { > >; __typename: () => Promise< - $$Utilities.Simplify< + $$Utilities.SimplifyDeep< $$Utilities.HandleOutputGraffleRootField< $Context, { __typename: "QueryRoot" }, @@ -7758,7 +7758,7 @@ export interface QueryRootMethods<$Context extends $$Utilities.Context> { $$SelectionSets.QueryRoot.id<$Context["scalars"]> >, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context["scalars"]["typesDecoded"], $$Utilities.HandleOutputGraffleRootField< $Context, diff --git a/src/generator/generators/MethodsRoot.ts b/src/generator/generators/MethodsRoot.ts index 528608742..352da48f1 100644 --- a/src/generator/generators/MethodsRoot.ts +++ b/src/generator/generators/MethodsRoot.ts @@ -54,7 +54,7 @@ const renderRootType = createCodeGenerator<{ node: Grafaid.Schema.ObjectType }>( export interface ${node.name}Methods<$Context extends ${identifiers.$$Utilities}.Context> { $batch: <$SelectionSet>(selectionSet: ${identifiers.$$Utilities}.Exact<$SelectionSet, ${identifiers.$$SelectionSets}.${node.name}<$Context['scalars']>>) => Promise< - ${identifiers.$$Utilities}.SimplifyExcept< + ${identifiers.$$Utilities}.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], ${identifiers.$$Utilities}.HandleOutput< $Context, @@ -64,7 +64,7 @@ const renderRootType = createCodeGenerator<{ node: Grafaid.Schema.ObjectType }>( > __typename: () => Promise< - ${identifiers.$$Utilities}.Simplify< + ${identifiers.$$Utilities}.SimplifyDeep< ${identifiers.$$Utilities}.HandleOutputGraffleRootField< $Context, { __typename: '${node.name}' }, @@ -91,7 +91,7 @@ const renderFieldMethods = createCodeGenerator<{ node: Grafaid.Schema.ObjectType code(` ${field.name}: <$SelectionSet>(selectionSet${isOptional ? `?` : ``}: ${identifiers.$$Utilities}.Exact<$SelectionSet, ${identifiers.$$SelectionSets}.${renderName(node)}.${renderName(field)}<$Context['scalars']>>) => Promise< - ${identifiers.$$Utilities}.SimplifyExcept< + ${identifiers.$$Utilities}.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], ${identifiers.$$Utilities}.HandleOutputGraffleRootField< $Context, diff --git a/src/lib/prelude.test-d.ts b/src/lib/prelude.test-d.ts index 06ed2e2f6..6c53c50e0 100644 --- a/src/lib/prelude.test-d.ts +++ b/src/lib/prelude.test-d.ts @@ -1,9 +1,18 @@ import { assertEqual } from './assert-equal.js' -import { type OmitKeysWithPrefix, type ToParameters, type Tuple } from './prelude.js' +import { type OmitKeysWithPrefix, type SimplifyDeepExcept, type ToParameters, type Tuple } from './prelude.js' // dprint-ignore { + +assertEqual , null | Date>() +assertEqual , {}>() +assertEqual , { a: Date }>() +assertEqual , { a: 1 }>() +assertEqual , { a: { b: Date } }>() +assertEqual , { a: { b: Date } }>() +assertEqual , { a: null | { b: Date } }>() + // assertEqual, true>() // assertEqual, true>() // assertEqual , false>() diff --git a/src/lib/prelude.ts b/src/lib/prelude.ts index 98ad04494..d293180ac 100644 --- a/src/lib/prelude.ts +++ b/src/lib/prelude.ts @@ -694,14 +694,6 @@ export const isObjectEmpty = (object: Record) => { export const toArray = (value: T | T[]) => Array.isArray(value) ? value : [value] -// dprint-ignore -export type SimplifyExcept<$ExcludeType, $Type> = - IsAny<$ExcludeType> extends true - ? Simplify<$Type> - : $Type extends $ExcludeType - ? $Type - : {[TypeKey in keyof $Type]: $Type[TypeKey]} - export const __: () => never = () => { throw new Error(`not implemented`) } @@ -753,16 +745,66 @@ type UnionValue = U extends any ? K extends keyof U ? : never : never -// // dprint-ignore -// export type IsAnyUnionMemberExtends = -// true extends IsAnyUnionMemberExtends_ -// ? true -// : false - -// // dprint-ignore -// type IsAnyUnionMemberExtends_ = -// T extends any -// ? T extends U -// ? true -// : never -// : never +// dprint-ignore +export type IsAnyUnionMemberExtends = + true extends IsAnyUnionMemberExtends_ + ? true + : false + +// dprint-ignore +type IsAnyUnionMemberExtends_ = + T extends any + ? T extends U + ? true + : never + : never + +// todo move these into DB lib +// dprint-ignore + +export type SimplifyExcept<$ExcludeType, $Type> = + IsAny<$ExcludeType> extends true + ? Simplify<$Type> + : $Type extends $ExcludeType + ? $Type + : {[TypeKey in keyof $Type]: $Type[TypeKey]} + +export type SimplifyDeep = SimplifyDeepExcept + +// dprint-ignore +export type SimplifyDeepExcept<$ExcludeType, $Type> = + IsExtendsExclude | Response | Error, $Type> extends true + ? $Type + : | ( + SimplifyDeepExcept_ | Response | Error, $Type> + & {} + ) + | ( + null extends $Type + ? null + : never + ) + | ( + undefined extends $Type + ? undefined + : never + ) + +// dprint-ignore +type SimplifyDeepExcept_<$ExcludeType, $Type> = + $Type extends object + ? & { + [$Key in keyof $Type]: SimplifyDeepExcept<$ExcludeType, $Type[$Key]> + } + & {} + : $Type + +// dprint-ignore +type IsExtendsExclude<$ExcludeType, $Type> = + IsAny<$ExcludeType> extends false + ? IsAnyUnionMemberExtends<$Type, $ExcludeType> extends true + ? true + : false + : false + +export type AnyAndUnknownToNever = IsAny extends true ? never : IsUnknown extends true ? never : T diff --git a/src/types/Schema/nodes/Scalar/helpers.ts b/src/types/Schema/nodes/Scalar/helpers.ts index 0c704adbd..a145bcd12 100644 --- a/src/types/Schema/nodes/Scalar/helpers.ts +++ b/src/types/Schema/nodes/Scalar/helpers.ts @@ -1,3 +1,4 @@ +import type { AnyAndUnknownToNever } from '../../../../lib/prelude.js' import { String } from '../../StandardTypes/scalar.js' import type { Mapper } from './codec.js' import type { Scalar } from './Scalar.js' @@ -28,9 +29,9 @@ export namespace Registry { } as Registry.Empty export type AddScalar<$Registry extends Registry, $Scalar extends Scalar> = { - map: $Registry['map'] & { [$Key in $Scalar['name']]: $Scalar } - typesEncoded: $Registry['typesEncoded'] | GetEncoded<$Scalar> - typesDecoded: $Registry['typesDecoded'] | GetDecoded<$Scalar> + map: $Registry['map'] & { [_ in $Scalar['name']]: $Scalar } + typesEncoded: AnyAndUnknownToNever<$Registry['typesEncoded']> | GetEncoded<$Scalar> + typesDecoded: AnyAndUnknownToNever<$Registry['typesDecoded']> | GetDecoded<$Scalar> } } diff --git a/tests/_/helpers.ts b/tests/_/helpers.ts index 02738bbe1..8cc5a4e12 100644 --- a/tests/_/helpers.ts +++ b/tests/_/helpers.ts @@ -158,10 +158,13 @@ export const test = testBase.extend({ // kitchenSink.anyware(async ({ encode }) => { // encode({ input: {}}) // }) + // @ts-expect-error fixme await use(kitchenSink) }, kitchenSinkHttp: async ({ fetch: _ }, use) => { const kitchenSink = KitchenSink.create({ schema: `https://foo.io/api/graphql` }) + kitchenSink._.extensions + // @ts-expect-error fixme await use(kitchenSink) }, kitchenSinkData: async ({}, use) => { // eslint-disable-line diff --git a/tests/_/schemas/kitchen-sink/graffle/modules/methods-root.ts b/tests/_/schemas/kitchen-sink/graffle/modules/methods-root.ts index a0cacb7d8..d23b624f5 100644 --- a/tests/_/schemas/kitchen-sink/graffle/modules/methods-root.ts +++ b/tests/_/schemas/kitchen-sink/graffle/modules/methods-root.ts @@ -7,7 +7,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { $batch: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutput< $Context, @@ -16,7 +16,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { > > __typename: () => Promise< - $$Utilities.Simplify< + $$Utilities.SimplifyDeep< $$Utilities.HandleOutputGraffleRootField< $Context, { __typename: 'Query' }, @@ -28,7 +28,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { InputObjectNested: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.InputObjectNested<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -41,7 +41,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { InputObjectNestedNonNull: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.InputObjectNestedNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -56,7 +56,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { abcEnum: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.abcEnum<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -69,7 +69,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { argInputObjectCircular: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.argInputObjectCircular<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -82,7 +82,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { date: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.date<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -95,7 +95,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateArg: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateArg<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -108,7 +108,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateArgInputObject: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateArgInputObject<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -121,7 +121,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateArgList: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateArgList<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -134,7 +134,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateArgNonNull: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateArgNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -147,7 +147,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateArgNonNullList: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateArgNonNullList<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -163,7 +163,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { $$SelectionSets.Query.dateArgNonNullListNonNull<$Context['scalars']> >, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -176,7 +176,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateInterface1: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateInterface1<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -189,7 +189,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateList: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateList<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -202,7 +202,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateListList: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateListList<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -215,7 +215,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateListNonNull: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateListNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -228,7 +228,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateNonNull: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -241,7 +241,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateObject1: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateObject1<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -254,7 +254,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { dateUnion: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.dateUnion<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -267,7 +267,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { error: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.error<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -280,7 +280,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { id: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.id<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -293,7 +293,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { idNonNull: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.idNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -306,7 +306,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { interface: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.$interface<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -319,7 +319,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { interfaceNonNull: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.interfaceNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -332,7 +332,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { interfaceWithArgs: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.interfaceWithArgs<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -345,7 +345,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { listInt: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.listInt<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -358,7 +358,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { listIntNonNull: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.listIntNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -371,7 +371,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { listListInt: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.listListInt<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -384,7 +384,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { listListIntNonNull: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.listListIntNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -397,7 +397,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { lowerCaseUnion: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.lowerCaseUnion<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -410,7 +410,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { object: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.$object<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -423,7 +423,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { objectList: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.objectList<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -436,7 +436,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { objectListNonNull: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.objectListNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -449,7 +449,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { objectNested: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.objectNested<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -462,7 +462,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { objectNonNull: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.objectNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -475,7 +475,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { objectWithArgs: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.objectWithArgs<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -488,7 +488,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { result: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.result<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -501,7 +501,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { resultNonNull: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.resultNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -514,7 +514,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { string: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.$string<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -527,7 +527,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { stringWithArgEnum: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.stringWithArgEnum<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -543,7 +543,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { $$SelectionSets.Query.stringWithArgInputObject<$Context['scalars']> >, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -559,7 +559,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { $$SelectionSets.Query.stringWithArgInputObjectRequired<$Context['scalars']> >, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -577,7 +577,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { stringWithArgs: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.stringWithArgs<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -590,7 +590,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { stringWithListArg: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.stringWithListArg<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -606,7 +606,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { $$SelectionSets.Query.stringWithListArgRequired<$Context['scalars']> >, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -619,7 +619,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { stringWithRequiredArg: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.stringWithRequiredArg<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -632,7 +632,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { unionFooBar: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.unionFooBar<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -645,7 +645,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { unionFooBarNonNull: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.unionFooBarNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -658,7 +658,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { unionFooBarWithArgs: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.unionFooBarWithArgs<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -671,7 +671,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { unionObject: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.unionObject<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -684,7 +684,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { unionObjectNonNull: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.unionObjectNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -699,7 +699,7 @@ export interface MutationMethods<$Context extends $$Utilities.Context> { $batch: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Mutation<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutput< $Context, @@ -711,7 +711,7 @@ export interface MutationMethods<$Context extends $$Utilities.Context> { > > __typename: () => Promise< - $$Utilities.Simplify< + $$Utilities.SimplifyDeep< $$Utilities.HandleOutputGraffleRootField< $Context, { __typename: 'Mutation' }, @@ -723,7 +723,7 @@ export interface MutationMethods<$Context extends $$Utilities.Context> { id: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Mutation.id<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -736,7 +736,7 @@ export interface MutationMethods<$Context extends $$Utilities.Context> { idNonNull: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Mutation.idNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, diff --git a/tests/_/schemas/mutation-only/graffle/modules/methods-root.ts b/tests/_/schemas/mutation-only/graffle/modules/methods-root.ts index e4f4f1966..30c8045f5 100644 --- a/tests/_/schemas/mutation-only/graffle/modules/methods-root.ts +++ b/tests/_/schemas/mutation-only/graffle/modules/methods-root.ts @@ -7,7 +7,7 @@ export interface MutationMethods<$Context extends $$Utilities.Context> { $batch: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Mutation<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutput< $Context, @@ -19,7 +19,7 @@ export interface MutationMethods<$Context extends $$Utilities.Context> { > > __typename: () => Promise< - $$Utilities.Simplify< + $$Utilities.SimplifyDeep< $$Utilities.HandleOutputGraffleRootField< $Context, { __typename: 'Mutation' }, @@ -31,7 +31,7 @@ export interface MutationMethods<$Context extends $$Utilities.Context> { id: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Mutation.id<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -44,7 +44,7 @@ export interface MutationMethods<$Context extends $$Utilities.Context> { idNonNull: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Mutation.idNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, diff --git a/tests/_/schemas/pokemon/graffle/modules/methods-root.ts b/tests/_/schemas/pokemon/graffle/modules/methods-root.ts index 6561270b5..2b3477c54 100644 --- a/tests/_/schemas/pokemon/graffle/modules/methods-root.ts +++ b/tests/_/schemas/pokemon/graffle/modules/methods-root.ts @@ -7,7 +7,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { $batch: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutput< $Context, @@ -16,7 +16,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { > > __typename: () => Promise< - $$Utilities.Simplify< + $$Utilities.SimplifyDeep< $$Utilities.HandleOutputGraffleRootField< $Context, { __typename: 'Query' }, @@ -28,7 +28,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { battles: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.battles<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -41,7 +41,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { beings: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.beings<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -54,7 +54,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { pokemonByName: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.pokemonByName<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -67,7 +67,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { pokemons: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.pokemons<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -80,7 +80,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { trainerByName: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.trainerByName<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -93,7 +93,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { trainers: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.trainers<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -108,7 +108,7 @@ export interface MutationMethods<$Context extends $$Utilities.Context> { $batch: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Mutation<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutput< $Context, @@ -120,7 +120,7 @@ export interface MutationMethods<$Context extends $$Utilities.Context> { > > __typename: () => Promise< - $$Utilities.Simplify< + $$Utilities.SimplifyDeep< $$Utilities.HandleOutputGraffleRootField< $Context, { __typename: 'Mutation' }, @@ -132,7 +132,7 @@ export interface MutationMethods<$Context extends $$Utilities.Context> { addPokemon: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Mutation.addPokemon<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, diff --git a/tests/_/schemas/pokemon/singleton.ts b/tests/_/schemas/pokemon/singleton.ts new file mode 100644 index 000000000..937a6d58b --- /dev/null +++ b/tests/_/schemas/pokemon/singleton.ts @@ -0,0 +1,4 @@ +import { Graffle } from './graffle/__.js' +import { schema } from './schema.js' + +export const pokemon = Graffle.create({ schema }) diff --git a/tests/_/schemas/query-only/graffle/modules/methods-root.ts b/tests/_/schemas/query-only/graffle/modules/methods-root.ts index 66f699136..c1e8b9442 100644 --- a/tests/_/schemas/query-only/graffle/modules/methods-root.ts +++ b/tests/_/schemas/query-only/graffle/modules/methods-root.ts @@ -7,7 +7,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { $batch: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutput< $Context, @@ -16,7 +16,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { > > __typename: () => Promise< - $$Utilities.Simplify< + $$Utilities.SimplifyDeep< $$Utilities.HandleOutputGraffleRootField< $Context, { __typename: 'Query' }, @@ -28,7 +28,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { id: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.id<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -41,7 +41,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { idNonNull: <$SelectionSet>( selectionSet?: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.idNonNull<$Context['scalars']>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context['scalars']['typesDecoded'], $$Utilities.HandleOutputGraffleRootField< $Context, diff --git a/website/graffle/modules/methods-root.ts b/website/graffle/modules/methods-root.ts index 44cc356a3..89499522e 100644 --- a/website/graffle/modules/methods-root.ts +++ b/website/graffle/modules/methods-root.ts @@ -7,7 +7,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { $batch: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query<$Context["scalars"]>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context["scalars"]["typesDecoded"], $$Utilities.HandleOutput< $Context, @@ -16,7 +16,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { > >; __typename: () => Promise< - $$Utilities.Simplify< + $$Utilities.SimplifyDeep< $$Utilities.HandleOutputGraffleRootField< $Context, { __typename: "Query" }, @@ -28,7 +28,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { battles: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.battles<$Context["scalars"]>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context["scalars"]["typesDecoded"], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -41,7 +41,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { beings: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.beings<$Context["scalars"]>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context["scalars"]["typesDecoded"], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -54,7 +54,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { pokemonByName: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.pokemonByName<$Context["scalars"]>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context["scalars"]["typesDecoded"], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -67,7 +67,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { pokemons: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.pokemons<$Context["scalars"]>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context["scalars"]["typesDecoded"], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -80,7 +80,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { trainerByName: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.trainerByName<$Context["scalars"]>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context["scalars"]["typesDecoded"], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -93,7 +93,7 @@ export interface QueryMethods<$Context extends $$Utilities.Context> { trainers: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Query.trainers<$Context["scalars"]>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context["scalars"]["typesDecoded"], $$Utilities.HandleOutputGraffleRootField< $Context, @@ -108,7 +108,7 @@ export interface MutationMethods<$Context extends $$Utilities.Context> { $batch: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Mutation<$Context["scalars"]>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context["scalars"]["typesDecoded"], $$Utilities.HandleOutput< $Context, @@ -120,7 +120,7 @@ export interface MutationMethods<$Context extends $$Utilities.Context> { > >; __typename: () => Promise< - $$Utilities.Simplify< + $$Utilities.SimplifyDeep< $$Utilities.HandleOutputGraffleRootField< $Context, { __typename: "Mutation" }, @@ -132,7 +132,7 @@ export interface MutationMethods<$Context extends $$Utilities.Context> { addPokemon: <$SelectionSet>( selectionSet: $$Utilities.Exact<$SelectionSet, $$SelectionSets.Mutation.addPokemon<$Context["scalars"]>>, ) => Promise< - $$Utilities.SimplifyExcept< + $$Utilities.SimplifyDeepExcept< $Context["scalars"]["typesDecoded"], $$Utilities.HandleOutputGraffleRootField< $Context,