fixing type conflict

Author: jamshally

demo/src/autogen/hasura/ts.ts

@@ -175,24 +175,24 @@ import { RemoveDogsModelByIdDocument } from '../';
     // Subscription Fetch ById Helper
     //
     export type SubscribeToVehicleGraphByIdSubscriptionFetchResult = FetchResult<SubscribeToVehicleGraphByIdSubscription, Record<string, any>, Record<string, any>>;
-    export type SubscribeToVehicleGraphByIdSubscriptionFetchResultEx = FetchResult<SubscribeToVehicleGraphByIdSubscription & VehicleGraphByIdHelperResultEx, Record<string, any>, Record<string, any>>;
+    export type SubscribeToVehicleGraphByIdSubscriptionFetchResultEx = FetchResult<SubscribeToVehicleGraphByIdSubscription, Record<string, any>, Record<string, any>> & VehicleGraphByIdHelperResultEx;
 
     async function subscribeToVehicleGraphById({ apolloClient, vehicleId, options }: { apolloClient: ApolloClient<object>, vehicleId:string, options: Omit<SubscriptionOptions<SubscribeToVehicleGraphByIdSubscriptionVariables>, 'query' | 'variables'> }): Promise<Observable<SubscribeToVehicleGraphByIdSubscriptionFetchResultEx>> {
       const subscription:Observable<SubscribeToVehicleGraphByIdSubscriptionFetchResult> = apolloClient.subscribe<SubscribeToVehicleGraphByIdSubscription>({ query: SubscribeToVehicleGraphByIdDocument, variables: { vehicleId }, ...options });
 
-      return subscription.map(value => {return { context:value.context, errors:value.errors, data:value.data, extensions:value.extensions, vehicleGraph:value?.data?.vehicle_by_pk || [] }  as SubscribeToVehicleGraphByIdSubscriptionResultEx }) ;
+      return subscription.map(value => {return { context:value.context, errors:value.errors, data:value.data, extensions:value.extensions, vehicleGraph:value?.data?.vehicle_by_pk || [] }  as SubscribeToVehicleGraphByIdSubscriptionFetchResultEx }) ;
     }
 
 
       // Subscription Fetch Objects Helper
       //
       export type SubscribeToVehicleGraphObjectsSubscriptionFetchResult = FetchResult<SubscribeToVehicleGraphObjectsSubscription, Record<string, any>, Record<string, any>>;
-      export type SubscribeToVehicleGraphObjectsSubscriptionFetchResultEx = FetchResult<SubscribeToVehicleGraphObjectsSubscription & VehicleGraphObjectsHelperResultEx, Record<string, any>, Record<string, any>>;
+      export type SubscribeToVehicleGraphObjectsSubscriptionFetchResultEx = FetchResult<SubscribeToVehicleGraphObjectsSubscription, Record<string, any>, Record<string, any>> & VehicleGraphObjectsHelperResultEx;
 
       async function subscribeToVehicleGraphObjects({ apolloClient, options }: { apolloClient: ApolloClient<object>, options: Omit<SubscriptionOptions<SubscribeToVehicleGraphObjectsSubscriptionVariables>, 'subscription'> }): Promise<Observable<SubscribeToVehicleGraphObjectsSubscriptionFetchResultEx>> {
         const subscription:Observable<SubscribeToVehicleGraphObjectsSubscriptionFetchResult> = apolloClient.subscribe<SubscribeToVehicleGraphObjectsSubscription>({ query: SubscribeToVehicleGraphObjectsDocument, ...options });
 
-        return subscription.map(value => {return { context:value.context, errors:value.errors, data:value.data, extensions:value.extensions, objects: value?.data?.vehicle || [] }  as SubscribeToVehicleGraphObjectsSubscriptionResultEx }) ;
+        return subscription.map(value => {return { context:value.context, errors:value.errors, data:value.data, extensions:value.extensions, objects: value?.data?.vehicle || [] }  as SubscribeToVehicleGraphObjectsSubscriptionFetchResultEx }) ;
       }
 
 
@@ -405,24 +405,24 @@ import { RemoveDogsModelByIdDocument } from '../';
     // Subscription Fetch ById Helper
     //
     export type SubscribeToVehicleGraphLocationOnlyByIdSubscriptionFetchResult = FetchResult<SubscribeToVehicleGraphLocationOnlyByIdSubscription, Record<string, any>, Record<string, any>>;
