@graphitation/supermassive 3.8.0-alpha.3 → 3.8.0

package/lib/executeWithoutSchema.mjs

@@ -178,12 +178,20 @@ function buildPerEventExecutionContext(exeContext, payload) {
 }
 function executeOperationWithBeforeHook(exeContext) {
   const hooks = exeContext.fieldExecutionHooks;
-  let hook;
+  let hookResultPromise;
   if (hooks == null ? void 0 : hooks.beforeOperationExecute) {
-    hook = invokeBeforeOperationExecuteHook(exeContext);
+    hookResultPromise = invokeBeforeOperationExecuteHook(exeContext);
   }
-  if (isPromise(hook)) {
-    return hook.then(() => executeOperation(exeContext));
+  if (hookResultPromise instanceof GraphQLError) {
+    return buildResponse(exeContext, null);
+  }
+  if (isPromise(hookResultPromise)) {
+    return hookResultPromise.then((hookResult) => {
+      if (hookResult instanceof GraphQLError) {
+        return buildResponse(exeContext, null);
+      }
+      return executeOperation(exeContext);
+    });
   }
   return executeOperation(exeContext);
 }
@@ -433,6 +441,17 @@ function createSourceEventStream(exeContext) {
     return { errors: [error] };
   }
 }
+function afterFieldSubscribeHandle(resolved, isDefaultResolverUsed, exeContext, info, hookContext, afterFieldSubscribe, error) {
+  if (!isDefaultResolverUsed && afterFieldSubscribe) {
+    hookContext = invokeAfterFieldSubscribeHook(
+      info,
+      exeContext,
+      hookContext,
+      resolved,
+      error
+    );
+  }
+}
 function executeSubscriptionImpl(exeContext) {
   var _a;
   const { operation, rootValue, schemaFragment } = exeContext;
@@ -491,28 +510,39 @@ function executeSubscriptionImpl(exeContext) {
     if (result === void 0) {
       result = resolveFn(rootValue, args, contextValue, info);
     }
-    const afterFieldSubscribeHandle = (resolved, error) => {
-      if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldSubscribe)) {
-        hookContext = invokeAfterFieldSubscribeHook(
-          info,
+    if (isPromise(result)) {
+      return result.then(assertEventStream, (error) => {
+        afterFieldSubscribeHandle(
+          void 0,
+          isDefaultResolverUsed,
           exeContext,
+          info,
           hookContext,
-          resolved,
+          !!(hooks == null ? void 0 : hooks.afterFieldSubscribe),
           error
         );
-      }
-    };
-    if (isPromise(result)) {
-      return result.then(assertEventStream, (error) => {
-        afterFieldSubscribeHandle(void 0, error);
         throw locatedError(error, fieldGroup, pathToArray(path));
       }).then((resolved) => {
-        afterFieldSubscribeHandle(resolved);
+        afterFieldSubscribeHandle(
+          resolved,
+          isDefaultResolverUsed,
+          exeContext,
+          info,
+          hookContext,
+          !!(hooks == null ? void 0 : hooks.afterFieldSubscribe)
+        );
         return resolved;
       });
     }
     const stream = assertEventStream(result);
-    afterFieldSubscribeHandle(stream);
+    afterFieldSubscribeHandle(
+      stream,
+      isDefaultResolverUsed,
+      exeContext,
+      info,
+      hookContext,
+      !!(hooks == null ? void 0 : hooks.afterFieldSubscribe)
+    );
     return stream;
   } catch (error) {
     if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldSubscribe)) {
@@ -661,20 +691,19 @@ function resolveAndCompleteField(exeContext, parentTypeName, fieldDefinition, fi
       result = resolveFn(source, args, contextValue, info);
     }
     let completed;
-    const handleAfterFieldHooks = (hook, useHook) => (resolved, error) => {
-      if (!isDefaultResolverUsed && useHook) {
-        hookContext = hook(info, exeContext, hookContext, resolved, error);
-        return hookContext instanceof GraphQLError ? null : resolved;
-      }
-      return resolved;
-    };
     if (isPromise(result)) {
-      completed = result.then(
-        handleAfterFieldHooks(
-          invokeAfterFieldResolveHook,
-          !!(hooks == null ? void 0 : hooks.afterFieldResolve)
-        )
-      ).then(
+      completed = result.then((resolved) => {
+        if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldResolve)) {
+          hookContext = invokeAfterFieldResolveHook(
+            info,
+            exeContext,
+            hookContext,
+            resolved
+          );
+          return hookContext instanceof GraphQLError ? null : resolved;
+        }
+        return resolved;
+      }).then(
         (resolved) => {
           return completeValue(
             exeContext,
@@ -687,18 +716,28 @@ function resolveAndCompleteField(exeContext, parentTypeName, fieldDefinition, fi
           );
         },
         (rawError) => {
-          handleAfterFieldHooks(
-            invokeAfterFieldResolveHook,
-            !!(hooks == null ? void 0 : hooks.afterFieldResolve)
-          )(void 0, rawError);
+          if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldResolve)) {
+            hookContext = invokeAfterFieldResolveHook(
+              info,
+              exeContext,
+              hookContext,
+              void 0,
+              rawError
+            );
+          }
           throw rawError;
         }
       );
     } else {
-      result = handleAfterFieldHooks(
-        invokeAfterFieldResolveHook,
-        !!(hooks == null ? void 0 : hooks.afterFieldResolve)
-      )(result);
+      if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldResolve)) {
+        hookContext = invokeAfterFieldResolveHook(
+          info,
+          exeContext,
+          hookContext,
+          result
+        );
+        result = hookContext instanceof GraphQLError ? null : result;
+      }
       completed = completeValue(
         exeContext,
         returnTypeRef,
@@ -711,16 +750,29 @@ function resolveAndCompleteField(exeContext, parentTypeName, fieldDefinition, fi
     }
     if (isPromise(completed)) {
       return completed.then(
-        handleAfterFieldHooks(
-          invokeAfterFieldCompleteHook,
-          !!(hooks == null ? void 0 : hooks.afterFieldComplete)
-        ),
+        (resolved) => {
+          if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldComplete)) {
+            hookContext = invokeAfterFieldCompleteHook(
+              info,
+              exeContext,
+              hookContext,
+              resolved
+            );
+            return hookContext instanceof GraphQLError ? null : resolved;
+          }
+          return resolved;
+        },
         (rawError) => {
           const error = locatedError(rawError, fieldGroup, pathToArray(path));
-          handleAfterFieldHooks(
-            invokeAfterFieldCompleteHook,
-            !!(hooks == null ? void 0 : hooks.afterFieldComplete)
-          )(void 0, error);
+          if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldComplete)) {
+            hookContext = invokeAfterFieldCompleteHook(
+              info,
+              exeContext,
+              hookContext,
+              void 0,
+              error
+            );
+          }
           handleFieldError(
             rawError,
             exeContext,
@@ -733,10 +785,16 @@ function resolveAndCompleteField(exeContext, parentTypeName, fieldDefinition, fi
         }
       );
     }
