@isograph/react 0.2.0 → 0.3.0

package/dist/core/componentCache.js

@@ -1,38 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOrCreateCachedComponent = void 0;
+exports.getOrCreateCachedComponent = getOrCreateCachedComponent;
 const cache_1 = require("./cache");
 const useReadAndSubscribe_1 = require("../react/useReadAndSubscribe");
 const PromiseWrapper_1 = require("./PromiseWrapper");
+const logging_1 = require("./logging");
 function getOrCreateCachedComponent(environment, componentName, fragmentReference, networkRequestOptions) {
     var _a, _b, _c;
     // cachedComponentsById is a three layer cache: id, then component name, then
     // stringified args. These three, together, uniquely identify a read at a given
     // time.
     const cachedComponentsById = environment.componentCache;
-    cachedComponentsById[fragmentReference.root] =
-        (_a = cachedComponentsById[fragmentReference.root]) !== null && _a !== void 0 ? _a : {};
-    const componentsByName = cachedComponentsById[fragmentReference.root];
+    const recordLink = fragmentReference.root.__link;
+    const componentsByName = ((_a = cachedComponentsById[recordLink]) !== null && _a !== void 0 ? _a : (cachedComponentsById[recordLink] = {}));
     componentsByName[componentName] = (_b = componentsByName[componentName]) !== null && _b !== void 0 ? _b : {};
     const byArgs = componentsByName[componentName];
     const stringifiedArgs = JSON.stringify((0, cache_1.stableCopy)(fragmentReference.variables));
     byArgs[stringifiedArgs] =
         (_c = byArgs[stringifiedArgs]) !== null && _c !== void 0 ? _c : (() => {
             function Component(additionalRuntimeProps) {
-                const data = (0, useReadAndSubscribe_1.useReadAndSubscribe)(fragmentReference, networkRequestOptions);
-                // @ts-expect-error
-                if (typeof window !== 'undefined' && window.__LOG) {
-                    console.log('Component re-rendered: ' +
-                        componentName +
-                        ' ' +
-                        fragmentReference.root);
-                }
                 const readerWithRefetchQueries = (0, PromiseWrapper_1.readPromise)(fragmentReference.readerWithRefetchQueries);
-                return readerWithRefetchQueries.readerArtifact.resolver(data, additionalRuntimeProps);
+                const data = (0, useReadAndSubscribe_1.useReadAndSubscribe)(fragmentReference, networkRequestOptions, readerWithRefetchQueries.readerArtifact.readerAst);
+                (0, logging_1.logMessage)(environment, {
+                    kind: 'ComponentRerendered',
+                    componentName,
+                    rootLink: fragmentReference.root,
+                });
+                return readerWithRefetchQueries.readerArtifact.resolver({
+                    data,
+                    parameters: fragmentReference.variables,
+                }, additionalRuntimeProps);
             }
             Component.displayName = `${componentName} (id: ${fragmentReference.root}) @component`;
             return Component;
         })();
     return byArgs[stringifiedArgs];
 }
-exports.getOrCreateCachedComponent = getOrCreateCachedComponent;

package/dist/core/entrypoint.d.ts

@@ -1,18 +1,32 @@
-/// <reference types="react" />
+import type { TypeName } from './IsographEnvironment';
 import { TopLevelReaderArtifact } from './reader';
 import { Arguments } from './util';
