more cleanup

Author: modosc

src/type/__tests__/definition-test.js

@@ -259,6 +259,8 @@ describe('Type System: Objects', () => {
             description: undefined,
             type: ScalarType,
             defaultValue: undefined,
+            deprecationReason: undefined,
+            isDeprecated: false,
             extensions: undefined,
             astNode: undefined,
           },
@@ -750,6 +752,7 @@ describe('Type System: Input Objects', () => {
           description: undefined,
           type: ScalarType,
           defaultValue: undefined,
+          isDeprecated: false,
           extensions: undefined,
           astNode: undefined,
         },
@@ -770,6 +773,7 @@ describe('Type System: Input Objects', () => {
           type: ScalarType,
           defaultValue: undefined,
           extensions: undefined,
+          isDeprecated: false,
           astNode: undefined,
         },
       });

src/type/definition.d.ts

@@ -493,6 +493,8 @@ export interface GraphQLArgumentConfig {
   description?: Maybe<string>;
   type: GraphQLInputType;
   defaultValue?: any;
+  isDeprecated?: boolean;
+  deprecationReason?: Maybe<string>;
   extensions?: Maybe<Readonly<Record<string, any>>>;
   astNode?: Maybe<InputValueDefinitionNode>;
 }

src/type/definition.js

@@ -825,7 +825,7 @@ function defineFieldMap<TSource, TContext>(
       type: argConfig.type,
       defaultValue: argConfig.defaultValue,
       extensions: argConfig.extensions && toObjMap(argConfig.extensions),
-      isDeprecated: Boolean(argConfig.deprecationReason),
+      isDeprecated: argConfig.deprecationReason != null,
       deprecationReason: argConfig.deprecationReason,
       astNode: argConfig.astNode,
     }));
@@ -1535,7 +1535,7 @@ function defineInputFieldMap(
     );
 
     return {
-      isDeprecated: Boolean(fieldConfig.deprecationReason),
+      isDeprecated: fieldConfig.deprecationReason != null,
       name: fieldName,
       description: fieldConfig.description,
       type: fieldConfig.type,

src/utilities/__tests__/buildASTSchema-test.js

@@ -777,6 +777,29 @@ describe('Schema Builder', () => {
       isDeprecated: true,
       deprecationReason: 'Because I said so',
     });
+
+    const inputFields = assertInputObjectType(
+      schema.getType('MyInput'),
+    ).getFields();
+
+    const newInput = inputFields.newInput;
+    expect(newInput.isDeprecated).to.equal(false);
+
+    const oldInput = inputFields.oldInput;
+    expect(oldInput.isDeprecated).to.equal(true);
+    expect(oldInput.deprecationReason).to.equal('No longer supported');
+
+    const otherInput = inputFields.otherInput;
+    expect(otherInput.isDeprecated).to.equal(true);
+    expect(otherInput.deprecationReason).to.equal('Use newInput');
+
+    const field3OldArg = rootFields.field3.args[0];
+    expect(field3OldArg.isDeprecated).to.equal(true);
+    expect(field3OldArg.deprecationReason).to.equal('No longer supported');
+
+    const field4OldArg = rootFields.field4.args[0];
+    expect(field4OldArg.isDeprecated).to.equal(true);
+    expect(field4OldArg.deprecationReason).to.equal('why not?');
   });
 
   it('Correctly extend scalar type', () => {
@@ -799,32 +822,6 @@ describe('Schema Builder', () => {
     `);
 
     expect(printAllASTNodes(someScalar)).to.equal(scalarSDL);
-    const rootFields = assertObjectType(schema.getType('Query')).getFields();
-
-    expect(rootFields.field2.isDeprecated).to.equal(true);
-    expect(rootFields.field2.deprecationReason).to.equal('Because I said so');
-
-    const field3OldArg = rootFields.field3.args[0];
-    expect(field3OldArg.isDeprecated).to.equal(true);
-    expect(field3OldArg.deprecationReason).to.equal('No longer supported');
-
-    const field4OldArg = rootFields.field4.args[0];
-    expect(field4OldArg.isDeprecated).to.equal(true);
-    expect(field4OldArg.deprecationReason).to.equal('why not?');
-
-    const myInput = schema.getType('MyInput');
-    const inputFields = myInput.getFields();
-
-    const newInput = inputFields.newInput;
-    expect(newInput.isDeprecated).to.equal(false);
-
-    const oldInput = inputFields.oldInput;
-    expect(oldInput.isDeprecated).to.equal(true);
-    expect(oldInput.deprecationReason).to.equal('No longer supported');
-
-    const otherInput = inputFields.otherInput;
-    expect(otherInput.isDeprecated).to.equal(true);
-    expect(otherInput.deprecationReason).to.equal('Use newInput');
   });
 
   it('Correctly extend object type', () => {

src/utilities/__tests__/schemaPrinter-test.js

@@ -678,7 +678,7 @@ describe('Type System Printer', () => {
         interfaces: [__Type!]
         possibleTypes: [__Type!]
         enumValues(includeDeprecated: Boolean = false): [__EnumValue!]
-        inputFields: [__InputValue!]
+        inputFields(includeDeprecated: Boolean = false): [__InputValue!]
         ofType: __Type
       }
 
@@ -886,7 +886,7 @@ describe('Type System Printer', () => {
         interfaces: [__Type!]
         possibleTypes: [__Type!]
         enumValues(includeDeprecated: Boolean = false): [__EnumValue!]
-        inputFields: [__InputValue!]
+        inputFields(includeDeprecated: Boolean = false): [__InputValue!]
         ofType: __Type
       }
 
@@ -921,7 +921,7 @@ describe('Type System Printer', () => {
       type __Field {
         name: String!
         description: String
-        args: [__InputValue!]!
+        args(includeDeprecated: Boolean = false): [__InputValue!]!
         type: __Type!
         isDeprecated: Boolean!
         deprecationReason: String

src/utilities/extendSchema.js

@@ -695,7 +695,10 @@ const stdTypeMap = keyMap(
  * deprecation reason.
  */
 function getDeprecationReason(
-  node: EnumValueDefinitionNode | FieldDefinitionNode,
+  node:
+    | EnumValueDefinitionNode
+    | FieldDefinitionNode
+    | InputValueDefinitionNode,
 ): ?string {
   const deprecated = getDirectiveValues(GraphQLDeprecatedDirective, node);
   return (deprecated?.reason: any);

src/utilities/printSchema.js

@@ -310,7 +310,7 @@ function printDirective(directive, options) {
 }
 
 function printDeprecated(fieldOrEnumVal) {
-  if (!fieldOrEnumVal.isDeprecated) {
+  if (fieldOrEnumVal.deprecationReason == null) {
     return '';
   }
   const reason = fieldOrEnumVal.deprecationReason;