@isograph/react 0.2.0 → 0.3.0

package/src/core/reader.ts

@@ -1,9 +1,13 @@
 import { Factory } from '@isograph/disposable-types';
-import { FragmentReference } from './FragmentReference';
+import {
+  FragmentReference,
+  ExtractParameters,
+  ExtractData,
+} from './FragmentReference';
 import {
   ComponentOrFieldName,
-  DataId,
   IsographEnvironment,
+  type Link,
 } from './IsographEnvironment';
 import {
   IsographEntrypoint,
@@ -12,37 +16,47 @@ import {
   RefetchQueryNormalizationArtifactWrapper,
 } from './entrypoint';
 import { Arguments } from './util';
+import { FetchOptions } from './check';
 
 export type TopLevelReaderArtifact<
-  TReadFromStore extends Object,
+  TReadFromStore extends { parameters: object; data: object },
   TClientFieldValue,
-  TComponentProps extends Record<string, never>,
+  TComponentProps extends Record<PropertyKey, never>,
 > =
   | EagerReaderArtifact<TReadFromStore, TClientFieldValue>
   | ComponentReaderArtifact<TReadFromStore, TComponentProps>;
 
 export type EagerReaderArtifact<
-  TReadFromStore extends Object,
+  TReadFromStore extends { parameters: object; data: object },
   TClientFieldValue,
 > = {
   readonly kind: 'EagerReaderArtifact';
   readonly readerAst: ReaderAst<TReadFromStore>;
-  readonly resolver: (data: TReadFromStore) => TClientFieldValue;
+  readonly resolver: (
+    data: ResolverFirstParameter<TReadFromStore>,
+  ) => TClientFieldValue;
 };
 
 export type ComponentReaderArtifact<
-  TReadFromStore extends Object,
-  TComponentProps extends Record<string, unknown> = Record<string, never>,
+  TReadFromStore extends { parameters: object; data: object },
+  TComponentProps extends Record<string, unknown> = Record<PropertyKey, never>,
 > = {
   readonly kind: 'ComponentReaderArtifact';
   readonly componentName: ComponentOrFieldName;
   readonly readerAst: ReaderAst<TReadFromStore>;
   readonly resolver: (
-    data: TReadFromStore,
+    data: ResolverFirstParameter<TReadFromStore>,
     runtimeProps: TComponentProps,
   ) => React.ReactNode;
 };
 
+export type ResolverFirstParameter<
+  TReadFromStore extends { data: object; parameters: object },
+> = {
+  data: ExtractData<TReadFromStore>;
+  parameters: ExtractParameters<TReadFromStore>;
+};
+
 export type RefetchReaderArtifact = {
   readonly kind: 'RefetchReaderArtifact';
   readonly readerAst: ReaderAst<unknown>;
@@ -53,7 +67,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[],
@@ -82,6 +96,10 @@ export type ReaderLinkedField = {
   readonly alias: string | null;
   readonly selections: ReaderAst<unknown>;
   readonly arguments: Arguments | null;
+  readonly condition: EagerReaderArtifact<
+    { data: object; parameters: object },
+    boolean | Link | null
+  > | null;
 };
 
 export type ReaderNonLoadableResolverField = {
@@ -128,6 +146,15 @@ type StableId = string;
 /// Passing TArgs to the LoadableField should be cheap and do no "actual" work,
 /// except to stringify the args or whatnot. Calling the factory can be
 /// expensive. For example, doing so will probably trigger a network request.
-export type LoadableField<TArgs, TResult> = (
-  args: TArgs,
-) => [StableId, Factory<FragmentReference<any, TResult>>];
+export type LoadableField<
+  TReadFromStore extends { data: object; parameters: object },
+  TResult,
+  TArgs = ExtractParameters<TReadFromStore>,
+> = (
+  args: TArgs | void,
+  // Note: fetchOptions is not nullable here because a LoadableField is not a
+  // user-facing API. Users should only interact with LoadableFields via APIs
+  // like useClientSideDefer. These APIs should have a nullable fetchOptions
+  // parameter, and provide a default value ({}) to the LoadableField.
+  fetchOptions: FetchOptions,
+) => [StableId, Factory<FragmentReference<TReadFromStore, TResult>>];

package/src/core/util.ts

@@ -1,5 +1,9 @@
 export type ExtractSecondParam<T extends (arg1: any, arg2: any) => any> =
   T extends (arg1: any, arg2: infer P) => any ? P : never;
+export type CombineWithIntrinsicAttributes<T> =
+  T extends Record<PropertyKey, never>
+    ? JSX.IntrinsicAttributes
+    : T & JSX.IntrinsicAttributes;
 
 export type Arguments = Argument[];
 export type Argument = [ArgumentName, ArgumentValue];

package/src/index.ts

@@ -24,7 +24,6 @@ export {
   type StoreRecord,
   createIsographEnvironment,
   createIsographStore,
-  defaultMissingFieldHandler,
 } from './core/IsographEnvironment';
 export {
   type EagerReaderArtifact,
@@ -37,6 +36,7 @@ export {
   type ReaderScalarField,
   type TopLevelReaderArtifact,
   type LoadableField,
+  type ResolverFirstParameter,
 } from './core/reader';
 export {
   type NormalizationAst,
@@ -50,10 +50,12 @@ export {
   type ExtractProps,
   type ExtractReadFromStore,
   type ExtractResolverResult,
+  type NetworkRequestInfo,
 } from './core/entrypoint';
 export { readButDoNotEvaluate } from './core/read';
 export {
   type ExtractSecondParam,
+  type CombineWithIntrinsicAttributes,
   type Argument,
   type ArgumentName,
   type ArgumentValue,
@@ -62,8 +64,17 @@ export {
 export {
   type FragmentReference,
   type Variables,
+  type ExtractParameters,
+  type ExtractData,
   stableIdForFragmentReference,
 } from './core/FragmentReference';
+export {
+  type LogMessage,
+  type LogFunction,
+  logMessage,
+  registerLogger,
+} from './core/logging';
+export { check, CheckResult, FetchOptions, ShouldFetch } from './core/check';
 
 export {
   IsographEnvironmentProvider,
@@ -79,8 +90,10 @@ export {
 } from './react/useReadAndSubscribe';
 export { useLazyReference } from './react/useLazyReference';
 export { useRerenderOnChange } from './react/useRerenderOnChange';
+export { RenderAfterCommit__DO_NOT_USE } from './react/RenderAfterCommit__DO_NOT_USE';
 
 export { useClientSideDefer } from './loadable-hooks/useClientSideDefer';
 export { useImperativeExposedMutationField } from './loadable-hooks/useImperativeExposedMutationField';
 export { useSkipLimitPagination } from './loadable-hooks/useSkipLimitPagination';
+export { useConnectionSpecPagination } from './loadable-hooks/useConnectionSpecPagination';
 export { useImperativeLoadableField } from './loadable-hooks/useImperativeLoadableField';

package/src/loadable-hooks/useClientSideDefer.ts

@@ -1,28 +1,58 @@
-import { FragmentReference } from '../core/FragmentReference';
+import {
+  ExtractParameters,
+  FragmentReference,
+} from '../core/FragmentReference';
 import { useIsographEnvironment } from '../react/IsographEnvironmentProvider';
 import { getOrCreateItemInSuspenseCache } from '../core/cache';
 import { useLazyDisposableState } from '@isograph/react-disposable-state';
 import { LoadableField } from '../core/reader';
+import { FetchOptions } from '../core/check';
 
-export function useClientSideDefer<TResult>(
-  loadableField: LoadableField<void, TResult>,
-): FragmentReference<Record<string, never>, TResult>;
+export function useClientSideDefer<
+  TReadFromStore extends { data: object; parameters: object },
+  TResult,
+>(
+  loadableField: LoadableField<
+    TReadFromStore,
+    TResult,
+    ExtractParameters<TReadFromStore>
+  >,
+  args?: Record<PropertyKey, never>,
+  fetchOptions?: FetchOptions,
+): { fragmentReference: FragmentReference<TReadFromStore, TResult> };
 
-export function useClientSideDefer<TArgs extends Object, TResult>(
-  loadableField: LoadableField<TArgs, TResult>,
-  args: TArgs,
-): FragmentReference<TArgs, TResult>;
+export function useClientSideDefer<
+  TReadFromStore extends { data: object; parameters: object },
+  TResult,
+  TProvidedArgs extends object,
+>(
+  loadableField: LoadableField<
+    TReadFromStore,
+    TResult,
+    Omit<ExtractParameters<TReadFromStore>, keyof TProvidedArgs>
+  >,
+  args: Omit<ExtractParameters<TReadFromStore>, keyof TProvidedArgs>,
+  fetchOptions?: FetchOptions,
+): { fragmentReference: FragmentReference<TReadFromStore, TResult> };
 
-export function useClientSideDefer<TArgs extends Object, TResult>(
-  loadableField: LoadableField<TArgs, TResult>,
-  args?: TArgs,
-): FragmentReference<TArgs, TResult> {
-  // @ts-expect-error args is missing iff it has the type void
-  const [id, loader] = loadableField(args);
+export function useClientSideDefer<
+  TReadFromStore extends { data: object; parameters: object },
+  TResult,
+  TProvidedArgs extends object,
+>(
+  loadableField: LoadableField<
+    TReadFromStore,
+    TResult,
+    Omit<ExtractParameters<TReadFromStore>, keyof TProvidedArgs>
+  >,
+  args?: Omit<ExtractParameters<TReadFromStore>, keyof TProvidedArgs>,
+  fetchOptions?: FetchOptions,
+): { fragmentReference: FragmentReference<TReadFromStore, TResult> } {
+  const [id, loader] = loadableField(args, fetchOptions ?? {});
   const environment = useIsographEnvironment();
   const cache = getOrCreateItemInSuspenseCache(environment, id, loader);
 
   const fragmentReference = useLazyDisposableState(cache).state;
 
-  return fragmentReference;
+  return { fragmentReference };
 }

package/src/loadable-hooks/useConnectionSpecPagination.ts

@@ -0,0 +1,331 @@
+import { ItemCleanupPair } from '@isograph/disposable-types';
+import {
+  UNASSIGNED_STATE,
+  useUpdatableDisposableState,
+} from '@isograph/react-disposable-state';
+import {
+  createReferenceCountedPointer,
+  ReferenceCountedPointer,
+} from '@isograph/reference-counted-pointer';
+import { useState } from 'react';
+import { subscribeToAnyChange } from '../core/cache';
+import { FragmentReference } from '../core/FragmentReference';
+import { getPromiseState, readPromise } from '../core/PromiseWrapper';
+import {
+  readButDoNotEvaluate,
+  type WithEncounteredRecords,
+} from '../core/read';
+import { LoadableField, type ReaderAst } from '../core/reader';
+import { useIsographEnvironment } from '../react/IsographEnvironmentProvider';
+import { useSubscribeToMultiple } from '../react/useReadAndSubscribe';
+import { maybeUnwrapNetworkRequest } from '../react/useResult';
+import { FetchOptions } from '../core/check';
+
+type UsePaginationReturnValue<
+  TReadFromStore extends { parameters: object; data: object },
+  TItem,
+> =
+  | {
+      kind: 'Pending';
+      pendingFragment: FragmentReference<TReadFromStore, Connection<TItem>>;
+      results: ReadonlyArray<TItem>;
+    }
+  | {
+      kind: 'Complete';
+      fetchMore: (count: number, fetchOptions?: FetchOptions) => void;
+      results: ReadonlyArray<TItem>;
+      hasNextPage: boolean;
+    };
+
+type LoadedFragmentReferences<
+  TReadFromStore extends { parameters: object; data: object },
+  TItem,
+> = ReadonlyArray<LoadedFragmentReference<TReadFromStore, TItem>>;
+
+type LoadedFragmentReference<
+  TReadFromStore extends { parameters: object; data: object },
+  TItem,
+> = ItemCleanupPair<
+  ReferenceCountedPointer<FragmentReference<TReadFromStore, TItem>>
+>;
+
+function flatten<T>(arr: ReadonlyArray<ReadonlyArray<T>>): ReadonlyArray<T> {
+  let outArray: Array<T> = [];
+  for (const subarr of arr) {
+    for (const item of subarr) {
+      outArray.push(item);
+    }
+  }
+  return outArray;
+}
+
+type PageInfo = {
+  readonly hasNextPage: boolean;
+  readonly endCursor: string | null;
+};
+
+type Connection<T> = {
+  readonly edges: ReadonlyArray<T> | null;
+  readonly pageInfo: PageInfo;
+};
+
+type NonNullConnection<T> = {
+  readonly edges: ReadonlyArray<T>;
+  readonly pageInfo: PageInfo;
+};
+
+type UseConnectionSpecPaginationArgs = {
+  first: number;
+  after: string | null;
+};
+
+export function useConnectionSpecPagination<
+  TReadFromStore extends {
+    parameters: object;
+    data: object;
+  },
+  TItem,
+>(
+  loadableField: LoadableField<
+    TReadFromStore,
+    Connection<TItem>,
+    UseConnectionSpecPaginationArgs
+  >,
+  initialState?: PageInfo,
+): UsePaginationReturnValue<TReadFromStore, TItem> {
+  const networkRequestOptions = {
+    suspendIfInFlight: true,
+    throwOnNetworkError: true,
+  };
+  const { state, setState } =
+    useUpdatableDisposableState<
+      LoadedFragmentReferences<TReadFromStore, Connection<TItem>>
+    >();
+
+  const environment = useIsographEnvironment();
+
+  // TODO move this out of useSkipLimitPagination, and pass environment and networkRequestOptions
+  // as parameters (or recreate networkRequestOptions)
+  function readCompletedFragmentReferences(
+    completedReferences: FragmentReference<TReadFromStore, Connection<TItem>>[],
+  ): NonNullConnection<TItem> {
+    const results = completedReferences.map((fragmentReference, i) => {
+      const readerWithRefetchQueries = readPromise(
+        fragmentReference.readerWithRefetchQueries,
+      );
+
+      // invariant: readOutDataAndRecords.length === completedReferences.length
+      const data = readOutDataAndRecords[i]?.item;
+      if (data == null) {
+        throw new Error(
+          'Parameter data is unexpectedly null. This is indicative of a bug in Isograph.',
+        );
+      }
+
+      const firstParameter = {
+        data,
+        parameters: fragmentReference.variables,
+      };
+
+      if (
+        readerWithRefetchQueries.readerArtifact.kind !== 'EagerReaderArtifact'
+      ) {
+        throw new Error(
+          `@loadable field of kind "${readerWithRefetchQueries.readerArtifact.kind}" is not supported by useSkipLimitPagination`,
+        );
+      }
+
+      return readerWithRefetchQueries.readerArtifact.resolver(firstParameter);
+    });
+
+    const items = flatten(results.map((result) => result.edges ?? []));
+
+    return {
+      edges: items,
+      pageInfo: results[results.length - 1]?.pageInfo ?? {
+        endCursor: null,
+        hasNextPage: true,
+      },
+    };
+  }
+
+  function subscribeCompletedFragmentReferences(
+    completedReferences: FragmentReference<TReadFromStore, Connection<TItem>>[],
+  ) {
+    return completedReferences.map(
+      (
+        fragmentReference,
+        i,
+      ): {
+        records: WithEncounteredRecords<TReadFromStore>;
+        callback: (
+          updatedRecords: WithEncounteredRecords<TReadFromStore>,
+        ) => void;
+        fragmentReference: FragmentReference<TReadFromStore, Connection<TItem>>;
+        readerAst: ReaderAst<Connection<TItem>>;
+      } => {
+        maybeUnwrapNetworkRequest(
+          fragmentReference.networkRequest,
+          networkRequestOptions,
+        );
+
+        const readerWithRefetchQueries = readPromise(
+          fragmentReference.readerWithRefetchQueries,
+        );
+
+        const records = readOutDataAndRecords[i];
+        if (records == null) {
+          throw new Error(
+            'subscribeCompletedFragmentReferences records is unexpectedly null',
+          );
+        }
+
+        return {
+          fragmentReference,
+          readerAst: readerWithRefetchQueries.readerArtifact.readerAst,
+          records,
+          callback(_data) {
+            rerender({});
+          },
+        };
+      },
+    );
+  }
+
+  const getFetchMore =
+    (after: string | null) =>
+    (count: number, fetchOptions?: FetchOptions): void => {
+      const loadedField = loadableField(
+        {
+          after: after,
+          first: count,
+        },
+        fetchOptions ?? {},
+      )[1]();
+      const newPointer = createReferenceCountedPointer(loadedField);
+      const clonedPointers = loadedReferences.map(([refCountedPointer]) => {
+        const clonedRefCountedPointer = refCountedPointer.cloneIfNotDisposed();
+        if (clonedRefCountedPointer == null) {
+          throw new Error(
+            'This reference counted pointer has already been disposed. \
+            This is indicative of a bug in useSkipLimitPagination.',
+          );
+        }
+        return clonedRefCountedPointer;
+      });
+      clonedPointers.push(newPointer);
+
+      const totalItemCleanupPair: ItemCleanupPair<
+        ReadonlyArray<
+          ItemCleanupPair<
+            ReferenceCountedPointer<
+              FragmentReference<TReadFromStore, Connection<TItem>>
+            >
+          >
+        >
+      > = [
+        clonedPointers,
+        () => {
+          clonedPointers.forEach(([, dispose]) => {
+            dispose();
+          });
+        },
+      ];
+
+      setState(totalItemCleanupPair);
+    };
+
+  const [, rerender] = useState({});
+
+  const loadedReferences = state === UNASSIGNED_STATE ? [] : state;
+
+  const mostRecentItem:
+    | LoadedFragmentReference<TReadFromStore, Connection<TItem>>
+    | undefined = loadedReferences[loadedReferences.length - 1];
+  const mostRecentFragmentReference =
+    mostRecentItem?.[0].getItemIfNotDisposed();
+
+  if (mostRecentItem && mostRecentFragmentReference === null) {
+    throw new Error(
+      'FragmentReference is unexpectedly disposed. \
+      This is indicative of a bug in Isograph.',
+    );
+  }
+
+  const networkRequestStatus =
+    mostRecentFragmentReference &&
+    getPromiseState(mostRecentFragmentReference.networkRequest);
+
+  const slicedFragmentReferences =
+    networkRequestStatus?.kind === 'Ok'
+      ? loadedReferences
+      : loadedReferences.slice(0, loadedReferences.length - 1);
+
+  const completedFragmentReferences = slicedFragmentReferences.map(
+    ([pointer]) => {
+      const fragmentReference = pointer.getItemIfNotDisposed();
+      if (fragmentReference == null) {
+        throw new Error(
+          'FragmentReference is unexpectedly disposed. \
+            This is indicative of a bug in Isograph.',
+        );
+      }
+      return fragmentReference;
+    },
+  );
+
+  const readOutDataAndRecords = completedFragmentReferences.map(
+    (fragmentReference) =>
+      readButDoNotEvaluate(
+        environment,
+        fragmentReference,
+        networkRequestOptions,
+      ),
+  );
+
+  useSubscribeToMultiple<TReadFromStore>(
+    subscribeCompletedFragmentReferences(completedFragmentReferences),
+  );
+
+  if (!networkRequestStatus) {
+    return {
+      kind: 'Complete',
+      fetchMore: getFetchMore(initialState?.endCursor ?? null),
+      results: [],
+      hasNextPage: initialState?.hasNextPage ?? true,
+    };
+  }
+
+  switch (networkRequestStatus.kind) {
+    case 'Pending': {
+      const unsubscribe = subscribeToAnyChange(environment, () => {
+        unsubscribe();
+        rerender({});
+      });
+
+      const results = readCompletedFragmentReferences(
+        completedFragmentReferences,
+      );
+      return {
+        results: results.edges,
+        kind: 'Pending',
+        pendingFragment: mostRecentFragmentReference,
+      };
+    }
+    case 'Err': {
+      throw networkRequestStatus.error;
+    }
+    case 'Ok': {
+      const results = readCompletedFragmentReferences(
+        completedFragmentReferences,
+      );
+
+      return {
+        results: results.edges,
+        hasNextPage: results.pageInfo.hasNextPage,
+        kind: 'Complete',
+        fetchMore: getFetchMore(results.pageInfo.endCursor),
+      };
+    }
+  }
+}

package/src/loadable-hooks/useImperativeLoadableField.ts

@@ -1,24 +1,50 @@
-import { FragmentReference } from '../core/FragmentReference';
+import {
+  ExtractParameters,
+  FragmentReference,
+} from '../core/FragmentReference';
 import {
   UnassignedState,
   useUpdatableDisposableState,
 } from '@isograph/react-disposable-state';
 import { LoadableField } from '../core/reader';
+import { FetchOptions } from '../core/check';
 
-type UseImperativeLoadableFieldReturn<TArgs, TResult> = {
-  fragmentReference: FragmentReference<any, TResult> | UnassignedState;
-  loadField: (args: TArgs) => void;
+type UseImperativeLoadableFieldReturn<
+  TReadFromStore extends { data: object; parameters: object },
+  TResult,
+  TProvidedArgs extends object,
+> = {
+  fragmentReference:
+    | FragmentReference<TReadFromStore, TResult>
+    | UnassignedState;
+  loadField: (
+    // TODO this should be void iff all args are provided by the query, like in
+    // useClientSideDefer.
+    args: Omit<ExtractParameters<TReadFromStore>, keyof TProvidedArgs> | void,
+    fetchOptions?: FetchOptions,
+  ) => void;
 };
 
-export function useImperativeLoadableField<TArgs, TResult>(
-  loadableField: LoadableField<TArgs, TResult>,
-): UseImperativeLoadableFieldReturn<TArgs, TResult> {
+export function useImperativeLoadableField<
+  TReadFromStore extends { data: object; parameters: object },
+  TResult,
+  TProvidedArgs extends object,
+>(
+  loadableField: LoadableField<
+    TReadFromStore,
+    TResult,
+    Omit<ExtractParameters<TReadFromStore>, keyof TProvidedArgs>
+  >,
+): UseImperativeLoadableFieldReturn<TReadFromStore, TResult, TProvidedArgs> {
   const { state, setState } =
-    useUpdatableDisposableState<FragmentReference<any, TResult>>();
+    useUpdatableDisposableState<FragmentReference<TReadFromStore, TResult>>();
 
   return {
-    loadField: (args: TArgs) => {
-      const [_id, loader] = loadableField(args);
+    loadField: (
+      args: Omit<ExtractParameters<TReadFromStore>, keyof TProvidedArgs> | void,
+      fetchOptions?: FetchOptions,
+    ) => {
+      const [_id, loader] = loadableField(args, fetchOptions ?? {});
       setState(loader());
     },
     fragmentReference: state,