@graphitation/supermassive 3.18.1-canary.3 → 4.0.0

package/lib/executeWithoutSchema.mjs

@@ -9,7 +9,6 @@ import {
   collectSubfields as _collectSubfields
 } from "./collectFields.mjs";
 import { devAssert } from "./jsutils/devAssert.mjs";
-import { getObjectAtPath } from "./jsutils/getObjectAtPath.mjs";
 import { inspect } from "./jsutils/inspect.mjs";
 import { invariant } from "./jsutils/invariant.mjs";
 import { isIterableObject } from "./jsutils/isIterableObject.mjs";
@@ -71,9 +70,7 @@ function buildExecutionContext(args) {
     subscribeFieldResolver,
     fieldExecutionHooks,
     enablePerEventContext,
-    enableEarlyExecution,
-    enableDeferredMerge,
-    enableIncrementalPayloadBatching
+    enableEarlyExecution
   } = args;
   assertValidExecutionArguments(document, variableValues);
   let operation;
@@ -132,9 +129,7 @@ function buildExecutionContext(args) {
     fieldExecutionHooks,
     subsequentPayloads: /* @__PURE__ */ new Set(),
     enablePerEventContext: enablePerEventContext != null ? enablePerEventContext : true,
-    enableEarlyExecution: enableEarlyExecution != null ? enableEarlyExecution : false,
-    enableDeferredMerge: enableDeferredMerge != null ? enableDeferredMerge : false,
-    enableIncrementalPayloadBatching: enableIncrementalPayloadBatching != null ? enableIncrementalPayloadBatching : false
+    enableEarlyExecution: enableEarlyExecution != null ? enableEarlyExecution : false
   };
 }
 function buildPerEventExecutionContext(exeContext, payload) {
@@ -235,7 +230,7 @@ function executeOperation(exeContext) {
     return buildResponse(exeContext, null);
   }
 }
-function buildResponse(exeContext, data, didWaitForDeferredMerge) {
+function buildResponse(exeContext, data) {
   var _a, _b;
   if (isPromise(data)) {
     return data.then(
@@ -248,14 +243,6 @@ function buildResponse(exeContext, data, didWaitForDeferredMerge) {
   }
   const hooks = exeContext.fieldExecutionHooks;
   try {
-    if (exeContext.enableDeferredMerge) {
-      if (shouldWaitForDeferredMerge(exeContext, data, didWaitForDeferredMerge)) {
-        return waitForNextTick().then(
-          () => buildResponse(exeContext, data, true)
-        );
-      }
-      includeCompletedDeferredFragmentsInResult(exeContext, data);
-    }
     const initialResult = exeContext.errors.length === 0 ? { data } : { errors: exeContext.errors, data };
     if (exeContext.subsequentPayloads.size > 0) {
       return {
@@ -285,25 +272,6 @@ function buildResponse(exeContext, data, didWaitForDeferredMerge) {
     return buildResponse(exeContext, null);
   }
 }
-function shouldWaitForDeferredMerge(exeContext, result, didWaitForDeferredMerge) {
-  if (didWaitForDeferredMerge || result == null) {
-    return false;
-  }
-  let hasDeferredFragment = false;
-  for (const incrementalDataRecord of exeContext.subsequentPayloads) {
-    if (!isDeferredFragmentRecord(incrementalDataRecord)) {
-      continue;
-    }
-    if (incrementalDataRecord.isCompleted) {
-      return false;
-    }
-    hasDeferredFragment = true;
-  }
-  return hasDeferredFragment;
-}
-function waitForNextTick() {
-  return new Promise((resolve) => setTimeout(resolve, 0));
-}
 function executeFieldsSerially(exeContext, parentTypeName, sourceValue, path, groupedFieldSet, patches) {
   if (exeContext.enableEarlyExecution) {
     startExecutingPatches(
@@ -405,27 +373,6 @@ function startExecutingPatches(exeContext, parentTypeName, sourceValue, path, pa
     );
   }
 }
-function includeCompletedDeferredFragmentsInResult(exeContext, result) {
-  if (result == null) {
-    return;
-  }
-  for (const incrementalDataRecord of exeContext.subsequentPayloads) {
-    if (!isDeferredFragmentRecord(incrementalDataRecord) || !incrementalDataRecord.isCompleted) {
-      continue;
-    }
-    const target = getObjectAtPath(result, incrementalDataRecord.path);
-    if (!target) {
-      continue;
-    }
-    if (incrementalDataRecord.data != null) {
-      Object.assign(target, incrementalDataRecord.data);
-    }
-    if (incrementalDataRecord.errors.length > 0) {
-      exeContext.errors.push(...incrementalDataRecord.errors);
-    }
-    exeContext.subsequentPayloads.delete(incrementalDataRecord);
-  }
-}
 function executeField(exeContext, parentTypeName, source, fieldGroup, path, incrementalDataRecord) {
   const schemaFragment = exeContext.schemaFragment;
   const fieldName = fieldGroup[0].name.value;
@@ -2032,26 +1979,19 @@ function getCompletedIncrementalResults(exeContext) {
   }
   return incrementalResults;
 }
-function waitForCompletedSubsequentPayload(exeContext) {
-  return Promise.race(
-    Array.from(exeContext.subsequentPayloads).map((p) => p.promise)
-  );
-}
-async function getCompletedIncrementalResultsWithBatching(exeContext) {
-  await Promise.resolve();
-  return getCompletedIncrementalResults(exeContext);
-}
 function yieldSubsequentPayloads(exeContext) {
   let isDone = false;
   async function next() {
     if (isDone) {
       return { value: void 0, done: true };
     }
-    await waitForCompletedSubsequentPayload(exeContext);
+    await Promise.race(
+      Array.from(exeContext.subsequentPayloads).map((p) => p.promise)
+    );
     if (isDone) {
       return { value: void 0, done: true };
     }
-    const incremental = exeContext.enableIncrementalPayloadBatching ? await getCompletedIncrementalResultsWithBatching(exeContext) : getCompletedIncrementalResults(exeContext);
+    const incremental = getCompletedIncrementalResults(exeContext);
     const hasNext = exeContext.subsequentPayloads.size > 0;
     if (!incremental.length && hasNext) {
       return next();
@@ -2094,9 +2034,6 @@ function yieldSubsequentPayloads(exeContext) {
 function isStreamItemsRecord(incrementalDataRecord) {
   return incrementalDataRecord.type === "stream";
 }
-function isDeferredFragmentRecord(incrementalDataRecord) {
-  return incrementalDataRecord.type === "defer";
-}
 var DeferredFragmentRecord = class {
   constructor(opts) {
     this.type = "defer";