@graphql-mesh/fusion-runtime 1.8.6 → 1.8.7-alpha-971df8ca5edef1a97ddf1332eb144ea01e16342e

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @graphql-mesh/fusion-runtime
 
+## 1.8.7-alpha-971df8ca5edef1a97ddf1332eb144ea01e16342e
+### Patch Changes
+
+
+
+- [#2225](https://github.com/graphql-hive/gateway/pull/2225) [`9d467a8`](https://github.com/graphql-hive/gateway/commit/9d467a839e9d7dc8a236d8b66c519e19c89bd67f) Thanks [@enisdenjo](https://github.com/enisdenjo)! - Inject the @resolveTo directive definition when not present in the composed supergraph SDL
+
 ## 1.8.6
 ### Patch Changes
 

package/dist/index.cjs

@@ -595,13 +595,42 @@ function getStitchingDirectivesTransformerForSubschema() {
   });
   return stitchingDirectivesTransformer;
 }
+const RESOLVE_TO_DIRECTIVE_DEF = graphql.parse(
+  /* GraphQL */
+  `
+  scalar ResolveToSourceArgs
+  directive @resolveTo(
+    requiredSelectionSet: String
+    sourceName: String
+    sourceTypeName: String
+    sourceFieldName: String
+    sourceSelectionSet: String
+    sourceArgs: ResolveToSourceArgs
+    keyField: String
+    keysArg: String
+    pubsubTopic: String
+    filterBy: String
+    additionalArgs: ResolveToSourceArgs
+    result: String
+    resultType: String
+  ) on FIELD_DEFINITION
+`
+);
 function handleResolveToDirectives(typeDefsOpt, additionalTypeDefs, additionalResolvers) {
-  const mergedTypeDefs = merge.mergeTypeDefs([typeDefsOpt, additionalTypeDefs]);
+  let mergedTypeDefs = merge.mergeTypeDefs([typeDefsOpt, additionalTypeDefs]);
+  let resolveToUsed = false;
+  let resolveToDirectiveDefined = false;
   graphql.visit(mergedTypeDefs, {
+    [graphql.Kind.DIRECTIVE_DEFINITION](node) {
+      if (node.name.value === "resolveTo") {
+        resolveToDirectiveDefined = true;
+      }
+    },
     [graphql.Kind.FIELD_DEFINITION](field, _key, _parent, _path, ancestors) {
       const fieldDirectives = utils.getDirectiveExtensions({ astNode: field });
       const resolveToDirectives = fieldDirectives?.resolveTo;
       if (resolveToDirectives?.length) {
+        resolveToUsed = true;
         const targetTypeName = ancestors[ancestors.length - 1].name.value;
         const targetFieldName = field.name.value;
         for (const resolveToDirective of resolveToDirectives) {
@@ -616,6 +645,9 @@ function handleResolveToDirectives(typeDefsOpt, additionalTypeDefs, additionalRe
       }
     }
   });
+  if (resolveToUsed && !resolveToDirectiveDefined) {
+    mergedTypeDefs = merge.mergeTypeDefs([RESOLVE_TO_DIRECTIVE_DEF, mergedTypeDefs]);
+  }
   return mergedTypeDefs;
 }
 const handleFederationSupergraph = function({

package/dist/index.d.cts

@@ -4,7 +4,6 @@ import { Logger } from '@graphql-hive/logger';
 import { TransportContext, TransportEntry, Transport } from '@graphql-mesh/transport-common';
 export { TransportEntry, TransportGetSubgraphExecutor, TransportGetSubgraphExecutorOptions } from '@graphql-mesh/transport-common';
 import { DelegationPlanBuilder, Subschema, MergedTypeResolver, SubschemaConfig } from '@graphql-tools/delegate';
-import * as graphql from 'graphql';
 import { GraphQLSchema, DocumentNode, ExecutionResult, GraphQLError, FragmentDefinitionNode, SelectionNode, SelectionSetNode } from 'graphql';
 import { GraphQLResolveInfo, GraphQLOutputType } from 'graphql/type';
 import { OnDelegateHook } from '@graphql-mesh/types';
@@ -244,7 +243,7 @@ declare function getTransportEntryMapUsingFusionAndFederationDirectives(unifiedG
 
 declare const restoreExtraDirectives: (schema: GraphQLSchema) => GraphQLSchema;
 declare function getStitchingDirectivesTransformerForSubschema(): (subschemaConfig: SubschemaConfig) => SubschemaConfig;
-declare function handleResolveToDirectives(typeDefsOpt: TypeSource, additionalTypeDefs: TypeSource, additionalResolvers: IResolvers[]): graphql.DocumentNode;
+declare function handleResolveToDirectives(typeDefsOpt: TypeSource, additionalTypeDefs: TypeSource, additionalResolvers: IResolvers[]): DocumentNode;
 interface HandleFederationSupergraphResult extends UnifiedGraphHandlerResult {
     getSubschema(subgraphName: string): SubschemaConfig;
     subschemas: SubschemaConfig[];

package/dist/index.d.ts

@@ -4,7 +4,6 @@ import { Logger } from '@graphql-hive/logger';
 import { TransportContext, TransportEntry, Transport } from '@graphql-mesh/transport-common';
 export { TransportEntry, TransportGetSubgraphExecutor, TransportGetSubgraphExecutorOptions } from '@graphql-mesh/transport-common';
 import { DelegationPlanBuilder, Subschema, MergedTypeResolver, SubschemaConfig } from '@graphql-tools/delegate';
-import * as graphql from 'graphql';
 import { GraphQLSchema, DocumentNode, ExecutionResult, GraphQLError, FragmentDefinitionNode, SelectionNode, SelectionSetNode } from 'graphql';
 import { GraphQLResolveInfo, GraphQLOutputType } from 'graphql/type';
 import { OnDelegateHook } from '@graphql-mesh/types';
@@ -244,7 +243,7 @@ declare function getTransportEntryMapUsingFusionAndFederationDirectives(unifiedG
 
 declare const restoreExtraDirectives: (schema: GraphQLSchema) => GraphQLSchema;
 declare function getStitchingDirectivesTransformerForSubschema(): (subschemaConfig: SubschemaConfig) => SubschemaConfig;
-declare function handleResolveToDirectives(typeDefsOpt: TypeSource, additionalTypeDefs: TypeSource, additionalResolvers: IResolvers[]): graphql.DocumentNode;
+declare function handleResolveToDirectives(typeDefsOpt: TypeSource, additionalTypeDefs: TypeSource, additionalResolvers: IResolvers[]): DocumentNode;
 interface HandleFederationSupergraphResult extends UnifiedGraphHandlerResult {
     getSubschema(subgraphName: string): SubschemaConfig;
     subschemas: SubschemaConfig[];

package/dist/index.js

@@ -5,7 +5,7 @@ import { getInContextSDK, getResolverForPubSubOperation, resolveAdditionalResolv
 import { getBatchingExecutor } from '@graphql-tools/batch-execute';
 import { getDirectiveExtensions, mapSchema, MapperKind, astFromField, asArray, getDocumentNodeFromSchema, memoize1, isDocumentNode, printSchemaWithDirectives, mergeDeep, isAsyncIterable, createGraphQLError } from '@graphql-tools/utils';
 import { handleMaybePromise, isPromise, mapAsyncIterator } from '@whatwg-node/promise-helpers';
-import { isInterfaceType, Kind, isObjectType, typeFromAST, isOutputType, GraphQLSchema, GraphQLDirective, parseType, visit, GraphQLString, DirectiveLocation, isEnumType, isSchema, buildSchema, buildASTSchema } from 'graphql';
+import { isInterfaceType, Kind, isObjectType, typeFromAST, isOutputType, GraphQLSchema, GraphQLDirective, parseType, visit, GraphQLString, DirectiveLocation, isEnumType, parse, isSchema, buildSchema, buildASTSchema } from 'graphql';
 import { defaultMergedResolver } from '@graphql-tools/delegate';
 import { getStitchedSchemaFromSupergraphSdl } from '@graphql-tools/federation';
 import { mergeTypeDefs } from '@graphql-tools/merge';
@@ -593,13 +593,42 @@ function getStitchingDirectivesTransformerForSubschema() {
   });
   return stitchingDirectivesTransformer;
 }
+const RESOLVE_TO_DIRECTIVE_DEF = parse(
+  /* GraphQL */
+  `
+  scalar ResolveToSourceArgs
+  directive @resolveTo(
+    requiredSelectionSet: String
+    sourceName: String
+    sourceTypeName: String
+    sourceFieldName: String
+    sourceSelectionSet: String
+    sourceArgs: ResolveToSourceArgs
+    keyField: String
+    keysArg: String
+    pubsubTopic: String
+    filterBy: String
+    additionalArgs: ResolveToSourceArgs
+    result: String
+    resultType: String
+  ) on FIELD_DEFINITION
+`
+);
 function handleResolveToDirectives(typeDefsOpt, additionalTypeDefs, additionalResolvers) {
-  const mergedTypeDefs = mergeTypeDefs([typeDefsOpt, additionalTypeDefs]);
+  let mergedTypeDefs = mergeTypeDefs([typeDefsOpt, additionalTypeDefs]);
+  let resolveToUsed = false;
+  let resolveToDirectiveDefined = false;
   visit(mergedTypeDefs, {
+    [Kind.DIRECTIVE_DEFINITION](node) {
+      if (node.name.value === "resolveTo") {
+        resolveToDirectiveDefined = true;
+      }
+    },
     [Kind.FIELD_DEFINITION](field, _key, _parent, _path, ancestors) {
       const fieldDirectives = getDirectiveExtensions({ astNode: field });
       const resolveToDirectives = fieldDirectives?.resolveTo;
       if (resolveToDirectives?.length) {
+        resolveToUsed = true;
         const targetTypeName = ancestors[ancestors.length - 1].name.value;
         const targetFieldName = field.name.value;
         for (const resolveToDirective of resolveToDirectives) {
@@ -614,6 +643,9 @@ function handleResolveToDirectives(typeDefsOpt, additionalTypeDefs, additionalRe
       }
     }
   });
+  if (resolveToUsed && !resolveToDirectiveDefined) {
+    mergedTypeDefs = mergeTypeDefs([RESOLVE_TO_DIRECTIVE_DEF, mergedTypeDefs]);
+  }
   return mergedTypeDefs;
 }
 const handleFederationSupergraph = function({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-mesh/fusion-runtime",
-  "version": "1.8.6",
+  "version": "1.8.7-alpha-971df8ca5edef1a97ddf1332eb144ea01e16342e",
   "type": "module",
   "description": "Runtime for GraphQL Mesh Fusion Supergraph",
   "repository": {
@@ -65,7 +65,7 @@
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@graphql-hive/router-runtime": "^1.3.2",
+    "@graphql-hive/router-runtime": "1.3.3-alpha-971df8ca5edef1a97ddf1332eb144ea01e16342e",
     "change-case": "^5.4.4",
     "graphql": "^16.12.0",
     "pkgroll": "2.27.0"