@isograph/react 0.0.0-main-3b6a3c06 → 0.0.0-main-e634679c

package/dist/componentCache.js

@@ -21,7 +21,7 @@ function getOrCreateCachedComponent(environment, root, componentName, readerArti
                     variables,
                     nestedRefetchQueries: resolverRefetchQueries,
                 });
-                return readerArtifact.resolver(Object.assign({ data }, additionalRuntimeProps));
+                return readerArtifact.resolver(data, additionalRuntimeProps);
             }
             Component.displayName = `${componentName} (id: ${root}) @component`;
             return Component;

package/dist/index.d.ts

@@ -14,11 +14,12 @@ export type IsographEntrypoint<TReadFromStore extends Object, TResolverProps, TR
 export type ReaderArtifact<TReadFromStore extends Object, TResolverProps, TResolverResult> = {
     kind: 'ReaderArtifact';
     readerAst: ReaderAst<TReadFromStore>;
-    resolver: (data: TResolverProps) => TResolverResult;
+    resolver: (data: TResolverProps, runtimeProps: any) => TResolverResult;
     variant: ReaderResolverVariant;
 };
 export type ReaderAstNode = ReaderScalarField | ReaderLinkedField | ReaderResolverField | ReaderRefetchField | ReaderMutationField;
 export type ReaderAst<TReadFromStore> = ReaderAstNode[];
+export type ExtractSecondParam<T extends (arg1: any, arg2: any) => any> = T extends (arg1: any, arg2: infer P) => any ? P : never;
 export type ReaderScalarField = {
     kind: 'Scalar';
     fieldName: string;

package/dist/index.js

@@ -218,7 +218,6 @@ function readData(environment, ast, root, variables, nestedRefetchQueries) {
                     const allowedVariables = refetchQuery.allowedVariables;
                     target[field.alias] = field.readerArtifact.resolver(environment, 
                     // resolvers for refetch fields take 3 args, and this is not reflected in types
-                    // @ts-expect-error
                     refetchQueryArtifact, Object.assign(Object.assign({}, data.data), filterVariables(variables, allowedVariables)));
                 }
                 break;
@@ -245,9 +244,9 @@ function readData(environment, ast, root, variables, nestedRefetchQueries) {
                     const refetchQuery = nestedRefetchQueries[refetchQueryIndex];
                     const refetchQueryArtifact = refetchQuery.artifact;
                     const allowedVariables = refetchQuery.allowedVariables;
-                    target[field.alias] = field.readerArtifact.resolver(environment, 
+                    target[field.alias] = field.readerArtifact.resolver(environment, refetchQueryArtifact, 
                     // @ts-expect-error
-                    refetchQueryArtifact, data.data, filterVariables(variables, allowedVariables));
+                    data.data, filterVariables(variables, allowedVariables));
                 }
                 break;
             }
@@ -265,6 +264,7 @@ function readData(environment, ast, root, variables, nestedRefetchQueries) {
                         };
                     }
                     else {
+                        // @ts-expect-error
                         target[field.alias] = field.readerArtifact.resolver(data.data);
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isograph/react",
-  "version": "0.0.0-main-3b6a3c06",
+  "version": "0.0.0-main-e634679c",
   "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-3b6a3c06",
-    "@isograph/react-disposable-state": "0.0.0-main-3b6a3c06",
+    "@isograph/disposable-types": "0.0.0-main-e634679c",
+    "@isograph/react-disposable-state": "0.0.0-main-e634679c",
     "react": "^18.2.0"
   },
   "devDependencies": {

package/src/componentCache.ts

@@ -32,10 +32,7 @@ export function getOrCreateCachedComponent(
           nestedRefetchQueries: resolverRefetchQueries,
         });
 
-        return readerArtifact.resolver({
-          data,
-          ...additionalRuntimeProps,
-        });
+        return readerArtifact.resolver(data, additionalRuntimeProps);
       }
       Component.displayName = `${componentName} (id: ${root}) @component`;
       return Component;

package/src/index.tsx

@@ -56,6 +56,8 @@ export type IsographEntrypoint<
   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,
@@ -63,7 +65,7 @@ export type ReaderArtifact<
 > = {
   kind: 'ReaderArtifact';
   readerAst: ReaderAst<TReadFromStore>;
-  resolver: (data: TResolverProps) => TResolverResult;
+  resolver: (data: TResolverProps, runtimeProps: any) => TResolverResult;
   variant: ReaderResolverVariant;
 };
 
@@ -77,6 +79,9 @@ export type ReaderAstNode =
 // @ts-ignore
 export type ReaderAst<TReadFromStore> = ReaderAstNode[];
 
+export type ExtractSecondParam<T extends (arg1: any, arg2: any) => any> =
+  T extends (arg1: any, arg2: infer P) => any ? P : never;
+
 export type ReaderScalarField = {
   kind: 'Scalar';
   fieldName: string;
@@ -517,8 +522,8 @@ function readData<TReadFromStore>(
           target[field.alias] = field.readerArtifact.resolver(
             environment,
             // resolvers for refetch fields take 3 args, and this is not reflected in types
-            // @ts-expect-error
             refetchQueryArtifact,
+            // @ts-expect-error
             {
               ...data.data,
               // TODO continue from here
@@ -558,8 +563,8 @@ function readData<TReadFromStore>(
 
           target[field.alias] = field.readerArtifact.resolver(
             environment,
-            // @ts-expect-error
             refetchQueryArtifact,
+            // @ts-expect-error
             data.data,
             filterVariables(variables, allowedVariables),
           );
@@ -588,6 +593,7 @@ function readData<TReadFromStore>(
               nestedReason: data,
             };
           } else {
+            // @ts-expect-error
             target[field.alias] = field.readerArtifact.resolver(data.data);
           }
         } else if (variant.kind === 'Component') {