fix(document-builder): directive optional selection

graffle-js · Nov 18, 2024 · 1dd9ffa · 1dd9ffa
1 parent 3535e9e
commit 1dd9ffa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/documentBuilder/InferResult/OutputObject.ts b/src/documentBuilder/InferResult/OutputObject.ts
@@ -60,15 +60,11 @@ type InlineFragmentKey_<$SelectionSet extends object, $Schema extends Schema, $N
     : IsNeverViaDirective<$SelectionSet> extends true
       ? {}
       : IsNullableViaDirective<$SelectionSet> extends true
-        ? MakeObjectSelectionResultNullable<
+        ? Partial<
             OutputObject_<OmitDirectiveAndArgumentKeys<$SelectionSet>, $Schema, $Node>
           >
         : OutputObject_<OmitDirectiveAndArgumentKeys<$SelectionSet>, $Schema, $Node>
 
-type MakeObjectSelectionResultNullable<$Result extends object> = {
-  [_ in keyof $Result]: null | $Result[_]
-}
-
 // dprint-ignore
 type PickPositiveIndicatorAndNotAlias<$SelectionSet> = StringKeyof<
   {

diff --git a/src/documentBuilder/InferResult/__.test-d.ts b/src/documentBuilder/InferResult/__.test-d.ts
@@ -150,8 +150,8 @@ assertEqual<$<{ stringWithArgs: { $: { string: '' } } }>, { stringWithArgs: null
 assertEqual<$<{ ___: { id: true  }}>                                                , { id: null | string }>()
 assertEqual<$<{ ___: { $include: false; id: true  }}>                               , {}>()
 assertEqual<$<{ ___: { $skip: true; id: true  }}>                                   , {}>()
-assertEqual<$<{ ___: { $skip: boolean; idNonNull: true; listIntNonNull:true }}>     , { idNonNull: string | null; listIntNonNull: number[] | null }>()
-assertEqual<$<{ ___: { $include: boolean; idNonNull: true; listIntNonNull:true }}>  , { idNonNull: string | null; listIntNonNull: number[] | null }>()
+assertEqual<$<{ ___: { $skip: boolean; id: true; listIntNonNull:true }}>            , { id?: string | null; listIntNonNull?: number[] }>()
+assertEqual<$<{ ___: { $include: boolean; id: true; listIntNonNull:true }}>         , { id?: string | null; listIntNonNull?: number[] }>()
 
 // Errors
 // @ts-expect-error invalid query