@graphitation/supermassive 3.8.0-alpha.2 → 3.8.0-alpha.3

package/lib/executeWithoutSchema.mjs

@@ -276,10 +276,16 @@ function buildResponse(exeContext, data) {
       };
     } else {
       if (hooks == null ? void 0 : hooks.afterBuildResponse) {
-        invokeAfterBuildResponseHook(exeContext, initialResult);
+        const hookResult = invokeAfterBuildResponseHook(
+          exeContext,
+          initialResult
+        );
         if (exeContext.errors.length > ((_b = (_a = initialResult.errors) == null ? void 0 : _a.length) != null ? _b : 0)) {
           initialResult.errors = exeContext.errors;
         }
+        if (hookResult instanceof GraphQLError) {
+          return { errors: initialResult.errors };
+        }
       }
       return initialResult;
     }
@@ -468,23 +474,18 @@ function executeSubscriptionImpl(exeContext) {
   const hooks = exeContext.fieldExecutionHooks;
   let hookContext = void 0;
   try {
-    const args = getArgumentValues(exeContext, fieldDef, fieldGroup[0]);
-    const contextValue = exeContext.contextValue;
+    let result;
     if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.beforeFieldSubscribe)) {
       hookContext = invokeBeforeFieldSubscribeHook(info, exeContext);
     }
-    let result;
+    const args = getArgumentValues(exeContext, fieldDef, fieldGroup[0]);
+    const contextValue = exeContext.contextValue;
     if (hookContext) {
       if (isPromise(hookContext)) {
         result = hookContext.then((context) => {
           hookContext = context;
-          if (hookContext instanceof GraphQLError) {
-            return null;
-          }
           return resolveFn(rootValue, args, contextValue, info);
         });
-      } else if (hookContext instanceof GraphQLError) {
-        result = null;
       }
     }
     if (result === void 0) {
@@ -499,42 +500,23 @@ function executeSubscriptionImpl(exeContext) {
           resolved,
           error
         );
-        if (hookContext instanceof GraphQLError) {
-          throw hookContext;
-        }
       }
     };
     if (isPromise(result)) {
-      return result.then(assertEventStream).then(
-        (resolved) => {
-          if (resolved instanceof GraphQLError) {
-            throw resolved;
-          }
-          if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldSubscribe)) {
-            hookContext = invokeAfterFieldSubscribeHook(
-              info,
-              exeContext,
-              hookContext,
-              resolved
-            );
-            if (hookContext instanceof GraphQLError) {
-              throw hookContext;
-            }
-          }
-          return resolved;
-        },
-        (error) => {
-          afterFieldSubscribeHandle(void 0, error);
-          throw locatedError(error, fieldGroup, pathToArray(path));
-        }
-      );
+      return result.then(assertEventStream, (error) => {
+        afterFieldSubscribeHandle(void 0, error);
+        throw locatedError(error, fieldGroup, pathToArray(path));
+      }).then((resolved) => {
+        afterFieldSubscribeHandle(resolved);
+        return resolved;
+      });
     }
     const stream = assertEventStream(result);
     afterFieldSubscribeHandle(stream);
     return stream;
   } catch (error) {
     if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldSubscribe)) {
-      hookContext = invokeAfterFieldSubscribeHook(
+      invokeAfterFieldSubscribeHook(
         info,
         exeContext,
         hookContext,
@@ -542,9 +524,6 @@ function executeSubscriptionImpl(exeContext) {
         error
       );
     }
-    if (hookContext instanceof GraphQLError) {
-      throw hookContext;
-    }
     throw locatedError(error, fieldGroup, pathToArray(path));
   }
 }
@@ -738,13 +717,10 @@ function resolveAndCompleteField(exeContext, parentTypeName, fieldDefinition, fi
         ),
         (rawError) => {
           const error = locatedError(rawError, fieldGroup, pathToArray(path));
-          const hookResult = handleAfterFieldHooks(
+          handleAfterFieldHooks(
             invokeAfterFieldCompleteHook,
             !!(hooks == null ? void 0 : hooks.afterFieldComplete)
           )(void 0, error);
-          if (hookResult === null) {
-            return null;
-          }
           handleFieldError(
             rawError,
             exeContext,
@@ -1275,7 +1251,7 @@ function invokeBeforeFieldSubscribeHook(resolveInfo, exeContext) {
           "Unexpected error in beforeFieldSubscribe hook"
         );
         exeContext.errors.push(error);
-        return error;
+        throw error;
       } else if (result instanceof Error) {
         const error = toGraphQLError(
           result,
@@ -1283,7 +1259,7 @@ function invokeBeforeFieldSubscribeHook(resolveInfo, exeContext) {
           "Unexpected error in beforeFieldSubscribe hook"
         );
         exeContext.errors.push(error);
-        return error;
+        throw error;
       }
       return result;
     }
@@ -1378,7 +1354,7 @@ function invokeAfterFieldSubscribeHook(resolveInfo, exeContext, hookContext, res
           "Unexpected error in afterFieldSubscribe hook"
         );
         exeContext.errors.push(error2);
-        return error2;
+        throw error2;
       } else if (result2 instanceof Error) {
         const error2 = toGraphQLError(
           result2,
@@ -1386,7 +1362,7 @@ function invokeAfterFieldSubscribeHook(resolveInfo, exeContext, hookContext, res
           "Unexpected error in afterFieldSubscribe hook"
         );
         exeContext.errors.push(error2);
-        return error2;
+        throw error2;
       }
       return result2;
     }
@@ -1449,7 +1425,7 @@ function invokeBeforeOperationExecuteHook(exeContext) {
       }
       if (result instanceof Error) {
         const error = toGraphQLError(
-          rawError,
+          result,
           void 0,
           "Unexpected error in beforeOperationExecute hook"
         );
@@ -1504,7 +1480,7 @@ function invokeAfterBuildResponseHook(exeContext, result) {
       operation: exeContext.operation,
       result
     }),
-    (_, rawError) => {
+    (result2, rawError) => {
       if (rawError) {
         const error = toGraphQLError(
           rawError,
@@ -1512,6 +1488,14 @@ function invokeAfterBuildResponseHook(exeContext, result) {
           "Unexpected error in afterBuildResponse hook"
         );
         exeContext.errors.push(error);
+        return error;
+      } else if (result2 instanceof Error) {
+        const error = toGraphQLError(
+          result2,
+          void 0,
+          "Unexpected error in afterBuildResponse hook"
+        );
+        exeContext.errors.push(error);
       }
     }
   );