@isograph/react 0.0.0-main-6815ceff → 0.0.0-main-3092d4a2

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

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

package/dist/core/read.d.ts

@@ -3,7 +3,7 @@ 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 ReaderImperativelyLoadedField, type ReaderLinkedField, type ReaderNonLoadableResolverField, type ReaderScalarField } from './reader';
+import { ReaderAst, type ReaderImperativelyLoadedField, type ReaderLinkedField, type ReaderLoadableField, type ReaderNonLoadableResolverField, type ReaderScalarField } from './reader';
 export type WithEncounteredRecords<T> = {
     readonly encounteredRecords: EncounteredIds;
     readonly item: ExtractData<T>;
@@ -19,6 +19,7 @@ export type ReadDataResult<Data> = ReadDataResultSuccess<Data> | {
     readonly nestedReason?: ReadDataResult<unknown>;
     readonly recordLink: Link;
 };
+export declare function readLoadablySelectedFieldData(environment: IsographEnvironment, field: ReaderLoadableField, root: Link, variables: Variables, networkRequest: PromiseWrapper<void, any>, networkRequestOptions: NetworkRequestReaderOptions, mutableEncounteredRecords: EncounteredIds): ReadDataResult<unknown>;
 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>;

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;AAGjB,OAAO,EAEL,wCAAwC,EAEzC,MAAM,cAAc,CAAC;AACtB,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,6BAA6B,EAClC,KAAK,iBAAiB,EACtB,KAAK,8BAA8B,EACnC,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;AAwXN,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,mBAAmB,EAChC,KAAK,EAAE,8BAA8B,EACrC,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,SAAS,EACpB,oBAAoB,EAAE,wCAAwC,EAAE,EAChE,cAAc,EAAE,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC,EACzC,qBAAqB,EAAE,2BAA2B,EAClD,yBAAyB,EAAE,cAAc,GACxC,cAAc,CAAC,OAAO,CAAC,CA+EzB;AAED,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;AAiBD,wBAAgB,2BAA2B,CACzC,WAAW,EAAE,mBAAmB,EAChC,KAAK,EAAE,6BAA6B,EACpC,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,SAAS,EACpB,oBAAoB,EAAE,wCAAwC,EAAE,EAChE,cAAc,EAAE,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC,EACzC,qBAAqB,EAAE,2BAA2B,EAClD,yBAAyB,EAAE,cAAc,GACxC,cAAc,CAAC,OAAO,CAAC,CAuDzB"}
+{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../src/core/read.ts"],"names":[],"mappings":"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"}

package/dist/core/read.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readButDoNotEvaluate = readButDoNotEvaluate;
+exports.readLoadablySelectedFieldData = readLoadablySelectedFieldData;
 exports.readResolverFieldData = readResolverFieldData;
 exports.readScalarFieldData = readScalarFieldData;
 exports.readLinkedFieldData = readLinkedFieldData;
@@ -117,102 +118,11 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, netwo
                 break;
             }
             case 'LoadablySelectedField': {
-                const refetchReaderParams = readData(environment, field.refetchReaderAst, root, variables, 
-                // Refetch fields just read the id, and don't need refetch query artifacts
-                [], networkRequest, networkRequestOptions, mutableEncounteredRecords);
-                if (refetchReaderParams.kind === 'MissingData') {
-                    return {
-                        kind: 'MissingData',
-                        reason: 'Missing data for ' + field.alias + ' on root ' + root.__link,
-                        nestedReason: refetchReaderParams,
-                        recordLink: refetchReaderParams.recordLink,
-                    };
-                }
-                else {
-                    target[field.alias] = (args, 
-                    // TODO get the associated type for FetchOptions from the loadably selected field
-                    fetchOptions) => {
-                        // TODO we should use the reader AST for this
-                        const includeReadOutData = (variables, readOutData) => {
-                            variables.id = readOutData.id;
-                            return variables;
-                        };
-                        const localVariables = includeReadOutData(args !== null && args !== void 0 ? args : {}, refetchReaderParams.data);
-                        writeQueryArgsToVariables(localVariables, field.queryArguments, variables);
-                        return [
-                            // Stable id
-                            root.__typename +
-                                ':' +
-                                root.__link +
-                                '/' +
-                                field.name +
-                                '/' +
-                                stableStringifyArgs(localVariables),
-                            // Fetcher
-                            () => {
-                                const fragmentReferenceAndDisposeFromEntrypoint = (entrypoint) => {
-                                    const [networkRequest, disposeNetworkRequest] = (0, makeNetworkRequest_1.maybeMakeNetworkRequest)(environment, entrypoint, localVariables, fetchOptions);
-                                    const fragmentReference = {
-                                        kind: 'FragmentReference',
-                                        readerWithRefetchQueries: (0, PromiseWrapper_1.wrapResolvedValue)({
-                                            kind: 'ReaderWithRefetchQueries',
-                                            readerArtifact: entrypoint.readerWithRefetchQueries.readerArtifact,
-                                            nestedRefetchQueries: entrypoint.readerWithRefetchQueries
-                                                .nestedRefetchQueries,
-                                        }),
-                                        // TODO localVariables is not guaranteed to have an id field
-                                        root,
-                                        variables: localVariables,
-                                        networkRequest,
-                                    };
-                                    return [fragmentReference, disposeNetworkRequest];
-                                };
-                                if (field.entrypoint.kind === 'Entrypoint') {
-                                    return fragmentReferenceAndDisposeFromEntrypoint(field.entrypoint);
-                                }
-                                else {
-                                    const isographArtifactPromiseWrapper = (0, IsographEnvironment_1.getOrLoadIsographArtifact)(environment, field.entrypoint.typeAndField, field.entrypoint.loader);
-                                    const state = (0, PromiseWrapper_1.getPromiseState)(isographArtifactPromiseWrapper);
-                                    if (state.kind === 'Ok') {
-                                        return fragmentReferenceAndDisposeFromEntrypoint(state.value);
-                                    }
-                                    else {
-                                        // Promise is pending or thrown
-                                        let entrypointLoaderState = { kind: 'EntrypointNotLoaded' };
-                                        const networkRequest = (0, PromiseWrapper_1.wrapPromise)(isographArtifactPromiseWrapper.promise.then((entrypoint) => {
-                                            if (entrypointLoaderState.kind === 'EntrypointNotLoaded') {
-                                                const [networkRequest, disposeNetworkRequest] = (0, makeNetworkRequest_1.maybeMakeNetworkRequest)(environment, entrypoint, localVariables, fetchOptions);
-                                                entrypointLoaderState = {
-                                                    kind: 'NetworkRequestStarted',
-                                                    disposeNetworkRequest,
-                                                };
-                                                return networkRequest.promise;
-                                            }
-                                        }));
-                                        const readerWithRefetchPromise = isographArtifactPromiseWrapper.promise.then((entrypoint) => entrypoint.readerWithRefetchQueries);
-                                        const fragmentReference = {
-                                            kind: 'FragmentReference',
-                                            readerWithRefetchQueries: (0, PromiseWrapper_1.wrapPromise)(readerWithRefetchPromise),
-                                            // TODO localVariables is not guaranteed to have an id field
-                                            root,
-                                            variables: localVariables,
-                                            networkRequest,
-                                        };
-                                        return [
-                                            fragmentReference,
-                                            () => {
-                                                if (entrypointLoaderState.kind === 'NetworkRequestStarted') {
-                                                    entrypointLoaderState.disposeNetworkRequest();
-                                                }
-                                                entrypointLoaderState = { kind: 'Disposed' };
-                                            },
-                                        ];
-                                    }
-                                }
-                            },
-                        ];
-                    };
+                const data = readLoadablySelectedFieldData(environment, field, root, variables, networkRequest, networkRequestOptions, mutableEncounteredRecords);
+                if (data.kind === 'MissingData') {
+                    return data;
                 }
+                target[field.alias] = data.data;
                 break;
             }
             default: {
@@ -228,6 +138,104 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, netwo
         data: target,
     };
 }
+function readLoadablySelectedFieldData(environment, field, root, variables, networkRequest, networkRequestOptions, mutableEncounteredRecords) {
+    const refetchReaderParams = readData(environment, field.refetchReaderAst, root, variables, 
+    // Refetch fields just read the id, and don't need refetch query artifacts
+    [], networkRequest, networkRequestOptions, mutableEncounteredRecords);
+    if (refetchReaderParams.kind === 'MissingData') {
+        return {
+            kind: 'MissingData',
+            reason: 'Missing data for ' + field.alias + ' on root ' + root.__link,
+            nestedReason: refetchReaderParams,
+            recordLink: refetchReaderParams.recordLink,
+        };
+    }
+    return {
+        kind: 'Success',
+        data: (args, 
+        // TODO get the associated type for FetchOptions from the loadably selected field
+        fetchOptions) => {
+            // TODO we should use the reader AST for this
+            const includeReadOutData = (variables, readOutData) => {
+                variables.id = readOutData.id;
+                return variables;
+            };
+            const localVariables = includeReadOutData(args !== null && args !== void 0 ? args : {}, refetchReaderParams.data);
+            writeQueryArgsToVariables(localVariables, field.queryArguments, variables);
+            return [
+                // Stable id
+                root.__typename +
+                    ':' +
+                    root.__link +
+                    '/' +
+                    field.name +
+                    '/' +
+                    stableStringifyArgs(localVariables),
+                // Fetcher
+                () => {
+                    const fragmentReferenceAndDisposeFromEntrypoint = (entrypoint) => {
+                        const [networkRequest, disposeNetworkRequest] = (0, makeNetworkRequest_1.maybeMakeNetworkRequest)(environment, entrypoint, localVariables, fetchOptions);
+                        const fragmentReference = {
+                            kind: 'FragmentReference',
+                            readerWithRefetchQueries: (0, PromiseWrapper_1.wrapResolvedValue)({
+                                kind: 'ReaderWithRefetchQueries',
+                                readerArtifact: entrypoint.readerWithRefetchQueries.readerArtifact,
+                                nestedRefetchQueries: entrypoint.readerWithRefetchQueries.nestedRefetchQueries,
+                            }),
+                            // TODO localVariables is not guaranteed to have an id field
+                            root,
+                            variables: localVariables,
+                            networkRequest,
+                        };
+                        return [fragmentReference, disposeNetworkRequest];
+                    };
+                    if (field.entrypoint.kind === 'Entrypoint') {
+                        return fragmentReferenceAndDisposeFromEntrypoint(field.entrypoint);
+                    }
+                    else {
+                        const isographArtifactPromiseWrapper = (0, IsographEnvironment_1.getOrLoadIsographArtifact)(environment, field.entrypoint.typeAndField, field.entrypoint.loader);
+                        const state = (0, PromiseWrapper_1.getPromiseState)(isographArtifactPromiseWrapper);
+                        if (state.kind === 'Ok') {
+                            return fragmentReferenceAndDisposeFromEntrypoint(state.value);
+                        }
+                        else {
+                            // Promise is pending or thrown
+                            let entrypointLoaderState = { kind: 'EntrypointNotLoaded' };
+                            const networkRequest = (0, PromiseWrapper_1.wrapPromise)(isographArtifactPromiseWrapper.promise.then((entrypoint) => {
+                                if (entrypointLoaderState.kind === 'EntrypointNotLoaded') {
+                                    const [networkRequest, disposeNetworkRequest] = (0, makeNetworkRequest_1.maybeMakeNetworkRequest)(environment, entrypoint, localVariables, fetchOptions);
+                                    entrypointLoaderState = {
+                                        kind: 'NetworkRequestStarted',
+                                        disposeNetworkRequest,
+                                    };
+                                    return networkRequest.promise;
+                                }
+                            }));
+                            const readerWithRefetchPromise = isographArtifactPromiseWrapper.promise.then((entrypoint) => entrypoint.readerWithRefetchQueries);
+                            const fragmentReference = {
+                                kind: 'FragmentReference',
+                                readerWithRefetchQueries: (0, PromiseWrapper_1.wrapPromise)(readerWithRefetchPromise),
+                                // TODO localVariables is not guaranteed to have an id field
+                                root,
+                                variables: localVariables,
+                                networkRequest,
+                            };
+                            return [
+                                fragmentReference,
+                                () => {
+                                    if (entrypointLoaderState.kind === 'NetworkRequestStarted') {
+                                        entrypointLoaderState.disposeNetworkRequest();
+                                    }
+                                    entrypointLoaderState = { kind: 'Disposed' };
+                                },
+                            ];
+                        }
+                    }
+                },
+            ];
+        },
+    };
+}
 function filterVariables(variables, allowedVariables) {
     const result = {};
     for (const key of allowedVariables) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isograph/react",
-  "version": "0.0.0-main-6815ceff",
+  "version": "0.0.0-main-3092d4a2",
   "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-6815ceff",
-    "@isograph/react-disposable-state": "0.0.0-main-6815ceff",
-    "@isograph/reference-counted-pointer": "0.0.0-main-6815ceff"
+    "@isograph/disposable-types": "0.0.0-main-3092d4a2",
+    "@isograph/react-disposable-state": "0.0.0-main-3092d4a2",
+    "@isograph/reference-counted-pointer": "0.0.0-main-3092d4a2"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0"

package/src/core/read.ts

@@ -40,6 +40,7 @@ import {
   ReaderAst,
   type ReaderImperativelyLoadedField,
   type ReaderLinkedField,
+  type ReaderLoadableField,
   type ReaderNonLoadableResolverField,
   type ReaderScalarField,
 } from './reader';
@@ -247,172 +248,19 @@ function readData<TReadFromStore>(
         break;
       }
       case 'LoadablySelectedField': {
-        const refetchReaderParams = readData(
+        const data = readLoadablySelectedFieldData(
           environment,
-          field.refetchReaderAst,
+          field,
           root,
           variables,
-          // Refetch fields just read the id, and don't need refetch query artifacts
-          [],
           networkRequest,
           networkRequestOptions,
           mutableEncounteredRecords,
         );
-        if (refetchReaderParams.kind === 'MissingData') {
-          return {
-            kind: 'MissingData',
-            reason:
-              'Missing data for ' + field.alias + ' on root ' + root.__link,
-            nestedReason: refetchReaderParams,
-            recordLink: refetchReaderParams.recordLink,
-          };
-        } else {
-          target[field.alias] = (
-            args: any,
-            // TODO get the associated type for FetchOptions from the loadably selected field
-            fetchOptions?: FetchOptions<any>,
-          ) => {
-            // TODO we should use the reader AST for this
-            const includeReadOutData = (variables: any, readOutData: any) => {
-              variables.id = readOutData.id;
-              return variables;
-            };
-            const localVariables = includeReadOutData(
-              args ?? {},
-              refetchReaderParams.data,
-            );
-            writeQueryArgsToVariables(
-              localVariables,
-              field.queryArguments,
-              variables,
-            );
-
-            return [
-              // Stable id
-              root.__typename +
-                ':' +
-                root.__link +
-                '/' +
-                field.name +
-                '/' +
-                stableStringifyArgs(localVariables),
-              // Fetcher
-              () => {
-                const fragmentReferenceAndDisposeFromEntrypoint = (
-                  entrypoint: IsographEntrypoint<any, any, any>,
-                ): [FragmentReference<any, any>, CleanupFn] => {
-                  const [networkRequest, disposeNetworkRequest] =
-                    maybeMakeNetworkRequest(
-                      environment,
-                      entrypoint,
-                      localVariables,
-                      fetchOptions,
-                    );
-
-                  const fragmentReference: FragmentReference<any, any> = {
-                    kind: 'FragmentReference',
-                    readerWithRefetchQueries: wrapResolvedValue({
-                      kind: 'ReaderWithRefetchQueries',
-                      readerArtifact:
-                        entrypoint.readerWithRefetchQueries.readerArtifact,
-                      nestedRefetchQueries:
-                        entrypoint.readerWithRefetchQueries
-                          .nestedRefetchQueries,
-                    } as const),
-
-                    // TODO localVariables is not guaranteed to have an id field
-                    root,
-                    variables: localVariables,
-                    networkRequest,
-                  };
-                  return [fragmentReference, disposeNetworkRequest];
-                };
-
-                if (field.entrypoint.kind === 'Entrypoint') {
-                  return fragmentReferenceAndDisposeFromEntrypoint(
-                    field.entrypoint,
-                  );
-                } else {
-                  const isographArtifactPromiseWrapper =
-                    getOrLoadIsographArtifact(
-                      environment,
-                      field.entrypoint.typeAndField,
-                      field.entrypoint.loader,
-                    );
-                  const state = getPromiseState(isographArtifactPromiseWrapper);
-                  if (state.kind === 'Ok') {
-                    return fragmentReferenceAndDisposeFromEntrypoint(
-                      state.value,
-                    );
-                  } else {
-                    // Promise is pending or thrown
-
-                    let entrypointLoaderState:
-                      | {
-                          kind: 'EntrypointNotLoaded';
-                        }
-                      | {
-                          kind: 'NetworkRequestStarted';
-                          disposeNetworkRequest: CleanupFn;
-                        }
-                      | { kind: 'Disposed' } = { kind: 'EntrypointNotLoaded' };
-
-                    const networkRequest = wrapPromise(
-                      isographArtifactPromiseWrapper.promise.then(
-                        (entrypoint) => {
-                          if (
-                            entrypointLoaderState.kind === 'EntrypointNotLoaded'
-                          ) {
-                            const [networkRequest, disposeNetworkRequest] =
-                              maybeMakeNetworkRequest(
-                                environment,
-                                entrypoint,
-                                localVariables,
-                                fetchOptions,
-                              );
-                            entrypointLoaderState = {
-                              kind: 'NetworkRequestStarted',
-                              disposeNetworkRequest,
-                            };
-                            return networkRequest.promise;
-                          }
-                        },
-                      ),
-                    );
-                    const readerWithRefetchPromise =
-                      isographArtifactPromiseWrapper.promise.then(
-                        (entrypoint) => entrypoint.readerWithRefetchQueries,
-                      );
-
-                    const fragmentReference: FragmentReference<any, any> = {
-                      kind: 'FragmentReference',
-                      readerWithRefetchQueries: wrapPromise(
-                        readerWithRefetchPromise,
-                      ),
-
-                      // TODO localVariables is not guaranteed to have an id field
-                      root,
-                      variables: localVariables,
-                      networkRequest,
-                    };
-
-                    return [
-                      fragmentReference,
-                      () => {
-                        if (
-                          entrypointLoaderState.kind === 'NetworkRequestStarted'
-                        ) {
-                          entrypointLoaderState.disposeNetworkRequest();
-                        }
-                        entrypointLoaderState = { kind: 'Disposed' };
-                      },
-                    ];
-                  }
-                }
-              },
-            ];
-          };
+        if (data.kind === 'MissingData') {
+          return data;
         }
+        target[field.alias] = data.data;
         break;
       }
 
@@ -430,6 +278,172 @@ function readData<TReadFromStore>(
   };
 }
 
+export function readLoadablySelectedFieldData(
+  environment: IsographEnvironment,
+  field: ReaderLoadableField,
+  root: Link,
+  variables: Variables,
+  networkRequest: PromiseWrapper<void, any>,
+  networkRequestOptions: NetworkRequestReaderOptions,
+  mutableEncounteredRecords: EncounteredIds,
+): ReadDataResult<unknown> {
+  const refetchReaderParams = readData(
+    environment,
+    field.refetchReaderAst,
+    root,
+    variables,
+    // Refetch fields just read the id, and don't need refetch query artifacts
+    [],
+    networkRequest,
+    networkRequestOptions,
+    mutableEncounteredRecords,
+  );
+
+  if (refetchReaderParams.kind === 'MissingData') {
+    return {
+      kind: 'MissingData',
+      reason: 'Missing data for ' + field.alias + ' on root ' + root.__link,
+      nestedReason: refetchReaderParams,
+      recordLink: refetchReaderParams.recordLink,
+    };
+  }
+
+  return {
+    kind: 'Success',
+    data: (
+      args: any,
+      // TODO get the associated type for FetchOptions from the loadably selected field
+      fetchOptions?: FetchOptions<any>,
+    ) => {
+      // TODO we should use the reader AST for this
+      const includeReadOutData = (variables: any, readOutData: any) => {
+        variables.id = readOutData.id;
+        return variables;
+      };
+      const localVariables = includeReadOutData(
+        args ?? {},
+        refetchReaderParams.data,
+      );
+      writeQueryArgsToVariables(
+        localVariables,
+        field.queryArguments,
+        variables,
+      );
+
+      return [
+        // Stable id
+        root.__typename +
+          ':' +
+          root.__link +
+          '/' +
+          field.name +
+          '/' +
+          stableStringifyArgs(localVariables),
+        // Fetcher
+        () => {
+          const fragmentReferenceAndDisposeFromEntrypoint = (
+            entrypoint: IsographEntrypoint<any, any, any>,
+          ): [FragmentReference<any, any>, CleanupFn] => {
+            const [networkRequest, disposeNetworkRequest] =
+              maybeMakeNetworkRequest(
+                environment,
+                entrypoint,
+                localVariables,
+                fetchOptions,
+              );
+
+            const fragmentReference: FragmentReference<any, any> = {
+              kind: 'FragmentReference',
+              readerWithRefetchQueries: wrapResolvedValue({
+                kind: 'ReaderWithRefetchQueries',
+                readerArtifact:
+                  entrypoint.readerWithRefetchQueries.readerArtifact,
+                nestedRefetchQueries:
+                  entrypoint.readerWithRefetchQueries.nestedRefetchQueries,
+              } as const),
+
+              // TODO localVariables is not guaranteed to have an id field
+              root,
+              variables: localVariables,
+              networkRequest,
+            };
+            return [fragmentReference, disposeNetworkRequest];
+          };
+
+          if (field.entrypoint.kind === 'Entrypoint') {
+            return fragmentReferenceAndDisposeFromEntrypoint(field.entrypoint);
+          } else {
+            const isographArtifactPromiseWrapper = getOrLoadIsographArtifact(
+              environment,
+              field.entrypoint.typeAndField,
+              field.entrypoint.loader,
+            );
+            const state = getPromiseState(isographArtifactPromiseWrapper);
+            if (state.kind === 'Ok') {
+              return fragmentReferenceAndDisposeFromEntrypoint(state.value);
+            } else {
+              // Promise is pending or thrown
+
+              let entrypointLoaderState:
+                | {
+                    kind: 'EntrypointNotLoaded';
+                  }
+                | {
+                    kind: 'NetworkRequestStarted';
+                    disposeNetworkRequest: CleanupFn;
+                  }
+                | { kind: 'Disposed' } = { kind: 'EntrypointNotLoaded' };
+
+              const networkRequest = wrapPromise(
+                isographArtifactPromiseWrapper.promise.then((entrypoint) => {
+                  if (entrypointLoaderState.kind === 'EntrypointNotLoaded') {
+                    const [networkRequest, disposeNetworkRequest] =
+                      maybeMakeNetworkRequest(
+                        environment,
+                        entrypoint,
+                        localVariables,
+                        fetchOptions,
+                      );
+                    entrypointLoaderState = {
+                      kind: 'NetworkRequestStarted',
+                      disposeNetworkRequest,
+                    };
+                    return networkRequest.promise;
+                  }
+                }),
+              );
+              const readerWithRefetchPromise =
+                isographArtifactPromiseWrapper.promise.then(
+                  (entrypoint) => entrypoint.readerWithRefetchQueries,
+                );
+
+              const fragmentReference: FragmentReference<any, any> = {
+                kind: 'FragmentReference',
+                readerWithRefetchQueries: wrapPromise(readerWithRefetchPromise),
+
+                // TODO localVariables is not guaranteed to have an id field
+                root,
+                variables: localVariables,
+                networkRequest,
+              };
+
+              return [
+                fragmentReference,
+                () => {
+                  if (entrypointLoaderState.kind === 'NetworkRequestStarted') {
+                    entrypointLoaderState.disposeNetworkRequest();
+                  }
+                  entrypointLoaderState = { kind: 'Disposed' };
+                },
+              ];
+            }
+          }
+        },
+      ];
+    },
+  };
+}
+
 function filterVariables(
   variables: Variables,
   allowedVariables: string[],