@isograph/react 0.2.0 → 0.3.1

package/dist/core/cache.js

@@ -1,28 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SECOND_SPLIT_KEY = exports.FIRST_SPLIT_KEY = exports.getParentRecordKey = exports.onNextChange = exports.subscribe = exports.subscribeToAnyChange = exports.normalizeData = exports.getOrCreateCacheForArtifact = exports.stableCopy = exports.getOrCreateItemInSuspenseCache = void 0;
+exports.THIRD_SPLIT_KEY = exports.SECOND_SPLIT_KEY = exports.FIRST_SPLIT_KEY = exports.TYPENAME_FIELD_NAME = void 0;
+exports.getOrCreateItemInSuspenseCache = getOrCreateItemInSuspenseCache;
+exports.stableCopy = stableCopy;
+exports.getOrCreateCacheForArtifact = getOrCreateCacheForArtifact;
+exports.normalizeData = normalizeData;
+exports.subscribeToAnyChange = subscribeToAnyChange;
+exports.subscribeToAnyChangesToRecord = subscribeToAnyChangesToRecord;
+exports.subscribe = subscribe;
+exports.onNextChangeToRecord = onNextChangeToRecord;
+exports.insertIfNotExists = insertIfNotExists;
+exports.getParentRecordKey = getParentRecordKey;
 const react_disposable_state_1 = require("@isograph/react-disposable-state");
-const IsographEnvironment_1 = require("./IsographEnvironment");
-const read_1 = require("./read");
 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 TYPENAME_FIELD_NAME = '__typename';
+const read_1 = require("./read");
+exports.TYPENAME_FIELD_NAME = '__typename';
 function getOrCreateItemInSuspenseCache(environment, index, factory) {
-    // @ts-expect-error
-    if (typeof window !== 'undefined' && window.__LOG) {
-        console.log('getting cache for', {
-            index,
-            cache: Object.keys(environment.fragmentCache),
-            found: !!environment.fragmentCache[index],
-        });
-    }
     if (environment.fragmentCache[index] == null) {
         environment.fragmentCache[index] = new react_disposable_state_1.ParentCache(factory);
     }
     return environment.fragmentCache[index];
 }
