Revert "Elevate ErrorBehavior to be a specified enum"

benjie · benjie · commit 60b42cca52d6 · 2025-10-28T12:19:53.000Z
This reverts commit 726b4ba.
diff --git a/src/__tests__/starWarsIntrospection-test.ts b/src/__tests__/starWarsIntrospection-test.ts
@@ -37,7 +37,7 @@ describe('Star Wars Introspection Tests', () => {
             { name: 'Droid' },
             { name: 'Query' },
             { name: 'Boolean' },
-            { name: 'ErrorBehavior' },
+            { name: '__ErrorBehavior' },
             { name: '__Schema' },
             { name: '__Type' },
             { name: '__TypeKind' },
diff --git a/src/error/ErrorBehavior.ts b/src/error/ErrorBehavior.ts
@@ -1,6 +1,8 @@
-export type ErrorBehavior = 'NO_PROPAGATE' | 'PROPAGATE' | 'ABORT';
+export type GraphQLErrorBehavior = 'NO_PROPAGATE' | 'PROPAGATE' | 'ABORT';
 
-export function isErrorBehavior(onError: unknown): onError is ErrorBehavior {
+export function isErrorBehavior(
+  onError: unknown,
+): onError is GraphQLErrorBehavior {
   return (
     onError === 'NO_PROPAGATE' || onError === 'PROPAGATE' || onError === 'ABORT'
   );
diff --git a/src/error/index.ts b/src/error/index.ts
@@ -9,4 +9,4 @@ export type {
 export { syntaxError } from './syntaxError';
 
 export { locatedError } from './locatedError';
-export type { ErrorBehavior } from './ErrorBehavior';
+export type { GraphQLErrorBehavior } from './ErrorBehavior';
diff --git a/src/execution/execute.ts b/src/execution/execute.ts
@@ -13,7 +13,7 @@ import { promiseForObject } from '../jsutils/promiseForObject';
 import type { PromiseOrValue } from '../jsutils/PromiseOrValue';
 import { promiseReduce } from '../jsutils/promiseReduce';
 
-import type { ErrorBehavior } from '../error/ErrorBehavior';
+import type { GraphQLErrorBehavior } from '../error/ErrorBehavior';
 import { isErrorBehavior } from '../error/ErrorBehavior';
 import type { GraphQLFormattedError } from '../error/GraphQLError';
 import { GraphQLError } from '../error/GraphQLError';
@@ -117,7 +117,7 @@ export interface ExecutionContext {
   typeResolver: GraphQLTypeResolver<any, any>;
   subscribeFieldResolver: GraphQLFieldResolver<any, any>;
   errors: Array<GraphQLError>;
-  errorBehavior: ErrorBehavior;
+  errorBehavior: GraphQLErrorBehavior;
 }
 
 /**
@@ -133,6 +133,7 @@ export interface ExecutionResult<
 > {
   errors?: ReadonlyArray<GraphQLError>;
   data?: TData | null;
+  onError?: GraphQLErrorBehavior;
   extensions?: TExtensions;
 }
 
@@ -163,7 +164,7 @@ export interface ExecutionArgs {
    *
    * @experimental
    */
-  onError?: ErrorBehavior;
+  onError?: GraphQLErrorBehavior;
   /** Additional execution options. */
   options?: {
     /** Set the maximum number of errors allowed for coercing (defaults to 50). */
diff --git a/src/graphql.ts b/src/graphql.ts
@@ -3,7 +3,7 @@ import { isPromise } from './jsutils/isPromise';
 import type { Maybe } from './jsutils/Maybe';
 import type { PromiseOrValue } from './jsutils/PromiseOrValue';
 
-import type { ErrorBehavior } from './error/ErrorBehavior';
+import type { GraphQLErrorBehavior } from './error/ErrorBehavior';
 
 import { parse } from './language/parser';
 import type { Source } from './language/source';
@@ -76,7 +76,7 @@ export interface GraphQLArgs {
    *
    * @experimental
    */
-  onError?: ErrorBehavior;
+  onError?: GraphQLErrorBehavior;
 }
 
 export function graphql(args: GraphQLArgs): Promise<ExecutionResult> {
diff --git a/src/index.ts b/src/index.ts
@@ -55,9 +55,6 @@ export {
   GraphQLString,
   GraphQLBoolean,
   GraphQLID,
-  // Standard GraphQL Enums
-  specifiedEnumTypes,
-  GraphQLErrorBehavior,
   // Int boundaries constants
   GRAPHQL_MAX_INT,
   GRAPHQL_MIN_INT,
@@ -82,6 +79,7 @@ export {
   __InputValue,
   __EnumValue,
   __TypeKind,
+  __ErrorBehavior,
   // Meta-field definitions.
   SchemaMetaFieldDef,
   TypeMetaFieldDef,
@@ -109,7 +107,6 @@ export {
   isRequiredArgument,
   isRequiredInputField,
   isSpecifiedScalarType,
-  isSpecifiedEnumType,
   isIntrospectionType,
   isSpecifiedDirective,
   // Assertions
@@ -399,7 +396,7 @@ export {
 } from './error/index';
 
 export type {
-  ErrorBehavior,
+  GraphQLErrorBehavior,
   GraphQLErrorOptions,
   GraphQLFormattedError,
   GraphQLErrorExtensions,
diff --git a/src/type/__tests__/introspection-test.ts b/src/type/__tests__/introspection-test.ts
@@ -102,7 +102,7 @@ describe('Introspection', () => {
               inputFields: null,
               interfaces: null,
               kind: 'ENUM',
-              name: 'ErrorBehavior',
+              name: '__ErrorBehavior',
               possibleTypes: null,
               specifiedByURL: null,
             },
@@ -213,7 +213,7 @@ describe('Introspection', () => {
                     name: null,
                     ofType: {
                       kind: 'ENUM',
-                      name: 'ErrorBehavior',
+                      name: '__ErrorBehavior',
                       ofType: null,
                     },
                   },
@@ -1059,7 +1059,7 @@ describe('Introspection', () => {
                     name: null,
                     ofType: {
                       kind: 'ENUM',
-                      name: 'ErrorBehavior',
+                      name: '__ErrorBehavior',
                       ofType: null,
                     },
                   },
diff --git a/src/type/__tests__/predicate-test.ts b/src/type/__tests__/predicate-test.ts
@@ -65,7 +65,6 @@ import {
   isDirective,
   isSpecifiedDirective,
 } from '../directives';
-import { GraphQLErrorBehavior, isSpecifiedEnumType } from '../enums';
 import {
   GraphQLBoolean,
   GraphQLFloat,
@@ -167,16 +166,6 @@ describe('Type predicates', () => {
     });
   });
 
-  describe('isSpecifiedEnumType', () => {
-    it('returns true for specified enums', () => {
-      expect(isSpecifiedEnumType(GraphQLErrorBehavior)).to.equal(true);
-    });
-
-    it('returns false for custom scalar', () => {
-      expect(isSpecifiedEnumType(EnumType)).to.equal(false);
-    });
-  });
-
   describe('isObjectType', () => {
     it('returns true for object type', () => {
       expect(isObjectType(ObjectType)).to.equal(true);
diff --git a/src/type/__tests__/schema-test.ts b/src/type/__tests__/schema-test.ts
@@ -296,7 +296,7 @@ describe('Type System: Schema', () => {
       'ASub',
       'Boolean',
       'String',
-      'ErrorBehavior',
+      '__ErrorBehavior',
       '__Schema',
       '__Type',
       '__TypeKind',
diff --git a/src/type/definition.ts b/src/type/definition.ts
@@ -14,7 +14,7 @@ import type { PromiseOrValue } from '../jsutils/PromiseOrValue';
 import { suggestionList } from '../jsutils/suggestionList';
 import { toObjMap } from '../jsutils/toObjMap';
 
-import type { ErrorBehavior } from '../error/ErrorBehavior';
+import type { GraphQLErrorBehavior } from '../error/ErrorBehavior';
 import { GraphQLError } from '../error/GraphQLError';
 
 import type {
@@ -990,7 +990,7 @@ export interface GraphQLResolveInfo {
   readonly operation: OperationDefinitionNode;
   readonly variableValues: { [variable: string]: unknown };
   /** @experimental */
-  readonly errorBehavior: ErrorBehavior;
+  readonly errorBehavior: GraphQLErrorBehavior;
 }
 
 /**
diff --git a/src/type/directives.ts b/src/type/directives.ts
@@ -18,7 +18,7 @@ import {
   defineArguments,
   GraphQLNonNull,
 } from './definition';
-import { GraphQLErrorBehavior } from './enums';
+import { __ErrorBehavior } from './introspection';
 import { GraphQLBoolean, GraphQLString } from './scalars';
 
 /**
@@ -230,7 +230,7 @@ export const GraphQLBehaviorDirective: GraphQLDirective = new GraphQLDirective({
   locations: [DirectiveLocation.SCHEMA],
   args: {
     onError: {
-      type: new GraphQLNonNull(GraphQLErrorBehavior),
+      type: new GraphQLNonNull(__ErrorBehavior),
       defaultValue: 'PROPAGATE',
     },
   },
diff --git a/src/type/enums.ts b/src/type/enums.ts
diff --git a/src/type/index.ts b/src/type/index.ts
@@ -158,13 +158,6 @@ export {
   GRAPHQL_MAX_INT,
   GRAPHQL_MIN_INT,
 } from './scalars';
-export {
-  // Predicate
-  isSpecifiedEnumType,
-  // Standard GraphQL Enums
-  specifiedEnumTypes,
-  GraphQLErrorBehavior,
-} from './enums';
 
 export {
   // Predicate
@@ -179,6 +172,7 @@ export {
   __InputValue,
   __EnumValue,
   __TypeKind,
+  __ErrorBehavior,
   // "Enum" of Type Kinds
   TypeKind,
   // Meta-field definitions.
diff --git a/src/type/introspection.ts b/src/type/introspection.ts
@@ -30,7 +30,6 @@ import {
   isUnionType,
 } from './definition';
 import type { GraphQLDirective } from './directives';
-import { GraphQLErrorBehavior } from './enums';
 import { GraphQLBoolean, GraphQLString } from './scalars';
 import type { GraphQLSchema } from './schema';
 
@@ -78,7 +77,7 @@ export const __Schema: GraphQLObjectType = new GraphQLObjectType({
       defaultErrorBehavior: {
         description:
           'The default error behavior that will be used for requests which do not specify `onError`.',
-        type: new GraphQLNonNull(GraphQLErrorBehavior),
+        type: new GraphQLNonNull(__ErrorBehavior),
         resolve: (schema) => schema.defaultErrorBehavior,
       },
     } as GraphQLFieldConfigMap<GraphQLSchema, unknown>),
@@ -507,6 +506,29 @@ export const __TypeKind: GraphQLEnumType = new GraphQLEnumType({
   },
 });
 
+export const __ErrorBehavior: GraphQLEnumType = new GraphQLEnumType({
+  name: '__ErrorBehavior',
+  description:
+    'An enum detailing the error behavior a GraphQL request should use.',
+  values: {
+    NO_PROPAGATE: {
+      value: 'NO_PROPAGATE',
+      description:
+        'Indicates that an error should result in the response position becoming null, even if it is marked as non-null.',
+    },
+    PROPAGATE: {
+      value: 'PROPAGATE',
+      description:
+        'Indicates that an error that occurs in a non-null position should propagate to the nearest nullable response position.',
+    },
+    ABORT: {
+      value: 'ABORT',
+      description:
+        'Indicates execution should cease when the first error occurs, and that the response data should be null.',
+    },
+  },
+});
+
 /**
  * Note that these are GraphQLField and not GraphQLFieldConfig,
  * so the format for args is different.
@@ -565,7 +587,7 @@ export const introspectionTypes: ReadonlyArray<GraphQLNamedType> =
     __InputValue,
     __EnumValue,
     __TypeKind,
-    // ErrorBehavior,
+    __ErrorBehavior,
   ]);
 
 export function isIntrospectionType(type: GraphQLNamedType): boolean {
diff --git a/src/type/schema.ts b/src/type/schema.ts
@@ -6,7 +6,7 @@ import type { Maybe } from '../jsutils/Maybe';
 import type { ObjMap } from '../jsutils/ObjMap';
 import { toObjMap } from '../jsutils/toObjMap';
 
-import type { ErrorBehavior } from '../error/ErrorBehavior';
+import type { GraphQLErrorBehavior } from '../error/ErrorBehavior';
 import { isErrorBehavior } from '../error/ErrorBehavior';
 import type { GraphQLError } from '../error/GraphQLError';
 
@@ -132,7 +132,7 @@ export interface GraphQLSchemaExtensions {
 export class GraphQLSchema {
   description: Maybe<string>;
   /** @experimental */
-  readonly defaultErrorBehavior: ErrorBehavior;
+  readonly defaultErrorBehavior: GraphQLErrorBehavior;
   extensions: Readonly<GraphQLSchemaExtensions>;
   astNode: Maybe<SchemaDefinitionNode>;
   extensionASTNodes: ReadonlyArray<SchemaExtensionNode>;
@@ -410,7 +410,7 @@ export interface GraphQLSchemaConfig extends GraphQLSchemaValidationOptions {
    *
    * @experimental
    */
-  defaultErrorBehavior?: Maybe<ErrorBehavior>;
+  defaultErrorBehavior?: Maybe<GraphQLErrorBehavior>;
   extensions?: Maybe<Readonly<GraphQLSchemaExtensions>>;
   astNode?: Maybe<SchemaDefinitionNode>;
   extensionASTNodes?: Maybe<ReadonlyArray<SchemaExtensionNode>>;
diff --git a/src/utilities/__tests__/printSchema-test.ts b/src/utilities/__tests__/printSchema-test.ts
@@ -710,10 +710,10 @@ describe('Type System Printer', () => {
       directive @oneOf on INPUT_OBJECT
 
       """Indicates the default error behavior of the schema."""
-      directive @behavior(onError: ErrorBehavior! = PROPAGATE) on SCHEMA
+      directive @behavior(onError: __ErrorBehavior! = PROPAGATE) on SCHEMA
       
       """An enum detailing the error behavior a GraphQL request should use."""
-      enum ErrorBehavior {
+      enum __ErrorBehavior {
         """
         Indicates that an error should result in the response position becoming null, even if it is marked as non-null.
         """
@@ -758,7 +758,7 @@ describe('Type System Printer', () => {
         """
         The default error behavior that will be used for requests which do not specify \`onError\`.
         """
-        defaultErrorBehavior: ErrorBehavior!
+        defaultErrorBehavior: __ErrorBehavior!
       }
 
       """
diff --git a/src/utilities/buildClientSchema.ts b/src/utilities/buildClientSchema.ts
@@ -27,7 +27,6 @@ import {
   isOutputType,
 } from '../type/definition';
 import { GraphQLDirective } from '../type/directives';
-import { specifiedEnumTypes } from '../type/enums';
 import { introspectionTypes, TypeKind } from '../type/introspection';
 import { specifiedScalarTypes } from '../type/scalars';
 import type { GraphQLSchemaValidationOptions } from '../type/schema';
@@ -84,11 +83,7 @@ export function buildClientSchema(
   );
 
   // Include standard types only if they are used.
-  for (const stdType of [
-    ...specifiedScalarTypes,
-    ...specifiedEnumTypes,
-    ...introspectionTypes,
-  ]) {
+  for (const stdType of [...specifiedScalarTypes, ...introspectionTypes]) {
     if (typeMap[stdType.name]) {
       typeMap[stdType.name] = stdType;
     }
diff --git a/src/utilities/extendSchema.ts b/src/utilities/extendSchema.ts
diff --git a/src/utilities/findBreakingChanges.ts b/src/utilities/findBreakingChanges.ts
diff --git a/src/utilities/getIntrospectionQuery.ts b/src/utilities/getIntrospectionQuery.ts
diff --git a/src/utilities/lexicographicSortSchema.ts b/src/utilities/lexicographicSortSchema.ts
diff --git a/src/utilities/printSchema.ts b/src/utilities/printSchema.ts
diff --git a/src/validation/rules/KnownTypeNamesRule.ts b/src/validation/rules/KnownTypeNamesRule.ts

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import { isPromise } from './jsutils/isPromise';`
`3`	`3`	`import type { Maybe } from './jsutils/Maybe';`
`4`	`4`	`import type { PromiseOrValue } from './jsutils/PromiseOrValue';`
`5`	`5`
`6`		`-import type { ErrorBehavior } from './error/ErrorBehavior';`
	`6`	`+import type { GraphQLErrorBehavior } from './error/ErrorBehavior';`
`7`	`7`
`8`	`8`	`import { parse } from './language/parser';`
`9`	`9`	`import type { Source } from './language/source';`
`@@ -76,7 +76,7 @@ export interface GraphQLArgs {`
`76`	`76`	`*`
`77`	`77`	`* @experimental`
`78`	`78`	`*/`
`79`		`- onError?: ErrorBehavior;`
	`79`	`+ onError?: GraphQLErrorBehavior;`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`export function graphql(args: GraphQLArgs): Promise<ExecutionResult> {`