@isograph/react 0.0.0-main-e7fae892 → 0.0.0-main-000d7173

package/dist/EntrypointReader.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { ExtractReadFromStore, ExtractResolverProps, IsographEntrypoint, type FragmentReference } from './index';
-export declare function EntrypointReader<TEntrypoint extends IsographEntrypoint<any, any, React.FC<any>>>(props: {
-    queryReference: FragmentReference<ExtractReadFromStore<TEntrypoint>, ExtractResolverProps<TEntrypoint>, React.FC<any>>;
+import { ExtractReadFromStore, IsographEntrypoint, type FragmentReference } from './index';
+export declare function EntrypointReader<TEntrypoint extends IsographEntrypoint<any, React.FC<any>>>(props: {
+    queryReference: FragmentReference<ExtractReadFromStore<TEntrypoint>, React.FC<any>>;
     additionalProps?: any | void;
 }): ReturnType<React.FC<any>>;

package/dist/cache.d.ts

@@ -13,8 +13,8 @@ declare global {
  * results.
  */
 export declare function stableCopy<T>(value: T): T;
-type IsoResolver = IsographEntrypoint<any, any, any>;
-export declare function getOrCreateCacheForArtifact<T>(environment: IsographEnvironment, artifact: IsographEntrypoint<any, any, T>, variables: object): ParentCache<PromiseWrapper<T>>;
+type IsoResolver = IsographEntrypoint<any, any>;
+export declare function getOrCreateCacheForArtifact<T>(environment: IsographEnvironment, artifact: IsographEntrypoint<any, T>, variables: object): ParentCache<PromiseWrapper<T>>;
 export declare function makeNetworkRequest<T>(environment: IsographEnvironment, artifact: IsoResolver, variables: object): ItemCleanupPair<PromiseWrapper<T>>;
 export declare function subscribe(environment: IsographEnvironment, callback: () => void): () => void;
 export declare function onNextChange(environment: IsographEnvironment): Promise<void>;

package/dist/componentCache.d.ts

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

package/dist/index.d.ts

@@ -4,17 +4,17 @@ export { makeNetworkRequest, subscribe } from './cache';
 export { IsographEnvironmentContext, ROOT_ID, type DataId, type DataTypeValue, type IsographEnvironment, IsographEnvironmentProvider, type IsographEnvironmentProviderProps, type IsographNetworkFunction, type IsographStore, type Link, type StoreRecord, useIsographEnvironment, createIsographEnvironment, createIsographStore, } from './IsographEnvironment';
 export { useImperativeReference } from './useImperativeReference';
 export { EntrypointReader } from './EntrypointReader';
-export type IsographEntrypoint<TReadFromStore extends Object, TResolverProps, TResolverResult> = {
+export type IsographEntrypoint<TReadFromStore extends Object, TResolverResult> = {
     kind: 'Entrypoint';
     queryText: string;
     normalizationAst: NormalizationAst;
-    readerArtifact: ReaderArtifact<TReadFromStore, TResolverProps, TResolverResult>;
+    readerArtifact: ReaderArtifact<TReadFromStore, TResolverResult>;
     nestedRefetchQueries: RefetchQueryArtifactWrapper[];
 };
-export type ReaderArtifact<TReadFromStore extends Object, TResolverProps, TResolverResult> = {
+export type ReaderArtifact<TReadFromStore extends Object, TResolverResult> = {
     kind: 'ReaderArtifact';
     readerAst: ReaderAst<TReadFromStore>;
-    resolver: (data: TResolverProps, runtimeProps: any) => TResolverResult;
+    resolver: (data: TReadFromStore, runtimeProps: any) => TResolverResult;
     variant: ReaderResolverVariant;
 };
 export type ReaderAstNode = ReaderScalarField | ReaderLinkedField | ReaderResolverField | ReaderRefetchField | ReaderMutationField;
@@ -42,22 +42,21 @@ export type ReaderResolverVariant = {
 export type ReaderResolverField = {
     kind: 'Resolver';
     alias: string;
-    readerArtifact: ReaderArtifact<any, any, any>;
+    readerArtifact: ReaderArtifact<any, any>;
     arguments: Arguments | null;
     usedRefetchQueries: number[];
 };
 export type ReaderRefetchField = {
     kind: 'RefetchField';
     alias: string;
-    readerArtifact: ReaderArtifact<any, any, any>;
+    readerArtifact: ReaderArtifact<any, any>;
     refetchQuery: number;
 };
 export type ReaderMutationField = {
     kind: 'MutationField';
     alias: string;
-    readerArtifact: ReaderArtifact<any, any, any>;
+    readerArtifact: ReaderArtifact<any, any>;
     refetchQuery: number;
-    allowedVariables: string[];
 };
 export type NormalizationAstNode = NormalizationScalarField | NormalizationLinkedField;
 export type NormalizationAst = NormalizationAstNode[];
@@ -92,26 +91,25 @@ export type ArgumentValue = {
     value: any;
 };
 type Variable = any;
-export type FragmentReference<TReadFromStore extends Object, TResolverProps, TResolverResult> = {
+export type FragmentReference<TReadFromStore extends Object, TResolverResult> = {
     kind: 'FragmentReference';
-    readerArtifact: ReaderArtifact<TReadFromStore, TResolverProps, TResolverResult>;
+    readerArtifact: ReaderArtifact<TReadFromStore, TResolverResult>;
     root: DataId;
     variables: {
         [index: string]: Variable;
     } | null;
     nestedRefetchQueries: RefetchQueryArtifactWrapper[];
 };
-export type ExtractReadFromStore<Type> = Type extends IsographEntrypoint<infer X, any, any> ? X : never;
-export type ExtractResolverProps<Type> = Type extends IsographEntrypoint<any, infer X, any> ? X : never;
-export type ExtractResolverResult<Type> = Type extends IsographEntrypoint<any, any, infer X> ? X : never;
+export type ExtractReadFromStore<Type> = Type extends IsographEntrypoint<infer X, any> ? X : never;
+export type ExtractResolverResult<Type> = Type extends IsographEntrypoint<any, infer X> ? X : never;
 export declare function useLazyReference<TEntrypoint>(entrypoint: TEntrypoint | ((_: any) => any), variables: {
     [key: string]: Variable;
 }): {
-    queryReference: FragmentReference<ExtractReadFromStore<TEntrypoint>, ExtractResolverProps<TEntrypoint>, ExtractResolverResult<TEntrypoint>>;
+    queryReference: FragmentReference<ExtractReadFromStore<TEntrypoint>, ExtractResolverResult<TEntrypoint>>;
 };
-export declare function useResult<TReadFromStore extends Object, TResolverProps, TResolverResult>(fragmentReference: FragmentReference<TReadFromStore, TResolverProps, TResolverResult>): TResolverResult;
-export declare function read<TReadFromStore extends Object, TResolverProps, TResolverResult>(environment: IsographEnvironment, fragmentReference: FragmentReference<TReadFromStore, TResolverProps, TResolverResult>): TResolverResult;
-export declare function readButDoNotEvaluate<TReadFromStore extends Object>(environment: IsographEnvironment, reference: FragmentReference<TReadFromStore, unknown, unknown>): TReadFromStore;
+export declare function useResult<TReadFromStore extends Object, TResolverResult>(fragmentReference: FragmentReference<TReadFromStore, TResolverResult>): TResolverResult;
+export declare function read<TReadFromStore extends Object, TResolverResult>(environment: IsographEnvironment, fragmentReference: FragmentReference<TReadFromStore, TResolverResult>): TResolverResult;
+export declare function readButDoNotEvaluate<TReadFromStore extends Object>(environment: IsographEnvironment, reference: FragmentReference<TReadFromStore, unknown>): TReadFromStore;
 export declare function defaultMissingFieldHandler(_storeRecord: StoreRecord, _root: DataId, fieldName: string, arguments_: {
     [index: string]: any;
 } | null, variables: {

package/dist/useImperativeReference.d.ts

@@ -1,7 +1,7 @@
 import { UnassignedState } from '@isograph/react-disposable-state';
-import { type IsographEntrypoint, type FragmentReference, ExtractReadFromStore, ExtractResolverProps, ExtractResolverResult } from './index';
-export declare function useImperativeReference<TEntrypoint extends IsographEntrypoint<any, any, any>>(entrypoint: TEntrypoint): {
-    queryReference: FragmentReference<ExtractReadFromStore<TEntrypoint>, ExtractResolverProps<TEntrypoint>, ExtractResolverResult<TEntrypoint>> | UnassignedState;
+import { type IsographEntrypoint, type FragmentReference, ExtractReadFromStore, ExtractResolverResult } from './index';
+export declare function useImperativeReference<TEntrypoint extends IsographEntrypoint<any, any>>(entrypoint: TEntrypoint): {
+    queryReference: FragmentReference<ExtractReadFromStore<TEntrypoint>, ExtractResolverResult<TEntrypoint>> | UnassignedState;
     loadQueryReference: (variables: {
         [index: string]: string;
     }) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isograph/react",
-  "version": "0.0.0-main-e7fae892",
+  "version": "0.0.0-main-000d7173",
   "description": "Use Isograph with React",
   "homepage": "https://isograph.dev",
   "main": "dist/index.js",
@@ -16,8 +16,8 @@
     "prepack": "yarn run test && yarn run compile"
   },
   "dependencies": {
-    "@isograph/disposable-types": "0.0.0-main-e7fae892",
-    "@isograph/react-disposable-state": "0.0.0-main-e7fae892",
+    "@isograph/disposable-types": "0.0.0-main-000d7173",
+    "@isograph/react-disposable-state": "0.0.0-main-000d7173",
     "react": "^18.2.0"
   },
   "devDependencies": {

package/src/EntrypointReader.tsx

@@ -1,18 +1,16 @@
 import * as React from 'react';
 import {
   ExtractReadFromStore,
-  ExtractResolverProps,
   IsographEntrypoint,
   type FragmentReference,
   useResult,
 } from './index';
 
 export function EntrypointReader<
-  TEntrypoint extends IsographEntrypoint<any, any, React.FC<any>>,
+  TEntrypoint extends IsographEntrypoint<any, React.FC<any>>,
 >(props: {
   queryReference: FragmentReference<
     ExtractReadFromStore<TEntrypoint>,
-    ExtractResolverProps<TEntrypoint>,
     React.FC<any>
   >;
   additionalProps?: any | void;

package/src/cache.tsx

@@ -70,11 +70,11 @@ export function stableCopy<T>(value: T): T {
   return stable as any;
 }
 
-type IsoResolver = IsographEntrypoint<any, any, any>;
+type IsoResolver = IsographEntrypoint<any, any>;
 
 export function getOrCreateCacheForArtifact<T>(
   environment: IsographEnvironment,
-  artifact: IsographEntrypoint<any, any, T>,
+  artifact: IsographEntrypoint<any, T>,
   variables: object,
 ): ParentCache<PromiseWrapper<T>> {
   const cacheKey = artifact.queryText + JSON.stringify(stableCopy(variables));

package/src/componentCache.ts

@@ -10,7 +10,7 @@ export function getOrCreateCachedComponent(
   environment: IsographEnvironment,
   root: DataId,
   componentName: string,
-  readerArtifact: ReaderArtifact<any, any, any>,
+  readerArtifact: ReaderArtifact<any, any>,
   variables: { [key: string]: string },
   resolverRefetchQueries: RefetchQueryArtifactWrapper[],
 ) {

package/src/index.tsx

@@ -42,30 +42,21 @@ export { EntrypointReader } from './EntrypointReader';
 // This type should be treated as an opaque type.
 export type IsographEntrypoint<
   TReadFromStore extends Object,
-  TResolverProps,
   TResolverResult,
 > = {
   kind: 'Entrypoint';
   queryText: string;
   normalizationAst: NormalizationAst;
-  readerArtifact: ReaderArtifact<
-    TReadFromStore,
-    TResolverProps,
-    TResolverResult
-  >;
+  readerArtifact: ReaderArtifact<TReadFromStore, TResolverResult>;
   nestedRefetchQueries: RefetchQueryArtifactWrapper[];
 };
 
 // TODO this should probably be at least three distinct types, for @component,
 // non-@component and refetch resolvers
-export type ReaderArtifact<
-  TReadFromStore extends Object,
-  TResolverProps,
-  TResolverResult,
-> = {
+export type ReaderArtifact<TReadFromStore extends Object, TResolverResult> = {
   kind: 'ReaderArtifact';
   readerAst: ReaderAst<TReadFromStore>;
-  resolver: (data: TResolverProps, runtimeProps: any) => TResolverResult;
+  resolver: (data: TReadFromStore, runtimeProps: any) => TResolverResult;
   variant: ReaderResolverVariant;
 };
 
@@ -105,7 +96,7 @@ export type ReaderResolverVariant =
 export type ReaderResolverField = {
   kind: 'Resolver';
   alias: string;
-  readerArtifact: ReaderArtifact<any, any, any>;
+  readerArtifact: ReaderArtifact<any, any>;
   arguments: Arguments | null;
   usedRefetchQueries: number[];
 };
@@ -114,7 +105,7 @@ export type ReaderRefetchField = {
   kind: 'RefetchField';
   alias: string;
   // TODO this bad modeling. A refetch field cannot have variant: "Component" (I think)
-  readerArtifact: ReaderArtifact<any, any, any>;
+  readerArtifact: ReaderArtifact<any, any>;
   refetchQuery: number;
 };
 
@@ -122,9 +113,8 @@ export type ReaderMutationField = {
   kind: 'MutationField';
   alias: string;
   // TODO this bad modeling. A mutation field cannot have variant: "Component" (I think)
-  readerArtifact: ReaderArtifact<any, any, any>;
+  readerArtifact: ReaderArtifact<any, any>;
   refetchQuery: number;
-  allowedVariables: string[];
 };
 
 export type NormalizationAstNode =
@@ -177,46 +167,31 @@ type Variable = any;
 
 export type FragmentReference<
   TReadFromStore extends Object,
-  TResolverProps,
   TResolverResult,
 > = {
   kind: 'FragmentReference';
-  readerArtifact: ReaderArtifact<
-    TReadFromStore,
-    TResolverProps,
-    TResolverResult
-  >;
+  readerArtifact: ReaderArtifact<TReadFromStore, TResolverResult>;
   root: DataId;
   variables: { [index: string]: Variable } | null;
   // TODO: We should instead have ReaderAst<TResolverProps>
   nestedRefetchQueries: RefetchQueryArtifactWrapper[];
 };
 
-function assertIsEntrypoint<
-  TReadFromStore extends Object,
-  TResolverProps,
-  TResolverResult,
->(
+function assertIsEntrypoint<TReadFromStore extends Object, TResolverResult>(
   value:
-    | IsographEntrypoint<TReadFromStore, TResolverProps, TResolverResult>
+    | IsographEntrypoint<TReadFromStore, TResolverResult>
     | ((_: any) => any)
     // Temporarily, allow any here. Once we automatically provide
     // types to entrypoints, we probably don't need this.
     | any,
-): asserts value is IsographEntrypoint<
-  TReadFromStore,
-  TResolverProps,
-  TResolverResult
-> {
+): asserts value is IsographEntrypoint<TReadFromStore, TResolverResult> {
   if (typeof value === 'function') throw new Error('Not a string');
 }
 
 export type ExtractReadFromStore<Type> =
-  Type extends IsographEntrypoint<infer X, any, any> ? X : never;
-export type ExtractResolverProps<Type> =
-  Type extends IsographEntrypoint<any, infer X, any> ? X : never;
+  Type extends IsographEntrypoint<infer X, any> ? X : never;
 export type ExtractResolverResult<Type> =
-  Type extends IsographEntrypoint<any, any, infer X> ? X : never;
+  Type extends IsographEntrypoint<any, infer X> ? X : never;
 // Note: we cannot write TEntrypoint extends IsographEntrypoint<any, any, any>, or else
 // if we do not explicitly pass a type, the read out type will be any.
 // We cannot write TEntrypoint extends IsographEntrypoint<never, never, never>, or else
@@ -232,14 +207,12 @@ export function useLazyReference<TEntrypoint>(
 ): {
   queryReference: FragmentReference<
     ExtractReadFromStore<TEntrypoint>,
-    ExtractResolverProps<TEntrypoint>,
     ExtractResolverResult<TEntrypoint>
   >;
 } {
   const environment = useIsographEnvironment();
   assertIsEntrypoint<
     ExtractReadFromStore<TEntrypoint>,
-    ExtractResolverProps<TEntrypoint>,
     ExtractResolverResult<TEntrypoint>
   >(entrypoint);
   const cache = getOrCreateCacheForArtifact<ExtractResolverResult<TEntrypoint>>(
@@ -266,16 +239,8 @@ export function useLazyReference<TEntrypoint>(
   };
 }
 
-export function useResult<
-  TReadFromStore extends Object,
-  TResolverProps,
-  TResolverResult,
->(
-  fragmentReference: FragmentReference<
-    TReadFromStore,
-    TResolverProps,
-    TResolverResult
-  >,
+export function useResult<TReadFromStore extends Object, TResolverResult>(
+  fragmentReference: FragmentReference<TReadFromStore, TResolverResult>,
 ): TResolverResult {
   const environment = useIsographEnvironment();
 
@@ -289,17 +254,9 @@ export function useResult<
   return read(environment, fragmentReference);
 }
 
-export function read<
-  TReadFromStore extends Object,
-  TResolverProps,
-  TResolverResult,
->(
+export function read<TReadFromStore extends Object, TResolverResult>(
   environment: IsographEnvironment,
-  fragmentReference: FragmentReference<
-    TReadFromStore,
-    TResolverProps,
-    TResolverResult
-  >,
+  fragmentReference: FragmentReference<TReadFromStore, TResolverResult>,
 ): TResolverResult {
   const variant = fragmentReference.readerArtifact.variant;
   if (variant.kind === 'Eager') {
@@ -333,7 +290,7 @@ export function read<
 
 export function readButDoNotEvaluate<TReadFromStore extends Object>(
   environment: IsographEnvironment,
-  reference: FragmentReference<TReadFromStore, unknown, unknown>,
+  reference: FragmentReference<TReadFromStore, unknown>,
 ): TReadFromStore {
   const response = readData(
     environment,

package/src/useImperativeReference.ts

@@ -6,7 +6,6 @@ import {
   type IsographEntrypoint,
   type FragmentReference,
   ExtractReadFromStore,
-  ExtractResolverProps,
   ExtractResolverResult,
   ROOT_ID,
   useIsographEnvironment,
@@ -14,14 +13,13 @@ import {
 } from './index';
 
 export function useImperativeReference<
-  TEntrypoint extends IsographEntrypoint<any, any, any>,
+  TEntrypoint extends IsographEntrypoint<any, any>,
 >(
   entrypoint: TEntrypoint,
 ): {
   queryReference:
     | FragmentReference<
         ExtractReadFromStore<TEntrypoint>,
-        ExtractResolverProps<TEntrypoint>,
         ExtractResolverResult<TEntrypoint>
       >
     | UnassignedState;
@@ -31,7 +29,6 @@ export function useImperativeReference<
     useUpdatableDisposableState<
       FragmentReference<
         ExtractReadFromStore<TEntrypoint>,
-        ExtractResolverProps<TEntrypoint>,
         ExtractResolverResult<TEntrypoint>
       >
     >();