@graphitation/supermassive 3.7.1 → 3.8.0-alpha.1

package/CHANGELOG.md

@@ -1,9 +1,17 @@
 # Change Log - @graphitation/supermassive
 
-<!-- This log was last generated on Wed, 06 Nov 2024 13:29:21 GMT and should not be manually modified. -->
+<!-- This log was last generated on Sun, 15 Dec 2024 19:04:27 GMT and should not be manually modified. -->
 
 <!-- Start content -->
 
+## 3.8.0-alpha.1
+
+Sun, 15 Dec 2024 19:04:27 GMT
+
+### Changes
+
+- Supermassive hook error handling modified (77059398+vejrj@users.noreply.github.com)
+
 ## 3.7.0
 
 Wed, 06 Nov 2024 13:29:21 GMT

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

@@ -480,53 +480,71 @@ function executeSubscriptionImpl(exeContext) {
   try {
     const args = (0, import_values.getArgumentValues)(exeContext, fieldDef, fieldGroup[0]);
     const contextValue = exeContext.contextValue;
-    if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.beforeFieldResolve)) {
-      hookContext = invokeBeforeFieldResolveHook(info, exeContext);
+    if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.beforeFieldSubscribe)) {
+      hookContext = invokeBeforeFieldSubscribeHook(info, exeContext);
     }
-    const result = (0, import_isPromise.isPromise)(hookContext) ? hookContext.then((context) => {
-      hookContext = context;
-      return resolveFn(rootValue, args, contextValue, info);
-    }) : resolveFn(rootValue, args, contextValue, info);
+    let result;
+    if (hookContext) {
+      if ((0, import_isPromise.isPromise)(hookContext)) {
+        result = hookContext.then((context) => {
+          hookContext = context;
+          if (hookContext instanceof import_graphql.GraphQLError) {
+            return null;
+          }
+          return resolveFn(rootValue, args, contextValue, info);
+        });
+      } else if (hookContext instanceof import_graphql.GraphQLError) {
+        result = null;
+      }
+    }
+    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,
+          exeContext,
+          hookContext,
+          resolved,
+          error
+        );
+        if (hookContext instanceof import_graphql.GraphQLError) {
+          throw hookContext;
+        }
+      }
+    };
     if ((0, import_isPromise.isPromise)(result)) {
       return result.then(assertEventStream).then(
         (resolved) => {
-          if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldResolve)) {
-            hookContext = invokeAfterFieldResolveHook(
+          if (resolved instanceof import_graphql.GraphQLError) {
+            throw resolved;
+          }
+          if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldSubscribe)) {
+            hookContext = invokeAfterFieldSubscribeHook(
               info,
               exeContext,
               hookContext,
               resolved
             );
+            if (hookContext instanceof import_graphql.GraphQLError) {
+              throw hookContext;
+            }
           }
           return resolved;
         },
         (error) => {
-          if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldResolve)) {
-            hookContext = invokeAfterFieldResolveHook(
-              info,
-              exeContext,
-              hookContext,
-              void 0,
-              error
-            );
-          }
+          afterFieldSubscribeHandle(void 0, error);
           throw (0, import_graphql.locatedError)(error, fieldGroup, (0, import_Path.pathToArray)(path));
         }
       );
     }
     const stream = assertEventStream(result);
-    if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldResolve)) {
-      hookContext = invokeAfterFieldResolveHook(
-        info,
-        exeContext,
-        hookContext,
-        stream
-      );
-    }
+    afterFieldSubscribeHandle(stream);
     return stream;
   } catch (error) {
-    if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldResolve)) {
-      hookContext = invokeAfterFieldResolveHook(
+    if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldSubscribe)) {
+      hookContext = invokeAfterFieldSubscribeHook(
         info,
         exeContext,
         hookContext,
@@ -534,6 +552,9 @@ function executeSubscriptionImpl(exeContext) {
         error
       );
     }
+    if (hookContext instanceof import_graphql.GraphQLError) {
+      throw hookContext;
+    }
     throw (0, import_graphql.locatedError)(error, fieldGroup, (0, import_Path.pathToArray)(path));
   }
 }
@@ -570,25 +591,28 @@ function mapResultOrEventStreamOrPromise(resultOrStreamOrPromise, exeContext, pa
           payload
         );
         const hooks = exeContext == null ? void 0 : exeContext.fieldExecutionHooks;
