gql.tada 1.9.3 → 1.10.1

package/dist/gql-tada.d.ts

@@ -478,124 +478,89 @@ type takeOptionalName<In extends any[]> = In extends [
       In
     >
   : _match<undefined, In>;
-type takeValue<In extends any[], Const extends boolean> = In extends [Token.Float, ...infer In]
-  ? _match<
-      {
-        kind: Kind.FLOAT;
-        value: string;
-      },
-      In
-    >
-  : In extends [Token.Integer, ...infer In]
+type takeValue<In extends any[], Const extends boolean> = In extends [infer Head, ...infer In]
+  ? Head extends Token.Float
     ? _match<
         {
-          kind: Kind.INT;
+          kind: Kind.FLOAT;
           value: string;
         },
         In
       >
-    : In extends [Token.String, ...infer In]
+    : Head extends Token.Integer
       ? _match<
           {
-            kind: Kind.STRING;
+            kind: Kind.INT;
             value: string;
-            block: false;
           },
           In
         >
-      : In extends [Token.BlockString, ...infer In]
+      : Head extends Token.String
         ? _match<
             {
               kind: Kind.STRING;
               value: string;
-              block: true;
+              block: false;
             },
             In
           >
-        : In extends [
-              {
-                kind: Token.Name;
-                name: 'null';
-              },
-              ...infer In,
-            ]
+        : Head extends Token.BlockString
           ? _match<
               {
-                kind: Kind.NULL;
+                kind: Kind.STRING;
+                value: string;
+                block: true;
               },
               In
             >
-          : In extends [
-                {
-                  kind: Token.Name;
-                  name: 'true' | 'false';
-                },
-                ...infer In,
-              ]
-            ? _match<
-                {
-                  kind: Kind.BOOLEAN;
-                  value: boolean;
-                },
-                In
-              >
-            : In extends [
-                  {
-                    kind: Token.Name;
-                    name: infer Name;
-                  },
-                  ...infer In,
-                ]
+          : Head extends {
+                kind: Token.Name;
+                name: infer Name;
+              }
+            ? Name extends 'null'
               ? _match<
                   {
-                    kind: Kind.ENUM;
-                    value: Name;
+                    kind: Kind.NULL;
                   },
                   In
                 >
-              : In extends [Token.BracketOpen, ...infer In]
-                ? takeListRec<[], In, Const>
-                : In extends [Token.BraceOpen, ...infer In]
-                  ? takeObjectRec<[], In, Const>
-                  : Const extends false
-                    ? In extends [
+              : Name extends 'true' | 'false'
+                ? _match<
+                    {
+                      kind: Kind.BOOLEAN;
+                      value: boolean;
+                    },
+                    In
+                  >
+                : _match<
+                    {
+                      kind: Kind.ENUM;
+                      value: Name;
+                    },
+                    In
+                  >
+            : Head extends Token.BracketOpen
+              ? takeListRec<[], In, Const>
+              : Head extends Token.BraceOpen
+                ? takeObjectRec<[], In, Const>
+                : Const extends false
+                  ? Head extends {
+                      kind: Token.Var;
+                      name: infer Name;
+                    }
+                    ? _match<
                         {
-                          kind: Token.Var;
-                          name: infer Name;
+                          kind: Kind.VARIABLE;
+                          name: {
+                            kind: Kind.NAME;
+                            value: Name;
+                          };
                         },
-                        ...infer In,
-                      ]
-                      ? _match<
-                          {
-                            kind: Kind.VARIABLE;
-                            name: {
-                              kind: Kind.NAME;
-                              value: Name;
-                            };
-                          },
-                          In
-                        >
-                      : void
-                    : void;
-type takeString<In extends any[]> = In extends [Token.String, ...infer In]
-  ? _match<
-      {
-        kind: Kind.STRING;
-        value: string;
-        block: false;
-      },
-      In
-    >
-  : In extends [Token.BlockString, ...infer In]
-    ? _match<
-        {
-          kind: Kind.STRING;
-          value: string;
-          block: true;
-        },
-        In
-      >
-    : void;
+                        In
+                      >
+                    : void
+                  : void
+  : void;
 type takeListRec<Nodes extends any[], In extends any[], Const extends boolean> = In extends [
   Token.BracketClose,
   ...infer In,
@@ -704,10 +669,20 @@ type takeDirective<In extends any[], Const extends boolean> = In extends [
       >
     : void
   : void;
-type takeDirectives<In extends any[], Const extends boolean, Directives extends any[] = []> =
-  takeDirective<In, Const> extends _match<infer Directive, infer In>
+type takeDirectives<
+  In extends any[],
+  Const extends boolean,
+  Directives extends any[] = [],
+> = In extends [
+  {
+    kind: Token.Directive;
+  },
+  ...any[],
+]
+  ? takeDirective<In, Const> extends _match<infer Directive, infer In>
     ? takeDirectives<In, Const, [...Directives, Directive]>
-    : _match<Directives, In>;
+    : _match<Directives, In>
+  : _match<Directives, In>;
 type _takeFieldName<In extends any[]> = In extends [
   {
     kind: Token.Name;
@@ -747,32 +722,99 @@ type _takeField<In extends any[]> =
   _takeFieldName<In> extends _match2<infer Alias, infer Name, infer In>
     ? takeArguments<In, false> extends _match<infer Arguments, infer In>
       ? takeDirectives<In, false> extends _match<infer Directives, infer In>
-        ? takeSelectionSet<In> extends _match<infer SelectionSet, infer In>
-          ? _match<
+        ? In extends [Token.BraceOpen, ...any[]]
+          ? takeSelectionSet<In> extends _match<infer SelectionSet, infer In>
+            ? _match<
+                {
+                  kind: Kind.FIELD;
+                  alias: Alias;
+                  name: Name;
+                  arguments: Arguments;
+                  directives: Directives;
+                  selectionSet: SelectionSet;
+                },
+                In
+              >
+            : void
+          : _match<
               {
                 kind: Kind.FIELD;
                 alias: Alias;
                 name: Name;
                 arguments: Arguments;
                 directives: Directives;
-                selectionSet: SelectionSet;
+                selectionSet: undefined;
               },
               In
             >
-          : _match<
+        : void
+      : void
+    : void;
+type _takeFragmentSpread<In extends any[]> = In extends [Token.Spread, ...infer In]
+  ? In extends [
+      {
+        kind: Token.Name;
+        name: 'on';
+      },
+      {
+        kind: Token.Name;
+        name: infer Type;
+      },
+      ...infer In,
+    ]
+    ? takeDirectives<In, false> extends _match<infer Directives, infer In>
+      ? takeSelectionSet<In> extends _match<infer SelectionSet, infer In>
+        ? _match<
+            {
+              kind: Kind.INLINE_FRAGMENT;
+              typeCondition: {
+                kind: Kind.NAMED_TYPE;
+                name: {
+                  kind: Kind.NAME;
+                  value: Type;
+                };
+              };
+              directives: Directives;
+              selectionSet: SelectionSet;
+            },
+            In
+          >
+        : void
+      : void
+    : In extends [
+          {
+            kind: Token.Name;
+            name: infer Name;
+          },
+          ...infer In,
+        ]
+      ? takeDirectives<In, false> extends _match<infer Directives, infer In>
+        ? _match<
+            {
+              kind: Kind.FRAGMENT_SPREAD;
+              name: {
+                kind: Kind.NAME;
+                value: Name;
+              };
+              directives: Directives;
+            },
+            In
+          >
+        : void
+      : takeDirectives<In, false> extends _match<infer Directives, infer In>
+        ? takeSelectionSet<In> extends _match<infer SelectionSet, infer In>
+          ? _match<
               {
-                kind: Kind.FIELD;
-                alias: Alias;
-                name: Name;
-                arguments: Arguments;
+                kind: Kind.INLINE_FRAGMENT;
+                typeCondition: undefined;
                 directives: Directives;
-                selectionSet: undefined;
+                selectionSet: SelectionSet;
               },
               In
             >
+          : void
         : void
-      : void
-    : void;
+  : void;
 type takeType<In extends any[]> = In extends [Token.BracketOpen, ...infer In]
   ? takeType<In> extends _match<infer Subtype, infer In>
     ? In extends [Token.BracketClose, ...infer In]
@@ -828,87 +870,28 @@ type takeType<In extends any[]> = In extends [Token.BracketOpen, ...infer In]
           In
         >
     : void;
-type _takeFragmentSpread<In extends any[]> = In extends [
-  Token.Spread,
+type _takeSelectionRec<Selections extends any[], In extends any[]> = In extends [
   {
     kind: Token.Name;
-    name: 'on';
   },
-  {
-    kind: Token.Name;
-    name: infer Type;
-  },
-  ...infer In,
+  ...any[],
 ]
-  ? takeDirectives<In, false> extends _match<infer Directives, infer In>
-    ? takeSelectionSet<In> extends _match<infer SelectionSet, infer In>
-      ? _match<
-          {
-            kind: Kind.INLINE_FRAGMENT;
-            typeCondition: {
-              kind: Kind.NAMED_TYPE;
-              name: {
-                kind: Kind.NAME;
-                value: Type;
-              };
-            };
-            directives: Directives;
-            selectionSet: SelectionSet;
-          },
-          In
-        >
-      : void
+  ? _takeField<In> extends _match<infer Selection, infer In>
+    ? _takeSelectionRec<[...Selections, Selection], In>
     : void
-  : In extends [
-        Token.Spread,
-        {
-          kind: Token.Name;
-          name: infer Name;
-        },
-        ...infer In,
-      ]
-    ? takeDirectives<In, false> extends _match<infer Directives, infer In>
+  : In extends [Token.Spread, ...any[]]
+    ? _takeFragmentSpread<In> extends _match<infer Selection, infer In>
+      ? _takeSelectionRec<[...Selections, Selection], In>
+      : void
+    : In extends [Token.BraceClose, ...infer In]
       ? _match<
           {
-            kind: Kind.FRAGMENT_SPREAD;
-            name: {
-              kind: Kind.NAME;
-              value: Name;
-            };
-            directives: Directives;
+            kind: Kind.SELECTION_SET;
+            selections: Selections;
           },
           In
         >
-      : void
-    : In extends [Token.Spread, ...infer In]
-      ? takeDirectives<In, false> extends _match<infer Directives, infer In>
-        ? takeSelectionSet<In> extends _match<infer SelectionSet, infer In>
-          ? _match<
-              {
-                kind: Kind.INLINE_FRAGMENT;
-                typeCondition: undefined;
-                directives: Directives;
-                selectionSet: SelectionSet;
-              },
-              In
-            >
-          : void
-        : void
       : void;
-type _takeSelectionRec<Selections extends any[], In extends any[]> =
-  _takeField<In> extends _match<infer Selection, infer In>
-    ? _takeSelectionRec<[...Selections, Selection], In>
-    : _takeFragmentSpread<In> extends _match<infer Selection, infer In>
-      ? _takeSelectionRec<[...Selections, Selection], In>
-      : In extends [Token.BraceClose, ...infer In]
-        ? _match<
-            {
-              kind: Kind.SELECTION_SET;
-              selections: Selections;
-            },
-            In
-          >
-        : void;
 type takeSelectionSet<In extends any[]> = In extends [Token.BraceOpen, ...infer In]
   ? _takeSelectionRec<[], In>
   : void;
@@ -967,9 +950,16 @@ type _takeVarDefinitionRec<Definitions extends any[], In extends any[]> = In ext
   ...infer In,
 ]
   ? _match<Definitions, In>
-  : takeVarDefinition<In> extends _match<infer Definition, infer In>
-    ? _takeVarDefinitionRec<[...Definitions, Definition], In>
-    : takeString<In> extends _match<infer _, infer In>
+  : In extends [
+        {
+          kind: Token.Var;
+        },
+        ...any[],
+      ]
+    ? takeVarDefinition<In> extends _match<infer Definition, infer In>
+      ? _takeVarDefinitionRec<[...Definitions, Definition], In>
+      : _match<Definitions, In>
+    : In extends [Token.String | Token.BlockString, ...infer In]
       ? _takeVarDefinitionRec<[...Definitions], In>
       : _match<Definitions, In>;
 type takeVarDefinitions<In extends any[]> = In extends [Token.ParenOpen, ...infer In]
@@ -1021,28 +1011,18 @@ type takeFragmentDefinition<In extends any[]> = In extends [
 type takeOperation<In extends any[]> = In extends [
   {
     kind: Token.Name;
-    name: 'query';
+    name: infer Operation;
   },
   ...infer In,
 ]
-  ? _match<OperationTypeNode.QUERY, In>
-  : In extends [
-        {
-          kind: Token.Name;
-          name: 'mutation';
-        },
-        ...infer In,
-      ]
-    ? _match<OperationTypeNode.MUTATION, In>
-    : In extends [
-          {
-            kind: Token.Name;
-            name: 'subscription';
-          },
-          ...infer In,
-        ]
-      ? _match<OperationTypeNode.SUBSCRIPTION, In>
-      : void;
+  ? Operation extends 'query'
+    ? _match<OperationTypeNode.QUERY, In>
+    : Operation extends 'mutation'
+      ? _match<OperationTypeNode.MUTATION, In>
+      : Operation extends 'subscription'
+        ? _match<OperationTypeNode.SUBSCRIPTION, In>
+        : void
+  : void;
 type takeOperationDefinition<In extends any[]> =
   takeOperation<In> extends _match<infer Operation, infer In>
     ? takeOptionalName<In> extends _match<infer Name, infer In>
@@ -1077,12 +1057,31 @@ type takeOperationDefinition<In extends any[]> =
           In
         >
       : void;
-type _takeDocumentRec<Definitions extends any[], In extends any[]> =
-  takeFragmentDefinition<In> extends _match<infer Definition, infer In>
+type _takeDocumentRec<Definitions extends any[], In extends any[]> = In extends [
+  {
+    kind: Token.Name;
+    name: 'fragment';
+  },
+  ...any[],
+]
+  ? takeFragmentDefinition<In> extends _match<infer Definition, infer In>
     ? _takeDocumentRec<[...Definitions, Definition], In>
-    : takeOperationDefinition<In> extends _match<infer Definition, infer In>
+    : _match<Definitions, In>
+  : In extends [
+        {
+          kind: Token.Name;
+          name: 'query' | 'mutation' | 'subscription';
+        },
+        ...any[],
+      ]
+    ? takeOperationDefinition<In> extends _match<infer Definition, infer In>
       ? _takeDocumentRec<[...Definitions, Definition], In>
-      : takeString<In> extends _match<infer _, infer In>
+      : _match<Definitions, In>
+    : In extends [Token.BraceOpen, ...any[]]
+      ? takeOperationDefinition<In> extends _match<infer Definition, infer In>
+        ? _takeDocumentRec<[...Definitions, Definition], In>
+        : _match<Definitions, In>
+      : In extends [Token.String | Token.BlockString, ...infer In]
         ? _takeDocumentRec<[...Definitions], In>
         : _match<Definitions, In>;
 type parseDocument<In extends string> =

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.9.3",
+  "version": "1.10.1",
   "author": "0no.co <hi@0no.co>",
   "source": "./src/index.ts",
   "main": "./dist/gql-tada",
@@ -48,10 +48,10 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@0no-co/graphql.web": "^1.0.5",
-    "@0no-co/graphqlsp": "^1.12.13",
-    "@gql.tada/cli-utils": "1.7.4",
-    "@gql.tada/internal": "1.0.10"
+    "@0no-co/graphql.web": "^1.3.2",
+    "@0no-co/graphqlsp": "^1.17.0",
+    "@gql.tada/cli-utils": "1.8.1",
+    "@gql.tada/internal": "1.1.0"
   },
   "peerDependencies": {
     "typescript": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"