@graphitation/supermassive 3.6.1 → 3.6.2

package/lib/executeWithoutSchema.mjs

@@ -83,7 +83,7 @@ function executeWithoutSchema(args) {
   if (!("schemaFragment" in exeContext)) {
     return { errors: exeContext };
   } else {
-    return executeOperationWithBeforeHook(exeContext);
+    return executeOperation(exeContext);
   }
 }
 function assertValidExecutionArguments(document, rawVariableValues) {
@@ -175,17 +175,6 @@ function buildPerEventExecutionContext(exeContext, payload) {
     errors: []
   });
 }
-function executeOperationWithBeforeHook(exeContext) {
-  const hooks = exeContext.fieldExecutionHooks;
-  let hook;
-  if (hooks == null ? void 0 : hooks.beforeOperationExecute) {
-    hook = invokeBeforeOperationExecuteHook(exeContext);
-  }
-  if (isPromise(hook)) {
-    return hook.then(() => executeOperation(exeContext));
-  }
-  return executeOperation(exeContext);
-}
 function executeOperation(exeContext) {
   try {
     const { operation, rootValue } = exeContext;
@@ -196,6 +185,10 @@ function executeOperation(exeContext) {
     );
     const path = void 0;
     let result;
+    const hooks = exeContext.fieldExecutionHooks;
+    if (hooks == null ? void 0 : hooks.beforeOperationExecute) {
+      invokeBeforeOperationExecuteHook(exeContext);
+    }
     switch (operation.operation) {
       case "query":
         result = executeFields(
@@ -463,10 +456,7 @@ function executeSubscriptionImpl(exeContext) {
     if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.beforeFieldResolve)) {
       hookContext = invokeBeforeFieldResolveHook(info, exeContext);
     }
-    const result = isPromise(hookContext) ? hookContext.then((context) => {
-      hookContext = context;
-      return resolveFn(rootValue, args, contextValue, info);
-    }) : resolveFn(rootValue, args, contextValue, info);
+    const result = resolveFn(rootValue, args, contextValue, info);
     if (isPromise(result)) {
       return result.then(assertEventStream).then(
         (resolved) => {
@@ -550,24 +540,11 @@ function mapResultOrEventStreamOrPromise(resultOrStreamOrPromise, exeContext, pa
           payload
         );
         const hooks = exeContext == null ? void 0 : exeContext.fieldExecutionHooks;
-        let beforeExecuteFieldsHook;
         if (hooks == null ? void 0 : hooks.beforeSubscriptionEventEmit) {
-          beforeExecuteFieldsHook = invokeBeforeSubscriptionEventEmitHook(
-            perEventContext,
-            payload
-          );
+          invokeBeforeSubscriptionEventEmitHook(perEventContext, payload);
         }
         try {
-          const data = isPromise(beforeExecuteFieldsHook) ? beforeExecuteFieldsHook.then(
-            () => executeFields(
-              exeContext,
-              parentTypeName,
-              payload,
-              path,
-              groupedFieldSet,
-              void 0
-            )
-          ) : executeFields(
+          const data = executeFields(
             exeContext,
             parentTypeName,
             payload,
@@ -633,10 +610,7 @@ function resolveAndCompleteField(exeContext, parentTypeName, fieldDefinition, fi
     if (!isDefaultResolverUsed && (hooks == null ? void 0 : hooks.beforeFieldResolve)) {
       hookContext = invokeBeforeFieldResolveHook(info, exeContext);
     }
-    const result = isPromise(hookContext) ? hookContext.then((context) => {
-      hookContext = context;
-      return resolveFn(source, args, contextValue, info);
-    }) : resolveFn(source, args, contextValue, info);
+    const result = resolveFn(source, args, contextValue, info);
     let completed;
     if (isPromise(result)) {
       completed = result.then(
@@ -1377,20 +1351,9 @@ function executeSafe(execute, onComplete) {
   } catch (e) {
     error = e;
   } finally {
-    if (!isPromise(result)) {
-      onComplete(result, error);
-    }
-  }
-  if (!isPromise(result)) {
-    return result;
+    onComplete(result, error);
   }
-  return result.then((hookResult) => {
-    onComplete(hookResult, error);
-    return hookResult;
-  }).catch((e) => {
-    onComplete(void 0, e);
-    return void 0;
-  });
+  return result;
 }
 function toGraphQLError(originalError, path, prependMessage) {
   const originalMessage = originalError instanceof Error ? originalError.message : inspect(originalError);