-        let beforeExecuteFieldsHook;
+        let beforeExecuteSubscriptionEvenEmitHook;
         if (hooks == null ? void 0 : hooks.beforeSubscriptionEventEmit) {
-          beforeExecuteFieldsHook = invokeBeforeSubscriptionEventEmitHook(
-            perEventContext,
-            payload
-          );
+          beforeExecuteSubscriptionEvenEmitHook = invokeBeforeSubscriptionEventEmitHook(perEventContext, payload);
+          if (beforeExecuteSubscriptionEvenEmitHook instanceof import_graphql.GraphQLError) {
+            return buildResponse(perEventContext, null);
+          }
         }
         try {
-          const data = (0, import_isPromise.isPromise)(beforeExecuteFieldsHook) ? beforeExecuteFieldsHook.then(
-            () => executeFields(
-              exeContext,
+          const data = (0, import_isPromise.isPromise)(beforeExecuteSubscriptionEvenEmitHook) ? beforeExecuteSubscriptionEvenEmitHook.then((context) => {
+            if (context instanceof import_graphql.GraphQLError) {
+              return null;
+            }
+            return executeFields(
+              perEventContext,
               parentTypeName,
               payload,
               path,
               groupedFieldSet,
               void 0
-            )
-          ) : executeFields(
-            exeContext,
+            );
+          }) : executeFields(
+            perEventContext,
             parentTypeName,
             payload,
             path,
@@ -653,54 +677,59 @@ function resolveAndCompleteField(exeContext, parentTypeName, fieldDefinition, fi
     if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.beforeFieldResolve)) {
       hookContext = invokeBeforeFieldResolveHook(info, exeContext);
     }
-    const result = (0, import_isPromise.isPromise)(hookContext) ? hookContext.then((context) => {
-      hookContext = context;
-      return resolveFn(source, args, contextValue, info);
-    }) : resolveFn(source, args, contextValue, info);
+    let result;
+    if (hookContext instanceof import_graphql.GraphQLError) {
+      result = null;
+    } else if ((0, import_isPromise.isPromise)(hookContext)) {
+      result = hookContext.then((context) => {
+        hookContext = context;
+        if (hookContext instanceof import_graphql.GraphQLError) {
+          return null;
+        }
+        return resolveFn(source, args, contextValue, info);
+      });
+    } else {
+      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(
         (resolved) => {
-          if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldResolve)) {
-            hookContext = invokeAfterFieldResolveHook(
-              info,
-              exeContext,
-              hookContext,
-              resolved
-            );
-          }
           return completeValue(
             exeContext,
             returnTypeRef,
             fieldGroup,
             info,
             path,
-            resolved,
+            hookContext instanceof import_graphql.GraphQLError ? null : resolved,
             incrementalDataRecord
           );
         },
         (rawError) => {
-          if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldResolve)) {
-            hookContext = invokeAfterFieldResolveHook(
-              info,
-              exeContext,
-              hookContext,
-              void 0,
-              rawError
-            );
-          }
+          handleAfterFieldHooks(
+            invokeAfterFieldResolveHook,
+            !!(hooks == null ? void 0 : hooks.afterFieldResolve)
+          )(void 0, rawError);
           throw rawError;
         }
       );
     } else {
-      if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldResolve)) {
-        hookContext = invokeAfterFieldResolveHook(
-          info,
-          exeContext,
-          hookContext,
-          result
-        );
-      }
+      result = handleAfterFieldHooks(
+        invokeAfterFieldResolveHook,
+        !!(hooks == null ? void 0 : hooks.afterFieldResolve)
+      )(result);
       completed = completeValue(
         exeContext,
         returnTypeRef,
@@ -713,27 +742,18 @@ function resolveAndCompleteField(exeContext, parentTypeName, fieldDefinition, fi
     }
     if ((0, import_isPromise.isPromise)(completed)) {
       return completed.then(
-        (resolved) => {
-          if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldComplete)) {
-            invokeAfterFieldCompleteHook(
-              info,
-              exeContext,
-              hookContext,
-              resolved
-            );
-          }
-          return resolved;
-        },
+        handleAfterFieldHooks(
+          invokeAfterFieldCompleteHook,
+          !!(hooks == null ? void 0 : hooks.afterFieldComplete)
+        ),
         (rawError) => {
           const error = (0, import_graphql.locatedError)(rawError, fieldGroup, (0, import_Path.pathToArray)(path));
-          if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldComplete)) {
-            invokeAfterFieldCompleteHook(
-              info,
-              exeContext,
-              hookContext,
-              void 0,
-              error
-            );
+          const hookResult = handleAfterFieldHooks(
+            invokeAfterFieldCompleteHook,
+            !!(hooks == null ? void 0 : hooks.afterFieldComplete)
+          )(void 0, error);
+          if (hookResult === null) {
+            return null;
           }
           handleFieldError(
             rawError,
@@ -747,10 +767,10 @@ function resolveAndCompleteField(exeContext, parentTypeName, fieldDefinition, fi
         }
       );
     }
