adjust error when unexpectedly encountering experimental directives

graphql · Dec 28, 2022 · 3b00b01 · 3b00b01
1 parent 1af828b
commit 3b00b01
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/execution/__tests__/executor-test.ts b/src/execution/__tests__/executor-test.ts
@@ -931,7 +931,7 @@ describe('Execute: Handles basic execution tasks', () => {
     const document = parse('query Q { a }');
 
     expect(() => execute({ schema, document })).to.throw(
-      'Use function `experimentalExecuteIncrementally` to execute operations against schemas that define the experimental @defer or @stream directives.',
+      'The provided schema unexpectedly contains experimental directives (@defer or @stream). These directives may only be utilized if experimental execution features are explicitly enabled.',
     );
   });
 
@@ -948,7 +948,7 @@ describe('Execute: Handles basic execution tasks', () => {
     const document = parse('query Q { a }');
 
     expect(() => execute({ schema, document })).to.throw(
-      'Use function `experimentalExecuteIncrementally` to execute operations against schemas that define the experimental @defer or @stream directives.',
+      'The provided schema unexpectedly contains experimental directives (@defer or @stream). These directives may only be utilized if experimental execution features are explicitly enabled.',
     );
   });
 

diff --git a/src/execution/execute.ts b/src/execution/execute.ts
@@ -263,6 +263,9 @@ export interface ExecutionArgs {
   subscribeFieldResolver?: Maybe<GraphQLFieldResolver<any, any>>;
 }
 
+const UNEXPECTED_EXPERIMENTAL_DIRECTIVES =
+  'The provided schema unexpectedly contains experimental directives (@defer or @stream). These directives may only be utilized if experimental execution features are explicitly enabled.';
+
 const UNEXPECTED_MULTIPLE_PAYLOADS =
   'Executing this GraphQL operation would unexpectedly produce multiple payloads (due to @defer or @stream directive)';
 
@@ -284,9 +287,7 @@ const UNEXPECTED_MULTIPLE_PAYLOADS =
  */
 export function execute(args: ExecutionArgs): PromiseOrValue<ExecutionResult> {
   if (args.schema.getDirective('defer') || args.schema.getDirective('stream')) {
-    throw new Error(
-      'Use function `experimentalExecuteIncrementally` to execute operations against schemas that define the experimental @defer or @stream directives.',
-    );
+    throw new Error(UNEXPECTED_EXPERIMENTAL_DIRECTIVES);
   }
 
   const result = experimentalExecuteIncrementally(args);