-exports.getOrCreateItemInSuspenseCache = getOrCreateItemInSuspenseCache;
 /**
  * Creates a copy of the provided value, ensuring any nested objects have their
  * keys sorted such that equivalent values would have identical JSON.stringify
@@ -44,11 +46,11 @@ function stableCopy(value) {
     }
     return stable;
 }
-exports.stableCopy = stableCopy;
-function getOrCreateCacheForArtifact(environment, entrypoint, variables) {
-    const cacheKey = entrypoint.queryText + JSON.stringify(stableCopy(variables));
+function getOrCreateCacheForArtifact(environment, entrypoint, variables, fetchOptions) {
+    const cacheKey = entrypoint.networkRequestInfo.queryText +
+        JSON.stringify(stableCopy(variables));
     const factory = () => {
-        const [networkRequest, disposeNetworkRequest] = (0, makeNetworkRequest_1.makeNetworkRequest)(environment, entrypoint, variables);
+        const [networkRequest, disposeNetworkRequest] = (0, makeNetworkRequest_1.maybeMakeNetworkRequest)(environment, entrypoint, variables, fetchOptions);
         const itemCleanupPair = [
             {
                 kind: 'FragmentReference',
@@ -57,7 +59,7 @@ function getOrCreateCacheForArtifact(environment, entrypoint, variables) {
                     readerArtifact: entrypoint.readerWithRefetchQueries.readerArtifact,
                     nestedRefetchQueries: entrypoint.readerWithRefetchQueries.nestedRefetchQueries,
                 }),
-                root: IsographEnvironment_1.ROOT_ID,
+                root: { __link: IsographEnvironment_1.ROOT_ID, __typename: entrypoint.concreteType },
                 variables,
                 networkRequest: networkRequest,
             },
@@ -67,26 +69,27 @@ function getOrCreateCacheForArtifact(environment, entrypoint, variables) {
     };
     return getOrCreateItemInSuspenseCache(environment, cacheKey, factory);
 }
-exports.getOrCreateCacheForArtifact = getOrCreateCacheForArtifact;
-function normalizeData(environment, normalizationAst, networkResponse, variables, nestedRefetchQueries) {
-    const encounteredIds = new Set();
-    // @ts-expect-error
-    if (typeof window !== 'undefined' && window.__LOG) {
-        console.log('about to normalize', normalizationAst, networkResponse, variables);
-    }
-    normalizeDataIntoRecord(environment, normalizationAst, networkResponse, environment.store.__ROOT, IsographEnvironment_1.ROOT_ID, variables, nestedRefetchQueries, encounteredIds);
-    // @ts-expect-error
-    if (typeof window !== 'undefined' && window.__LOG) {
-        console.log('after normalization', {
-            store: environment.store,
-            encounteredIds,
-            environment,
-        });
-    }
+function normalizeData(environment, normalizationAst, networkResponse, variables, nestedRefetchQueries, root) {
+    var _a, _b;
+    var _c, _d, _e;
+    const encounteredIds = new Map();
+    (0, logging_1.logMessage)(environment, () => ({
+        kind: 'AboutToNormalize',
+        normalizationAst,
+        networkResponse,
+        variables,
+    }));
+    const recordsById = ((_a = (_c = environment.store)[_d = root.__typename]) !== null && _a !== void 0 ? _a : (_c[_d] = {}));
+    const newStoreRecord = ((_b = recordsById[_e = root.__link]) !== null && _b !== void 0 ? _b : (recordsById[_e] = {}));
+    normalizeDataIntoRecord(environment, normalizationAst, networkResponse, newStoreRecord, root, variables, nestedRefetchQueries, encounteredIds);
+    (0, logging_1.logMessage)(environment, () => ({
+        kind: 'AfterNormalization',
+        store: environment.store,
+        encounteredIds,
+    }));
     callSubscriptions(environment, encounteredIds);
     return encounteredIds;
 }
-exports.normalizeData = normalizeData;
 function subscribeToAnyChange(environment, callback) {
     const subscription = {
         kind: 'AnyRecords',
@@ -95,30 +98,35 @@ function subscribeToAnyChange(environment, callback) {
     environment.subscriptions.add(subscription);
     return () => environment.subscriptions.delete(subscription);
 }
-exports.subscribeToAnyChange = subscribeToAnyChange;
+function subscribeToAnyChangesToRecord(environment, recordLink, callback) {
+    const subscription = {
+        kind: 'AnyChangesToRecord',
+        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) {
+function subscribe(environment, encounteredDataAndRecords, fragmentReference, callback, readerAst) {
     const fragmentSubscription = {
         kind: 'FragmentSubscription',
         callback,
         encounteredDataAndRecords,
         fragmentReference,
+        readerAst,
     };
-    // @ts-expect-error
     environment.subscriptions.add(fragmentSubscription);
-    // @ts-expect-error
     return () => environment.subscriptions.delete(fragmentSubscription);
 }
-exports.subscribe = subscribe;
-function onNextChange(environment) {
+function onNextChangeToRecord(environment, recordLink) {
     return new Promise((resolve) => {
-        const unsubscribe = subscribeToAnyChange(environment, () => {
+        const unsubscribe = subscribeToAnyChangesToRecord(environment, recordLink, () => {
             unsubscribe();
             resolve();
         });
     });
 }
-exports.onNextChange = onNextChange;
 // Calls to readButDoNotEvaluate can suspend (i.e. throw a promise).
 // Maybe in the future, they will be able to throw errors.
 //
@@ -134,6 +142,7 @@ function withErrorHandling(f) {
 }
 function callSubscriptions(environment, recordsEncounteredWhenNormalizing) {
     environment.subscriptions.forEach(withErrorHandling((subscription) => {
+        var _a;
         switch (subscription.kind) {
             case 'FragmentSubscription': {
                 // TODO if there are multiple components subscribed to the same
@@ -157,32 +166,30 @@ function callSubscriptions(environment, recordsEncounteredWhenNormalizing) {
                         suspendIfInFlight: false,
                         throwOnNetworkError: false,
                     });
-                    if (!(0, areEqualWithDeepComparison_1.areEqualObjectsWithDeepComparison)(subscription.encounteredDataAndRecords.item, newEncounteredDataAndRecords.item)) {
-                        // @ts-expect-error
-                        if (typeof window !== 'undefined' && window.__LOG) {
-                            console.log('Deep equality - No', {
-                                fragmentReference: subscription.fragmentReference,
-                                old: subscription.encounteredDataAndRecords.item,
-                                new: newEncounteredDataAndRecords.item,
-                            });
-                        }
-                        // TODO deep compare values
+                    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) {
                         subscription.callback(newEncounteredDataAndRecords);
                     }
-                    else {
-                        // @ts-expect-error
-                        if (typeof window !== 'undefined' && window.__LOG) {
-                            console.log('Deep equality - Yes', {
-                                fragmentReference: subscription.fragmentReference,
-                                old: subscription.encounteredDataAndRecords.item,
-                            });
-                        }
-                    }
                 }
                 return;
             }
             case 'AnyRecords': {
-                return subscription.callback();
+                subscription.callback();
+                return;
+            }
+            case 'AnyChangesToRecord': {
+                if ((_a = recordsEncounteredWhenNormalizing
+                    .get(subscription.recordLink.__typename)) === null || _a === void 0 ? void 0 : _a.has(subscription.recordLink.__link)) {
+                    subscription.callback();
+                }
+                return;
             }
             default: {
                 // Ensure we have covered all variants
@@ -193,7 +200,20 @@ function callSubscriptions(environment, recordsEncounteredWhenNormalizing) {
         }
     }));
 }
-function hasOverlappingIds(set1, set2) {
+function hasOverlappingIds(ids1, ids2) {
+    for (const [typeName, set1] of ids1.entries()) {
+        const set2 = ids2.get(typeName);
+        if (set2 === undefined) {
+            continue;
+        }
+        if (isNotDisjointFrom(set1, set2)) {
+            return true;
+        }
+    }
+    return false;
+}
+// TODO use a polyfill library
+function isNotDisjointFrom(set1, set2) {
     for (const id of set1) {
         if (set2.has(id)) {
             return true;
@@ -204,7 +224,7 @@ function hasOverlappingIds(set1, set2) {
 /**
  * Mutate targetParentRecord according to the normalizationAst and networkResponseParentRecord.
  */