-    if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldComplete)) {
-      invokeAfterFieldCompleteHook(info, exeContext, hookContext, completed);
-    }
-    return completed;
+    return handleAfterFieldHooks(
+      invokeAfterFieldCompleteHook,
+      !!(hooks == null ? void 0 : hooks.afterFieldComplete)
+    )(completed);
   } catch (rawError) {
     const pathArray = (0, import_Path.pathToArray)(path);
     const error = (0, import_graphql.locatedError)(rawError, fieldGroup, pathArray);
@@ -764,13 +784,16 @@ function resolveAndCompleteField(exeContext, parentTypeName, fieldDefinition, fi
       );
     }
     if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.afterFieldComplete)) {
-      invokeAfterFieldCompleteHook(
+      const invokeAfterFieldCompleteHookResult = invokeAfterFieldCompleteHook(
         info,
         exeContext,
         hookContext,
         void 0,
         error
       );
+      if (invokeAfterFieldCompleteHookResult instanceof import_graphql.GraphQLError) {
+        return null;
+      }
     }
     handleFieldError(
       rawError,
@@ -1243,6 +1266,39 @@ function collectAndExecuteSubfields(exeContext, returnTypeName, fieldGroup, path
   }
   return subFields;
 }
+function invokeBeforeFieldSubscribeHook(resolveInfo, exeContext) {
+  var _a;
+  const hook = (_a = exeContext.fieldExecutionHooks) == null ? void 0 : _a.beforeFieldSubscribe;
+  if (!hook) {
+    return;
+  }
+  return executeSafe(
+    () => hook({
+      resolveInfo,
+      context: exeContext.contextValue
+    }),
+    (result, rawError) => {
+      if (rawError) {
+        const error = toGraphQLError(
+          rawError,
+          resolveInfo.path,
+          "Unexpected error in beforeFieldSubscribe hook"
+        );
+        exeContext.errors.push(error);
+        return error;
+      } else if (result instanceof Error) {
+        const error = toGraphQLError(
+          result,
+          resolveInfo.path,
+          "Unexpected error in beforeFieldSubscribe hook"
+        );
+        exeContext.errors.push(error);
+        return error;
+      }
+      return result;
+    }
+  );
+}
 function invokeBeforeFieldResolveHook(resolveInfo, exeContext) {
   var _a;
   const hook = (_a = exeContext.fieldExecutionHooks) == null ? void 0 : _a.beforeFieldResolve;
@@ -1254,7 +1310,7 @@ function invokeBeforeFieldResolveHook(resolveInfo, exeContext) {
       resolveInfo,
       context: exeContext.contextValue
     }),
-    (_, rawError) => {
+    (result, rawError) => {
       if (rawError) {
         const error = toGraphQLError(
           rawError,
@@ -1262,7 +1318,16 @@ function invokeBeforeFieldResolveHook(resolveInfo, exeContext) {
           "Unexpected error in beforeFieldResolve hook"
         );
         exeContext.errors.push(error);
+        return error;
+      } else if (result instanceof Error) {
+        const error = toGraphQLError(
+          result,
+          resolveInfo.path,
+          "Unexpected error in beforeFieldResolve hook"
+        );
+        exeContext.errors.push(error);
       }
+      return result;
     }
   );
 }
@@ -1280,7 +1345,7 @@ function invokeAfterFieldResolveHook(resolveInfo, exeContext, hookContext, resul
       result,
       error
     }),
