fix: Add tail recursion where it's possible but missing (#51)

Co-authored-by: deathemperor <deathemperor@gmail.com> Co-authored-by: HaiNNT <HaiNNT1302@gmail.com>
0no-co · Feb 3, 2024 · cdd6370 · cdd6370
1 parent 4dc30de
commit cdd6370
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 67 deletions.
diff --git a/.changeset/short-teachers-begin.md b/.changeset/short-teachers-begin.md
@@ -0,0 +1,5 @@
+---
+'gql.tada': patch
+---
+
+Improve performance of several smaller types (Thank you, [@deathemperor](https://github.com/deathemperor) & [@HaiNNT](https://github.com/HaiNNT))
diff --git a/src/selection.ts b/src/selection.ts
@@ -134,45 +134,53 @@ type _getPossibleTypeSelectionRec<
   Type extends ObjectLikeType,
   Introspection extends IntrospectionLikeType,
   Fragments extends { [name: string]: any },
+  SelectionAcc = {},
 > = Selections extends [infer Node, ...infer Rest]
-  ? (Node extends { kind: Kind.FRAGMENT_SPREAD | Kind.INLINE_FRAGMENT }
-      ? getSpreadSubtype<Node, Type, Introspection, Fragments> extends infer Subtype extends
-          ObjectLikeType
-        ? PossibleType extends getTypenameOfType<Subtype>
-          ?
-              | (isOptional<Node> extends true ? {} : never)
-              | getFragmentSelection<Node, Subtype, Introspection, Fragments>
-          : {}
-        : Node extends { kind: Kind.FRAGMENT_SPREAD; name: any }
-          ? makeUndefinedFragmentRef<Node['name']['value']>
-          : {}
-      : Node extends { kind: Kind.FIELD; name: any; selectionSet: any }
-        ? isOptional<Node> extends true
-          ? {
-              [Prop in getFieldAlias<Node>]?: Node['name']['value'] extends '__typename'
-                ? PossibleType
-                : unwrapType<
-                    Type['fields'][Node['name']['value']]['type'],
-                    Node['selectionSet'],
-                    Introspection,
-                    Fragments,
-                    getTypeDirective<Node>
-                  >;
-            }
-          : {
-              [Prop in getFieldAlias<Node>]: Node['name']['value'] extends '__typename'
-                ? PossibleType
-                : unwrapType<
-                    Type['fields'][Node['name']['value']]['type'],
-                    Node['selectionSet'],
-                    Introspection,
-                    Fragments,
-                    getTypeDirective<Node>
-                  >;
-            }
-        : {}) &
-      _getPossibleTypeSelectionRec<Rest, PossibleType, Type, Introspection, Fragments>
-  : {};
+  ? _getPossibleTypeSelectionRec<
+      Rest,
+      PossibleType,
+      Type,
+      Introspection,
+      Fragments,
+      (Node extends { kind: Kind.FRAGMENT_SPREAD | Kind.INLINE_FRAGMENT }
+        ? getSpreadSubtype<Node, Type, Introspection, Fragments> extends infer Subtype extends
+            ObjectLikeType
+          ? PossibleType extends getTypenameOfType<Subtype>
+            ?
+                | (isOptional<Node> extends true ? {} : never)
+                | getFragmentSelection<Node, Subtype, Introspection, Fragments>
+            : {}
+          : Node extends { kind: Kind.FRAGMENT_SPREAD; name: any }
+            ? makeUndefinedFragmentRef<Node['name']['value']>
+            : {}
+        : Node extends { kind: Kind.FIELD; name: any; selectionSet: any }
+          ? isOptional<Node> extends true
+            ? {
+                [Prop in getFieldAlias<Node>]?: Node['name']['value'] extends '__typename'
+                  ? PossibleType
+                  : unwrapType<
+                      Type['fields'][Node['name']['value']]['type'],
+                      Node['selectionSet'],
+                      Introspection,
+                      Fragments,
+                      getTypeDirective<Node>
+                    >;
+              }
+            : {
+                [Prop in getFieldAlias<Node>]: Node['name']['value'] extends '__typename'
+                  ? PossibleType
+                  : unwrapType<
+                      Type['fields'][Node['name']['value']]['type'],
+                      Node['selectionSet'],
+                      Introspection,
+                      Fragments,
+                      getTypeDirective<Node>
+                    >;
+              }
+          : {}) &
+        SelectionAcc
+    >
+  : SelectionAcc;
 
 type getOperationSelectionType<
   Definition,

diff --git a/src/variables.ts b/src/variables.ts
@@ -6,14 +6,19 @@ import type { obj } from './utils';
 type getInputObjectTypeRec<
   InputFields,
   Introspection extends IntrospectionLikeType,
+  InputObject = {},
 > = InputFields extends [infer InputField, ...infer Rest]
-  ? (InputField extends { name: any; type: any }
-      ? InputField['type'] extends { kind: 'NON_NULL' }
-        ? { [Name in InputField['name']]: unwrapType<InputField['type'], Introspection> }
-        : { [Name in InputField['name']]?: unwrapType<InputField['type'], Introspection> }
-      : {}) &
-      getInputObjectTypeRec<Rest, Introspection>
-  : {};
+  ? getInputObjectTypeRec<
+      Rest,
+      Introspection,
+      (InputField extends { name: any; type: any }
+        ? InputField['type'] extends { kind: 'NON_NULL' }
+          ? { [Name in InputField['name']]: unwrapType<InputField['type'], Introspection> }
+          : { [Name in InputField['name']]?: unwrapType<InputField['type'], Introspection> }
+        : {}) &
+        InputObject
+    >
+  : InputObject;
 
 type getScalarType<
   TypeName,
@@ -62,27 +67,32 @@ type unwrapTypeRef<Type, Introspection extends IntrospectionLikeType> = Type ext
   ? _unwrapTypeRefRec<Type['type'], Introspection>
   : null | _unwrapTypeRefRec<Type, Introspection>;
 
-type getVariablesRec<Variables, Introspection extends IntrospectionLikeType> = Variables extends [
-  infer Variable,
-  ...infer Rest,
-]
-  ? (Variable extends { kind: Kind.VARIABLE_DEFINITION; variable: any; type: any }
-      ? Variable extends { defaultValue: undefined; type: { kind: Kind.NON_NULL_TYPE } }
-        ? {
-            [Name in Variable['variable']['name']['value']]: unwrapTypeRef<
-              Variable['type'],
-              Introspection
-            >;
-          }
-        : {
-            [Name in Variable['variable']['name']['value']]?: unwrapTypeRef<
-              Variable['type'],
-              Introspection
-            >;
-          }
-      : {}) &
-      getVariablesRec<Rest, Introspection>
-  : {};
+type _getVariablesRec<
+  Variables,
+  Introspection extends IntrospectionLikeType,
+  VariablesObject = {},
+> = Variables extends [infer Variable, ...infer Rest]
+  ? _getVariablesRec<
+      Rest,
+      Introspection,
+      (Variable extends { kind: Kind.VARIABLE_DEFINITION; variable: any; type: any }
+        ? Variable extends { defaultValue: undefined; type: { kind: Kind.NON_NULL_TYPE } }
+          ? {
+              [Name in Variable['variable']['name']['value']]: unwrapTypeRef<
+                Variable['type'],
+                Introspection
+              >;
+            }
+          : {
+              [Name in Variable['variable']['name']['value']]?: unwrapTypeRef<
+                Variable['type'],
+                Introspection
+              >;
+            }
+        : {}) &
+        VariablesObject
+    >
+  : VariablesObject;
 
 type getVariablesType<
   Document extends DocumentNodeLike,
@@ -91,7 +101,7 @@ type getVariablesType<
   kind: Kind.OPERATION_DEFINITION;
   variableDefinitions: any;
 }
-  ? obj<getVariablesRec<Document['definitions'][0]['variableDefinitions'], Introspection>>
+  ? obj<_getVariablesRec<Document['definitions'][0]['variableDefinitions'], Introspection>>
   : {};
 
 export type { getVariablesType };