Remove AliasedField type and add AliasName to Field type

src/AST.ts

@@ -119,26 +119,23 @@ export const selectionSet = <T extends ReadonlyArray<Selection>>(
 export interface Field<
  Name extends string,
  Arguments extends Array<Argument<string, any>> | undefined = undefined,
- SS extends SelectionSet<any> | undefined = undefined
+ SS extends SelectionSet<any> | undefined = undefined,
+ AliasName extends string | undefined = undefined,
 > extends FieldNode {
  name: { kind: Kind.NAME; value: Name };
  arguments?: Arguments;
  selectionSet?: SS;
- as<AliasName extends string>(alias: AliasName): AliasedField<AliasName, Name, Arguments, SS>
-}
+ alias?: AliasNode<AliasName>;
 
-export interface AliasedField<
- AliasName extends string,
- Name extends string,
- Arguments extends Array<Argument<string, any>> | undefined = undefined,
- SS extends SelectionSet<any> | undefined = undefined
-> extends FieldNode {
- name: { kind: Kind.NAME; value: Name };
- alias: { kind: Kind.NAME; value: AliasName };
- arguments?: Arguments;
- selectionSet?: SS;
+ as<AliasName extends string>(alias: AliasName): Field<Name, Arguments, SS, AliasName>
 }
 
+type AliasNode<AliasName extends string | undefined> =
+ AliasName extends string 
+ ? { kind: Kind.NAME, value: AliasName }
+ : undefined
+
+
 export const field = <
  Name extends string,
  Arguments extends Array<Argument<string, any>> | undefined = undefined,
@@ -157,7 +154,7 @@ export const field = <
  as<AliasName extends string>(alias: AliasName) {
  return {
  ...this,
- alias: { kind: Kind.NAME, value: alias }
+ alias: { kind: Kind.NAME, value: alias } as AliasNode<AliasName>
  }
  }
 });
@@ -216,8 +213,7 @@ export interface FragmentSpread<Name extends string>
 
 // SelectionNode
 export type Selection =
- | Field<any, any, any>
- | AliasedField<any, any, any, any>
+ | Field<any, any, any, any>
  | InlineFragment<any, any>
  | FragmentSpread<any>;
 

src/Result.ts

@@ -1,6 +1,6 @@
 import { L, Test } from "ts-toolbelt";
 
-import type { AliasedField, Field, InlineFragment, NamedType, Selection, SelectionSet } from "./AST";
+import type { Field, InlineFragment, NamedType, Selection, SelectionSet } from "./AST";
 
 // @note `Result` takes a root `Type` (TS) and `SelectionSet` (GQL) and recursively walks the
 // array of `Selection` nodes's (i.e `Field`, `InlineFragment`, or `FragmentSpread` nodes)
@@ -32,16 +32,18 @@ export type Result<
  Parent;
 
 type InferName<F> =
- F extends Field<infer Name, any, any> | AliasedField<infer Name, any, any, any>
- ? Name
+ F extends Field<infer Name, any, any, infer AliasName>
+ ? AliasName extends string 
+ ? AliasName
+ : Name
  : never;
 
 type InferResult<
  F, 
  Schema extends Record<string, any>, 
  Parent extends Record<string, any>
 > =
- F extends Field<infer Name, any, infer SS> | AliasedField<any, infer Name, any, infer SS>
+ F extends Field<infer Name, any, infer SS, any>
  ? Result<Schema, InferParent<Parent, Name>, SS>
  : never
 
@@ -66,7 +68,7 @@ export type SpreadFragments<
 export type SpreadFragment<
  Schema extends Record<string, any>,
  Fragment extends InlineFragment<any, any>,
- CommonSelection extends SelectionSet<ReadonlyArray<Field<any, any, any> | AliasedField<any, any, any>>>,
+ CommonSelection extends SelectionSet<ReadonlyArray<Field<any, any, any, any>>>,
 > = Fragment extends InlineFragment<
  NamedType<infer Typename>,
  infer SelectionSet

src/Variables.ts

@@ -63,7 +63,7 @@ export type Variables<
  ? {}
  : S extends SelectionSet<ReadonlyArray<Selection>>
  ? S["selections"][number] extends infer Selection
- ? Selection extends Field<infer FieldName, infer FieldArgs, infer SS>
+ ? Selection extends Field<infer FieldName, infer FieldArgs, infer SS, any>
  ? O.Merge<
  FilterMapArguments<RootType, FieldName, FieldArgs>,
  Variables<Schema, RootType[FieldName], SS>