@isograph/react 0.0.0-main-3a36e9fb → 0.0.0-main-beecd3bf

package/dist/core/makeNetworkRequest.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.maybeMakeNetworkRequest = maybeMakeNetworkRequest;
 exports.makeNetworkRequest = makeNetworkRequest;
 const garbageCollection_1 = require("./garbageCollection");
+const IsographEnvironment_1 = require("./IsographEnvironment");
 const PromiseWrapper_1 = require("./PromiseWrapper");
 const cache_1 = require("./cache");
 const logging_1 = require("./logging");
@@ -17,7 +18,10 @@ function maybeMakeNetworkRequest(environment, artifact, variables, shouldFetch)
             return [(0, PromiseWrapper_1.wrapResolvedValue)(undefined), () => { }];
         }
         case 'IfNecessary': {
-            const result = (0, check_1.check)(environment, artifact.networkRequestInfo.normalizationAst, variables);
+            const result = (0, check_1.check)(environment, artifact.networkRequestInfo.normalizationAst, variables, {
+                __link: IsographEnvironment_1.ROOT_ID,
+                __typename: artifact.concreteType,
+            });
             if (result.kind === 'EnoughData') {
                 return [(0, PromiseWrapper_1.wrapResolvedValue)(undefined), () => { }];
             }
@@ -57,12 +61,14 @@ function makeNetworkRequest(environment, artifact, variables) {
             });
         }
         if (status.kind === 'UndisposedIncomplete') {
+            const root = { __link: IsographEnvironment_1.ROOT_ID, __typename: artifact.concreteType };
             (0, cache_1.normalizeData)(environment, artifact.networkRequestInfo.normalizationAst, (_a = networkResponse.data) !== null && _a !== void 0 ? _a : {}, variables, artifact.kind === 'Entrypoint'
                 ? artifact.readerWithRefetchQueries.nestedRefetchQueries
-                : []);
+                : [], root);
             const retainedQuery = {
                 normalizationAst: artifact.networkRequestInfo.normalizationAst,
                 variables,
+                root,
             };
             status = {
                 kind: 'UndisposedComplete',

package/dist/core/read.d.ts

@@ -1,7 +1,8 @@
+import { type EncounteredIds } from './cache';
 import { FragmentReference, ExtractData } from './FragmentReference';
-import { DataId, IsographEnvironment, type Link } from './IsographEnvironment';
+import { IsographEnvironment, type Link } from './IsographEnvironment';
 export type WithEncounteredRecords<T> = {
-    readonly encounteredRecords: Set<DataId>;
+    readonly encounteredRecords: EncounteredIds;
     readonly item: ExtractData<T>;
 };
 export declare function readButDoNotEvaluate<TReadFromStore extends {
@@ -11,7 +12,7 @@ export declare function readButDoNotEvaluate<TReadFromStore extends {
 export type ReadDataResult<TReadFromStore> = {
     readonly kind: 'Success';
     readonly data: ExtractData<TReadFromStore>;
-    readonly encounteredRecords: Set<DataId>;
+    readonly encounteredRecords: EncounteredIds;
 } | {
     readonly kind: 'MissingData';
     readonly reason: string;

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

@@ -1 +1 @@
-{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../src/core/read.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,iBAAiB,EAEjB,WAAW,EAEZ,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,MAAM,EAGN,mBAAmB,EACnB,KAAK,IAAI,EACV,MAAM,uBAAuB,CAAC;AAe/B,MAAM,MAAM,sBAAsB,CAAC,CAAC,IAAI;IACtC,QAAQ,CAAC,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACzC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;CAC/B,CAAC;AAEF,wBAAgB,oBAAoB,CAClC,cAAc,SAAS;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAE3D,WAAW,EAAE,mBAAmB,EAChC,iBAAiB,EAAE,iBAAiB,CAAC,cAAc,EAAE,OAAO,CAAC,EAC7D,qBAAqB,EAAE,2BAA2B,GACjD,sBAAsB,CAAC,cAAc,CAAC,CAkDxC;AAED,MAAM,MAAM,cAAc,CAAC,cAAc,IACrC;IACE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;IAC3C,QAAQ,CAAC,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC1C,GACD;IACE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,YAAY,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IAChD,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC;CAC3B,CAAC;AAyjBN,MAAM,MAAM,2BAA2B,GAAG;IACxC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF,wBAAgB,oCAAoC,CAClD,qBAAqB,CAAC,EAAE,OAAO,CAAC,2BAA2B,CAAC,GAAG,IAAI,GAClE,2BAA2B,CAK7B"}
+{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../src/core/read.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,cAAc,EACpB,MAAM,SAAS,CAAC;AAMjB,OAAO,EACL,iBAAiB,EAEjB,WAAW,EAEZ,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAGL,mBAAmB,EACnB,KAAK,IAAI,EACV,MAAM,uBAAuB,CAAC;AAe/B,MAAM,MAAM,sBAAsB,CAAC,CAAC,IAAI;IACtC,QAAQ,CAAC,kBAAkB,EAAE,cAAc,CAAC;IAC5C,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;CAC/B,CAAC;AAEF,wBAAgB,oBAAoB,CAClC,cAAc,SAAS;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAE3D,WAAW,EAAE,mBAAmB,EAChC,iBAAiB,EAAE,iBAAiB,CAAC,cAAc,EAAE,OAAO,CAAC,EAC7D,qBAAqB,EAAE,2BAA2B,GACjD,sBAAsB,CAAC,cAAc,CAAC,CAkDxC;AAED,MAAM,MAAM,cAAc,CAAC,cAAc,IACrC;IACE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;IAC3C,QAAQ,CAAC,kBAAkB,EAAE,cAAc,CAAC;CAC7C,GACD;IACE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,YAAY,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IAChD,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC;CAC3B,CAAC;AA+jBN,MAAM,MAAM,2BAA2B,GAAG;IACxC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF,wBAAgB,oCAAoC,CAClD,qBAAqB,CAAC,EAAE,OAAO,CAAC,2BAA2B,CAAC,GAAG,IAAI,GAClE,2BAA2B,CAK7B"}

package/dist/core/read.js

@@ -11,7 +11,7 @@ const logging_1 = require("./logging");
 const check_1 = require("./check");
 function readButDoNotEvaluate(environment, fragmentReference, networkRequestOptions) {
     var _a;
-    const mutableEncounteredRecords = new Set();
+    const mutableEncounteredRecords = new Map();
     const readerWithRefetchQueries = (0, PromiseWrapper_1.readPromise)(fragmentReference.readerWithRefetchQueries);
     const response = readData(environment, readerWithRefetchQueries.readerArtifact.readerAst, fragmentReference.root, (_a = fragmentReference.variables) !== null && _a !== void 0 ? _a : {}, readerWithRefetchQueries.nestedRefetchQueries, fragmentReference.networkRequest, networkRequestOptions, mutableEncounteredRecords);
     (0, logging_1.logMessage)(environment, {
@@ -47,8 +47,9 @@ function readButDoNotEvaluate(environment, fragmentReference, networkRequestOpti
 }
 function readData(environment, ast, root, variables, nestedRefetchQueries, networkRequest, networkRequestOptions, mutableEncounteredRecords) {
     var _a, _b, _c, _d, _e;
-    mutableEncounteredRecords.add(root.__link);
-    let storeRecord = environment.store[root.__link];
+    const encounteredIds = (0, cache_1.insertIfNotExists)(mutableEncounteredRecords, root.__typename);
+    encounteredIds.add(root.__link);
+    let storeRecord = (_a = environment.store[root.__typename]) === null || _a === void 0 ? void 0 : _a[root.__link];
     if (storeRecord === undefined) {
         return {
             kind: 'MissingData',
@@ -78,7 +79,7 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, netwo
                         recordLink: root,
                     };
                 }
-                target[(_a = field.alias) !== null && _a !== void 0 ? _a : field.fieldName] = value;
+                target[(_b = field.alias) !== null && _b !== void 0 ? _b : field.fieldName] = value;
                 break;
             }
             case 'Linked': {
@@ -120,7 +121,7 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, netwo
                         }
                         results.push(result.data);
                     }
-                    target[(_b = field.alias) !== null && _b !== void 0 ? _b : field.fieldName] = results;
+                    target[(_c = field.alias) !== null && _c !== void 0 ? _c : field.fieldName] = results;
                     break;
                 }
                 let link = (0, IsographEnvironment_1.assertLink)(value);
@@ -153,8 +154,8 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, netwo
                 }
                 if (link === undefined) {
                     // TODO make this configurable, and also generated and derived from the schema
-                    const missingFieldHandler = (_c = environment.missingFieldHandler) !== null && _c !== void 0 ? _c : IsographEnvironment_1.defaultMissingFieldHandler;
-                    const altLink = missingFieldHandler(storeRecord, root, field.fieldName, field.arguments, variables);
+                    const missingFieldHandler = environment.missingFieldHandler;
+                    const altLink = missingFieldHandler === null || missingFieldHandler === void 0 ? void 0 : missingFieldHandler(storeRecord, root, field.fieldName, field.arguments, variables);
                     (0, logging_1.logMessage)(environment, {
                         kind: 'MissingFieldHandlerCalled',
                         root,
@@ -303,7 +304,9 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, netwo
                         writeQueryArgsToVariables(localVariables, field.queryArguments, variables);
                         return [
                             // Stable id
-                            root.__link +
+                            root.__typename +
+                                ':' +
+                                root.__link +
                                 '/' +
                                 field.name +
                                 '/' +
@@ -323,7 +326,7 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, netwo
                                                 .nestedRefetchQueries,
                                         }),
                                         // TODO localVariables is not guaranteed to have an id field
-                                        root: { __link: localVariables.id },
+                                        root,
                                         variables: localVariables,
                                         networkRequest,
                                     };
@@ -358,7 +361,7 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, netwo
                                             kind: 'FragmentReference',
                                             readerWithRefetchQueries: (0, PromiseWrapper_1.wrapPromise)(readerWithRefetchPromise),
                                             // TODO localVariables is not guaranteed to have an id field
-                                            root: { __link: localVariables.id },
+                                            root,
                                             variables: localVariables,
                                             networkRequest,
                                         };

package/dist/index.d.ts

@@ -2,7 +2,7 @@ export { retainQuery, unretainQuery, type RetainedQuery, garbageCollectEnvironme
 export { type PromiseWrapper, readPromise, getPromiseState, wrapResolvedValue, wrapPromise, } from './core/PromiseWrapper';
 export { subscribe, normalizeData } from './core/cache';
 export { makeNetworkRequest } from './core/makeNetworkRequest';
-export { ROOT_ID, type DataId, type DataTypeValue, type IsographEnvironment, type IsographNetworkFunction, type IsographStore, type Link, type StoreRecord, createIsographEnvironment, createIsographStore, defaultMissingFieldHandler, } from './core/IsographEnvironment';
+export { ROOT_ID, type DataId, type DataTypeValue, type IsographEnvironment, type IsographNetworkFunction, type IsographStore, type Link, type StoreRecord, createIsographEnvironment, createIsographStore, } from './core/IsographEnvironment';
 export { type EagerReaderArtifact, type ComponentReaderArtifact, type RefetchReaderArtifact, type ReaderAst, type ReaderAstNode, type ReaderLinkedField, type ReaderNonLoadableResolverField, type ReaderScalarField, type TopLevelReaderArtifact, type LoadableField, type ResolverFirstParameter, } from './core/reader';
 export { type NormalizationAst, type NormalizationAstNode, type NormalizationLinkedField, type NormalizationScalarField, type IsographEntrypoint, assertIsEntrypoint, type RefetchQueryNormalizationArtifact, type RefetchQueryNormalizationArtifactWrapper, type ExtractProps, type ExtractReadFromStore, type ExtractResolverResult, type NetworkRequestInfo, } from './core/entrypoint';
 export { readButDoNotEvaluate } from './core/read';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,aAAa,EACb,KAAK,aAAa,EAClB,yBAAyB,GAC1B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,KAAK,cAAc,EACnB,WAAW,EACX,eAAe,EACf,iBAAiB,EACjB,WAAW,GACZ,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EACL,OAAO,EACP,KAAK,MAAM,EACX,KAAK,aAAa,EAClB,KAAK,mBAAmB,EACxB,KAAK,uBAAuB,EAC5B,KAAK,aAAa,EAClB,KAAK,IAAI,EACT,KAAK,WAAW,EAChB,yBAAyB,EACzB,mBAAmB,EACnB,0BAA0B,GAC3B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,uBAAuB,EAC5B,KAAK,qBAAqB,EAC1B,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,KAAK,8BAA8B,EACnC,KAAK,iBAAiB,EACtB,KAAK,sBAAsB,EAC3B,KAAK,aAAa,EAClB,KAAK,sBAAsB,GAC5B,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EACzB,KAAK,wBAAwB,EAC7B,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EACvB,kBAAkB,EAClB,KAAK,iCAAiC,EACtC,KAAK,wCAAwC,EAC7C,KAAK,YAAY,EACjB,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,EAC1B,KAAK,kBAAkB,GACxB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,8BAA8B,EACnC,KAAK,QAAQ,EACb,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,SAAS,GACf,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,SAAS,EACd,KAAK,iBAAiB,EACtB,KAAK,WAAW,EAChB,4BAA4B,GAC7B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,UAAU,EACV,cAAc,GACf,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE7E,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,EACtB,KAAK,gCAAgC,GACtC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EACL,mBAAmB,EACnB,sBAAsB,GACvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,6BAA6B,EAAE,MAAM,uCAAuC,CAAC;AAEtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,EAAE,iCAAiC,EAAE,MAAM,oDAAoD,CAAC;AACvG,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,2BAA2B,EAAE,MAAM,8CAA8C,CAAC;AAC3F,OAAO,EAAE,0BAA0B,EAAE,MAAM,6CAA6C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,aAAa,EACb,KAAK,aAAa,EAClB,yBAAyB,GAC1B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,KAAK,cAAc,EACnB,WAAW,EACX,eAAe,EACf,iBAAiB,EACjB,WAAW,GACZ,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EACL,OAAO,EACP,KAAK,MAAM,EACX,KAAK,aAAa,EAClB,KAAK,mBAAmB,EACxB,KAAK,uBAAuB,EAC5B,KAAK,aAAa,EAClB,KAAK,IAAI,EACT,KAAK,WAAW,EAChB,yBAAyB,EACzB,mBAAmB,GACpB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,uBAAuB,EAC5B,KAAK,qBAAqB,EAC1B,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,KAAK,8BAA8B,EACnC,KAAK,iBAAiB,EACtB,KAAK,sBAAsB,EAC3B,KAAK,aAAa,EAClB,KAAK,sBAAsB,GAC5B,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,oBAAoB,EACzB,KAAK,wBAAwB,EAC7B,KAAK,wBAAwB,EAC7B,KAAK,kBAAkB,EACvB,kBAAkB,EAClB,KAAK,iCAAiC,EACtC,KAAK,wCAAwC,EAC7C,KAAK,YAAY,EACjB,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,EAC1B,KAAK,kBAAkB,GACxB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,8BAA8B,EACnC,KAAK,QAAQ,EACb,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,SAAS,GACf,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,SAAS,EACd,KAAK,iBAAiB,EACtB,KAAK,WAAW,EAChB,4BAA4B,GAC7B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,UAAU,EACV,cAAc,GACf,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE7E,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,EACtB,KAAK,gCAAgC,GACtC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EACL,mBAAmB,EACnB,sBAAsB,GACvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,6BAA6B,EAAE,MAAM,uCAAuC,CAAC;AAEtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,EAAE,iCAAiC,EAAE,MAAM,oDAAoD,CAAC;AACvG,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,2BAA2B,EAAE,MAAM,8CAA8C,CAAC;AAC3F,OAAO,EAAE,0BAA0B,EAAE,MAAM,6CAA6C,CAAC"}

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useImperativeLoadableField = exports.useConnectionSpecPagination = exports.useSkipLimitPagination = exports.useImperativeExposedMutationField = exports.useClientSideDefer = exports.RenderAfterCommit__DO_NOT_USE = exports.useRerenderOnChange = exports.useLazyReference = exports.useSubscribeToMultiple = exports.useReadAndSubscribe = exports.useResult = exports.FragmentReader = exports.useImperativeReference = exports.useIsographEnvironment = exports.IsographEnvironmentProvider = exports.check = exports.registerLogger = exports.logMessage = exports.stableIdForFragmentReference = exports.readButDoNotEvaluate = exports.assertIsEntrypoint = exports.defaultMissingFieldHandler = exports.createIsographStore = exports.createIsographEnvironment = exports.ROOT_ID = exports.makeNetworkRequest = exports.normalizeData = exports.subscribe = exports.wrapPromise = exports.wrapResolvedValue = exports.getPromiseState = exports.readPromise = exports.garbageCollectEnvironment = exports.unretainQuery = exports.retainQuery = void 0;
+exports.useImperativeLoadableField = exports.useConnectionSpecPagination = exports.useSkipLimitPagination = exports.useImperativeExposedMutationField = exports.useClientSideDefer = exports.RenderAfterCommit__DO_NOT_USE = exports.useRerenderOnChange = exports.useLazyReference = exports.useSubscribeToMultiple = exports.useReadAndSubscribe = exports.useResult = exports.FragmentReader = exports.useImperativeReference = exports.useIsographEnvironment = exports.IsographEnvironmentProvider = exports.check = exports.registerLogger = exports.logMessage = exports.stableIdForFragmentReference = exports.readButDoNotEvaluate = exports.assertIsEntrypoint = exports.createIsographStore = exports.createIsographEnvironment = exports.ROOT_ID = exports.makeNetworkRequest = exports.normalizeData = exports.subscribe = exports.wrapPromise = exports.wrapResolvedValue = exports.getPromiseState = exports.readPromise = exports.garbageCollectEnvironment = exports.unretainQuery = exports.retainQuery = void 0;
 var garbageCollection_1 = require("./core/garbageCollection");
 Object.defineProperty(exports, "retainQuery", { enumerable: true, get: function () { return garbageCollection_1.retainQuery; } });
 Object.defineProperty(exports, "unretainQuery", { enumerable: true, get: function () { return garbageCollection_1.unretainQuery; } });
@@ -19,7 +19,6 @@ var IsographEnvironment_1 = require("./core/IsographEnvironment");
 Object.defineProperty(exports, "ROOT_ID", { enumerable: true, get: function () { return IsographEnvironment_1.ROOT_ID; } });
 Object.defineProperty(exports, "createIsographEnvironment", { enumerable: true, get: function () { return IsographEnvironment_1.createIsographEnvironment; } });
 Object.defineProperty(exports, "createIsographStore", { enumerable: true, get: function () { return IsographEnvironment_1.createIsographStore; } });
-Object.defineProperty(exports, "defaultMissingFieldHandler", { enumerable: true, get: function () { return IsographEnvironment_1.defaultMissingFieldHandler; } });
 var entrypoint_1 = require("./core/entrypoint");
 Object.defineProperty(exports, "assertIsEntrypoint", { enumerable: true, get: function () { return entrypoint_1.assertIsEntrypoint; } });
 var read_1 = require("./core/read");

package/dist/react/useImperativeReference.js

@@ -25,7 +25,7 @@ function useImperativeReference(entrypoint) {
                         readerArtifact: entrypoint.readerWithRefetchQueries.readerArtifact,
                         nestedRefetchQueries: entrypoint.readerWithRefetchQueries.nestedRefetchQueries,
                     }),
-                    root: { __link: IsographEnvironment_1.ROOT_ID },
+                    root: { __link: IsographEnvironment_1.ROOT_ID, __typename: entrypoint.concreteType },
                     variables,
                     networkRequest,
                 },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isograph/react",
-  "version": "0.0.0-main-3a36e9fb",
+  "version": "0.0.0-main-beecd3bf",
   "description": "Use Isograph with React",
   "homepage": "https://isograph.dev",
   "main": "dist/index.js",
@@ -19,9 +19,9 @@
     "iso-watch": "../../target/debug/isograph_cli --config ./isograph.config.json --watch"
   },
   "dependencies": {
-    "@isograph/disposable-types": "0.0.0-main-3a36e9fb",
-    "@isograph/react-disposable-state": "0.0.0-main-3a36e9fb",
-    "@isograph/reference-counted-pointer": "0.0.0-main-3a36e9fb"
+    "@isograph/disposable-types": "0.0.0-main-beecd3bf",
+    "@isograph/react-disposable-state": "0.0.0-main-beecd3bf",
+    "@isograph/reference-counted-pointer": "0.0.0-main-beecd3bf"
   },
   "peerDependencies": {
     "react": "18.3.1"

package/schema.graphql

@@ -2,6 +2,7 @@ type Query {
   me: Economist!
   you: Economist!
   node(id: ID!): Node
+  query: Query!
 }
 
 type Economist implements Node {

package/src/core/FragmentReference.ts

@@ -35,7 +35,7 @@ export type FragmentReference<
 export function stableIdForFragmentReference(
   fragmentReference: FragmentReference<any, any>,
 ): string {
-  return `${fragmentReference.root.__link}/TODO_FRAGMENT_NAME/${serializeVariables(fragmentReference.variables ?? {})}`;
+  return `${fragmentReference.root.__typename}/${fragmentReference.root.__link}/TODO_FRAGMENT_NAME/${serializeVariables(fragmentReference.variables ?? {})}`;
 }
 
 function serializeVariables(variables: Variables) {

package/src/core/IsographEnvironment.ts

@@ -82,6 +82,7 @@ export type IsographNetworkFunction = (
 
 export type Link = {
   readonly __link: DataId;
+  readonly __typename: TypeName;
 };
 
 export type DataTypeValue =
@@ -111,8 +112,12 @@ export type DataId = string;
 export const ROOT_ID: DataId & '__ROOT' = '__ROOT';
 
 export type IsographStore = {
-  [index: DataId]: StoreRecord | null;
-  readonly __ROOT: StoreRecord;
+  [index: TypeName]: {
+    [index: DataId]: StoreRecord | null;
+  } | null;
+  readonly Query: {
+    readonly __ROOT: StoreRecord;
+  };
 };
 
 const DEFAULT_GC_BUFFER_SIZE = 10;
@@ -139,29 +144,12 @@ export function createIsographEnvironment(
 
 export function createIsographStore(): IsographStore {
   return {
-    [ROOT_ID]: {},
+    Query: {
+      [ROOT_ID]: {},
+    },
   };
 }
 
-export function defaultMissingFieldHandler(
-  _storeRecord: StoreRecord,
-  _root: Link,
-  fieldName: string,
-  arguments_: { [index: string]: any } | null,
-  variables: Variables | null,
-): Link | undefined {
-  if (fieldName === 'node' || fieldName === 'user') {
-    const variable = arguments_?.['id'];
-    const value = variables?.[variable];
-
-    // TODO can we handle explicit nulls here too? Probably, after wrapping in objects
-    if (value != null) {
-      // @ts-expect-error
-      return { __link: value };
-    }
-  }
-}
-
 export function assertLink(link: DataTypeValue): Link | null | undefined {
   if (Array.isArray(link)) {
     throw new Error('Unexpected array');
@@ -179,10 +167,12 @@ export function getLink(maybeLink: DataTypeValue): Link | null {
   if (
     maybeLink != null &&
     typeof maybeLink === 'object' &&
-    // @ts-expect-error this is safe
-    maybeLink.__link != null
+    '__link' in maybeLink &&
+    maybeLink.__link != null &&
+    '__typename' in maybeLink &&
+    maybeLink.__typename != null
   ) {
-    return maybeLink as any;
+    return maybeLink;
   }
   return null;
 }

package/src/core/cache.ts

@@ -12,6 +12,7 @@ import {
   DataTypeValue,
   getLink,
   FragmentSubscription,
+  type TypeName,
 } from './IsographEnvironment';
 import {
   IsographEntrypoint,
@@ -35,7 +36,7 @@ import { wrapResolvedValue } from './PromiseWrapper';
 import { logMessage } from './logging';
 import { DEFAULT_SHOULD_FETCH_VALUE, FetchOptions } from './check';
 
-const TYPENAME_FIELD_NAME = '__typename';
+export const TYPENAME_FIELD_NAME = '__typename';
 
 export function getOrCreateItemInSuspenseCache<
   TReadFromStore extends { parameters: object; data: object },
@@ -113,7 +114,7 @@ export function getOrCreateCacheForArtifact<
           nestedRefetchQueries:
             entrypoint.readerWithRefetchQueries.nestedRefetchQueries,
         }),
-        root: { __link: ROOT_ID },
+        root: { __link: ROOT_ID, __typename: entrypoint.concreteType },
         variables,
         networkRequest: networkRequest,
       },
@@ -137,6 +138,7 @@ export type NetworkResponseObject = {
   // undefined should not *actually* be present in the network response.
   [index: string]: undefined | NetworkResponseValue;
   id?: DataId;
+  __typename?: TypeName;
 };
 
 export function normalizeData(
@@ -145,8 +147,9 @@ export function normalizeData(
   networkResponse: NetworkResponseObject,
   variables: Variables,
   nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[],
-): Set<DataId> {
-  const encounteredIds = new Set<DataId>();
+  root: Link,
+): EncounteredIds {
+  const encounteredIds: EncounteredIds = new Map();
 
   logMessage(environment, {
     kind: 'AboutToNormalize',
@@ -154,13 +157,17 @@ export function normalizeData(
     networkResponse,
     variables,
   });
+
+  const recordsById = (environment.store[root.__typename] ??= {});
+  const newStoreRecord = (recordsById[root.__link] ??= {});
+
   normalizeDataIntoRecord(
     environment,
     normalizationAst,
     networkResponse,
-    environment.store.__ROOT,
-    { __link: ROOT_ID },
-    variables as any,
+    newStoreRecord,
+    root,
+    variables,
     nestedRefetchQueries,
     encounteredIds,
   );
@@ -255,7 +262,7 @@ function withErrorHandling<T>(f: (t: T) => void): (t: T) => void {
 
 function callSubscriptions(
   environment: IsographEnvironment,
-  recordsEncounteredWhenNormalizing: Set<DataId>,
+  recordsEncounteredWhenNormalizing: EncounteredIds,
 ) {
   environment.subscriptions.forEach(
     withErrorHandling((subscription) => {
@@ -318,9 +325,9 @@ function callSubscriptions(
         }
         case 'AnyChangesToRecord': {
           if (
-            recordsEncounteredWhenNormalizing.has(
-              subscription.recordLink.__link,
-            )
+            recordsEncounteredWhenNormalizing
+              .get(subscription.recordLink.__typename)
+              ?.has(subscription.recordLink.__link)
           ) {
             subscription.callback();
           }
@@ -337,7 +344,25 @@ function callSubscriptions(
   );
 }
 
-function hasOverlappingIds(set1: Set<DataId>, set2: Set<DataId>): boolean {
+function hasOverlappingIds(
+  ids1: EncounteredIds,
+  ids2: EncounteredIds,
+): boolean {
+  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<T>(set1: Set<T>, set2: Set<T>): boolean {
   for (const id of set1) {
     if (set2.has(id)) {
       return true;
@@ -346,6 +371,7 @@ function hasOverlappingIds(set1: Set<DataId>, set2: Set<DataId>): boolean {
   return false;
 }
 
+export type EncounteredIds = Map<TypeName, Set<DataId>>;
 /**
  * Mutate targetParentRecord according to the normalizationAst and networkResponseParentRecord.
  */
@@ -357,7 +383,7 @@ function normalizeDataIntoRecord(
   targetParentRecordLink: Link,
   variables: Variables,
   nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[],
-  mutableEncounteredIds: Set<DataId>,
+  mutableEncounteredIds: EncounteredIds,
 ): RecordHasBeenUpdated {
   let recordHasBeenUpdated = false;
   for (const normalizationNode of normalizationAst) {
@@ -412,11 +438,25 @@ function normalizeDataIntoRecord(
     }
   }
   if (recordHasBeenUpdated) {
-    mutableEncounteredIds.add(targetParentRecordLink.__link);
+    let encounteredRecordsIds = insertIfNotExists(
+      mutableEncounteredIds,
+      targetParentRecordLink.__typename,
+    );
+
+    encounteredRecordsIds.add(targetParentRecordLink.__link);
   }
   return recordHasBeenUpdated;
 }
 
+export function insertIfNotExists<K, V>(map: Map<K, Set<V>>, key: K) {
+  let result = map.get(key);
+  if (result === undefined) {
+    result = new Set();
+    map.set(key, result);
+  }
+  return result;
+}
+
 type RecordHasBeenUpdated = boolean;
 function normalizeScalarField(
   astNode: NormalizationScalarField,
@@ -451,7 +491,7 @@ function normalizeLinkedField(
   targetParentRecordLink: Link,
   variables: Variables,
   nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[],
-  mutableEncounteredIds: Set<DataId>,
+  mutableEncounteredIds: EncounteredIds,
 ): RecordHasBeenUpdated {
   const networkResponseKey = getNetworkResponseKey(astNode);
   const networkResponseData = networkResponseParentRecord[networkResponseKey];
@@ -492,7 +532,18 @@ function normalizeLinkedField(
         mutableEncounteredIds,
       );
 
-      dataIds.push({ __link: newStoreRecordId });
+      const __typename =
+        astNode.concreteType ?? networkResponseObject[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);
@@ -508,11 +559,23 @@ function normalizeLinkedField(
       mutableEncounteredIds,
     );
 
+    let __typename =
+      astNode.concreteType ?? networkResponseData[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 = getLink(existingValue);
-    return link?.__link !== newStoreRecordId;
+    return link?.__link !== newStoreRecordId || link.__typename !== __typename;
   }
 }
 
@@ -527,7 +590,7 @@ function normalizeInlineFragment(
   targetParentRecordLink: Link,
   variables: Variables,
   nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[],
-  mutableEncounteredIds: Set<DataId>,
+  mutableEncounteredIds: EncounteredIds,
 ): RecordHasBeenUpdated {
   const typeToRefineTo = astNode.type;
   if (networkResponseParentRecord[TYPENAME_FIELD_NAME] === typeToRefineTo) {
@@ -556,7 +619,10 @@ function dataIdsAreTheSame(
     }
     for (let i = 0; i < newDataIds.length; i++) {
       const maybeLink = getLink(existingValue[i]);
-      if (newDataIds[i]?.__link !== maybeLink?.__link) {
+      if (
+        newDataIds[i]?.__link !== maybeLink?.__link ||
+        newDataIds[i]?.__typename !== maybeLink?.__typename
+      ) {
         return false;
       }
     }
@@ -574,7 +640,7 @@ function normalizeNetworkResponseObject(
   variables: Variables,
   index: number | null,
   nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[],
-  mutableEncounteredIds: Set<DataId>,
+  mutableEncounteredIds: EncounteredIds,
 ): DataId /* The id of the modified or newly created item */ {
   const newStoreRecordId = getDataIdOfNetworkResponse(
     targetParentRecordLink,
@@ -583,16 +649,25 @@ function normalizeNetworkResponseObject(
     variables,
     index,
   );
+  const __typename =
+    astNode.concreteType ?? networkResponseData[TYPENAME_FIELD_NAME];
 
-  const newStoreRecord = environment.store[newStoreRecordId] ?? {};
-  environment.store[newStoreRecordId] = newStoreRecord;
+  if (__typename == null) {
+    throw new Error(
+      'Unexpected missing __typename in network response object. ' +
+        'This is indicative of a bug in Isograph.',
+    );
+  }
+
+  const recordsById = (environment.store[__typename] ??= {});
+  const newStoreRecord = (recordsById[newStoreRecordId] ??= {});
 
   normalizeDataIntoRecord(
     environment,
     astNode.selections,
     networkResponseData,
     newStoreRecord,
-    { __link: newStoreRecordId },
+    { __link: newStoreRecordId, __typename: __typename },
     variables,
     nestedRefetchQueries,
     mutableEncounteredIds,
@@ -726,10 +801,16 @@ export const SECOND_SPLIT_KEY = '___';
 function getDataIdOfNetworkResponse(
   parentRecordLink: Link,
   dataToNormalize: NetworkResponseObject,
-  astNode: NormalizationLinkedField | NormalizationScalarField,
+  astNode: NormalizationLinkedField,
   variables: Variables,
   index: number | null,
 ): DataId {
+  // If we are dealing with nested Query, use __ROOT as id
+  // TODO do not hard code this value here
+  if (astNode.concreteType === 'Query') {
+    return 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.
 
@@ -738,7 +819,7 @@ function getDataIdOfNetworkResponse(
     return dataId;
   }
 
-  let storeKey = `${parentRecordLink.__link}.${astNode.fieldName}`;
+  let storeKey = `${parentRecordLink.__typename}:${parentRecordLink.__link}.${astNode.fieldName}`;
   if (index != null) {
     storeKey += `.${index}`;
   }

package/src/core/check.ts

@@ -5,7 +5,6 @@ import {
   getLink,
   IsographEnvironment,
   Link,
-  ROOT_ID,
   StoreRecord,
 } from './IsographEnvironment';
 import { logMessage } from './logging';
@@ -31,13 +30,17 @@ export function check(
   environment: IsographEnvironment,
   normalizationAst: NormalizationAst,
   variables: Variables,
+  root: Link,
 ): CheckResult {
+  const recordsById = (environment.store[root.__typename] ??= {});
+  const newStoreRecord = (recordsById[root.__link] ??= {});
+
   const checkResult = checkFromRecord(
     environment,
     normalizationAst,
     variables,
-    environment.store[ROOT_ID],
-    { __link: ROOT_ID },
+    newStoreRecord,
+    root,
   );
   logMessage(environment, {
     kind: 'EnvironmentCheck',
@@ -97,7 +100,8 @@ function checkFromRecord(
               );
             }
 
-            const linkedRecord = environment.store[link.__link];
+            const linkedRecord =
+              environment.store[link.__typename]?.[link.__link];
 
             if (linkedRecord === undefined) {
               return {
@@ -130,7 +134,8 @@ function checkFromRecord(
             );
           }
 
-          const linkedRecord = environment.store[link.__link];
+          const linkedRecord =
+            environment.store[link.__typename]?.[link.__link];
 
           if (linkedRecord === undefined) {
             return {

package/src/core/entrypoint.ts

@@ -32,6 +32,7 @@ export type IsographEntrypoint<
     TReadFromStore,
     TClientFieldValue
   >;
+  readonly concreteType: TypeName;
 };
 
 export type IsographEntrypointLoader<
@@ -75,6 +76,7 @@ export type NormalizationInlineFragment = {
 export type RefetchQueryNormalizationArtifact = {
   readonly kind: 'RefetchQuery';
   readonly networkRequestInfo: NetworkRequestInfo;
+  readonly concreteType: TypeName;
 };
 
 // TODO rename