relay-runtime 0.0.0-main-ba09a889 → 0.0.0-main-dce1a2ea

package/experimental.js

@@ -1,5 +1,5 @@
 /**
- * Relay v0.0.0-main-ba09a889
+ * Relay v0.0.0-main-dce1a2ea
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/index.js

@@ -1,5 +1,5 @@
 /**
- * Relay v0.0.0-main-ba09a889
+ * Relay v0.0.0-main-dce1a2ea
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/lib/store/OperationExecutor.js

@@ -179,7 +179,7 @@ var Executor = /*#__PURE__*/function () {
         }
       case 'loading_final':
         {
-          activeState = this._pendingModulePayloadsCount > 0 ? 'active' : 'inactive';
+          activeState = this._pendingModulePayloadsCount > 0 || this._useExecTimeResolvers && !this._execTimeResolverResponseComplete ? 'active' : 'inactive';
           break;
         }
       default:
@@ -374,8 +374,10 @@ var Executor = /*#__PURE__*/function () {
         this._getPublishQueueAndSaveActor().commitPayload(this._operation, payload, this._updater);
         _payloadFollowups.push(payload);
         this._execTimeResolverResponseComplete = isFinal;
+        if (isFinal) {
+          this._updateActiveState();
+        }
       }
-      this._processPayloadFollowups(_payloadFollowups);
     }
     if (incrementalResponses.length > 0) {
       var _payloadFollowups2 = this._processIncrementalResponses(incrementalResponses);
@@ -619,7 +621,7 @@ var Executor = /*#__PURE__*/function () {
     });
   };
   _proto._maybeCompleteSubscriptionOperationTracking = function _maybeCompleteSubscriptionOperationTracking() {
-    if (!this._isSubscriptionOperation && !(this._useExecTimeResolvers && this._execTimeResolverResponseComplete)) {
+    if (!this._isSubscriptionOperation && !(this._useExecTimeResolvers && this._execTimeResolverResponseComplete && this._state === 'loading_final')) {
       return;
     }
     if (this._pendingModulePayloadsCount === 0 && this._incrementalPayloadsPending === false) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "relay-runtime",
   "description": "A core runtime for building GraphQL-driven applications.",
-  "version": "0.0.0-main-ba09a889",
+  "version": "0.0.0-main-dce1a2ea",
   "keywords": [
     "graphql",
     "relay"

package/store/OperationExecutor.js.flow

@@ -323,7 +323,11 @@ class Executor<TMutation: MutationParameters> {
       }
       case 'loading_final': {
         activeState =
-          this._pendingModulePayloadsCount > 0 ? 'active' : 'inactive';
+          this._pendingModulePayloadsCount > 0 ||
+          (this._useExecTimeResolvers &&
+            !this._execTimeResolverResponseComplete)
+            ? 'active'
+            : 'inactive';
         break;
       }
       default:
@@ -585,8 +589,12 @@ class Executor<TMutation: MutationParameters> {
         );
         payloadFollowups.push(payload);
         this._execTimeResolverResponseComplete = isFinal;
+        if (isFinal) {
+          // Need to update the active state to mark the query as inactive,
+          // incase server payloads have completed
+          this._updateActiveState();
+        }
       }
-      this._processPayloadFollowups(payloadFollowups);
     }
 
     if (incrementalResponses.length > 0) {
@@ -949,7 +957,11 @@ class Executor<TMutation: MutationParameters> {
   _maybeCompleteSubscriptionOperationTracking() {
     if (
       !this._isSubscriptionOperation &&
-      !(this._useExecTimeResolvers && this._execTimeResolverResponseComplete)
+      !(
+        this._useExecTimeResolvers &&
+        this._execTimeResolverResponseComplete &&
+        this._state === 'loading_final'
+      )
     ) {
       return;
     }