@isograph/react 0.0.0-main-8821fa52 → 0.0.0-main-aa925b7c

package/.turbo/turbo-compile-typescript.log

@@ -1,4 +1,4 @@
 
-> @isograph/react@0.0.0-main-8821fa52 compile-typescript /Users/runner/work/isograph/isograph/libs/isograph-react
+> @isograph/react@0.0.0-main-aa925b7c compile-typescript /Users/runner/work/isograph/isograph/libs/isograph-react
 > rm -rf dist/* && tsc -p tsconfig.pkg.json
 

package/dist/core/read.d.ts

@@ -1,8 +1,9 @@
 import { type EncounteredIds } from './cache';
+import { RefetchQueryNormalizationArtifactWrapper } from './entrypoint';
 import { ExtractData, FragmentReference, Variables, type UnknownTReadFromStore } from './FragmentReference';
 import { IsographEnvironment, type DataTypeValue, type Link, type StoreRecord } from './IsographEnvironment';
 import { PromiseWrapper } from './PromiseWrapper';
-import { ReaderAst, type ReaderLinkedField, type ReaderScalarField } from './reader';
+import { ReaderAst, type ReaderImperativelyLoadedField, type ReaderLinkedField, type ReaderNonLoadableResolverField, type ReaderScalarField } from './reader';
 export type WithEncounteredRecords<T> = {
     readonly encounteredRecords: EncounteredIds;
     readonly item: ExtractData<T>;
@@ -18,6 +19,7 @@ export type ReadDataResult<Data> = ReadDataResultSuccess<Data> | {
     readonly nestedReason?: ReadDataResult<unknown>;
     readonly recordLink: Link;
 };
+export declare function readResolverFieldData(environment: IsographEnvironment, field: ReaderNonLoadableResolverField, root: Link, variables: Variables, nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[], networkRequest: PromiseWrapper<void, any>, networkRequestOptions: NetworkRequestReaderOptions, mutableEncounteredRecords: EncounteredIds): ReadDataResult<unknown>;
 export declare function readScalarFieldData(field: ReaderScalarField, storeRecord: StoreRecord, root: Link, variables: Variables): ReadDataResult<string | number | boolean | Link | DataTypeValue[] | null>;
 export declare function readLinkedFieldData(environment: IsographEnvironment, field: ReaderLinkedField, storeRecord: StoreRecord, root: Link, variables: Variables, networkRequest: PromiseWrapper<void, any>, readData: <TReadFromStore>(ast: ReaderAst<TReadFromStore>, root: Link) => ReadDataResult<object>): ReadDataResult<unknown>;
 export type NetworkRequestReaderOptions = {
@@ -25,4 +27,5 @@ export type NetworkRequestReaderOptions = {
     throwOnNetworkError: boolean;
 };
 export declare function getNetworkRequestOptionsWithDefaults(networkRequestOptions?: Partial<NetworkRequestReaderOptions> | void): NetworkRequestReaderOptions;
+export declare function readImperativelyLoadedField(environment: IsographEnvironment, field: ReaderImperativelyLoadedField, root: Link, variables: Variables, nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[], networkRequest: PromiseWrapper<void, any>, networkRequestOptions: NetworkRequestReaderOptions, mutableEncounteredRecords: EncounteredIds): ReadDataResult<unknown>;
 //# sourceMappingURL=read.d.ts.map

package/dist/core/read.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../src/core/read.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,cAAc,EACpB,MAAM,SAAS,CAAC;AAQjB,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,SAAS,EACT,KAAK,qBAAqB,EAC3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAGL,mBAAmB,EACnB,KAAK,aAAa,EAClB,KAAK,IAAI,EACT,KAAK,WAAW,EACjB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAEL,cAAc,EAKf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,SAAS,EACT,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EACvB,MAAM,UAAU,CAAC;AAIlB,MAAM,MAAM,sBAAsB,CAAC,CAAC,IAAI;IACtC,QAAQ,CAAC,kBAAkB,EAAE,cAAc,CAAC;IAC5C,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;CAC/B,CAAC;AAEF,wBAAgB,oBAAoB,CAClC,cAAc,SAAS,qBAAqB,EAE5C,WAAW,EAAE,mBAAmB,EAChC,iBAAiB,EAAE,iBAAiB,CAAC,cAAc,EAAE,OAAO,CAAC,EAC7D,qBAAqB,EAAE,2BAA2B,GACjD,sBAAsB,CAAC,cAAc,CAAC,CAiExC;AAED,MAAM,MAAM,qBAAqB,CAAC,IAAI,IAAI;IACxC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,cAAc,CAAC,IAAI,IAC3B,qBAAqB,CAAC,IAAI,CAAC,GAC3B;IACE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,YAAY,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IAChD,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC;CAC3B,CAAC;AA6dN,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,iBAAiB,EACxB,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,SAAS,GACnB,cAAc,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,aAAa,EAAE,GAAG,IAAI,CAAC,CAa3E;AAED,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,mBAAmB,EAChC,KAAK,EAAE,iBAAiB,EACxB,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC,EAEzC,QAAQ,EAAE,CAAC,cAAc,EACvB,GAAG,EAAE,SAAS,CAAC,cAAc,CAAC,EAC9B,IAAI,EAAE,IAAI,KACP,cAAc,CAAC,MAAM,CAAC,GAC1B,cAAc,CAAC,OAAO,CAAC,CA6JzB;AAED,MAAM,MAAM,2BAA2B,GAAG;IACxC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF,wBAAgB,oCAAoC,CAClD,qBAAqB,CAAC,EAAE,OAAO,CAAC,2BAA2B,CAAC,GAAG,IAAI,GAClE,2BAA2B,CAK7B"}
+{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../src/core/read.ts"],"names":[],"mappings":"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"}

package/dist/core/read.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readButDoNotEvaluate = readButDoNotEvaluate;
+exports.readResolverFieldData = readResolverFieldData;
 exports.readScalarFieldData = readScalarFieldData;
 exports.readLinkedFieldData = readLinkedFieldData;
 exports.getNetworkRequestOptionsWithDefaults = getNetworkRequestOptionsWithDefaults;
+exports.readImperativelyLoadedField = readImperativelyLoadedField;
 const cache_1 = require("./cache");
 const componentCache_1 = require("./componentCache");
 const IsographEnvironment_1 = require("./IsographEnvironment");
@@ -99,98 +101,19 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, netwo
                 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
-                [], 
-                // This is probably indicative of the fact that we are doing redundant checks
-                // on the status of this network request...
-                networkRequest, networkRequestOptions, mutableEncounteredRecords);
+                const data = readImperativelyLoadedField(environment, field, root, variables, nestedRefetchQueries, networkRequest, networkRequestOptions, mutableEncounteredRecords);
                 if (data.kind === 'MissingData') {
-                    return {
-                        kind: 'MissingData',
-                        reason: 'Missing data for ' + field.alias + ' on root ' + root.__link,
-                        nestedReason: data,
-                        recordLink: data.recordLink,
-                    };
-                }
-                else {
-                    const refetchQueryIndex = field.refetchQuery;
-                    const refetchQuery = nestedRefetchQueries[refetchQueryIndex];
-                    if (refetchQuery == null) {
-                        throw new Error('refetchQuery is null in RefetchField. This is indicative of a bug in Isograph.');
-                    }
-                    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] = (args) => [
-                        // Stable id
-                        root.__link + '__' + field.name,
-                        // Fetcher
-                        field.refetchReaderArtifact.resolver(environment, refetchQueryArtifact, data.data, filterVariables(Object.assign(Object.assign({}, args), variables), allowedVariables), root, 
-                        // TODO these params should be removed
-                        null, []),
-                    ];
+                    return data;
                 }
+                target[field.alias] = data.data;
                 break;
             }
             case 'Resolver': {
-                const usedRefetchQueries = field.usedRefetchQueries;
-                const resolverRefetchQueries = usedRefetchQueries.map((index) => {
-                    const resolverRefetchQuery = nestedRefetchQueries[index];
-                    if (resolverRefetchQuery == null) {
-                        throw new Error('resolverRefetchQuery is null in Resolver. This is indicative of a bug in Isograph.');
-                    }
-                    return resolverRefetchQuery;
-                });
-                const readerWithRefetchQueries = {
-                    kind: 'ReaderWithRefetchQueries',
-                    readerArtifact: field.readerArtifact,
-                    nestedRefetchQueries: resolverRefetchQueries,
-                };
-                const fragment = {
-                    kind: 'FragmentReference',
-                    readerWithRefetchQueries: (0, PromiseWrapper_1.wrapResolvedValue)(readerWithRefetchQueries),
-                    root,
-                    variables: generateChildVariableMap(variables, field.arguments),
-                    networkRequest,
-                };
-                switch (field.readerArtifact.kind) {
-                    case 'EagerReaderArtifact': {
-                        const data = readData(environment, field.readerArtifact.readerAst, root, generateChildVariableMap(variables, field.arguments), resolverRefetchQueries, networkRequest, networkRequestOptions, mutableEncounteredRecords);
-                        if (data.kind === 'MissingData') {
-                            return {
-                                kind: 'MissingData',
-                                reason: 'Missing data for ' + field.alias + ' on root ' + root.__link,
-                                nestedReason: data,
-                                recordLink: data.recordLink,
-                            };
-                        }
-                        else {
-                            const firstParameter = {
-                                data: data.data,
-                                parameters: variables,
-                                startUpdate: field.readerArtifact.hasUpdatable
-                                    ? (0, startUpdate_1.getOrCreateCachedStartUpdate)(environment, fragment, readerWithRefetchQueries.readerArtifact.fieldName)
-                                    : undefined,
-                            };
-                            target[field.alias] =
-                                field.readerArtifact.resolver(firstParameter);
-                        }
-                        break;
-                    }
-                    case 'ComponentReaderArtifact': {
-                        target[field.alias] = (0, componentCache_1.getOrCreateCachedComponent)(environment, field.readerArtifact.fieldName, fragment, networkRequestOptions);
-                        break;
-                    }
-                    default: {
-                        let _ = field.readerArtifact;
-                        _;
-                        throw new Error('Unexpected kind');
-                    }
+                const data = readResolverFieldData(environment, field, root, variables, nestedRefetchQueries, networkRequest, networkRequestOptions, mutableEncounteredRecords);
+                if (data.kind === 'MissingData') {
+                    return data;
                 }
+                target[field.alias] = data.data;
                 break;
             }
             case 'LoadablySelectedField': {
@@ -370,6 +293,63 @@ function writeQueryArgsToVariables(targetVariables, queryArgs, variables) {
         }
     }
 }
+function readResolverFieldData(environment, field, root, variables, nestedRefetchQueries, networkRequest, networkRequestOptions, mutableEncounteredRecords) {
+    const usedRefetchQueries = field.usedRefetchQueries;
+    const resolverRefetchQueries = usedRefetchQueries.map((index) => {
+        const resolverRefetchQuery = nestedRefetchQueries[index];
+        if (resolverRefetchQuery == null) {
+            throw new Error('resolverRefetchQuery is null in Resolver. This is indicative of a bug in Isograph.');
+        }
+        return resolverRefetchQuery;
+    });
+    const readerWithRefetchQueries = {
+        kind: 'ReaderWithRefetchQueries',
+        readerArtifact: field.readerArtifact,
+        nestedRefetchQueries: resolverRefetchQueries,
+    };
+    const fragment = {
+        kind: 'FragmentReference',
+        readerWithRefetchQueries: (0, PromiseWrapper_1.wrapResolvedValue)(readerWithRefetchQueries),
+        root,
+        variables: generateChildVariableMap(variables, field.arguments),
+        networkRequest,
+    };
+    switch (field.readerArtifact.kind) {
+        case 'EagerReaderArtifact': {
+            const data = readData(environment, field.readerArtifact.readerAst, root, generateChildVariableMap(variables, field.arguments), resolverRefetchQueries, networkRequest, networkRequestOptions, mutableEncounteredRecords);
+            if (data.kind === 'MissingData') {
+                return {
+                    kind: 'MissingData',
+                    reason: 'Missing data for ' + field.alias + ' on root ' + root.__link,
+                    nestedReason: data,
+                    recordLink: data.recordLink,
+                };
+            }
+            const firstParameter = {
+                data: data.data,
+                parameters: variables,
+                startUpdate: field.readerArtifact.hasUpdatable
+                    ? (0, startUpdate_1.getOrCreateCachedStartUpdate)(environment, fragment, readerWithRefetchQueries.readerArtifact.fieldName)
+                    : undefined,
+            };
+            return {
+                kind: 'Success',
+                data: field.readerArtifact.resolver(firstParameter),
+            };
+        }
+        case 'ComponentReaderArtifact': {
+            return {
+                kind: 'Success',
+                data: (0, componentCache_1.getOrCreateCachedComponent)(environment, field.readerArtifact.fieldName, fragment, networkRequestOptions),
+            };
+        }
+        default: {
+            let _ = field.readerArtifact;
+            _;
+            throw new Error('Unexpected kind');
+        }
+    }
+}
 function readScalarFieldData(field, storeRecord, root, variables) {
     const storeRecordName = (0, cache_1.getParentRecordKey)(field, variables);
     const value = storeRecord[storeRecordName];
@@ -540,3 +520,43 @@ function stableStringifyArgs(args) {
     }
     return s;
 }
+function readImperativelyLoadedField(environment, field, root, variables, nestedRefetchQueries, networkRequest, networkRequestOptions, mutableEncounteredRecords) {
+    // 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
+    [], 
+    // This is probably indicative of the fact that we are doing redundant checks
+    // on the status of this network request...
+    networkRequest, networkRequestOptions, mutableEncounteredRecords);
+    if (data.kind === 'MissingData') {
+        return {
+            kind: 'MissingData',
+            reason: 'Missing data for ' + field.alias + ' on root ' + root.__link,
+            nestedReason: data,
+            recordLink: data.recordLink,
+        };
+    }
+    else {
+        const refetchQueryIndex = field.refetchQuery;
+        const refetchQuery = nestedRefetchQueries[refetchQueryIndex];
+        if (refetchQuery == null) {
+            throw new Error('refetchQuery is null in RefetchField. This is indicative of a bug in Isograph.');
+        }
+        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.
+        return {
+            kind: 'Success',
+            data: (args) => [
+                // Stable id
+                root.__link + '__' + field.name,
+                // Fetcher
+                field.refetchReaderArtifact.resolver(environment, refetchQueryArtifact, data.data, filterVariables(Object.assign(Object.assign({}, args), variables), allowedVariables), root, 
+                // TODO these params should be removed
+                null, []),
+            ],
+        };
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isograph/react",
-  "version": "0.0.0-main-8821fa52",
+  "version": "0.0.0-main-aa925b7c",
   "description": "Use Isograph with React",
   "homepage": "https://isograph.dev",
   "main": "dist/index.js",
@@ -20,9 +20,9 @@
     "iso-watch": "cross-env ../../target/debug/isograph_cli --config ./isograph.config.json --watch"
   },
   "dependencies": {
-    "@isograph/disposable-types": "0.0.0-main-8821fa52",
-    "@isograph/react-disposable-state": "0.0.0-main-8821fa52",
-    "@isograph/reference-counted-pointer": "0.0.0-main-8821fa52"
+    "@isograph/disposable-types": "0.0.0-main-aa925b7c",
+    "@isograph/react-disposable-state": "0.0.0-main-aa925b7c",
+    "@isograph/reference-counted-pointer": "0.0.0-main-aa925b7c"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0"

package/src/core/read.ts

@@ -38,7 +38,9 @@ import {
 } from './PromiseWrapper';
 import {
   ReaderAst,
+  type ReaderImperativelyLoadedField,
   type ReaderLinkedField,
+  type ReaderNonLoadableResolverField,
   type ReaderScalarField,
 } from './reader';
 import { getOrCreateCachedStartUpdate } from './startUpdate';
@@ -211,138 +213,37 @@ 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(
+        const data = readImperativelyLoadedField(
           environment,
-          field.refetchReaderArtifact.readerAst,
+          field,
           root,
           variables,
-          // Refetch fields just read the id, and don't need refetch query artifacts
-          [],
-          // This is probably indicative of the fact that we are doing redundant checks
-          // on the status of this network request...
+          nestedRefetchQueries,
           networkRequest,
           networkRequestOptions,
           mutableEncounteredRecords,
         );
         if (data.kind === 'MissingData') {
-          return {
-            kind: 'MissingData',
-            reason:
-              'Missing data for ' + field.alias + ' on root ' + root.__link,
-            nestedReason: data,
-            recordLink: data.recordLink,
-          };
-        } else {
-          const refetchQueryIndex = field.refetchQuery;
-          const refetchQuery = nestedRefetchQueries[refetchQueryIndex];
-          if (refetchQuery == null) {
-            throw new Error(
-              'refetchQuery is null in RefetchField. This is indicative of a bug in Isograph.',
-            );
-          }
-          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] = (args: any) => [
-            // Stable id
-            root.__link + '__' + field.name,
-            // Fetcher
-            field.refetchReaderArtifact.resolver(
-              environment,
-              refetchQueryArtifact,
-              data.data,
-              filterVariables({ ...args, ...variables }, allowedVariables),
-              root,
-              // TODO these params should be removed
-              null,
-              [],
-            ),
-          ];
+          return data;
         }
+        target[field.alias] = data.data;
         break;
       }
       case 'Resolver': {
-        const usedRefetchQueries = field.usedRefetchQueries;
-        const resolverRefetchQueries = usedRefetchQueries.map((index) => {
-          const resolverRefetchQuery = nestedRefetchQueries[index];
-          if (resolverRefetchQuery == null) {
-            throw new Error(
-              'resolverRefetchQuery is null in Resolver. This is indicative of a bug in Isograph.',
-            );
-          }
-          return resolverRefetchQuery;
-        });
-
-        const readerWithRefetchQueries = {
-          kind: 'ReaderWithRefetchQueries',
-          readerArtifact: field.readerArtifact,
-          nestedRefetchQueries: resolverRefetchQueries,
-        } satisfies ReaderWithRefetchQueries<any, any>;
-
-        const fragment = {
-          kind: 'FragmentReference',
-          readerWithRefetchQueries: wrapResolvedValue(readerWithRefetchQueries),
+        const data = readResolverFieldData(
+          environment,
+          field,
           root,
-          variables: generateChildVariableMap(variables, field.arguments),
+          variables,
+          nestedRefetchQueries,
           networkRequest,
-        } satisfies FragmentReference<any, any>;
-
-        switch (field.readerArtifact.kind) {
-          case 'EagerReaderArtifact': {
-            const data = readData(
-              environment,
-              field.readerArtifact.readerAst,
-              root,
-              generateChildVariableMap(variables, field.arguments),
-              resolverRefetchQueries,
-              networkRequest,
-              networkRequestOptions,
-              mutableEncounteredRecords,
-            );
-            if (data.kind === 'MissingData') {
-              return {
-                kind: 'MissingData',
-                reason:
-                  'Missing data for ' + field.alias + ' on root ' + root.__link,
-                nestedReason: data,
-                recordLink: data.recordLink,
-              };
-            } else {
-              const firstParameter = {
-                data: data.data,
-                parameters: variables,
-                startUpdate: field.readerArtifact.hasUpdatable
-                  ? getOrCreateCachedStartUpdate(
-                      environment,
-                      fragment,
-                      readerWithRefetchQueries.readerArtifact.fieldName,
-                    )
-                  : undefined,
-              };
-              target[field.alias] =
-                field.readerArtifact.resolver(firstParameter);
-            }
-            break;
-          }
-          case 'ComponentReaderArtifact': {
-            target[field.alias] = getOrCreateCachedComponent(
-              environment,
-              field.readerArtifact.fieldName,
-              fragment,
-              networkRequestOptions,
-            );
-            break;
-          }
-          default: {
-            let _: never = field.readerArtifact;
-            _;
-            throw new Error('Unexpected kind');
-          }
+          networkRequestOptions,
+          mutableEncounteredRecords,
+        );
+        if (data.kind === 'MissingData') {
+          return data;
         }
+        target[field.alias] = data.data;
         break;
       }
       case 'LoadablySelectedField': {
@@ -611,6 +512,96 @@ function writeQueryArgsToVariables(
   }
 }
 
+export function readResolverFieldData(
+  environment: IsographEnvironment,
+  field: ReaderNonLoadableResolverField,
+  root: Link,
+  variables: Variables,
+  nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[],
+  networkRequest: PromiseWrapper<void, any>,
+  networkRequestOptions: NetworkRequestReaderOptions,
+  mutableEncounteredRecords: EncounteredIds,
+): ReadDataResult<unknown> {
+  const usedRefetchQueries = field.usedRefetchQueries;
+  const resolverRefetchQueries = usedRefetchQueries.map((index) => {
+    const resolverRefetchQuery = nestedRefetchQueries[index];
+    if (resolverRefetchQuery == null) {
+      throw new Error(
+        'resolverRefetchQuery is null in Resolver. This is indicative of a bug in Isograph.',
+      );
+    }
+    return resolverRefetchQuery;
+  });
+
+  const readerWithRefetchQueries = {
+    kind: 'ReaderWithRefetchQueries',
+    readerArtifact: field.readerArtifact,
+    nestedRefetchQueries: resolverRefetchQueries,
+  } satisfies ReaderWithRefetchQueries<any, any>;
+
+  const fragment = {
+    kind: 'FragmentReference',
+    readerWithRefetchQueries: wrapResolvedValue(readerWithRefetchQueries),
+    root,
+    variables: generateChildVariableMap(variables, field.arguments),
+    networkRequest,
+  } satisfies FragmentReference<any, any>;
+
+  switch (field.readerArtifact.kind) {
+    case 'EagerReaderArtifact': {
+      const data = readData(
+        environment,
+        field.readerArtifact.readerAst,
+        root,
+        generateChildVariableMap(variables, field.arguments),
+        resolverRefetchQueries,
+        networkRequest,
+        networkRequestOptions,
+        mutableEncounteredRecords,
+      );
+      if (data.kind === 'MissingData') {
+        return {
+          kind: 'MissingData',
+          reason: 'Missing data for ' + field.alias + ' on root ' + root.__link,
+          nestedReason: data,
+          recordLink: data.recordLink,
+        };
+      }
+      const firstParameter = {
+        data: data.data,
+        parameters: variables,
+        startUpdate: field.readerArtifact.hasUpdatable
+          ? getOrCreateCachedStartUpdate(
+              environment,
+              fragment,
+              readerWithRefetchQueries.readerArtifact.fieldName,
+            )
+          : undefined,
+      };
+      return {
+        kind: 'Success',
+        data: field.readerArtifact.resolver(firstParameter),
+      };
+    }
+    case 'ComponentReaderArtifact': {
+      return {
+        kind: 'Success',
+        data: getOrCreateCachedComponent(
+          environment,
+          field.readerArtifact.fieldName,
+          fragment,
+          networkRequestOptions,
+        ),
+      };
+    }
+    default: {
+      let _: never = field.readerArtifact;
+      _;
+      throw new Error('Unexpected kind');
+    }
+  }
+}
+
 export function readScalarFieldData(
   field: ReaderScalarField,
   storeRecord: StoreRecord,
@@ -830,3 +821,69 @@ function stableStringifyArgs(args: object) {
   }
   return s;
 }
+
+export function readImperativelyLoadedField(
+  environment: IsographEnvironment,
+  field: ReaderImperativelyLoadedField,
+  root: Link,
+  variables: Variables,
+  nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[],
+  networkRequest: PromiseWrapper<void, any>,
+  networkRequestOptions: NetworkRequestReaderOptions,
+  mutableEncounteredRecords: EncounteredIds,
+): ReadDataResult<unknown> {
+  // 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
+    [],
+    // This is probably indicative of the fact that we are doing redundant checks
+    // on the status of this network request...
+    networkRequest,
+    networkRequestOptions,
+    mutableEncounteredRecords,
+  );
+  if (data.kind === 'MissingData') {
+    return {
+      kind: 'MissingData',
+      reason: 'Missing data for ' + field.alias + ' on root ' + root.__link,
+      nestedReason: data,
+      recordLink: data.recordLink,
+    };
+  } else {
+    const refetchQueryIndex = field.refetchQuery;
+    const refetchQuery = nestedRefetchQueries[refetchQueryIndex];
+    if (refetchQuery == null) {
+      throw new Error(
+        'refetchQuery is null in RefetchField. This is indicative of a bug in Isograph.',
+      );
+    }
+    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.
+    return {
+      kind: 'Success',
+      data: (args: any) => [
+        // Stable id
+        root.__link + '__' + field.name,
+        // Fetcher
+        field.refetchReaderArtifact.resolver(
+          environment,
+          refetchQueryArtifact,
+          data.data,
+          filterVariables({ ...args, ...variables }, allowedVariables),
+          root,
+          // TODO these params should be removed
+          null,
+          [],
+        ),
+      ],
+    };
+  }
+}