Namespace with apollo.subgraph

apollographql · Apr 20, 2022 · d4f7b7f · d4f7b7f
1 parent e504e27
commit d4f7b7f
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 19 deletions.
diff --git a/gateway-js/src/schema-helper/addResolversToSchema.ts b/gateway-js/src/schema-helper/addResolversToSchema.ts
@@ -22,9 +22,12 @@ export function addResolversToSchema(
  if (fieldName === "__resolveReference") {
  type.extensions = {
  ...type.extensions,
- apolloSubgraph: {
- ...type.extensions.apolloSubgraph,
- resolveReference: fieldConfig,
+ apollo: {
+ ...type.extensions.apollo,
+ subgraph: {
+ ...type.extensions.apollo?.subgraph,
+ resolveReference: fieldConfig,
+ }
  },
  };
  } else if (fieldName.startsWith("__")) {
@@ -76,9 +79,12 @@ export function addResolversToSchema(
  if (fieldName === "__resolveReference") {
  type.extensions = {
  ...type.extensions,
- apolloSubgraph: {
- ...type.extensions.apolloSubgraph,
- resolveReference: fieldConfig
+ apollo: {
+ ...type.extensions.apollo,
+ subgraph: {
+ ...type.extensions.apollo?.subgraph,
+ resolveReference: fieldConfig,
+ }
  },
  };
  } else if (fieldName.startsWith("__")) {

diff --git a/gateway-js/src/typings/graphql.ts b/gateway-js/src/typings/graphql.ts
@@ -12,14 +12,20 @@ interface ApolloSubgraphExtensions<TContext> {
 
 declare module 'graphql/type/definition' {
  interface GraphQLObjectTypeExtensions<_TSource = any, _TContext = any> {
- apolloSubgraph?: ApolloSubgraphExtensions<_TContext>;
+ apollo?: {
+ subgraph?: ApolloSubgraphExtensions<_TContext>;
+ }
  }
 
  interface GraphQLInterfaceTypeExtensions<_TSource = any, _TContext = any> {
- apolloSubgraph?: ApolloSubgraphExtensions<_TContext>;
+ apollo?: {
+ subgraph?: ApolloSubgraphExtensions<_TContext>;
+ }
  }
 
  interface GraphQLUnionTypeExtensions<_TSource = any, _TContext = any> {
- apolloSubgraph?: ApolloSubgraphExtensions<_TContext>;
+ apollo?: {
+ subgraph?: ApolloSubgraphExtensions<_TContext>;
+ }
  }
 }
diff --git a/subgraph-js/src/schema-helper/buildSchemaFromSDL.ts b/subgraph-js/src/schema-helper/buildSchemaFromSDL.ts
@@ -111,9 +111,12 @@ export function addResolversToSchema(
  if (fieldName === "__resolveReference") {
  type.extensions = {
  ...type.extensions,
- apolloSubgraph: {
- ...type.extensions.apolloSubgraph,
- resolveReference: fieldConfig
+ apollo: {
+ ...type.extensions.apollo,
+ subgraph: {
+ ...type.extensions.apollo?.subgraph,
+ resolveReference: fieldConfig,
+ }
  },
  };
  } else if (fieldName.startsWith("__")) {
@@ -165,9 +168,12 @@ export function addResolversToSchema(
  if (fieldName === "__resolveReference") {
  type.extensions = {
  ...type.extensions,
- apolloSubgraph: {
- ...type.extensions.apolloSubgraph,
- resolveReference: fieldConfig
+ apollo: {
+ ...type.extensions.apollo,
+ subgraph: {
+ ...type.extensions.apollo?.subgraph,
+ resolveReference: fieldConfig,
+ }
  },
  };
  } else if (fieldName.startsWith("__")) {

diff --git a/subgraph-js/src/schemaExtensions.ts b/subgraph-js/src/schemaExtensions.ts
@@ -12,14 +12,20 @@ interface ApolloSubgraphExtensions<TContext> {
 
 declare module 'graphql/type/definition' {
  interface GraphQLObjectTypeExtensions<_TSource = any, _TContext = any> {
- apolloSubgraph?: ApolloSubgraphExtensions<_TContext>;
+ apollo?: {
+ subgraph?: ApolloSubgraphExtensions<_TContext>;
+ };
  }
 
  interface GraphQLInterfaceTypeExtensions<_TSource = any, _TContext = any> {
- apolloSubgraph?: ApolloSubgraphExtensions<_TContext>;
+ apollo?: {
+ subgraph?: ApolloSubgraphExtensions<_TContext>;
+ };
  }
 
  interface GraphQLUnionTypeExtensions<_TSource = any, _TContext = any> {
- apolloSubgraph?: ApolloSubgraphExtensions<_TContext>;
+ apollo?: {
+ subgraph?: ApolloSubgraphExtensions<_TContext>;
+ };
  }
 }
diff --git a/subgraph-js/src/types.ts b/subgraph-js/src/types.ts
@@ -94,7 +94,7 @@ export function entitiesResolver({
  }
 
  const resolveReference =
- type.extensions?.apolloSubgraph?.resolveReference ??
+ type.extensions.apollo?.subgraph?.resolveReference ??
  function defaultResolveReference() {
  return reference;
  };