relay-runtime 18.2.0 → 19.0.0

package/experimental.js

@@ -1,5 +1,5 @@
 /**
- * Relay v18.2.0
+ * Relay v19.0.0
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/experimental.js.flow

@@ -16,6 +16,7 @@ import type {DataID} from './util/RelayRuntimeTypes';
 
 const resolverDataInjector = require('./store/live-resolvers/resolverDataInjector');
 const {observeFragment} = require('./store/observeFragmentExperimental');
+const {observeQuery} = require('./store/observeQueryExperimental');
 const {waitForFragmentData} = require('./store/waitForFragmentExperimental');
 
 // Annotates a strong object return type, where `A` is the GraphQL typename and `Typename` is the
@@ -43,13 +44,13 @@ export type IdOf<A: string, Typename: void | string = void> = [
 export type RelayResolverValue<A> = $NonMaybeType<A>;
 
 type ErrorResult<Error> = {
-  ok: false,
-  errors: $ReadOnlyArray<Error>,
+  +ok: false,
+  +errors: $ReadOnlyArray<Error>,
 };
 
 type OkayResult<T> = {
-  ok: true,
-  value: T,
+  +ok: true,
+  +value: T,
 };
 
 export type Result<T, Error> = OkayResult<T> | ErrorResult<Error>;
@@ -57,19 +58,20 @@ export type Result<T, Error> = OkayResult<T> | ErrorResult<Error>;
 function isValueResult<T = mixed>(
   input: Result<T, Error>,
 ): input is OkayResult<T> {
-  return input.ok === true;
+  return input.ok === (true as const);
 }
 
 function isErrorResult<T = mixed>(
   input: Result<T, Error>,
 ): input is ErrorResult<Error> {
-  return input.ok === false;
+  return input.ok === (false as const);
 }
 
 module.exports = {
   resolverDataInjector,
   isValueResult,
   isErrorResult,
+  observeQuery,
   observeFragment,
   waitForFragmentData,
 };

package/index.js

@@ -1,5 +1,5 @@
 /**
- * Relay v18.2.0
+ * Relay v19.0.0
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/index.js.flow

@@ -35,6 +35,7 @@ const {
 } = require('./store/ClientID');
 const createFragmentSpecResolver = require('./store/createFragmentSpecResolver');
 const createRelayContext = require('./store/createRelayContext');
+const createRelayLoggingContext = require('./store/createRelayLoggingContext');
 const isRelayModernEnvironment = require('./store/isRelayModernEnvironment');
 const {
   isSuspenseSentinel,
@@ -316,6 +317,7 @@ module.exports = {
   suspenseSentinel,
   isRequest: GraphQLTag.isRequest,
   readInlineData,
+  readFragment: ResolverFragments.readFragment,
 
   // Declarative mutation API
   MutationTypes: RelayDeclarativeMutationConfig.MutationTypes,
@@ -379,6 +381,7 @@ module.exports = {
     ResolverFragments,
     OperationTracker: RelayOperationTracker,
     createRelayContext: createRelayContext,
+    createRelayLoggingContext: createRelayLoggingContext,
     getOperationVariables: RelayConcreteVariables.getOperationVariables,
     getLocalVariables: RelayConcreteVariables.getLocalVariables,
     fetchQuery: fetchQueryInternal.fetchQuery,

package/lib/experimental.js

@@ -3,8 +3,10 @@
 var resolverDataInjector = require('./store/live-resolvers/resolverDataInjector');
 var _require = require('./store/observeFragmentExperimental'),
   observeFragment = _require.observeFragment;
-var _require2 = require('./store/waitForFragmentExperimental'),
-  waitForFragmentData = _require2.waitForFragmentData;
+var _require2 = require('./store/observeQueryExperimental'),
+  observeQuery = _require2.observeQuery;
+var _require3 = require('./store/waitForFragmentExperimental'),
+  waitForFragmentData = _require3.waitForFragmentData;
 function isValueResult(input) {
   return input.ok === true;
 }
@@ -15,6 +17,7 @@ module.exports = {
   resolverDataInjector: resolverDataInjector,
   isValueResult: isValueResult,
   isErrorResult: isErrorResult,
+  observeQuery: observeQuery,
   observeFragment: observeFragment,
   waitForFragmentData: waitForFragmentData
 };

package/lib/index.js

@@ -25,6 +25,7 @@ var _require2 = require('./store/ClientID'),
   isClientID = _require2.isClientID;
 var createFragmentSpecResolver = require('./store/createFragmentSpecResolver');
 var createRelayContext = require('./store/createRelayContext');
+var createRelayLoggingContext = require('./store/createRelayLoggingContext');
 var isRelayModernEnvironment = require('./store/isRelayModernEnvironment');
 var _require3 = require('./store/live-resolvers/LiveResolverSuspenseSentinel'),
   isSuspenseSentinel = _require3.isSuspenseSentinel,
@@ -123,6 +124,7 @@ module.exports = {
   suspenseSentinel: suspenseSentinel,
   isRequest: GraphQLTag.isRequest,
   readInlineData: readInlineData,
+  readFragment: ResolverFragments.readFragment,
   MutationTypes: RelayDeclarativeMutationConfig.MutationTypes,
   RangeOperations: RelayDeclarativeMutationConfig.RangeOperations,
   DefaultHandlerProvider: RelayDefaultHandlerProvider,
@@ -173,6 +175,7 @@ module.exports = {
     ResolverFragments: ResolverFragments,
     OperationTracker: RelayOperationTracker,
     createRelayContext: createRelayContext,
+    createRelayLoggingContext: createRelayLoggingContext,
     getOperationVariables: RelayConcreteVariables.getOperationVariables,
     getLocalVariables: RelayConcreteVariables.getLocalVariables,
     fetchQuery: fetchQueryInternal.fetchQuery,

package/lib/multi-actor-environment/ActorSpecificEnvironment.js

@@ -16,7 +16,7 @@ var ActorSpecificEnvironment = /*#__PURE__*/function () {
     this._operationTracker = new RelayOperationTracker();
     this._store = config.store;
     this._network = wrapNetworkWithLogObserver(this, config.network);
-    this._publishQueue = new RelayPublishQueue(config.store, config.handlerProvider, defaultGetDataID, config.missingFieldHandlers);
+    this._publishQueue = new RelayPublishQueue(config.store, config.handlerProvider, defaultGetDataID, config.missingFieldHandlers, this.__log);
     this._defaultRenderPolicy = config.defaultRenderPolicy;
     this.options = {
       actorID: this.actorIdentifier

package/lib/mutations/RelayRecordSourceProxy.js

@@ -14,7 +14,7 @@ var _require4 = require('./readUpdatableQuery'),
 var RelayRecordProxy = require('./RelayRecordProxy');
 var invariant = require('invariant');
 var RelayRecordSourceProxy = /*#__PURE__*/function () {
-  function RelayRecordSourceProxy(mutator, getDataID, handlerProvider, missingFieldHandlers) {
+  function RelayRecordSourceProxy(mutator, getDataID, handlerProvider, missingFieldHandlers, log) {
     this.__mutator = mutator;
     this._handlerProvider = handlerProvider || null;
     this._proxies = {};
@@ -22,6 +22,7 @@ var RelayRecordSourceProxy = /*#__PURE__*/function () {
     this._invalidatedStore = false;
     this._idsMarkedForInvalidation = new Set();
     this._missingFieldHandlers = missingFieldHandlers;
+    this._log = log !== null && log !== void 0 ? log : function (LogEvent) {};
   }
   var _proto = RelayRecordSourceProxy.prototype;
   _proto.publishSource = function publishSource(source, fieldPayloads) {

package/lib/mutations/createUpdatableProxy.js

@@ -71,11 +71,11 @@ function updateProxyFromSelections(mutableUpdatableProxy, updatableProxyRootReco
         case 'ClientEdgeToServerObject':
         case 'Defer':
         case 'ModuleImport':
-        case 'RelayLiveResolver':
         case 'RequiredField':
         case 'CatchField':
         case 'Stream':
         case 'RelayResolver':
+        case 'RelayLiveResolver':
           throw new Error('Encountered an unexpected ReaderSelection variant in RelayRecordSourceProxy. This indicates a bug in Relay.');
         default:
           selection.kind;

package/lib/mutations/validateMutation.js

@@ -72,13 +72,13 @@ if (process.env.NODE_ENV !== "production") {
         return validateModuleImport(context);
       case 'TypeDiscriminator':
         return validateAbstractKey(context, selection.abstractKey);
-      case 'RelayResolver':
-      case 'RelayLiveResolver':
       case 'ClientEdgeToClientObject':
       case 'LinkedHandle':
       case 'ScalarHandle':
       case 'Defer':
       case 'Stream':
+      case 'RelayResolver':
+      case 'RelayLiveResolver':
         {
           return;
         }

package/lib/network/RelayObservable.js

@@ -364,9 +364,7 @@ function _subscribe(source, observer) {
 function swallowError(_error, _isUncaughtThrownError) {}
 if (process.env.NODE_ENV !== "production") {
   RelayObservable.onUnhandledError(function (error, isUncaughtThrownError) {
-    if (typeof fail === 'function') {
-      fail(String(error));
-    } else if (isUncaughtThrownError) {
+    if (isUncaughtThrownError) {
       setTimeout(function () {
         throw error;
       });

package/lib/network/wrapNetworkWithLogObserver.js

@@ -3,7 +3,7 @@
 var generateID = require('../util/generateID');
 function wrapNetworkWithLogObserver(env, network) {
   return {
-    execute: function execute(params, variables, cacheConfig, uploadables) {
+    execute: function execute(params, variables, cacheConfig, uploadables, _, encryptedVariables, preprocessResponse, checkOperation) {
       var networkRequestId = generateID();
       var logObserver = {
         start: function start(subscription) {
@@ -49,7 +49,7 @@ function wrapNetworkWithLogObserver(env, network) {
           info: info
         });
       };
-      return network.execute(params, variables, cacheConfig, uploadables, logRequestInfo)["do"](logObserver);
+      return network.execute(params, variables, cacheConfig, uploadables, logRequestInfo, encryptedVariables, preprocessResponse, checkOperation)["do"](logObserver);
     }
   };
 }

package/lib/query/fetchQuery.js

@@ -21,7 +21,7 @@ function fetchQuery(environment, query, variables, options) {
   var operation = createOperationDescriptor(queryNode, variables, networkCacheConfig);
   var fetchPolicy = (_options$fetchPolicy = options === null || options === void 0 ? void 0 : options.fetchPolicy) !== null && _options$fetchPolicy !== void 0 ? _options$fetchPolicy : 'network-only';
   function readData(snapshot) {
-    handlePotentialSnapshotErrors(environment, snapshot.errorResponseFields);
+    handlePotentialSnapshotErrors(environment, snapshot.fieldErrors);
     return snapshot.data;
   }
   switch (fetchPolicy) {

package/lib/store/DataChecker.js

@@ -33,7 +33,7 @@ function check(getSourceForActor, getTargetForActor, defaultActorIdentifier, sel
   var dataID = selector.dataID,
     node = selector.node,
     variables = selector.variables;
-  var checker = new DataChecker(getSourceForActor, getTargetForActor, defaultActorIdentifier, variables, handlers, operationLoader, getDataID, shouldProcessClientComponents);
+  var checker = new DataChecker(getSourceForActor, getTargetForActor, defaultActorIdentifier, variables, handlers, operationLoader, getDataID, shouldProcessClientComponents, log);
   var result = checker.check(node, dataID);
   if (log != null) {
     log({
@@ -44,7 +44,7 @@ function check(getSourceForActor, getTargetForActor, defaultActorIdentifier, sel
   return result;
 }
 var DataChecker = /*#__PURE__*/function () {
-  function DataChecker(getSourceForActor, getTargetForActor, defaultActorIdentifier, variables, handlers, operationLoader, getDataID, shouldProcessClientComponents) {
+  function DataChecker(getSourceForActor, getTargetForActor, defaultActorIdentifier, variables, handlers, operationLoader, getDataID, shouldProcessClientComponents, log) {
     this._getSourceForActor = getSourceForActor;
     this._getTargetForActor = getTargetForActor;
     this._getDataID = getDataID;
@@ -61,6 +61,7 @@ var DataChecker = /*#__PURE__*/function () {
     this._recordWasMissing = false;
     this._variables = variables;
     this._shouldProcessClientComponents = shouldProcessClientComponents;
+    this._log = log;
   }
   var _proto = DataChecker.prototype;
   _proto._getMutatorAndRecordProxyForActor = function _getMutatorAndRecordProxyForActor(actorIdentifier) {
@@ -68,7 +69,7 @@ var DataChecker = /*#__PURE__*/function () {
     if (tuple == null) {
       var target = this._getTargetForActor(actorIdentifier);
       var mutator = new RelayRecordSourceMutator(this._getSourceForActor(actorIdentifier), target);
-      var recordSourceProxy = new RelayRecordSourceProxy(mutator, this._getDataID, undefined, this._handlers);
+      var recordSourceProxy = new RelayRecordSourceProxy(mutator, this._getDataID, undefined, this._handlers, this._log);
       tuple = [mutator, recordSourceProxy];
       this._mutatorRecordSourceProxyCache.set(actorIdentifier, tuple);
     }
@@ -275,8 +276,6 @@ var DataChecker = /*#__PURE__*/function () {
           _this2._traverseSelections(selection.fragment.selections, dataID);
           break;
         case 'RelayResolver':
-          _this2._checkResolver(selection, dataID);
-          break;
         case 'RelayLiveResolver':
           _this2._checkResolver(selection, dataID);
           break;

package/lib/store/OperationExecutor.js

@@ -111,6 +111,12 @@ var Executor = /*#__PURE__*/function () {
           variables: _this._operation.request.variables,
           cacheConfig: (_this$_operation$requ = _this._operation.request.cacheConfig) !== null && _this$_operation$requ !== void 0 ? _this$_operation$requ : {}
         });
+      },
+      unsubscribe: function unsubscribe() {
+        _this._log({
+          name: 'execute.unsubscribe',
+          executeId: _this._executeId
+        });
       }
     });
     if (!RelayFeatureFlags.PROCESS_OPTIMISTIC_UPDATE_BEFORE_SUBSCRIPTION && optimisticConfig != null) {
@@ -378,6 +384,7 @@ var Executor = /*#__PURE__*/function () {
       var payload = this._normalizeResponse(response, this._operation.root, ROOT_TYPE, {
         actorIdentifier: this._actorIdentifier,
         getDataID: this._getDataID,
+        log: this._log,
         path: [],
         shouldProcessClientComponents: this._shouldProcessClientComponents,
         treatMissingFieldsAsNull: treatMissingFieldsAsNull
@@ -459,6 +466,7 @@ var Executor = /*#__PURE__*/function () {
     }, selector, followupPayload.typeName, {
       actorIdentifier: this._actorIdentifier,
       getDataID: this._getDataID,
+      log: this._log,
       path: followupPayload.path,
       treatMissingFieldsAsNull: this._treatMissingFieldsAsNull,
       shouldProcessClientComponents: this._shouldProcessClientComponents
@@ -515,6 +523,7 @@ var Executor = /*#__PURE__*/function () {
       var relayPayload = _this8._normalizeResponse(payloadPart, _this8._operation.root, ROOT_TYPE, {
         actorIdentifier: _this8._actorIdentifier,
         getDataID: _this8._getDataID,
+        log: _this8._log,
         path: [],
         treatMissingFieldsAsNull: _this8._treatMissingFieldsAsNull,
         shouldProcessClientComponents: _this8._shouldProcessClientComponents
@@ -801,6 +810,7 @@ var Executor = /*#__PURE__*/function () {
     var relayPayload = this._normalizeResponse(response, placeholder.selector, placeholder.typeName, {
       actorIdentifier: this._actorIdentifier,
       getDataID: this._getDataID,
+      log: this._log,
       path: placeholder.path,
       treatMissingFieldsAsNull: this._treatMissingFieldsAsNull,
       shouldProcessClientComponents: this._shouldProcessClientComponents
@@ -903,6 +913,7 @@ var Executor = /*#__PURE__*/function () {
     var relayPayload = this._normalizeResponse(response, selector, typeName, {
       actorIdentifier: this._actorIdentifier,
       getDataID: this._getDataID,
+      log: this._log,
       path: [].concat((0, _toConsumableArray2["default"])(normalizationPath), [responseKey, String(itemIndex)]),
       treatMissingFieldsAsNull: this._treatMissingFieldsAsNull,
       shouldProcessClientComponents: this._shouldProcessClientComponents

package/lib/store/RelayModernEnvironment.js

@@ -14,13 +14,14 @@ var defaultGetDataID = require('./defaultGetDataID');
 var defaultRelayFieldLogger = require('./defaultRelayFieldLogger');
 var normalizeResponse = require('./normalizeResponse');
 var OperationExecutor = require('./OperationExecutor');
+var RelayModernStore = require('./RelayModernStore');
 var RelayPublishQueue = require('./RelayPublishQueue');
 var RelayRecordSource = require('./RelayRecordSource');
 var invariant = require('invariant');
 var RelayModernEnvironment = /*#__PURE__*/function () {
   function RelayModernEnvironment(config) {
     var _this = this;
-    var _config$log, _config$relayFieldLog, _config$UNSTABLE_defa, _config$getDataID, _config$missingFieldH, _config$handlerProvid, _config$scheduler, _config$isServer, _config$normalizeResp, _config$operationTrac;
+    var _config$store, _config$log, _config$relayFieldLog, _config$UNSTABLE_defa, _config$getDataID, _config$missingFieldH, _config$handlerProvid, _config$scheduler, _config$isServer, _config$normalizeResp, _config$operationTrac;
     this.configName = config.configName;
     this._treatMissingFieldsAsNull = config.treatMissingFieldsAsNull === true;
     var operationLoader = config.operationLoader;
@@ -29,6 +30,12 @@ var RelayModernEnvironment = /*#__PURE__*/function () {
         !(typeof operationLoader === 'object' && typeof operationLoader.get === 'function' && typeof operationLoader.load === 'function') ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernEnvironment: Expected `operationLoader` to be an object ' + 'with get() and load() functions, got `%s`.', operationLoader) : invariant(false) : void 0;
       }
     }
+    var store = (_config$store = config.store) !== null && _config$store !== void 0 ? _config$store : new RelayModernStore(new RelayRecordSource(), {
+      log: config.log,
+      operationLoader: config.operationLoader,
+      getDataID: config.getDataID,
+      shouldProcessClientComponents: config.shouldProcessClientComponents
+    });
     this.__log = (_config$log = config.log) !== null && _config$log !== void 0 ? _config$log : emptyFunction;
     this.relayFieldLogger = (_config$relayFieldLog = config.relayFieldLogger) !== null && _config$relayFieldLog !== void 0 ? _config$relayFieldLog : defaultRelayFieldLogger;
     this._defaultRenderPolicy = (_config$UNSTABLE_defa = config.UNSTABLE_defaultRenderPolicy) !== null && _config$UNSTABLE_defa !== void 0 ? _config$UNSTABLE_defa : 'partial';
@@ -37,9 +44,9 @@ var RelayModernEnvironment = /*#__PURE__*/function () {
     this._network = wrapNetworkWithLogObserver(this, config.network);
     this._getDataID = (_config$getDataID = config.getDataID) !== null && _config$getDataID !== void 0 ? _config$getDataID : defaultGetDataID;
     this._missingFieldHandlers = (_config$missingFieldH = config.missingFieldHandlers) !== null && _config$missingFieldH !== void 0 ? _config$missingFieldH : [];
-    this._publishQueue = new RelayPublishQueue(config.store, (_config$handlerProvid = config.handlerProvider) !== null && _config$handlerProvid !== void 0 ? _config$handlerProvid : RelayDefaultHandlerProvider, this._getDataID, this._missingFieldHandlers);
+    this._publishQueue = new RelayPublishQueue(store, (_config$handlerProvid = config.handlerProvider) !== null && _config$handlerProvid !== void 0 ? _config$handlerProvid : RelayDefaultHandlerProvider, this._getDataID, this._missingFieldHandlers, this.__log);
     this._scheduler = (_config$scheduler = config.scheduler) !== null && _config$scheduler !== void 0 ? _config$scheduler : null;
-    this._store = config.store;
+    this._store = store;
     this.options = config.options;
     this._isServer = (_config$isServer = config.isServer) !== null && _config$isServer !== void 0 ? _config$isServer : false;
     this._normalizeResponse = (_config$normalizeResp = config.normalizeResponse) !== null && _config$normalizeResp !== void 0 ? _config$normalizeResp : normalizeResponse;
@@ -199,7 +206,9 @@ var RelayModernEnvironment = /*#__PURE__*/function () {
     var operation = _ref.operation;
     return this._execute({
       createSource: function createSource() {
-        return _this7.getNetwork().execute(operation.request.node.params, operation.request.variables, operation.request.cacheConfig || {}, null);
+        return _this7.getNetwork().execute(operation.request.node.params, operation.request.variables, operation.request.cacheConfig || {}, null, undefined, undefined, undefined, function () {
+          return _this7.check(operation);
+        });
       },
       isClientPayload: false,
       operation: operation,

package/lib/store/RelayModernFragmentSpecResolver.js

@@ -132,14 +132,14 @@ var SelectorResolver = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_onChange", function (snapshot) {
       _this2._data = snapshot.data;
       _this2._isMissingData = snapshot.isMissingData;
-      _this2._errorResponseFields = snapshot.errorResponseFields;
+      _this2._fieldErrors = snapshot.fieldErrors;
       _this2._callback();
     });
     var _snapshot = environment.lookup(selector);
     this._callback = callback;
     this._data = _snapshot.data;
     this._isMissingData = _snapshot.isMissingData;
-    this._errorResponseFields = _snapshot.errorResponseFields;
+    this._fieldErrors = _snapshot.fieldErrors;
     this._environment = environment;
     this._rootIsQueryRenderer = rootIsQueryRenderer;
     this._selector = selector;
@@ -182,7 +182,7 @@ var SelectorResolver = /*#__PURE__*/function () {
         }
       }
     }
-    handlePotentialSnapshotErrors(this._environment, this._errorResponseFields);
+    handlePotentialSnapshotErrors(this._environment, this._fieldErrors);
     return this._data;
   };
   _proto2.setSelector = function setSelector(selector) {
@@ -193,7 +193,7 @@ var SelectorResolver = /*#__PURE__*/function () {
     var snapshot = this._environment.lookup(selector);
     this._data = recycleNodesInto(this._data, snapshot.data);
     this._isMissingData = snapshot.isMissingData;
-    this._errorResponseFields = snapshot.errorResponseFields;
+    this._fieldErrors = snapshot.fieldErrors;
     this._selector = selector;
     this._subscription = this._environment.subscribe(snapshot, this._onChange);
   };

package/lib/store/RelayModernStore.js

@@ -28,7 +28,7 @@ var DEFAULT_RELEASE_BUFFER_SIZE = 10;
 var RelayModernStore = /*#__PURE__*/function () {
   function RelayModernStore(source, options) {
     var _this = this;
-    var _options$gcReleaseBuf, _options$gcScheduler, _options$getDataID, _options$log, _options$operationLoa, _options$shouldProces, _options$treatMissing;
+    var _options$gcReleaseBuf, _options$shouldRetain, _options$gcScheduler, _options$getDataID, _options$log, _options$operationLoa, _options$shouldProces, _options$treatMissing;
     (0, _defineProperty2["default"])(this, "_gcStep", function () {
       if (_this._gcRun) {
         if (_this._gcRun.next().done) {
@@ -50,6 +50,7 @@ var RelayModernStore = /*#__PURE__*/function () {
     this._currentWriteEpoch = 0;
     this._gcHoldCounter = 0;
     this._gcReleaseBufferSize = (_options$gcReleaseBuf = options === null || options === void 0 ? void 0 : options.gcReleaseBufferSize) !== null && _options$gcReleaseBuf !== void 0 ? _options$gcReleaseBuf : DEFAULT_RELEASE_BUFFER_SIZE;
+    this._shouldRetainWithinTTL_EXPERIMENTAL = (_options$shouldRetain = options === null || options === void 0 ? void 0 : options.shouldRetainWithinTTL_EXPERIMENTAL) !== null && _options$shouldRetain !== void 0 ? _options$shouldRetain : false;
     this._gcRun = null;
     this._gcScheduler = (_options$gcScheduler = options === null || options === void 0 ? void 0 : options.gcScheduler) !== null && _options$gcScheduler !== void 0 ? _options$gcScheduler : resolveImmediate;
     this._getDataID = (_options$getDataID = options === null || options === void 0 ? void 0 : options.getDataID) !== null && _options$getDataID !== void 0 ? _options$getDataID : defaultGetDataID;
@@ -67,10 +68,10 @@ var RelayModernStore = /*#__PURE__*/function () {
     this._resolverCache = new LiveResolverCache(function () {
       return _this._getMutableRecordSource();
     }, this);
-    this._storeSubscriptions = new RelayStoreSubscriptions(options === null || options === void 0 ? void 0 : options.log, this._resolverCache);
+    this._resolverContext = options === null || options === void 0 ? void 0 : options.resolverContext;
+    this._storeSubscriptions = new RelayStoreSubscriptions(options === null || options === void 0 ? void 0 : options.log, this._resolverCache, this._resolverContext);
     this._updatedRecordIDs = new Set();
     this._shouldProcessClientComponents = (_options$shouldProces = options === null || options === void 0 ? void 0 : options.shouldProcessClientComponents) !== null && _options$shouldProces !== void 0 ? _options$shouldProces : false;
-    this._resolverContext = options === null || options === void 0 ? void 0 : options.resolverContext;
     this._treatMissingFieldsAsNull = (_options$treatMissing = options === null || options === void 0 ? void 0 : options.treatMissingFieldsAsNull) !== null && _options$treatMissing !== void 0 ? _options$treatMissing : false;
     this._actorIdentifier = options === null || options === void 0 ? void 0 : options.actorIdentifier;
     initializeRecordSource(this._recordSource);
@@ -150,13 +151,17 @@ var RelayModernStore = /*#__PURE__*/function () {
         var _queryCacheExpirationTime = _this2._queryCacheExpirationTime;
         var rootEntryIsStale = rootEntry.fetchTime != null && _queryCacheExpirationTime != null && rootEntry.fetchTime <= Date.now() - _queryCacheExpirationTime;
         if (rootEntryIsStale) {
-          _this2._roots["delete"](id);
+          if (!_this2._shouldRetainWithinTTL_EXPERIMENTAL) {
+            _this2._roots["delete"](id);
+          }
           _this2.scheduleGC();
         } else {
           _this2._releaseBuffer.push(id);
           if (_this2._releaseBuffer.length > _this2._gcReleaseBufferSize) {
             var _id = _this2._releaseBuffer.shift();
-            _this2._roots["delete"](_id);
+            if (!_this2._shouldRetainWithinTTL_EXPERIMENTAL) {
+              _this2._roots["delete"](_id);
+            }
             _this2.scheduleGC();
           }
         }
@@ -414,6 +419,9 @@ var RelayModernStore = /*#__PURE__*/function () {
     while (!gcRun.next().done) {}
   };
   _proto._collect = function* _collect() {
+    if (this._shouldRetainWithinTTL_EXPERIMENTAL && this._queryCacheExpirationTime == null) {
+      return;
+    }
     var log = this.__log;
     top: while (true) {
       if (log != null) {
@@ -423,11 +431,25 @@ var RelayModernStore = /*#__PURE__*/function () {
       }
       var startEpoch = this._currentWriteEpoch;
       var references = new Set();
-      var _iterator2 = (0, _createForOfIteratorHelper2["default"])(this._roots.values()),
+      var _iterator2 = (0, _createForOfIteratorHelper2["default"])(this._roots.entries()),
         _step2;
       try {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var operation = _step2.value.operation;
+          var _step2$value = _step2.value,
+            _dataID = _step2$value[0],
+            _step2$value$ = _step2$value[1],
+            operation = _step2$value$.operation,
+            refCount = _step2$value$.refCount,
+            fetchTime = _step2$value$.fetchTime;
+          if (this._shouldRetainWithinTTL_EXPERIMENTAL) {
+            var _queryCacheExpirationTime = this._queryCacheExpirationTime;
+            !(_queryCacheExpirationTime != null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'Query cache expiration time should be non-null if executing GC') : invariant(false) : void 0;
+            var recordHasExpired = fetchTime == null || fetchTime <= Date.now() - _queryCacheExpirationTime;
+            var recordShouldBeCollected = recordHasExpired && refCount === 0 && !this._releaseBuffer.includes(_dataID);
+            if (recordShouldBeCollected) {
+              continue;
+            }
+          }
           var selector = operation.root;
           RelayReferenceMarker.mark(this._recordSource, selector, references, this._operationLoader, this._shouldProcessClientComponents);
           yield;
@@ -445,21 +467,20 @@ var RelayModernStore = /*#__PURE__*/function () {
       } finally {
         _iterator2.f();
       }
-      if (references.size === 0) {
-        this._recordSource.clear();
-      } else {
-        var storeIDs = this._recordSource.getRecordIDs();
-        for (var ii = 0; ii < storeIDs.length; ii++) {
-          var dataID = storeIDs[ii];
-          if (!references.has(dataID)) {
-            var record = this._recordSource.get(dataID);
-            if (record != null) {
-              var maybeResolverSubscription = RelayModernRecord.getValue(record, RELAY_RESOLVER_LIVE_STATE_SUBSCRIPTION_KEY);
-              if (maybeResolverSubscription != null) {
-                maybeResolverSubscription();
-              }
+      var storeIDs = this._recordSource.getRecordIDs();
+      for (var ii = 0; ii < storeIDs.length; ii++) {
+        var dataID = storeIDs[ii];
+        if (!references.has(dataID)) {
+          var record = this._recordSource.get(dataID);
+          if (record != null) {
+            var maybeResolverSubscription = RelayModernRecord.getValue(record, RELAY_RESOLVER_LIVE_STATE_SUBSCRIPTION_KEY);
+            if (maybeResolverSubscription != null) {
+              maybeResolverSubscription();
             }
-            this._recordSource.remove(dataID);
+          }
+          this._recordSource.remove(dataID);
+          if (this._shouldRetainWithinTTL_EXPERIMENTAL) {
+            this._roots["delete"](dataID);
           }
         }
       }
@@ -476,6 +497,7 @@ var RelayModernStore = /*#__PURE__*/function () {
     return {
       path: path,
       getDataID: this._getDataID,
+      log: this.__log,
       treatMissingFieldsAsNull: this._treatMissingFieldsAsNull,
       shouldProcessClientComponents: this._shouldProcessClientComponents,
       actorIdentifier: this._actorIdentifier

package/lib/store/RelayPublishQueue.js

@@ -4,6 +4,7 @@ var _global$ErrorUtils$ap, _global$ErrorUtils;
 var RelayRecordSourceMutator = require('../mutations/RelayRecordSourceMutator');
 var RelayRecordSourceProxy = require('../mutations/RelayRecordSourceProxy');
 var RelayRecordSourceSelectorProxy = require('../mutations/RelayRecordSourceSelectorProxy');
+var RelayFeatureFlags = require('../util/RelayFeatureFlags');
 var RelayReader = require('./RelayReader');
 var RelayRecordSource = require('./RelayRecordSource');
 var invariant = require('invariant');
@@ -13,7 +14,7 @@ var applyWithGuard = (_global$ErrorUtils$ap = _global === null || _global === vo
   return callback.apply(context, args);
 };
 var RelayPublishQueue = /*#__PURE__*/function () {
-  function RelayPublishQueue(store, handlerProvider, getDataID, missingFieldHandlers) {
+  function RelayPublishQueue(store, handlerProvider, getDataID, missingFieldHandlers, log) {
     this._hasStoreSnapshot = false;
     this._handlerProvider = handlerProvider || null;
     this._pendingBackupRebase = false;
@@ -24,6 +25,7 @@ var RelayPublishQueue = /*#__PURE__*/function () {
     this._gcHold = null;
     this._getDataID = getDataID;
     this._missingFieldHandlers = missingFieldHandlers;
+    this._log = log;
   }
   var _proto = RelayPublishQueue.prototype;
   _proto.applyUpdate = function applyUpdate(updater) {
@@ -69,15 +71,11 @@ var RelayPublishQueue = /*#__PURE__*/function () {
   _proto.run = function run(sourceOperation) {
     var runWillClearGcHold = this._appliedOptimisticUpdates === 0 && !!this._gcHold;
     var runIsANoop = !this._pendingBackupRebase && this._pendingOptimisticUpdates.size === 0 && !runWillClearGcHold;
-    if (process.env.NODE_ENV !== "production") {
-      process.env.NODE_ENV !== "production" ? warning(!runIsANoop, 'RelayPublishQueue.run was called, but the call would have been a noop.') : void 0;
-      process.env.NODE_ENV !== "production" ? warning(this._isRunning !== true, 'A store update was detected within another store update. Please ' + "make sure new store updates aren't being executed within an " + 'updater function for a different update.') : void 0;
-      this._isRunning = true;
-    }
+    process.env.NODE_ENV !== "production" ? warning(!runIsANoop, 'RelayPublishQueue.run was called, but the call would have been a noop.') : void 0;
+    RelayFeatureFlags.DISALLOW_NESTED_UPDATES ? !(this._isRunning !== true) ? process.env.NODE_ENV !== "production" ? invariant(false, 'A store update was detected within another store update. Please ' + "make sure new store updates aren't being executed within an " + 'updater function for a different update.') : invariant(false) : void 0 : process.env.NODE_ENV !== "production" ? warning(this._isRunning !== true, 'A store update was detected within another store update. Please ' + "make sure new store updates aren't being executed within an " + 'updater function for a different update.') : void 0;
+    this._isRunning = true;
     if (runIsANoop) {
-      if (process.env.NODE_ENV !== "production") {
-        this._isRunning = false;
-      }
+      this._isRunning = false;
       return [];
     }
     if (this._pendingBackupRebase) {
@@ -105,9 +103,7 @@ var RelayPublishQueue = /*#__PURE__*/function () {
         this._gcHold = null;
       }
     }
-    if (process.env.NODE_ENV !== "production") {
-      this._isRunning = false;
-    }
+    this._isRunning = false;
     return this._store.notify(sourceOperation, invalidatedStore);
   };
   _proto._publishSourceFromPayload = function _publishSourceFromPayload(pendingPayload) {
@@ -118,7 +114,7 @@ var RelayPublishQueue = /*#__PURE__*/function () {
     var source = payload.source,
       fieldPayloads = payload.fieldPayloads;
     var mutator = new RelayRecordSourceMutator(this._store.getSource(), source);
-    var recordSourceProxy = new RelayRecordSourceProxy(mutator, this._getDataID, this._handlerProvider, this._missingFieldHandlers);
+    var recordSourceProxy = new RelayRecordSourceProxy(mutator, this._getDataID, this._handlerProvider, this._missingFieldHandlers, this._log);
     if (fieldPayloads && fieldPayloads.length) {
       fieldPayloads.forEach(function (fieldPayload) {
         var handler = _this._handlerProvider && _this._handlerProvider(fieldPayload.handle);
@@ -154,7 +150,7 @@ var RelayPublishQueue = /*#__PURE__*/function () {
         var updater = data.updater;
         var sink = RelayRecordSource.create();
         var mutator = new RelayRecordSourceMutator(_this2._store.getSource(), sink);
-        var recordSourceProxy = new RelayRecordSourceProxy(mutator, _this2._getDataID, _this2._handlerProvider, _this2._missingFieldHandlers);
+        var recordSourceProxy = new RelayRecordSourceProxy(mutator, _this2._getDataID, _this2._handlerProvider, _this2._missingFieldHandlers, _this2._log);
         applyWithGuard(updater, null, [recordSourceProxy], null, 'RelayPublishQueue:commitData');
         invalidatedStore = invalidatedStore || recordSourceProxy.isStoreMarkedForInvalidation();
         var idsMarkedForInvalidation = recordSourceProxy.getIDsMarkedForInvalidation();
@@ -168,7 +164,7 @@ var RelayPublishQueue = /*#__PURE__*/function () {
     var _this3 = this;
     var sink = RelayRecordSource.create();
     var mutator = new RelayRecordSourceMutator(this._store.getSource(), sink);
-    var recordSourceProxy = new RelayRecordSourceProxy(mutator, this._getDataID, this._handlerProvider, this._missingFieldHandlers);
+    var recordSourceProxy = new RelayRecordSourceProxy(mutator, this._getDataID, this._handlerProvider, this._missingFieldHandlers, this._log);
     var processUpdate = function processUpdate(optimisticUpdate) {
       if (optimisticUpdate.storeUpdater) {
         var storeUpdater = optimisticUpdate.storeUpdater;