@graphitation/supermassive 3.4.2 → 3.5.1

package/lib/executeWithoutSchema.mjs

@@ -536,13 +536,14 @@ function resolveAndCompleteField(exeContext, parentTypeName, fieldDefinition, fi
     typeNameFromReference(returnTypeRef),
     path
   );
-  const isDefaultResolverUsed = resolveFn === exeContext.fieldResolver;
+  const isDefaultResolverUsed = resolveFn === exeContext.fieldResolver || fieldName === "__typename";
   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);
     let completed;
@@ -550,7 +551,12 @@ function resolveAndCompleteField(exeContext, parentTypeName, fieldDefinition, fi
       completed = result.then(
         (resolved) => {
           if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldResolve)) {
-            invokeAfterFieldResolveHook(info, exeContext, resolved);
+            hookContext = invokeAfterFieldResolveHook(
+              info,
+              exeContext,
+              hookContext,
+              resolved
+            );
           }
           return completeValue(
             exeContext,
@@ -564,14 +570,25 @@ function resolveAndCompleteField(exeContext, parentTypeName, fieldDefinition, fi
         },
         (rawError) => {
           if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldResolve)) {
-            invokeAfterFieldResolveHook(info, exeContext, void 0, rawError);
+            hookContext = invokeAfterFieldResolveHook(
+              info,
+              exeContext,
+              hookContext,
+              void 0,
+              rawError
+            );
           }
           throw rawError;
         }
       );
     } else {
       if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldResolve)) {
-        invokeAfterFieldResolveHook(info, exeContext, result);
+        hookContext = invokeAfterFieldResolveHook(
+          info,
+          exeContext,
+          hookContext,
+          result
+        );
       }
       completed = completeValue(
         exeContext,
@@ -587,14 +604,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 +637,29 @@ 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,
+        error
+      );
     }
     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 +1138,7 @@ function invokeBeforeFieldResolveHook(resolveInfo, exeContext) {
   if (!hook) {
     return;
   }
-  executeSafe(
+  return executeSafe(
     () => hook({
       resolveInfo,
       context: exeContext.contextValue
@@ -1115,16 +1155,17 @@ function invokeBeforeFieldResolveHook(resolveInfo, exeContext) {
     }
   );
 }
-function invokeAfterFieldResolveHook(resolveInfo, exeContext, result, error) {
+function invokeAfterFieldResolveHook(resolveInfo, exeContext, hookContext, result, error) {
   var _a;
   const hook = (_a = exeContext.fieldExecutionHooks) == null ? void 0 : _a.afterFieldResolve;
   if (!hook) {
     return;
   }
-  executeSafe(
+  return executeSafe(
     () => hook({
       resolveInfo,
       context: exeContext.contextValue,
+      hookContext,
       result,
       error
     }),
@@ -1140,7 +1181,7 @@ function invokeAfterFieldResolveHook(resolveInfo, exeContext, result, 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 +1191,7 @@ function invokeAfterFieldCompleteHook(resolveInfo, exeContext, result, error) {
     () => hook({
       resolveInfo,
       context: exeContext.contextValue,
+      hookContext,
       result,
       error
     }),