-    export type SubscribeToVehicleGraphLocationOnlyByIdSubscriptionFetchResultEx = FetchResult<SubscribeToVehicleGraphLocationOnlyByIdSubscription & VehicleGraphLocationOnlyByIdHelperResultEx, Record<string, any>, Record<string, any>>;
+    export type SubscribeToVehicleGraphLocationOnlyByIdSubscriptionFetchResultEx = FetchResult<SubscribeToVehicleGraphLocationOnlyByIdSubscription, Record<string, any>, Record<string, any>> & VehicleGraphLocationOnlyByIdHelperResultEx;
 
     async function subscribeToVehicleGraphLocationOnlyById({ apolloClient, vehicleId, options }: { apolloClient: ApolloClient<object>, vehicleId:string, options: Omit<SubscriptionOptions<SubscribeToVehicleGraphLocationOnlyByIdSubscriptionVariables>, 'query' | 'variables'> }): Promise<Observable<SubscribeToVehicleGraphLocationOnlyByIdSubscriptionFetchResultEx>> {
       const subscription:Observable<SubscribeToVehicleGraphLocationOnlyByIdSubscriptionFetchResult> = apolloClient.subscribe<SubscribeToVehicleGraphLocationOnlyByIdSubscription>({ query: SubscribeToVehicleGraphLocationOnlyByIdDocument, variables: { vehicleId }, ...options });
 
-      return subscription.map(value => {return { context:value.context, errors:value.errors, data:value.data, extensions:value.extensions, vehicleGraphLocationOnly:value?.data?.vehicle_by_pk || [] }  as SubscribeToVehicleGraphLocationOnlyByIdSubscriptionResultEx }) ;
+      return subscription.map(value => {return { context:value.context, errors:value.errors, data:value.data, extensions:value.extensions, vehicleGraphLocationOnly:value?.data?.vehicle_by_pk || [] }  as SubscribeToVehicleGraphLocationOnlyByIdSubscriptionFetchResultEx }) ;
     }
 
 
       // Subscription Fetch Objects Helper
       //
       export type SubscribeToVehicleGraphLocationOnlyObjectsSubscriptionFetchResult = FetchResult<SubscribeToVehicleGraphLocationOnlyObjectsSubscription, Record<string, any>, Record<string, any>>;
-      export type SubscribeToVehicleGraphLocationOnlyObjectsSubscriptionFetchResultEx = FetchResult<SubscribeToVehicleGraphLocationOnlyObjectsSubscription & VehicleGraphLocationOnlyObjectsHelperResultEx, Record<string, any>, Record<string, any>>;
+      export type SubscribeToVehicleGraphLocationOnlyObjectsSubscriptionFetchResultEx = FetchResult<SubscribeToVehicleGraphLocationOnlyObjectsSubscription, Record<string, any>, Record<string, any>> & VehicleGraphLocationOnlyObjectsHelperResultEx;
 
       async function subscribeToVehicleGraphLocationOnlyObjects({ apolloClient, options }: { apolloClient: ApolloClient<object>, options: Omit<SubscriptionOptions<SubscribeToVehicleGraphLocationOnlyObjectsSubscriptionVariables>, 'subscription'> }): Promise<Observable<SubscribeToVehicleGraphLocationOnlyObjectsSubscriptionFetchResultEx>> {
         const subscription:Observable<SubscribeToVehicleGraphLocationOnlyObjectsSubscriptionFetchResult> = apolloClient.subscribe<SubscribeToVehicleGraphLocationOnlyObjectsSubscription>({ query: SubscribeToVehicleGraphLocationOnlyObjectsDocument, ...options });
 
-        return subscription.map(value => {return { context:value.context, errors:value.errors, data:value.data, extensions:value.extensions, objects: value?.data?.vehicle || [] }  as SubscribeToVehicleGraphLocationOnlyObjectsSubscriptionResultEx }) ;
+        return subscription.map(value => {return { context:value.context, errors:value.errors, data:value.data, extensions:value.extensions, objects: value?.data?.vehicle || [] }  as SubscribeToVehicleGraphLocationOnlyObjectsSubscriptionFetchResultEx }) ;
       }
 
 
