extract isBadUserInputGraphQLError and replace RegExp with startsWith

apollographql · Feb 1, 2022 · 863fe02 · 863fe02
1 parent e1ee2ef
commit 863fe02
Showing 1 changed file with 17 additions and 21 deletions.
diff --git a/packages/apollo-server-core/src/requestPipeline.ts b/packages/apollo-server-core/src/requestPipeline.ts
@@ -98,6 +98,22 @@ export type DataSources<TContext> = {
 
 type Mutable<T> = { -readonly [P in keyof T]: T[P] };
 
+function isBadUserInputGraphQLError(error: GraphQLError): Boolean {
+  return (
+    error.nodes?.length === 1 &&
+    error.nodes[0].kind === Kind.VARIABLE_DEFINITION &&
+    (error.message.startsWith(
+      `Variable "$${error.nodes[0].variable.name.value}" got invalid value `,
+    ) ||
+      error.message.startsWith(
+        `Variable "$${error.nodes[0].variable.name.value}" of required type `,
+      ) ||
+      error.message.startsWith(
+        `Variable "$${error.nodes[0].variable.name.value}" of non-null type `,
+      ))
+  );
+}
+
 export async function processGraphQLRequest<TContext>(
   config: GraphQLRequestPipelineConfig<TContext>,
   requestContext: Mutable<GraphQLRequestContext<TContext>>,
@@ -400,27 +416,7 @@ export async function processGraphQLRequest<TContext>(
       // variable resolution from execution later; see
       // https://github.com/graphql/graphql-js/issues/3169
       const resultErrors = result.errors?.map((e) => {
-        if (
-          e.nodes?.length === 1 &&
-          e.nodes[0].kind === Kind.VARIABLE_DEFINITION &&
-          (e.message.startsWith(
-            `Variable "$${e.nodes[0].variable.name.value}" got invalid value `,
-          ) ||
-            e.message.match(
-              new RegExp(
-                '^Variable "\\$' +
-                  e.nodes[0].variable.name.value +
-                  '" of required type ".*!" was not provided.',
-              ),
-            ) ||
-            e.message.match(
-              new RegExp(
-                '^Variable "\\$' +
-                  e.nodes[0].variable.name.value +
-                  '" of non-null type ".*!" must not be null.',
-              ),
-            ))
-        ) {
+        if (isBadUserInputGraphQLError(e)) {
           return fromGraphQLError(e, {
             errorClass: UserInputError,
           });