@isograph/react 0.0.0-main-a840a70e → 0.0.0-main-c09c9dbf

package/dist/react/useReadAndSubscribe.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"useReadAndSubscribe.mjs","names":["componentFunction: IsographComponentFunction"],"sources":["../../src/react/useReadAndSubscribe.ts"],"sourcesContent":["import { useEffect, useState } from 'react';\nimport {\n  type ExtractData,\n  type FragmentReference,\n  stableIdForFragmentReference,\n  type UnknownTReadFromStore,\n} from '../core/FragmentReference';\nimport type { IsographComponentFunction } from '../core/IsographEnvironment';\nimport { logMessage } from '../core/logging';\nimport { readPromise } from '../core/PromiseWrapper';\nimport {\n  type NetworkRequestReaderOptions,\n  readButDoNotEvaluate,\n  type WithEncounteredRecords,\n} from '../core/read';\nimport type { ReaderAst } from '../core/reader';\nimport { subscribe } from '../core/subscribe';\nimport { useIsographEnvironment } from './IsographEnvironmentProvider';\nimport { maybeUnwrapNetworkRequest } from './maybeUnwrapNetworkRequest';\nimport { useRerenderOnChange } from './useRerenderOnChange';\n\n/**\n * Read the data from a fragment reference and subscribe to updates.\n */\nexport function useReadAndSubscribe<\n  TReadFromStore extends UnknownTReadFromStore,\n>(\n  fragmentReference: FragmentReference<TReadFromStore, any>,\n  networkRequestOptions: NetworkRequestReaderOptions,\n  readerAst: ReaderAst<TReadFromStore>,\n): ExtractData<TReadFromStore> {\n  const environment = useIsographEnvironment();\n  const [readOutDataAndRecords, setReadOutDataAndRecords] = useState(() =>\n    readButDoNotEvaluate(environment, fragmentReference, networkRequestOptions),\n  );\n  useRerenderOnChange(\n    readOutDataAndRecords,\n    fragmentReference,\n    setReadOutDataAndRecords,\n    readerAst,\n  );\n  return readOutDataAndRecords.item;\n}\n\nexport function useSubscribeToMultiple<\n  TReadFromStore extends UnknownTReadFromStore,\n>(\n  items: ReadonlyArray<{\n    records: WithEncounteredRecords<TReadFromStore>;\n    callback: (updatedRecords: WithEncounteredRecords<TReadFromStore>) => void;\n    fragmentReference: FragmentReference<TReadFromStore, any>;\n    readerAst: ReaderAst<TReadFromStore>;\n  }>,\n) {\n  const environment = useIsographEnvironment();\n  useEffect(\n    () => {\n      const cleanupFns = items.map(\n        ({ records, callback, fragmentReference, readerAst }) => {\n          return subscribe(\n            environment,\n            records,\n            fragmentReference,\n            callback,\n            readerAst,\n          );\n        },\n      );\n      return () => {\n        cleanupFns.forEach((loader) => {\n          loader();\n        });\n      };\n    },\n    // By analogy to useReadAndSubscribe, we can have an empty dependency array?\n    // Maybe callback has to be depended on. I don't know!\n    // TODO find out\n    [\n      items\n        .map(({ fragmentReference }) => {\n          stableIdForFragmentReference(fragmentReference);\n        })\n        .join('.'),\n    ],\n  );\n}\n\nexport const componentFunction: IsographComponentFunction = (\n  environment,\n  fragmentReference,\n  networkRequestOptions,\n  startUpdate,\n) => {\n  function Component(additionalRuntimeProps: { [key: string]: any }) {\n    maybeUnwrapNetworkRequest(\n      fragmentReference.networkRequest,\n      networkRequestOptions,\n    );\n    const readerWithRefetchQueries = readPromise(\n      fragmentReference.readerWithRefetchQueries,\n    );\n\n    const data = useReadAndSubscribe(\n      fragmentReference,\n      networkRequestOptions,\n      readerWithRefetchQueries.readerArtifact.readerAst,\n    );\n\n    logMessage(environment, () => ({\n      kind: 'ComponentRerendered',\n      componentName: fragmentReference.fieldName,\n      rootLink: fragmentReference.root,\n    }));\n\n    return readerWithRefetchQueries.readerArtifact.resolver(\n      // @ts-expect-error\n      {\n        data,\n        parameters: fragmentReference.variables,\n        startUpdate: readerWithRefetchQueries.readerArtifact.hasUpdatable\n          ? startUpdate\n          : undefined,\n      },\n      additionalRuntimeProps,\n    );\n  }\n  const idString = `(type: ${fragmentReference.root.__typename}, id: ${fragmentReference.root.__link})`;\n  Component.displayName = `${fragmentReference.fieldName} ${idString} @component`;\n  return Component;\n};\n"],"mappings":";;;;;;;;;;;;;;AAwBA,SAAgB,oBAGd,mBACA,uBACA,WAC6B;CAC7B,MAAM,cAAc,wBAAwB;CAC5C,MAAM,CAAC,uBAAuB,4BAA4B,eACxD,qBAAqB,aAAa,mBAAmB,sBAAsB,CAC5E;AACD,qBACE,uBACA,mBACA,0BACA,UACD;AACD,QAAO,sBAAsB;;AAG/B,SAAgB,uBAGd,OAMA;CACA,MAAM,cAAc,wBAAwB;AAC5C,iBACQ;EACJ,MAAM,aAAa,MAAM,KACtB,EAAE,SAAS,UAAU,mBAAmB,gBAAgB;AACvD,UAAO,UACL,aACA,SACA,mBACA,UACA,UACD;IAEJ;AACD,eAAa;AACX,cAAW,SAAS,WAAW;AAC7B,YAAQ;KACR;;IAMN,CACE,MACG,KAAK,EAAE,wBAAwB;AAC9B,+BAA6B,kBAAkB;GAC/C,CACD,KAAK,IAAI,CACb,CACF;;AAGH,MAAaA,qBACX,aACA,mBACA,uBACA,gBACG;CACH,SAAS,UAAU,wBAAgD;AACjE,4BACE,kBAAkB,gBAClB,sBACD;EACD,MAAM,2BAA2B,YAC/B,kBAAkB,yBACnB;EAED,MAAM,OAAO,oBACX,mBACA,uBACA,yBAAyB,eAAe,UACzC;AAED,aAAW,oBAAoB;GAC7B,MAAM;GACN,eAAe,kBAAkB;GACjC,UAAU,kBAAkB;GAC7B,EAAE;AAEH,SAAO,yBAAyB,eAAe,SAE7C;GACE;GACA,YAAY,kBAAkB;GAC9B,aAAa,yBAAyB,eAAe,eACjD,cACA;GACL,EACD,uBACD;;CAEH,MAAM,WAAW,UAAU,kBAAkB,KAAK,WAAW,QAAQ,kBAAkB,KAAK,OAAO;AACnG,WAAU,cAAc,GAAG,kBAAkB,UAAU,GAAG,SAAS;AACnE,QAAO"}
+{"version":3,"file":"useReadAndSubscribe.mjs","names":[],"sources":["../../src/react/useReadAndSubscribe.ts"],"sourcesContent":["import { useEffect, useState } from 'react';\nimport {\n  type ExtractData,\n  type FragmentReference,\n  stableIdForFragmentReference,\n  type UnknownTReadFromStore,\n} from '../core/FragmentReference';\nimport type { IsographComponentFunction } from '../core/IsographEnvironment';\nimport { logMessage } from '../core/logging';\nimport { readPromise } from '../core/PromiseWrapper';\nimport {\n  type NetworkRequestReaderOptions,\n  readButDoNotEvaluate,\n  type WithEncounteredRecords,\n} from '../core/read';\nimport type { ReaderAst } from '../core/reader';\nimport { subscribe } from '../core/subscribe';\nimport { useIsographEnvironment } from './IsographEnvironmentProvider';\nimport { maybeUnwrapNetworkRequest } from './maybeUnwrapNetworkRequest';\nimport { useRerenderOnChange } from './useRerenderOnChange';\n\n/**\n * Read the data from a fragment reference and subscribe to updates.\n */\nexport function useReadAndSubscribe<\n  TReadFromStore extends UnknownTReadFromStore,\n>(\n  fragmentReference: FragmentReference<TReadFromStore, any>,\n  networkRequestOptions: NetworkRequestReaderOptions,\n  readerAst: ReaderAst<TReadFromStore>,\n): ExtractData<TReadFromStore> {\n  const environment = useIsographEnvironment();\n  const [readOutDataAndRecords, setReadOutDataAndRecords] = useState(() =>\n    readButDoNotEvaluate(environment, fragmentReference, networkRequestOptions),\n  );\n  useRerenderOnChange(\n    readOutDataAndRecords,\n    fragmentReference,\n    setReadOutDataAndRecords,\n    readerAst,\n  );\n  return readOutDataAndRecords.item;\n}\n\nexport function useSubscribeToMultiple<\n  TReadFromStore extends UnknownTReadFromStore,\n>(\n  items: ReadonlyArray<{\n    records: WithEncounteredRecords<TReadFromStore>;\n    callback: (updatedRecords: WithEncounteredRecords<TReadFromStore>) => void;\n    fragmentReference: FragmentReference<TReadFromStore, any>;\n    readerAst: ReaderAst<TReadFromStore>;\n  }>,\n) {\n  const environment = useIsographEnvironment();\n  useEffect(\n    () => {\n      const cleanupFns = items.map(\n        ({ records, callback, fragmentReference, readerAst }) => {\n          return subscribe(\n            environment,\n            records,\n            fragmentReference,\n            callback,\n            readerAst,\n          );\n        },\n      );\n      return () => {\n        cleanupFns.forEach((loader) => {\n          loader();\n        });\n      };\n    },\n    // By analogy to useReadAndSubscribe, we can have an empty dependency array?\n    // Maybe callback has to be depended on. I don't know!\n    // TODO find out\n    [\n      items\n        .map(({ fragmentReference }) => {\n          stableIdForFragmentReference(fragmentReference);\n        })\n        .join('.'),\n    ],\n  );\n}\n\nexport const componentFunction: IsographComponentFunction = (\n  environment,\n  fragmentReference,\n  networkRequestOptions,\n  startUpdate,\n) => {\n  function Component(additionalRuntimeProps: { [key: string]: any }) {\n    maybeUnwrapNetworkRequest(\n      fragmentReference.networkRequest,\n      networkRequestOptions,\n    );\n    const readerWithRefetchQueries = readPromise(\n      fragmentReference.readerWithRefetchQueries,\n    );\n\n    const data = useReadAndSubscribe(\n      fragmentReference,\n      networkRequestOptions,\n      readerWithRefetchQueries.readerArtifact.readerAst,\n    );\n\n    logMessage(environment, () => ({\n      kind: 'ComponentRerendered',\n      componentName: fragmentReference.fieldName,\n      rootLink: fragmentReference.root,\n    }));\n\n    return readerWithRefetchQueries.readerArtifact.resolver(\n      // @ts-expect-error\n      {\n        data,\n        parameters: fragmentReference.variables,\n        startUpdate: readerWithRefetchQueries.readerArtifact.hasUpdatable\n          ? startUpdate\n          : undefined,\n      },\n      additionalRuntimeProps,\n    );\n  }\n  const idString = `(type: ${fragmentReference.root.__typename}, id: ${fragmentReference.root.__link})`;\n  Component.displayName = `${fragmentReference.fieldName} ${idString} @component`;\n  return Component;\n};\n"],"mappings":";;;;;;;;;;;;;;AAwBA,SAAgB,oBAGd,mBACA,uBACA,WAC6B;CAC7B,MAAM,cAAc,wBAAwB;CAC5C,MAAM,CAAC,uBAAuB,4BAA4B,eACxD,qBAAqB,aAAa,mBAAmB,sBAAsB,CAC5E;AACD,qBACE,uBACA,mBACA,0BACA,UACD;AACD,QAAO,sBAAsB;;AAG/B,SAAgB,uBAGd,OAMA;CACA,MAAM,cAAc,wBAAwB;AAC5C,iBACQ;EACJ,MAAM,aAAa,MAAM,KACtB,EAAE,SAAS,UAAU,mBAAmB,gBAAgB;AACvD,UAAO,UACL,aACA,SACA,mBACA,UACA,UACD;IAEJ;AACD,eAAa;AACX,cAAW,SAAS,WAAW;AAC7B,YAAQ;KACR;;IAMN,CACE,MACG,KAAK,EAAE,wBAAwB;AAC9B,+BAA6B,kBAAkB;GAC/C,CACD,KAAK,IAAI,CACb,CACF;;AAGH,MAAa,qBACX,aACA,mBACA,uBACA,gBACG;CACH,SAAS,UAAU,wBAAgD;AACjE,4BACE,kBAAkB,gBAClB,sBACD;EACD,MAAM,2BAA2B,YAC/B,kBAAkB,yBACnB;EAED,MAAM,OAAO,oBACX,mBACA,uBACA,yBAAyB,eAAe,UACzC;AAED,aAAW,oBAAoB;GAC7B,MAAM;GACN,eAAe,kBAAkB;GACjC,UAAU,kBAAkB;GAC7B,EAAE;AAEH,SAAO,yBAAyB,eAAe,SAE7C;GACE;GACA,YAAY,kBAAkB;GAC9B,aAAa,yBAAyB,eAAe,eACjD,cACA;GACL,EACD,uBACD;;CAEH,MAAM,WAAW,UAAU,kBAAkB,KAAK,WAAW,QAAQ,kBAAkB,KAAK,OAAO;AACnG,WAAU,cAAc,GAAG,kBAAkB,UAAU,GAAG,SAAS;AACnE,QAAO"}

