use @hayes naming suggestion

Co-authored-by: Michael Hayes <[email protected]>"

Author: yaacovCR

integrationTests/ts/basic-test.ts

@@ -11,7 +11,7 @@ const queryType: GraphQLObjectType = new GraphQLObjectType({
       args: {
         who: {
           type: GraphQLString,
-          externalDefaultValue: 'World',
+          default: { value: 'World' },
         },
       },
       resolve(_root, args: { who: string }) {

integrationTests/ts/esm.ts

@@ -15,7 +15,7 @@ const queryType: GraphQLObjectType = new GraphQLObjectType({
       args: {
         who: {
           type: GraphQLString,
-          externalDefaultValue: 'World',
+          default: { value: 'World' },
         },
       },
       resolve(_root, args: { who: string }) {

src/execution/__tests__/executor-test.ts

@@ -246,7 +246,7 @@ describe('Execute: Handles basic execution tasks', () => {
             signature: {
               name: 'var',
               type: GraphQLString,
-              externalDefaultValue: undefined,
+              default: undefined,
             },
             value: 'abc',
           },

src/execution/__tests__/variables-test.ts

@@ -142,11 +142,11 @@ const TestType = new GraphQLObjectType({
     }),
     fieldWithDefaultArgumentValue: fieldWithInputArg({
       type: GraphQLString,
-      externalDefaultValue: 'Hello World',
+      default: { value: 'Hello World' },
     }),
     fieldWithNonNullableStringInputAndDefaultArgumentValue: fieldWithInputArg({
       type: new GraphQLNonNull(GraphQLString),
-      externalDefaultValue: 'Hello World',
+      default: { value: 'Hello World' },
     }),
     fieldWithNestedInputObject: fieldWithInputArg({
       type: TestNestedInputObject,
@@ -187,7 +187,7 @@ const schema = new GraphQLSchema({
           type: new GraphQLNonNull(GraphQLBoolean),
           description: 'Skipped when true.',
           // default values will override operation variables in the setting of defined fragment variables that are not provided
-          externalDefaultValue: true,
+          default: { value: true },
         },
       },
     }),

src/execution/getVariableSignature.ts

@@ -21,7 +21,7 @@ export interface GraphQLVariableSignature {
   name: string;
   type: GraphQLInputType;
   defaultValue?: never;
-  externalDefaultValue: { literal: ConstValueNode } | undefined;
+  default: { literal: ConstValueNode } | undefined;
 }
 
 export function getVariableSignature(
@@ -46,6 +46,6 @@ export function getVariableSignature(
   return {
     name: varName,
     type: varType,
-    externalDefaultValue: defaultValue ? { literal: defaultValue } : undefined,
+    default: defaultValue && { literal: defaultValue },
   };
 }

src/index.ts

@@ -212,7 +212,7 @@ export type {
   GraphQLScalarOutputValueCoercer,
   GraphQLScalarInputValueCoercer,
   GraphQLScalarInputLiteralCoercer,
-  GraphQLDefaultValueUsage,
+  GraphQLDefaultInput,
 } from './type/index.js';
 
 // Parse and operate on GraphQL language source files.

src/type/__tests__/definition-test.ts

@@ -205,8 +205,7 @@ describe('Type System: Objects', () => {
               description: 'Argument description.',
               type: ScalarType,
               defaultValue: undefined,
-              externalDefaultValue: 'DefaultValue',
-              defaultValueLiteral: undefined,
+              default: { value: 'DefaultValue' },
               deprecationReason: 'Argument deprecation reason.',
               extensions: { someExtension: 'extension' },
               astNode: dummyAny,
@@ -378,7 +377,7 @@ describe('Type System: Objects', () => {
       description: undefined,
       type: ScalarType,
       defaultValue: undefined,
-      externalDefaultValue: undefined,
+      default: undefined,
       deprecationReason: undefined,
       extensions: {},
       astNode: undefined,
@@ -495,8 +494,7 @@ describe('Type System: Interfaces', () => {
               description: 'Argument description.',
               type: ScalarType,
               defaultValue: undefined,
-              externalDefaultValue: undefined,
-              defaultValueLiteral: dummyAny,
+              default: { literal: dummyAny },
               deprecationReason: 'Argument deprecation reason.',
               extensions: { someExtension: 'extension' },
               astNode: dummyAny,
@@ -834,8 +832,7 @@ describe('Type System: Input Objects', () => {
           description: 'Argument description.',
           type: ScalarType,
           defaultValue: undefined,
-          externalDefaultValue: 'DefaultValue',
-          defaultValueLiteral: undefined,
+          default: { value: 'DefaultValue' },
           deprecationReason: 'Argument deprecation reason.',
           extensions: { someExtension: 'extension' },
           astNode: dummyAny,
@@ -864,7 +861,7 @@ describe('Type System: Input Objects', () => {
         description: undefined,
         type: ScalarType,
         defaultValue: undefined,
-        externalDefaultValue: undefined,
+        default: undefined,
         deprecationReason: undefined,
         extensions: {},
         astNode: undefined,
@@ -884,7 +881,7 @@ describe('Type System: Input Objects', () => {
         description: undefined,
         type: ScalarType,
         defaultValue: undefined,
-        externalDefaultValue: undefined,
+        default: undefined,
         extensions: {},
         deprecationReason: undefined,
         astNode: undefined,
@@ -933,15 +930,15 @@ describe('Type System: Input Objects', () => {
       const inputObjType = new GraphQLInputObjectType({
         name: 'SomeInputObject',
         fields: {
-          f: { type: ScalarType, externalDefaultValue: 3 },
+          f: { type: ScalarType, default: { value: 3 } },
         },
       });
       expect(inputObjType.getFields().f).to.deep.include({
         name: 'f',
         description: undefined,
         type: ScalarType,
         defaultValue: undefined,
-        externalDefaultValue: { value: 3 },
+        default: { value: 3 },
         deprecationReason: undefined,
         extensions: {},
         astNode: undefined,
@@ -954,7 +951,7 @@ describe('Type System: Input Objects', () => {
         fields: {
           f: {
             type: ScalarType,
-            defaultValueLiteral: { kind: Kind.INT, value: '3' },
+            default: { literal: { kind: Kind.INT, value: '3' } },
           },
         },
       });
@@ -963,28 +960,12 @@ describe('Type System: Input Objects', () => {
         description: undefined,
         type: ScalarType,
         defaultValue: undefined,
-        externalDefaultValue: { literal: { kind: 'IntValue', value: '3' } },
+        default: { literal: { kind: 'IntValue', value: '3' } },
         deprecationReason: undefined,
         extensions: {},
         astNode: undefined,
       });
     });
-
-    it('rejects an Input Object type with potentially conflicting default values', () => {
-      const inputObjType = new GraphQLInputObjectType({
-        name: 'SomeInputObject',
-        fields: {
-          f: {
-            type: ScalarType,
-            externalDefaultValue: 3,
-            defaultValueLiteral: { kind: Kind.INT, value: '3' },
-          },
-        },
-      });
-      expect(() => inputObjType.getFields()).to.throw(
-        'Argument "f" has both an externalDefaultValue and a defaultValueLiteral property, but only one must be provided.',
-      );
-    });
   });
 });
 

src/type/__tests__/directive-test.ts

@@ -45,7 +45,7 @@ describe('Type System: Directive', () => {
       description: undefined,
       type: GraphQLString,
       defaultValue: undefined,
-      externalDefaultValue: undefined,
+      default: undefined,
       deprecationReason: undefined,
       extensions: {},
       astNode: undefined,
@@ -57,7 +57,7 @@ describe('Type System: Directive', () => {
       description: undefined,
       type: GraphQLInt,
       defaultValue: undefined,
-      externalDefaultValue: undefined,
+      default: undefined,
       deprecationReason: undefined,
       extensions: {},
       astNode: undefined,

src/type/__tests__/enumType-test.ts

@@ -71,7 +71,7 @@ const QueryType = new GraphQLObjectType({
       args: {
         fromEnum: {
           type: ComplexEnum,
-          externalDefaultValue: 'ONE',
+          default: { value: 'ONE' },
         },
         provideGoodValue: { type: GraphQLBoolean },
         provideBadValue: { type: GraphQLBoolean },

src/type/__tests__/predicate-test.ts

@@ -5,6 +5,7 @@ import { DirectiveLocation } from '../../language/directiveLocation.js';
 
 import type {
   GraphQLArgument,
+  GraphQLDefaultInput,
   GraphQLInputField,
   GraphQLInputType,
 } from '../definition.js';
@@ -634,7 +635,7 @@ describe('Type predicates', () => {
   describe('isRequiredArgument', () => {
     function buildArg(config: {
       type: GraphQLInputType;
-      externalDefaultValue?: unknown;
+      default?: GraphQLDefaultInput;
     }): GraphQLArgument {
       const objectType = new GraphQLObjectType({
         name: 'SomeType',
@@ -660,7 +661,7 @@ describe('Type predicates', () => {
 
       const optArg2 = buildArg({
         type: GraphQLString,
-        externalDefaultValue: null,
+        default: { value: null },
       });
       expect(isRequiredArgument(optArg2)).to.equal(false);
 
@@ -671,7 +672,7 @@ describe('Type predicates', () => {
 
       const optArg4 = buildArg({
         type: new GraphQLNonNull(GraphQLString),
-        externalDefaultValue: 'default',
+        default: { value: 'default' },
       });
       expect(isRequiredArgument(optArg4)).to.equal(false);
     });
@@ -680,7 +681,7 @@ describe('Type predicates', () => {
   describe('isRequiredInputField', () => {
     function buildInputField(config: {
       type: GraphQLInputType;
-      externalDefaultValue?: unknown;
+      default?: GraphQLDefaultInput;
     }): GraphQLInputField {
       const inputObjectType = new GraphQLInputObjectType({
         name: 'SomeType',
@@ -706,7 +707,7 @@ describe('Type predicates', () => {
 
       const optField2 = buildInputField({
         type: GraphQLString,
-        externalDefaultValue: null,
+        default: { value: null },
       });
       expect(isRequiredInputField(optField2)).to.equal(false);
 
@@ -717,7 +718,7 @@ describe('Type predicates', () => {
 
       const optField4 = buildInputField({
         type: new GraphQLNonNull(GraphQLString),
-        externalDefaultValue: 'default',
+        default: { value: 'default' },
       });
       expect(isRequiredInputField(optField4)).to.equal(false);
     });