@isograph/react 0.0.0-main-dd7a276d → 0.0.0-main-c06bc99a

package/dist/core/FragmentReference.d.ts

@@ -1,6 +1,5 @@
 import { DataId } from './IsographEnvironment';
-import { RefetchQueryNormalizationArtifactWrapper } from '../core/entrypoint';
-import { TopLevelReaderArtifact } from './reader';
+import { ReaderWithRefetchQueries } from '../core/entrypoint';
 import { PromiseWrapper } from './PromiseWrapper';
 export type VariableValue = string | number | boolean | null | object;
 export type Variables = {
@@ -8,10 +7,9 @@ export type Variables = {
 };
 export type FragmentReference<TReadFromStore extends Object, TClientFieldValue> = {
     readonly kind: 'FragmentReference';
-    readonly readerArtifact: TopLevelReaderArtifact<TReadFromStore, TClientFieldValue, any>;
+    readonly readerWithRefetchQueries: ReaderWithRefetchQueries<TReadFromStore, TClientFieldValue>;
     readonly root: DataId;
     readonly variables: Variables | null;
-    readonly nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[];
     readonly networkRequest: PromiseWrapper<void, any>;
 };
 export declare function stableIdForFragmentReference(fragmentReference: FragmentReference<any, any>): string;

package/dist/core/cache.js

@@ -51,10 +51,13 @@ function getOrCreateCacheForArtifact(environment, entrypoint, variables) {
         const itemCleanupPair = [
             {
                 kind: 'FragmentReference',
-                readerArtifact: entrypoint.readerArtifact,
+                readerWithRefetchQueries: {
+                    kind: 'ReaderWithRefetchQueries',
+                    readerArtifact: entrypoint.readerWithRefetchQueries.readerArtifact,
+                    nestedRefetchQueries: entrypoint.readerWithRefetchQueries.nestedRefetchQueries,
+                },
                 root: IsographEnvironment_1.ROOT_ID,
                 variables,
-                nestedRefetchQueries: entrypoint.nestedRefetchQueries,
                 networkRequest: networkRequest,
             },
             disposeNetworkRequest,

package/dist/core/componentCache.js

@@ -26,7 +26,7 @@ function getOrCreateCachedComponent(environment, componentName, fragmentReferenc
                         ' ' +
                         fragmentReference.root);
                 }
-                return fragmentReference.readerArtifact.resolver(data, additionalRuntimeProps);
+                return fragmentReference.readerWithRefetchQueries.readerArtifact.resolver(data, additionalRuntimeProps);
             }
             Component.displayName = `${componentName} (id: ${fragmentReference.root}) @component`;
             return Component;

package/dist/core/entrypoint.d.ts

@@ -1,12 +1,16 @@
 /// <reference types="react" />
 import { TopLevelReaderArtifact } from './reader';
 import { Arguments } from './util';
+export type ReaderWithRefetchQueries<TReadFromStore extends Object, TClientFieldValue> = {
+    readonly kind: 'ReaderWithRefetchQueries';
+    readonly readerArtifact: TopLevelReaderArtifact<TReadFromStore, TClientFieldValue, any>;
+    readonly nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[];
+};
 export type IsographEntrypoint<TReadFromStore extends Object, TClientFieldValue> = {
     readonly kind: 'Entrypoint';
     readonly queryText: string;
     readonly normalizationAst: NormalizationAst;
-    readonly readerArtifact: TopLevelReaderArtifact<TReadFromStore, TClientFieldValue, any>;
-    readonly nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[];
+    readonly readerWithRefetchQueries: ReaderWithRefetchQueries<TReadFromStore, TClientFieldValue>;
 };
 export type NormalizationAstNode = NormalizationScalarField | NormalizationLinkedField | NormalizationInlineFragment;
 export type NormalizationAst = ReadonlyArray<NormalizationAstNode>;

package/dist/core/makeNetworkRequest.js

@@ -28,7 +28,9 @@ function makeNetworkRequest(environment, artifact, variables) {
             });
         }
         if (status.kind === 'UndisposedIncomplete') {
-            (0, cache_1.normalizeData)(environment, artifact.normalizationAst, (_a = networkResponse.data) !== null && _a !== void 0 ? _a : {}, variables, artifact.kind === 'Entrypoint' ? artifact.nestedRefetchQueries : []);
+            (0, cache_1.normalizeData)(environment, artifact.normalizationAst, (_a = networkResponse.data) !== null && _a !== void 0 ? _a : {}, variables, artifact.kind === 'Entrypoint'
+                ? artifact.readerWithRefetchQueries.nestedRefetchQueries
+                : []);
             const retainedQuery = {
                 normalizationAst: artifact.normalizationAst,
                 variables,

package/dist/core/read.js

@@ -8,7 +8,7 @@ const makeNetworkRequest_1 = require("./makeNetworkRequest");
 function readButDoNotEvaluate(environment, fragmentReference, networkRequestOptions) {
     var _a;
     const mutableEncounteredRecords = new Set();
-    const response = readData(environment, fragmentReference.readerArtifact.readerAst, fragmentReference.root, (_a = fragmentReference.variables) !== null && _a !== void 0 ? _a : {}, fragmentReference.nestedRefetchQueries, fragmentReference.networkRequest, networkRequestOptions, mutableEncounteredRecords);
+    const response = readData(environment, fragmentReference.readerWithRefetchQueries.readerArtifact.readerAst, fragmentReference.root, (_a = fragmentReference.variables) !== null && _a !== void 0 ? _a : {}, fragmentReference.readerWithRefetchQueries.nestedRefetchQueries, fragmentReference.networkRequest, networkRequestOptions, mutableEncounteredRecords);
     // @ts-expect-error
     if (typeof window !== 'undefined' && window.__LOG) {
         console.log('done reading', { response });
@@ -208,11 +208,14 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, netwo
                 else if (kind === 'ComponentReaderArtifact') {
                     target[field.alias] = (0, componentCache_1.getOrCreateCachedComponent)(environment, field.readerArtifact.componentName, {
                         kind: 'FragmentReference',
-                        readerArtifact: field.readerArtifact,
+                        readerWithRefetchQueries: {
+                            kind: 'ReaderWithRefetchQueries',
+                            readerArtifact: field.readerArtifact,
+                            nestedRefetchQueries: resolverRefetchQueries,
+                        },
                         root,
                         variables: generateChildVariableMap(variables, field.arguments),
                         networkRequest,
-                        nestedRefetchQueries: resolverRefetchQueries,
                     }, networkRequestOptions);
                 }
                 break;
@@ -249,11 +252,15 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, netwo
                                 const [networkRequest, disposeNetworkRequest] = (0, makeNetworkRequest_1.makeNetworkRequest)(environment, field.entrypoint, localVariables);
                                 const fragmentReference = {
                                     kind: 'FragmentReference',
-                                    readerArtifact: field.entrypoint.readerArtifact,
+                                    readerWithRefetchQueries: {
+                                        kind: 'ReaderWithRefetchQueries',
+                                        readerArtifact: field.entrypoint.readerWithRefetchQueries.readerArtifact,
+                                        nestedRefetchQueries: field.entrypoint.readerWithRefetchQueries
+                                            .nestedRefetchQueries,
+                                    },
                                     // TODO localVariables is not guaranteed to have an id field
                                     root: localVariables.id,
                                     variables: localVariables,
-                                    nestedRefetchQueries: field.entrypoint.nestedRefetchQueries,
                                     networkRequest,
                                 };
                                 return [fragmentReference, disposeNetworkRequest];

package/dist/loadable-hooks/useSuspensefulSkipLimitPagination.js

@@ -42,7 +42,7 @@ function useSuspensefulSkipLimitPagination(loadableField) {
         }
         (0, useResult_1.maybeUnwrapNetworkRequest)(fragmentReference.networkRequest, networkRequestOptions);
         const data = (0, read_1.readButDoNotEvaluate)(environment, fragmentReference, networkRequestOptions);
-        return fragmentReference.readerArtifact.resolver(data.item, undefined);
+        return fragmentReference.readerWithRefetchQueries.readerArtifact.resolver(data.item, undefined);
     });
     const items = flatten(results);
     const loadedSoFar = items.length;

package/dist/react/useImperativeReference.js

@@ -15,10 +15,13 @@ function useImperativeReference(entrypoint) {
             setState([
                 {
                     kind: 'FragmentReference',
-                    readerArtifact: entrypoint.readerArtifact,
+                    readerWithRefetchQueries: {
+                        kind: 'ReaderWithRefetchQueries',
+                        readerArtifact: entrypoint.readerWithRefetchQueries.readerArtifact,
+                        nestedRefetchQueries: entrypoint.readerWithRefetchQueries.nestedRefetchQueries,
+                    },
                     root: IsographEnvironment_1.ROOT_ID,
                     variables,
-                    nestedRefetchQueries: entrypoint.nestedRefetchQueries,
                     networkRequest,
                 },
                 () => {

package/dist/react/useResult.js

@@ -10,14 +10,14 @@ function useResult(fragmentReference, partialNetworkRequestOptions) {
     const environment = (0, IsographEnvironmentProvider_1.useIsographEnvironment)();
     const networkRequestOptions = (0, read_1.getNetworkRequestOptionsWithDefaults)(partialNetworkRequestOptions);
     maybeUnwrapNetworkRequest(fragmentReference.networkRequest, networkRequestOptions);
-    switch (fragmentReference.readerArtifact.kind) {
+    switch (fragmentReference.readerWithRefetchQueries.readerArtifact.kind) {
         case 'ComponentReaderArtifact': {
             // @ts-expect-error
-            return (0, componentCache_1.getOrCreateCachedComponent)(environment, fragmentReference.readerArtifact.componentName, fragmentReference, networkRequestOptions);
+            return (0, componentCache_1.getOrCreateCachedComponent)(environment, fragmentReference.readerWithRefetchQueries.readerArtifact.componentName, fragmentReference, networkRequestOptions);
         }
         case 'EagerReaderArtifact': {
             const data = (0, useReadAndSubscribe_1.useReadAndSubscribe)(fragmentReference, networkRequestOptions);
-            return fragmentReference.readerArtifact.resolver(data);
+            return fragmentReference.readerWithRefetchQueries.readerArtifact.resolver(data);
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isograph/react",
-  "version": "0.0.0-main-dd7a276d",
+  "version": "0.0.0-main-c06bc99a",
   "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-dd7a276d",
-    "@isograph/react-disposable-state": "0.0.0-main-dd7a276d",
-    "@isograph/reference-counted-pointer": "0.0.0-main-dd7a276d"
+    "@isograph/disposable-types": "0.0.0-main-c06bc99a",
+    "@isograph/react-disposable-state": "0.0.0-main-c06bc99a",
+    "@isograph/reference-counted-pointer": "0.0.0-main-c06bc99a"
   },
   "peerDependencies": {
     "react": "18.2.0"

package/src/core/FragmentReference.ts

@@ -1,6 +1,5 @@
 import { DataId } from './IsographEnvironment';
-import { RefetchQueryNormalizationArtifactWrapper } from '../core/entrypoint';
-import { TopLevelReaderArtifact } from './reader';
+import { ReaderWithRefetchQueries } from '../core/entrypoint';
 import { PromiseWrapper } from './PromiseWrapper';
 
 // TODO type this better
@@ -13,15 +12,12 @@ export type FragmentReference<
   TClientFieldValue,
 > = {
   readonly kind: 'FragmentReference';
-  readonly readerArtifact: TopLevelReaderArtifact<
+  readonly readerWithRefetchQueries: ReaderWithRefetchQueries<
     TReadFromStore,
-    TClientFieldValue,
-    any
+    TClientFieldValue
   >;
   readonly root: DataId;
   readonly variables: Variables | null;
-  // TODO: We should instead have ReaderAst<TClientFieldProps>
-  readonly nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[];
   readonly networkRequest: PromiseWrapper<void, any>;
 };
 

package/src/core/cache.ts

@@ -95,10 +95,14 @@ export function getOrCreateCacheForArtifact<
     > = [
       {
         kind: 'FragmentReference',
-        readerArtifact: entrypoint.readerArtifact,
+        readerWithRefetchQueries: {
+          kind: 'ReaderWithRefetchQueries',
+          readerArtifact: entrypoint.readerWithRefetchQueries.readerArtifact,
+          nestedRefetchQueries:
+            entrypoint.readerWithRefetchQueries.nestedRefetchQueries,
+        },
         root: ROOT_ID,
         variables,
-        nestedRefetchQueries: entrypoint.nestedRefetchQueries,
         networkRequest: networkRequest,
       },
       disposeNetworkRequest,

package/src/core/componentCache.ts

@@ -44,7 +44,7 @@ export function getOrCreateCachedComponent(
           );
         }
 
-        return fragmentReference.readerArtifact.resolver(
+        return fragmentReference.readerWithRefetchQueries.readerArtifact.resolver(
           data,
           additionalRuntimeProps,
         );

package/src/core/entrypoint.ts

@@ -1,14 +1,11 @@
 import { TopLevelReaderArtifact } from './reader';
 import { Arguments } from './util';
 
-// This type should be treated as an opaque type.
-export type IsographEntrypoint<
+export type ReaderWithRefetchQueries<
   TReadFromStore extends Object,
   TClientFieldValue,
 > = {
-  readonly kind: 'Entrypoint';
-  readonly queryText: string;
-  readonly normalizationAst: NormalizationAst;
+  readonly kind: 'ReaderWithRefetchQueries';
   readonly readerArtifact: TopLevelReaderArtifact<
     TReadFromStore,
     TClientFieldValue,
@@ -18,6 +15,20 @@ export type IsographEntrypoint<
   readonly nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[];
 };
 
+// This type should be treated as an opaque type.
+export type IsographEntrypoint<
+  TReadFromStore extends Object,
+  TClientFieldValue,
+> = {
+  readonly kind: 'Entrypoint';
+  readonly queryText: string;
+  readonly normalizationAst: NormalizationAst;
+  readonly readerWithRefetchQueries: ReaderWithRefetchQueries<
+    TReadFromStore,
+    TClientFieldValue
+  >;
+};
+
 export type NormalizationAstNode =
   | NormalizationScalarField
   | NormalizationLinkedField

package/src/core/makeNetworkRequest.ts

@@ -48,7 +48,9 @@ export function makeNetworkRequest(
           artifact.normalizationAst,
           networkResponse.data ?? {},
           variables,
-          artifact.kind === 'Entrypoint' ? artifact.nestedRefetchQueries : [],
+          artifact.kind === 'Entrypoint'
+            ? artifact.readerWithRefetchQueries.nestedRefetchQueries
+            : [],
         );
         const retainedQuery = {
           normalizationAst: artifact.normalizationAst,

package/src/core/read.ts

@@ -26,10 +26,10 @@ export function readButDoNotEvaluate<TReadFromStore extends Object>(
   const mutableEncounteredRecords = new Set<DataId>();
   const response = readData(
     environment,
-    fragmentReference.readerArtifact.readerAst,
+    fragmentReference.readerWithRefetchQueries.readerArtifact.readerAst,
     fragmentReference.root,
     fragmentReference.variables ?? {},
-    fragmentReference.nestedRefetchQueries,
+    fragmentReference.readerWithRefetchQueries.nestedRefetchQueries,
     fragmentReference.networkRequest,
     networkRequestOptions,
     mutableEncounteredRecords,
@@ -309,11 +309,14 @@ function readData<TReadFromStore>(
             field.readerArtifact.componentName,
             {
               kind: 'FragmentReference',
-              readerArtifact: field.readerArtifact,
+              readerWithRefetchQueries: {
+                kind: 'ReaderWithRefetchQueries',
+                readerArtifact: field.readerArtifact,
+                nestedRefetchQueries: resolverRefetchQueries,
+              },
               root,
               variables: generateChildVariableMap(variables, field.arguments),
               networkRequest,
-              nestedRefetchQueries: resolverRefetchQueries,
             } as const,
             networkRequestOptions,
           );
@@ -372,11 +375,17 @@ function readData<TReadFromStore>(
                   );
                 const fragmentReference: FragmentReference<any, any> = {
                   kind: 'FragmentReference',
-                  readerArtifact: field.entrypoint.readerArtifact,
+                  readerWithRefetchQueries: {
+                    kind: 'ReaderWithRefetchQueries',
+                    readerArtifact:
+                      field.entrypoint.readerWithRefetchQueries.readerArtifact,
+                    nestedRefetchQueries:
+                      field.entrypoint.readerWithRefetchQueries
+                        .nestedRefetchQueries,
+                  },
                   // TODO localVariables is not guaranteed to have an id field
                   root: localVariables.id,
                   variables: localVariables,
-                  nestedRefetchQueries: field.entrypoint.nestedRefetchQueries,
                   networkRequest,
                 };
                 return [fragmentReference, disposeNetworkRequest];

package/src/loadable-hooks/useSuspensefulSkipLimitPagination.ts

@@ -91,7 +91,7 @@ export function useSuspensefulSkipLimitPagination<
       fragmentReference,
       networkRequestOptions,
     );
-    return fragmentReference.readerArtifact.resolver(
+    return fragmentReference.readerWithRefetchQueries.readerArtifact.resolver(
       data.item,
       undefined,
     ) as ReadonlyArray<any>;

package/src/react/useImperativeReference.ts

@@ -35,10 +35,14 @@ export function useImperativeReference<
       setState([
         {
           kind: 'FragmentReference',
-          readerArtifact: entrypoint.readerArtifact,
+          readerWithRefetchQueries: {
+            kind: 'ReaderWithRefetchQueries',
+            readerArtifact: entrypoint.readerWithRefetchQueries.readerArtifact,
+            nestedRefetchQueries:
+              entrypoint.readerWithRefetchQueries.nestedRefetchQueries,
+          },
           root: ROOT_ID,
           variables,
-          nestedRefetchQueries: entrypoint.nestedRefetchQueries,
           networkRequest,
         },
         () => {

package/src/react/useResult.ts

@@ -22,12 +22,12 @@ export function useResult<TReadFromStore extends Object, TClientFieldValue>(
     networkRequestOptions,
   );
 
-  switch (fragmentReference.readerArtifact.kind) {
+  switch (fragmentReference.readerWithRefetchQueries.readerArtifact.kind) {
     case 'ComponentReaderArtifact': {
       // @ts-expect-error
       return getOrCreateCachedComponent(
         environment,
-        fragmentReference.readerArtifact.componentName,
+        fragmentReference.readerWithRefetchQueries.readerArtifact.componentName,
         fragmentReference,
         networkRequestOptions,
       );
@@ -37,7 +37,9 @@ export function useResult<TReadFromStore extends Object, TClientFieldValue>(
         fragmentReference,
         networkRequestOptions,
       );
-      return fragmentReference.readerArtifact.resolver(data);
+      return fragmentReference.readerWithRefetchQueries.readerArtifact.resolver(
+        data,
+      );
     }
   }
 }

package/src/tests/__isograph/Query/meName/entrypoint.ts

@@ -37,8 +37,11 @@ const artifact: IsographEntrypoint<
   kind: "Entrypoint",
   queryText,
   normalizationAst,
-  nestedRefetchQueries,
-  readerArtifact: readerResolver,
-};
+  readerWithRefetchQueries: {
+    kind: "ReaderWithRefetchQueries",
+    nestedRefetchQueries,
+    readerArtifact: readerResolver,
+  }
+            };
 
 export default artifact;

package/src/tests/__isograph/Query/meNameSuccessor/entrypoint.ts

@@ -73,8 +73,11 @@ const artifact: IsographEntrypoint<
   kind: "Entrypoint",
   queryText,
   normalizationAst,
-  nestedRefetchQueries,
-  readerArtifact: readerResolver,
-};
+  readerWithRefetchQueries: {
+    kind: "ReaderWithRefetchQueries",
+    nestedRefetchQueries,
+    readerArtifact: readerResolver,
+  }
+            };
 
 export default artifact;

package/src/tests/__isograph/Query/nodeField/entrypoint.ts

@@ -36,8 +36,11 @@ const artifact: IsographEntrypoint<
   kind: "Entrypoint",
   queryText,
   normalizationAst,
-  nestedRefetchQueries,
-  readerArtifact: readerResolver,
-};
+  readerWithRefetchQueries: {
+    kind: "ReaderWithRefetchQueries",
+    nestedRefetchQueries,
+    readerArtifact: readerResolver,
+  }
+            };
 
 export default artifact;