gql.tada 1.0.0 → 1.0.1

package/README.md

@@ -44,36 +44,7 @@ server for TypeScript, the documentation for each API should pop up in your edit
 
 ## 🔎 Let’s take a look!
 
-```ts
-import { graphql } from 'gql.tada';
-import { myIntrospectionQuery } from './fixtures/introspection';
-
-// We can declare our introspected schema once globally
-declare module 'gql.tada' {
-  interface setupSchema {
-    introspection: typeof myIntrospectionQuery;
-  }
-}
-
-// Creates fragment documents
-const fragment = graphql(`
-  fragment HelloWorld extends Query {
-    hello
-    world
-  }
-`);
-
-// Creates queries, optionally accepting a list of fragments for fragment spreads
-const query = graphql(
-  `
-    {
-      hello
-      ...HelloWorld
-    }
-  `,
-  [fragment]
-);
-```
+<img width="100%" alt="Code Editor showing GraphQL queries being edited with gql.tada and GraphLSP" src="https://github.com/0no-co/gql.tada/blob/277ce424a747522ef2ca0d398b113f4f285eb595/website/public/demo-code.png?raw=true" />
 
 ## 📦 [Releases](https://github.com/0no-co/gql.tada/releases)
 

package/dist/gql-tada.d.ts

@@ -2,10 +2,10 @@ import {
   Kind,
   OperationTypeNode,
   DocumentNode,
-  FieldNode,
-  NameNode,
   FragmentSpreadNode,
   InlineFragmentNode,
+  FieldNode,
+  NameNode,
   TypeNode,
 } from '@0no-co/graphql.web';
 
@@ -1017,10 +1017,10 @@ type isOptionalRec<Directives extends readonly unknown[] | undefined> =
         name: any;
       }
       ? Directive['name']['value'] extends 'include' | 'skip' | 'defer'
-        ? false
+        ? true
         : isOptionalRec<Rest>
       : isOptionalRec<Rest>
-    : true;
+    : false;
 type getFieldAlias<Node extends FieldNode> = Node['alias'] extends undefined
   ? Node['name']['value']
   : Node['alias'] extends NameNode
@@ -1085,7 +1085,7 @@ type getSpreadSubtype<
 type getTypenameOfType<Type extends ObjectLikeType> = Type extends {
   possibleTypes: any;
 }
-  ? Type['possibleTypes']
+  ? Type['name'] | Type['possibleTypes']
   : Type['name'];
 type getSelection<
   Selections extends readonly any[],
@@ -1094,44 +1094,8 @@ type getSelection<
   Fragments extends {
     [name: string]: any;
   },
-> = obj<
-  getFieldsSelectionRec<Selections, Type, Introspection, Fragments> &
-    getFragmentsSelection<Selections, Type, Introspection, Fragments>
->;
-type getFieldsSelectionRec<
-  Selections extends readonly unknown[],
-  Type extends ObjectLikeType,
-  Introspection extends IntrospectionLikeType,
-  Fragments extends {
-    [name: string]: any;
-  },
-> = Selections extends readonly [infer Selection, ...infer Rest]
-  ? (Selection extends FieldNode
-      ? isOptionalRec<Selection['directives']> extends true
-        ? {
-            [Prop in getFieldAlias<Selection>]: Selection['name']['value'] extends '__typename'
-              ? getTypenameOfType<Type>
-              : unwrapType$1<
-                  Type['fields'][Selection['name']['value']]['type'],
-                  Selection['selectionSet'],
-                  Introspection,
-                  Fragments
-                >;
-          }
-        : {
-            [Prop in getFieldAlias<Selection>]?: Selection['name']['value'] extends '__typename'
-              ? getTypenameOfType<Type>
-              : unwrapType$1<
-                  Type['fields'][Selection['name']['value']]['type'],
-                  Selection['selectionSet'],
-                  Introspection,
-                  Fragments
-                >;
-          }
-      : {}) &
-      getFieldsSelectionRec<Rest, Type, Introspection, Fragments>
-  : {};
-type _getFragmentsSelectionRec<
+> = obj<getPossibleTypesSelection<Selections, Type, Introspection, Fragments>>;
+type _getPossibleTypeSelectionRec<
   Selections extends readonly unknown[],
   PossibleType extends string,
   Type extends ObjectLikeType,
@@ -1143,18 +1107,40 @@ type _getFragmentsSelectionRec<
   ? (Node extends FragmentSpreadNode | InlineFragmentNode
       ? getSpreadSubtype<Node, Type, Introspection, Fragments> extends infer Subtype extends
           ObjectLikeType
-        ? PossibleType extends Subtype['name'] | getTypenameOfType<Subtype>
+        ? PossibleType extends getTypenameOfType<Subtype>
           ?
-              | (isOptionalRec<Node['directives']> extends true ? never : {})
+              | (isOptionalRec<Node['directives']> extends true ? {} : never)
               | getFragmentSelection<Node, Subtype, Introspection, Fragments>
           : {}
         : Node extends FragmentSpreadNode
           ? makeUndefinedFragmentRef<Node['name']['value']>
           : {}
-      : {}) &
-      _getFragmentsSelectionRec<Rest, PossibleType, Type, Introspection, Fragments>
+      : Node extends FieldNode
+        ? isOptionalRec<Node['directives']> extends true
+          ? {
+              [Prop in getFieldAlias<Node>]?: Node['name']['value'] extends '__typename'
+                ? PossibleType
+                : unwrapType$1<
+                    Type['fields'][Node['name']['value']]['type'],
+                    Node['selectionSet'],
+                    Introspection,
+                    Fragments
+                  >;
+            }
+          : {
+              [Prop in getFieldAlias<Node>]: Node['name']['value'] extends '__typename'
+                ? PossibleType
+                : unwrapType$1<
+                    Type['fields'][Node['name']['value']]['type'],
+                    Node['selectionSet'],
+                    Introspection,
+                    Fragments
+                  >;
+            }
+        : {}) &
+      _getPossibleTypeSelectionRec<Rest, PossibleType, Type, Introspection, Fragments>
   : {};
-type getFragmentsSelection<
+type getPossibleTypesSelection<
   Selections extends readonly unknown[],
   Type extends ObjectLikeType,
   Introspection extends IntrospectionLikeType,
@@ -1166,7 +1152,7 @@ type getFragmentsSelection<
   possibleTypes: any;
 }
   ? objValues<{
-      [PossibleType in Type['possibleTypes']]: _getFragmentsSelectionRec<
+      [PossibleType in Type['possibleTypes']]: _getPossibleTypeSelectionRec<
         Selections,
         PossibleType,
         Type,
@@ -1178,7 +1164,7 @@ type getFragmentsSelection<
         kind: 'OBJECT';
         name: any;
       }
-    ? _getFragmentsSelectionRec<Selections, Type['name'], Type, Introspection, Fragments>
+    ? _getPossibleTypeSelectionRec<Selections, Type['name'], Type, Introspection, Fragments>
     : {};
 type getOperationSelectionType<
   Definition,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gql.tada",
   "description": "The spec-compliant & magical GraphQL query language engine in the TypeScript type system",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "author": "0no.co <hi@0no.co>",
   "source": "./src/index.ts",
   "main": "./dist/gql-tada",