@isograph/react 0.0.0-main-01f29812 → 0.0.0-main-7f010fe1

package/dist/cache.js

@@ -211,7 +211,8 @@ function getStoreKeyChunkForArgumentValue(argumentValue, variables) {
         }
         default: {
             // TODO configure eslint to allow unused vars starting with _
-            let _ = argumentValue;
+            // @ts-expect-error
+            const _ = argumentValue;
             throw new Error('Unexpected case');
         }
     }
@@ -237,6 +238,7 @@ function getNetworkResponseKey(astNode) {
                     break;
                 }
                 default: {
+                    // @ts-expect-error
                     let _ = argumentValue;
                     throw new Error('Unexpected case');
                 }

package/dist/index.d.ts

@@ -88,20 +88,23 @@ export type ArgumentValue = {
     kind: 'Literal';
     value: any;
 };
+type Variable = any;
 export type FragmentReference<TReadFromStore extends Object, TResolverProps, TResolverResult> = {
     kind: 'FragmentReference';
     readerArtifact: ReaderArtifact<TReadFromStore, TResolverProps, TResolverResult>;
     root: DataId;
     variables: {
-        [index: string]: string;
+        [index: string]: Variable;
     } | null;
     nestedRefetchQueries: RefetchQueryArtifactWrapper[];
 };
-type ExtractTReadFromStore<Type> = Type extends IsographEntrypoint<infer X, any, any> ? X : never;
+type ExtractReadFromStore<Type> = Type extends IsographEntrypoint<infer X, any, any> ? X : never;
 type ExtractResolverProps<Type> = Type extends IsographEntrypoint<any, infer X, any> ? X : never;
 type ExtractResolverResult<Type> = Type extends IsographEntrypoint<any, any, infer X> ? X : never;
-export declare function useLazyReference<TEntrypoint>(entrypoint: TEntrypoint | ((_: any) => any), variables: object): {
-    queryReference: FragmentReference<ExtractTReadFromStore<TEntrypoint>, ExtractResolverProps<TEntrypoint>, ExtractResolverResult<TEntrypoint>>;
+export declare function useLazyReference<TEntrypoint>(entrypoint: TEntrypoint | ((_: any) => any), variables: {
+    [key: string]: Variable;
+}): {
+    queryReference: FragmentReference<ExtractReadFromStore<TEntrypoint>, ExtractResolverProps<TEntrypoint>, ExtractResolverResult<TEntrypoint>>;
 };
 export declare function useRead<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;

package/dist/index.js

@@ -28,7 +28,6 @@ function assertIsEntrypoint(value) {
 function useLazyReference(entrypoint, variables) {
     const environment = (0, IsographEnvironment_1.useIsographEnvironment)();
     assertIsEntrypoint(entrypoint);
-    // Typechecking fails here... TODO investigate
     const cache = (0, cache_1.getOrCreateCacheForArtifact)(environment, entrypoint, variables);
     // TODO add comment explaining why we never use this value
     // @ts-ignore
@@ -58,6 +57,7 @@ function read(environment, fragmentReference) {
             throw (0, cache_1.onNextChange)(environment);
         }
         else {
+            // @ts-expect-error This not properly typed yet
             return fragmentReference.readerArtifact.resolver(data.data);
         }
     }
@@ -207,7 +207,10 @@ 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, refetchQueryArtifact, Object.assign(Object.assign({}, data.data), filterVariables(variables, 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;
             }
@@ -233,7 +236,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, refetchQueryArtifact, data.data, filterVariables(variables, allowedVariables));
+                    target[field.alias] = field.readerArtifact.resolver(environment, 
+                    // @ts-expect-error
+                    refetchQueryArtifact, data.data, filterVariables(variables, allowedVariables));
                 }
                 break;
             }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@isograph/react",
-  "version": "0.0.0-main-01f29812",
+  "version": "0.0.0-main-7f010fe1",
   "description": "Use Isograph with React",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "Isograph Labs",
   "license": "MIT",
   "scripts": {
-    "compile": "rm -rf dist/* && (tsc -p tsconfig.pkg.json || exit 0)",
+    "compile": "rm -rf dist/* && tsc -p tsconfig.pkg.json",
     "compile-watch": "tsc -p tsconfig.pkg.json --watch",
     "test": "echo no tests yet",
     "test-watch": "vitest watch",
@@ -15,8 +15,8 @@
     "prepack": "yarn run test && yarn run compile"
   },
   "dependencies": {
-    "@isograph/disposable-types": "0.0.0-main-01f29812",
-    "@isograph/react-disposable-state": "0.0.0-main-01f29812",
+    "@isograph/disposable-types": "0.0.0-main-7f010fe1",
+    "@isograph/react-disposable-state": "0.0.0-main-7f010fe1",
     "react": "^18.2.0"
   },
   "devDependencies": {

package/src/cache.tsx

@@ -402,7 +402,8 @@ function getStoreKeyChunkForArgumentValue(
     }
     default: {
       // TODO configure eslint to allow unused vars starting with _
-      let _: never = argumentValue;
+      // @ts-expect-error
+      const _: never = argumentValue;
       throw new Error('Unexpected case');
     }
   }
