@graphitation/supermassive 3.4.1 → 3.5.0

package/lib/executeWithoutSchema.mjs

@@ -538,41 +538,36 @@ function resolveAndCompleteField(exeContext, parentTypeName, fieldDefinition, fi
   );
   const isDefaultResolverUsed = resolveFn === exeContext.fieldResolver;
   const hooks = exeContext.fieldExecutionHooks;
+  let hookContext = void 0;
   try {
     const args = getArgumentValues(exeContext, fieldDefinition, fieldGroup[0]);
     const contextValue = exeContext.contextValue;
     if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.beforeFieldResolve)) {
-      invokeBeforeFieldResolveHook(info, exeContext);
+      hookContext = invokeBeforeFieldResolveHook(info, exeContext);
     }
     const result = resolveFn(source, args, contextValue, info);
+    if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldResolve)) {
+      hookContext = invokeAfterFieldResolveHook(
+        info,
+        exeContext,
+        hookContext,
+        result
+      );
+    }
     let completed;
     if (isPromise(result)) {
-      completed = result.then(
-        (resolved) => {
-          if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldResolve)) {
-            invokeAfterFieldResolveHook(info, exeContext, resolved);
-          }
-          return completeValue(
-            exeContext,
-            returnTypeRef,
-            fieldGroup,
-            info,
-            path,
-            resolved,
-            incrementalDataRecord
-          );
-        },
-        (rawError) => {
-          if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldResolve)) {
-            invokeAfterFieldResolveHook(info, exeContext, void 0, rawError);
-          }
-          throw rawError;
-        }
-      );
+      completed = result.then((resolved) => {
+        return completeValue(
+          exeContext,
+          returnTypeRef,
+          fieldGroup,
+          info,
+          path,
+          resolved,
+          incrementalDataRecord
+        );
+      });
     } else {
-      if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldResolve)) {
-        invokeAfterFieldResolveHook(info, exeContext, result);
-      }
       completed = completeValue(
         exeContext,
         returnTypeRef,
@@ -587,14 +582,25 @@ function resolveAndCompleteField(exeContext, parentTypeName, fieldDefinition, fi
       return completed.then(
         (resolved) => {
           if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldComplete)) {
-            invokeAfterFieldCompleteHook(info, exeContext, resolved);
+            invokeAfterFieldCompleteHook(
+              info,
+              exeContext,
+              hookContext,
+              resolved
+            );
           }
           return resolved;
         },
         (rawError) => {
           const error = locatedError(rawError, fieldGroup, pathToArray(path));
           if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldComplete)) {
-            invokeAfterFieldCompleteHook(info, exeContext, void 0, error);
+            invokeAfterFieldCompleteHook(
+              info,
+              exeContext,
+              hookContext,
+              void 0,
+              error
+            );
           }
           handleFieldError(
             rawError,
@@ -609,17 +615,28 @@ function resolveAndCompleteField(exeContext, parentTypeName, fieldDefinition, fi
       );
     }
     if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldComplete)) {
-      invokeAfterFieldCompleteHook(info, exeContext, completed);
+      invokeAfterFieldCompleteHook(info, exeContext, hookContext, completed);
     }
     return completed;
   } catch (rawError) {
     const pathArray = pathToArray(path);
     const error = locatedError(rawError, fieldGroup, pathArray);
     if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldResolve) && error.path && arraysAreEqual(pathArray, error.path)) {
-      invokeAfterFieldResolveHook(info, exeContext, void 0, error);
+      hookContext = invokeAfterFieldResolveHook(
+        info,
+        exeContext,
+        hookContext,
+        void 0
+      );
     }
     if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldComplete)) {
-      invokeAfterFieldCompleteHook(info, exeContext, void 0, error);
+      invokeAfterFieldCompleteHook(
+        info,
+        exeContext,
+        hookContext,
+        void 0,
+        error
+      );
     }
     handleFieldError(
       rawError,
@@ -1098,7 +1115,7 @@ function invokeBeforeFieldResolveHook(resolveInfo, exeContext) {
   if (!hook) {
     return;
   }
-  executeSafe(
+  return executeSafe(
     () => hook({
       resolveInfo,
       context: exeContext.contextValue
@@ -1115,32 +1132,32 @@ function invokeBeforeFieldResolveHook(resolveInfo, exeContext) {
     }
   );
 }
-function invokeAfterFieldResolveHook(resolveInfo, exeContext, result, error) {
+function invokeAfterFieldResolveHook(resolveInfo, exeContext, hookContext, result) {
   var _a;
   const hook = (_a = exeContext.fieldExecutionHooks) == null ? void 0 : _a.afterFieldResolve;
   if (!hook) {
     return;
   }
-  executeSafe(
+  return executeSafe(
     () => hook({
       resolveInfo,
       context: exeContext.contextValue,
-      result,
-      error
+      hookContext,
+      result
     }),
     (_, rawError) => {
       if (rawError) {
-        const error2 = toGraphQLError(
+        const error = toGraphQLError(
           rawError,
           resolveInfo.path,
           "Unexpected error in afterFieldResolve hook"
         );
-        exeContext.errors.push(error2);
+        exeContext.errors.push(error);
       }
     }
   );
 }
-function invokeAfterFieldCompleteHook(resolveInfo, exeContext, result, error) {
+function invokeAfterFieldCompleteHook(resolveInfo, exeContext, hookContext, result, error) {
   var _a;
   const hook = (_a = exeContext.fieldExecutionHooks) == null ? void 0 : _a.afterFieldComplete;
   if (!hook) {
@@ -1150,6 +1167,7 @@ function invokeAfterFieldCompleteHook(resolveInfo, exeContext, result, error) {
     () => hook({
       resolveInfo,
       context: exeContext.contextValue,
+      hookContext,
       result,
       error
     }),