relay-runtime 0.0.0-main-c9cf5515 → 0.0.0-main-91fd7b05

package/experimental.js

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

package/index.js

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

package/lib/query/fetchQuery.js

@@ -31,10 +31,22 @@ function fetchQuery(environment, query, variables, options) {
       }
     case 'store-or-network':
       {
-        if (environment.check(operation).status === 'available') {
-          return RelayObservable.from(environment.lookup(operation.fragment)).map(readData);
+        var queryAvailability = environment.check(operation);
+        var shouldFetch = queryAvailability.status !== 'available';
+        var observable;
+        if (!shouldFetch) {
+          observable = RelayObservable.from(environment.lookup(operation.fragment)).map(readData);
+        } else {
+          observable = getNetworkObservable(environment, operation).map(readData);
         }
-        return getNetworkObservable(environment, operation).map(readData);
+        environment.__log({
+          name: 'fetchquery.fetch',
+          operation: operation,
+          fetchPolicy: fetchPolicy,
+          queryAvailability: queryAvailability,
+          shouldFetch: shouldFetch
+        });
+        return observable;
       }
     default:
       fetchPolicy;

package/package.json

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

package/query/fetchQuery.js.flow

@@ -151,14 +151,27 @@ function fetchQuery<TVariables: Variables, TData, TRawResponse>(
       );
     }
     case 'store-or-network': {
-      if (environment.check(operation).status === 'available') {
-        return RelayObservable.from<Snapshot>(
+      const queryAvailability = environment.check(operation);
+      const shouldFetch = queryAvailability.status !== 'available';
+      let observable;
+      if (!shouldFetch) {
+        observable = RelayObservable.from<Snapshot>(
           environment.lookup(operation.fragment),
         ).map(readData);
+      } else {
+        observable = getNetworkObservable<$FlowFixMe>(
+          environment,
+          operation,
+        ).map(readData);
       }
-      return getNetworkObservable<$FlowFixMe>(environment, operation).map(
-        readData,
-      );
+      environment.__log({
+        name: 'fetchquery.fetch',
+        operation,
+        fetchPolicy,
+        queryAvailability,
+        shouldFetch,
+      });
+      return observable;
     }
     default:
       fetchPolicy as empty;

package/store/RelayStoreTypes.js.flow

@@ -806,6 +806,15 @@ 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
   | SuspenseQueryLogEvent
@@ -845,7 +854,8 @@ export type LogEvent =
   | EntrypointRootConsumeLogEvent
   | LiveResolverBatchStartLogEvent
   | LiveResolverBatchEndLogEvent
-  | UseFragmentSubscriptionMissedUpdates;
+  | UseFragmentSubscriptionMissedUpdates
+  | FetchQueryFetchLogEvent;
 
 export type LogFunction = LogEvent => void;
 export type LogRequestInfoFunction = mixed => void;