@isograph/react 0.0.0-main-d4700c2e → 0.0.0-main-0365bd75

package/src/core/IsographEnvironment.ts

@@ -5,6 +5,7 @@ import type {
   IsographEntrypoint,
   IsographOperation,
   IsographPersistedOperation,
+  RawReaderWithRefetchQueries,
   ReaderWithRefetchQueries,
   ReaderWithRefetchQueriesLoader,
 } from './entrypoint';
@@ -250,7 +251,7 @@ export function getOrLoadIsographArtifact(
 export function getOrLoadReaderWithRefetchQueries(
   _environment: IsographEnvironment,
   readerWithRefetchQueries:
-    | ReaderWithRefetchQueries<any, any>
+    | RawReaderWithRefetchQueries<any, any>
     | ReaderWithRefetchQueriesLoader<any, any>,
 ): {
   readerWithRefetchQueries: PromiseWrapper<ReaderWithRefetchQueries<any, any>>;
@@ -259,16 +260,28 @@ export function getOrLoadReaderWithRefetchQueries(
 } {
   switch (readerWithRefetchQueries.kind) {
     case 'ReaderWithRefetchQueries':
+      const readerArtifact = readerWithRefetchQueries.readerArtifact();
       return {
-        readerWithRefetchQueries: wrapResolvedValue(readerWithRefetchQueries),
-        fieldName: readerWithRefetchQueries.readerArtifact.fieldName,
-        readerArtifactKind: readerWithRefetchQueries.readerArtifact.kind,
+        readerWithRefetchQueries: wrapResolvedValue({
+          kind: 'ReaderWithRefetchQueries',
+          nestedRefetchQueries: readerWithRefetchQueries.nestedRefetchQueries,
+          readerArtifact: readerArtifact,
+        }),
+        fieldName: readerArtifact.fieldName,
+        readerArtifactKind: readerArtifact.kind,
       };
     case 'ReaderWithRefetchQueriesLoader':
       return {
         // TODO: cache promise wrapper
         readerWithRefetchQueries: wrapPromise(
-          readerWithRefetchQueries.loader(),
+          readerWithRefetchQueries
+            .loader()
+            .then((readerWithRefetchQueries) => ({
+              kind: 'ReaderWithRefetchQueries',
+              nestedRefetchQueries:
+                readerWithRefetchQueries.nestedRefetchQueries,
+              readerArtifact: readerWithRefetchQueries.readerArtifact(),
+            })),
         ),
         fieldName: readerWithRefetchQueries.fieldName,
         readerArtifactKind: readerWithRefetchQueries.readerArtifactKind,

package/src/core/cache.ts

@@ -590,17 +590,9 @@ function getDataIdOfNetworkResponse(
   variables: Variables,
   index: number | null,
 ): DataId {
-  const __typename =
-    astNode.concreteType ?? dataToNormalize[TYPENAME_FIELD_NAME];
-  if (__typename == null) {
-    throw new Error(
-      'Unexpected missing __typename in network response when normalizing a linked field. ' +
-        'This is indicative of a bug in Isograph.',
-    );
-  }
   // If we are dealing with nested Query, use __ROOT as id
   // TODO do not hard code this value here
-  if (__typename === 'Query') {
+  if (astNode.concreteType === 'Query') {
     return ROOT_ID;
   }
 

package/src/core/entrypoint.ts

@@ -22,6 +22,20 @@ export type ReaderWithRefetchQueries<
   readonly nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[];
 };
 
+export type RawReaderWithRefetchQueries<
+  TReadFromStore extends UnknownTReadFromStore,
+  TClientFieldValue,
+> = {
+  readonly kind: 'ReaderWithRefetchQueries';
+  readonly readerArtifact: () => TopLevelReaderArtifact<
+    TReadFromStore,
+    TClientFieldValue,
+    // TODO don't type this as any
+    any
+  >;
+  readonly nestedRefetchQueries: RefetchQueryNormalizationArtifactWrapper[];
+};
+
 export type ReaderWithRefetchQueriesLoader<
   TReadFromStore extends UnknownTReadFromStore,
   TClientFieldValue,
@@ -32,7 +46,7 @@ export type ReaderWithRefetchQueriesLoader<
     | 'EagerReaderArtifact'
     | 'ComponentReaderArtifact';
   readonly loader: () => Promise<
-    ReaderWithRefetchQueries<TReadFromStore, TClientFieldValue>
+    RawReaderWithRefetchQueries<TReadFromStore, TClientFieldValue>
   >;
 };
 
@@ -69,7 +83,7 @@ export type IsographEntrypoint<
   readonly kind: 'Entrypoint';
   readonly networkRequestInfo: NetworkRequestInfo<TNormalizationAst>;
   readonly readerWithRefetchQueries:
-    | ReaderWithRefetchQueries<TReadFromStore, TClientFieldValue>
+    | RawReaderWithRefetchQueries<TReadFromStore, TClientFieldValue>
     | ReaderWithRefetchQueriesLoader<TReadFromStore, TClientFieldValue>;
   readonly concreteType: TypeName;
   /**

package/src/core/makeNetworkRequest.ts

@@ -395,20 +395,18 @@ function readDataForOnComplete<
       suspendIfInFlight: false,
       throwOnNetworkError: false,
     };
-    const resolvedReaderWithRefetchQueries =
-      readerWithRefetchQueries as ReaderWithRefetchQueries<
-        TReadFromStore,
-        TClientFieldValue
-      >;
+    if (readerWithRefetchQueries == null) {
+      throw new Error(
+        'Expected readerWithRefetchQueries to be not null. This is indicative of a bug in Isograph.',
+      );
+    }
 
     const fragment: FragmentReference<TReadFromStore, TClientFieldValue> = {
       kind: 'FragmentReference',
       // TODO this smells.
-      readerWithRefetchQueries: wrapResolvedValue(
-        resolvedReaderWithRefetchQueries,
-      ),
-      fieldName: resolvedReaderWithRefetchQueries.readerArtifact.fieldName,
-      readerArtifactKind: resolvedReaderWithRefetchQueries.readerArtifact.kind,
+      readerWithRefetchQueries: wrapResolvedValue(readerWithRefetchQueries),
+      fieldName: readerWithRefetchQueries.readerArtifact.fieldName,
+      readerArtifactKind: readerWithRefetchQueries.readerArtifact.kind,
       root,
       variables,
       networkRequest: fakeNetworkRequest,
@@ -418,7 +416,7 @@ function readDataForOnComplete<
       fragment,
       fakeNetworkRequestOptions,
     ).item;
-    const readerArtifact = resolvedReaderWithRefetchQueries.readerArtifact;
+    const readerArtifact = readerWithRefetchQueries.readerArtifact;
     switch (readerArtifact.kind) {
       case 'ComponentReaderArtifact': {
         // @ts-expect-error We should find a way to encode this in the type system:
@@ -432,7 +430,7 @@ function readDataForOnComplete<
               kind: 'ReaderWithRefetchQueries',
               readerArtifact: readerArtifact,
               nestedRefetchQueries:
-                resolvedReaderWithRefetchQueries.nestedRefetchQueries,
+                readerWithRefetchQueries.nestedRefetchQueries,
             }),
             fieldName: readerArtifact.fieldName,
             readerArtifactKind: readerArtifact.kind,

package/src/core/read.ts

@@ -550,25 +550,25 @@ export function readResolverFieldData(
 
   const readerWithRefetchQueries = {
     kind: 'ReaderWithRefetchQueries',
-    readerArtifact: field.readerArtifact,
+    readerArtifact: field.readerArtifact(),
     nestedRefetchQueries: resolverRefetchQueries,
   } satisfies ReaderWithRefetchQueries<any, any>;
 
   const fragment = {
     kind: 'FragmentReference',
     readerWithRefetchQueries: wrapResolvedValue(readerWithRefetchQueries),
-    fieldName: field.readerArtifact.fieldName,
-    readerArtifactKind: field.readerArtifact.kind,
+    fieldName: readerWithRefetchQueries.readerArtifact.fieldName,
+    readerArtifactKind: readerWithRefetchQueries.readerArtifact.kind,
     root,
     variables: generateChildVariableMap(variables, field.arguments),
     networkRequest,
   } satisfies FragmentReference<any, any>;
 
-  switch (field.readerArtifact.kind) {
+  switch (readerWithRefetchQueries.readerArtifact.kind) {
     case 'EagerReaderArtifact': {
       const data = readData(
         environment,
-        field.readerArtifact.readerAst,
+        readerWithRefetchQueries.readerArtifact.readerAst,
         root,
         generateChildVariableMap(variables, field.arguments),
         resolverRefetchQueries,
@@ -587,7 +587,7 @@ export function readResolverFieldData(
       const firstParameter = {
         data: data.data,
         parameters: variables,
-        startUpdate: field.readerArtifact.hasUpdatable
+        startUpdate: readerWithRefetchQueries.readerArtifact.hasUpdatable
           ? getOrCreateCachedStartUpdate(
               environment,
               fragment,
@@ -597,7 +597,7 @@ export function readResolverFieldData(
       };
       return {
         kind: 'Success',
-        data: field.readerArtifact.resolver(firstParameter),
+        data: readerWithRefetchQueries.readerArtifact.resolver(firstParameter),
       };
     }
     case 'ComponentReaderArtifact': {
@@ -651,7 +651,8 @@ export function readLinkedFieldData(
   let value = storeRecord[storeRecordName];
 
   if (field.condition != null) {
-    const data = readData(field.condition.readerAst, root);
+    const condition = field.condition();
+    const data = readData(condition.readerAst, root);
     if (data.kind === 'MissingData') {
       return {
         kind: 'MissingData',
@@ -664,7 +665,7 @@ export function readLinkedFieldData(
 
     const readerWithRefetchQueries = {
       kind: 'ReaderWithRefetchQueries',
-      readerArtifact: field.condition,
+      readerArtifact: condition,
       // TODO this is wrong
       // should map field.condition.usedRefetchQueries
       // but it doesn't exist
@@ -675,8 +676,8 @@ export function readLinkedFieldData(
       kind: 'FragmentReference',
       readerWithRefetchQueries: wrapResolvedValue(readerWithRefetchQueries),
       root,
-      fieldName: field.condition.fieldName,
-      readerArtifactKind: field.condition.kind,
+      fieldName: condition.fieldName,
+      readerArtifactKind: condition.kind,
       variables: generateChildVariableMap(
         variables,
         // TODO this is wrong
@@ -687,10 +688,10 @@ export function readLinkedFieldData(
       networkRequest,
     } satisfies FragmentReference<any, any>;
 
-    const condition = field.condition.resolver({
+    const link = condition.resolver({
       data: data.data,
       parameters: {},
-      ...(field.condition.hasUpdatable
+      ...(condition.hasUpdatable
         ? {
             startUpdate: getOrCreateCachedStartUpdate(
               environment,
@@ -700,7 +701,7 @@ export function readLinkedFieldData(
           }
         : undefined),
     });
-    value = condition;
+    value = link;
   }
 
   if (Array.isArray(value)) {

package/src/core/reader.ts

@@ -105,10 +105,12 @@ export type ReaderLinkedField = {
   readonly alias: string | null;
   readonly selections: ReaderAst<unknown>;
   readonly arguments: Arguments | null;
-  readonly condition: EagerReaderArtifact<
-    { data: any; parameters: any; startUpdate?: StartUpdate<any> },
-    StoreLink | null | (StoreLink | null)[] | StoreLink[]
-  > | null;
+  readonly condition:
+    | (() => EagerReaderArtifact<
+        { data: any; parameters: any; startUpdate?: StartUpdate<any> },
+        StoreLink | null | (StoreLink | null)[] | StoreLink[]
+      >)
+    | null;
   readonly isUpdatable: boolean;
   /**
    * If refetchQueryIndex != null, then the linked field is a client pointer.
@@ -124,7 +126,7 @@ export type ReaderNonLoadableResolverField = {
   readonly kind: 'Resolver';
   readonly alias: string;
   // TODO don't type this as any
-  readonly readerArtifact: TopLevelReaderArtifact<any, any, any>;
+  readonly readerArtifact: () => TopLevelReaderArtifact<any, any, any>;
   readonly arguments: Arguments | null;
   readonly usedRefetchQueries: number[];
 };

package/src/tests/__isograph/Node/asEconomist/resolver_reader.ts

@@ -14,15 +14,15 @@ const readerAst: ReaderAst<{ data: any, parameters: Record<PropertyKey, never> }
   },
 ];
 
-const artifact: EagerReaderArtifact<
+const artifact = (): EagerReaderArtifact<
   { data: any, parameters: Record<PropertyKey, never> },
   Link<"Economist"> | null
-> = {
+> => ({
   kind: "EagerReaderArtifact",
   fieldName: "asEconomist",
   resolver: ({ data }) => data.__typename === "Economist" ? data.__link : null,
   readerAst,
   hasUpdatable: false,
-};
+});
 
 export default artifact;

package/src/tests/__isograph/Query/linkedUpdate/resolver_reader.ts

@@ -79,15 +79,15 @@ const readerAst: ReaderAst<Query__linkedUpdate__param> = [
   },
 ];
 
-const artifact: EagerReaderArtifact<
+const artifact = (): EagerReaderArtifact<
   Query__linkedUpdate__param,
   Query__linkedUpdate__output_type
-> = {
+> => ({
   kind: "EagerReaderArtifact",
   fieldName: "linkedUpdate",
   resolver,
   readerAst,
   hasUpdatable: true,
-};
+});
 
 export default artifact;

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

@@ -24,15 +24,15 @@ const readerAst: ReaderAst<Query__meName__param> = [
   },
 ];
 
-const artifact: EagerReaderArtifact<
+const artifact = (): EagerReaderArtifact<
   Query__meName__param,
   Query__meName__output_type
-> = {
+> => ({
   kind: "EagerReaderArtifact",
   fieldName: "meName",
   resolver,
   readerAst,
   hasUpdatable: false,
-};
+});
 
 export default artifact;

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

@@ -53,15 +53,15 @@ const readerAst: ReaderAst<Query__meNameSuccessor__param> = [
   },
 ];
 
-const artifact: EagerReaderArtifact<
+const artifact = (): EagerReaderArtifact<
   Query__meNameSuccessor__param,
   Query__meNameSuccessor__output_type
-> = {
+> => ({
   kind: "EagerReaderArtifact",
   fieldName: "meNameSuccessor",
   resolver,
   readerAst,
   hasUpdatable: false,
-};
+});
 
 export default artifact;

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

@@ -29,15 +29,15 @@ const readerAst: ReaderAst<Query__nodeField__param> = [
   },
 ];
 
-const artifact: EagerReaderArtifact<
+const artifact = (): EagerReaderArtifact<
   Query__nodeField__param,
   Query__nodeField__output_type
-> = {
+> => ({
   kind: "EagerReaderArtifact",
   fieldName: "nodeField",
   resolver,
   readerAst,
   hasUpdatable: false,
-};
+});
 
 export default artifact;

package/src/tests/__isograph/Query/normalizeUndefinedField/resolver_reader.ts

@@ -24,15 +24,15 @@ const readerAst: ReaderAst<Query__normalizeUndefinedField__param> = [
   },
 ];
 
-const artifact: EagerReaderArtifact<
+const artifact = (): EagerReaderArtifact<
   Query__normalizeUndefinedField__param,
   Query__normalizeUndefinedField__output_type
-> = {
+> => ({
   kind: "EagerReaderArtifact",
   fieldName: "normalizeUndefinedField",
   resolver,
   readerAst,
   hasUpdatable: false,
-};
+});
 
 export default artifact;

package/src/tests/__isograph/Query/startUpdate/resolver_reader.ts

@@ -41,15 +41,15 @@ const readerAst: ReaderAst<Query__startUpdate__param> = [
   },
 ];
 
-const artifact: EagerReaderArtifact<
+const artifact = (): EagerReaderArtifact<
   Query__startUpdate__param,
   Query__startUpdate__output_type
-> = {
+> => ({
   kind: "EagerReaderArtifact",
   fieldName: "startUpdate",
   resolver,
   readerAst,
   hasUpdatable: true,
-};
+});
 
 export default artifact;

package/src/tests/__isograph/Query/subquery/resolver_reader.ts

@@ -40,15 +40,15 @@ const readerAst: ReaderAst<Query__subquery__param> = [
   },
 ];
 
-const artifact: EagerReaderArtifact<
+const artifact = (): EagerReaderArtifact<
   Query__subquery__param,
   Query__subquery__output_type
-> = {
+> => ({
   kind: "EagerReaderArtifact",
   fieldName: "subquery",
   resolver,
   readerAst,
   hasUpdatable: false,
-};
+});
 
 export default artifact;