@isograph/react 0.4.3 → 0.5.0

package/dist/core/garbageCollection.js

@@ -3,8 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.unretainQuery = unretainQuery;
 exports.retainQuery = retainQuery;
 exports.garbageCollectEnvironment = garbageCollectEnvironment;
+exports.garbageCollectBaseStoreLayer = garbageCollectBaseStoreLayer;
 const cache_1 = require("./cache");
 const IsographEnvironment_1 = require("./IsographEnvironment");
+const PromiseWrapper_1 = require("./PromiseWrapper");
+function isRetainedQueryWithNormalizationAst(query) {
+    return (query.normalizationAst.result !== PromiseWrapper_1.NOT_SET &&
+        query.normalizationAst.result.kind === 'Ok');
+}
 function unretainQuery(environment, retainedQuery) {
     environment.retainedQueries.delete(retainedQuery);
     environment.gcBuffer.push(retainedQuery);
@@ -21,21 +27,37 @@ function retainQuery(environment, queryToRetain) {
     // id + variables
 }
 function garbageCollectEnvironment(environment) {
-    const retainedIds = {};
+    if (environment.store.kind !== 'BaseStoreLayer') {
+        return;
+    }
+    const retainedQueries = [];
     for (const query of environment.retainedQueries) {
-        recordReachableIds(environment.store, query, retainedIds);
+        if (!isRetainedQueryWithNormalizationAst(query)) {
+            return;
+        }
+        retainedQueries.push(query);
     }
     for (const query of environment.gcBuffer) {
-        recordReachableIds(environment.store, query, retainedIds);
+        if (!isRetainedQueryWithNormalizationAst(query)) {
+            return;
+        }
+        retainedQueries.push(query);
+    }
+    garbageCollectBaseStoreLayer(retainedQueries, environment.store);
+}
+function garbageCollectBaseStoreLayer(retainedQueries, baseStoreLayer) {
+    const retainedIds = {};
+    for (const query of retainedQueries) {
+        recordReachableIds(baseStoreLayer.data, query, retainedIds);
     }
-    for (const typeName in environment.store) {
-        const dataById = environment.store[typeName];
+    for (const typeName in baseStoreLayer.data) {
+        const dataById = baseStoreLayer.data[typeName];
         if (dataById == null)
             continue;
         const retainedTypeIds = retainedIds[typeName];
         // delete all objects
         if (retainedTypeIds == undefined || retainedTypeIds.size == 0) {
-            delete environment.store[typeName];
+            delete baseStoreLayer.data[typeName];
             continue;
         }
         for (const dataId in dataById) {
@@ -44,21 +66,21 @@ function garbageCollectEnvironment(environment) {
             }
         }
         if (Object.keys(dataById).length === 0) {
-            delete environment.store[typeName];
+            delete baseStoreLayer.data[typeName];
         }
     }
 }
-function recordReachableIds(store, retainedQuery, mutableRetainedIds) {
+function recordReachableIds(dataLayer, retainedQuery, mutableRetainedIds) {
     var _a, _b;
     var _c;
-    const record = (_a = store[retainedQuery.root.__typename]) === null || _a === void 0 ? void 0 : _a[retainedQuery.root.__link];
+    const record = (_a = dataLayer[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);
+        recordReachableIdsFromRecord(dataLayer, record, mutableRetainedIds, retainedQuery.normalizationAst.result.value.selections, retainedQuery.variables);
     }
 }
-function recordReachableIdsFromRecord(store, currentRecord, mutableRetainedIds, selections, variables) {
+function recordReachableIdsFromRecord(dataLayer, currentRecord, mutableRetainedIds, selections, variables) {
     var _a;
     for (const selection of selections) {
         switch (selection.kind) {
@@ -81,14 +103,14 @@ function recordReachableIdsFromRecord(store, currentRecord, mutableRetainedIds,
                     }
                 }
                 let typeStore = selection.concreteType !== null
-                    ? store[selection.concreteType]
+                    ? dataLayer[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];
+                    const resolvedTypeStore = typeStore !== null && typeStore !== void 0 ? typeStore : dataLayer[__typename];
                     if (resolvedTypeStore == null) {
                         continue;
                     }
@@ -96,7 +118,7 @@ function recordReachableIdsFromRecord(store, currentRecord, mutableRetainedIds,
                     if (nextRecord != null) {
                         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);
+                        recordReachableIdsFromRecord(dataLayer, nextRecord, mutableRetainedIds, selection.selections, variables);
                     }
                 }
                 continue;

package/dist/core/logging.d.ts

@@ -3,9 +3,22 @@ import { NetworkResponseObject, type EncounteredIds } from './cache';
 import { CheckResult } from './check';
 import { IsographEntrypoint, RefetchQueryNormalizationArtifact, type NormalizationAstNodes } from './entrypoint';
 import { FragmentReference, Variables } from './FragmentReference';
-import { IsographEnvironment, IsographStore, StoreRecord, type StoreLink } from './IsographEnvironment';
+import { IsographEnvironment, StoreRecord, type StoreLink } from './IsographEnvironment';
 import { ReadDataResult } from './read';
 import { Arguments } from './util';
+import type { StoreLayer } from './optimisticProxy';
+/**
+ * Note: these types are unstable. We will add and remove items from this enum
+ * and add and remove fields. Please do not rely on the specifics here (for now).
+ *
+ * Goals include:
+ * - convenient debugging for Isograph developers
+ * - eventual support for the Isograph devtools
+ *
+ * In some cases (e.g. in `AfterNormalization`), we include large objects and thus
+ * prevent them from getting garbage collected (if the log message is printed).
+ * Especially in cases like that, we intend to remove those!
+ */
 export type LogMessage = {
     kind: 'AboutToNormalize';
     normalizationAst: NormalizationAstNodes;
@@ -13,7 +26,7 @@ export type LogMessage = {
     variables: Variables;
 } | {
     kind: 'AfterNormalization';
-    store: IsographStore;
+    store: StoreLayer;
     encounteredIds: EncounteredIds;
 } | {
     kind: 'DeepEqualityCheck';
@@ -27,7 +40,7 @@ export type LogMessage = {
     rootLink: StoreLink;
 } | {
     kind: 'MakeNetworkRequest';
-    artifact: RefetchQueryNormalizationArtifact | IsographEntrypoint<any, any, any>;
+    artifact: RefetchQueryNormalizationArtifact | IsographEntrypoint<any, any, any, any>;
     variables: Variables;
     networkRequestId: string;
 } | {

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/makeNetworkRequest.d.ts

@@ -1,9 +1,11 @@
 import { ItemCleanupPair } from '@isograph/disposable-types';
+import { type NetworkResponseObject } from './cache';
 import { FetchOptions } from './check';
 import { IsographEntrypoint, ReaderWithRefetchQueries, RefetchQueryNormalizationArtifact, type NormalizationAst, type NormalizationAstLoader } from './entrypoint';
 import { ExtractParameters, type UnknownTReadFromStore } from './FragmentReference';
 import { IsographEnvironment } from './IsographEnvironment';
 import { AnyError, PromiseWrapper } from './PromiseWrapper';
-export declare function maybeMakeNetworkRequest<TReadFromStore extends UnknownTReadFromStore, TClientFieldValue, TArtifact extends RefetchQueryNormalizationArtifact | IsographEntrypoint<TReadFromStore, TClientFieldValue, TNormalizationAst>, TNormalizationAst extends NormalizationAst | NormalizationAstLoader>(environment: IsographEnvironment, artifact: TArtifact, variables: ExtractParameters<TReadFromStore>, readerWithRefetchQueries: PromiseWrapper<ReaderWithRefetchQueries<TReadFromStore, TClientFieldValue>> | null, fetchOptions: FetchOptions<TClientFieldValue> | null): ItemCleanupPair<PromiseWrapper<void, AnyError>>;
-export declare function makeNetworkRequest<TReadFromStore extends UnknownTReadFromStore, TClientFieldValue, TArtifact extends RefetchQueryNormalizationArtifact | IsographEntrypoint<TReadFromStore, TClientFieldValue, TNormalizationAst>, TNormalizationAst extends NormalizationAst | NormalizationAstLoader>(environment: IsographEnvironment, artifact: TArtifact, variables: ExtractParameters<TReadFromStore>, readerWithRefetchQueries: PromiseWrapper<ReaderWithRefetchQueries<TReadFromStore, TClientFieldValue>> | null, fetchOptions: FetchOptions<TClientFieldValue> | null): ItemCleanupPair<PromiseWrapper<void, AnyError>>;
+export declare function maybeMakeNetworkRequest<TReadFromStore extends UnknownTReadFromStore, TClientFieldValue, TNormalizationAst extends NormalizationAst | NormalizationAstLoader, TRawResponseType extends NetworkResponseObject>(environment: IsographEnvironment, artifact: RefetchQueryNormalizationArtifact | IsographEntrypoint<TReadFromStore, TClientFieldValue, TNormalizationAst, TRawResponseType>, variables: ExtractParameters<TReadFromStore>, readerWithRefetchQueries: PromiseWrapper<ReaderWithRefetchQueries<TReadFromStore, TClientFieldValue>> | null, fetchOptions: FetchOptions<TClientFieldValue, TRawResponseType> | null): ItemCleanupPair<PromiseWrapper<void, AnyError>>;
+export declare function retainQueryWithoutMakingNetworkRequest<TReadFromStore extends UnknownTReadFromStore, TClientFieldValue, TRawResponseType extends NetworkResponseObject>(environment: IsographEnvironment, artifact: RefetchQueryNormalizationArtifact | IsographEntrypoint<TReadFromStore, TClientFieldValue, NormalizationAst | NormalizationAstLoader, TRawResponseType>, variables: ExtractParameters<TReadFromStore>): ItemCleanupPair<PromiseWrapper<void, AnyError>>;
+export declare function makeNetworkRequest<TReadFromStore extends UnknownTReadFromStore, TClientFieldValue, TNormalizationAst extends NormalizationAst | NormalizationAstLoader, TRawResponseType extends NetworkResponseObject>(environment: IsographEnvironment, artifact: RefetchQueryNormalizationArtifact | IsographEntrypoint<TReadFromStore, TClientFieldValue, TNormalizationAst, TRawResponseType>, variables: ExtractParameters<TReadFromStore>, readerWithRefetchQueries: PromiseWrapper<ReaderWithRefetchQueries<TReadFromStore, TClientFieldValue>> | null, fetchOptions: FetchOptions<TClientFieldValue, TRawResponseType> | null): ItemCleanupPair<PromiseWrapper<void, AnyError>>;
 //# sourceMappingURL=makeNetworkRequest.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"makeNetworkRequest.d.ts","sourceRoot":"","sources":["../../src/core/makeNetworkRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,OAAO,EAAqC,YAAY,EAAE,MAAM,SAAS,CAAC;AAE1E,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,iCAAiC,EACjC,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAC5B,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,iBAAiB,EAEjB,KAAK,qBAAqB,EAC3B,MAAM,qBAAqB,CAAC;AAO7B,OAAO,EAAE,mBAAmB,EAAsB,MAAM,uBAAuB,CAAC;AAEhF,OAAO,EACL,QAAQ,EACR,cAAc,EAGf,MAAM,kBAAkB,CAAC;AAM1B,wBAAgB,uBAAuB,CACrC,cAAc,SAAS,qBAAqB,EAC5C,iBAAiB,EACjB,SAAS,SACL,iCAAiC,GACjC,kBAAkB,CAAC,cAAc,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,EAC5E,iBAAiB,SAAS,gBAAgB,GAAG,sBAAsB,EAEnE,WAAW,EAAE,mBAAmB,EAChC,QAAQ,EAAE,SAAS,EACnB,SAAS,EAAE,iBAAiB,CAAC,cAAc,CAAC,EAC5C,wBAAwB,EAAE,cAAc,CACtC,wBAAwB,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAC5D,GAAG,IAAI,EACR,YAAY,EAAE,YAAY,CAAC,iBAAiB,CAAC,GAAG,IAAI,GACnD,eAAe,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CA8CjD;AAeD,wBAAgB,kBAAkB,CAChC,cAAc,SAAS,qBAAqB,EAC5C,iBAAiB,EACjB,SAAS,SACL,iCAAiC,GACjC,kBAAkB,CAAC,cAAc,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,EAC5E,iBAAiB,SAAS,gBAAgB,GAAG,sBAAsB,EAEnE,WAAW,EAAE,mBAAmB,EAChC,QAAQ,EAAE,SAAS,EACnB,SAAS,EAAE,iBAAiB,CAAC,cAAc,CAAC,EAC5C,wBAAwB,EAAE,cAAc,CACtC,wBAAwB,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAC5D,GAAG,IAAI,EACR,YAAY,EAAE,YAAY,CAAC,iBAAiB,CAAC,GAAG,IAAI,GACnD,eAAe,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAgHjD"}
+{"version":3,"file":"makeNetworkRequest.d.ts","sourceRoot":"","sources":["../../src/core/makeNetworkRequest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAIL,KAAK,qBAAqB,EAC3B,MAAM,SAAS,CAAC;AACjB,OAAO,EAAqC,YAAY,EAAE,MAAM,SAAS,CAAC;AAE1E,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,iCAAiC,EACjC,KAAK,gBAAgB,EACrB,KAAK,sBAAsB,EAC5B,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,iBAAiB,EAEjB,KAAK,qBAAqB,EAC3B,MAAM,qBAAqB,CAAC;AAO7B,OAAO,EAAE,mBAAmB,EAAsB,MAAM,uBAAuB,CAAC;AAShF,OAAO,EACL,QAAQ,EACR,cAAc,EAGf,MAAM,kBAAkB,CAAC;AAM1B,wBAAgB,uBAAuB,CACrC,cAAc,SAAS,qBAAqB,EAC5C,iBAAiB,EACjB,iBAAiB,SAAS,gBAAgB,GAAG,sBAAsB,EACnE,gBAAgB,SAAS,qBAAqB,EAE9C,WAAW,EAAE,mBAAmB,EAChC,QAAQ,EACJ,iCAAiC,GACjC,kBAAkB,CAChB,cAAc,EACd,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,CACjB,EACL,SAAS,EAAE,iBAAiB,CAAC,cAAc,CAAC,EAC5C,wBAAwB,EAAE,cAAc,CACtC,wBAAwB,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAC5D,GAAG,IAAI,EACR,YAAY,EAAE,YAAY,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,GAAG,IAAI,GACrE,eAAe,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAuDjD;AAED,wBAAgB,sCAAsC,CACpD,cAAc,SAAS,qBAAqB,EAC5C,iBAAiB,EACjB,gBAAgB,SAAS,qBAAqB,EAE9C,WAAW,EAAE,mBAAmB,EAChC,QAAQ,EACJ,iCAAiC,GACjC,kBAAkB,CAChB,cAAc,EACd,iBAAiB,EACjB,gBAAgB,GAAG,sBAAsB,EACzC,gBAAgB,CACjB,EACL,SAAS,EAAE,iBAAiB,CAAC,cAAc,CAAC,GAC3C,eAAe,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAmBjD;AAED,wBAAgB,kBAAkB,CAChC,cAAc,SAAS,qBAAqB,EAC5C,iBAAiB,EACjB,iBAAiB,SAAS,gBAAgB,GAAG,sBAAsB,EACnE,gBAAgB,SAAS,qBAAqB,EAE9C,WAAW,EAAE,mBAAmB,EAChC,QAAQ,EACJ,iCAAiC,GACjC,kBAAkB,CAChB,cAAc,EACd,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,CACjB,EACL,SAAS,EAAE,iBAAiB,CAAC,cAAc,CAAC,EAC5C,wBAAwB,EAAE,cAAc,CACtC,wBAAwB,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAC5D,GAAG,IAAI,EACR,YAAY,EAAE,YAAY,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,GAAG,IAAI,GACrE,eAAe,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAiKjD"}

package/dist/core/makeNetworkRequest.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.maybeMakeNetworkRequest = maybeMakeNetworkRequest;
+exports.retainQueryWithoutMakingNetworkRequest = retainQueryWithoutMakingNetworkRequest;
 exports.makeNetworkRequest = makeNetworkRequest;
 const cache_1 = require("./cache");
 const check_1 = require("./check");
@@ -8,6 +9,7 @@ const componentCache_1 = require("./componentCache");
 const garbageCollection_1 = require("./garbageCollection");
 const IsographEnvironment_1 = require("./IsographEnvironment");
 const logging_1 = require("./logging");
+const optimisticProxy_1 = require("./optimisticProxy");
 const PromiseWrapper_1 = require("./PromiseWrapper");
 const read_1 = require("./read");
 const startUpdate_1 = require("./startUpdate");
@@ -19,19 +21,20 @@ function maybeMakeNetworkRequest(environment, artifact, variables, readerWithRef
             return makeNetworkRequest(environment, artifact, variables, readerWithRefetchQueries, fetchOptions);
         }
         case 'No': {
-            return [(0, PromiseWrapper_1.wrapResolvedValue)(undefined), () => { }];
+            return retainQueryWithoutMakingNetworkRequest(environment, artifact, variables);
         }
         case 'IfNecessary': {
             if (artifact.networkRequestInfo.normalizationAst.kind ===
                 'NormalizationAstLoader') {
-                throw new Error('Using lazy loaded normalizationAst with shouldFetch: "IfNecessary" is not supported as it will lead to slower initial load time.');
+                throw new Error('Using lazy loaded normalizationAst with shouldFetch: "IfNecessary" is ' +
+                    'not supported as it will lead to a network waterfall.');
             }
             const result = (0, check_1.check)(environment, artifact.networkRequestInfo.normalizationAst.selections, variables, {
                 __link: IsographEnvironment_1.ROOT_ID,
                 __typename: artifact.concreteType,
             });
             if (result.kind === 'EnoughData') {
-                return [(0, PromiseWrapper_1.wrapResolvedValue)(undefined), () => { }];
+                return retainQueryWithoutMakingNetworkRequest(environment, artifact, variables);
             }
             else {
                 return makeNetworkRequest(environment, artifact, variables, readerWithRefetchQueries, fetchOptions);
@@ -39,33 +42,41 @@ function maybeMakeNetworkRequest(environment, artifact, variables, readerWithRef
         }
     }
 }
-function loadNormalizationAst(normalizationAst) {
-    switch (normalizationAst.kind) {
-        case 'NormalizationAst': {
-            return normalizationAst;
-        }
-        case 'NormalizationAstLoader': {
-            return normalizationAst.loader();
-        }
-    }
+function retainQueryWithoutMakingNetworkRequest(environment, artifact, variables) {
+    let status = {
+        kind: 'UndisposedComplete',
+        retainedQuery: fetchNormalizationAstAndRetainArtifact(environment, artifact, variables),
+    };
+    return [
+        (0, PromiseWrapper_1.wrapResolvedValue)(undefined),
+        () => {
+            if (status.kind !== 'Disposed') {
+                status = unretainAndGarbageCollect(environment, status);
+            }
+        },
+    ];
 }
 function makeNetworkRequest(environment, artifact, variables, readerWithRefetchQueries, fetchOptions) {
     // TODO this should be a DataId and stored in the store
     const myNetworkRequestId = networkRequestId + '';
     networkRequestId++;
+    let status = {
+        kind: 'UndisposedIncomplete',
+        retainedQuery: fetchNormalizationAstAndRetainArtifact(environment, artifact, variables),
+        optimistic: (fetchOptions === null || fetchOptions === void 0 ? void 0 : fetchOptions.optimisticNetworkResponse) != null
+            ? makeOptimisticUpdate(environment, artifact, variables, fetchOptions === null || fetchOptions === void 0 ? void 0 : fetchOptions.optimisticNetworkResponse)
+            : null,
+    };
     (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 = Promise.all([
         environment.networkFunction(artifact.networkRequestInfo.operation, variables),
-        loadNormalizationAst(artifact.networkRequestInfo.normalizationAst),
+        status.retainedQuery.normalizationAst.promise,
         readerWithRefetchQueries === null || readerWithRefetchQueries === void 0 ? void 0 : readerWithRefetchQueries.promise,
     ])
         .then(([networkResponse, normalizationAst, readerWithRefetchQueries]) => {
@@ -80,23 +91,34 @@ function makeNetworkRequest(environment, artifact, variables, readerWithRefetchQ
                 (_a = fetchOptions === null || fetchOptions === void 0 ? void 0 : fetchOptions.onError) === null || _a === void 0 ? void 0 : _a.call(fetchOptions);
             }
             catch (_c) { }
-            throw new Error('GraphQL network response had errors', {
+            throw new Error('Network response had errors', {
                 cause: networkResponse,
             });
         }
         const root = { __link: IsographEnvironment_1.ROOT_ID, __typename: artifact.concreteType };
         if (status.kind === 'UndisposedIncomplete') {
-            (0, cache_1.normalizeData)(environment, normalizationAst.selections, (_b = networkResponse.data) !== null && _b !== void 0 ? _b : {}, variables, root);
-            const retainedQuery = {
-                normalizationAst: normalizationAst.selections,
-                variables,
-                root,
-            };
-            status = {
-                kind: 'UndisposedComplete',
-                retainedQuery,
-            };
-            (0, garbageCollection_1.retainQuery)(environment, retainedQuery);
+            if (status.optimistic != null) {
+                status =
+                    revertOptimisticStoreLayerAndMaybeReplaceIfUndisposedIncomplete(environment, status, (storeLayer) => {
+                        var _a;
+                        return (0, cache_1.normalizeData)(environment, storeLayer, normalizationAst.selections, (_a = networkResponse.data) !== null && _a !== void 0 ? _a : {}, variables, root, new Map());
+                    });
+            }
+            else {
+                const encounteredIds = new Map();
+                environment.store = (0, optimisticProxy_1.addNetworkResponseStoreLayer)(environment.store);
+                (0, cache_1.normalizeData)(environment, environment.store, normalizationAst.selections, (_b = networkResponse.data) !== null && _b !== void 0 ? _b : {}, variables, root, encounteredIds);
+                (0, logging_1.logMessage)(environment, () => ({
+                    kind: 'AfterNormalization',
+                    store: environment.store,
+                    encounteredIds: encounteredIds,
+                }));
+                (0, cache_1.callSubscriptions)(environment, encounteredIds);
+                status = {
+                    kind: 'UndisposedComplete',
+                    retainedQuery: status.retainedQuery,
+                };
+            }
         }
         const onComplete = fetchOptions === null || fetchOptions === void 0 ? void 0 : fetchOptions.onComplete;
         if (onComplete != null) {
@@ -122,21 +144,23 @@ function makeNetworkRequest(environment, artifact, variables, readerWithRefetchQ
             (_a = fetchOptions === null || fetchOptions === void 0 ? void 0 : fetchOptions.onError) === null || _a === void 0 ? void 0 : _a.call(fetchOptions);
         }
         catch (_b) { }
+        if (status.kind === 'UndisposedIncomplete') {
+            status =
+                revertOptimisticStoreLayerAndMaybeReplaceIfUndisposedIncomplete(environment, status, null);
+        }
         throw e;
     });
     const wrapper = (0, PromiseWrapper_1.wrapPromise)(promise);
     const response = [
         wrapper,
         () => {
-            if (status.kind === 'UndisposedComplete') {
-                const didUnretainSomeQuery = (0, garbageCollection_1.unretainQuery)(environment, status.retainedQuery);
-                if (didUnretainSomeQuery) {
-                    (0, garbageCollection_1.garbageCollectEnvironment)(environment);
-                }
+            if (status.kind === 'UndisposedIncomplete') {
+                status =
+                    revertOptimisticStoreLayerAndMaybeReplaceIfUndisposedIncomplete(environment, status, null);
+            }
+            if (status.kind !== 'Disposed') {
+                status = unretainAndGarbageCollect(environment, status);
             }
-            status = {
-                kind: 'Disposed',
-            };
         },
     ];
     return response;
@@ -162,6 +186,8 @@ function readDataForOnComplete(artifact, environment, root, variables, readerWit
             kind: 'FragmentReference',
             // TODO this smells.
             readerWithRefetchQueries: (0, PromiseWrapper_1.wrapResolvedValue)(resolvedReaderWithRefetchQueries),
+            fieldName: resolvedReaderWithRefetchQueries.readerArtifact.fieldName,
+            readerArtifactKind: resolvedReaderWithRefetchQueries.readerArtifact.kind,
             root,
             variables,
             networkRequest: fakeNetworkRequest,
@@ -173,13 +199,15 @@ function readDataForOnComplete(artifact, environment, root, variables, readerWit
                 // @ts-expect-error We should find a way to encode this in the type system:
                 // if we have a ComponentReaderArtifact, we will necessarily have a
                 // TClientFieldValue which is a React.FC<...>
-                return (0, componentCache_1.getOrCreateCachedComponent)(environment, readerArtifact.fieldName, {
+                return (0, componentCache_1.getOrCreateCachedComponent)(environment, {
                     kind: 'FragmentReference',
                     readerWithRefetchQueries: (0, PromiseWrapper_1.wrapResolvedValue)({
                         kind: 'ReaderWithRefetchQueries',
                         readerArtifact: readerArtifact,
                         nestedRefetchQueries: resolvedReaderWithRefetchQueries.nestedRefetchQueries,
                     }),
+                    fieldName: readerArtifact.fieldName,
+                    readerArtifactKind: readerArtifact.kind,
                     root,
                     variables,
                     networkRequest: fakeNetworkRequest,
@@ -188,7 +216,7 @@ function readDataForOnComplete(artifact, environment, root, variables, readerWit
             case 'EagerReaderArtifact': {
                 return readerArtifact.resolver(Object.assign({ data: fragmentResult, parameters: variables }, (readerArtifact.hasUpdatable
                     ? {
-                        startUpdate: (0, startUpdate_1.getOrCreateCachedStartUpdate)(environment, fragment, resolvedReaderWithRefetchQueries.readerArtifact.fieldName, fakeNetworkRequestOptions),
+                        startUpdate: (0, startUpdate_1.getOrCreateCachedStartUpdate)(environment, fragment, fakeNetworkRequestOptions),
                     }
                     : undefined)));
             }
@@ -201,3 +229,52 @@ function readDataForOnComplete(artifact, environment, root, variables, readerWit
     }
     return null;
 }
+function fetchNormalizationAstAndRetainArtifact(environment, artifact, variables) {
+    const normalizationAst = artifact.networkRequestInfo.normalizationAst.kind === 'NormalizationAst'
+        ? (0, PromiseWrapper_1.wrapResolvedValue)(artifact.networkRequestInfo.normalizationAst)
+        : (0, PromiseWrapper_1.wrapPromise)(artifact.networkRequestInfo.normalizationAst.loader());
+    const root = { __link: IsographEnvironment_1.ROOT_ID, __typename: artifact.concreteType };
+    const retainedQuery = {
+        normalizationAst: normalizationAst,
+        variables,
+        root,
+    };
+    (0, garbageCollection_1.retainQuery)(environment, retainedQuery);
+    return retainedQuery;
+}
+function makeOptimisticUpdate(environment, artifact, variables, optimisticNetworkResponse) {
+    const root = { __link: IsographEnvironment_1.ROOT_ID, __typename: artifact.concreteType };
+    if (artifact.networkRequestInfo.normalizationAst.kind ===
+        'NormalizationAstLoader') {
+        throw new Error('Using lazy loaded normalizationAst with optimisticNetworkResponse is not supported.');
+    }
+    const encounteredIds = new Map();
+    const optimistic = (environment.store =
+        (0, optimisticProxy_1.addOptimisticNetworkResponseStoreLayer)(environment.store));
+    (0, cache_1.normalizeData)(environment, environment.store, artifact.networkRequestInfo.normalizationAst.selections, optimisticNetworkResponse, variables, root, encounteredIds);
+    (0, logging_1.logMessage)(environment, () => ({
+        kind: 'AfterNormalization',
+        store: environment.store,
+        encounteredIds: encounteredIds,
+    }));
+    (0, cache_1.callSubscriptions)(environment, encounteredIds);
+    return optimistic;
+}
+function revertOptimisticStoreLayerAndMaybeReplaceIfUndisposedIncomplete(environment, status, normalizeData) {
+    if (status.optimistic) {
+        (0, optimisticProxy_1.revertOptimisticStoreLayerAndMaybeReplace)(environment, status.optimistic, normalizeData);
+    }
+    return {
+        kind: 'UndisposedComplete',
+        retainedQuery: status.retainedQuery,
+    };
+}
+function unretainAndGarbageCollect(environment, status) {
+    const didUnretainSomeQuery = (0, garbageCollection_1.unretainQuery)(environment, status.retainedQuery);
+    if (didUnretainSomeQuery) {
+        (0, garbageCollection_1.garbageCollectEnvironment)(environment);
+    }
+    return {
+        kind: 'Disposed',
+    };
+}

package/dist/core/optimisticProxy.d.ts

@@ -0,0 +1,59 @@
+import type { BaseStoreLayerData, IsographEnvironment, StoreLayerData, StoreLink, StoreRecord } from './IsographEnvironment';
+export declare function getOrInsertRecord(dataLayer: StoreLayerData, link: StoreLink): StoreRecord;
+/**
+ * Given the child-most store layer (i.e. environment.store) and a link (identifying a
+ * store record), create a proxy object that attempts to read through each successive
+ * store layer until a value (i.e. field name) is found. If found, return that value.
+ */
+export declare function getStoreRecordProxy(storeLayer: StoreLayer, link: StoreLink): Readonly<StoreRecord> | null | undefined;
+export declare function getMutableStoreRecordProxy(childMostStoreLayer: StoreLayer, link: StoreLink): StoreRecord;
+export type BaseStoreLayer = {
+    readonly kind: 'BaseStoreLayer';
+    childStoreLayer: OptimisticStoreLayer | null;
+    readonly parentStoreLayer: null;
+    readonly data: BaseStoreLayerData;
+};
+export type NetworkResponseStoreLayer = {
+    readonly kind: 'NetworkResponseStoreLayer';
+    childStoreLayer: OptimisticStoreLayer | StartUpdateStoreLayer | null;
+    parentStoreLayer: OptimisticStoreLayer | StartUpdateStoreLayer;
+    readonly data: StoreLayerData;
+};
+export type DataUpdate<TStoreLayer extends StoreLayer> = (storeLayer: TStoreLayer) => void;
+export type StartUpdateStoreLayer = {
+    readonly kind: 'StartUpdateStoreLayer';
+    childStoreLayer: OptimisticStoreLayer | NetworkResponseStoreLayer | null;
+    parentStoreLayer: OptimisticStoreLayer | NetworkResponseStoreLayer;
+    data: StoreLayerData;
+    startUpdate: DataUpdate<StartUpdateStoreLayer | BaseStoreLayer>;
+};
+export type OptimisticStoreLayer = OptimisticUpdaterStoreLayer | OptimisticNetworkResponseStoreLayer;
+export type OptimisticUpdaterStoreLayer = {
+    readonly kind: 'OptimisticUpdaterStoreLayer';
+    childStoreLayer: OptimisticStoreLayer | StartUpdateStoreLayer | NetworkResponseStoreLayer | null;
+    parentStoreLayer: OptimisticStoreLayer | StartUpdateStoreLayer | NetworkResponseStoreLayer | BaseStoreLayer;
+    data: StoreLayerData;
+    readonly startUpdate: DataUpdate<OptimisticUpdaterStoreLayer>;
+};
+export type OptimisticNetworkResponseStoreLayer = {
+    readonly kind: 'OptimisticNetworkResponseStoreLayer';
+    childStoreLayer: OptimisticStoreLayer | StartUpdateStoreLayer | NetworkResponseStoreLayer | null;
+    parentStoreLayer: OptimisticStoreLayer | StartUpdateStoreLayer | NetworkResponseStoreLayer | BaseStoreLayer;
+    data: StoreLayerData;
+};
+export declare function addNetworkResponseStoreLayer(parent: StoreLayer): StoreLayerWithData;
+export declare function addStartUpdateStoreLayer(parent: StoreLayer, startUpdate: StartUpdateStoreLayer['startUpdate']): StoreLayer;
+export declare function addOptimisticUpdaterStoreLayer(parent: StoreLayer, startUpdate: OptimisticUpdaterStoreLayer['startUpdate']): OptimisticUpdaterStoreLayer;
+export declare function addOptimisticNetworkResponseStoreLayer(parent: StoreLayer): OptimisticNetworkResponseStoreLayer;
+/**
+ * Remove an optimistic store layer from the stack, potentially replacing it
+ * with a network response.
+ *
+ * After we do this, we must re-execute all child startUpdate and optimistic
+ * layers (since their data may have changed.) We also keep track of changed
+ * records, in order to call affected subscriptions.
+ */
+export declare function revertOptimisticStoreLayerAndMaybeReplace(environment: IsographEnvironment, optimisticNode: OptimisticStoreLayer, normalizeData: null | ((storeLayer: StoreLayerWithData) => void)): void;
+export type StoreLayer = OptimisticStoreLayer | NetworkResponseStoreLayer | StartUpdateStoreLayer | BaseStoreLayer;
+export type StoreLayerWithData = BaseStoreLayer | NetworkResponseStoreLayer | OptimisticNetworkResponseStoreLayer;
+//# sourceMappingURL=optimisticProxy.d.ts.map

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

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