@isograph/react 0.0.0-main-6815ceff → 0.0.0-main-17115d24

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-17115d24 compile-typescript /Users/runner/work/isograph/isograph/libs/isograph-react
 > rm -rf dist/* && tsc -p tsconfig.pkg.json
 

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

@@ -1 +1 @@
-{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../src/core/cache.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../src/core/cache.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAEP,WAAW,EACZ,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,kBAAkB,EAElB,wBAAwB,EACxB,wBAAwB,EACxB,wCAAwC,EACxC,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAC3B,KAAK,qBAAqB,EAC3B,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,SAAS,EACT,KAAK,qBAAqB,EAE3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,MAAM,EAIN,IAAI,EAGJ,KAAK,mBAAmB,EACxB,KAAK,QAAQ,EACd,MAAM,uBAAuB,CAAC;AAI/B,OAAO,EAAwB,sBAAsB,EAAE,MAAM,QAAQ,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,KAAK,SAAS,EAAE,MAAM,UAAU,CAAC;AAGhF,eAAO,MAAM,mBAAmB,eAAe,CAAC;AAEhD,wBAAgB,8BAA8B,CAC5C,cAAc,SAAS,qBAAqB,EAC5C,iBAAiB,EAEjB,WAAW,EAAE,mBAAmB,EAChC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,OAAO,CAAC,iBAAiB,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC,GACrE,WAAW,CAAC,iBAAiB,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC,CAMnE;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAezC;AAED,wBAAgB,2BAA2B,CACzC,cAAc,SAAS,qBAAqB,EAC5C,iBAAiB,EACjB,iBAAiB,SAAS,gBAAgB,GAAG,sBAAsB,EAEnE,WAAW,EAAE,mBAAmB,EAChC,UAAU,EAAE,kBAAkB,CAC5B,cAAc,EACd,iBAAiB,EACjB,iBAAiB,CAClB,EACD,SAAS,EAAE,iBAAiB,CAAC,cAAc,CAAC,EAC5C,YAAY,CAAC,EAAE,YAAY,CAAC,iBAAiB,CAAC,GAC7C,WAAW,CAAC,iBAAiB,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC,CAgCnE;AAED,MAAM,MAAM,0BAA0B,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AACnE,MAAM,MAAM,oBAAoB,GAC5B,0BAA0B,GAC1B,IAAI,GACJ,qBAAqB,GACrB,CAAC,qBAAqB,GAAG,IAAI,CAAC,EAAE,GAChC,CAAC,0BAA0B,GAAG,IAAI,CAAC,EAAE,CAAC;AAE1C,MAAM,MAAM,qBAAqB,GAAG;IAGlC,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,oBAAoB,CAAC;IAClD,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,UAAU,CAAC,EAAE,QAAQ,CAAC;CACvB,CAAC;AAEF,wBAAgB,aAAa,CAC3B,WAAW,EAAE,mBAAmB,EAChC,gBAAgB,EAAE,qBAAqB,EACvC,eAAe,EAAE,qBAAqB,EACtC,SAAS,EAAE,SAAS,EACpB,oBAAoB,EAAE,wCAAwC,EAAE,EAChE,IAAI,EAAE,IAAI,GACT,cAAc,CAgChB;AAED,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,mBAAmB,EAChC,QAAQ,EAAE,MAAM,IAAI,GACnB,MAAM,IAAI,CAOZ;AAED,wBAAgB,6BAA6B,CAC3C,WAAW,EAAE,mBAAmB,EAChC,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,MAAM,IAAI,GACnB,MAAM,IAAI,CAQZ;AAGD,wBAAgB,SAAS,CAAC,cAAc,SAAS,qBAAqB,EACpE,WAAW,EAAE,mBAAmB,EAChC,yBAAyB,EAAE,sBAAsB,CAAC,cAAc,CAAC,EACjE,iBAAiB,EAAE,iBAAiB,CAAC,cAAc,EAAE,GAAG,CAAC,EACzD,QAAQ,EAAE,CACR,4BAA4B,EAAE,sBAAsB,CAAC,cAAc,CAAC,KACjE,IAAI,EACT,SAAS,EAAE,SAAS,CAAC,cAAc,CAAC,GACnC,MAAM,IAAI,CAUZ;AAED,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,mBAAmB,EAChC,UAAU,EAAE,IAAI,GACf,OAAO,CAAC,IAAI,CAAC,CAWf;AA8HD,MAAM,MAAM,cAAc,GAAG,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;AA6ExD,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,UAOlE;AAwPD,wBAAgB,kBAAkB,CAChC,OAAO,EACH,wBAAwB,GACxB,wBAAwB,GACxB,iBAAiB,GACjB,iBAAiB,EACrB,SAAS,EAAE,SAAS,GACnB,MAAM,CAUR;AA0GD,eAAO,MAAM,eAAe,SAAS,CAAC;AACtC,eAAO,MAAM,gBAAgB,QAAQ,CAAC;AACtC,eAAO,MAAM,eAAe,OAAO,CAAC"}

package/dist/core/cache.js

@@ -20,13 +20,6 @@ const PromiseWrapper_1 = require("./PromiseWrapper");
 const read_1 = require("./read");
 exports.TYPENAME_FIELD_NAME = '__typename';
 function getOrCreateItemInSuspenseCache(environment, index, factory) {
-    // TODO this is probably a useless message, we should remove it
-    (0, logging_1.logMessage)(environment, {
-        kind: 'GettingSuspenseCacheItem',
-        index,
-        availableCacheItems: Object.keys(environment.fragmentCache),
-        found: !!environment.fragmentCache[index],
-    });
     if (environment.fragmentCache[index] == null) {
         environment.fragmentCache[index] = new react_disposable_state_1.ParentCache(factory);
     }
@@ -80,20 +73,20 @@ function normalizeData(environment, normalizationAst, networkResponse, variables
     var _a, _b;
     var _c, _d, _e;
     const encounteredIds = new Map();
-    (0, logging_1.logMessage)(environment, {
+    (0, logging_1.logMessage)(environment, () => ({
         kind: 'AboutToNormalize',
         normalizationAst,
         networkResponse,
         variables,
-    });
+    }));
     const recordsById = ((_a = (_c = environment.store)[_d = root.__typename]) !== null && _a !== void 0 ? _a : (_c[_d] = {}));
     const newStoreRecord = ((_b = recordsById[_e = root.__link]) !== null && _b !== void 0 ? _b : (recordsById[_e] = {}));
     normalizeDataIntoRecord(environment, normalizationAst, networkResponse, newStoreRecord, root, variables, nestedRefetchQueries, encounteredIds);
-    (0, logging_1.logMessage)(environment, {
+    (0, logging_1.logMessage)(environment, () => ({
         kind: 'AfterNormalization',
         store: environment.store,
         encounteredIds,
-    });
+    }));
     callSubscriptions(environment, encounteredIds);
     return encounteredIds;
 }
@@ -174,13 +167,13 @@ function callSubscriptions(environment, recordsEncounteredWhenNormalizing) {
                         throwOnNetworkError: false,
                     });
                     const mergedItem = (0, areEqualWithDeepComparison_1.mergeObjectsUsingReaderAst)(subscription.readerAst, subscription.encounteredDataAndRecords.item, newEncounteredDataAndRecords.item);
-                    (0, logging_1.logMessage)(environment, {
+                    (0, logging_1.logMessage)(environment, () => ({
                         kind: 'DeepEqualityCheck',
                         fragmentReference: subscription.fragmentReference,
                         old: subscription.encounteredDataAndRecords.item,
                         new: newEncounteredDataAndRecords.item,
                         deeplyEqual: mergedItem === subscription.encounteredDataAndRecords.item,
-                    });
+                    }));
                     if (mergedItem !== subscription.encounteredDataAndRecords.item) {
                         subscription.callback(newEncounteredDataAndRecords);
                     }

package/dist/core/check.js

@@ -12,10 +12,10 @@ function check(environment, normalizationAst, variables, root) {
     const recordsById = ((_a = (_c = environment.store)[_d = root.__typename]) !== null && _a !== void 0 ? _a : (_c[_d] = {}));
     const newStoreRecord = ((_b = recordsById[_e = root.__link]) !== null && _b !== void 0 ? _b : (recordsById[_e] = {}));
     const checkResult = checkFromRecord(environment, normalizationAst, variables, newStoreRecord, root);
-    (0, logging_1.logMessage)(environment, {
+    (0, logging_1.logMessage)(environment, () => ({
         kind: 'EnvironmentCheck',
         result: checkResult,
-    });
+    }));
     return checkResult;
 }
 function checkFromRecord(environment, normalizationAst, variables, record, recordLink) {

package/dist/core/componentCache.js

@@ -15,11 +15,11 @@ function getOrCreateCachedComponent(environment, componentName, fragmentReferenc
         function Component(additionalRuntimeProps) {
             const readerWithRefetchQueries = (0, PromiseWrapper_1.readPromise)(fragmentReference.readerWithRefetchQueries);
             const data = (0, useReadAndSubscribe_1.useReadAndSubscribe)(fragmentReference, networkRequestOptions, readerWithRefetchQueries.readerArtifact.readerAst);
-            (0, logging_1.logMessage)(environment, {
+            (0, logging_1.logMessage)(environment, () => ({
                 kind: 'ComponentRerendered',
                 componentName,
                 rootLink: fragmentReference.root,
-            });
+            }));
             return readerWithRefetchQueries.readerArtifact.resolver({
                 data,
                 parameters: fragmentReference.variables,

package/dist/core/logging.d.ts

@@ -7,11 +7,6 @@ import { IsographEnvironment, IsographStore, StoreRecord, type Link } from './Is
 import { ReadDataResult } from './read';
 import { Arguments } from './util';
 export type LogMessage = {
-    kind: 'GettingSuspenseCacheItem';
-    index: string;
-    availableCacheItems: ReadonlyArray<string>;
-    found: boolean;
-} | {
     kind: 'AboutToNormalize';
     normalizationAst: NormalizationAstNodes;
     networkResponse: NetworkResponseObject;
@@ -53,6 +48,8 @@ export type LogMessage = {
 } | {
     kind: 'DoneReading';
     response: ReadDataResult<any>;
+    fieldName: string;
+    root: Link;
 } | {
     kind: 'NonEntrypointReceived';
     entrypoint: any;
@@ -66,6 +63,6 @@ export type LogFunction = (logMessage: LogMessage) => void;
 export type WrappedLogFunction = {
     log: LogFunction;
 };
-export declare function logMessage(environment: IsographEnvironment, message: LogMessage): void;
+export declare function logMessage(environment: IsographEnvironment, getMessage: () => LogMessage): void;
 export declare function registerLogger(environment: IsographEnvironment, log: LogFunction): CleanupFn;
 //# sourceMappingURL=logging.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../src/core/logging.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../src/core/logging.ts"],"names":[],"mappings":"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"}

package/dist/core/logging.js

@@ -2,12 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logMessage = logMessage;
 exports.registerLogger = registerLogger;
-function logMessage(environment, message) {
-    for (const logger of environment.loggers) {
-        try {
-            logger.log(message);
+function logMessage(environment, getMessage) {
+    if (environment.loggers.size > 0) {
+        const message = getMessage();
+        for (const logger of environment.loggers) {
+            try {
+                logger.log(message);
+            }
+            catch (_a) { }
         }
-        catch (_a) { }
     }
 }
 function registerLogger(environment, log) {

package/dist/core/makeNetworkRequest.js

@@ -53,12 +53,12 @@ function makeNetworkRequest(environment, artifact, variables, fetchOptions) {
     // TODO this should be a DataId and stored in the store
     const myNetworkRequestId = networkRequestId + '';
     networkRequestId++;
-    (0, logging_1.logMessage)(environment, {
+    (0, logging_1.logMessage)(environment, () => ({
         kind: 'MakeNetworkRequest',
         artifact,
         variables,
         networkRequestId: myNetworkRequestId,
-    });
+    }));
     let status = {
         kind: 'UndisposedIncomplete',
     };
@@ -69,11 +69,11 @@ function makeNetworkRequest(environment, artifact, variables, fetchOptions) {
     ])
         .then(([networkResponse, normalizationAst]) => {
         var _a, _b;
-        (0, logging_1.logMessage)(environment, {
+        (0, logging_1.logMessage)(environment, () => ({
             kind: 'ReceivedNetworkResponse',
             networkResponse,
             networkRequestId: myNetworkRequestId,
-        });
+        }));
         if (networkResponse.errors != null) {
             try {
                 (_a = fetchOptions === null || fetchOptions === void 0 ? void 0 : fetchOptions.onError) === null || _a === void 0 ? void 0 : _a.call(fetchOptions);
@@ -114,11 +114,11 @@ function makeNetworkRequest(environment, artifact, variables, fetchOptions) {
     })
         .catch((e) => {
         var _a;
-        (0, logging_1.logMessage)(environment, {
+        (0, logging_1.logMessage)(environment, () => ({
             kind: 'ReceivedNetworkError',
             networkRequestId: myNetworkRequestId,
             error: e,
-        });
+        }));
         try {
             (_a = fetchOptions === null || fetchOptions === void 0 ? void 0 : fetchOptions.onError) === null || _a === void 0 ? void 0 : _a.call(fetchOptions);
         }

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":"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"}
+{"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;
@@ -19,10 +20,12 @@ function readButDoNotEvaluate(environment, fragmentReference, networkRequestOpti
     // TODO consider moving this to the outside
     const readerWithRefetchQueries = (0, PromiseWrapper_1.readPromise)(fragmentReference.readerWithRefetchQueries);
     const response = readData(environment, readerWithRefetchQueries.readerArtifact.readerAst, fragmentReference.root, (_a = fragmentReference.variables) !== null && _a !== void 0 ? _a : {}, readerWithRefetchQueries.nestedRefetchQueries, fragmentReference.networkRequest, networkRequestOptions, mutableEncounteredRecords);
-    (0, logging_1.logMessage)(environment, {
+    (0, logging_1.logMessage)(environment, () => ({
         kind: 'DoneReading',
         response,
-    });
+        fieldName: readerWithRefetchQueries.readerArtifact.fieldName,
+        root: fragmentReference.root,
+    }));
     if (response.kind === 'MissingData') {
         // There are two cases here that we care about:
         // 1. the network request is in flight, we haven't suspended on it, and we want
@@ -117,102 +120,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 +140,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) {
@@ -457,14 +467,14 @@ function readLinkedFieldData(environment, field, storeRecord, root, variables, n
         // TODO make this configurable, and also generated and derived from the schema
         const missingFieldHandler = environment.missingFieldHandler;
         const altLink = missingFieldHandler === null || missingFieldHandler === void 0 ? void 0 : missingFieldHandler(storeRecord, root, field.fieldName, field.arguments, variables);
-        (0, logging_1.logMessage)(environment, {
+        (0, logging_1.logMessage)(environment, () => ({
             kind: 'MissingFieldHandlerCalled',
             root,
             storeRecord,
             fieldName: field.fieldName,
             arguments: field.arguments,
             variables,
-        });
+        }));
         if (altLink === undefined) {
             return {
                 kind: 'MissingData',

package/dist/react/useLazyReference.js

@@ -9,10 +9,10 @@ function useLazyReference(entrypoint, variables, ...[fetchOptions]) {
     const environment = (0, IsographEnvironmentProvider_1.useIsographEnvironment)();
     if ((entrypoint === null || entrypoint === void 0 ? void 0 : entrypoint.kind) !== 'Entrypoint') {
         // TODO have a separate error logger
-        (0, logging_1.logMessage)(environment, {
+        (0, logging_1.logMessage)(environment, () => ({
             kind: 'NonEntrypointReceived',
             entrypoint,
-        });
+        }));
     }
     const cache = (0, cache_1.getOrCreateCacheForArtifact)(environment, entrypoint, variables, fetchOptions);
     return {

package/package.json

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

package/src/core/cache.ts

@@ -50,13 +50,6 @@ export function getOrCreateItemInSuspenseCache<
   index: string,
   factory: Factory<FragmentReference<TReadFromStore, TClientFieldValue>>,
 ): ParentCache<FragmentReference<TReadFromStore, TClientFieldValue>> {
-  // TODO this is probably a useless message, we should remove it
-  logMessage(environment, {
-    kind: 'GettingSuspenseCacheItem',
-    index,
-    availableCacheItems: Object.keys(environment.fragmentCache),
-    found: !!environment.fragmentCache[index],
-  });
   if (environment.fragmentCache[index] == null) {
     environment.fragmentCache[index] = new ParentCache(factory);
   }
@@ -159,12 +152,12 @@ export function normalizeData(
 ): EncounteredIds {
   const encounteredIds: EncounteredIds = new Map();
 
-  logMessage(environment, {
+  logMessage(environment, () => ({
     kind: 'AboutToNormalize',
     normalizationAst,
     networkResponse,
     variables,
-  });
+  }));
 
   const recordsById = (environment.store[root.__typename] ??= {});
   const newStoreRecord = (recordsById[root.__link] ??= {});
@@ -180,11 +173,11 @@ export function normalizeData(
     encounteredIds,
   );
 
-  logMessage(environment, {
+  logMessage(environment, () => ({
     kind: 'AfterNormalization',
     store: environment.store,
     encounteredIds,
-  });
+  }));
 
   callSubscriptions(environment, encounteredIds);
   return encounteredIds;
@@ -310,14 +303,14 @@ function callSubscriptions(
               newEncounteredDataAndRecords.item,
             );
 
-            logMessage(environment, {
+            logMessage(environment, () => ({
               kind: 'DeepEqualityCheck',
               fragmentReference: subscription.fragmentReference,
               old: subscription.encounteredDataAndRecords.item,
               new: newEncounteredDataAndRecords.item,
               deeplyEqual:
                 mergedItem === subscription.encounteredDataAndRecords.item,
-            });
+            }));
 
             if (mergedItem !== subscription.encounteredDataAndRecords.item) {
               subscription.callback(newEncounteredDataAndRecords);

package/src/core/check.ts

@@ -49,10 +49,10 @@ export function check(
     newStoreRecord,
     root,
   );
-  logMessage(environment, {
+  logMessage(environment, () => ({
     kind: 'EnvironmentCheck',
     result: checkResult,
-  });
+  }));
   return checkResult;
 }
 

package/src/core/componentCache.ts

@@ -32,11 +32,11 @@ export function getOrCreateCachedComponent(
         readerWithRefetchQueries.readerArtifact.readerAst,
       );
 
-      logMessage(environment, {
+      logMessage(environment, () => ({
         kind: 'ComponentRerendered',
         componentName,
         rootLink: fragmentReference.root,
-      });
+      }));
 
       return readerWithRefetchQueries.readerArtifact.resolver(
         {

package/src/core/logging.ts

@@ -17,12 +17,6 @@ import { ReadDataResult } from './read';
 import { Arguments } from './util';
 
 export type LogMessage =
-  | {
-      kind: 'GettingSuspenseCacheItem';
-      index: string;
-      availableCacheItems: ReadonlyArray<string>;
-      found: boolean;
-    }
   | {
       kind: 'AboutToNormalize';
       normalizationAst: NormalizationAstNodes;
@@ -76,6 +70,8 @@ export type LogMessage =
   | {
       kind: 'DoneReading';
       response: ReadDataResult<any>;
+      fieldName: string;
+      root: Link;
     }
   | {
       kind: 'NonEntrypointReceived';
@@ -98,12 +94,15 @@ export type WrappedLogFunction = {
 
 export function logMessage(
   environment: IsographEnvironment,
-  message: LogMessage,
+  getMessage: () => LogMessage,
 ) {
-  for (const logger of environment.loggers) {
-    try {
-      logger.log(message);
-    } catch {}
+  if (environment.loggers.size > 0) {
+    const message = getMessage();
+    for (const logger of environment.loggers) {
+      try {
+        logger.log(message);
+      } catch {}
+    }
   }
 }
 

package/src/core/makeNetworkRequest.ts

@@ -113,12 +113,12 @@ export function makeNetworkRequest<
   const myNetworkRequestId = networkRequestId + '';
   networkRequestId++;
 
-  logMessage(environment, {
+  logMessage(environment, () => ({
     kind: 'MakeNetworkRequest',
     artifact,
     variables,
     networkRequestId: myNetworkRequestId,
-  });
+  }));
 
   let status: NetworkRequestStatus = {
     kind: 'UndisposedIncomplete',
@@ -132,11 +132,11 @@ export function makeNetworkRequest<
     loadNormalizationAst(artifact.networkRequestInfo.normalizationAst),
   ])
     .then(([networkResponse, normalizationAst]) => {
-      logMessage(environment, {
+      logMessage(environment, () => ({
         kind: 'ReceivedNetworkResponse',
         networkResponse,
         networkRequestId: myNetworkRequestId,
-      });
+      }));
 
       if (networkResponse.errors != null) {
         try {
@@ -190,11 +190,11 @@ export function makeNetworkRequest<
       }
     })
     .catch((e) => {
-      logMessage(environment, {
+      logMessage(environment, () => ({
         kind: 'ReceivedNetworkError',
         networkRequestId: myNetworkRequestId,
         error: e,
-      });
+      }));
       try {
         fetchOptions?.onError?.();
       } catch {}

package/src/core/read.ts

@@ -40,6 +40,7 @@ import {
   ReaderAst,
   type ReaderImperativelyLoadedField,
   type ReaderLinkedField,
+  type ReaderLoadableField,
   type ReaderNonLoadableResolverField,
   type ReaderScalarField,
 } from './reader';
@@ -76,10 +77,12 @@ export function readButDoNotEvaluate<
     mutableEncounteredRecords,
   );
 
-  logMessage(environment, {
+  logMessage(environment, () => ({
     kind: 'DoneReading',
     response,
-  });
+    fieldName: readerWithRefetchQueries.readerArtifact.fieldName,
+    root: fragmentReference.root,
+  }));
 
   if (response.kind === 'MissingData') {
     // There are two cases here that we care about:
@@ -247,172 +250,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 +280,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[],
@@ -750,14 +766,14 @@ export function readLinkedFieldData(
       field.arguments,
       variables,
     );
-    logMessage(environment, {
+    logMessage(environment, () => ({
       kind: 'MissingFieldHandlerCalled',
       root,
       storeRecord,
       fieldName: field.fieldName,
       arguments: field.arguments,
       variables,
-    });
+    }));
 
     if (altLink === undefined) {
       return {

package/src/react/useLazyReference.ts

@@ -37,10 +37,10 @@ export function useLazyReference<
 
   if (entrypoint?.kind !== 'Entrypoint') {
     // TODO have a separate error logger
-    logMessage(environment, {
+    logMessage(environment, () => ({
       kind: 'NonEntrypointReceived',
       entrypoint,
-    });
+    }));
   }
 
   const cache = getOrCreateCacheForArtifact(