Add missing deprecated input value printing for subgraph printer.

Add tests for printing @SpecifiedBy and deprecated input values.
apollographql · Sep 2, 2021 · d0eb6f7 · d0eb6f7
1 parent 4492fb2
commit d0eb6f7
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/federation-integration-testsuite-js/src/fixtures/accounts.ts b/federation-integration-testsuite-js/src/fixtures/accounts.ts
@@ -23,6 +23,8 @@ export const typeDefs = gql`
     inheritMaxAge: Boolean
   ) on FIELD_DEFINITION | OBJECT | INTERFACE | UNION
 
+  scalar JSON @specifiedBy(url: "https://json-spec.dev")
+
   schema {
     query: RootQuery
     mutation: Mutation
@@ -65,7 +67,11 @@ export const typeDefs = gql`
   }
 
   type Mutation {
-    login(username: String!, password: String!): User
+    login(
+      username: String!
+      password: String!
+      userId: String @deprecated(reason: "Use username instead")
+    ): User
   }
 
   extend type Library @key(fields: "id") {

diff --git a/federation-js/src/service/__tests__/printSubgraphSchema.test.ts b/federation-js/src/service/__tests__/printSubgraphSchema.test.ts
@@ -22,6 +22,8 @@ describe('printSubgraphSchema', () => {
         PRIVATE
       }
 
+      scalar JSON @specifiedBy(url: \\"https://json-spec.dev\\")
+
       type PasswordAccount @key(fields: \\"email\\") {
         email: String!
       }
@@ -54,7 +56,7 @@ describe('printSubgraphSchema', () => {
       }
 
       type Mutation {
-        login(username: String!, password: String!): User
+        login(username: String!, password: String!, userId: String @deprecated(reason: \\"Use username instead\\")): User
       }
 
       extend type RootQuery {

diff --git a/federation-js/src/service/__tests__/printSupergraphSdl.test.ts b/federation-js/src/service/__tests__/printSupergraphSdl.test.ts
@@ -141,6 +141,8 @@ describe('printSupergraphSdl', () => {
         url: String!
       }
 
+      scalar JSON @specifiedBy(url: \\"https://json-spec.dev\\")
+
       type KeyValue {
         key: String!
         value: String!
@@ -160,7 +162,7 @@ describe('printSupergraphSdl', () => {
 
       type Mutation {
         deleteReview(id: ID!): Boolean @join__field(graph: REVIEWS)
-        login(password: String!, username: String!): User @join__field(graph: ACCOUNTS)
+        login(password: String!, userId: String @deprecated(reason: \\"Use username instead\\"), username: String!): User @join__field(graph: ACCOUNTS)
         reviewProduct(body: String!, upc: String!): Product @join__field(graph: REVIEWS)
         updateReview(review: UpdateReviewInput!): Review @join__field(graph: REVIEWS)
       }

diff --git a/federation-js/src/service/printSubgraphSchema.ts b/federation-js/src/service/printSubgraphSchema.ts
@@ -363,7 +363,7 @@ function printInputValue(arg: GraphQLInputField) {
   if (defaultAST) {
     argDecl += ` = ${print(defaultAST)}`;
   }
-  return argDecl;
+  return argDecl + printDeprecated(arg.deprecationReason);
 }
 
 function printDirective(directive: GraphQLDirective) {

diff --git a/gateway-js/src/__tests__/loadSupergraphSdlFromStorage.test.ts b/gateway-js/src/__tests__/loadSupergraphSdlFromStorage.test.ts
@@ -148,6 +148,8 @@ describe('loadSupergraphSdlFromStorage', () => {
         url: String!
       }
 
+      scalar JSON @specifiedBy(url: \\"https://json-spec.dev\\")
+
       type KeyValue {
         key: String!
         value: String!
@@ -167,7 +169,7 @@ describe('loadSupergraphSdlFromStorage', () => {
 
       type Mutation {
         deleteReview(id: ID!): Boolean @join__field(graph: REVIEWS)
-        login(password: String!, username: String!): User @join__field(graph: ACCOUNTS)
+        login(password: String!, userId: String @deprecated(reason: \\"Use username instead\\"), username: String!): User @join__field(graph: ACCOUNTS)
         reviewProduct(body: String!, upc: String!): Product @join__field(graph: REVIEWS)
         updateReview(review: UpdateReviewInput!): Review @join__field(graph: REVIEWS)
       }