@isograph/react 0.0.0-main-cebaca69 → 0.0.0-main-00af1d07

package/dist/core/FragmentReference.d.ts

@@ -1,4 +1,4 @@
-import { DataId } from './IsographEnvironment';
+import { type Link } from './IsographEnvironment';
 import { ReaderWithRefetchQueries } from '../core/entrypoint';
 import { PromiseWrapper } from './PromiseWrapper';
 export type VariableValue = string | number | boolean | null | object;
@@ -17,7 +17,7 @@ export type FragmentReference<TReadFromStore extends {
 }, TClientFieldValue> = {
     readonly kind: 'FragmentReference';
     readonly readerWithRefetchQueries: PromiseWrapper<ReaderWithRefetchQueries<TReadFromStore, TClientFieldValue>>;
-    readonly root: DataId;
+    readonly root: Link;
     readonly variables: ExtractParameters<TReadFromStore>;
     readonly networkRequest: PromiseWrapper<void, any>;
 };

package/dist/core/FragmentReference.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.stableIdForFragmentReference = stableIdForFragmentReference;
 function stableIdForFragmentReference(fragmentReference) {
     var _a;
-    return `${fragmentReference.root}/TODO_FRAGMENT_NAME/${serializeVariables((_a = fragmentReference.variables) !== null && _a !== void 0 ? _a : {})}`;
+    return `${fragmentReference.root.__link}/TODO_FRAGMENT_NAME/${serializeVariables((_a = fragmentReference.variables) !== null && _a !== void 0 ? _a : {})}`;
 }
 function serializeVariables(variables) {
     let s = '';

package/dist/core/IsographEnvironment.d.ts

@@ -29,7 +29,7 @@ export type FragmentSubscription<TReadFromStore extends {
 type AnyChangesToRecordSubscription = {
     readonly kind: 'AnyChangesToRecord';
     readonly callback: () => void;
-    readonly recordId: DataId;
+    readonly recordLink: Link;
 };
 type AnyRecordSubscription = {
     readonly kind: 'AnyRecords';
@@ -56,7 +56,7 @@ export type IsographEnvironment = {
     readonly gcBufferSize: number;
     readonly loggers: Set<WrappedLogFunction>;
 };
-export type MissingFieldHandler = (storeRecord: StoreRecord, root: DataId, fieldName: string, arguments_: {
+export type MissingFieldHandler = (storeRecord: StoreRecord, root: Link, fieldName: string, arguments_: {
     [index: string]: any;
 } | null, variables: Variables | null) => Link | undefined;
 export type IsographNetworkFunction = (queryText: string, variables: Variables) => Promise<any>;
@@ -77,7 +77,7 @@ export type IsographStore = {
 };
 export declare function createIsographEnvironment(store: IsographStore, networkFunction: IsographNetworkFunction, missingFieldHandler?: MissingFieldHandler | null, logFunction?: LogFunction | null): IsographEnvironment;
 export declare function createIsographStore(): IsographStore;
-export declare function defaultMissingFieldHandler(_storeRecord: StoreRecord, _root: DataId, fieldName: string, arguments_: {
+export declare function defaultMissingFieldHandler(_storeRecord: StoreRecord, _root: Link, fieldName: string, arguments_: {
     [index: string]: any;
 } | null, variables: Variables | null): Link | undefined;
 export declare function assertLink(link: DataTypeValue): Link | null | undefined;

package/dist/core/cache.d.ts

@@ -1,5 +1,5 @@
 import { Factory, ParentCache } from '@isograph/react-disposable-state';
-import { DataId, type IsographEnvironment } from './IsographEnvironment';
+import { DataId, Link, type IsographEnvironment } from './IsographEnvironment';
 import { IsographEntrypoint, NormalizationAst, NormalizationLinkedField, NormalizationScalarField, RefetchQueryNormalizationArtifactWrapper } from '../core/entrypoint';
 import { ReaderLinkedField, ReaderScalarField, type ReaderAst } from './reader';
 import { WithEncounteredRecords } from './read';
@@ -26,12 +26,12 @@ export type NetworkResponseObject = {
 };
 export declare function normalizeData(environment: IsographEnvironment, normalizationAst: NormalizationAst, networkResponse: NetworkResponseObject, variables: Variables, nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[]): Set<DataId>;
 export declare function subscribeToAnyChange(environment: IsographEnvironment, callback: () => void): () => void;
-export declare function subscribeToAnyChangesToRecord(environment: IsographEnvironment, recordId: DataId, callback: () => void): () => void;
+export declare function subscribeToAnyChangesToRecord(environment: IsographEnvironment, recordLink: Link, callback: () => void): () => void;
 export declare function subscribe<TReadFromStore extends {
     parameters: object;
     data: object;
 }>(environment: IsographEnvironment, encounteredDataAndRecords: WithEncounteredRecords<TReadFromStore>, fragmentReference: FragmentReference<TReadFromStore, any>, callback: (newEncounteredDataAndRecords: WithEncounteredRecords<TReadFromStore>) => void, readerAst: ReaderAst<TReadFromStore>): () => void;
-export declare function onNextChangeToRecord(environment: IsographEnvironment, recordId: DataId): Promise<void>;
+export declare function onNextChangeToRecord(environment: IsographEnvironment, recordLink: Link): Promise<void>;
 export declare function getParentRecordKey(astNode: NormalizationLinkedField | NormalizationScalarField | ReaderLinkedField | ReaderScalarField, variables: Variables): string;
 export declare const FIRST_SPLIT_KEY = "____";
 export declare const SECOND_SPLIT_KEY = "___";

package/dist/core/cache.js

@@ -64,7 +64,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 },
                 variables,
                 networkRequest: networkRequest,
             },
@@ -82,7 +82,7 @@ function normalizeData(environment, normalizationAst, networkResponse, variables
         networkResponse,
         variables,
     });
-    normalizeDataIntoRecord(environment, normalizationAst, networkResponse, environment.store.__ROOT, IsographEnvironment_1.ROOT_ID, variables, nestedRefetchQueries, encounteredIds);
+    normalizeDataIntoRecord(environment, normalizationAst, networkResponse, environment.store.__ROOT, { __link: IsographEnvironment_1.ROOT_ID }, variables, nestedRefetchQueries, encounteredIds);
     (0, logging_1.logMessage)(environment, {
         kind: 'AfterNormalization',
         store: environment.store,
@@ -99,10 +99,10 @@ function subscribeToAnyChange(environment, callback) {
     environment.subscriptions.add(subscription);
     return () => environment.subscriptions.delete(subscription);
 }
-function subscribeToAnyChangesToRecord(environment, recordId, callback) {
+function subscribeToAnyChangesToRecord(environment, recordLink, callback) {
     const subscription = {
         kind: 'AnyChangesToRecord',
-        recordId,
+        recordLink,
         callback,
     };
     environment.subscriptions.add(subscription);
@@ -120,9 +120,9 @@ function subscribe(environment, encounteredDataAndRecords, fragmentReference, ca
     environment.subscriptions.add(fragmentSubscription);
     return () => environment.subscriptions.delete(fragmentSubscription);
 }
-function onNextChangeToRecord(environment, recordId) {
+function onNextChangeToRecord(environment, recordLink) {
     return new Promise((resolve) => {
-        const unsubscribe = subscribeToAnyChangesToRecord(environment, recordId, () => {
+        const unsubscribe = subscribeToAnyChangesToRecord(environment, recordLink, () => {
             unsubscribe();
             resolve();
         });
@@ -185,7 +185,7 @@ function callSubscriptions(environment, recordsEncounteredWhenNormalizing) {
                 return;
             }
             case 'AnyChangesToRecord': {
-                if (recordsEncounteredWhenNormalizing.has(subscription.recordId)) {
+                if (recordsEncounteredWhenNormalizing.has(subscription.recordLink.__link)) {
                     subscription.callback();
                 }
                 return;
@@ -210,7 +210,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) {
@@ -221,13 +221,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;
@@ -241,7 +241,7 @@ function normalizeDataIntoRecord(environment, normalizationAst, networkResponseP
         }
     }
     if (recordHasBeenUpdated) {
-        mutableEncounteredIds.add(targetParentRecordId);
+        mutableEncounteredIds.add(targetParentRecordLink.__link);
     }
     return recordHasBeenUpdated;
 }
@@ -262,7 +262,7 @@ 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) {
     const networkResponseKey = getNetworkResponseKey(astNode);
     const networkResponseData = networkResponseParentRecord[networkResponseKey];
     const parentRecordKey = getParentRecordKey(astNode, variables);
@@ -279,14 +279,14 @@ 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);
+            const newStoreRecordId = normalizeNetworkResponseObject(environment, astNode, networkResponseObject, targetParentRecordLink, variables, i, nestedRefetchQueries, mutableEncounteredIds);
             dataIds.push({ __link: newStoreRecordId });
         }
         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);
         targetParentRecord[parentRecordKey] = {
             __link: newStoreRecordId,
         };
@@ -297,10 +297,10 @@ function normalizeLinkedField(environment, astNode, networkResponseParentRecord,
 /**
  * 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);
+        const hasBeenModified = normalizeDataIntoRecord(environment, astNode.selections, networkResponseParentRecord, targetParentRecord, targetParentRecordLink, variables, nestedRefetchQueries, mutableEncounteredIds);
         return hasBeenModified;
     }
     return false;
@@ -324,12 +324,12 @@ function dataIdsAreTheSame(existingValue, newDataIds) {
         return false;
     }
 }
-function normalizeNetworkResponseObject(environment, astNode, networkResponseData, targetParentRecordId, variables, index, nestedRefetchQueries, mutableEncounteredIds) {
+function normalizeNetworkResponseObject(environment, astNode, networkResponseData, targetParentRecordLink, variables, index, nestedRefetchQueries, mutableEncounteredIds) {
     var _a;
-    const newStoreRecordId = getDataIdOfNetworkResponse(targetParentRecordId, networkResponseData, astNode, variables, index);
+    const newStoreRecordId = getDataIdOfNetworkResponse(targetParentRecordLink, 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);
+    normalizeDataIntoRecord(environment, astNode.selections, networkResponseData, newStoreRecord, { __link: newStoreRecordId }, variables, nestedRefetchQueries, mutableEncounteredIds);
     return newStoreRecordId;
 }
 function isScalarOrEmptyArray(data) {
@@ -435,14 +435,14 @@ function getNetworkResponseKey(astNode) {
 exports.FIRST_SPLIT_KEY = '____';
 exports.SECOND_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) {
     // 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.__link}.${astNode.fieldName}`;
     if (index != null) {
         storeKey += `.${index}`;
     }

package/dist/core/componentCache.js

@@ -11,9 +11,8 @@ function getOrCreateCachedComponent(environment, componentName, fragmentReferenc
     // stringified args. These three, together, uniquely identify a read at a given
     // time.
     const cachedComponentsById = environment.componentCache;
-    cachedComponentsById[fragmentReference.root] =
-        (_a = cachedComponentsById[fragmentReference.root]) !== null && _a !== void 0 ? _a : {};
-    const componentsByName = cachedComponentsById[fragmentReference.root];
+    const recordLink = fragmentReference.root.__link;
+    const componentsByName = ((_a = cachedComponentsById[recordLink]) !== null && _a !== void 0 ? _a : (cachedComponentsById[recordLink] = {}));
     componentsByName[componentName] = (_b = componentsByName[componentName]) !== null && _b !== void 0 ? _b : {};
     const byArgs = componentsByName[componentName];
     const stringifiedArgs = JSON.stringify((0, cache_1.stableCopy)(fragmentReference.variables));
@@ -25,7 +24,7 @@ function getOrCreateCachedComponent(environment, componentName, fragmentReferenc
                 (0, logging_1.logMessage)(environment, {
                     kind: 'ComponentRerendered',
                     componentName,
-                    rootId: fragmentReference.root,
+                    rootLink: fragmentReference.root,
                 });
                 const firstParameter = {
                     data,

package/dist/core/logging.d.ts

@@ -1,5 +1,5 @@
 import { CleanupFn } from '@isograph/disposable-types';
-import { DataId, IsographEnvironment, IsographStore, StoreRecord } from './IsographEnvironment';
+import { IsographEnvironment, IsographStore, StoreRecord, type Link } from './IsographEnvironment';
 import { IsographEntrypoint, NormalizationAst, RefetchQueryNormalizationArtifact } from './entrypoint';
 import { FragmentReference, Variables } from './FragmentReference';
 import { NetworkResponseObject } from './cache';
@@ -28,7 +28,7 @@ export type LogMessage = {
 } | {
     kind: 'ComponentRerendered';
     componentName: string;
-    rootId: DataId;
+    rootLink: Link;
 } | {
     kind: 'MakeNetworkRequest';
     artifact: RefetchQueryNormalizationArtifact | IsographEntrypoint<any, any>;
@@ -40,7 +40,7 @@ export type LogMessage = {
     networkRequestId: string;
 } | {
     kind: 'MissingFieldHandlerCalled';
-    root: DataId;
+    root: Link;
     storeRecord: StoreRecord;
     fieldName: string;
     arguments: Arguments | null;

package/dist/core/read.d.ts

@@ -1,5 +1,5 @@
 import { FragmentReference, ExtractData } from './FragmentReference';
-import { DataId, IsographEnvironment } from './IsographEnvironment';
+import { DataId, IsographEnvironment, type Link } from './IsographEnvironment';
 export type WithEncounteredRecords<T> = {
     readonly encounteredRecords: Set<DataId>;
     readonly item: ExtractData<T>;
@@ -16,7 +16,7 @@ export type ReadDataResult<TReadFromStore> = {
     readonly kind: 'MissingData';
     readonly reason: string;
     readonly nestedReason?: ReadDataResult<unknown>;
-    readonly recordId: DataId;
+    readonly recordLink: Link;
 };
 export type NetworkRequestReaderOptions = {
     suspendIfInFlight: boolean;

package/dist/core/read.js

@@ -31,11 +31,11 @@ function readButDoNotEvaluate(environment, fragmentReference, networkRequestOpti
             networkRequestOptions.throwOnNetworkError) {
             // TODO assert that the network request state is not Err
             throw new Promise((resolve, reject) => {
-                (0, cache_1.onNextChangeToRecord)(environment, response.recordId).then(resolve);
+                (0, cache_1.onNextChangeToRecord)(environment, response.recordLink).then(resolve);
                 fragmentReference.networkRequest.promise.catch(reject);
             });
         }
-        throw (0, cache_1.onNextChangeToRecord)(environment, response.recordId);
+        throw (0, cache_1.onNextChangeToRecord)(environment, response.recordLink);
     }
     else {
         return {
@@ -46,13 +46,13 @@ function readButDoNotEvaluate(environment, fragmentReference, networkRequestOpti
 }
 function readData(environment, ast, root, variables, nestedRefetchQueries, networkRequest, networkRequestOptions, mutableEncounteredRecords) {
     var _a, _b, _c, _d, _e;
-    mutableEncounteredRecords.add(root);
-    let storeRecord = environment.store[root];
+    mutableEncounteredRecords.add(root.__link);
+    let storeRecord = environment.store[root.__link];
     if (storeRecord === undefined) {
         return {
             kind: 'MissingData',
-            reason: 'No record for root ' + root,
-            recordId: root,
+            reason: 'No record for root ' + root.__link,
+            recordLink: root,
         };
     }
     if (storeRecord === null) {
@@ -73,8 +73,8 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, netwo
                 if (value === undefined) {
                     return {
                         kind: 'MissingData',
-                        reason: 'No value for ' + storeRecordName + ' on root ' + root,
-                        recordId: root,
+                        reason: 'No value for ' + storeRecordName + ' on root ' + root.__link,
+                        recordLink: root,
                     };
                 }
                 target[(_a = field.alias) !== null && _a !== void 0 ? _a : field.fieldName] = value;
@@ -93,28 +93,28 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, netwo
                                 reason: 'No link for ' +
                                     storeRecordName +
                                     ' on root ' +
-                                    root +
+                                    root.__link +
                                     '. Link is ' +
                                     JSON.stringify(item),
-                                recordId: root,
+                                recordLink: root,
                             };
                         }
                         else if (link === null) {
                             results.push(null);
                             continue;
                         }
-                        const result = readData(environment, field.selections, link.__link, variables, nestedRefetchQueries, networkRequest, networkRequestOptions, mutableEncounteredRecords);
+                        const result = readData(environment, field.selections, link, variables, nestedRefetchQueries, networkRequest, networkRequestOptions, mutableEncounteredRecords);
                         if (result.kind === 'MissingData') {
                             return {
                                 kind: 'MissingData',
                                 reason: 'Missing data for ' +
                                     storeRecordName +
                                     ' on root ' +
-                                    root +
+                                    root.__link +
                                     '. Link is ' +
                                     JSON.stringify(item),
                                 nestedReason: result,
-                                recordId: result.recordId,
+                                recordLink: result.recordLink,
                             };
                         }
                         results.push(result.data);
@@ -141,10 +141,10 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, netwo
                             reason: 'No link for ' +
                                 storeRecordName +
                                 ' on root ' +
-                                root +
+                                root.__link +
                                 '. Link is ' +
                                 JSON.stringify(value),
-                            recordId: root,
+                            recordLink: root,
                         };
                     }
                     else {
@@ -155,14 +155,14 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, netwo
                     target[(_d = field.alias) !== null && _d !== void 0 ? _d : field.fieldName] = null;
                     break;
                 }
-                const targetId = link.__link;
+                const targetId = link;
                 const data = readData(environment, field.selections, targetId, variables, nestedRefetchQueries, networkRequest, networkRequestOptions, mutableEncounteredRecords);
                 if (data.kind === 'MissingData') {
                     return {
                         kind: 'MissingData',
-                        reason: 'Missing data for ' + storeRecordName + ' on root ' + root,
+                        reason: 'Missing data for ' + storeRecordName + ' on root ' + root.__link,
                         nestedReason: data,
-                        recordId: data.recordId,
+                        recordLink: data.recordLink,
                     };
                 }
                 target[(_e = field.alias) !== null && _e !== void 0 ? _e : field.fieldName] = data.data;
@@ -180,9 +180,9 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, netwo
                 if (data.kind === 'MissingData') {
                     return {
                         kind: 'MissingData',
-                        reason: 'Missing data for ' + field.alias + ' on root ' + root,
+                        reason: 'Missing data for ' + field.alias + ' on root ' + root.__link,
                         nestedReason: data,
-                        recordId: data.recordId,
+                        recordLink: data.recordLink,
                     };
                 }
                 else {
@@ -197,7 +197,7 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, netwo
                     // use the resolver reader AST to get the resolver parameters.
                     target[field.alias] = (args) => [
                         // Stable id
-                        root + '__' + field.name,
+                        root.__link + '__' + field.name,
                         // Fetcher
                         field.refetchReaderArtifact.resolver(environment, refetchQueryArtifact, data.data, filterVariables(Object.assign(Object.assign({}, args), variables), allowedVariables), root, 
                         // TODO these params should be removed
@@ -215,9 +215,9 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, netwo
                         if (data.kind === 'MissingData') {
                             return {
                                 kind: 'MissingData',
-                                reason: 'Missing data for ' + field.alias + ' on root ' + root,
+                                reason: 'Missing data for ' + field.alias + ' on root ' + root.__link,
                                 nestedReason: data,
-                                recordId: data.recordId,
+                                recordLink: data.recordLink,
                             };
                         }
                         else {
@@ -259,9 +259,9 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, netwo
                 if (refetchReaderParams.kind === 'MissingData') {
                     return {
                         kind: 'MissingData',
-                        reason: 'Missing data for ' + field.alias + ' on root ' + root,
+                        reason: 'Missing data for ' + field.alias + ' on root ' + root.__link,
                         nestedReason: refetchReaderParams,
-                        recordId: refetchReaderParams.recordId,
+                        recordLink: refetchReaderParams.recordLink,
                     };
                 }
                 else {
@@ -275,7 +275,7 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, netwo
                         writeQueryArgsToVariables(localVariables, field.queryArguments, variables);
                         return [
                             // Stable id
-                            root +
+                            root.__link +
                                 '/' +
                                 field.name +
                                 '/' +
@@ -293,7 +293,7 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, netwo
                                                 .nestedRefetchQueries,
                                         }),
                                         // TODO localVariables is not guaranteed to have an id field
-                                        root: localVariables.id,
+                                        root: { __link: localVariables.id },
                                         variables: localVariables,
                                         networkRequest,
                                     };
@@ -326,7 +326,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: localVariables.id,
+                                            root: { __link: localVariables.id },
                                             variables: localVariables,
                                             networkRequest,
                                         };

package/dist/core/reader.d.ts

@@ -1,6 +1,6 @@
 import { Factory } from '@isograph/disposable-types';
 import { FragmentReference, ExtractParameters, ExtractData } from './FragmentReference';
-import { ComponentOrFieldName, DataId, IsographEnvironment } from './IsographEnvironment';
+import { ComponentOrFieldName, IsographEnvironment, type Link } from './IsographEnvironment';
 import { IsographEntrypoint, IsographEntrypointLoader, RefetchQueryNormalizationArtifact, RefetchQueryNormalizationArtifactWrapper } from './entrypoint';
 import { Arguments } from './util';
 export type TopLevelReaderArtifact<TReadFromStore extends {
@@ -34,7 +34,7 @@ export type ResolverFirstParameter<TReadFromStore extends {
 export type RefetchReaderArtifact = {
     readonly kind: 'RefetchReaderArtifact';
     readonly readerAst: ReaderAst<unknown>;
-    readonly resolver: (environment: IsographEnvironment, artifact: RefetchQueryNormalizationArtifact, variables: any, filteredVariables: any, rootId: DataId, readerArtifact: TopLevelReaderArtifact<any, any, any> | null, nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[]) => () => void;
+    readonly resolver: (environment: IsographEnvironment, artifact: RefetchQueryNormalizationArtifact, variables: any, filteredVariables: any, rootLink: Link, readerArtifact: TopLevelReaderArtifact<any, any, any> | null, nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[]) => () => void;
 };
 export type ReaderAstNode = ReaderScalarField | ReaderLinkedField | ReaderNonLoadableResolverField | ReaderImperativelyLoadedField | ReaderLoadableField;
 export type ReaderAst<TReadFromStore> = ReadonlyArray<ReaderAstNode>;

package/dist/react/useImperativeReference.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isograph/react",
-  "version": "0.0.0-main-cebaca69",
+  "version": "0.0.0-main-00af1d07",
   "description": "Use Isograph with React",
   "homepage": "https://isograph.dev",
   "main": "dist/index.js",
@@ -17,9 +17,9 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@isograph/disposable-types": "0.0.0-main-cebaca69",
-    "@isograph/react-disposable-state": "0.0.0-main-cebaca69",
-    "@isograph/reference-counted-pointer": "0.0.0-main-cebaca69"
+    "@isograph/disposable-types": "0.0.0-main-00af1d07",
+    "@isograph/react-disposable-state": "0.0.0-main-00af1d07",
+    "@isograph/reference-counted-pointer": "0.0.0-main-00af1d07"
   },
   "peerDependencies": {
     "react": "18.3.1"

package/src/core/FragmentReference.ts

@@ -1,4 +1,4 @@
-import { DataId } from './IsographEnvironment';
+import { type Link } from './IsographEnvironment';
 import { ReaderWithRefetchQueries } from '../core/entrypoint';
 import { PromiseWrapper } from './PromiseWrapper';
 
@@ -27,7 +27,7 @@ export type FragmentReference<
   readonly readerWithRefetchQueries: PromiseWrapper<
     ReaderWithRefetchQueries<TReadFromStore, TClientFieldValue>
   >;
-  readonly root: DataId;
+  readonly root: Link;
   readonly variables: ExtractParameters<TReadFromStore>;
   readonly networkRequest: PromiseWrapper<void, any>;
 };
@@ -35,7 +35,7 @@ export type FragmentReference<
 export function stableIdForFragmentReference(
   fragmentReference: FragmentReference<any, any>,
 ): string {
-  return `${fragmentReference.root}/TODO_FRAGMENT_NAME/${serializeVariables(fragmentReference.variables ?? {})}`;
+  return `${fragmentReference.root.__link}/TODO_FRAGMENT_NAME/${serializeVariables(fragmentReference.variables ?? {})}`;
 }
 
 function serializeVariables(variables: Variables) {

package/src/core/IsographEnvironment.ts

@@ -31,7 +31,7 @@ export type FragmentSubscription<
 type AnyChangesToRecordSubscription = {
   readonly kind: 'AnyChangesToRecord';
   readonly callback: () => void;
-  readonly recordId: DataId;
+  readonly recordLink: Link;
 };
 
 type AnyRecordSubscription = {
@@ -69,7 +69,7 @@ export type IsographEnvironment = {
 
 export type MissingFieldHandler = (
   storeRecord: StoreRecord,
-  root: DataId,
+  root: Link,
   fieldName: string,
   arguments_: { [index: string]: any } | null,
   variables: Variables | null,
@@ -145,7 +145,7 @@ export function createIsographStore(): IsographStore {
 
 export function defaultMissingFieldHandler(
   _storeRecord: StoreRecord,
-  _root: DataId,
+  _root: Link,
   fieldName: string,
   arguments_: { [index: string]: any } | null,
   variables: Variables | null,

package/src/core/cache.ts

@@ -5,9 +5,9 @@ import {
 } from '@isograph/react-disposable-state';
 import {
   DataId,
+  Link,
   ROOT_ID,
   StoreRecord,
-  Link,
   type IsographEnvironment,
   DataTypeValue,
   getLink,
@@ -106,7 +106,7 @@ export function getOrCreateCacheForArtifact<
           nestedRefetchQueries:
             entrypoint.readerWithRefetchQueries.nestedRefetchQueries,
         }),
-        root: ROOT_ID,
+        root: { __link: ROOT_ID },
         variables,
         networkRequest: networkRequest,
       },
@@ -152,7 +152,7 @@ export function normalizeData(
     normalizationAst,
     networkResponse,
     environment.store.__ROOT,
-    ROOT_ID,
+    { __link: ROOT_ID },
     variables as any,
     nestedRefetchQueries,
     encounteredIds,
@@ -182,12 +182,12 @@ export function subscribeToAnyChange(
 
 export function subscribeToAnyChangesToRecord(
   environment: IsographEnvironment,
-  recordId: DataId,
+  recordLink: Link,
   callback: () => void,
 ): () => void {
   const subscription = {
     kind: 'AnyChangesToRecord',
-    recordId,
+    recordLink,
     callback,
   } as const;
   environment.subscriptions.add(subscription);
@@ -219,12 +219,12 @@ export function subscribe<
 
 export function onNextChangeToRecord(
   environment: IsographEnvironment,
-  recordId: DataId,
+  recordLink: Link,
 ): Promise<void> {
   return new Promise((resolve) => {
     const unsubscribe = subscribeToAnyChangesToRecord(
       environment,
-      recordId,
+      recordLink,
       () => {
         unsubscribe();
         resolve();
@@ -310,7 +310,11 @@ function callSubscriptions(
           return;
         }
         case 'AnyChangesToRecord': {
-          if (recordsEncounteredWhenNormalizing.has(subscription.recordId)) {
+          if (
+            recordsEncounteredWhenNormalizing.has(
+              subscription.recordLink.__link,
+            )
+          ) {
             subscription.callback();
           }
           return;
@@ -343,7 +347,7 @@ function normalizeDataIntoRecord(
   normalizationAst: NormalizationAst,
   networkResponseParentRecord: NetworkResponseObject,
   targetParentRecord: StoreRecord,
-  targetParentRecordId: DataId,
+  targetParentRecordLink: Link,
   variables: Variables,
   nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[],
   mutableEncounteredIds: Set<DataId>,
@@ -368,7 +372,7 @@ function normalizeDataIntoRecord(
           normalizationNode,
           networkResponseParentRecord,
           targetParentRecord,
-          targetParentRecordId,
+          targetParentRecordLink,
           variables,
           nestedRefetchQueries,
           mutableEncounteredIds,
@@ -383,7 +387,7 @@ function normalizeDataIntoRecord(
           normalizationNode,
           networkResponseParentRecord,
           targetParentRecord,
-          targetParentRecordId,
+          targetParentRecordLink,
           variables,
           nestedRefetchQueries,
           mutableEncounteredIds,
@@ -401,7 +405,7 @@ function normalizeDataIntoRecord(
     }
   }
   if (recordHasBeenUpdated) {
-    mutableEncounteredIds.add(targetParentRecordId);
+    mutableEncounteredIds.add(targetParentRecordLink.__link);
   }
   return recordHasBeenUpdated;
 }
@@ -437,7 +441,7 @@ function normalizeLinkedField(
   astNode: NormalizationLinkedField,
   networkResponseParentRecord: NetworkResponseObject,
   targetParentRecord: StoreRecord,
-  targetParentRecordId: DataId,
+  targetParentRecordLink: Link,
   variables: Variables,
   nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[],
   mutableEncounteredIds: Set<DataId>,
@@ -467,7 +471,7 @@ function normalizeLinkedField(
         environment,
         astNode,
         networkResponseObject,
-        targetParentRecordId,
+        targetParentRecordLink,
         variables,
         i,
         nestedRefetchQueries,
@@ -483,7 +487,7 @@ function normalizeLinkedField(
       environment,
       astNode,
       networkResponseData,
-      targetParentRecordId,
+      targetParentRecordLink,
       variables,
       null,
       nestedRefetchQueries,
@@ -506,7 +510,7 @@ function normalizeInlineFragment(
   astNode: NormalizationInlineFragment,
   networkResponseParentRecord: NetworkResponseObject,
   targetParentRecord: StoreRecord,
-  targetParentRecordId: DataId,
+  targetParentRecordLink: Link,
   variables: Variables,
   nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[],
   mutableEncounteredIds: Set<DataId>,
@@ -518,7 +522,7 @@ function normalizeInlineFragment(
       astNode.selections,
       networkResponseParentRecord,
       targetParentRecord,
-      targetParentRecordId,
+      targetParentRecordLink,
       variables,
       nestedRefetchQueries,
       mutableEncounteredIds,
@@ -554,14 +558,14 @@ function normalizeNetworkResponseObject(
   environment: IsographEnvironment,
   astNode: NormalizationLinkedField,
   networkResponseData: NetworkResponseObject,
-  targetParentRecordId: string,
+  targetParentRecordLink: Link,
   variables: Variables,
   index: number | null,
   nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[],
   mutableEncounteredIds: Set<DataId>,
 ): DataId /* The id of the modified or newly created item */ {
   const newStoreRecordId = getDataIdOfNetworkResponse(
-    targetParentRecordId,
+    targetParentRecordLink,
     networkResponseData,
     astNode,
     variables,
@@ -576,7 +580,7 @@ function normalizeNetworkResponseObject(
     astNode.selections,
     networkResponseData,
     newStoreRecord,
-    newStoreRecordId,
+    { __link: newStoreRecordId },
     variables,
     nestedRefetchQueries,
     mutableEncounteredIds,
@@ -714,7 +718,7 @@ export const SECOND_SPLIT_KEY = '___';
 
 // Returns a key to look up an item in the store
 function getDataIdOfNetworkResponse(
-  parentRecordId: DataId,
+  parentRecordLink: Link,
   dataToNormalize: NetworkResponseObject,
   astNode: NormalizationLinkedField | NormalizationScalarField,
   variables: Variables,
@@ -728,7 +732,7 @@ function getDataIdOfNetworkResponse(
     return dataId;
   }
 
-  let storeKey = `${parentRecordId}.${astNode.fieldName}`;
+  let storeKey = `${parentRecordLink.__link}.${astNode.fieldName}`;
   if (index != null) {
     storeKey += `.${index}`;
   }

package/src/core/componentCache.ts

@@ -17,9 +17,9 @@ export function getOrCreateCachedComponent(
   // time.
   const cachedComponentsById = environment.componentCache;
 
-  cachedComponentsById[fragmentReference.root] =
-    cachedComponentsById[fragmentReference.root] ?? {};
-  const componentsByName = cachedComponentsById[fragmentReference.root];
+  const recordLink = fragmentReference.root.__link;
+
+  const componentsByName = (cachedComponentsById[recordLink] ??= {});
 
   componentsByName[componentName] = componentsByName[componentName] ?? {};
   const byArgs = componentsByName[componentName];
@@ -44,7 +44,7 @@ export function getOrCreateCachedComponent(
         logMessage(environment, {
           kind: 'ComponentRerendered',
           componentName,
-          rootId: fragmentReference.root,
+          rootLink: fragmentReference.root,
         });
 
         const firstParameter = {

package/src/core/logging.ts

@@ -1,9 +1,9 @@
 import { CleanupFn } from '@isograph/disposable-types';
 import {
-  DataId,
   IsographEnvironment,
   IsographStore,
   StoreRecord,
+  type Link,
 } from './IsographEnvironment';
 import {
   IsographEntrypoint,
@@ -43,7 +43,7 @@ export type LogMessage =
   | {
       kind: 'ComponentRerendered';
       componentName: string;
-      rootId: DataId;
+      rootLink: Link;
     }
   | {
       kind: 'MakeNetworkRequest';
@@ -61,7 +61,7 @@ export type LogMessage =
     }
   | {
       kind: 'MissingFieldHandlerCalled';
-      root: DataId;
+      root: Link;
       storeRecord: StoreRecord;
       fieldName: string;
       arguments: Arguments | null;

package/src/core/read.ts

@@ -17,6 +17,7 @@ import {
   defaultMissingFieldHandler,
   getOrLoadIsographArtifact,
   IsographEnvironment,
+  type Link,
 } from './IsographEnvironment';
 import { makeNetworkRequest } from './makeNetworkRequest';
 import {
@@ -80,11 +81,11 @@ export function readButDoNotEvaluate<
     ) {
       // TODO assert that the network request state is not Err
       throw new Promise((resolve, reject) => {
-        onNextChangeToRecord(environment, response.recordId).then(resolve);
+        onNextChangeToRecord(environment, response.recordLink).then(resolve);
         fragmentReference.networkRequest.promise.catch(reject);
       });
     }
-    throw onNextChangeToRecord(environment, response.recordId);
+    throw onNextChangeToRecord(environment, response.recordLink);
   } else {
     return {
       encounteredRecords: mutableEncounteredRecords,
@@ -103,26 +104,26 @@ export type ReadDataResult<TReadFromStore> =
       readonly kind: 'MissingData';
       readonly reason: string;
       readonly nestedReason?: ReadDataResult<unknown>;
-      readonly recordId: DataId;
+      readonly recordLink: Link;
     };
 
 function readData<TReadFromStore>(
   environment: IsographEnvironment,
   ast: ReaderAst<TReadFromStore>,
-  root: DataId,
+  root: Link,
   variables: ExtractParameters<TReadFromStore>,
   nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[],
   networkRequest: PromiseWrapper<void, any>,
   networkRequestOptions: NetworkRequestReaderOptions,
   mutableEncounteredRecords: Set<DataId>,
 ): ReadDataResult<TReadFromStore> {
-  mutableEncounteredRecords.add(root);
-  let storeRecord = environment.store[root];
+  mutableEncounteredRecords.add(root.__link);
+  let storeRecord = environment.store[root.__link];
   if (storeRecord === undefined) {
     return {
       kind: 'MissingData',
-      reason: 'No record for root ' + root,
-      recordId: root,
+      reason: 'No record for root ' + root.__link,
+      recordLink: root,
     };
   }
 
@@ -146,8 +147,9 @@ function readData<TReadFromStore>(
         if (value === undefined) {
           return {
             kind: 'MissingData',
-            reason: 'No value for ' + storeRecordName + ' on root ' + root,
-            recordId: root,
+            reason:
+              'No value for ' + storeRecordName + ' on root ' + root.__link,
+            recordLink: root,
           };
         }
         target[field.alias ?? field.fieldName] = value;
@@ -167,10 +169,10 @@ function readData<TReadFromStore>(
                   'No link for ' +
                   storeRecordName +
                   ' on root ' +
-                  root +
+                  root.__link +
                   '. Link is ' +
                   JSON.stringify(item),
-                recordId: root,
+                recordLink: root,
               };
             } else if (link === null) {
               results.push(null);
@@ -179,7 +181,7 @@ function readData<TReadFromStore>(
             const result = readData(
               environment,
               field.selections,
-              link.__link,
+              link,
               variables,
               nestedRefetchQueries,
               networkRequest,
@@ -193,11 +195,11 @@ function readData<TReadFromStore>(
                   'Missing data for ' +
                   storeRecordName +
                   ' on root ' +
-                  root +
+                  root.__link +
                   '. Link is ' +
                   JSON.stringify(item),
                 nestedReason: result,
-                recordId: result.recordId,
+                recordLink: result.recordLink,
               };
             }
             results.push(result.data);
@@ -234,10 +236,10 @@ function readData<TReadFromStore>(
                 'No link for ' +
                 storeRecordName +
                 ' on root ' +
-                root +
+                root.__link +
                 '. Link is ' +
                 JSON.stringify(value),
-              recordId: root,
+              recordLink: root,
             };
           } else {
             link = altLink;
@@ -246,7 +248,7 @@ function readData<TReadFromStore>(
           target[field.alias ?? field.fieldName] = null;
           break;
         }
-        const targetId = link.__link;
+        const targetId = link;
         const data = readData(
           environment,
           field.selections,
@@ -260,9 +262,10 @@ function readData<TReadFromStore>(
         if (data.kind === 'MissingData') {
           return {
             kind: 'MissingData',
-            reason: 'Missing data for ' + storeRecordName + ' on root ' + root,
+            reason:
+              'Missing data for ' + storeRecordName + ' on root ' + root.__link,
             nestedReason: data,
-            recordId: data.recordId,
+            recordLink: data.recordLink,
           };
         }
         target[field.alias ?? field.fieldName] = data.data;
@@ -287,9 +290,10 @@ function readData<TReadFromStore>(
         if (data.kind === 'MissingData') {
           return {
             kind: 'MissingData',
-            reason: 'Missing data for ' + field.alias + ' on root ' + root,
+            reason:
+              'Missing data for ' + field.alias + ' on root ' + root.__link,
             nestedReason: data,
-            recordId: data.recordId,
+            recordLink: data.recordLink,
           };
         } else {
           const refetchQueryIndex = field.refetchQuery;
@@ -304,7 +308,7 @@ function readData<TReadFromStore>(
           // use the resolver reader AST to get the resolver parameters.
           target[field.alias] = (args: any) => [
             // Stable id
-            root + '__' + field.name,
+            root.__link + '__' + field.name,
             // Fetcher
             field.refetchReaderArtifact.resolver(
               environment,
@@ -341,9 +345,10 @@ function readData<TReadFromStore>(
             if (data.kind === 'MissingData') {
               return {
                 kind: 'MissingData',
-                reason: 'Missing data for ' + field.alias + ' on root ' + root,
+                reason:
+                  'Missing data for ' + field.alias + ' on root ' + root.__link,
                 nestedReason: data,
-                recordId: data.recordId,
+                recordLink: data.recordLink,
               };
             } else {
               const firstParameter = {
@@ -397,9 +402,10 @@ function readData<TReadFromStore>(
         if (refetchReaderParams.kind === 'MissingData') {
           return {
             kind: 'MissingData',
-            reason: 'Missing data for ' + field.alias + ' on root ' + root,
+            reason:
+              'Missing data for ' + field.alias + ' on root ' + root.__link,
             nestedReason: refetchReaderParams,
-            recordId: refetchReaderParams.recordId,
+            recordLink: refetchReaderParams.recordLink,
           };
         } else {
           target[field.alias] = (args: any) => {
@@ -420,7 +426,7 @@ function readData<TReadFromStore>(
 
             return [
               // Stable id
-              root +
+              root.__link +
                 '/' +
                 field.name +
                 '/' +
@@ -445,7 +451,7 @@ function readData<TReadFromStore>(
                     } as const),
 
                     // TODO localVariables is not guaranteed to have an id field
-                    root: localVariables.id,
+                    root: { __link: localVariables.id },
                     variables: localVariables,
                     networkRequest,
                   };
@@ -514,7 +520,7 @@ function readData<TReadFromStore>(
                       ),
 
                       // TODO localVariables is not guaranteed to have an id field
-                      root: localVariables.id,
+                      root: { __link: localVariables.id },
                       variables: localVariables,
                       networkRequest,
                     };

package/src/core/reader.ts

@@ -6,8 +6,8 @@ import {
 } from './FragmentReference';
 import {
   ComponentOrFieldName,
-  DataId,
   IsographEnvironment,
+  type Link,
 } from './IsographEnvironment';
 import {
   IsographEntrypoint,
@@ -66,7 +66,7 @@ export type RefetchReaderArtifact = {
     variables: any,
     // TODO type this better
     filteredVariables: any,
-    rootId: DataId,
+    rootLink: Link,
     readerArtifact: TopLevelReaderArtifact<any, any, any> | null,
     // TODO type this better
     nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[],

package/src/react/useImperativeReference.ts

@@ -47,7 +47,7 @@ export function useImperativeReference<
             nestedRefetchQueries:
               entrypoint.readerWithRefetchQueries.nestedRefetchQueries,
           }),
-          root: ROOT_ID,
+          root: { __link: ROOT_ID },
           variables,
           networkRequest,
         },