@isograph/react 0.0.0-main-684823b0 → 0.0.0-main-33a95299

package/dist/read.js

@@ -133,6 +133,8 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, mutab
                 break;
             }
             case 'ImperativelyLoadedField': {
+                // First, we read the data using the refetch reader AST (i.e. read out the
+                // id field).
                 const data = readData(environment, field.refetchReaderArtifact.readerAst, root, variables, 
                 // Refetch fields just read the id, and don't need refetch query artifacts
                 [], mutableEncounteredRecords);
@@ -151,11 +153,13 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, mutab
                     const refetchQuery = nestedRefetchQueries[refetchQueryIndex];
                     const refetchQueryArtifact = refetchQuery.artifact;
                     const allowedVariables = refetchQuery.allowedVariables;
+                    // Second, we allow the user to call the resolver, which will ultimately
+                    // use the resolver reader AST to get the resolver parameters.
                     target[field.alias] = [
                         // DataId
                         root + '__' + field.name,
                         // Fetcher
-                        field.refetchReaderArtifact.resolver(environment, refetchQueryArtifact, data.data, filterVariables(variables, allowedVariables), root, field.resolverReaderArtifact),
+                        field.refetchReaderArtifact.resolver(environment, refetchQueryArtifact, data.data, filterVariables(variables, allowedVariables), root, field.resolverReaderArtifact, field.usedRefetchQueries.map((id) => nestedRefetchQueries[id])),
                     ];
                 }
                 break;

package/dist/reader.d.ts

@@ -2,7 +2,7 @@
 import { ItemCleanupPair } from '@isograph/disposable-types';
 import { FragmentReference } from './FragmentReference';
 import { ComponentOrFieldName, DataId, IsographEnvironment } from './IsographEnvironment';
-import { RefetchQueryNormalizationArtifact } from './entrypoint';
+import { RefetchQueryNormalizationArtifact, RefetchQueryNormalizationArtifactWrapper } from './entrypoint';
 import { Arguments } from './util';
 export type TopLevelReaderArtifact<TReadFromStore extends Object, TClientFieldValue, TComponentProps extends Record<string, never>> = EagerReaderArtifact<TReadFromStore, TClientFieldValue> | ComponentReaderArtifact<TReadFromStore, TComponentProps>;
 export type EagerReaderArtifact<TReadFromStore extends Object, TClientFieldValue> = {
@@ -19,12 +19,12 @@ export type ComponentReaderArtifact<TReadFromStore extends Object, TComponentPro
 export type RefetchReaderArtifact = {
     readonly kind: 'RefetchReaderArtifact';
     readonly readerAst: ReaderAst<unknown>;
-    readonly resolver: (environment: IsographEnvironment, artifact: RefetchQueryNormalizationArtifact, variables: any, filteredVariables: any, rootId: DataId, readerArtifact: TopLevelReaderArtifact<any, any, any> | null) => () => void;
+    readonly resolver: (environment: IsographEnvironment, artifact: RefetchQueryNormalizationArtifact, variables: any, filteredVariables: any, rootId: DataId, readerArtifact: TopLevelReaderArtifact<any, any, any> | null, nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[]) => () => void;
 };
 export type MutationReaderArtifact<TReadFromStore extends Object> = {
     readonly kind: 'MutationReaderArtifact';
     readonly readerAst: ReaderAst<unknown>;
-    readonly resolver: (environment: IsographEnvironment, entrypoint: RefetchQueryNormalizationArtifact, readOutData: TReadFromStore, filteredVariables: any, rootId: DataId, readerArtifact: TopLevelReaderArtifact<any, any, any> | null) => (mutationParams: any) => void;
+    readonly resolver: (environment: IsographEnvironment, entrypoint: RefetchQueryNormalizationArtifact, readOutData: TReadFromStore, filteredVariables: any, rootId: DataId, readerArtifact: TopLevelReaderArtifact<any, any, any> | null, nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[]) => (mutationParams: any) => void;
 };
 export type ReaderAstNode = ReaderScalarField | ReaderLinkedField | ReaderResolverField | ReaderImperativelyLoadedField;
 export type ReaderAst<TReadFromStore> = ReadonlyArray<ReaderAstNode>;
@@ -55,6 +55,7 @@ export type ReaderImperativelyLoadedField = {
     readonly resolverReaderArtifact: TopLevelReaderArtifact<any, any, any> | null;
     readonly refetchQuery: number;
     readonly name: string;
+    readonly usedRefetchQueries: number[];
 };
 export type LoadableField<T> = [
     string,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isograph/react",
-  "version": "0.0.0-main-684823b0",
+  "version": "0.0.0-main-33a95299",
   "description": "Use Isograph with React",
   "homepage": "https://isograph.dev",
   "main": "dist/index.js",
@@ -16,8 +16,8 @@
     "prepack": "yarn run test && yarn run compile"
   },
   "dependencies": {
-    "@isograph/disposable-types": "0.0.0-main-684823b0",
-    "@isograph/react-disposable-state": "0.0.0-main-684823b0",
+    "@isograph/disposable-types": "0.0.0-main-33a95299",
+    "@isograph/react-disposable-state": "0.0.0-main-33a95299",
     "react": "^18.2.0"
   },
   "devDependencies": {

package/src/read.ts

@@ -194,6 +194,8 @@ function readData<TReadFromStore>(
         break;
       }
       case 'ImperativelyLoadedField': {
+        // First, we read the data using the refetch reader AST (i.e. read out the
+        // id field).
         const data = readData(
           environment,
           field.refetchReaderArtifact.readerAst,
@@ -218,6 +220,8 @@ function readData<TReadFromStore>(
           const refetchQueryArtifact = refetchQuery.artifact;
           const allowedVariables = refetchQuery.allowedVariables;
 
+          // Second, we allow the user to call the resolver, which will ultimately
+          // use the resolver reader AST to get the resolver parameters.
           target[field.alias] = [
             // DataId
             root + '__' + field.name,
@@ -229,6 +233,7 @@ function readData<TReadFromStore>(
               filterVariables(variables, allowedVariables),
               root,
               field.resolverReaderArtifact,
+              field.usedRefetchQueries.map((id) => nestedRefetchQueries[id]),
             ),
           ];
         }

package/src/reader.ts

@@ -5,7 +5,10 @@ import {
   DataId,
   IsographEnvironment,
 } from './IsographEnvironment';
-import { RefetchQueryNormalizationArtifact } from './entrypoint';
+import {
+  RefetchQueryNormalizationArtifact,
+  RefetchQueryNormalizationArtifactWrapper,
+} from './entrypoint';
 import { Arguments } from './util';
 
 export type TopLevelReaderArtifact<
@@ -51,6 +54,7 @@ export type RefetchReaderArtifact = {
     rootId: DataId,
     readerArtifact: TopLevelReaderArtifact<any, any, any> | null,
     // TODO type this better
+    nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[],
   ) => () => void;
 };
 
@@ -67,6 +71,7 @@ export type MutationReaderArtifact<TReadFromStore extends Object> = {
     rootId: DataId,
     readerArtifact: TopLevelReaderArtifact<any, any, any> | null,
     // TODO type this better
+    nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[],
   ) => (mutationParams: any) => void;
 };
 
@@ -111,6 +116,7 @@ export type ReaderImperativelyLoadedField = {
   readonly resolverReaderArtifact: TopLevelReaderArtifact<any, any, any> | null;
   readonly refetchQuery: number;
   readonly name: string;
+  readonly usedRefetchQueries: number[];
 };
 
 export type LoadableField<T> = [