@@ -598,24 +598,24 @@ import { RemoveDogsModelByIdDocument } from '../';
     // Subscription Fetch ById Helper
     //
     export type SubscribeToDogModelByIdSubscriptionFetchResult = FetchResult<SubscribeToDogModelByIdSubscription, Record<string, any>, Record<string, any>>;
-    export type SubscribeToDogModelByIdSubscriptionFetchResultEx = FetchResult<SubscribeToDogModelByIdSubscription & DogModelByIdHelperResultEx, Record<string, any>, Record<string, any>>;
+    export type SubscribeToDogModelByIdSubscriptionFetchResultEx = FetchResult<SubscribeToDogModelByIdSubscription, Record<string, any>, Record<string, any>> & DogModelByIdHelperResultEx;
 
     async function subscribeToDogModelById({ apolloClient, dogsId, options }: { apolloClient: ApolloClient<object>, dogsId:string, options: Omit<SubscriptionOptions<SubscribeToDogModelByIdSubscriptionVariables>, 'query' | 'variables'> }): Promise<Observable<SubscribeToDogModelByIdSubscriptionFetchResultEx>> {
       const subscription:Observable<SubscribeToDogModelByIdSubscriptionFetchResult> = apolloClient.subscribe<SubscribeToDogModelByIdSubscription>({ query: SubscribeToDogModelByIdDocument, variables: { dogsId }, ...options });
 
-      return subscription.map(value => {return { context:value.context, errors:value.errors, data:value.data, extensions:value.extensions, dogModel:value?.data?.dogs_by_pk || [] }  as SubscribeToDogModelByIdSubscriptionResultEx }) ;
+      return subscription.map(value => {return { context:value.context, errors:value.errors, data:value.data, extensions:value.extensions, dogModel:value?.data?.dogs_by_pk || [] }  as SubscribeToDogModelByIdSubscriptionFetchResultEx }) ;
     }
 
 
       // Subscription Fetch Objects Helper
       //
       export type SubscribeToDogModelObjectsSubscriptionFetchResult = FetchResult<SubscribeToDogModelObjectsSubscription, Record<string, any>, Record<string, any>>;
-      export type SubscribeToDogModelObjectsSubscriptionFetchResultEx = FetchResult<SubscribeToDogModelObjectsSubscription & DogModelObjectsHelperResultEx, Record<string, any>, Record<string, any>>;
+      export type SubscribeToDogModelObjectsSubscriptionFetchResultEx = FetchResult<SubscribeToDogModelObjectsSubscription, Record<string, any>, Record<string, any>> & DogModelObjectsHelperResultEx;
 
       async function subscribeToDogModelObjects({ apolloClient, options }: { apolloClient: ApolloClient<object>, options: Omit<SubscriptionOptions<SubscribeToDogModelObjectsSubscriptionVariables>, 'subscription'> }): Promise<Observable<SubscribeToDogModelObjectsSubscriptionFetchResultEx>> {
         const subscription:Observable<SubscribeToDogModelObjectsSubscriptionFetchResult> = apolloClient.subscribe<SubscribeToDogModelObjectsSubscription>({ query: SubscribeToDogModelObjectsDocument, ...options });
 
-        return subscription.map(value => {return { context:value.context, errors:value.errors, data:value.data, extensions:value.extensions, objects: value?.data?.dogs || [] }  as SubscribeToDogModelObjectsSubscriptionResultEx }) ;
+        return subscription.map(value => {return { context:value.context, errors:value.errors, data:value.data, extensions:value.extensions, objects: value?.data?.dogs || [] }  as SubscribeToDogModelObjectsSubscriptionFetchResultEx }) ;
       }
 
 

packages/graphql-codegen-hasura-shared/dist/src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-codegen-hasura-shared",
-  "version": "4.0.0-alpha.0",
+  "version": "4.0.0-alpha.3",
   "description": "GraphQL Code Generator plugin for generating a CRUD TypeScript Config for Hasura from Documents",
   "author": "ahrnee <[email protected]>",
   "license": "MIT",
@@ -35,5 +35,5 @@
   "typescript": {
     "definition": "dist/graphql-codegen-hasura-client-config/src/index.d.ts"
   },
-  "gitHead": "86939eb1e105504606a19fcf432f09d2e0d95341"
+  "gitHead": "31dc40fd15d3a2a3009f7316005d1460bdea6c4d"
 }