@@ -435,6 +436,7 @@ function getNetworkResponseKey(
           break;
         }
         default: {
+          // @ts-expect-error
           let _: never = argumentValue;
           throw new Error('Unexpected case');
         }

package/src/componentCache.ts

@@ -23,7 +23,7 @@ export function getOrCreateCachedComponent(
   byArgs[stringifiedArgs] =
     byArgs[stringifiedArgs] ??
     (() => {
-      function Component(additionalRuntimeProps) {
+      function Component(additionalRuntimeProps: { [key: string]: any }) {
         const data = readButDoNotEvaluate(environment, {
           kind: 'FragmentReference',
           readerArtifact: readerArtifact,

package/src/index.tsx

@@ -164,6 +164,9 @@ export type ArgumentValue =
       value: any;
     };
 
+// TODO type this better
+type Variable = any;
+
 export type FragmentReference<
   TReadFromStore extends Object,
   TResolverProps,
@@ -176,7 +179,7 @@ export type FragmentReference<
     TResolverResult
   >;
   root: DataId;
-  variables: { [index: string]: string } | null;
+  variables: { [index: string]: Variable } | null;
   // TODO: We should instead have ReaderAst<TResolverProps>
   nestedRefetchQueries: RefetchQueryArtifactWrapper[];
 };
@@ -200,7 +203,7 @@ function assertIsEntrypoint<
   if (typeof value === 'function') throw new Error('Not a string');
 }
 
-type ExtractTReadFromStore<Type> =
+type ExtractReadFromStore<Type> =
   Type extends IsographEntrypoint<infer X, any, any> ? X : never;
 type ExtractResolverProps<Type> =
   Type extends IsographEntrypoint<any, infer X, any> ? X : never;
@@ -217,17 +220,20 @@ export function useLazyReference<TEntrypoint>(
     // iso`...`. At runtime, we confirm that the passed-in `iso` literal is actually
     // an entrypoint.
     | ((_: any) => any),
-  variables: object,
+  variables: { [key: string]: Variable },
 ): {
   queryReference: FragmentReference<
-    ExtractTReadFromStore<TEntrypoint>,
+    ExtractReadFromStore<TEntrypoint>,
     ExtractResolverProps<TEntrypoint>,
     ExtractResolverResult<TEntrypoint>
   >;
 } {
   const environment = useIsographEnvironment();
-  assertIsEntrypoint(entrypoint);
-  // Typechecking fails here... TODO investigate
+  assertIsEntrypoint<
+    ExtractReadFromStore<TEntrypoint>,
+    ExtractResolverProps<TEntrypoint>,
+    ExtractResolverResult<TEntrypoint>
+  >(entrypoint);
   const cache = getOrCreateCacheForArtifact<ExtractResolverResult<TEntrypoint>>(
     environment,
     entrypoint,
@@ -237,7 +243,9 @@ export function useLazyReference<TEntrypoint>(
   // TODO add comment explaining why we never use this value
   // @ts-ignore
   const data =
-    useLazyDisposableState<PromiseWrapper<TResolverResult>>(cache).state;
+    useLazyDisposableState<PromiseWrapper<ExtractResolverResult<TEntrypoint>>>(
+      cache,
+    ).state;
 
   return {
     queryReference: {
@@ -289,6 +297,7 @@ export function read<
     if (data.kind === 'MissingData') {
       throw onNextChange(environment);
     } else {
+      // @ts-expect-error This not properly typed yet
       return fragmentReference.readerArtifact.resolver(data.data);
     }
   } else if (variant.kind === 'Component') {
@@ -496,6 +505,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,
             {
               ...data.data,
@@ -536,6 +547,7 @@ function readData<TReadFromStore>(
 
           target[field.alias] = field.readerArtifact.resolver(
             environment,
+            // @ts-expect-error
             refetchQueryArtifact,
             data.data,
             filterVariables(variables, allowedVariables),