@isograph/react 0.0.0-main-ee768a61 → 0.0.0-main-37985805

package/dist/cache.d.ts

@@ -6,6 +6,12 @@ declare global {
         __LOG: boolean;
     }
 }
+/**
+ * Creates a copy of the provided value, ensuring any nested objects have their
+ * keys sorted such that equivalent values would have identical JSON.stringify
+ * results.
+ */
+export declare function stableCopy<T>(value: T): T;
 type IsoResolver = IsographEntrypoint<any, any, any>;
 export declare function getOrCreateCacheForArtifact<T>(artifact: IsographEntrypoint<any, any, T>, variables: object): ParentCache<PromiseWrapper<T>>;
 declare let network: ((queryText: string, variables: object) => Promise<any>) | null;

package/dist/cache.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SECOND_SPLIT_KEY = exports.FIRST_SPLIT_KEY = exports.getParentRecordKey = exports.onNextChange = exports.subscribe = exports.clearStore = exports.getStore = exports.ROOT_ID = exports.makeNetworkRequest = exports.setNetwork = exports.getOrCreateCacheForArtifact = void 0;
+exports.SECOND_SPLIT_KEY = exports.FIRST_SPLIT_KEY = exports.getParentRecordKey = exports.onNextChange = exports.subscribe = exports.clearStore = exports.getStore = exports.ROOT_ID = exports.makeNetworkRequest = exports.setNetwork = exports.getOrCreateCacheForArtifact = exports.stableCopy = void 0;
 const react_disposable_state_1 = require("@isograph/react-disposable-state");
 const PromiseWrapper_1 = require("./PromiseWrapper");
 const cache = {};
@@ -38,6 +38,7 @@ function stableCopy(value) {
     }
     return stable;
 }
+exports.stableCopy = stableCopy;
 function getOrCreateCacheForArtifact(artifact, variables) {
     const cacheKey = artifact.queryText + JSON.stringify(stableCopy(variables));
     const factory = () => makeNetworkRequest(artifact, variables);

package/dist/componentCache.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { ReaderArtifact, RefetchQueryArtifactWrapper } from "./index";
 import { DataId } from "./cache";
-export declare function getOrCreateCachedComponent(root: DataId, componentName: string, stringifiedArgs: string, readerArtifact: ReaderArtifact<any, any, any>, variables: {
+export declare function getOrCreateCachedComponent(root: DataId, componentName: string, readerArtifact: ReaderArtifact<any, any, any>, variables: {
     [key: string]: string;
 }, resolverRefetchQueries: RefetchQueryArtifactWrapper[]): import("react").FC<any>;

package/dist/componentCache.js

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOrCreateCachedComponent = void 0;
 const index_1 = require("./index");
+const cache_1 = require("./cache");
 const cachedComponentsById = {};
-function getOrCreateCachedComponent(root, componentName, stringifiedArgs, readerArtifact, variables, resolverRefetchQueries) {
+function getOrCreateCachedComponent(root, componentName, readerArtifact, variables, resolverRefetchQueries) {
     var _a, _b, _c;
+    const stringifiedArgs = JSON.stringify((0, cache_1.stableCopy)(variables));
     cachedComponentsById[root] = (_a = cachedComponentsById[root]) !== null && _a !== void 0 ? _a : {};
     const componentsByName = cachedComponentsById[root];
     componentsByName[componentName] = (_b = componentsByName[componentName]) !== null && _b !== void 0 ? _b : {};

package/dist/index.js

@@ -57,7 +57,7 @@ function read(fragmentReference) {
     }
     else if (variant.kind === "Component") {
         // @ts-ignore
-        return (0, componentCache_1.getOrCreateCachedComponent)(fragmentReference.root, variant.componentName, "TODO", fragmentReference.readerArtifact, (_b = fragmentReference.variables) !== null && _b !== void 0 ? _b : {}, fragmentReference.nestedRefetchQueries);
+        return (0, componentCache_1.getOrCreateCachedComponent)(fragmentReference.root, variant.componentName, fragmentReference.readerArtifact, (_b = fragmentReference.variables) !== null && _b !== void 0 ? _b : {}, fragmentReference.nestedRefetchQueries);
     }
     // Why can't Typescript realize that this is unreachable??
     throw new Error("This is unreachable");
@@ -248,7 +248,7 @@ function readData(ast, root, variables, nestedRefetchQueries) {
                     }
                 }
                 else if (variant.kind === "Component") {
-                    target[field.alias] = (0, componentCache_1.getOrCreateCachedComponent)(root, variant.componentName, "TODO", field.readerArtifact, variables, resolverRefetchQueries);
+                    target[field.alias] = (0, componentCache_1.getOrCreateCachedComponent)(root, variant.componentName, field.readerArtifact, variables, resolverRefetchQueries);
                 }
                 break;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isograph/react",
-  "version": "0.0.0-main-ee768a61",
+  "version": "0.0.0-main-37985805",
   "description": "Use Isograph with React",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,8 +15,8 @@
     "prepack": "yarn run test && yarn run compile"
   },
   "dependencies": {
-    "@isograph/disposable-types": "0.0.0-main-ee768a61",
-    "@isograph/react-disposable-state": "0.0.0-main-ee768a61",
+    "@isograph/disposable-types": "0.0.0-main-37985805",
+    "@isograph/react-disposable-state": "0.0.0-main-37985805",
     "react": "^18.2.0"
   },
   "devDependencies": {

package/src/cache.ts

@@ -45,7 +45,7 @@ function getOrCreateCache<T>(
  * keys sorted such that equivalent values would have identical JSON.stringify
  * results.
  */
-function stableCopy<T>(value: T): T {
+export function stableCopy<T>(value: T): T {
   if (!value || typeof value !== "object") {
     return value;
   }

package/src/componentCache.ts

@@ -3,7 +3,7 @@ import {
   RefetchQueryArtifactWrapper,
   readButDoNotEvaluate,
 } from "./index";
-import { DataId } from "./cache";
+import { DataId, stableCopy } from "./cache";
 
 type ComponentName = string;
 type StringifiedArgs = string;
@@ -15,11 +15,11 @@ const cachedComponentsById: {
 export function getOrCreateCachedComponent(
   root: DataId,
   componentName: string,
-  stringifiedArgs: string,
   readerArtifact: ReaderArtifact<any, any, any>,
   variables: { [key: string]: string },
   resolverRefetchQueries: RefetchQueryArtifactWrapper[]
 ) {
+  const stringifiedArgs = JSON.stringify(stableCopy(variables));
   cachedComponentsById[root] = cachedComponentsById[root] ?? {};
   const componentsByName = cachedComponentsById[root];
   componentsByName[componentName] = componentsByName[componentName] ?? {};

package/src/index.tsx

@@ -256,7 +256,6 @@ export function read<
     return getOrCreateCachedComponent(
       fragmentReference.root,
       variant.componentName,
-      "TODO",
       fragmentReference.readerArtifact,
       fragmentReference.variables ?? {},
       fragmentReference.nestedRefetchQueries
@@ -519,7 +518,6 @@ function readData<TReadFromStore>(
           target[field.alias] = getOrCreateCachedComponent(
             root,
             variant.componentName,
-            "TODO",
             field.readerArtifact,
             variables,
             resolverRefetchQueries