package/dist/react/{useRerenderOnChange.js → useRerenderOnChange.cjs}

@@ -1,8 +1,7 @@
-const require_rolldown_runtime = require('../_virtual/rolldown_runtime.js');
-const require_subscribe = require('../core/subscribe.js');
-const require_IsographEnvironmentProvider = require('./IsographEnvironmentProvider.js');
+const require_rolldown_runtime = require('../_virtual/rolldown_runtime.cjs');
+const require_subscribe = require('../core/subscribe.cjs');
+const require_IsographEnvironmentProvider = require('./IsographEnvironmentProvider.cjs');
 let react = require("react");
-react = require_rolldown_runtime.__toESM(react);
 
 //#region src/react/useRerenderOnChange.ts
 function useRerenderOnChange(encounteredDataAndRecords, fragmentReference, setEncounteredDataAndRecords, readerAst) {

package/dist/react/{useRerenderOnChange.d.ts → useRerenderOnChange.d.cts}

@@ -1,6 +1,6 @@
-import { ReaderAst } from "../core/reader.js";
-import { WithEncounteredRecords } from "../core/read.js";
-import { FragmentReference } from "../core/FragmentReference.js";
+import { ReaderAst } from "../core/reader.cjs";
+import { WithEncounteredRecords } from "../core/read.cjs";
+import { FragmentReference } from "../core/FragmentReference.cjs";
 
 //#region src/react/useRerenderOnChange.d.ts
 declare function useRerenderOnChange<TReadFromStore extends {
@@ -9,4 +9,4 @@ declare function useRerenderOnChange<TReadFromStore extends {
 }>(encounteredDataAndRecords: WithEncounteredRecords<TReadFromStore>, fragmentReference: FragmentReference<any, any>, setEncounteredDataAndRecords: (data: WithEncounteredRecords<TReadFromStore>) => void, readerAst: ReaderAst<TReadFromStore>): void;
 //#endregion
 export { useRerenderOnChange };
-//# sourceMappingURL=useRerenderOnChange.d.ts.map
+//# sourceMappingURL=useRerenderOnChange.d.cts.map

package/dist/react/useRerenderOnChange.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useRerenderOnChange.d.cts","names":[],"sources":["../../src/react/useRerenderOnChange.ts"],"mappings":";;;;;iBASgB,mBAAA;EACW,UAAA;EAAoB,IAAA;AAAA,EAAA,CAE7C,yBAAA,EAA2B,sBAAA,CAAuB,cAAA,GAClD,iBAAA,EAAmB,iBAAA,YACnB,4BAAA,GACE,IAAA,EAAM,sBAAA,CAAuB,cAAA,YAE/B,SAAA,EAAW,SAAA,CAAU,cAAA"}

package/dist/react/useRerenderOnChange.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"useRerenderOnChange.d.mts","names":[],"sources":["../../src/react/useRerenderOnChange.ts"],"sourcesContent":[],"mappings":";;;;;iBASgB;;EAAA,IAAA,EAAA,MAAA;CAGoC,CAAA,CAAA,yBAAA,EAAvB,sBAAuB,CAAA,cAAA,CAAA,EAAA,iBAAA,EAC/B,iBAD+B,CAAA,GAAA,EAAA,GAAA,CAAA,EAAA,4BAAA,EAAA,CAAA,IAAA,EAG1C,sBAH0C,CAGnB,cAHmB,CAAA,EAAA,GAAA,IAAA,EAAA,SAAA,EAKvC,SALuC,CAK7B,cAL6B,CAAA,CAAA,EAAA,IAAA"}
+{"version":3,"file":"useRerenderOnChange.d.mts","names":[],"sources":["../../src/react/useRerenderOnChange.ts"],"mappings":";;;;;iBASgB,mBAAA;EACW,UAAA;EAAoB,IAAA;AAAA,EAAA,CAE7C,yBAAA,EAA2B,sBAAA,CAAuB,cAAA,GAClD,iBAAA,EAAmB,iBAAA,YACnB,4BAAA,GACE,IAAA,EAAM,sBAAA,CAAuB,cAAA,YAE/B,SAAA,EAAW,SAAA,CAAU,cAAA"}

package/dist/react/{useResult.js → useResult.cjs}

@@ -1,10 +1,10 @@
-const require_PromiseWrapper = require('../core/PromiseWrapper.js');
-const require_startUpdate = require('../core/startUpdate.js');
-const require_componentCache = require('../core/componentCache.js');
-const require_read = require('../core/read.js');
-const require_IsographEnvironmentProvider = require('./IsographEnvironmentProvider.js');
-const require_maybeUnwrapNetworkRequest = require('./maybeUnwrapNetworkRequest.js');
-const require_useReadAndSubscribe = require('./useReadAndSubscribe.js');
+const require_PromiseWrapper = require('../core/PromiseWrapper.cjs');
+const require_startUpdate = require('../core/startUpdate.cjs');
+const require_componentCache = require('../core/componentCache.cjs');
+const require_read = require('../core/read.cjs');
+const require_IsographEnvironmentProvider = require('./IsographEnvironmentProvider.cjs');
+const require_maybeUnwrapNetworkRequest = require('./maybeUnwrapNetworkRequest.cjs');
+const require_useReadAndSubscribe = require('./useReadAndSubscribe.cjs');
 
 //#region src/react/useResult.ts
 function useResult(fragmentReference, partialNetworkRequestOptions) {

package/dist/react/{useResult.d.ts → useResult.d.cts}

@@ -1,8 +1,8 @@
-import { NetworkRequestReaderOptions } from "../core/read.js";
-import { FragmentReference, UnknownTReadFromStore } from "../core/FragmentReference.js";
+import { NetworkRequestReaderOptions } from "../core/read.cjs";
+import { FragmentReference, UnknownTReadFromStore } from "../core/FragmentReference.cjs";
 
 //#region src/react/useResult.d.ts
 declare function useResult<TReadFromStore extends UnknownTReadFromStore, TClientFieldValue>(fragmentReference: FragmentReference<TReadFromStore, TClientFieldValue>, partialNetworkRequestOptions?: Partial<NetworkRequestReaderOptions> | void): TClientFieldValue;
 //#endregion
 export { useResult };
-//# sourceMappingURL=useResult.d.ts.map
+//# sourceMappingURL=useResult.d.cts.map

package/dist/react/useResult.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useResult.d.cts","names":[],"sources":["../../src/react/useResult.ts"],"mappings":";;;;iBAegB,SAAA,wBACS,qBAAA,oBAAA,CAGvB,iBAAA,EAAmB,iBAAA,CAAkB,cAAA,EAAgB,iBAAA,GACrD,4BAAA,GAA+B,OAAA,CAAQ,2BAAA,WACtC,iBAAA"}

package/dist/react/useResult.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"useResult.d.mts","names":[],"sources":["../../src/react/useResult.ts"],"sourcesContent":[],"mappings":";;;;iBAegB,iCACS,6DAGJ,kBAAkB,gBAAgB,mDACtB,QAAQ,sCACtC"}
+{"version":3,"file":"useResult.d.mts","names":[],"sources":["../../src/react/useResult.ts"],"mappings":";;;;iBAegB,SAAA,wBACS,qBAAA,oBAAA,CAGvB,iBAAA,EAAmB,iBAAA,CAAkB,cAAA,EAAgB,iBAAA,GACrD,4BAAA,GAA+B,OAAA,CAAQ,2BAAA,WACtC,iBAAA"}

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@isograph/react",
-  "version": "0.0.0-main-a840a70e",
+  "version": "0.0.0-main-c09c9dbf",
   "description": "Use Isograph with React",
   "homepage": "https://isograph.dev",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "main": "./dist/index.cjs",
+  "types": "./dist/index.d.cts",
   "author": "Isograph Labs",
   "license": "MIT",
   "dependencies": {
-    "@isograph/reference-counted-pointer": "0.0.0-main-a840a70e",
-    "@isograph/disposable-types": "0.0.0-main-a840a70e",
-    "@isograph/react-disposable-state": "0.0.0-main-a840a70e"
+    "@isograph/react-disposable-state": "0.0.0-main-c09c9dbf",
+    "@isograph/reference-counted-pointer": "0.0.0-main-c09c9dbf",
+    "@isograph/disposable-types": "0.0.0-main-c09c9dbf"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0"
@@ -32,8 +32,8 @@
   "module": "./dist/index.mjs",
   "exports": {
     ".": {
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.js"
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.mjs"
     },
     "./package.json": "./package.json"
   },
@@ -43,7 +43,7 @@
     "test": "vitest run",
     "test-watch": "vitest watch",
     "coverage": "vitest run --coverage",
-    "tsc": "tsc",
+    "tsc": "tsc -b",
     "tsc-force": "tsc --build --clean && tsc --build --force",
     "iso": "../../target/debug/isograph_cli --config ./isograph.config.json"
   }

package/src/core/IsographEnvironment.ts

@@ -1,6 +1,10 @@
 import type { ParentCache } from '@isograph/react-disposable-state';
 import type { Brand } from './brand';
-import type { LinkedParentRecordKey, ScalarParentRecordKey } from './cache';
+import type {
+  LinkedParentRecordKey,
+  ParentRecordKey,
+  ScalarParentRecordKey,
+} from './cache';
 import type {
   IsographEntrypoint,
   IsographOperation,
@@ -144,9 +148,9 @@ export type DataTypeValueLinked =
   | readonly DataTypeValueLinked[];
 
 export type StoreRecord = {
-  [index: ScalarParentRecordKey]: DataTypeValueScalar;
-  [index: LinkedParentRecordKey]: DataTypeValueLinked;
-} & {
+  [key: ScalarParentRecordKey]: DataTypeValueScalar;
+  [key: LinkedParentRecordKey]: DataTypeValueLinked;
+  readonly [key: ParentRecordKey]: DataTypeValueScalar | DataTypeValueLinked;
   // TODO __typename?: T, which is restricted to being a concrete string
   // TODO this shouldn't always be named id
   readonly __typename?: TypeName;

package/src/core/cache.ts

@@ -1,5 +1,4 @@
 import { type Factory, ParentCache } from '@isograph/react-disposable-state';
-import type { Brand } from './brand';
 import type {
   NormalizationAstNodes,
   NormalizationInlineFragment,
@@ -61,12 +60,16 @@ export type NetworkResponseValue =
 export type NetworkResponseObject = {
   // N.B. undefined is here to support optional id's, but
   // undefined should not *actually* be present in the network response.
-  readonly [K in
-    | ScalarNetworkResponseKey
-    | LinkedNetworkResponseKey]: K extends ScalarNetworkResponseKey
-    ? undefined | NetworkResponsePlural<NetworkResponseScalarValue>
-    : undefined | NetworkResponsePlural<NetworkResponseObject>;
-} & {
+  readonly [key: ScalarNetworkResponseKey]:
+    | undefined
+    | NetworkResponsePlural<NetworkResponseScalarValue>;
+  readonly [key: LinkedNetworkResponseKey]:
+    | undefined
+    | NetworkResponsePlural<NetworkResponseObject>;
+  readonly [key: NetworkResponseKey]:
+    | undefined
+    | NetworkResponsePlural<NetworkResponseScalarValue>
+    | NetworkResponsePlural<NetworkResponseObject>;
   readonly id?: DataId;
   readonly __typename?: TypeName;
 };
@@ -433,15 +436,20 @@ function normalizeNetworkResponseObject(
   return newStoreRecordId;
 }
 
-declare const LinkedParentRecordKeyBrand: unique symbol;
-export type LinkedParentRecordKey = string & {
-  brand?: Brand<undefined, typeof LinkedParentRecordKeyBrand>;
-};
+export type ParentRecordKey = string;
 
-declare const ScalarParentRecordKeyBrand: unique symbol;
-export type ScalarParentRecordKey = string & {
-  brand?: Brand<undefined, typeof ScalarParentRecordKeyBrand>;
-};
+/**
+ * these don't actually start with the different prefixes, but they let
+ * us use multiple indexes, e.g.
+ * {
+ *   readonly [key: `NOT_AN_ACTUAL_TYPE_LinkedParentRecordKey_${string} `]: ...
+ *   readonly [key: `NOT_AN_ACTUAL_TYPE_ScalarParentRecordKey_${string} `]: ...
+ * }
+ */
+export type LinkedParentRecordKey =
+  `NOT_AN_ACTUAL_TYPE_LinkedParentRecordKey_${string}`;
+export type ScalarParentRecordKey =
+  `NOT_AN_ACTUAL_TYPE_ScalarParentRecordKey_${string}`;
 
 export function getParentRecordKey(
   astNode: NormalizationLinkedField | ReaderLinkedField,
@@ -458,7 +466,7 @@ export function getParentRecordKey(
     | ReaderLinkedField
     | ReaderScalarField,
   variables: Variables,
-): string {
+): ParentRecordKey {
   let parentRecordKey = astNode.fieldName;
   const fieldParameters = astNode.arguments;
   if (fieldParameters != null) {
@@ -512,15 +520,20 @@ function getStoreKeyChunkForArgument(argument: Argument, variables: Variables) {
   return `${FIRST_SPLIT_KEY}${argumentName}${SECOND_SPLIT_KEY}${chunk}`;
 }
 
-declare const LinkedNetworkResponseKeyBrand: unique symbol;
-export type LinkedNetworkResponseKey = string & {
-  brand?: Brand<undefined, typeof LinkedNetworkResponseKeyBrand>;
-};
+export type NetworkResponseKey = string;
 
-declare const ScalarNetworkResponseKeyBrand: unique symbol;
-export type ScalarNetworkResponseKey = string & {
-  brand?: Brand<undefined, typeof ScalarNetworkResponseKeyBrand>;
-};
+/**
+ * these don't actually start with the different prefixes, but they let
+ * us use multiple indexes, e.g.
+ * {
+ *   readonly [key: `NOT_AN_ACTUAL_TYPE_LinkedNetworkResponseKey_${string} `]: ...
+ *   readonly [key: `NOT_AN_ACTUAL_TYPE_ScalarNetworkResponseKey_${string} `]: ...
+ * }
+ */
+export type LinkedNetworkResponseKey =
+  `NOT_AN_ACTUAL_TYPE_LinkedNetworkResponseKey_${string}`;
+export type ScalarNetworkResponseKey =
+  `NOT_AN_ACTUAL_TYPE_ScalarNetworkResponseKey_${string}`;
 
 function getNetworkResponseKey(
   astNode: NormalizationLinkedField,
@@ -530,7 +543,7 @@ function getNetworkResponseKey(
 ): ScalarNetworkResponseKey;
 function getNetworkResponseKey(
   astNode: NormalizationLinkedField | NormalizationScalarField,
-): string {
+): NetworkResponseKey {
   let networkResponseKey = astNode.fieldName;
   const fieldParameters = astNode.arguments;
 

package/src/core/getOrCreateCacheForArtifact.ts

@@ -1,5 +1,5 @@
-import type { ItemCleanupPair } from '@isograph/isograph-disposable-types/dist';
-import type { ParentCache } from '@isograph/isograph-react-disposable-state/dist';
+import type { ItemCleanupPair } from '@isograph/disposable-types';
+import type { ParentCache } from '@isograph/react-disposable-state';
 import {
   type NetworkResponseObject,
   getOrCreateItemInSuspenseCache,

package/src/core/writeData.ts

@@ -1,15 +1,14 @@
-import type { ItemCleanupPair } from '@isograph/isograph-disposable-types/dist';
-import { callSubscriptions } from './subscribe';
+import type { ItemCleanupPair } from '@isograph/disposable-types';
 import {
-  type NetworkResponseObject,
   type EncounteredIds,
+  type NetworkResponseObject,
   normalizeData,
 } from './cache';
 import type { IsographEntrypoint, NormalizationAst } from './entrypoint';
 import type {
-  UnknownTReadFromStore,
   ExtractParameters,
   FragmentReference,
+  UnknownTReadFromStore,
 } from './FragmentReference';
 import {
   type IsographEnvironment,
@@ -19,6 +18,7 @@ import {
 import { logMessage } from './logging';
 import { retainQueryWithoutMakingNetworkRequest } from './makeNetworkRequest';
 import { addNetworkResponseStoreLayer } from './optimisticProxy';
+import { callSubscriptions } from './subscribe';
 
 export function writeData<
   TReadFromStore extends UnknownTReadFromStore,

package/src/tests/garbageCollection.test.ts

@@ -7,9 +7,9 @@ import {
 } from '../core/garbageCollection';
 import { ROOT_ID, type BaseStoreLayerData } from '../core/IsographEnvironment';
 import { wrapResolvedValue } from '../core/PromiseWrapper';
+import { createIsographEnvironment } from '../react/createIsographEnvironment';
 import { meNameSuccessorRetainedQuery } from './meNameSuccessor';
 import { nodeFieldRetainedQuery } from './nodeQuery';
-import { createIsographEnvironment } from '../react/createIsographEnvironment';
 
 const getDefaultStore = (): BaseStoreLayerData => ({
   Query: {
@@ -71,13 +71,13 @@ describe('garbage collection', () => {
       null as any,
     );
 
-    expect(store.Economist?.[1]).not.toBe(undefined);
+    expect(store['Economist']?.[1]).not.toBe(undefined);
 
     // TODO enable babel so we don't have to do this
     retainQuery(environment, meNameRetainedQuery);
     garbageCollectEnvironment(environment);
 
-    expect(store.Economist?.[1]).toBe(undefined);
+    expect(store['Economist']?.[1]).toBe(undefined);
   });
 
   test('Referenced records should not be garbage collected', () => {
@@ -88,13 +88,13 @@ describe('garbage collection', () => {
       null as any,
     );
 
-    expect(store.Economist?.[0]).not.toBe(undefined);
+    expect(store['Economist']?.[0]).not.toBe(undefined);
 
     // TODO enable babel so we don't have to do this
     retainQuery(environment, meNameRetainedQuery);
     garbageCollectEnvironment(environment);
 
-    expect(store.Economist?.[0]).not.toBe(undefined);
+    expect(store['Economist']?.[0]).not.toBe(undefined);
   });
 
   test('Referenced records should not be garbage collected, and this should work with variables', () => {
@@ -105,12 +105,12 @@ describe('garbage collection', () => {
       null as any,
     );
 
-    expect(store.Economist?.[0]).not.toBe(undefined);
+    expect(store['Economist']?.[0]).not.toBe(undefined);
 
     retainQuery(environment, nodeFieldRetainedQuery);
     garbageCollectEnvironment(environment);
 
-    expect(store.Economist?.[0]).not.toBe(undefined);
+    expect(store['Economist']?.[0]).not.toBe(undefined);
   });
 
   test('Referenced records should not be garbage collected, and this should work through multiple levels', () => {
@@ -124,9 +124,9 @@ describe('garbage collection', () => {
     retainQuery(environment, meNameSuccessorRetainedQuery);
     garbageCollectEnvironment(environment);
 
-    expect(store.Economist?.[0]).not.toBe(undefined);
-    expect(store.Economist?.[1]).not.toBe(undefined);
-    expect(store.Economist?.[2]).not.toBe(undefined);
+    expect(store['Economist']?.[0]).not.toBe(undefined);
+    expect(store['Economist']?.[1]).not.toBe(undefined);
+    expect(store['Economist']?.[2]).not.toBe(undefined);
   });
 
   test('ROOT_ID should be garbage collected, if there are no retained queries', () => {
@@ -139,6 +139,6 @@ describe('garbage collection', () => {
     garbageCollectEnvironment(environment);
 
     expect(store.Query?.[ROOT_ID]).toBe(undefined);
-    expect(store.Economist?.[0]).toBe(undefined);
+    expect(store['Economist']?.[0]).toBe(undefined);
   });
 });

package/src/tests/normalizeData.test.ts

@@ -8,6 +8,7 @@ import {
 } from '../core/IsographEnvironment';
 import { normalizeData } from '../core/cache';
 import { getOrCreateCacheForArtifact } from '../core/getOrCreateCacheForArtifact';
+import type { StoreLayer } from '../core/optimisticProxy';
 import {
   readButDoNotEvaluate,
   type WithEncounteredRecords,
@@ -36,11 +37,18 @@ const normalizeUndefinedFieldEntrypoint = iso(
   `entrypoint Query.normalizeUndefinedField`,
 );
 
+function getBaseStoreLayer(node: StoreLayer) {
+  if (node.kind === 'BaseStoreLayer') {
+    return node;
+  }
+  return getBaseStoreLayer(node.parentStoreLayer);
+}
+
 describe('normalize undefined field', () => {
   test('should normalize scalar field to null', () => {
     normalizeData(
       environment,
-      environment.store,
+      getBaseStoreLayer(environment.store),
       normalizeUndefinedFieldEntrypoint.networkRequestInfo.normalizationAst
         .selections,
       {
@@ -74,7 +82,7 @@ describe('normalize undefined field', () => {
   test('should normalize linked field to null', () => {
     normalizeData(
       environment,
-      environment.store,
+      getBaseStoreLayer(environment.store),
       normalizeUndefinedFieldEntrypoint.networkRequestInfo.normalizationAst
         .selections,
       {},
@@ -111,7 +119,7 @@ describe('nested Query', () => {
   test('should be normalized', () => {
     normalizeData(
       environment,
-      environment.store,
+      getBaseStoreLayer(environment.store),
       entrypoint.networkRequestInfo.normalizationAst.selections,
       {
         query: { node____id___v_id: { __typename: 'Economist', id: '1' } },

package/src/tests/optimisticProxy.test.ts

@@ -64,7 +64,7 @@ describe('optimisticLayer', () => {
         getStoreRecordProxy(environment.store, {
           __link: '__ROOT',
           __typename: 'Query',
-        })?.counter,
+        })?.['counter'],
       ).toBe(4);
     });
   });
@@ -88,7 +88,7 @@ describe('optimisticLayer', () => {
         getStoreRecordProxy(environment.store, {
           __link: '__ROOT',
           __typename: 'Query',
-        })?.counter,
+        })?.['counter'],
       ).toBe(3);
     });
   });
@@ -103,7 +103,7 @@ describe('optimisticLayer', () => {
         getStoreRecordProxy(environment.store, {
           __link: '__ROOT',
           __typename: 'Query',
-        })?.counter,
+        })?.['counter'],
       ).toBe(3);
     });
   });
@@ -235,7 +235,7 @@ describe('optimisticLayer', () => {
           getStoreRecordProxy(environment.store, {
             __link: '__ROOT',
             __typename: 'Query',
-          })?.counter,
+          })?.['counter'],
         ).toBe(5);
       });
 
@@ -256,7 +256,7 @@ describe('optimisticLayer', () => {
           getStoreRecordProxy(environment.store, {
             __link: '__ROOT',
             __typename: 'Query',
-          })?.counter,
+          })?.['counter'],
         ).toBe(12);
       });
 
@@ -281,7 +281,7 @@ describe('optimisticLayer', () => {
           getStoreRecordProxy(environment.store, {
             __link: '__ROOT',
             __typename: 'Query',
-          })?.counter,
+          })?.['counter'],
         ).toBe(13);
       });
 
@@ -306,7 +306,7 @@ describe('optimisticLayer', () => {
           getStoreRecordProxy(environment.store, {
             __link: '__ROOT',
             __typename: 'Query',
-          })?.counter,
+          })?.['counter'],
         ).toBe(16);
       });
 
@@ -330,7 +330,7 @@ describe('optimisticLayer', () => {
           getStoreRecordProxy(environment.store, {
             __link: '__ROOT',
             __typename: 'Query',
-          })?.counter,
+          })?.['counter'],
         ).toBe(6);
       });
     });
@@ -360,7 +360,7 @@ describe('optimisticLayer', () => {
           getStoreRecordProxy(environment.store, {
             __link: '__ROOT',
             __typename: 'Query',
-          })?.counter,
+          })?.['counter'],
         ).toBe(12);
       });
 
@@ -387,7 +387,7 @@ describe('optimisticLayer', () => {
           getStoreRecordProxy(environment.store, {
             __link: '__ROOT',
             __typename: 'Query',
-          })?.counter,
+          })?.['counter'],
         ).toBe(12);
       });
 