-function normalizeDataIntoRecord(environment, normalizationAst, networkResponseParentRecord, targetParentRecord, targetParentRecordId, variables, nestedRefetchQueries, mutableEncounteredIds) {
+function normalizeDataIntoRecord(environment, normalizationAst, networkResponseParentRecord, targetParentRecord, targetParentRecordLink, variables, nestedRefetchQueries, mutableEncounteredIds) {
     let recordHasBeenUpdated = false;
     for (const normalizationNode of normalizationAst) {
         switch (normalizationNode.kind) {
@@ -215,13 +235,13 @@ function normalizeDataIntoRecord(environment, normalizationAst, networkResponseP
                 break;
             }
             case 'Linked': {
-                const linkedFieldResultedInChange = normalizeLinkedField(environment, normalizationNode, networkResponseParentRecord, targetParentRecord, targetParentRecordId, variables, nestedRefetchQueries, mutableEncounteredIds);
+                const linkedFieldResultedInChange = normalizeLinkedField(environment, normalizationNode, networkResponseParentRecord, targetParentRecord, targetParentRecordLink, variables, nestedRefetchQueries, mutableEncounteredIds);
                 recordHasBeenUpdated =
                     recordHasBeenUpdated || linkedFieldResultedInChange;
                 break;
             }
             case 'InlineFragment': {
-                const inlineFragmentResultedInChange = normalizeInlineFragment(environment, normalizationNode, networkResponseParentRecord, targetParentRecord, targetParentRecordId, variables, nestedRefetchQueries, mutableEncounteredIds);
+                const inlineFragmentResultedInChange = normalizeInlineFragment(environment, normalizationNode, networkResponseParentRecord, targetParentRecord, targetParentRecordLink, variables, nestedRefetchQueries, mutableEncounteredIds);
                 recordHasBeenUpdated =
                     recordHasBeenUpdated || inlineFragmentResultedInChange;
                 break;
@@ -235,10 +255,19 @@ function normalizeDataIntoRecord(environment, normalizationAst, networkResponseP
         }
     }
     if (recordHasBeenUpdated) {
-        mutableEncounteredIds.add(targetParentRecordId);
+        let encounteredRecordsIds = insertIfNotExists(mutableEncounteredIds, targetParentRecordLink.__typename);
+        encounteredRecordsIds.add(targetParentRecordLink.__link);
     }
     return recordHasBeenUpdated;
 }
+function insertIfNotExists(map, key) {
+    let result = map.get(key);
+    if (result === undefined) {
+        result = new Set();
+        map.set(key, result);
+    }
+    return result;
+}
 function normalizeScalarField(astNode, networkResponseParentRecord, targetStoreRecord, variables) {
     const networkResponseKey = getNetworkResponseKey(astNode);
     const networkResponseData = networkResponseParentRecord[networkResponseKey];
@@ -256,7 +285,8 @@ function normalizeScalarField(astNode, networkResponseParentRecord, targetStoreR
 /**
  * Mutate targetParentRecord with a given linked field ast node.
  */
-function normalizeLinkedField(environment, astNode, networkResponseParentRecord, targetParentRecord, targetParentRecordId, variables, nestedRefetchQueries, mutableEncounteredIds) {
+function normalizeLinkedField(environment, astNode, networkResponseParentRecord, targetParentRecord, targetParentRecordLink, variables, nestedRefetchQueries, mutableEncounteredIds) {
+    var _a, _b;
     const networkResponseKey = getNetworkResponseKey(astNode);
     const networkResponseData = networkResponseParentRecord[networkResponseKey];
     const parentRecordKey = getParentRecordKey(astNode, variables);
@@ -265,7 +295,8 @@ function normalizeLinkedField(environment, astNode, networkResponseParentRecord,
         targetParentRecord[parentRecordKey] = null;
         return existingValue !== null;
     }
-    if (isScalarButNotEmptyArray(networkResponseData)) {
+    if (isScalarOrEmptyArray(networkResponseData) &&
+        !isNullOrEmptyArray(networkResponseData)) {
         throw new Error('Unexpected scalar network response when normalizing a linked field');
     }
     if (Array.isArray(networkResponseData)) {
@@ -273,43 +304,61 @@ function normalizeLinkedField(environment, astNode, networkResponseParentRecord,
         const dataIds = [];
         for (let i = 0; i < networkResponseData.length; i++) {
             const networkResponseObject = networkResponseData[i];
-            const newStoreRecordId = normalizeNetworkResponseObject(environment, astNode, networkResponseObject, targetParentRecordId, variables, i, nestedRefetchQueries, mutableEncounteredIds);
-            dataIds.push({ __link: newStoreRecordId });
+            if (networkResponseObject == null) {
+                dataIds.push(null);
+                continue;
+            }
+            const newStoreRecordId = normalizeNetworkResponseObject(environment, astNode, networkResponseObject, targetParentRecordLink, variables, i, nestedRefetchQueries, 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. ' +
+                    'This is indicative of a bug in Isograph.');
+            }
+            dataIds.push({
+                __link: newStoreRecordId,
+                __typename,
+            });
         }
         targetParentRecord[parentRecordKey] = dataIds;
         return !dataIdsAreTheSame(existingValue, dataIds);
     }
     else {
-        const newStoreRecordId = normalizeNetworkResponseObject(environment, astNode, networkResponseData, targetParentRecordId, variables, null, nestedRefetchQueries, mutableEncounteredIds);
+        const newStoreRecordId = normalizeNetworkResponseObject(environment, astNode, networkResponseData, targetParentRecordLink, variables, null, nestedRefetchQueries, 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. ' +
+                'This is indicative of a bug in Isograph.');
+        }
         targetParentRecord[parentRecordKey] = {
             __link: newStoreRecordId,
+            __typename,
         };
         const link = (0, IsographEnvironment_1.getLink)(existingValue);
-        return (link === null || link === void 0 ? void 0 : link.__link) !== newStoreRecordId;
+        return (link === null || link === void 0 ? void 0 : link.__link) !== newStoreRecordId || link.__typename !== __typename;
     }
 }
 /**
  * Mutate targetParentRecord with a given linked field ast node.
  */
-function normalizeInlineFragment(environment, astNode, networkResponseParentRecord, targetParentRecord, targetParentRecordId, variables, nestedRefetchQueries, mutableEncounteredIds) {
+function normalizeInlineFragment(environment, astNode, networkResponseParentRecord, targetParentRecord, targetParentRecordLink, variables, nestedRefetchQueries, mutableEncounteredIds) {
     const typeToRefineTo = astNode.type;
-    if (networkResponseParentRecord[TYPENAME_FIELD_NAME] === typeToRefineTo) {
-        const hasBeenModified = normalizeDataIntoRecord(environment, astNode.selections, networkResponseParentRecord, targetParentRecord, targetParentRecordId, variables, nestedRefetchQueries, mutableEncounteredIds);
+    if (networkResponseParentRecord[exports.TYPENAME_FIELD_NAME] === typeToRefineTo) {
+        const hasBeenModified = normalizeDataIntoRecord(environment, astNode.selections, networkResponseParentRecord, targetParentRecord, targetParentRecordLink, variables, nestedRefetchQueries, mutableEncounteredIds);
         return hasBeenModified;
     }
     return false;
 }
 function dataIdsAreTheSame(existingValue, newDataIds) {
+    var _a, _b;
     if (Array.isArray(existingValue)) {
         if (newDataIds.length !== existingValue.length) {
             return false;
         }
         for (let i = 0; i < newDataIds.length; i++) {
             const maybeLink = (0, IsographEnvironment_1.getLink)(existingValue[i]);
-            if (maybeLink !== null) {
-                if (newDataIds[i].__link !== maybeLink.__link) {
-                    return false;
-                }
+            if (((_a = newDataIds[i]) === null || _a === void 0 ? void 0 : _a.__link) !== (maybeLink === null || maybeLink === void 0 ? void 0 : maybeLink.__link) ||
+                ((_b = newDataIds[i]) === null || _b === void 0 ? void 0 : _b.__typename) !== (maybeLink === null || maybeLink === void 0 ? void 0 : maybeLink.__typename)) {
+                return false;
             }
         }
         return true;
@@ -318,12 +367,18 @@ function dataIdsAreTheSame(existingValue, newDataIds) {
         return false;
     }
 }
-function normalizeNetworkResponseObject(environment, astNode, networkResponseData, targetParentRecordId, variables, index, nestedRefetchQueries, mutableEncounteredIds) {
-    var _a;
-    const newStoreRecordId = getDataIdOfNetworkResponse(targetParentRecordId, networkResponseData, astNode, variables, index);
-    const newStoreRecord = (_a = environment.store[newStoreRecordId]) !== null && _a !== void 0 ? _a : {};
-    environment.store[newStoreRecordId] = newStoreRecord;
-    normalizeDataIntoRecord(environment, astNode.selections, networkResponseData, newStoreRecord, newStoreRecordId, variables, nestedRefetchQueries, mutableEncounteredIds);
+function normalizeNetworkResponseObject(environment, astNode, networkResponseData, targetParentRecordLink, variables, index, nestedRefetchQueries, mutableEncounteredIds) {
+    var _a, _b, _c;
+    var _d;
+    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, nestedRefetchQueries, mutableEncounteredIds);
     return newStoreRecordId;
 }
 function isScalarOrEmptyArray(data) {
@@ -332,24 +387,20 @@ function isScalarOrEmptyArray(data) {
         // This is maybe fixed in a new version of Typescript??
         return data.every((x) => isScalarOrEmptyArray(x));
     }
-    const isScalarValue = typeof data === 'string' ||
+    const isScalarValue = data === null ||
+        typeof data === 'string' ||
         typeof data === 'number' ||
         typeof data === 'boolean';
     return isScalarValue;
 }
-function isScalarButNotEmptyArray(data) {
-    // N.B. empty arrays count as empty arrays of linked fields.
+function isNullOrEmptyArray(data) {
     if (Array.isArray(data)) {
         if (data.length === 0) {
-            return false;
+            return true;
         }
-        // This is maybe fixed in a new version of Typescript??
-        return data.every((x) => isScalarOrEmptyArray(x));
+        return data.every((x) => isNullOrEmptyArray(x));
     }
-    const isScalarValue = typeof data === 'string' ||
-        typeof data === 'number' ||
-        typeof data === 'boolean';
-    return isScalarValue;
+    return data === null;
 }
 function getParentRecordKey(astNode, variables) {
     let parentRecordKey = astNode.fieldName;
@@ -361,10 +412,18 @@ function getParentRecordKey(astNode, variables) {
     }
     return parentRecordKey;
 }
-exports.getParentRecordKey = getParentRecordKey;
 function getStoreKeyChunkForArgumentValue(argumentValue, variables) {
     var _a;
     switch (argumentValue.kind) {
+        case 'Object': {
+            return Object.fromEntries(argumentValue.value.map(([argumentName, argumentValue]) => {
+                return [
+                    argumentName,
+                    //  substitute variables
+                    getStoreKeyChunkForArgumentValue(argumentValue, variables),
+                ];
+            }));
+        }
         case 'Literal': {
             return argumentValue.value;
         }
@@ -387,57 +446,75 @@ function getStoreKeyChunkForArgumentValue(argumentValue, variables) {
     }
 }
 function getStoreKeyChunkForArgument(argument, variables) {
-    const chunk = getStoreKeyChunkForArgumentValue(argument[1], variables);
+    let chunk = getStoreKeyChunkForArgumentValue(argument[1], variables);
+    if (typeof chunk === 'object') {
+        chunk = JSON.stringify(stableCopy(chunk));
+    }
     return `${exports.FIRST_SPLIT_KEY}${argument[0]}${exports.SECOND_SPLIT_KEY}${chunk}`;
 }
 function getNetworkResponseKey(astNode) {
     let networkResponseKey = astNode.fieldName;
     const fieldParameters = astNode.arguments;
     if (fieldParameters != null) {
-        for (const fieldParameter of fieldParameters) {
-            const [argumentName, argumentValue] = fieldParameter;
-            let argumentValueChunk;
-            switch (argumentValue.kind) {
-                case 'Literal': {
-                    argumentValueChunk = 'l_' + argumentValue.value;
-                    break;
-                }
-                case 'Variable': {
-                    argumentValueChunk = 'v_' + argumentValue.name;
-                    break;
-                }
-                case 'String': {
-                    argumentValueChunk = 's_' + argumentValue.value;
-                    break;
-                }
-                case 'Enum': {
-                    argumentValueChunk = 'e_' + argumentValue.value;
-                    break;
-                }
-                default: {
-                    // Ensure we have covered all variants
-                    let _ = argumentValue;
-                    _;
-                    throw new Error('Unexpected case');
-                }
-            }
+        for (const [argumentName, argumentValue] of fieldParameters) {
+            let argumentValueChunk = getArgumentValueChunk(argumentValue);
             networkResponseKey += `${exports.FIRST_SPLIT_KEY}${argumentName}${exports.SECOND_SPLIT_KEY}${argumentValueChunk}`;
         }
     }
     return networkResponseKey;
 }
+function getArgumentValueChunk(argumentValue) {
+    switch (argumentValue.kind) {
+        case 'Object': {
+            return ('o_' +
+                argumentValue.value
+                    .map(([argumentName, argumentValue]) => {
+                    return (argumentName +
+                        exports.THIRD_SPLIT_KEY +
+                        getArgumentValueChunk(argumentValue));
+                })
+                    .join('_') +
+                '_c');
+        }
+        case 'Literal': {
+            return 'l_' + argumentValue.value;
+        }
+        case 'Variable': {
+            return 'v_' + argumentValue.name;
+        }
+        case 'String': {
+            // replace all non-word characters (alphanumeric & underscore) with underscores
+            return 's_' + argumentValue.value.replaceAll(/\W/g, '_');
+        }
+        case 'Enum': {
+            return 'e_' + argumentValue.value;
+        }
+        default: {
+            // Ensure we have covered all variants
+            let _ = argumentValue;
+            _;
+            throw new Error('Unexpected case');
+        }
+    }
+}
 // an alias might be pullRequests____first___first____after___cursor
 exports.FIRST_SPLIT_KEY = '____';
 exports.SECOND_SPLIT_KEY = '___';
+exports.THIRD_SPLIT_KEY = '__';
 // Returns a key to look up an item in the store
-function getDataIdOfNetworkResponse(parentRecordId, dataToNormalize, astNode, variables, index) {
+function getDataIdOfNetworkResponse(parentRecordLink, dataToNormalize, astNode, variables, index) {
+    // If we are dealing with nested Query, use __ROOT as id
+    // TODO do not hard code this value here
+    if (astNode.concreteType === 'Query') {
+        return IsographEnvironment_1.ROOT_ID;
+    }
     // Check whether the dataToNormalize has an id field. If so, that is the key.
     // If not, we construct an id from the parentRecordId and the field parameters.
     const dataId = dataToNormalize.id;
     if (dataId != null) {
         return dataId;
     }
-    let storeKey = `${parentRecordId}.${astNode.fieldName}`;
+    let storeKey = `${parentRecordLink.__typename}:${parentRecordLink.__link}.${astNode.fieldName}`;
     if (index != null) {
         storeKey += `.${index}`;
     }

package/dist/core/check.d.ts

@@ -0,0 +1,22 @@
+import { NormalizationAstNodes } from './entrypoint';
+import { Variables } from './FragmentReference';
+import { IsographEnvironment, Link } 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;
+    onComplete?: (data: TReadOutData) => void;
+    onError?: () => void;
+};
+export type RequiredFetchOptions<TReadOutData> = {
+    shouldFetch: RequiredShouldFetch;
+} & FetchOptions<TReadOutData>;
+export type CheckResult = {
+    kind: 'EnoughData';
+} | {
+    kind: 'MissingData';
+    record: Link;
+};
+export declare function check(environment: IsographEnvironment, normalizationAst: NormalizationAstNodes, variables: Variables, root: Link): CheckResult;
+//# sourceMappingURL=check.d.ts.map

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

@@ -0,0 +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,IAAI,EAEL,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,IAAI,CAAC;CACd,CAAC;AAEN,wBAAgB,KAAK,CACnB,WAAW,EAAE,mBAAmB,EAChC,gBAAgB,EAAE,qBAAqB,EACvC,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,IAAI,GACT,WAAW,CAgBb"}