@isograph/react 0.0.0-main-dd7a276d → 0.0.0-main-043fded2

package/dist/core/cache.js

@@ -51,10 +51,10 @@ function getOrCreateCacheForArtifact(environment, entrypoint, variables) {
         const itemCleanupPair = [
             {
                 kind: 'FragmentReference',
-                readerArtifact: entrypoint.readerArtifact,
+                readerArtifact: entrypoint.readerWithRefetchQueries.readerArtifact,
                 root: IsographEnvironment_1.ROOT_ID,
                 variables,
-                nestedRefetchQueries: entrypoint.nestedRefetchQueries,
+                nestedRefetchQueries: entrypoint.readerWithRefetchQueries.nestedRefetchQueries,
                 networkRequest: networkRequest,
             },
             disposeNetworkRequest,

package/dist/core/entrypoint.d.ts

@@ -1,12 +1,16 @@
 /// <reference types="react" />
 import { TopLevelReaderArtifact } from './reader';
 import { Arguments } from './util';
+type ReaderWithRefetchQueries<TReadFromStore extends Object, TClientFieldValue> = {
+    readonly kind: 'ReaderWithRefetchQueries';
+    readonly readerArtifact: TopLevelReaderArtifact<TReadFromStore, TClientFieldValue, any>;
+    readonly nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[];
+};
 export type IsographEntrypoint<TReadFromStore extends Object, TClientFieldValue> = {
     readonly kind: 'Entrypoint';
     readonly queryText: string;
     readonly normalizationAst: NormalizationAst;
-    readonly readerArtifact: TopLevelReaderArtifact<TReadFromStore, TClientFieldValue, any>;
-    readonly nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[];
+    readonly readerWithRefetchQueries: ReaderWithRefetchQueries<TReadFromStore, TClientFieldValue>;
 };
 export type NormalizationAstNode = NormalizationScalarField | NormalizationLinkedField | NormalizationInlineFragment;
 export type NormalizationAst = ReadonlyArray<NormalizationAstNode>;
@@ -39,3 +43,4 @@ export declare function assertIsEntrypoint<TReadFromStore extends Object, TClien
 export type ExtractReadFromStore<Type> = Type extends IsographEntrypoint<infer X, any> ? X : never;
 export type ExtractResolverResult<Type> = Type extends IsographEntrypoint<any, infer X> ? X : never;
 export type ExtractProps<Type> = Type extends React.FC<infer X> ? X : never;
+export {};

package/dist/core/makeNetworkRequest.js

@@ -28,7 +28,9 @@ function makeNetworkRequest(environment, artifact, variables) {
             });
         }
         if (status.kind === 'UndisposedIncomplete') {
-            (0, cache_1.normalizeData)(environment, artifact.normalizationAst, (_a = networkResponse.data) !== null && _a !== void 0 ? _a : {}, variables, artifact.kind === 'Entrypoint' ? artifact.nestedRefetchQueries : []);
+            (0, cache_1.normalizeData)(environment, artifact.normalizationAst, (_a = networkResponse.data) !== null && _a !== void 0 ? _a : {}, variables, artifact.kind === 'Entrypoint'
+                ? artifact.readerWithRefetchQueries.nestedRefetchQueries
+                : []);
             const retainedQuery = {
                 normalizationAst: artifact.normalizationAst,
                 variables,

package/dist/core/read.js

@@ -249,11 +249,12 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, netwo
                                 const [networkRequest, disposeNetworkRequest] = (0, makeNetworkRequest_1.makeNetworkRequest)(environment, field.entrypoint, localVariables);
                                 const fragmentReference = {
                                     kind: 'FragmentReference',
-                                    readerArtifact: field.entrypoint.readerArtifact,
+                                    readerArtifact: field.entrypoint.readerWithRefetchQueries.readerArtifact,
                                     // TODO localVariables is not guaranteed to have an id field
                                     root: localVariables.id,
                                     variables: localVariables,
-                                    nestedRefetchQueries: field.entrypoint.nestedRefetchQueries,
+                                    nestedRefetchQueries: field.entrypoint.readerWithRefetchQueries
+                                        .nestedRefetchQueries,
                                     networkRequest,
                                 };
                                 return [fragmentReference, disposeNetworkRequest];

package/dist/react/useImperativeReference.js

@@ -15,10 +15,10 @@ function useImperativeReference(entrypoint) {
             setState([
                 {
                     kind: 'FragmentReference',
-                    readerArtifact: entrypoint.readerArtifact,
+                    readerArtifact: entrypoint.readerWithRefetchQueries.readerArtifact,
                     root: IsographEnvironment_1.ROOT_ID,
                     variables,
-                    nestedRefetchQueries: entrypoint.nestedRefetchQueries,
+                    nestedRefetchQueries: entrypoint.readerWithRefetchQueries.nestedRefetchQueries,
                     networkRequest,
                 },
                 () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isograph/react",
-  "version": "0.0.0-main-dd7a276d",
+  "version": "0.0.0-main-043fded2",
   "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-dd7a276d",
-    "@isograph/react-disposable-state": "0.0.0-main-dd7a276d",
-    "@isograph/reference-counted-pointer": "0.0.0-main-dd7a276d"
+    "@isograph/disposable-types": "0.0.0-main-043fded2",
+    "@isograph/react-disposable-state": "0.0.0-main-043fded2",
+    "@isograph/reference-counted-pointer": "0.0.0-main-043fded2"
   },
   "peerDependencies": {
     "react": "18.2.0"

package/src/core/cache.ts

@@ -95,10 +95,11 @@ export function getOrCreateCacheForArtifact<
     > = [
       {
         kind: 'FragmentReference',
-        readerArtifact: entrypoint.readerArtifact,
+        readerArtifact: entrypoint.readerWithRefetchQueries.readerArtifact,
         root: ROOT_ID,
         variables,
-        nestedRefetchQueries: entrypoint.nestedRefetchQueries,
+        nestedRefetchQueries:
+          entrypoint.readerWithRefetchQueries.nestedRefetchQueries,
         networkRequest: networkRequest,
       },
       disposeNetworkRequest,

package/src/core/entrypoint.ts

@@ -1,14 +1,11 @@
 import { TopLevelReaderArtifact } from './reader';
 import { Arguments } from './util';
 
-// This type should be treated as an opaque type.
-export type IsographEntrypoint<
+type ReaderWithRefetchQueries<
   TReadFromStore extends Object,
   TClientFieldValue,
 > = {
-  readonly kind: 'Entrypoint';
-  readonly queryText: string;
-  readonly normalizationAst: NormalizationAst;
+  readonly kind: 'ReaderWithRefetchQueries';
   readonly readerArtifact: TopLevelReaderArtifact<
     TReadFromStore,
     TClientFieldValue,
@@ -18,6 +15,20 @@ export type IsographEntrypoint<
   readonly nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[];
 };
 
+// This type should be treated as an opaque type.
+export type IsographEntrypoint<
+  TReadFromStore extends Object,
+  TClientFieldValue,
+> = {
+  readonly kind: 'Entrypoint';
+  readonly queryText: string;
+  readonly normalizationAst: NormalizationAst;
+  readonly readerWithRefetchQueries: ReaderWithRefetchQueries<
+    TReadFromStore,
+    TClientFieldValue
+  >;
+};
+
 export type NormalizationAstNode =
   | NormalizationScalarField
   | NormalizationLinkedField

package/src/core/makeNetworkRequest.ts

@@ -48,7 +48,9 @@ export function makeNetworkRequest(
           artifact.normalizationAst,
           networkResponse.data ?? {},
           variables,
-          artifact.kind === 'Entrypoint' ? artifact.nestedRefetchQueries : [],
+          artifact.kind === 'Entrypoint'
+            ? artifact.readerWithRefetchQueries.nestedRefetchQueries
+            : [],
         );
         const retainedQuery = {
           normalizationAst: artifact.normalizationAst,

package/src/core/read.ts

@@ -372,11 +372,14 @@ function readData<TReadFromStore>(
                   );
                 const fragmentReference: FragmentReference<any, any> = {
                   kind: 'FragmentReference',
-                  readerArtifact: field.entrypoint.readerArtifact,
+                  readerArtifact:
+                    field.entrypoint.readerWithRefetchQueries.readerArtifact,
                   // TODO localVariables is not guaranteed to have an id field
                   root: localVariables.id,
                   variables: localVariables,
-                  nestedRefetchQueries: field.entrypoint.nestedRefetchQueries,
+                  nestedRefetchQueries:
+                    field.entrypoint.readerWithRefetchQueries
+                      .nestedRefetchQueries,
                   networkRequest,
                 };
                 return [fragmentReference, disposeNetworkRequest];

package/src/react/useImperativeReference.ts

@@ -35,10 +35,11 @@ export function useImperativeReference<
       setState([
         {
           kind: 'FragmentReference',
-          readerArtifact: entrypoint.readerArtifact,
+          readerArtifact: entrypoint.readerWithRefetchQueries.readerArtifact,
           root: ROOT_ID,
           variables,
-          nestedRefetchQueries: entrypoint.nestedRefetchQueries,
+          nestedRefetchQueries:
+            entrypoint.readerWithRefetchQueries.nestedRefetchQueries,
           networkRequest,
         },
         () => {

package/src/tests/__isograph/Query/meName/entrypoint.ts

@@ -37,8 +37,11 @@ const artifact: IsographEntrypoint<
   kind: "Entrypoint",
   queryText,
   normalizationAst,
-  nestedRefetchQueries,
-  readerArtifact: readerResolver,
-};
+  readerWithRefetchQueries: {
+    kind: "ReaderWithRefetchQueries",
+    nestedRefetchQueries,
+    readerArtifact: readerResolver,
+  }
+            };
 
 export default artifact;

package/src/tests/__isograph/Query/meNameSuccessor/entrypoint.ts

@@ -73,8 +73,11 @@ const artifact: IsographEntrypoint<
   kind: "Entrypoint",
   queryText,
   normalizationAst,
-  nestedRefetchQueries,
-  readerArtifact: readerResolver,
-};
+  readerWithRefetchQueries: {
+    kind: "ReaderWithRefetchQueries",
+    nestedRefetchQueries,
+    readerArtifact: readerResolver,
+  }
+            };
 
 export default artifact;

package/src/tests/__isograph/Query/nodeField/entrypoint.ts

@@ -36,8 +36,11 @@ const artifact: IsographEntrypoint<
   kind: "Entrypoint",
   queryText,
   normalizationAst,
-  nestedRefetchQueries,
-  readerArtifact: readerResolver,
-};
+  readerWithRefetchQueries: {
+    kind: "ReaderWithRefetchQueries",
+    nestedRefetchQueries,
+    readerArtifact: readerResolver,
+  }
+            };
 
 export default artifact;