@isograph/react 0.4.2 → 0.5.0

package/dist/core/cache.js

@@ -11,13 +11,15 @@ exports.subscribe = subscribe;
 exports.onNextChangeToRecord = onNextChangeToRecord;
 exports.callSubscriptions = callSubscriptions;
 exports.insertEmptySetIfMissing = insertEmptySetIfMissing;
+exports.isArray = isArray;
 exports.getParentRecordKey = getParentRecordKey;
+exports.writeData = writeData;
 const react_disposable_state_1 = require("@isograph/react-disposable-state");
 const areEqualWithDeepComparison_1 = require("./areEqualWithDeepComparison");
 const IsographEnvironment_1 = require("./IsographEnvironment");
 const logging_1 = require("./logging");
 const makeNetworkRequest_1 = require("./makeNetworkRequest");
-const PromiseWrapper_1 = require("./PromiseWrapper");
+const optimisticProxy_1 = require("./optimisticProxy");
 const read_1 = require("./read");
 exports.TYPENAME_FIELD_NAME = '__typename';
 function getOrCreateItemInSuspenseCache(environment, index, factory) {
@@ -35,7 +37,7 @@ function stableCopy(value) {
     if (!value || typeof value !== 'object') {
         return value;
     }
-    if (Array.isArray(value)) {
+    if (isArray(value)) {
         // @ts-ignore
         return value.map(stableCopy);
     }
@@ -62,15 +64,14 @@ function getOrCreateCacheForArtifact(environment, entrypoint, variables, fetchOp
             break;
     }
     const factory = () => {
-        const readerWithRefetchQueries = entrypoint.readerWithRefetchQueries.kind ===
-            'ReaderWithRefetchQueriesLoader'
-            ? (0, PromiseWrapper_1.wrapPromise)(entrypoint.readerWithRefetchQueries.loader())
-            : (0, PromiseWrapper_1.wrapResolvedValue)(entrypoint.readerWithRefetchQueries);
+        const { fieldName, readerArtifactKind, readerWithRefetchQueries } = (0, IsographEnvironment_1.getOrLoadReaderWithRefetchQueries)(environment, entrypoint.readerWithRefetchQueries);
         const [networkRequest, disposeNetworkRequest] = (0, makeNetworkRequest_1.maybeMakeNetworkRequest)(environment, entrypoint, variables, readerWithRefetchQueries, fetchOptions !== null && fetchOptions !== void 0 ? fetchOptions : null);
         const itemCleanupPair = [
             {
                 kind: 'FragmentReference',
                 readerWithRefetchQueries,
+                fieldName,
+                readerArtifactKind,
                 root: { __link: IsographEnvironment_1.ROOT_ID, __typename: entrypoint.concreteType },
                 variables,
                 networkRequest: networkRequest,
@@ -81,25 +82,15 @@ function getOrCreateCacheForArtifact(environment, entrypoint, variables, fetchOp
     };
     return getOrCreateItemInSuspenseCache(environment, cacheKey, factory);
 }
-function normalizeData(environment, normalizationAst, networkResponse, variables, root) {
-    var _a, _b;
-    var _c, _d, _e;
-    const encounteredIds = new Map();
+function normalizeData(environment, storeLayer, normalizationAst, networkResponse, variables, root, encounteredIds) {
     (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, encounteredIds);
-    (0, logging_1.logMessage)(environment, () => ({
-        kind: 'AfterNormalization',
-        store: environment.store,
-        encounteredIds,
-    }));
-    callSubscriptions(environment, encounteredIds);
+    const newStoreRecord = (0, optimisticProxy_1.getMutableStoreRecordProxy)(storeLayer, root);
+    normalizeDataIntoRecord(environment, storeLayer, normalizationAst, networkResponse, newStoreRecord, root, variables, encounteredIds);
     return encounteredIds;
 }
 function subscribeToAnyChange(environment, callback) {
@@ -119,7 +110,6 @@ function subscribeToAnyChangesToRecord(environment, recordLink, callback) {
     environment.subscriptions.add(subscription);
     return () => environment.subscriptions.delete(subscription);
 }
-// TODO we should re-read and call callback if the value has changed
 function subscribe(environment, encounteredDataAndRecords, fragmentReference, callback, readerAst) {
     const fragmentSubscription = {
         kind: 'FragmentSubscription',
@@ -128,6 +118,11 @@ function subscribe(environment, encounteredDataAndRecords, fragmentReference, ca
         fragmentReference,
         readerAst,
     };
+    // subscribe is called in an effect. (We should actually subscribe during the
+    // initial render.) Because it's called in an effect, we might have missed some
+    // changes since the initial render! So, at this point, we re-read and call the
+    // subscription (i.e. re-render) if the fragment data has changed.
+    callSubscriptionIfDataChanged(environment, fragmentSubscription);
     environment.subscriptions.add(fragmentSubscription);
     return () => environment.subscriptions.delete(fragmentSubscription);
 }
@@ -165,38 +160,7 @@ function callSubscriptions(environment, recordsEncounteredWhenNormalizing) {
                 // fragment, we will call readButNotEvaluate multiple times. We
                 // should fix that.
                 if (hasOverlappingIds(recordsEncounteredWhenNormalizing, subscription.encounteredDataAndRecords.encounteredRecords)) {
-                    const newEncounteredDataAndRecords = (0, read_1.readButDoNotEvaluate)(environment, subscription.fragmentReference, 
-                    // Is this wrong?
-                    // Reasons to think no:
-                    // - we are only updating the read-out value, and the network
-                    //   options only affect whether we throw.
-                    // - the component will re-render, and re-throw on its own, anyway.
-                    //
-                    // Reasons to think not:
-                    // - it seems more efficient to suspend here and not update state,
-                    //   if we expect that the component will just throw anyway
-                    // - consistency
-                    // - it's also weird, this is called from makeNetworkRequest, where
-                    //   we don't currently pass network request options
-                    {
-                        suspendIfInFlight: false,
-                        throwOnNetworkError: false,
-                    });
-                    const mergedItem = (0, areEqualWithDeepComparison_1.mergeObjectsUsingReaderAst)(subscription.readerAst, subscription.encounteredDataAndRecords.item, newEncounteredDataAndRecords.item);
-                    (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) {
-                        logAnyError(environment, { situation: 'calling FragmentSubscription callback' }, () => {
-                            subscription.callback(newEncounteredDataAndRecords);
-                        });
-                        subscription.encounteredDataAndRecords =
-                            newEncounteredDataAndRecords;
-                    }
+                    callSubscriptionIfDataChanged(environment, subscription);
                 }
                 return;
             }
@@ -220,6 +184,39 @@ function callSubscriptions(environment, recordsEncounteredWhenNormalizing) {
         }
     }));
 }
+function callSubscriptionIfDataChanged(environment, subscription) {
+    const newEncounteredDataAndRecords = (0, read_1.readButDoNotEvaluate)(environment, subscription.fragmentReference, 
+    // Is this wrong?
+    // Reasons to think no:
+    // - we are only updating the read-out value, and the network
+    //   options only affect whether we throw.
+    // - the component will re-render, and re-throw on its own, anyway.
+    //
+    // Reasons to think not:
+    // - it seems more efficient to suspend here and not update state,
+    //   if we expect that the component will just throw anyway
+    // - consistency
+    // - it's also weird, this is called from makeNetworkRequest, where
+    //   we don't currently pass network request options
+    {
+        suspendIfInFlight: false,
+        throwOnNetworkError: false,
+    });
+    const mergedItem = (0, areEqualWithDeepComparison_1.mergeObjectsUsingReaderAst)(subscription.readerAst, subscription.encounteredDataAndRecords.item, newEncounteredDataAndRecords.item);
+    (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) {
+        logAnyError(environment, { situation: 'calling FragmentSubscription callback' }, () => {
+            subscription.callback(newEncounteredDataAndRecords);
+        });
+        subscription.encounteredDataAndRecords = newEncounteredDataAndRecords;
+    }
+}
 function hasOverlappingIds(ids1, ids2) {
     for (const [typeName, set1] of ids1.entries()) {
         const set2 = ids2.get(typeName);
@@ -244,7 +241,7 @@ function isNotDisjointFrom(set1, set2) {
 /**
  * Mutate targetParentRecord according to the normalizationAst and networkResponseParentRecord.
  */
-function normalizeDataIntoRecord(environment, normalizationAst, networkResponseParentRecord, targetParentRecord, targetParentRecordLink, variables, mutableEncounteredIds) {
+function normalizeDataIntoRecord(environment, storeLayer, normalizationAst, networkResponseParentRecord, targetParentRecord, targetParentRecordLink, variables, mutableEncounteredIds) {
     let recordHasBeenUpdated = false;
     for (const normalizationNode of normalizationAst) {
         switch (normalizationNode.kind) {
@@ -255,13 +252,13 @@ function normalizeDataIntoRecord(environment, normalizationAst, networkResponseP
                 break;
             }
             case 'Linked': {
-                const linkedFieldResultedInChange = normalizeLinkedField(environment, normalizationNode, networkResponseParentRecord, targetParentRecord, targetParentRecordLink, variables, mutableEncounteredIds);
+                const linkedFieldResultedInChange = normalizeLinkedField(environment, storeLayer, normalizationNode, networkResponseParentRecord, targetParentRecord, targetParentRecordLink, variables, mutableEncounteredIds);
                 recordHasBeenUpdated =
                     recordHasBeenUpdated || linkedFieldResultedInChange;
                 break;
             }
             case 'InlineFragment': {
-                const inlineFragmentResultedInChange = normalizeInlineFragment(environment, normalizationNode, networkResponseParentRecord, targetParentRecord, targetParentRecordLink, variables, mutableEncounteredIds);
+                const inlineFragmentResultedInChange = normalizeInlineFragment(environment, storeLayer, normalizationNode, networkResponseParentRecord, targetParentRecord, targetParentRecordLink, variables, mutableEncounteredIds);
                 recordHasBeenUpdated =
                     recordHasBeenUpdated || inlineFragmentResultedInChange;
                 break;
@@ -292,9 +289,12 @@ function normalizeScalarField(astNode, networkResponseParentRecord, targetStoreR
     const networkResponseKey = getNetworkResponseKey(astNode);
     const networkResponseData = networkResponseParentRecord[networkResponseKey];
     const parentRecordKey = getParentRecordKey(astNode, variables);
-    if (networkResponseData == null ||
-        isScalarOrEmptyArray(networkResponseData)) {
-        const existingValue = targetStoreRecord[parentRecordKey];
+    const existingValue = targetStoreRecord[parentRecordKey];
+    if (networkResponseData == null) {
+        targetStoreRecord[parentRecordKey] = null;
+        return existingValue !== null;
+    }
+    if (isScalarOrEmptyArray(networkResponseData)) {
         targetStoreRecord[parentRecordKey] = networkResponseData;
         return existingValue !== networkResponseData;
     }
@@ -302,10 +302,13 @@ function normalizeScalarField(astNode, networkResponseParentRecord, targetStoreR
         throw new Error('Unexpected object array when normalizing scalar');
     }
 }
+function isArray(value) {
+    return Array.isArray(value);
+}
 /**
  * Mutate targetParentRecord with a given linked field ast node.
  */
-function normalizeLinkedField(environment, astNode, networkResponseParentRecord, targetParentRecord, targetParentRecordLink, variables, mutableEncounteredIds) {
+function normalizeLinkedField(environment, storeLayer, astNode, networkResponseParentRecord, targetParentRecord, targetParentRecordLink, variables, mutableEncounteredIds) {
     var _a, _b;
     const networkResponseKey = getNetworkResponseKey(astNode);
     const networkResponseData = networkResponseParentRecord[networkResponseKey];
@@ -319,7 +322,7 @@ function normalizeLinkedField(environment, astNode, networkResponseParentRecord,
         !isNullOrEmptyArray(networkResponseData)) {
         throw new Error('Unexpected scalar network response when normalizing a linked field');
     }
-    if (Array.isArray(networkResponseData)) {
+    if (isArray(networkResponseData)) {
         // TODO check astNode.plural or the like
         const dataIds = [];
         for (let i = 0; i < networkResponseData.length; i++) {
@@ -328,7 +331,7 @@ function normalizeLinkedField(environment, astNode, networkResponseParentRecord,
                 dataIds.push(null);
                 continue;
             }
-            const newStoreRecordId = normalizeNetworkResponseObject(environment, astNode, networkResponseObject, targetParentRecordLink, variables, i, mutableEncounteredIds);
+            const newStoreRecordId = normalizeNetworkResponseObject(environment, storeLayer, astNode, networkResponseObject, targetParentRecordLink, variables, i, mutableEncounteredIds);
             const __typename = (_a = astNode.concreteType) !== null && _a !== void 0 ? _a : networkResponseObject[exports.TYPENAME_FIELD_NAME];
             if (__typename == null) {
                 throw new Error('Unexpected missing __typename in network response when normalizing a linked field. ' +
@@ -343,7 +346,7 @@ function normalizeLinkedField(environment, astNode, networkResponseParentRecord,
         return !dataIdsAreTheSame(existingValue, dataIds);
     }
     else {
-        const newStoreRecordId = normalizeNetworkResponseObject(environment, astNode, networkResponseData, targetParentRecordLink, variables, null, mutableEncounteredIds);
+        const newStoreRecordId = normalizeNetworkResponseObject(environment, storeLayer, astNode, networkResponseData, targetParentRecordLink, variables, null, mutableEncounteredIds);
         let __typename = (_b = astNode.concreteType) !== null && _b !== void 0 ? _b : networkResponseData[exports.TYPENAME_FIELD_NAME];
         if (__typename == null) {
             throw new Error('Unexpected missing __typename in network response when normalizing a linked field. ' +
@@ -360,17 +363,17 @@ function normalizeLinkedField(environment, astNode, networkResponseParentRecord,
 /**
  * Mutate targetParentRecord with a given linked field ast node.
  */
-function normalizeInlineFragment(environment, astNode, networkResponseParentRecord, targetParentRecord, targetParentRecordLink, variables, mutableEncounteredIds) {
+function normalizeInlineFragment(environment, storeLayer, astNode, networkResponseParentRecord, targetParentRecord, targetParentRecordLink, variables, mutableEncounteredIds) {
     const typeToRefineTo = astNode.type;
     if (networkResponseParentRecord[exports.TYPENAME_FIELD_NAME] === typeToRefineTo) {
-        const hasBeenModified = normalizeDataIntoRecord(environment, astNode.selections, networkResponseParentRecord, targetParentRecord, targetParentRecordLink, variables, mutableEncounteredIds);
+        const hasBeenModified = normalizeDataIntoRecord(environment, storeLayer, astNode.selections, networkResponseParentRecord, targetParentRecord, targetParentRecordLink, variables, mutableEncounteredIds);
         return hasBeenModified;
     }
     return false;
 }
 function dataIdsAreTheSame(existingValue, newDataIds) {
     var _a, _b;
-    if (Array.isArray(existingValue)) {
+    if (isArray(existingValue)) {
         if (newDataIds.length !== existingValue.length) {
             return false;
         }
@@ -387,24 +390,22 @@ function dataIdsAreTheSame(existingValue, newDataIds) {
         return false;
     }
 }
-function normalizeNetworkResponseObject(environment, astNode, networkResponseData, targetParentRecordLink, variables, index, mutableEncounteredIds) {
-    var _a, _b, _c;
-    var _d;
+function normalizeNetworkResponseObject(environment, storeLayer, astNode, networkResponseData, targetParentRecordLink, variables, index, mutableEncounteredIds) {
+    var _a;
     const newStoreRecordId = getDataIdOfNetworkResponse(targetParentRecordLink, networkResponseData, astNode, variables, index);
     const __typename = (_a = astNode.concreteType) !== null && _a !== void 0 ? _a : networkResponseData[exports.TYPENAME_FIELD_NAME];
     if (__typename == null) {
         throw new Error('Unexpected missing __typename in network response object. ' +
             'This is indicative of a bug in Isograph.');
     }
-    const recordsById = ((_b = (_d = environment.store)[__typename]) !== null && _b !== void 0 ? _b : (_d[__typename] = {}));
-    const newStoreRecord = ((_c = recordsById[newStoreRecordId]) !== null && _c !== void 0 ? _c : (recordsById[newStoreRecordId] = {}));
-    normalizeDataIntoRecord(environment, astNode.selections, networkResponseData, newStoreRecord, { __link: newStoreRecordId, __typename: __typename }, variables, mutableEncounteredIds);
+    const link = { __link: newStoreRecordId, __typename };
+    const newStoreRecord = (0, optimisticProxy_1.getMutableStoreRecordProxy)(storeLayer, link);
+    normalizeDataIntoRecord(environment, storeLayer, astNode.selections, networkResponseData, newStoreRecord, link, variables, mutableEncounteredIds);
     return newStoreRecordId;
 }
 function isScalarOrEmptyArray(data) {
     // N.B. empty arrays count as empty arrays of scalar fields.
-    if (Array.isArray(data)) {
-        // This is maybe fixed in a new version of Typescript??
+    if (isArray(data)) {
         return data.every((x) => isScalarOrEmptyArray(x));
     }
     const isScalarValue = data === null ||
@@ -414,7 +415,7 @@ function isScalarOrEmptyArray(data) {
     return isScalarValue;
 }
 function isNullOrEmptyArray(data) {
-    if (Array.isArray(data)) {
+    if (isArray(data)) {
         if (data.length === 0) {
             return true;
         }
@@ -548,3 +549,30 @@ function getDataIdOfNetworkResponse(parentRecordLink, dataToNormalize, astNode,
     }
     return storeKey;
 }
+function writeData(environment, entrypoint, data, variables) {
+    const encounteredIds = new Map();
+    environment.store = (0, optimisticProxy_1.addNetworkResponseStoreLayer)(environment.store);
+    normalizeData(environment, environment.store, entrypoint.networkRequestInfo.normalizationAst.selections, data, variables, { __link: IsographEnvironment_1.ROOT_ID, __typename: entrypoint.concreteType }, encounteredIds);
+    (0, logging_1.logMessage)(environment, () => ({
+        kind: 'AfterNormalization',
+        store: environment.store,
+        encounteredIds,
+    }));
+    callSubscriptions(environment, encounteredIds);
+    const { fieldName, readerArtifactKind, readerWithRefetchQueries } = (0, IsographEnvironment_1.getOrLoadReaderWithRefetchQueries)(environment, entrypoint.readerWithRefetchQueries);
+    const [networkRequest, disposeNetworkRequest] = (0, makeNetworkRequest_1.retainQueryWithoutMakingNetworkRequest)(environment, entrypoint, variables);
+    return [
+        {
+            kind: 'FragmentReference',
+            readerWithRefetchQueries,
+            fieldName,
+            readerArtifactKind,
+            root: { __link: IsographEnvironment_1.ROOT_ID, __typename: entrypoint.concreteType },
+            variables,
+            networkRequest,
+        },
+        () => {
+            disposeNetworkRequest();
+        },
+    ];
+}

package/dist/core/check.d.ts

@@ -4,14 +4,17 @@ import { IsographEnvironment, StoreLink } from './IsographEnvironment';
 export type ShouldFetch = RequiredShouldFetch | 'IfNecessary';
 export type RequiredShouldFetch = 'Yes' | 'No';
 export declare const DEFAULT_SHOULD_FETCH_VALUE: ShouldFetch;
-export type FetchOptions<TReadOutData> = {
-    shouldFetch?: ShouldFetch;
+type FetchOptionsShared<TReadOutData> = {
     onComplete?: (data: TReadOutData) => void;
     onError?: () => void;
 };
-export type RequiredFetchOptions<TReadOutData> = {
+export interface FetchOptions<TReadOutData, TRawResponseType> extends FetchOptionsShared<TReadOutData> {
+    shouldFetch?: ShouldFetch;
+    optimisticNetworkResponse?: TRawResponseType;
+}
+export interface RequiredFetchOptions<TReadOutData> extends FetchOptionsShared<TReadOutData> {
     shouldFetch: RequiredShouldFetch;
-} & FetchOptions<TReadOutData>;
+}
 export type CheckResult = {
     kind: 'EnoughData';
 } | {
@@ -19,4 +22,5 @@ export type CheckResult = {
     record: StoreLink;
 };
 export declare function check(environment: IsographEnvironment, normalizationAst: NormalizationAstNodes, variables: Variables, root: StoreLink): CheckResult;
+export {};
 //# sourceMappingURL=check.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../../src/core/check.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAEL,mBAAmB,EACnB,SAAS,EAEV,MAAM,uBAAuB,CAAC;AAG/B,MAAM,MAAM,WAAW,GAAG,mBAAmB,GAAG,aAAa,CAAC;AAC9D,MAAM,MAAM,mBAAmB,GAAG,KAAK,GAAG,IAAI,CAAC;AAE/C,eAAO,MAAM,0BAA0B,EAAE,WAA2B,CAAC;AAErE,MAAM,MAAM,YAAY,CAAC,YAAY,IAAI;IACvC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IAC1C,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAAC,YAAY,IAAI;IAC/C,WAAW,EAAE,mBAAmB,CAAC;CAClC,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;AAE/B,MAAM,MAAM,WAAW,GACnB;IACE,IAAI,EAAE,YAAY,CAAC;CACpB,GACD;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC;AAEN,wBAAgB,KAAK,CACnB,WAAW,EAAE,mBAAmB,EAChC,gBAAgB,EAAE,qBAAqB,EACvC,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,SAAS,GACd,WAAW,CAgBb"}
+{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../../src/core/check.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAEL,mBAAmB,EACnB,SAAS,EAEV,MAAM,uBAAuB,CAAC;AAI/B,MAAM,MAAM,WAAW,GAAG,mBAAmB,GAAG,aAAa,CAAC;AAC9D,MAAM,MAAM,mBAAmB,GAAG,KAAK,GAAG,IAAI,CAAC;AAE/C,eAAO,MAAM,0BAA0B,EAAE,WAA2B,CAAC;AAErE,KAAK,kBAAkB,CAAC,YAAY,IAAI;IACtC,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IAC1C,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB,CAAC;AAEF,MAAM,WAAW,YAAY,CAAC,YAAY,EAAE,gBAAgB,CAC1D,SAAQ,kBAAkB,CAAC,YAAY,CAAC;IACxC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,yBAAyB,CAAC,EAAE,gBAAgB,CAAC;CAC9C;AAED,MAAM,WAAW,oBAAoB,CAAC,YAAY,CAChD,SAAQ,kBAAkB,CAAC,YAAY,CAAC;IACxC,WAAW,EAAE,mBAAmB,CAAC;CAClC;AAED,MAAM,MAAM,WAAW,GACnB;IACE,IAAI,EAAE,YAAY,CAAC;CACpB,GACD;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC;AAEN,wBAAgB,KAAK,CACnB,WAAW,EAAE,mBAAmB,EAChC,gBAAgB,EAAE,qBAAqB,EACvC,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,SAAS,GACd,WAAW,CAsBb"}

package/dist/core/check.js

@@ -5,12 +5,16 @@ exports.check = check;
 const cache_1 = require("./cache");
 const IsographEnvironment_1 = require("./IsographEnvironment");
 const logging_1 = require("./logging");
+const optimisticProxy_1 = require("./optimisticProxy");
 exports.DEFAULT_SHOULD_FETCH_VALUE = 'IfNecessary';
 function check(environment, normalizationAst, variables, root) {
-    var _a, _b;
-    var _c, _d, _e;
-    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 newStoreRecord = (0, optimisticProxy_1.getStoreRecordProxy)(environment.store, root);
+    if (newStoreRecord == null) {
+        return {
+            kind: 'MissingData',
+            record: root,
+        };
+    }
     const checkResult = checkFromRecord(environment, normalizationAst, variables, newStoreRecord, root);
     (0, logging_1.logMessage)(environment, () => ({
         kind: 'EnvironmentCheck',
@@ -19,7 +23,6 @@ function check(environment, normalizationAst, variables, root) {
     return checkResult;
 }
 function checkFromRecord(environment, normalizationAst, variables, record, recordLink) {
-    var _a, _b;
     normalizationAstLoop: for (const normalizationAstNode of normalizationAst) {
         switch (normalizationAstNode.kind) {
             case 'Scalar': {
@@ -54,7 +57,7 @@ function checkFromRecord(environment, normalizationAst, variables, record, recor
                             throw new Error('Unexpected non-link in the Isograph store. ' +
                                 'This is indicative of a bug in Isograph.');
                         }
-                        const linkedRecord = (_a = environment.store[link.__typename]) === null || _a === void 0 ? void 0 : _a[link.__link];
+                        const linkedRecord = (0, optimisticProxy_1.getStoreRecordProxy)(environment.store, link);
                         if (linkedRecord === undefined) {
                             return {
                                 kind: 'MissingData',
@@ -79,7 +82,7 @@ function checkFromRecord(environment, normalizationAst, variables, record, recor
                         throw new Error('Unexpected non-link in the Isograph store. ' +
                             'This is indicative of a bug in Isograph.');
                     }
-                    const linkedRecord = (_b = environment.store[link.__typename]) === null || _b === void 0 ? void 0 : _b[link.__link];
+                    const linkedRecord = (0, optimisticProxy_1.getStoreRecordProxy)(environment.store, link);
                     if (linkedRecord === undefined) {
                         return {
                             kind: 'MissingData',

package/dist/core/componentCache.d.ts

@@ -1,5 +1,5 @@
 import { FragmentReference } from './FragmentReference';
 import { IsographEnvironment } from './IsographEnvironment';
 import { NetworkRequestReaderOptions } from './read';
-export declare function getOrCreateCachedComponent(environment: IsographEnvironment, componentName: string, fragmentReference: FragmentReference<any, any>, networkRequestOptions: NetworkRequestReaderOptions): React.FC<any>;
+export declare function getOrCreateCachedComponent(environment: IsographEnvironment, fragmentReference: FragmentReference<any, any>, networkRequestOptions: NetworkRequestReaderOptions): React.FC<any>;
 //# sourceMappingURL=componentCache.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"componentCache.d.ts","sourceRoot":"","sources":["../../src/core/componentCache.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EAElB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAG5D,OAAO,EAAE,2BAA2B,EAAE,MAAM,QAAQ,CAAC;AAGrD,wBAAgB,0BAA0B,CACxC,WAAW,EAAE,mBAAmB,EAChC,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,EAC9C,qBAAqB,EAAE,2BAA2B,GACjD,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CA2Cf"}
+{"version":3,"file":"componentCache.d.ts","sourceRoot":"","sources":["../../src/core/componentCache.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,iBAAiB,EAElB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAG5D,OAAO,EAAE,2BAA2B,EAAE,MAAM,QAAQ,CAAC;AAGrD,wBAAgB,0BAA0B,CACxC,WAAW,EAAE,mBAAmB,EAChC,iBAAiB,EAAE,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,EAC9C,qBAAqB,EAAE,2BAA2B,GACjD,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,CA+Cf"}

package/dist/core/componentCache.js

@@ -2,22 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOrCreateCachedComponent = getOrCreateCachedComponent;
 const useReadAndSubscribe_1 = require("../react/useReadAndSubscribe");
+const useResult_1 = require("../react/useResult");
 const FragmentReference_1 = require("./FragmentReference");
 const logging_1 = require("./logging");
 const PromiseWrapper_1 = require("./PromiseWrapper");
 const startUpdate_1 = require("./startUpdate");
-function getOrCreateCachedComponent(environment, componentName, fragmentReference, networkRequestOptions) {
+function getOrCreateCachedComponent(environment, fragmentReference, networkRequestOptions) {
     var _a;
     var _b, _c;
     // We create startUpdate outside of component to make it stable
     const startUpdate = (0, startUpdate_1.createStartUpdate)(environment, fragmentReference, networkRequestOptions);
-    return ((_a = (_b = environment.componentCache)[_c = (0, FragmentReference_1.stableIdForFragmentReference)(fragmentReference, componentName)]) !== null && _a !== void 0 ? _a : (_b[_c] = (() => {
+    return ((_a = (_b = environment.componentCache)[_c = (0, FragmentReference_1.stableIdForFragmentReference)(fragmentReference)]) !== null && _a !== void 0 ? _a : (_b[_c] = (() => {
         function Component(additionalRuntimeProps) {
+            (0, useResult_1.maybeUnwrapNetworkRequest)(fragmentReference.networkRequest, networkRequestOptions);
             const readerWithRefetchQueries = (0, PromiseWrapper_1.readPromise)(fragmentReference.readerWithRefetchQueries);
             const data = (0, useReadAndSubscribe_1.useReadAndSubscribe)(fragmentReference, networkRequestOptions, readerWithRefetchQueries.readerArtifact.readerAst);
             (0, logging_1.logMessage)(environment, () => ({
                 kind: 'ComponentRerendered',
-                componentName,
+                componentName: fragmentReference.fieldName,
                 rootLink: fragmentReference.root,
             }));
             return readerWithRefetchQueries.readerArtifact.resolver({
@@ -29,7 +31,7 @@ function getOrCreateCachedComponent(environment, componentName, fragmentReferenc
             }, additionalRuntimeProps);
         }
         const idString = `(type: ${fragmentReference.root.__typename}, id: ${fragmentReference.root.__link})`;
-        Component.displayName = `${componentName} ${idString} @component`;
+        Component.displayName = `${fragmentReference.fieldName} ${idString} @component`;
         return Component;
     })()));
 }

package/dist/core/entrypoint.d.ts

@@ -1,5 +1,7 @@
+import type { Contravariant, PhantomData } from './brand';
+import type { NetworkResponseObject } from './cache';
 import type { UnknownTReadFromStore } from './FragmentReference';
-import type { TypeName } from './IsographEnvironment';
+import type { ComponentOrFieldName, TypeName } from './IsographEnvironment';
 import { TopLevelReaderArtifact } from './reader';
 import { Arguments } from './util';
 export type ReaderWithRefetchQueries<TReadFromStore extends UnknownTReadFromStore, TClientFieldValue> = {
@@ -9,6 +11,8 @@ export type ReaderWithRefetchQueries<TReadFromStore extends UnknownTReadFromStor
 };
 export type ReaderWithRefetchQueriesLoader<TReadFromStore extends UnknownTReadFromStore, TClientFieldValue> = {
     readonly kind: 'ReaderWithRefetchQueriesLoader';
+    readonly fieldName: ComponentOrFieldName;
+    readonly readerArtifactKind: 'EagerReaderArtifact' | 'ComponentReaderArtifact';
     readonly loader: () => Promise<ReaderWithRefetchQueries<TReadFromStore, TClientFieldValue>>;
 };
 export type NetworkRequestInfo<TNormalizationAst> = {
@@ -30,16 +34,21 @@ export type IsographPersistedOperationExtraInfo = {
     readonly operationName: string | null;
     readonly operationKind: 'Query' | 'Mutation' | 'Subscription';
 };
-export type IsographEntrypoint<TReadFromStore extends UnknownTReadFromStore, TClientFieldValue, TNormalizationAst extends NormalizationAst | NormalizationAstLoader> = {
+export type IsographEntrypoint<TReadFromStore extends UnknownTReadFromStore, TClientFieldValue, TNormalizationAst extends NormalizationAst | NormalizationAstLoader, TRawResponseType extends NetworkResponseObject> = {
     readonly kind: 'Entrypoint';
     readonly networkRequestInfo: NetworkRequestInfo<TNormalizationAst>;
     readonly readerWithRefetchQueries: ReaderWithRefetchQueries<TReadFromStore, TClientFieldValue> | ReaderWithRefetchQueriesLoader<TReadFromStore, TClientFieldValue>;
     readonly concreteType: TypeName;
+    /**
+     * This field exists solely for typechecking, and will not exist at runtime.
+     */
+    readonly '~TRawResponseType'?: PhantomData<Contravariant<TRawResponseType>>;
 };
-export type IsographEntrypointLoader<TReadFromStore extends UnknownTReadFromStore, TClientFieldValue> = {
+export type IsographEntrypointLoader<TReadFromStore extends UnknownTReadFromStore, TClientFieldValue, TRawResponseType extends NetworkResponseObject> = {
     readonly kind: 'EntrypointLoader';
     readonly typeAndField: string;
-    readonly loader: () => Promise<IsographEntrypoint<TReadFromStore, TClientFieldValue, NormalizationAst>>;
+    readonly readerArtifactKind: 'EagerReaderArtifact' | 'ComponentReaderArtifact';
+    readonly loader: () => Promise<IsographEntrypoint<TReadFromStore, TClientFieldValue, NormalizationAst, TRawResponseType>>;
 };
 export type NormalizationAstNode = NormalizationScalarField | NormalizationLinkedField | NormalizationInlineFragment;
 export type NormalizationAstNodes = ReadonlyArray<NormalizationAstNode>;
@@ -77,8 +86,9 @@ export type RefetchQueryNormalizationArtifactWrapper = {
     readonly artifact: RefetchQueryNormalizationArtifact;
     readonly allowedVariables: string[];
 };
-export declare function assertIsEntrypoint<TReadFromStore extends UnknownTReadFromStore, TClientFieldValue, TNormalizationAst extends NormalizationAst | NormalizationAstLoader>(value: IsographEntrypoint<TReadFromStore, TClientFieldValue, TNormalizationAst> | ((_: any) => any) | any): asserts value is IsographEntrypoint<TReadFromStore, TClientFieldValue, TNormalizationAst>;
-export type ExtractReadFromStore<Type> = Type extends IsographEntrypoint<infer X, any, any> ? X : never;
-export type ExtractResolverResult<Type> = Type extends IsographEntrypoint<any, infer X, any> ? X : never;
+export declare function assertIsEntrypoint<TReadFromStore extends UnknownTReadFromStore, TClientFieldValue, TNormalizationAst extends NormalizationAst | NormalizationAstLoader, TRawResponseType extends NetworkResponseObject>(value: IsographEntrypoint<TReadFromStore, TClientFieldValue, TNormalizationAst, TRawResponseType> | ((_: any) => any) | any): asserts value is IsographEntrypoint<TReadFromStore, TClientFieldValue, TNormalizationAst, TRawResponseType>;
+export type ExtractReadFromStore<Type> = Type extends IsographEntrypoint<infer X, any, any, any> ? X : never;
+export type ExtractRawResponseType<Type> = Type extends IsographEntrypoint<any, any, any, infer X> ? X : never;
+export type ExtractResolverResult<Type> = Type extends IsographEntrypoint<any, infer X, any, any> ? 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

@@ -1 +1 @@
-{"version":3,"file":"entrypoint.d.ts","sourceRoot":"","sources":["../../src/core/entrypoint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,MAAM,MAAM,wBAAwB,CAClC,cAAc,SAAS,qBAAqB,EAC5C,iBAAiB,IACf;IACF,QAAQ,CAAC,IAAI,EAAE,0BAA0B,CAAC;IAC1C,QAAQ,CAAC,cAAc,EAAE,sBAAsB,CAC7C,cAAc,EACd,iBAAiB,EAEjB,GAAG,CACJ,CAAC;IACF,QAAQ,CAAC,oBAAoB,EAAE,wCAAwC,EAAE,CAAC;CAC3E,CAAC;AAEF,MAAM,MAAM,8BAA8B,CACxC,cAAc,SAAS,qBAAqB,EAC5C,iBAAiB,IACf;IACF,QAAQ,CAAC,IAAI,EAAE,gCAAgC,CAAC;IAChD,QAAQ,CAAC,MAAM,EAAE,MAAM,OAAO,CAC5B,wBAAwB,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAC5D,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,kBAAkB,CAAC,iBAAiB,IAAI;IAClD,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC;IACpC,QAAQ,CAAC,SAAS,EAAE,iBAAiB,GAAG,0BAA0B,CAAC;IACnE,QAAQ,CAAC,gBAAgB,EAAE,iBAAiB,CAAC;CAC9C,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC;IACpC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,mCAAmC,GAAG,IAAI,CAAC;CAChE,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG;IAChD,QAAQ,CAAC,IAAI,EAAE,6BAA6B,CAAC;IAC7C,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,QAAQ,CAAC,aAAa,EAAE,OAAO,GAAG,UAAU,GAAG,cAAc,CAAC;CAC/D,CAAC;AAGF,MAAM,MAAM,kBAAkB,CAC5B,cAAc,SAAS,qBAAqB,EAC5C,iBAAiB,EACjB,iBAAiB,SAAS,gBAAgB,GAAG,sBAAsB,IACjE;IACF,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;IACnE,QAAQ,CAAC,wBAAwB,EAC7B,wBAAwB,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAC3D,8BAA8B,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;IACtE,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,wBAAwB,CAClC,cAAc,SAAS,qBAAqB,EAC5C,iBAAiB,IACf;IACF,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC;IAClC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,OAAO,CAC5B,kBAAkB,CAAC,cAAc,EAAE,iBAAiB,EAAE,gBAAgB,CAAC,CACxE,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAC5B,wBAAwB,GACxB,wBAAwB,GACxB,2BAA2B,CAAC;AAEhC,MAAM,MAAM,qBAAqB,GAAG,aAAa,CAAC,oBAAoB,CAAC,CAAC;AAExE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC;IAClC,QAAQ,CAAC,UAAU,EAAE,qBAAqB,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,IAAI,EAAE,wBAAwB,CAAC;IACxC,QAAQ,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAAC;CAClD,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAC;IACrC,QAAQ,CAAC,UAAU,EAAE,qBAAqB,CAAC;IAC3C,QAAQ,CAAC,YAAY,EAAE,QAAQ,GAAG,IAAI,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,qBAAqB,CAAC;CAC5C,CAAC;AAGF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;IAClE,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC;CACjC,CAAC;AAGF,MAAM,MAAM,wCAAwC,GAAG;IACrD,QAAQ,CAAC,QAAQ,EAAE,iCAAiC,CAAC;IACrD,QAAQ,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAC;CACrC,CAAC;AAEF,wBAAgB,kBAAkB,CAChC,cAAc,SAAS,qBAAqB,EAC5C,iBAAiB,EACjB,iBAAiB,SAAS,gBAAgB,GAAG,sBAAsB,EAEnE,KAAK,EACD,kBAAkB,CAAC,cAAc,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,GACxE,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,GAAG,CAAC,GAGjB,GAAG,GACN,OAAO,CAAC,KAAK,IAAI,kBAAkB,CACpC,cAAc,EACd,iBAAiB,EACjB,iBAAiB,CAClB,CAEA;AAED,MAAM,MAAM,oBAAoB,CAAC,IAAI,IACnC,IAAI,SAAS,kBAAkB,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AACjE,MAAM,MAAM,qBAAqB,CAAC,IAAI,IACpC,IAAI,SAAS,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AACjE,MAAM,MAAM,YAAY,CAAC,IAAI,IAAI,IAAI,SAAS,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC"}
+{"version":3,"file":"entrypoint.d.ts","sourceRoot":"","sources":["../../src/core/entrypoint.ts"],"names":[],"mappings":"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"}

package/dist/core/garbageCollection.d.ts

@@ -1,12 +1,18 @@
-import { NormalizationAstNodes } from './entrypoint';
+import { type NormalizationAst } from './entrypoint';
 import { IsographEnvironment, type StoreLink } from './IsographEnvironment';
+import type { BaseStoreLayer } from './optimisticProxy';
+import { type PromiseWrapper, type PromiseWrapperOk } from './PromiseWrapper';
 export type RetainedQuery = {
-    readonly normalizationAst: NormalizationAstNodes;
+    readonly normalizationAst: PromiseWrapper<NormalizationAst>;
     readonly variables: {};
     readonly root: StoreLink;
 };
+export interface RetainedQueryWithNormalizationAst extends RetainedQuery {
+    readonly normalizationAst: PromiseWrapperOk<NormalizationAst>;
+}
 export 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 declare function garbageCollectBaseStoreLayer(retainedQueries: RetainedQueryWithNormalizationAst[], baseStoreLayer: BaseStoreLayer): void;
 //# sourceMappingURL=garbageCollection.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"garbageCollection.d.ts","sourceRoot":"","sources":["../../src/core/garbageCollection.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAErD,OAAO,EAGL,mBAAmB,EAGnB,KAAK,SAAS,EAEf,MAAM,uBAAuB,CAAC;AAE/B,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,qBAAqB,CAAC;IACjD,QAAQ,CAAC,SAAS,EAAE,EAAE,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC;AAC3C,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"}
+{"version":3,"file":"garbageCollection.d.ts","sourceRoot":"","sources":["../../src/core/garbageCollection.ts"],"names":[],"mappings":"AACA,OAAO,EAAyB,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAE5E,OAAO,EAGL,mBAAmB,EAGnB,KAAK,SAAS,EAEf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,gBAAgB,EACtB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,cAAc,CAAC,gBAAgB,CAAC,CAAC;IAC5D,QAAQ,CAAC,SAAS,EAAE,EAAE,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;CAC1B,CAAC;AAEF,MAAM,WAAW,iCAAkC,SAAQ,aAAa;IACtE,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;CAC/D;AAWD,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC;AAC3C,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,QAqBzE;AAED,wBAAgB,4BAA4B,CAC1C,eAAe,EAAE,iCAAiC,EAAE,EACpD,cAAc,EAAE,cAAc,QA6B/B"}