🎨 Maybe fixed allowed invalid keys

Author: aexol

examples/typescript-node-big-schema/src/zeus/apollo.ts

@@ -5,27 +5,31 @@ import { gql, useMutation, useQuery, useLazyQuery, useSubscription } from '@apol
 import type { MutationHookOptions, QueryHookOptions, LazyQueryHookOptions, SubscriptionHookOptions } from '@apollo/client';
 
 
-export function useTypedMutation<Z, O extends "mutation_root">(
+export function useTypedMutation<Z extends ValueTypes[O], O extends "mutation_root">(
   mutation: Z | ValueTypes[O],
   options?: MutationHookOptions<InputType<GraphQLTypes[O], Z>>,
+  operationName?: string,
 ) {
-  return useMutation<InputType<GraphQLTypes[O], Z>>(gql(Zeus("mutation",mutation)), options);
+  return useMutation<InputType<GraphQLTypes[O], Z>>(gql(Zeus("mutation",mutation, operationName)), options);
 }
-export function useTypedQuery<Z, O extends "query_root">(
+export function useTypedQuery<Z extends ValueTypes[O], O extends "query_root">(
   query: Z | ValueTypes[O],
   options?: QueryHookOptions<InputType<GraphQLTypes[O], Z>>,
+  operationName?: string,
 ) {
-  return useQuery<InputType<GraphQLTypes[O], Z>>(gql(Zeus("query",query)), options);
+  return useQuery<InputType<GraphQLTypes[O], Z>>(gql(Zeus("query",query, operationName)), options);
 }
-export function useTypedLazyQuery<Z, O extends "query_root">(
+export function useTypedLazyQuery<Z extends ValueTypes[O], O extends "query_root">(
   LazyQuery: Z | ValueTypes[O],
   options?: LazyQueryHookOptions<InputType<GraphQLTypes[O], Z>>,
+  operationName?: string,
 ) {
-  return useLazyQuery<InputType<GraphQLTypes[O], Z>>(gql(Zeus("query",LazyQuery)), options);
+  return useLazyQuery<InputType<GraphQLTypes[O], Z>>(gql(Zeus("query",LazyQuery, operationName)), options);
 }
-export function useTypedSubscription<Z, O extends "subscription_root">(
+export function useTypedSubscription<Z extends ValueTypes[O], O extends "subscription_root">(
   subscription: Z | ValueTypes[O],
   options?: SubscriptionHookOptions<InputType<GraphQLTypes[O], Z>>,
+  operationName?: string,
 ) {
-  return useSubscription<InputType<GraphQLTypes[O], Z>>(gql(Zeus("subscription",subscription)), options);
+  return useSubscription<InputType<GraphQLTypes[O], Z>>(gql(Zeus("subscription",subscription, operationName)), options);
 }

examples/typescript-node-big-schema/src/zeus/reactQuery.ts

@@ -5,7 +5,7 @@ import { useMutation, useQuery } from 'react-query';
 import type { UseMutationOptions, UseQueryOptions } from 'react-query';
 
 
-export function useTypedMutation<O extends "mutation_root", TData, TResult = InputType<GraphQLTypes[O], TData>>(
+export function useTypedMutation<O extends "mutation_root", TData extends ValueTypes[O], TResult = InputType<GraphQLTypes[O], TData>>(
   mutationKey: string,
   mutation: TData | ValueTypes[O],
   options?: Omit<UseMutationOptions<TResult>, 'mutationKey' | 'mutationFn'>,
@@ -14,7 +14,7 @@ export function useTypedMutation<O extends "mutation_root", TData, TResult = Inp
 ) {
   return useMutation<TResult>(mutationKey, () => Chain(host)("mutation")(mutation, zeusOptions) as Promise<TResult>, options);
 }
-export function useTypedQuery<O extends "query_root", TData, TResult = InputType<GraphQLTypes[O], TData>>(
+export function useTypedQuery<O extends "query_root", TData extends ValueTypes[O], TResult = InputType<GraphQLTypes[O], TData>>(
   queryKey: string,
   query: TData | ValueTypes[O],
   options?: Omit<UseQueryOptions<TResult>, 'queryKey' | 'queryFn'>,

examples/typescript-node/src/zeus/apollo.ts

@@ -5,27 +5,31 @@ import { gql, useQuery, useLazyQuery, useSubscription, useMutation } from '@apol
 import type { QueryHookOptions, LazyQueryHookOptions, SubscriptionHookOptions, MutationHookOptions } from '@apollo/client';
 
 
-export function useTypedQuery<Z, O extends "Query">(
+export function useTypedQuery<Z extends ValueTypes[O], O extends "Query">(
   query: Z | ValueTypes[O],
   options?: QueryHookOptions<InputType<GraphQLTypes[O], Z>>,
+  operationName?: string,
 ) {
-  return useQuery<InputType<GraphQLTypes[O], Z>>(gql(Zeus("query",query)), options);
+  return useQuery<InputType<GraphQLTypes[O], Z>>(gql(Zeus("query",query, operationName)), options);
 }
-export function useTypedLazyQuery<Z, O extends "Query">(
+export function useTypedLazyQuery<Z extends ValueTypes[O], O extends "Query">(
   LazyQuery: Z | ValueTypes[O],
   options?: LazyQueryHookOptions<InputType<GraphQLTypes[O], Z>>,
+  operationName?: string,
 ) {
-  return useLazyQuery<InputType<GraphQLTypes[O], Z>>(gql(Zeus("query",LazyQuery)), options);
+  return useLazyQuery<InputType<GraphQLTypes[O], Z>>(gql(Zeus("query",LazyQuery, operationName)), options);
 }
-export function useTypedSubscription<Z, O extends "Subscription">(
+export function useTypedSubscription<Z extends ValueTypes[O], O extends "Subscription">(
   subscription: Z | ValueTypes[O],
   options?: SubscriptionHookOptions<InputType<GraphQLTypes[O], Z>>,
+  operationName?: string,
 ) {
-  return useSubscription<InputType<GraphQLTypes[O], Z>>(gql(Zeus("subscription",subscription)), options);
+  return useSubscription<InputType<GraphQLTypes[O], Z>>(gql(Zeus("subscription",subscription, operationName)), options);
 }
-export function useTypedMutation<Z, O extends "Mutation">(
+export function useTypedMutation<Z extends ValueTypes[O], O extends "Mutation">(
   mutation: Z | ValueTypes[O],
   options?: MutationHookOptions<InputType<GraphQLTypes[O], Z>>,
+  operationName?: string,
 ) {
-  return useMutation<InputType<GraphQLTypes[O], Z>>(gql(Zeus("mutation",mutation)), options);
+  return useMutation<InputType<GraphQLTypes[O], Z>>(gql(Zeus("mutation",mutation, operationName)), options);
 }

examples/typescript-node/src/zeus/const.ts

@@ -73,6 +73,10 @@ export const AllTypesProps: Record<string,any> = {
 }
 
 export const ReturnTypes: Record<string,any> = {
+	ChangeCard:{
+		"...on SpecialCard":"SpecialCard",
+		"...on EffectCard":"EffectCard"
+	},
 	CardStack:{
 		cards:"Card",
 		name:"String"
@@ -85,9 +89,6 @@ export const ReturnTypes: Record<string,any> = {
 		myStacks:"CardStack",
 		nameables:"Nameable"
 	},
-	Subscription:{
-		deck:"Card"
-	},
 	Card:{
 		Attack:"Int",
 		Children:"Int",
@@ -100,12 +101,13 @@ export const ReturnTypes: Record<string,any> = {
 		name:"String",
 		skills:"SpecialSkills"
 	},
-	Mutation:{
-		addCard:"Card"
+	S3Object:{
+		bucket:"String",
+		key:"String",
+		region:"String"
 	},
-	SpecialCard:{
-		effect:"String",
-		name:"String"
+	Subscription:{
+		deck:"Card"
 	},
 	Nameable:{
 		"...on CardStack": "CardStack",
@@ -114,17 +116,15 @@ export const ReturnTypes: Record<string,any> = {
 		"...on EffectCard": "EffectCard",
 		name:"String"
 	},
-	EffectCard:{
-		effectSize:"Float",
+	SpecialCard:{
+		effect:"String",
 		name:"String"
 	},
-	S3Object:{
-		bucket:"String",
-		key:"String",
-		region:"String"
+	Mutation:{
+		addCard:"Card"
 	},
-	ChangeCard:{
-		"...on SpecialCard":"SpecialCard",
-		"...on EffectCard":"EffectCard"
+	EffectCard:{
+		effectSize:"Float",
+		name:"String"
 	}
 }