-export type ReaderWithRefetchQueries<TReadFromStore extends Object, TClientFieldValue> = {
+export type ReaderWithRefetchQueries<TReadFromStore extends {
+    parameters: object;
+    data: object;
+}, TClientFieldValue> = {
     readonly kind: 'ReaderWithRefetchQueries';
     readonly readerArtifact: TopLevelReaderArtifact<TReadFromStore, TClientFieldValue, any>;
     readonly nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[];
 };
-export type IsographEntrypoint<TReadFromStore extends Object, TClientFieldValue> = {
-    readonly kind: 'Entrypoint';
+export type NetworkRequestInfo = {
+    readonly kind: 'NetworkRequestInfo';
     readonly queryText: string;
     readonly normalizationAst: NormalizationAst;
+};
+export type IsographEntrypoint<TReadFromStore extends {
+    parameters: object;
+    data: object;
+}, TClientFieldValue> = {
+    readonly kind: 'Entrypoint';
+    readonly networkRequestInfo: NetworkRequestInfo;
     readonly readerWithRefetchQueries: ReaderWithRefetchQueries<TReadFromStore, TClientFieldValue>;
+    readonly concreteType: TypeName;
 };
-export type IsographEntrypointLoader<TReadFromStore extends Object, TClientFieldValue> = {
+export type IsographEntrypointLoader<TReadFromStore extends {
+    parameters: object;
+    data: object;
+}, TClientFieldValue> = {
     readonly kind: 'EntrypointLoader';
     readonly typeAndField: string;
     readonly loader: () => Promise<IsographEntrypoint<TReadFromStore, TClientFieldValue>>;
@@ -29,6 +43,7 @@ export type NormalizationLinkedField = {
     readonly fieldName: string;
     readonly arguments: Arguments | null;
     readonly selections: NormalizationAst;
+    readonly concreteType: TypeName | null;
 };
 export type NormalizationInlineFragment = {
     readonly kind: 'InlineFragment';
@@ -37,14 +52,18 @@ export type NormalizationInlineFragment = {
 };
 export type RefetchQueryNormalizationArtifact = {
     readonly kind: 'RefetchQuery';
-    readonly queryText: string;
-    readonly normalizationAst: NormalizationAst;
+    readonly networkRequestInfo: NetworkRequestInfo;
+    readonly concreteType: TypeName;
 };
 export type RefetchQueryNormalizationArtifactWrapper = {
     readonly artifact: RefetchQueryNormalizationArtifact;
     readonly allowedVariables: string[];
 };
-export declare function assertIsEntrypoint<TReadFromStore extends Object, TClientFieldValue>(value: IsographEntrypoint<TReadFromStore, TClientFieldValue> | ((_: any) => any) | any): asserts value is IsographEntrypoint<TReadFromStore, TClientFieldValue>;
+export declare function assertIsEntrypoint<TReadFromStore extends {
+    parameters: object;
+    data: object;
+}, TClientFieldValue>(value: IsographEntrypoint<TReadFromStore, TClientFieldValue> | ((_: any) => any) | any): asserts value is IsographEntrypoint<TReadFromStore, TClientFieldValue>;
 export type ExtractReadFromStore<Type> = Type extends IsographEntrypoint<infer X, any> ? X : never;
 export type ExtractResolverResult<Type> = Type extends IsographEntrypoint<any, infer X> ? X : never;
 export type ExtractProps<Type> = Type extends React.FC<infer X> ? X : never;
+//# sourceMappingURL=entrypoint.d.ts.map

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

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

package/dist/core/entrypoint.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertIsEntrypoint = void 0;
+exports.assertIsEntrypoint = assertIsEntrypoint;
 function assertIsEntrypoint(value) {
     if (typeof value === 'function')
         throw new Error('Not a string');
 }
-exports.assertIsEntrypoint = assertIsEntrypoint;

package/dist/core/garbageCollection.d.ts

@@ -1,11 +1,13 @@
-import { IsographEnvironment } from './IsographEnvironment';
+import { IsographEnvironment, type Link } from './IsographEnvironment';
 import { NormalizationAst } from './entrypoint';
 export type RetainedQuery = {
     readonly normalizationAst: NormalizationAst;
     readonly variables: {};
+    readonly root: Link;
 };
 type DidUnretainSomeQuery = boolean;
 export declare function unretainQuery(environment: IsographEnvironment, retainedQuery: RetainedQuery): DidUnretainSomeQuery;
 export declare function retainQuery(environment: IsographEnvironment, queryToRetain: RetainedQuery): void;
 export declare function garbageCollectEnvironment(environment: IsographEnvironment): void;
 export {};
+//# sourceMappingURL=garbageCollection.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"garbageCollection.d.ts","sourceRoot":"","sources":["../../src/core/garbageCollection.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,mBAAmB,EAInB,KAAK,IAAI,EAEV,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC5C,QAAQ,CAAC,SAAS,EAAE,EAAE,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;CACrB,CAAC;AAEF,KAAK,oBAAoB,GAAG,OAAO,CAAC;AACpC,wBAAgB,aAAa,CAC3B,WAAW,EAAE,mBAAmB,EAChC,aAAa,EAAE,aAAa,GAC3B,oBAAoB,CAUtB;AAED,wBAAgB,WAAW,CACzB,WAAW,EAAE,mBAAmB,EAChC,aAAa,EAAE,aAAa,QAM7B;AAED,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,mBAAmB,QA+BzE"}

package/dist/core/garbageCollection.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.garbageCollectEnvironment = exports.retainQuery = exports.unretainQuery = void 0;
+exports.unretainQuery = unretainQuery;
+exports.retainQuery = retainQuery;
+exports.garbageCollectEnvironment = garbageCollectEnvironment;
 const IsographEnvironment_1 = require("./IsographEnvironment");
 const cache_1 = require("./cache");
 function unretainQuery(environment, retainedQuery) {
@@ -12,57 +14,88 @@ function unretainQuery(environment, retainedQuery) {
     }
     return false;
 }
-exports.unretainQuery = unretainQuery;
 function retainQuery(environment, queryToRetain) {
     environment.retainedQueries.add(queryToRetain);
     // TODO can we remove this query from the buffer somehow?
     // We are relying on === equality, but we really should be comparing
     // id + variables
 }
-exports.retainQuery = retainQuery;
 function garbageCollectEnvironment(environment) {
-    const retainedIds = new Set([IsographEnvironment_1.ROOT_ID]);
+    const retainedIds = {};
     for (const query of environment.retainedQueries) {
         recordReachableIds(environment.store, query, retainedIds);
     }
     for (const query of environment.gcBuffer) {
         recordReachableIds(environment.store, query, retainedIds);
     }
-    for (const dataId in environment.store) {
-        if (!retainedIds.has(dataId)) {
-            delete environment.store[dataId];
+    for (const typeName in environment.store) {
+        const dataById = environment.store[typeName];
+        if (dataById == null)
+            continue;
+        const retainedTypeIds = retainedIds[typeName];
+        // delete all objects
+        if (retainedTypeIds == undefined || retainedTypeIds.size == 0) {
+            delete environment.store[typeName];
+            continue;
+        }
+        for (const dataId in dataById) {
+            if (!retainedTypeIds.has(dataId)) {
+                delete dataById[dataId];
+            }
+        }
+        if (Object.keys(dataById).length === 0) {
+            delete environment.store[typeName];
         }
     }
 }
-exports.garbageCollectEnvironment = garbageCollectEnvironment;
 function recordReachableIds(store, retainedQuery, mutableRetainedIds) {
-    recordReachableIdsFromRecord(store, store[IsographEnvironment_1.ROOT_ID], mutableRetainedIds, retainedQuery.normalizationAst, retainedQuery.variables);
+    var _a, _b;
+    var _c;
+    const record = (_a = store[retainedQuery.root.__typename]) === null || _a === void 0 ? void 0 : _a[retainedQuery.root.__link];
+    const retainedRecordsIds = ((_b = mutableRetainedIds[_c = retainedQuery.root.__typename]) !== null && _b !== void 0 ? _b : (mutableRetainedIds[_c] = new Set()));
+    retainedRecordsIds.add(retainedQuery.root.__link);
+    if (record) {
+        recordReachableIdsFromRecord(store, record, mutableRetainedIds, retainedQuery.normalizationAst, retainedQuery.variables);
+    }
 }
 function recordReachableIdsFromRecord(store, currentRecord, mutableRetainedIds, selections, variables) {
+    var _a;
     for (const selection of selections) {
         switch (selection.kind) {
             case 'Linked':
                 const linkKey = (0, cache_1.getParentRecordKey)(selection, variables !== null && variables !== void 0 ? variables : {});
                 const linkedFieldOrFields = currentRecord[linkKey];
-                const ids = [];
+                const links = [];
                 if (Array.isArray(linkedFieldOrFields)) {
                     for (const maybeLink of linkedFieldOrFields) {
                         const link = (0, IsographEnvironment_1.assertLink)(maybeLink);
                         if (link != null) {
-                            ids.push(link.__link);
+                            links.push(link);
                         }
                     }
                 }
                 else {
                     const link = (0, IsographEnvironment_1.assertLink)(linkedFieldOrFields);
                     if (link != null) {
-                        ids.push(link.__link);
+                        links.push(link);
                     }
                 }
-                for (const nextRecordId of ids) {
-                    const nextRecord = store[nextRecordId];
+                let typeStore = selection.concreteType !== null
+                    ? store[selection.concreteType]
+                    : null;
+                if (typeStore == null && selection.concreteType !== null) {
+                    continue;
+                }
+                for (const nextRecordLink of links) {
+                    let __typename = nextRecordLink.__typename;
+                    const resolvedTypeStore = typeStore !== null && typeStore !== void 0 ? typeStore : store[__typename];
+                    if (resolvedTypeStore == null) {
+                        continue;
+                    }
+                    const nextRecord = resolvedTypeStore[nextRecordLink.__link];
                     if (nextRecord != null) {
-                        mutableRetainedIds.add(nextRecordId);
+                        const retainedRecordsIds = ((_a = mutableRetainedIds[__typename]) !== null && _a !== void 0 ? _a : (mutableRetainedIds[__typename] = new Set()));
+                        retainedRecordsIds.add(nextRecordLink.__link);
                         recordReachableIdsFromRecord(store, nextRecord, mutableRetainedIds, selection.selections, variables);
                     }
                 }

package/dist/core/logging.d.ts

@@ -0,0 +1,69 @@
+import { CleanupFn } from '@isograph/disposable-types';
+import { IsographEnvironment, IsographStore, StoreRecord, type Link } from './IsographEnvironment';
+import { IsographEntrypoint, NormalizationAst, RefetchQueryNormalizationArtifact } from './entrypoint';
+import { FragmentReference, Variables } from './FragmentReference';
+import { NetworkResponseObject, type EncounteredIds } from './cache';
+import { Arguments } from './util';
+import { ReadDataResult } from './read';
+import { CheckResult } from './check';
+export type LogMessage = {
+    kind: 'GettingSuspenseCacheItem';
+    index: string;
+    availableCacheItems: ReadonlyArray<string>;
+    found: boolean;
+} | {
+    kind: 'AboutToNormalize';
+    normalizationAst: NormalizationAst;
+    networkResponse: NetworkResponseObject;
+    variables: Variables;
+} | {
+    kind: 'AfterNormalization';
+    store: IsographStore;
+    encounteredIds: EncounteredIds;
+} | {
+    kind: 'DeepEqualityCheck';
+    fragmentReference: FragmentReference<any, any>;
+    old: object;
+    new: object;
+    deeplyEqual: boolean;
+} | {
+    kind: 'ComponentRerendered';
+    componentName: string;
+    rootLink: Link;
+} | {
+    kind: 'MakeNetworkRequest';
+    artifact: RefetchQueryNormalizationArtifact | IsographEntrypoint<any, any>;
+    variables: Variables;
+    networkRequestId: string;
+} | {
+    kind: 'ReceivedNetworkResponse';
+    networkResponse: any;
+    networkRequestId: string;
+} | {
+    kind: 'ReceivedNetworkError';
+    error: any;
+    networkRequestId: string;
+} | {
+    kind: 'MissingFieldHandlerCalled';
+    root: Link;
+    storeRecord: StoreRecord;
+    fieldName: string;
+    arguments: Arguments | null;
+    variables: Variables;
+} | {
+    kind: 'DoneReading';
+    response: ReadDataResult<any>;
+} | {
+    kind: 'NonEntrypointReceived';
+    entrypoint: any;
+} | {
+    kind: 'EnvironmentCheck';
+    result: CheckResult;
+};
+export type LogFunction = (logMessage: LogMessage) => void;
+export type WrappedLogFunction = {
+    log: LogFunction;
+};
+export declare function logMessage(environment: IsographEnvironment, message: LogMessage): void;
+export declare function registerLogger(environment: IsographEnvironment, log: LogFunction): CleanupFn;
+//# sourceMappingURL=logging.d.ts.map

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

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

package/dist/core/logging.js

@@ -0,0 +1,19 @@
+"use strict";
+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);
+        }
+        catch (_a) { }
+    }
+}
+function registerLogger(environment, log) {
+    const wrapped = { log };
+    environment.loggers.add(wrapped);
+    return () => {
+        environment.loggers.delete(wrapped);
+    };
+}

package/dist/core/makeNetworkRequest.d.ts

@@ -3,4 +3,7 @@ import { IsographEntrypoint, RefetchQueryNormalizationArtifact } from './entrypo
 import { Variables } from './FragmentReference';
 import { IsographEnvironment } from './IsographEnvironment';
 import { AnyError, PromiseWrapper } from './PromiseWrapper';
-export declare function makeNetworkRequest(environment: IsographEnvironment, artifact: RefetchQueryNormalizationArtifact | IsographEntrypoint<any, any>, variables: Variables): ItemCleanupPair<PromiseWrapper<void, AnyError>>;
+import { FetchOptions } from './check';
+export declare function maybeMakeNetworkRequest(environment: IsographEnvironment, artifact: RefetchQueryNormalizationArtifact | IsographEntrypoint<any, any>, variables: Variables, fetchOptions?: FetchOptions): ItemCleanupPair<PromiseWrapper<void, AnyError>>;
+export declare function makeNetworkRequest(environment: IsographEnvironment, artifact: RefetchQueryNormalizationArtifact | IsographEntrypoint<any, any>, variables: Variables, fetchOptions?: FetchOptions): ItemCleanupPair<PromiseWrapper<void, AnyError>>;
+//# sourceMappingURL=makeNetworkRequest.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"makeNetworkRequest.d.ts","sourceRoot":"","sources":["../../src/core/makeNetworkRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EACL,kBAAkB,EAClB,iCAAiC,EAClC,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAOhD,OAAO,EAAE,mBAAmB,EAAW,MAAM,uBAAuB,CAAC;AACrE,OAAO,EACL,QAAQ,EACR,cAAc,EAGf,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAqC,YAAY,EAAE,MAAM,SAAS,CAAC;AAI1E,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,mBAAmB,EAChC,QAAQ,EAAE,iCAAiC,GAAG,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,EAC1E,SAAS,EAAE,SAAS,EACpB,YAAY,CAAC,EAAE,YAAY,GAC1B,eAAe,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CA8BjD;AAED,wBAAgB,kBAAkB,CAChC,WAAW,EAAE,mBAAmB,EAChC,QAAQ,EAAE,iCAAiC,GAAG,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,EAC1E,SAAS,EAAE,SAAS,EACpB,YAAY,CAAC,EAAE,YAAY,GAC1B,eAAe,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CA+FjD"}

package/dist/core/makeNetworkRequest.js

@@ -1,39 +1,79 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeNetworkRequest = void 0;
+exports.maybeMakeNetworkRequest = maybeMakeNetworkRequest;
+exports.makeNetworkRequest = makeNetworkRequest;
 const garbageCollection_1 = require("./garbageCollection");
+const IsographEnvironment_1 = require("./IsographEnvironment");
 const PromiseWrapper_1 = require("./PromiseWrapper");
 const cache_1 = require("./cache");
-function makeNetworkRequest(environment, artifact, variables) {
-    // @ts-expect-error
-    if (typeof window !== 'undefined' && window.__LOG) {
-        console.log('make network request', artifact, variables);
+const logging_1 = require("./logging");
+const check_1 = require("./check");
+let networkRequestId = 0;
+function maybeMakeNetworkRequest(environment, artifact, variables, fetchOptions) {
+    var _a;
+    switch ((_a = fetchOptions === null || fetchOptions === void 0 ? void 0 : fetchOptions.shouldFetch) !== null && _a !== void 0 ? _a : check_1.DEFAULT_SHOULD_FETCH_VALUE) {
+        case 'Yes': {
+            return makeNetworkRequest(environment, artifact, variables, fetchOptions);
+        }
+        case 'No': {
+            return [(0, PromiseWrapper_1.wrapResolvedValue)(undefined), () => { }];
+        }
+        case 'IfNecessary': {
+            const result = (0, check_1.check)(environment, artifact.networkRequestInfo.normalizationAst, variables, {
+                __link: IsographEnvironment_1.ROOT_ID,
+                __typename: artifact.concreteType,
+            });
+            if (result.kind === 'EnoughData') {
+                return [(0, PromiseWrapper_1.wrapResolvedValue)(undefined), () => { }];
+            }
+            else {
+                return makeNetworkRequest(environment, artifact, variables, fetchOptions);
+            }
+        }
     }
+}
+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, {
+        kind: 'MakeNetworkRequest',
+        artifact,
+        variables,
+        networkRequestId: myNetworkRequestId,
+    });
     let status = {
         kind: 'UndisposedIncomplete',
     };
     // This should be an observable, not a promise
     const promise = environment
-        .networkFunction(artifact.queryText, variables)
+        .networkFunction(artifact.networkRequestInfo.queryText, variables)
         .then((networkResponse) => {
-        var _a;
-        // @ts-expect-error
-        if (typeof window !== 'undefined' && window.__LOG) {
-            console.log('network response', artifact, networkResponse);
-        }
+        var _a, _b, _c;
+        (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);
+            }
+            catch (_d) { }
             // @ts-expect-error Why are we getting the wrong constructor here?
             throw new Error('GraphQL network response had errors', {
                 cause: networkResponse,
             });
         }
         if (status.kind === 'UndisposedIncomplete') {
-            (0, cache_1.normalizeData)(environment, artifact.normalizationAst, (_a = networkResponse.data) !== null && _a !== void 0 ? _a : {}, variables, artifact.kind === 'Entrypoint'
+            const root = { __link: IsographEnvironment_1.ROOT_ID, __typename: artifact.concreteType };
+            (0, cache_1.normalizeData)(environment, artifact.networkRequestInfo.normalizationAst, (_b = networkResponse.data) !== null && _b !== void 0 ? _b : {}, variables, artifact.kind === 'Entrypoint'
                 ? artifact.readerWithRefetchQueries.nestedRefetchQueries
-                : []);
+                : [], root);
             const retainedQuery = {
-                normalizationAst: artifact.normalizationAst,
+                normalizationAst: artifact.networkRequestInfo.normalizationAst,
                 variables,
+                root,
             };
             status = {
                 kind: 'UndisposedComplete',
@@ -41,6 +81,23 @@ function makeNetworkRequest(environment, artifact, variables) {
             };
             (0, garbageCollection_1.retainQuery)(environment, retainedQuery);
         }
+        try {
+            (_c = fetchOptions === null || fetchOptions === void 0 ? void 0 : fetchOptions.onComplete) === null || _c === void 0 ? void 0 : _c.call(fetchOptions);
+        }
+        catch (_e) { }
+    })
+        .catch((e) => {
+        var _a;
+        (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);
+        }
+        catch (_b) { }
+        throw e;
     });
     const wrapper = (0, PromiseWrapper_1.wrapPromise)(promise);
     const response = [
@@ -59,4 +116,3 @@ function makeNetworkRequest(environment, artifact, variables) {
     ];
     return response;
 }
-exports.makeNetworkRequest = makeNetworkRequest;

package/dist/core/read.d.ts

@@ -1,12 +1,27 @@
-import { FragmentReference } from './FragmentReference';
-import { DataId, IsographEnvironment } from './IsographEnvironment';
+import { type EncounteredIds } from './cache';
+import { FragmentReference, ExtractData } from './FragmentReference';
+import { IsographEnvironment, type Link } from './IsographEnvironment';
 export type WithEncounteredRecords<T> = {
-    readonly encounteredRecords: Set<DataId>;
-    readonly item: T;
+    readonly encounteredRecords: EncounteredIds;
+    readonly item: ExtractData<T>;
+};
+export declare function readButDoNotEvaluate<TReadFromStore extends {
+    parameters: object;
+    data: object;
+}>(environment: IsographEnvironment, fragmentReference: FragmentReference<TReadFromStore, unknown>, networkRequestOptions: NetworkRequestReaderOptions): WithEncounteredRecords<TReadFromStore>;
+export type ReadDataResult<TReadFromStore> = {
+    readonly kind: 'Success';
+    readonly data: ExtractData<TReadFromStore>;
+    readonly encounteredRecords: EncounteredIds;
+} | {
+    readonly kind: 'MissingData';
+    readonly reason: string;
+    readonly nestedReason?: ReadDataResult<unknown>;
+    readonly recordLink: Link;
 };
-export declare function readButDoNotEvaluate<TReadFromStore extends Object>(environment: IsographEnvironment, fragmentReference: FragmentReference<TReadFromStore, unknown>, networkRequestOptions: NetworkRequestReaderOptions): WithEncounteredRecords<TReadFromStore>;
 export type NetworkRequestReaderOptions = {
     suspendIfInFlight: boolean;
     throwOnNetworkError: boolean;
 };
 export declare function getNetworkRequestOptionsWithDefaults(networkRequestOptions?: Partial<NetworkRequestReaderOptions> | void): NetworkRequestReaderOptions;
+//# sourceMappingURL=read.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../src/core/read.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,cAAc,EACpB,MAAM,SAAS,CAAC;AAMjB,OAAO,EACL,iBAAiB,EAEjB,WAAW,EAEZ,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAGL,mBAAmB,EACnB,KAAK,IAAI,EACV,MAAM,uBAAuB,CAAC;AAe/B,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;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAE3D,WAAW,EAAE,mBAAmB,EAChC,iBAAiB,EAAE,iBAAiB,CAAC,cAAc,EAAE,OAAO,CAAC,EAC7D,qBAAqB,EAAE,2BAA2B,GACjD,sBAAsB,CAAC,cAAc,CAAC,CAkDxC;AAED,MAAM,MAAM,cAAc,CAAC,cAAc,IACrC;IACE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;IAC3C,QAAQ,CAAC,kBAAkB,EAAE,cAAc,CAAC;CAC7C,GACD;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;AAukBN,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"}