@@ -415,7 +415,7 @@ describe('optimisticLayer', () => {
           getStoreRecordProxy(environment.store, {
             __link: '__ROOT',
             __typename: 'Query',
-          })?.counter,
+          })?.['counter'],
         ).toBe(12);
       });
     });
@@ -444,7 +444,7 @@ describe('optimisticLayer', () => {
           getStoreRecordProxy(environment.store, {
             __link: '__ROOT',
             __typename: 'Query',
-          })?.counter,
+          })?.['counter'],
         ).toBe(5);
       });
       test("doesn't merge child nodes if has parent nodes", () => {
@@ -474,7 +474,7 @@ describe('optimisticLayer', () => {
           getStoreRecordProxy(environment.store, {
             __link: '__ROOT',
             __typename: 'Query',
-          })?.counter,
+          })?.['counter'],
         ).toBe(6);
       });
     });
@@ -541,7 +541,7 @@ describe('optimisticLayer', () => {
             getStoreRecordProxy(environment.store, {
               __link: '__ROOT',
               __typename: 'Query',
-            })?.counter,
+            })?.['counter'],
           ).toBe(0);
         });
 
@@ -562,7 +562,7 @@ describe('optimisticLayer', () => {
             getStoreRecordProxy(environment.store, {
               __link: '__ROOT',
               __typename: 'Query',
-            })?.counter,
+            })?.['counter'],
           ).toBe(12);
         });
 