-    return handleAfterFieldHooks(
-      invokeAfterFieldCompleteHook,
-      !!(hooks == null ? void 0 : hooks.afterFieldComplete)
-    )(completed);
+    if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldComplete)) {
+      hookContext = invokeAfterFieldCompleteHook(
+        info,
+        exeContext,
+        hookContext,
+        completed
+      );
+      return hookContext instanceof GraphQLError ? null : completed;
+    }
+    return completed;
   } catch (rawError) {
     const pathArray = pathToArray(path);
     const error = locatedError(rawError, fieldGroup, pathArray);
@@ -750,16 +808,13 @@ function resolveAndCompleteField(exeContext, parentTypeName, fieldDefinition, fi
       );
     }
     if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldComplete)) {
-      const invokeAfterFieldCompleteHookResult = invokeAfterFieldCompleteHook(
+      invokeAfterFieldCompleteHook(
         info,
         exeContext,
         hookContext,
         void 0,
         error
       );
-      if (invokeAfterFieldCompleteHookResult instanceof GraphQLError) {
-        return null;
-      }
     }
     handleFieldError(
       rawError,
@@ -1248,7 +1303,7 @@ function invokeBeforeFieldSubscribeHook(resolveInfo, exeContext) {
         const error = toGraphQLError(
           rawError,
           resolveInfo.path,
-          "Unexpected error in beforeFieldSubscribe hook"
+          "Unexpected error thrown by beforeFieldSubscribe hook"
         );
         exeContext.errors.push(error);
         throw error;
@@ -1256,7 +1311,7 @@ function invokeBeforeFieldSubscribeHook(resolveInfo, exeContext) {
         const error = toGraphQLError(
           result,
           resolveInfo.path,
-          "Unexpected error in beforeFieldSubscribe hook"
+          "Unexpected error returned from beforeFieldSubscribe hook"
         );
         exeContext.errors.push(error);
         throw error;
@@ -1281,7 +1336,7 @@ function invokeBeforeFieldResolveHook(resolveInfo, exeContext) {
         const error = toGraphQLError(
           rawError,
           resolveInfo.path,
-          "Unexpected error in beforeFieldResolve hook"
+          "Unexpected error thrown by beforeFieldResolve hook"
         );
         exeContext.errors.push(error);
         return error;
@@ -1289,7 +1344,7 @@ function invokeBeforeFieldResolveHook(resolveInfo, exeContext) {
         const error = toGraphQLError(
           result,
           resolveInfo.path,
-          "Unexpected error in beforeFieldResolve hook"
+          "Unexpected error returned from beforeFieldResolve hook"
         );
         exeContext.errors.push(error);
       }
@@ -1316,7 +1371,7 @@ function invokeAfterFieldResolveHook(resolveInfo, exeContext, hookContext, resul
         const error2 = toGraphQLError(
           rawError,
           resolveInfo.path,
-          "Unexpected error in afterFieldResolve hook"
+          "Unexpected error thrown by afterFieldResolve hook"
         );
         exeContext.errors.push(error2);
         return error2;
@@ -1324,7 +1379,7 @@ function invokeAfterFieldResolveHook(resolveInfo, exeContext, hookContext, resul
         const error2 = toGraphQLError(
           result2,
           resolveInfo.path,
-          "Unexpected error in afterFieldResolve hook"
+          "Unexpected error returned from afterFieldResolve hook"
         );
         exeContext.errors.push(error2);
       }
@@ -1351,7 +1406,7 @@ function invokeAfterFieldSubscribeHook(resolveInfo, exeContext, hookContext, res
         const error2 = toGraphQLError(
           rawError,
           resolveInfo.path,
-          "Unexpected error in afterFieldSubscribe hook"
+          "Unexpected error thrown by afterFieldSubscribe hook"
         );
         exeContext.errors.push(error2);
         throw error2;
@@ -1359,7 +1414,7 @@ function invokeAfterFieldSubscribeHook(resolveInfo, exeContext, hookContext, res
         const error2 = toGraphQLError(
           result2,
           resolveInfo.path,
-          "Unexpected error in afterFieldSubscribe hook"
+          "Unexpected error returned from afterFieldSubscribe hook"
         );
         exeContext.errors.push(error2);
         throw error2;
@@ -1387,7 +1442,7 @@ function invokeAfterFieldCompleteHook(resolveInfo, exeContext, hookContext, resu
         const error2 = toGraphQLError(
           rawError,
           resolveInfo.path,
-          "Unexpected error in afterFieldComplete hook"
+          "Unexpected error thrown by afterFieldComplete hook"
         );
         exeContext.errors.push(error2);
         return error2;
@@ -1395,7 +1450,7 @@ function invokeAfterFieldCompleteHook(resolveInfo, exeContext, hookContext, resu
         const error2 = toGraphQLError(
           result2,
           resolveInfo.path,
-          "Unexpected error in afterFieldComplete hook"
+          "Unexpected error returned from afterFieldComplete hook"
         );
         exeContext.errors.push(error2);
       }
@@ -1415,19 +1470,22 @@ function invokeBeforeOperationExecuteHook(exeContext) {
       operation: exeContext.operation
     }),
     (result, rawError) => {
+      var _a2, _b;
+      const operationName = (_b = (_a2 = exeContext.operation.name) == null ? void 0 : _a2.value) != null ? _b : "unknown";
       if (rawError) {
         const error = toGraphQLError(
           rawError,
           void 0,
-          "Unexpected error in beforeOperationExecute hook"
+          `Unexpected error thrown by beforeOperationExecute hook (operation: ${operationName})`
         );
-        throw error;
+        exeContext.errors.push(error);
+        return error;
       }
       if (result instanceof Error) {
         const error = toGraphQLError(
           result,
           void 0,
-          "Unexpected error in beforeOperationExecute hook"
+          `Unexpected error returned from beforeOperationExecute hook (operation: ${operationName})`
         );
         exeContext.errors.push(error);
       }
@@ -1448,11 +1506,13 @@ function invokeBeforeSubscriptionEventEmitHook(exeContext, eventPayload) {
       eventPayload
     }),
     (result, rawError) => {
+      var _a2, _b;
+      const operationName = (_b = (_a2 = exeContext.operation.name) == null ? void 0 : _a2.value) != null ? _b : "unknown";
       if (rawError) {
         const error = toGraphQLError(
           rawError,
           void 0,
-          "Unexpected error in beforeSubscriptionEventEmit hook"
+          `Unexpected error thrown by beforeSubscriptionEventEmit hook (operation: ${operationName})`
         );
         exeContext.errors.push(error);
         return error;
@@ -1460,7 +1520,7 @@ function invokeBeforeSubscriptionEventEmitHook(exeContext, eventPayload) {
         const error = toGraphQLError(
           result,
           void 0,
-          "Unexpected error in beforeSubscriptionEventEmit hook"
+          `Unexpected error returned from beforeSubscriptionEventEmit hook (operation: ${operationName})`
         );
         exeContext.errors.push(error);
       }
@@ -1481,11 +1541,13 @@ function invokeAfterBuildResponseHook(exeContext, result) {
       result
     }),
     (result2, rawError) => {
+      var _a2, _b;
+      const operationName = (_b = (_a2 = exeContext.operation.name) == null ? void 0 : _a2.value) != null ? _b : "unknown";
       if (rawError) {
         const error = toGraphQLError(
           rawError,
           void 0,
-          "Unexpected error in afterBuildResponse hook"
+          `Unexpected error thrown by afterBuildResponse hook (operation: ${operationName})`
         );
         exeContext.errors.push(error);
         return error;
@@ -1493,7 +1555,7 @@ function invokeAfterBuildResponseHook(exeContext, result) {
         const error = toGraphQLError(
           result2,
           void 0,
-          "Unexpected error in afterBuildResponse hook"
+          `Unexpected error returned from afterBuildResponse hook (operation: ${operationName})`
         );
         exeContext.errors.push(error);
       }