-    (_, rawError) => {
+    (result2, rawError) => {
       if (rawError) {
         const error2 = toGraphQLError(
           rawError,
@@ -1288,7 +1353,52 @@ function invokeAfterFieldResolveHook(resolveInfo, exeContext, hookContext, resul
           "Unexpected error in afterFieldResolve hook"
         );
         exeContext.errors.push(error2);
+        return error2;
+      } else if (result2 instanceof Error) {
+        const error2 = toGraphQLError(
+          result2,
+          resolveInfo.path,
+          "Unexpected error in afterFieldResolve hook"
+        );
+        exeContext.errors.push(error2);
+      }
+      return result2;
+    }
+  );
+}
+function invokeAfterFieldSubscribeHook(resolveInfo, exeContext, hookContext, result, error) {
+  var _a;
+  const hook = (_a = exeContext.fieldExecutionHooks) == null ? void 0 : _a.afterFieldSubscribe;
+  if (!hook) {
+    return;
+  }
+  return executeSafe(
+    () => hook({
+      resolveInfo,
+      context: exeContext.contextValue,
+      hookContext,
+      result,
+      error
+    }),
+    (result2, rawError) => {
+      if (rawError) {
+        const error2 = toGraphQLError(
+          rawError,
+          resolveInfo.path,
+          "Unexpected error in afterFieldSubscribe hook"
+        );
+        exeContext.errors.push(error2);
+        return error2;
+      } else if (result2 instanceof Error) {
+        const error2 = toGraphQLError(
+          result2,
+          resolveInfo.path,
+          "Unexpected error in afterFieldSubscribe hook"
+        );
+        exeContext.errors.push(error2);
+        return error2;
       }
+      return result2;
     }
   );
 }
@@ -1298,7 +1408,7 @@ function invokeAfterFieldCompleteHook(resolveInfo, exeContext, hookContext, resu
   if (!hook) {
     return;
   }
-  executeSafe(
+  return executeSafe(
     () => hook({
       resolveInfo,
       context: exeContext.contextValue,
@@ -1306,7 +1416,7 @@ function invokeAfterFieldCompleteHook(resolveInfo, exeContext, hookContext, resu
       result,
       error
     }),
-    (_, rawError) => {
+    (result2, rawError) => {
       if (rawError) {
         const error2 = toGraphQLError(
           rawError,
@@ -1314,7 +1424,16 @@ function invokeAfterFieldCompleteHook(resolveInfo, exeContext, hookContext, resu
           "Unexpected error in afterFieldComplete hook"
         );
         exeContext.errors.push(error2);
+        return error2;
+      } else if (result2 instanceof Error) {
+        const error2 = toGraphQLError(
+          result2,
+          resolveInfo.path,
+          "Unexpected error in afterFieldComplete hook"
+        );
+        exeContext.errors.push(error2);
       }
+      return result2;
     }
   );
 }
@@ -1329,8 +1448,16 @@ function invokeBeforeOperationExecuteHook(exeContext) {
       context: exeContext.contextValue,
       operation: exeContext.operation
     }),
-    (_, rawError) => {
+    (result, rawError) => {
       if (rawError) {
+        const error = toGraphQLError(
+          rawError,
+          void 0,
+          "Unexpected error in beforeOperationExecute hook"
+        );
+        throw error;
+      }
+      if (result instanceof Error) {
         const error = toGraphQLError(
           rawError,
           void 0,
@@ -1338,6 +1465,7 @@ function invokeBeforeOperationExecuteHook(exeContext) {
         );
         exeContext.errors.push(error);
       }
+      return result;
     }
   );
 }
@@ -1353,7 +1481,7 @@ function invokeBeforeSubscriptionEventEmitHook(exeContext, eventPayload) {
       operation: exeContext.operation,
       eventPayload
     }),
-    (_, rawError) => {
+    (result, rawError) => {
       if (rawError) {
         const error = toGraphQLError(
           rawError,
@@ -1361,7 +1489,16 @@ function invokeBeforeSubscriptionEventEmitHook(exeContext, eventPayload) {
           "Unexpected error in beforeSubscriptionEventEmit hook"
         );
         exeContext.errors.push(error);
+        return error;
+      } else if (result instanceof Error) {
+        const error = toGraphQLError(
+          result,
+          void 0,
+          "Unexpected error in beforeSubscriptionEventEmit hook"
+        );
+        exeContext.errors.push(error);
       }
+      return result;
     }
   );
 }
@@ -1396,20 +1533,14 @@ function executeSafe(execute, onComplete) {
     result = execute();
   } catch (e) {
     error = e;
-  } finally {
-    if (!(0, import_isPromise.isPromise)(result)) {
-      onComplete(result, error);
-    }
   }
   if (!(0, import_isPromise.isPromise)(result)) {
-    return result;
+    return onComplete(result, error);
   }
   return result.then((hookResult) => {
-    onComplete(hookResult, error);
-    return hookResult;
+    return onComplete(hookResult, error);
   }).catch((e) => {
-    onComplete(void 0, e);
-    return void 0;
+    return onComplete(void 0, e);
   });
 }
 function toGraphQLError(originalError, path, prependMessage) {