@isograph/react 0.0.0-main-6c4d9bd8 → 0.0.0-main-edade9ce

package/dist/core/cache.js

@@ -132,7 +132,10 @@ function callSubscriptions(environment, recordsEncounteredWhenNormalizing) {
                     // - consistency
                     // - it's also weird, this is called from makeNetworkRequest, where
                     //   we don't currently pass network request options
-                    {});
+                    {
+                        suspendIfInFlight: false,
+                        throwOnNetworkError: false,
+                    });
                     if (!(0, areEqualWithDeepComparison_1.areEqualObjectsWithDeepComparison)(subscription.encounteredDataAndRecords.item, newEncounteredDataAndRecords.item)) {
                         if (typeof window !== 'undefined' && window.__LOG) {
                             console.log('Deep equality - No', {

package/dist/core/read.d.ts

@@ -6,6 +6,7 @@ export type WithEncounteredRecords<T> = {
 };
 export declare function readButDoNotEvaluate<TReadFromStore extends Object>(environment: IsographEnvironment, fragmentReference: FragmentReference<TReadFromStore, unknown>, networkRequestOptions: NetworkRequestReaderOptions): WithEncounteredRecords<TReadFromStore>;
 export type NetworkRequestReaderOptions = {
-    suspendIfInFlight?: boolean;
-    throwOnNetworkError?: boolean;
+    suspendIfInFlight: boolean;
+    throwOnNetworkError: boolean;
 };
+export declare function getNetworkRequestOptionsWithDefaults(networkRequestOptions?: Partial<NetworkRequestReaderOptions> | void): NetworkRequestReaderOptions;

package/dist/core/read.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readButDoNotEvaluate = void 0;
+exports.getNetworkRequestOptionsWithDefaults = exports.readButDoNotEvaluate = void 0;
 const cache_1 = require("./cache");
 const componentCache_1 = require("./componentCache");
 const IsographEnvironment_1 = require("./IsographEnvironment");
@@ -329,6 +329,14 @@ function writeQueryArgsToVariables(targetVariables, queryArgs, variables) {
         }
     }
 }
+function getNetworkRequestOptionsWithDefaults(networkRequestOptions) {
+    var _a, _b;
+    return {
+        suspendIfInFlight: (_a = networkRequestOptions === null || networkRequestOptions === void 0 ? void 0 : networkRequestOptions.suspendIfInFlight) !== null && _a !== void 0 ? _a : false,
+        throwOnNetworkError: (_b = networkRequestOptions === null || networkRequestOptions === void 0 ? void 0 : networkRequestOptions.throwOnNetworkError) !== null && _b !== void 0 ? _b : true,
+    };
+}
+exports.getNetworkRequestOptionsWithDefaults = getNetworkRequestOptionsWithDefaults;
 // TODO use a description of the params for this?
 // TODO call stableStringifyArgs on the variable values, as well.
 // This doesn't matter for now, since we are just using primitive values

package/dist/react/FragmentReader.d.ts

@@ -5,9 +5,9 @@ import { NetworkRequestReaderOptions } from '../core/read';
 export declare function FragmentReader<TProps extends Record<any, any>, TEntrypoint extends IsographEntrypoint<any, React.FC<TProps>>>(props: TProps extends Record<string, never> ? {
     fragmentReference: FragmentReference<ExtractReadFromStore<TEntrypoint>, React.FC<{}>>;
     additionalProps?: TProps;
-    networkRequestOptions?: NetworkRequestReaderOptions;
+    networkRequestOptions?: Partial<NetworkRequestReaderOptions>;
 } : {
     fragmentReference: FragmentReference<ExtractReadFromStore<TEntrypoint>, React.FC<TProps>>;
     additionalProps: TProps;
-    networkRequestOptions?: NetworkRequestReaderOptions;
+    networkRequestOptions?: Partial<NetworkRequestReaderOptions>;
 }): React.ReactNode;

package/dist/react/FragmentReader.js

@@ -27,8 +27,7 @@ exports.FragmentReader = void 0;
 const React = __importStar(require("react"));
 const useResult_1 = require("./useResult");
 function FragmentReader(props) {
-    var _a;
-    const Component = (0, useResult_1.useResult)(props.fragmentReference, (_a = props.networkRequestOptions) !== null && _a !== void 0 ? _a : {});
+    const Component = (0, useResult_1.useResult)(props.fragmentReference, props.networkRequestOptions);
     return React.createElement(Component, Object.assign({}, props.additionalProps));
 }
 exports.FragmentReader = FragmentReader;

package/dist/react/useResult.d.ts

@@ -1,5 +1,5 @@
 import { FragmentReference } from '../core/FragmentReference';
 import { NetworkRequestReaderOptions } from '../core/read';
 import { PromiseWrapper } from '../core/PromiseWrapper';
-export declare function useResult<TReadFromStore extends Object, TClientFieldValue>(fragmentReference: FragmentReference<TReadFromStore, TClientFieldValue>, networkRequestOptions: NetworkRequestReaderOptions): TClientFieldValue;
+export declare function useResult<TReadFromStore extends Object, TClientFieldValue>(fragmentReference: FragmentReference<TReadFromStore, TClientFieldValue>, partialNetworkRequestOptions?: Partial<NetworkRequestReaderOptions> | void): TClientFieldValue;
 export declare function maybeUnwrapNetworkRequest(networkRequest: PromiseWrapper<void, any>, networkRequestOptions: NetworkRequestReaderOptions): void;

package/dist/react/useResult.js

@@ -4,9 +4,11 @@ exports.maybeUnwrapNetworkRequest = exports.useResult = void 0;
 const IsographEnvironmentProvider_1 = require("../react/IsographEnvironmentProvider");
 const componentCache_1 = require("../core/componentCache");
 const useReadAndSubscribe_1 = require("./useReadAndSubscribe");
+const read_1 = require("../core/read");
 const PromiseWrapper_1 = require("../core/PromiseWrapper");
-function useResult(fragmentReference, networkRequestOptions) {
+function useResult(fragmentReference, partialNetworkRequestOptions) {
     const environment = (0, IsographEnvironmentProvider_1.useIsographEnvironment)();
+    const networkRequestOptions = (0, read_1.getNetworkRequestOptionsWithDefaults)(partialNetworkRequestOptions);
     maybeUnwrapNetworkRequest(fragmentReference.networkRequest, networkRequestOptions);
     switch (fragmentReference.readerArtifact.kind) {
         case 'ComponentReaderArtifact': {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isograph/react",
-  "version": "0.0.0-main-6c4d9bd8",
+  "version": "0.0.0-main-edade9ce",
   "description": "Use Isograph with React",
   "homepage": "https://isograph.dev",
   "main": "dist/index.js",
@@ -17,9 +17,9 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@isograph/disposable-types": "0.0.0-main-6c4d9bd8",
-    "@isograph/react-disposable-state": "0.0.0-main-6c4d9bd8",
-    "@isograph/reference-counted-pointer": "0.0.0-main-6c4d9bd8",
+    "@isograph/disposable-types": "0.0.0-main-edade9ce",
+    "@isograph/react-disposable-state": "0.0.0-main-edade9ce",
+    "@isograph/reference-counted-pointer": "0.0.0-main-edade9ce",
     "react": "^18.2.0"
   },
   "devDependencies": {

package/src/core/cache.ts

@@ -226,7 +226,10 @@ function callSubscriptions(
               // - consistency
               // - it's also weird, this is called from makeNetworkRequest, where
               //   we don't currently pass network request options
-              {},
+              {
+                suspendIfInFlight: false,
+                throwOnNetworkError: false,
+              },
             );
 
             if (

package/src/core/read.ts

@@ -468,10 +468,19 @@ function writeQueryArgsToVariables(
 }
 
 export type NetworkRequestReaderOptions = {
-  suspendIfInFlight?: boolean;
-  throwOnNetworkError?: boolean;
+  suspendIfInFlight: boolean;
+  throwOnNetworkError: boolean;
 };
 
+export function getNetworkRequestOptionsWithDefaults(
+  networkRequestOptions?: Partial<NetworkRequestReaderOptions> | void,
+): NetworkRequestReaderOptions {
+  return {
+    suspendIfInFlight: networkRequestOptions?.suspendIfInFlight ?? false,
+    throwOnNetworkError: networkRequestOptions?.throwOnNetworkError ?? true,
+  };
+}
+
 // TODO use a description of the params for this?
 // TODO call stableStringifyArgs on the variable values, as well.
 // This doesn't matter for now, since we are just using primitive values

package/src/react/FragmentReader.tsx

@@ -15,7 +15,7 @@ export function FragmentReader<
           React.FC<{}>
         >;
         additionalProps?: TProps;
-        networkRequestOptions?: NetworkRequestReaderOptions;
+        networkRequestOptions?: Partial<NetworkRequestReaderOptions>;
       }
     : {
         fragmentReference: FragmentReference<
@@ -23,12 +23,12 @@ export function FragmentReader<
           React.FC<TProps>
         >;
         additionalProps: TProps;
-        networkRequestOptions?: NetworkRequestReaderOptions;
+        networkRequestOptions?: Partial<NetworkRequestReaderOptions>;
       },
 ): React.ReactNode {
   const Component = useResult(
     props.fragmentReference,
-    props.networkRequestOptions ?? {},
+    props.networkRequestOptions,
   );
   return <Component {...props.additionalProps} />;
 }

package/src/react/useResult.ts

@@ -2,14 +2,20 @@ import { useIsographEnvironment } from '../react/IsographEnvironmentProvider';
 import { FragmentReference } from '../core/FragmentReference';
 import { getOrCreateCachedComponent } from '../core/componentCache';
 import { useReadAndSubscribe } from './useReadAndSubscribe';
-import { NetworkRequestReaderOptions } from '../core/read';
+import {
+  getNetworkRequestOptionsWithDefaults,
+  NetworkRequestReaderOptions,
+} from '../core/read';
 import { getPromiseState, PromiseWrapper } from '../core/PromiseWrapper';
 
 export function useResult<TReadFromStore extends Object, TClientFieldValue>(
   fragmentReference: FragmentReference<TReadFromStore, TClientFieldValue>,
-  networkRequestOptions: NetworkRequestReaderOptions,
+  partialNetworkRequestOptions?: Partial<NetworkRequestReaderOptions> | void,
 ): TClientFieldValue {
   const environment = useIsographEnvironment();
+  const networkRequestOptions = getNetworkRequestOptionsWithDefaults(
+    partialNetworkRequestOptions,
+  );
 
   maybeUnwrapNetworkRequest(
     fragmentReference.networkRequest,