@graphitation/supermassive 3.15.0 → 3.15.1

package/lib/executeWithoutSchema.mjs

@@ -356,7 +356,13 @@ function executeField(exeContext, parentTypeName, source, fieldGroup, path, incr
     fieldName
   });
   if (!loading) {
-    throwIfRootField(parentTypeName, fieldName, fieldGroup, "typeDefinition");
+    handleMissingSchemaError(
+      exeContext,
+      void 0,
+      fieldGroup,
+      path,
+      incrementalDataRecord
+    );
     return void 0;
   }
   return loading.then(() => {
@@ -376,17 +382,16 @@ function executeField(exeContext, parentTypeName, source, fieldGroup, path, incr
         incrementalDataRecord
       );
     }
-    throwIfRootField(parentTypeName, fieldName, fieldGroup, "typeDefinition");
+    handleMissingSchemaError(
+      exeContext,
+      void 0,
+      fieldGroup,
+      path,
+      incrementalDataRecord
+    );
     return void 0;
   });
 }
-function throwIfRootField(parentTypeName, fieldName, fieldGroup, validationTarget) {
-  const isRootField = parentTypeName === "Mutation" || parentTypeName === "Query";
-  if (isRootField) {
-    const message = validationTarget === "typeDefinition" ? `Type definition for ${parentTypeName}.${fieldName} is missing` : validationTarget === "resolver" ? `Resolver for ${parentTypeName}.${fieldName} is missing` : "Unexpected validation target";
-    throw locatedError(new Error(message), fieldGroup);
-  }
-}
 function requestSchemaFragment(exeContext, request) {
   if (!exeContext.schemaFragmentLoader) {
     return;
@@ -620,12 +625,30 @@ function buildResolveInfo(exeContext, fieldName, fieldGroup, parentTypeName, ret
 function handleFieldError(rawError, exeContext, returnTypeRef, fieldGroup, path, incrementalDataRecord) {
   var _a;
   const error = locatedError(rawError, fieldGroup, pathToArray(path));
-  if (isNonNullType(returnTypeRef)) {
+  if (returnTypeRef && isNonNullType(returnTypeRef)) {
     throw error;
   }
   const errors = (_a = incrementalDataRecord == null ? void 0 : incrementalDataRecord.errors) != null ? _a : exeContext.errors;
   errors.push(error);
 }
+function handleMissingSchemaError(exeContext, returnTypeRef, fieldGroup, path, incrementalDataRecord) {
+  const parentTypeName = path.typename;
+  const isRootField = parentTypeName === "Mutation" || parentTypeName === "Query";
+  if (!isRootField) {
+    return;
+  }
+  const fieldName = path.key;
+  const message = !returnTypeRef ? `Type definition for ${parentTypeName}.${fieldName} is missing` : `Resolver for ${parentTypeName}.${fieldName} is missing`;
+  const error = new Error(message);
+  handleFieldError(
+    error,
+    exeContext,
+    returnTypeRef,
+    fieldGroup,
+    path,
+    incrementalDataRecord
+  );
+}
 function resolveAndCompleteField(exeContext, parentTypeName, fieldDefinition, fieldGroup, path, source, incrementalDataRecord) {
   var _a;
   const fieldName = fieldGroup[0].name.value;
@@ -645,7 +668,13 @@ function resolveAndCompleteField(exeContext, parentTypeName, fieldDefinition, fi
   );
   const isDefaultResolverUsed = resolveFn === exeContext.fieldResolver || fieldName === "__typename";
   if (resolveFn === exeContext.fieldResolver && typeof source === "undefined") {
-    throwIfRootField(parentTypeName, fieldName, fieldGroup, "resolver");
+    handleMissingSchemaError(
+      exeContext,
+      returnTypeRef,
+      fieldGroup,
+      path,
+      incrementalDataRecord
+    );
   }
   const hooks = exeContext.fieldExecutionHooks;
   let hookContext = void 0;