@@ -587,7 +587,7 @@ describe('optimisticLayer', () => {
             getStoreRecordProxy(environment.store, {
               __link: '__ROOT',
               __typename: 'Query',
-            })?.counter,
+            })?.['counter'],
           ).toBe(13);
         });
 
@@ -612,7 +612,7 @@ describe('optimisticLayer', () => {
             getStoreRecordProxy(environment.store, {
               __link: '__ROOT',
               __typename: 'Query',
-            })?.counter,
+            })?.['counter'],
           ).toBe(15);
         });
 
@@ -636,7 +636,7 @@ describe('optimisticLayer', () => {
             getStoreRecordProxy(environment.store, {
               __link: '__ROOT',
               __typename: 'Query',
-            })?.counter,
+            })?.['counter'],
           ).toBe(1);
         });
       });
@@ -666,7 +666,7 @@ describe('optimisticLayer', () => {
             getStoreRecordProxy(environment.store, {
               __link: '__ROOT',
               __typename: 'Query',
-            })?.counter,
+            })?.['counter'],
           ).toBe(12);
         });
 
@@ -693,7 +693,7 @@ describe('optimisticLayer', () => {
             getStoreRecordProxy(environment.store, {
               __link: '__ROOT',
               __typename: 'Query',
-            })?.counter,
+            })?.['counter'],
           ).toBe(12);
         });
 
@@ -721,7 +721,7 @@ describe('optimisticLayer', () => {
             getStoreRecordProxy(environment.store, {
               __link: '__ROOT',
               __typename: 'Query',
-            })?.counter,
+            })?.['counter'],
           ).toBe(12);
         });
       });
@@ -747,7 +747,7 @@ describe('optimisticLayer', () => {
             getStoreRecordProxy(environment.store, {
               __link: '__ROOT',
               __typename: 'Query',
-            })?.counter,
+            })?.['counter'],
           ).toBe(1);
         });
 
@@ -775,7 +775,7 @@ describe('optimisticLayer', () => {
             getStoreRecordProxy(environment.store, {
               __link: '__ROOT',
               __typename: 'Query',
-            })?.counter,
+            })?.['counter'],
           ).toBe(2);
         });
       });