relay-runtime 20.1.1 → 21.0.0

package/store/RelayStoreTypes.js.flow

@@ -30,6 +30,7 @@ import type {
   NormalizationRootNode,
   NormalizationScalarField,
   NormalizationSelectableNode,
+  NormalizationSelection,
 } from '../util/NormalizationNode';
 import type {
   ReaderClientEdgeToServerObject,
@@ -75,7 +76,7 @@ export type FragmentMap = {[key: string]: ReaderFragment, ...};
 /**
  * The results of a selector given a store/RecordSource.
  */
-export type SelectorData = {[key: string]: mixed, ...};
+export type SelectorData = {[key: string]: unknown, ...};
 
 export type SingularReaderSelector = {
   +kind: 'SingularReaderSelector',
@@ -91,7 +92,7 @@ export type ReaderSelector = SingularReaderSelector | PluralReaderSelector;
 
 export type PluralReaderSelector = {
   +kind: 'PluralReaderSelector',
-  +selectors: $ReadOnlyArray<SingularReaderSelector>,
+  +selectors: ReadonlyArray<SingularReaderSelector>,
 };
 
 export type FieldErrorType =
@@ -132,7 +133,7 @@ export type ClientEdgeTraversalInfo = {
 };
 
 export type ClientEdgeTraversalPath =
-  $ReadOnlyArray<ClientEdgeTraversalInfo | null>;
+  ReadonlyArray<ClientEdgeTraversalInfo | null>;
 
 export type MissingClientEdgeRequestInfo = {
   +request: ConcreteRequest,
@@ -145,8 +146,8 @@ export type MissingClientEdgeRequestInfo = {
 export type Snapshot = {
   +data: ?SelectorData,
   +isMissingData: boolean,
-  +missingLiveResolverFields?: $ReadOnlyArray<DataID>,
-  +missingClientEdges: null | $ReadOnlyArray<MissingClientEdgeRequestInfo>,
+  +missingLiveResolverFields?: ReadonlyArray<DataID>,
+  +missingClientEdges: null | ReadonlyArray<MissingClientEdgeRequestInfo>,
   +seenRecords: DataIDSet,
   +selector: SingularReaderSelector,
   +fieldErrors: ?FieldErrors,
@@ -170,7 +171,7 @@ export type OperationDescriptor = {
 /**
  * Arbitrary data e.g. received by a container as props.
  */
-export type Props = {[key: string]: mixed, ...};
+export type Props = {[key: string]: unknown, ...};
 
 /**
  * The type of the `relay` property set on React context by the React/Relay
@@ -187,7 +188,7 @@ export type RelayContext = {
  * The results of reading the results of a FragmentMap given some input
  * `Props`.
  */
-export type FragmentSpecResults = {[key: string]: mixed, ...};
+export type FragmentSpecResults = {[key: string]: unknown, ...};
 
 /**
  * A utility for resolving and subscribing to the results of a fragment spec
@@ -258,7 +259,7 @@ export interface MutableRecordSource extends RecordSource {
 }
 
 export type CheckOptions = {
-  +handlers: $ReadOnlyArray<MissingFieldHandler>,
+  +handlers: ReadonlyArray<MissingFieldHandler>,
   +defaultActorIdentifier: ActorIdentifier,
   +getTargetForActor: (actorIdentifier: ActorIdentifier) => MutableRecordSource,
   +getSourceForActor: (actorIdentifier: ActorIdentifier) => RecordSource,
@@ -306,7 +307,7 @@ export interface Store {
   notify(
     sourceOperation?: OperationDescriptor,
     invalidateStore?: boolean,
-  ): $ReadOnlyArray<RequestDescriptor>;
+  ): ReadonlyArray<RequestDescriptor>;
 
   /**
    * Publish new information (e.g. from the network) to the store, updating its
@@ -354,7 +355,7 @@ export interface Store {
    * Will return an opaque snapshot of the current invalidation state of
    * the data ids that were provided.
    */
-  lookupInvalidationState(dataIDs: $ReadOnlyArray<DataID>): InvalidationState;
+  lookupInvalidationState(dataIDs: ReadonlyArray<DataID>): InvalidationState;
 
   /**
    * Given the previous invalidation state for those
@@ -422,6 +423,16 @@ export interface StoreSubscriptions {
     sourceOperation?: OperationDescriptor,
   ): void;
 
+  /**
+   * Same as `updateSubscriptions`, except it only notifies subscriptions with stale snapshots.
+   */
+  updateStaleSubscriptions(
+    source: RecordSource,
+    updatedRecordIDs: DataIDSet,
+    updatedOwners: Array<RequestDescriptor>,
+    sourceOperation?: OperationDescriptor,
+  ): void;
+
   /**
    * returns the number of subscriptions
    */
@@ -461,23 +472,23 @@ export interface RecordProxy {
     args?: ?Variables,
   ): RecordProxy;
   getType(): string;
-  getValue(name: string, args?: ?Variables): mixed;
-  getErrors(name: string, args?: ?Variables): ?$ReadOnlyArray<TRelayFieldError>;
+  getValue(name: string, args?: ?Variables): unknown;
+  getErrors(name: string, args?: ?Variables): ?ReadonlyArray<TRelayFieldError>;
   setLinkedRecord(
     record: RecordProxy,
     name: string,
     args?: ?Variables,
   ): RecordProxy;
   setLinkedRecords(
-    records: $ReadOnlyArray<?RecordProxy>,
+    records: ReadonlyArray<?RecordProxy>,
     name: string,
     args?: ?Variables,
   ): RecordProxy;
   setValue(
-    value: mixed,
+    value: unknown,
     name: string,
     args?: ?Variables,
-    errors?: ?$ReadOnlyArray<TRelayFieldError>,
+    errors?: ?ReadonlyArray<TRelayFieldError>,
   ): RecordProxy;
   invalidateRecord(): void;
 }
@@ -487,7 +498,7 @@ export interface ReadOnlyRecordProxy {
   getLinkedRecord(name: string, args?: ?Variables): ?RecordProxy;
   getLinkedRecords(name: string, args?: ?Variables): ?Array<?RecordProxy>;
   getType(): string;
-  getValue(name: string, args?: ?Variables): mixed;
+  getValue(name: string, args?: ?Variables): unknown;
 }
 
 /**
@@ -520,11 +531,11 @@ export interface RecordSourceProxy {
   get(dataID: DataID): ?RecordProxy;
   getRoot(): RecordProxy;
   invalidateStore(): void;
-  readUpdatableQuery<TVariables: Variables, TData>(
+  readUpdatableQuery<TVariables extends Variables, TData>(
     query: UpdatableQuery<TVariables, TData>,
     variables: TVariables,
   ): UpdatableData<TData>;
-  readUpdatableFragment<TFragmentType: FragmentType, TData>(
+  readUpdatableFragment<TFragmentType extends FragmentType, TData>(
     fragment: UpdatableFragment<TFragmentType, TData>,
     fragmentReference: HasUpdatableSpread<TFragmentType>,
   ): UpdatableData<TData>;
@@ -547,12 +558,35 @@ export interface RecordSourceSelectorProxy extends RecordSourceProxy {
 
 export type SuspenseFragmentLogEvent = {
   +name: 'suspense.fragment',
-  +data: mixed,
+  +data: unknown,
   +fragment: ReaderFragment,
   +isRelayHooks: boolean,
   +isMissingData: boolean,
   +isPromiseCached: boolean,
-  +pendingOperations: $ReadOnlyArray<RequestDescriptor>,
+  +pendingOperations: ReadonlyArray<RequestDescriptor>,
+};
+
+export type SuspenseResolverLogEvent = {
+  +name: 'suspense.resolver',
+  +fragment: ReaderFragment,
+  +fragmentOwner: RequestDescriptor,
+  +isMount: boolean,
+  +suspendingLiveResolvers: ReadonlyArray<DataID>,
+};
+
+export type SuspenseClientEdgeLogEvent = {
+  +name: 'suspense.client_edge',
+  +fragment: ReaderFragment,
+  +fragmentOwner: RequestDescriptor,
+  +isMount: boolean,
+};
+
+export type SuspenseMissingDataLogEvent = {
+  +name: 'suspense.missing_data',
+  +fragment: ReaderFragment,
+  +fragmentOwner: RequestDescriptor,
+  +isMount: boolean,
+  +pendingOperations: ReadonlyArray<RequestDescriptor>,
 };
 
 export type SuspenseQueryLogEvent = {
@@ -571,7 +605,7 @@ export type QueryResourceFetchLogEvent = {
   +resourceID: number,
   +operation: OperationDescriptor,
   // value from ProfilerContext
-  +profilerContext: mixed,
+  +profilerContext: unknown,
   // FetchPolicy from Relay Hooks
   +fetchPolicy: string,
   // RenderPolicy from Relay Hooks
@@ -584,14 +618,14 @@ export type QueryResourceRetainLogEvent = {
   +name: 'queryresource.retain',
   +resourceID: number,
   // value from ProfilerContext
-  +profilerContext: mixed,
+  +profilerContext: unknown,
 };
 
 export type FragmentResourceMissingDataLogEvent = {
   // Indicates FragmentResource is going to return a result that is missing
   // data.
   +name: 'fragmentresource.missing_data',
-  +data: mixed,
+  +data: unknown,
   +fragment: ReaderFragment,
   +isRelayHooks: boolean,
   // Are we reading this result from the fragment resource cache?
@@ -605,13 +639,13 @@ export type PendingOperationFoundLogEvent = {
   +name: 'pendingoperation.found',
   +fragment: ReaderFragment,
   +fragmentOwner: RequestDescriptor,
-  +pendingOperations: $ReadOnlyArray<RequestDescriptor>,
+  +pendingOperations: ReadonlyArray<RequestDescriptor>,
 };
 
 export type NetworkInfoLogEvent = {
   +name: 'network.info',
   +networkRequestId: number,
-  +info: mixed,
+  +info: unknown,
 };
 
 export type NetworkStartLogEvent = {
@@ -709,6 +743,14 @@ export type StoreDataCheckerEndEvent = {
   +selector: NormalizationSelector,
 };
 
+export type StoreDataCheckerMissingEvent = {
+  +name: 'store.datachecker.missing',
+  +kind: 'scalar' | 'linked' | 'pluralLinked' | 'unknown_record',
+  +dataID: DataID,
+  +fieldName?: string,
+  +storageKey?: string,
+};
+
 export type StorePublishLogEvent = {
   +name: 'store.publish',
   +source: RecordSource,
@@ -746,6 +788,16 @@ export type StoreGcEndEvent = {
   +references: DataIDSet,
 };
 
+export type StoreBatchStartLogEvent = {
+  +name: 'store.batch.start',
+};
+
+export type StoreBatchCompleteLogEvent = {
+  +name: 'store.batch.complete',
+  +sourceOperations: Array<OperationDescriptor>,
+  +invalidateStore: boolean,
+};
+
 export type StoreNotifyStartLogEvent = {
   +name: 'store.notify.start',
   +sourceOperation: ?OperationDescriptor,
@@ -767,9 +819,20 @@ export type StoreNotifySubscriptionLogEvent = {
   +nextSnapshot: Snapshot,
 };
 
+export type ReaderReadFragmentSpread = {
+  +name: 'reader.fragmentSpread',
+  fragmentName: string,
+  data: SelectorData,
+};
+
+export type ReaderRead = {
+  name: 'reader.read',
+  selector: SingularReaderSelector,
+};
+
 export type EntrypointRootConsumeLogEvent = {
   +name: 'entrypoint.root.consume',
-  +profilerContext: mixed,
+  +profilerContext: unknown,
   +rootModuleID: string,
 };
 
@@ -796,8 +859,20 @@ export type IdCollisionTypenameLogEvent = {
   +new_typename: string,
 };
 
+export type FetchQueryFetchLogEvent = {
+  +name: 'fetchquery.fetch',
+  +operation: OperationDescriptor,
+  // FetchPolicy from Relay Hooks
+  +fetchPolicy: string,
+  +queryAvailability: OperationAvailability,
+  +shouldFetch: boolean,
+};
+
 export type LogEvent =
   | SuspenseFragmentLogEvent
+  | SuspenseResolverLogEvent
+  | SuspenseClientEdgeLogEvent
+  | SuspenseMissingDataLogEvent
   | SuspenseQueryLogEvent
   | QueryResourceFetchLogEvent
   | QueryResourceRetainLogEvent
@@ -821,6 +896,7 @@ export type LogEvent =
   | ExecuteNormalizeEnd
   | StoreDataCheckerStartEvent
   | StoreDataCheckerEndEvent
+  | StoreDataCheckerMissingEvent
   | StorePublishLogEvent
   | StoreSnapshotLogEvent
   | StoreLookupStartEvent
@@ -829,16 +905,21 @@ export type LogEvent =
   | StoreGcStartEvent
   | StoreGcInterruptedEvent
   | StoreGcEndEvent
+  | StoreBatchStartLogEvent
+  | StoreBatchCompleteLogEvent
   | StoreNotifyStartLogEvent
   | StoreNotifyCompleteLogEvent
   | StoreNotifySubscriptionLogEvent
   | EntrypointRootConsumeLogEvent
   | LiveResolverBatchStartLogEvent
   | LiveResolverBatchEndLogEvent
-  | UseFragmentSubscriptionMissedUpdates;
+  | UseFragmentSubscriptionMissedUpdates
+  | FetchQueryFetchLogEvent
+  | ReaderRead
+  | ReaderReadFragmentSpread;
 
 export type LogFunction = LogEvent => void;
-export type LogRequestInfoFunction = mixed => void;
+export type LogRequestInfoFunction = unknown => void;
 
 /**
  * The public API of Relay core. Represents an encapsulated environment with its
@@ -848,7 +929,7 @@ export interface IEnvironment {
   /**
    * Extra information attached to the environment instance
    */
-  +options: mixed;
+  +options: unknown;
 
   /**
    * **UNSTABLE** Event based logging API thats scoped to the environment.
@@ -905,7 +986,7 @@ export interface IEnvironment {
    * Apply an optimistic mutation response and/or updater. The mutation can be
    * reverted by calling `dispose()` on the returned value.
    */
-  applyMutation<TMutation: MutationParameters>(
+  applyMutation<TMutation extends MutationParameters>(
     optimisticConfig: OptimisticResponseConfig<TMutation>,
   ): Disposable;
 
@@ -979,7 +1060,7 @@ export interface IEnvironment {
    * Note: Observables are lazy, so calling this method will do nothing until
    * the result is subscribed to: environment.executeSubscription({...}).subscribe({...}).
    */
-  executeSubscription<TMutation: MutationParameters>(config: {
+  executeSubscription<TMutation extends MutationParameters>(config: {
     operation: OperationDescriptor,
     updater?: ?SelectorStoreUpdater<TMutation['response']>,
   }): RelayObservable<GraphQLResponse>;
@@ -994,7 +1075,7 @@ export interface IEnvironment {
    * the result is subscribed to:
    * environment.executeMutation({...}).subscribe({...}).
    */
-  executeMutation<TMutation: MutationParameters>(
+  executeMutation<TMutation extends MutationParameters>(
     config: ExecuteMutationConfig<TMutation>,
   ): RelayObservable<GraphQLResponse>;
 
@@ -1041,8 +1122,8 @@ export interface IEnvironment {
  */
 export type ModuleImportPointer = {
   +__fragmentPropName: ?string,
-  +__module_component: mixed,
-  +$fragmentSpreads: mixed,
+  +__module_component: unknown,
+  +$fragmentSpreads: unknown,
   ...
 };
 
@@ -1056,7 +1137,7 @@ export type DataIDSet = Set<DataID>;
  * A function that updates a store (via a proxy) given the results of a "handle"
  * field payload.
  */
-export type Handler = $ReadOnly<{
+export type Handler = Readonly<{
   update: (store: RecordSourceProxy, fieldPayload: HandleFieldPayload) => void,
   ...
 }>;
@@ -1101,11 +1182,11 @@ export type HandleFieldPayload = {
  */
 export type ModuleImportPayload = {
   +kind: 'ModuleImportPayload',
-  +args: ?$ReadOnlyArray<NormalizationArgument>,
+  +args: ?ReadonlyArray<NormalizationArgument>,
   +data: PayloadData,
   +dataID: DataID,
-  +operationReference: mixed,
-  +path: $ReadOnlyArray<string>,
+  +operationReference: unknown,
+  +path: ReadonlyArray<string>,
   +typeName: string,
   +variables: Variables,
   +actorIdentifier: ?ActorIdentifier,
@@ -1131,7 +1212,7 @@ export type ActorPayload = {
   +data: PayloadData,
   +dataID: DataID,
   +node: NormalizationLinkedField,
-  +path: $ReadOnlyArray<string>,
+  +path: ReadonlyArray<string>,
   +typeName: string,
   +variables: Variables,
   +actorIdentifier: ActorIdentifier,
@@ -1151,7 +1232,7 @@ export type DeferPlaceholder = {
   +kind: 'defer',
   +data: PayloadData,
   +label: string,
-  +path: $ReadOnlyArray<string>,
+  +path: ReadonlyArray<string>,
   +selector: NormalizationSelector,
   +typeName: string,
   +actorIdentifier: ?ActorIdentifier,
@@ -1159,7 +1240,7 @@ export type DeferPlaceholder = {
 export type StreamPlaceholder = {
   +kind: 'stream',
   +label: string,
-  +path: $ReadOnlyArray<string>,
+  +path: ReadonlyArray<string>,
   +parentID: DataID,
   +node: NormalizationSelectableNode,
   +variables: Variables,
@@ -1186,12 +1267,12 @@ export type OperationLoader = {
    * Synchronously load an operation, returning either the node or null if it
    * cannot be resolved synchronously.
    */
-  get(reference: mixed): ?NormalizationRootNode,
+  get(reference: unknown): ?NormalizationRootNode,
 
   /**
    * Asynchronously load an operation.
    */
-  load(reference: mixed): Promise<?NormalizationRootNode>,
+  load(reference: unknown): Promise<?NormalizationRootNode>,
 };
 
 /**
@@ -1214,7 +1295,7 @@ export type SelectorStoreUpdater<-TMutationResponse> = (
  * A set of configs that can be used to apply an optimistic update into the
  * store.
  */
-export type OptimisticUpdate<TMutation: MutationParameters> =
+export type OptimisticUpdate<TMutation extends MutationParameters> =
   | OptimisticUpdateFunction
   | OptimisticUpdateRelayPayload<TMutation>;
 
@@ -1222,13 +1303,14 @@ export type OptimisticUpdateFunction = {
   +storeUpdater: StoreUpdater,
 };
 
-export type OptimisticUpdateRelayPayload<TMutation: MutationParameters> = {
-  +operation: OperationDescriptor,
-  +payload: RelayResponsePayload,
-  +updater: ?SelectorStoreUpdater<TMutation['response']>,
-};
+export type OptimisticUpdateRelayPayload<TMutation extends MutationParameters> =
+  {
+    +operation: OperationDescriptor,
+    +payload: RelayResponsePayload,
+    +updater: ?SelectorStoreUpdater<TMutation['response']>,
+  };
 
-export type OptimisticResponseConfig<TMutation: MutationParameters> = {
+export type OptimisticResponseConfig<TMutation extends MutationParameters> = {
   +operation: OperationDescriptor,
   +response: ?PayloadData,
   +updater: ?SelectorStoreUpdater<TMutation['response']>,
@@ -1246,7 +1328,7 @@ export type MissingFieldHandler =
         parentRecord: ?ReadOnlyRecordProxy,
         args: Variables,
         store: ReadOnlyRecordSourceProxy,
-      ) => mixed,
+      ) => unknown,
     }
   | {
       kind: 'linked',
@@ -1289,7 +1371,7 @@ export type MissingExpectedDataLogEvent = {
   +owner: string,
   fieldPath: string, // Purposefully mutable to allow lazy construction in RelayReader
   // To populate this, you should pass the value to a ReactRelayLoggingContext
-  +uiContext: mixed | void,
+  +uiContext: unknown | void,
 };
 
 /**
@@ -1318,7 +1400,7 @@ export type MissingExpectedDataThrowEvent = {
   fieldPath: string, // Purposefully mutable to allow lazy construction in RelayReader
   +handled: boolean,
   // To populate this, you should pass the value to a ReactRelayLoggingContext
-  +uiContext: mixed | void,
+  +uiContext: unknown | void,
 };
 
 /**
@@ -1330,7 +1412,7 @@ export type MissingRequiredFieldLogEvent = {
   +owner: string,
   fieldPath: string, // Purposefully mutable to allow lazy construction in RelayReader
   // To populate this, you should pass the value to a ReactRelayLoggingContext
-  +uiContext: mixed | void,
+  +uiContext: unknown | void,
 };
 
 /**
@@ -1350,7 +1432,7 @@ export type MissingRequiredFieldThrowEvent = {
   fieldPath: string, // Purposefully mutable to allow lazy construction in RelayReader
   +handled: boolean,
   // To populate this, you should pass the value to a ReactRelayLoggingContext
-  +uiContext: mixed | void,
+  +uiContext: unknown | void,
 };
 
 /**
@@ -1373,7 +1455,7 @@ export type RelayResolverErrorEvent = {
   +shouldThrow: boolean,
   +handled: boolean,
   // To populate this, you should pass the value to a ReactRelayLoggingContext
-  +uiContext: mixed | void,
+  +uiContext: unknown | void,
 };
 
 /**
@@ -1401,7 +1483,7 @@ export type RelayFieldPayloadErrorEvent = {
   +shouldThrow: boolean,
   +handled: boolean,
   // To populate this, you should pass the value to a ReactRelayLoggingContext
-  +uiContext: mixed | void,
+  +uiContext: unknown | void,
 };
 
 /**
@@ -1428,14 +1510,21 @@ export type RelayResponsePayload = {
   +fieldPayloads: ?Array<HandleFieldPayload>,
   +incrementalPlaceholders: ?Array<IncrementalDataPlaceholder>,
   +followupPayloads: ?Array<FollowupPayload>,
-  +source: MutableRecordSource,
   +isFinal: boolean,
+  +isPreNormalized?: boolean,
+  +s2cExecutions?: ?ReadonlyArray<{
+    +recordID: DataID,
+    +selections: ReadonlyArray<NormalizationSelection>,
+    +typeName: string,
+  }>,
+  +source: MutableRecordSource,
+  +storeUpdater?: ?(store: RecordSourceProxy) => void,
 };
 
 /**
  * Configuration on the executeMutation(...).
  */
-export type ExecuteMutationConfig<TMutation: MutationParameters> = {
+export type ExecuteMutationConfig<TMutation extends MutationParameters> = {
   operation: OperationDescriptor,
   optimisticUpdater?: ?SelectorStoreUpdater<TMutation['response']>,
   optimisticResponse?: ?Object,
@@ -1450,14 +1539,14 @@ export interface PublishQueue {
   /**
    * Schedule applying an optimistic updates on the next `run()`.
    */
-  applyUpdate<TMutation: MutationParameters>(
+  applyUpdate<TMutation extends MutationParameters>(
     updater: OptimisticUpdate<TMutation>,
   ): void;
 
   /**
    * Schedule reverting an optimistic updates on the next `run()`.
    */
-  revertUpdate<TMutation: MutationParameters>(
+  revertUpdate<TMutation extends MutationParameters>(
     updater: OptimisticUpdate<TMutation>,
   ): void;
 
@@ -1469,7 +1558,7 @@ export interface PublishQueue {
   /**
    * Schedule applying a payload to the store on the next `run()`.
    */
-  commitPayload<TMutation: MutationParameters>(
+  commitPayload<TMutation extends MutationParameters>(
     operation: OperationDescriptor,
     payload: RelayResponsePayload,
     updater?: ?SelectorStoreUpdater<TMutation['response']>,
@@ -1493,7 +1582,7 @@ export interface PublishQueue {
    * Optionally provide an OperationDescriptor indicating the source operation
    * that was being processed to produce this run.
    */
-  run(sourceOperation?: OperationDescriptor): $ReadOnlyArray<RequestDescriptor>;
+  run(sourceOperation?: OperationDescriptor): ReadonlyArray<RequestDescriptor>;
 }
 
 /**
@@ -1532,4 +1621,4 @@ export type LiveState<+T> = {
  * `resolverContext` is set on the Relay Store.
  * This context will be passed as the third argument to the live resolver
  */
-export type ResolverContext = mixed;
+export type ResolverContext = unknown;

package/store/RelayStoreUtils.js.flow

@@ -36,12 +36,13 @@ const invariant = require('invariant');
 
 export type Arguments = {
   +FRAGMENT_POINTER_IS_WITHIN_UNMATCHED_TYPE_REFINEMENT?: boolean,
-  +[string]: mixed,
+  +[string]: unknown,
 };
 
 const {VARIABLE, LITERAL, OBJECT_VALUE, LIST_VALUE} = RelayConcreteNode;
 
 const ERRORS_KEY: '__errors' = '__errors';
+const FIELD_GRANULAR_NOTIFICATIONS_KEY = '__fieldGranularNotifications';
 const MODULE_COMPONENT_KEY_PREFIX = '__module_component_';
 const MODULE_OPERATION_KEY_PREFIX = '__module_operation_';
 
@@ -50,7 +51,7 @@ const RELAY_READ_TIME_RESOLVER_KEY_PREFIX = '$r:';
 function getArgumentValue(
   arg: NormalizationArgument | ReaderArgument,
   variables: Variables,
-): mixed {
+): unknown {
   if (arg.kind === VARIABLE) {
     // Variables are provided at runtime and are not guaranteed to be stable.
     return getStableVariableValue(arg.variableName, variables);
@@ -58,7 +59,7 @@ function getArgumentValue(
     // The Relay compiler generates stable ConcreteArgument values.
     return arg.value;
   } else if (arg.kind === OBJECT_VALUE) {
-    const value: {[string]: mixed} = {};
+    const value: {[string]: unknown} = {};
     arg.fields.forEach(field => {
       value[field.name] = getArgumentValue(field, variables);
     });
@@ -77,13 +78,13 @@ function getArgumentValue(
  * names. Guaranteed to return a result with stable ordered nested values.
  */
 function getArgumentValues(
-  args?: ?$ReadOnlyArray<NormalizationArgument | ReaderArgument>,
+  args?: ?ReadonlyArray<NormalizationArgument | ReaderArgument>,
   variables: Variables,
   isWithinUnmatchedTypeRefinement?: boolean,
 ): Arguments {
   const values: {
     FRAGMENT_POINTER_IS_WITHIN_UNMATCHED_TYPE_REFINEMENT?: boolean,
-    [string]: mixed,
+    [string]: unknown,
   } = {};
   if (isWithinUnmatchedTypeRefinement) {
     values[
@@ -204,7 +205,7 @@ function getArguments(
     | NormalizationHandle
     | ReaderField
     | ReaderActorChange,
-): ?$ReadOnlyArray<NormalizationArgument | ReaderArgument> {
+): ?ReadonlyArray<NormalizationArgument | ReaderArgument> {
   if (field.kind === 'RelayResolver' || field.kind === 'RelayLiveResolver') {
     if (field.args == null) {
       return field.fragment?.args;
@@ -256,7 +257,7 @@ function formatStorageKey(name: string, argValues: ?Arguments): string {
  * Given Variables and a variable name, return a variable value with
  * all values in a stable order.
  */
-function getStableVariableValue(name: string, variables: Variables): mixed {
+function getStableVariableValue(name: string, variables: Variables): unknown {
   invariant(
     variables.hasOwnProperty(name),
     'getVariableValue(): Undefined variable `%s`.',
@@ -273,6 +274,10 @@ function getModuleOperationKey(documentName: string): string {
   return `${MODULE_OPERATION_KEY_PREFIX}${documentName}`;
 }
 
+function getFieldNotificationKey(dataID: string, storageKey: string): string {
+  return `__fn:${dataID}:${storageKey}`;
+}
+
 /**
  * Constants shared by all implementations of RecordSource/MutableRecordSource/etc.
  */
@@ -286,6 +291,7 @@ const RelayStoreUtils = {
   FRAGMENT_PROP_NAME_KEY: '__fragmentPropName',
   MODULE_COMPONENT_KEY: '__module_component', // alias returned by Reader
   ERRORS_KEY,
+  FIELD_GRANULAR_NOTIFICATIONS_KEY,
   ID_KEY: '__id',
   REF_KEY: '__ref',
   REFS_KEY: '__refs',
@@ -298,6 +304,7 @@ const RelayStoreUtils = {
   RELAY_RESOLVER_SNAPSHOT_KEY: '__resolverSnapshot',
   RELAY_RESOLVER_ERROR_KEY: '__resolverError',
   RELAY_RESOLVER_OUTPUT_TYPE_RECORD_IDS: '__resolverOutputTypeRecordIDs',
+  RELAY_RESOLVER_RECORD_TYPENAME: '__RELAY_RESOLVER__',
   RELAY_READ_TIME_RESOLVER_KEY_PREFIX,
 
   formatStorageKey,
@@ -309,6 +316,7 @@ const RelayStoreUtils = {
   getStableStorageKey,
   getModuleComponentKey,
   getModuleOperationKey,
+  getFieldNotificationKey,
 } as const;
 
 module.exports = RelayStoreUtils;