introspection: expose fields/values with empty deprecationReason (#2339)

Author: IvanGoncharov

src/type/__tests__/introspection-test.js

@@ -1000,6 +1000,10 @@ describe('Introspection', () => {
           type: GraphQLString,
           deprecationReason: 'Removed in 1.0',
         },
+        deprecatedWithEmptyReason: {
+          type: GraphQLString,
+          deprecationReason: '',
+        },
       },
     });
 
@@ -1032,6 +1036,11 @@ describe('Introspection', () => {
               isDeprecated: true,
               deprecationReason: 'Removed in 1.0',
             },
+            {
+              name: 'deprecatedWithEmptyReason',
+              isDeprecated: true,
+              deprecationReason: '',
+            },
           ],
         },
       },
@@ -1160,9 +1169,10 @@ describe('Introspection', () => {
     const TestEnum = new GraphQLEnumType({
       name: 'TestEnum',
       values: {
-        NON_DEPRECATED: { value: 0 },
-        DEPRECATED: { value: 1, deprecationReason: 'Removed in 1.0' },
-        ALSO_NON_DEPRECATED: { value: 2 },
+        NON_DEPRECATED: {},
+        DEPRECATED: { deprecationReason: 'Removed in 1.0' },
+        DEPRECATED_WITH_EMPTY_REASON: { deprecationReason: '' },
+        ALSO_NON_DEPRECATED: {},
       },
     });
 
@@ -1179,7 +1189,6 @@ describe('Introspection', () => {
     const source = `
       {
         __type(name: "TestEnum") {
-          name
           trueValues: enumValues(includeDeprecated: true) {
             name
           }
@@ -1196,33 +1205,19 @@ describe('Introspection', () => {
     expect(graphqlSync({ schema, source })).to.deep.equal({
       data: {
         __type: {
-          name: 'TestEnum',
           trueValues: [
-            {
-              name: 'NON_DEPRECATED',
-            },
-            {
-              name: 'DEPRECATED',
-            },
-            {
-              name: 'ALSO_NON_DEPRECATED',
-            },
+            { name: 'NON_DEPRECATED' },
+            { name: 'DEPRECATED' },
+            { name: 'DEPRECATED_WITH_EMPTY_REASON' },
+            { name: 'ALSO_NON_DEPRECATED' },
           ],
           falseValues: [
-            {
-              name: 'NON_DEPRECATED',
-            },
-            {
-              name: 'ALSO_NON_DEPRECATED',
-            },
+            { name: 'NON_DEPRECATED' },
+            { name: 'ALSO_NON_DEPRECATED' },
           ],
           omittedValues: [
-            {
-              name: 'NON_DEPRECATED',
-            },
-            {
-              name: 'ALSO_NON_DEPRECATED',
-            },
+            { name: 'NON_DEPRECATED' },
+            { name: 'ALSO_NON_DEPRECATED' },
           ],
         },
       },

src/type/introspection.js

@@ -240,7 +240,7 @@ export const __Type = new GraphQLObjectType({
           if (isObjectType(type) || isInterfaceType(type)) {
             let fields = objectValues(type.getFields());
             if (!includeDeprecated) {
-              fields = fields.filter(field => !field.deprecationReason);
+              fields = fields.filter(field => !field.isDeprecated);
             }
             return fields;
           }
@@ -272,7 +272,7 @@ export const __Type = new GraphQLObjectType({
           if (isEnumType(type)) {
             let values = type.getValues();
             if (!includeDeprecated) {
-              values = values.filter(value => !value.deprecationReason);
+              values = values.filter(value => !value.isDeprecated);
             }
             return values;
           }