@graphitation/supermassive 3.8.0-alpha.3 → 3.8.0

package/CHANGELOG.md

@@ -1,16 +1,16 @@
 # Change Log - @graphitation/supermassive
 
-<!-- This log was last generated on Tue, 17 Dec 2024 19:43:04 GMT and should not be manually modified. -->
+<!-- This log was last generated on Thu, 02 Jan 2025 12:43:33 GMT and should not be manually modified. -->
 
 <!-- Start content -->
 
-## 3.8.0-alpha.3
+## 3.8.0
 
-Tue, 17 Dec 2024 19:43:04 GMT
+Thu, 02 Jan 2025 12:43:33 GMT
 
-### Changes
+### Minor changes
 
-- subscribe hooks fixed (77059398+vejrj@users.noreply.github.com)
+- Hooks error handling (77059398+vejrj@users.noreply.github.com)
 
 ## 3.7.2
 

package/hooks.md

@@ -0,0 +1,64 @@
+# Hooks Documentation
+
+## Overview
+
+This document describes the behaviour of hooks when they encounter errors.
+
+## General Rule
+
+- **Thrown Error**: Specific behaviour is applied based on the hook.
+- **Returned Error**: The error is registered and execution continues.
+
+### Hooks and Their Behaviours
+
+#### `beforeOperationExecute`
+
+Called before every operation
+
+- **Thrown Error**: Stops execution and sets `data` to `null` and registers the error.
+- **Returned Error**: The error is registered and execution continues.
+
+#### `beforeSubscriptionEventEmit`
+
+- **Thrown ErErrorror**: Sets `data` to `null` and registers the error.
+- **Returned Error**: The error is registered and execution continues.
+
+#### `beforeFieldResolve`
+
+Called before every field resolution
+
+- **Thrown Error**: The field is not executed and is handled as if it has returned `null`.
+- **Returned Error**: The error is registered and execution continues.
+
+#### `afterFieldResolve`
+
+Called after every field resolution.
+
+- **Thrown Error**: The field is set to `null` and the error is registered.
+- **Returned Error**: The error is registered and execution continues.
+
+#### `afterFieldComplete`
+
+Called when field value is completed
+
+- **Thrown Error**: The field is set to `null` and the error is registered.
+- **Returned Error**: The error is registered and execution continues.
+
+#### `afterBuildResponse`
+
+- **Thrown Error**: Returns no data property, only errors.
+- **Returned Error**: The error is registered and execution continues.
+
+## Additional Hooks
+
+### `beforeFieldSubscribe`
+
+Called before subscription event stream creation
+
+- **Thrown or Returned Error**: Stops execution and sets `data` is `undefined` and error is returned in `errors` field.
+
+### `afterFieldSubscribe`
+
+Called after subscription event stream creation
+
+- **Thrown or Returned Error**: Stops execution and sets `data` is `undefined` and error is returned in `errors` field.

package/lib/executeWithoutSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"executeWithoutSchema.d.ts","sourceRoot":"","sources":["../src/executeWithoutSchema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"executeWithoutSchema.d.ts","sourceRoot":"","sources":["../src/executeWithoutSchema.ts"],"names":[],"mappings":"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"}

package/lib/executeWithoutSchema.js

@@ -197,12 +197,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 ((0, import_isPromise.isPromise)(hook)) {
-    return hook.then(() => executeOperation(exeContext));
+  if (hookResultPromise instanceof import_graphql.GraphQLError) {
+    return buildResponse(exeContext, null);
+  }
+  if ((0, import_isPromise.isPromise)(hookResultPromise)) {
+    return hookResultPromise.then((hookResult) => {
+      if (hookResult instanceof import_graphql.GraphQLError) {
+        return buildResponse(exeContext, null);
+      }
+      return executeOperation(exeContext);
+    });
   }
   return executeOperation(exeContext);
 }
@@ -452,6 +460,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;
@@ -510,28 +529,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 ((0, import_isPromise.isPromise)(result)) {
+      return result.then(assertEventStream, (error) => {
+        afterFieldSubscribeHandle(
+          void 0,
+          isDefaultResolverUsed,
           exeContext,
+          info,
           hookContext,
-          resolved,
+          !!(hooks == null ? void 0 : hooks.afterFieldSubscribe),
           error
         );
-      }
-    };
-    if ((0, import_isPromise.isPromise)(result)) {
-      return result.then(assertEventStream, (error) => {
-        afterFieldSubscribeHandle(void 0, error);
         throw (0, import_graphql.locatedError)(error, fieldGroup, (0, import_Path.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)) {
@@ -680,20 +710,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 import_graphql.GraphQLError ? null : resolved;
-      }
-      return resolved;
-    };
     if ((0, import_isPromise.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 import_graphql.GraphQLError ? null : resolved;
+        }
+        return resolved;
+      }).then(
         (resolved) => {
           return completeValue(
             exeContext,
@@ -706,18 +735,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 import_graphql.GraphQLError ? null : result;
+      }
       completed = completeValue(
         exeContext,
         returnTypeRef,
@@ -730,16 +769,29 @@ function resolveAndCompleteField(exeContext, parentTypeName, fieldDefinition, fi
     }
     if ((0, import_isPromise.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 import_graphql.GraphQLError ? null : resolved;
+          }
+          return resolved;
+        },
         (rawError) => {
           const error = (0, import_graphql.locatedError)(rawError, fieldGroup, (0, import_Path.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,
@@ -752,10 +804,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 import_graphql.GraphQLError ? null : completed;
+    }
+    return completed;
   } catch (rawError) {
     const pathArray = (0, import_Path.pathToArray)(path);
     const error = (0, import_graphql.locatedError)(rawError, fieldGroup, pathArray);
@@ -769,16 +827,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 import_graphql.GraphQLError) {
-        return null;
-      }
     }
     handleFieldError(
       rawError,
@@ -1267,7 +1322,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;
@@ -1275,7 +1330,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;
@@ -1300,7 +1355,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;
@@ -1308,7 +1363,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);
       }
@@ -1335,7 +1390,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;
@@ -1343,7 +1398,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);
       }
@@ -1370,7 +1425,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;
@@ -1378,7 +1433,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;
@@ -1406,7 +1461,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;
@@ -1414,7 +1469,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);
       }
@@ -1434,19 +1489,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);
       }
@@ -1467,11 +1525,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;
@@ -1479,7 +1539,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);
       }
@@ -1500,11 +1560,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;
@@ -1512,7 +1574,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);
       }