@isograph/react 0.0.0-main-6d83b6a2 → 0.0.0-main-f524690b

package/dist/cache.js

@@ -138,7 +138,8 @@ function normalizeScalarField(astNode, networkResponseParentRecord, targetStoreR
     const networkResponseKey = getNetworkResponseKey(astNode);
     const networkResponseData = networkResponseParentRecord[networkResponseKey];
     const parentRecordKey = getParentRecordKey(astNode, variables);
-    if (networkResponseData == null || isScalarOrEmptyArray(networkResponseData)) {
+    if (networkResponseData == null ||
+        isScalarOrEmptyArray(networkResponseData)) {
         targetStoreRecord[parentRecordKey] = networkResponseData;
     }
     else {
@@ -190,7 +191,9 @@ function isScalarOrEmptyArray(data) {
         // This is maybe fixed in a new version of Typescript??
         return data.every((x) => isScalarOrEmptyArray(x));
     }
-    const isScalarValue = typeof data === 'string' || typeof data === 'number' || typeof data === 'boolean';
+    const isScalarValue = typeof data === 'string' ||
+        typeof data === 'number' ||
+        typeof data === 'boolean';
     return isScalarValue;
 }
 function isScalarButNotEmptyArray(data) {
@@ -202,7 +205,9 @@ function isScalarButNotEmptyArray(data) {
         // This is maybe fixed in a new version of Typescript??
         return data.every((x) => isScalarOrEmptyArray(x));
     }
-    const isScalarValue = typeof data === 'string' || typeof data === 'number' || typeof data === 'boolean';
+    const isScalarValue = typeof data === 'string' ||
+        typeof data === 'number' ||
+        typeof data === 'boolean';
     return isScalarValue;
 }
 function getParentRecordKey(astNode, variables) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isograph/react",
-  "version": "0.0.0-main-6d83b6a2",
+  "version": "0.0.0-main-f524690b",
   "description": "Use Isograph with React",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,8 +15,8 @@
     "prepack": "yarn run test && yarn run compile"
   },
   "dependencies": {
-    "@isograph/disposable-types": "0.0.0-main-6d83b6a2",
-    "@isograph/react-disposable-state": "0.0.0-main-6d83b6a2",
+    "@isograph/disposable-types": "0.0.0-main-f524690b",
+    "@isograph/react-disposable-state": "0.0.0-main-f524690b",
     "react": "^18.2.0"
   },
   "devDependencies": {

package/src/cache.ts

@@ -1,4 +1,8 @@
-import { Factory, ItemCleanupPair, ParentCache } from '@isograph/react-disposable-state';
+import {
+  Factory,
+  ItemCleanupPair,
+  ParentCache,
+} from '@isograph/react-disposable-state';
 import { PromiseWrapper, wrapPromise } from './PromiseWrapper';
 import {
   Argument,
@@ -20,7 +24,10 @@ declare global {
 
 const cache: { [index: string]: ParentCache<any> } = {};
 
-function getOrCreateCache<T>(index: string, factory: Factory<T>): ParentCache<T> {
+function getOrCreateCache<T>(
+  index: string,
+  factory: Factory<T>,
+): ParentCache<T> {
   if (typeof window !== 'undefined' && window.__LOG) {
     console.log('getting cache for', {
       index,
@@ -64,7 +71,8 @@ export function getOrCreateCacheForArtifact<T>(
   variables: object,
 ): ParentCache<PromiseWrapper<T>> {
   const cacheKey = artifact.queryText + JSON.stringify(stableCopy(variables));
-  const factory: Factory<PromiseWrapper<T>> = () => makeNetworkRequest<T>(artifact, variables);
+  const factory: Factory<PromiseWrapper<T>> = () =>
+    makeNetworkRequest<T>(artifact, variables);
   return getOrCreateCache<PromiseWrapper<T>>(cacheKey, factory);
 }
 
@@ -86,18 +94,20 @@ export function makeNetworkRequest<T>(
     throw new Error('Network must be set before makeNetworkRequest is called');
   }
 
-  const promise = network(artifact.queryText, variables).then((networkResponse) => {
-    if (typeof window !== 'undefined' && window.__LOG) {
-      console.log('network response', artifact);
-    }
-    normalizeData(
-      artifact.normalizationAst,
-      networkResponse.data,
-      variables,
-      artifact.nestedRefetchQueries,
-    );
-    return networkResponse.data;
-  });
+  const promise = network(artifact.queryText, variables).then(
+    (networkResponse) => {
+      if (typeof window !== 'undefined' && window.__LOG) {
+        console.log('network response', artifact);
+      }
+      normalizeData(
+        artifact.normalizationAst,
+        networkResponse.data,
+        variables,
+        artifact.nestedRefetchQueries,
+      );
+      return networkResponse.data;
+    },
+  );
 
   const wrapper = wrapPromise(promise);
 
@@ -173,7 +183,12 @@ function normalizeData(
   nestedRefetchQueries: RefetchQueryArtifactWrapper[],
 ) {
   if (typeof window !== 'undefined' && window.__LOG) {
-    console.log('about to normalize', normalizationAst, networkResponse, variables);
+    console.log(
+      'about to normalize',
+      normalizationAst,
+      networkResponse,
+      variables,
+    );
   }
   normalizeDataIntoRecord(
     normalizationAst,
@@ -256,7 +271,10 @@ function normalizeScalarField(
   const networkResponseData = networkResponseParentRecord[networkResponseKey];
   const parentRecordKey = getParentRecordKey(astNode, variables);
 
-  if (networkResponseData == null || isScalarOrEmptyArray(networkResponseData)) {
+  if (
+    networkResponseData == null ||
+    isScalarOrEmptyArray(networkResponseData)
+  ) {
     targetStoreRecord[parentRecordKey] = networkResponseData;
   } else {
     throw new Error('Unexpected object array when normalizing scalar');
@@ -284,7 +302,9 @@ function normalizeLinkedField(
   }
 
   if (isScalarButNotEmptyArray(networkResponseData)) {
-    throw new Error('Unexpected scalar network response when normalizing a linked field');
+    throw new Error(
+      'Unexpected scalar network response when normalizing a linked field',
+    );
   }
 
   if (Array.isArray(networkResponseData)) {
@@ -358,7 +378,9 @@ function isScalarOrEmptyArray(
     return (data as any).every((x: any) => isScalarOrEmptyArray(x));
   }
   const isScalarValue =
-    typeof data === 'string' || typeof data === 'number' || typeof data === 'boolean';
+    typeof data === 'string' ||
+    typeof data === 'number' ||
+    typeof data === 'boolean';
   return isScalarValue;
 }
 
@@ -374,7 +396,9 @@ function isScalarButNotEmptyArray(
     return (data as any).every((x: any) => isScalarOrEmptyArray(x));
   }
   const isScalarValue =
-    typeof data === 'string' || typeof data === 'number' || typeof data === 'boolean';
+    typeof data === 'string' ||
+    typeof data === 'number' ||
+    typeof data === 'boolean';
   return isScalarValue;
 }
 
@@ -418,7 +442,10 @@ function getStoreKeyChunkForArgumentValue(
   }
 }
 
-function getStoreKeyChunkForArgument(argument: Argument, variables: { [index: string]: string }) {
+function getStoreKeyChunkForArgument(
+  argument: Argument,
+  variables: { [index: string]: string },
+) {
   const chunk = getStoreKeyChunkForArgumentValue(argument[1], variables);
   return `${FIRST_SPLIT_KEY}${argument[0]}${SECOND_SPLIT_KEY}${chunk}`;
 }

package/src/componentCache.ts

@@ -1,4 +1,8 @@
-import { ReaderArtifact, RefetchQueryArtifactWrapper, readButDoNotEvaluate } from './index';
+import {
+  ReaderArtifact,
+  RefetchQueryArtifactWrapper,
+  readButDoNotEvaluate,
+} from './index';
 import { DataId, stableCopy } from './cache';
 
 type ComponentName = string;

package/src/index.tsx

@@ -26,15 +26,27 @@ export {
 export { iso } from './iso';
 
 // This type should be treated as an opaque type.
-export type IsographEntrypoint<TReadFromStore extends Object, TResolverProps, TResolverResult> = {
+export type IsographEntrypoint<
+  TReadFromStore extends Object,
+  TResolverProps,
+  TResolverResult,
+> = {
   kind: 'Entrypoint';
   queryText: string;
   normalizationAst: NormalizationAst;
-  readerArtifact: ReaderArtifact<TReadFromStore, TResolverProps, TResolverResult>;
+  readerArtifact: ReaderArtifact<
+    TReadFromStore,
+    TResolverProps,
+    TResolverResult
+  >;
   nestedRefetchQueries: RefetchQueryArtifactWrapper[];
 };
 
-export type ReaderArtifact<TReadFromStore extends Object, TResolverProps, TResolverResult> = {
+export type ReaderArtifact<
+  TReadFromStore extends Object,
+  TResolverProps,
+  TResolverResult,
+> = {
   kind: 'ReaderArtifact';
   readerAst: ReaderAst<TReadFromStore>;
   resolver: (data: TResolverProps) => TResolverResult;
@@ -96,7 +108,9 @@ export type ReaderMutationField = {
   allowedVariables: string[];
 };
 
-export type NormalizationAstNode = NormalizationScalarField | NormalizationLinkedField;
+export type NormalizationAstNode =
+  | NormalizationScalarField
+  | NormalizationLinkedField;
 // @ts-ignore
 export type NormalizationAst = NormalizationAstNode[];
 
@@ -139,24 +153,45 @@ export type ArgumentValue =
       value: any;
     };
 
-export type FragmentReference<TReadFromStore extends Object, TResolverProps, TResolverResult> = {
+export type FragmentReference<
+  TReadFromStore extends Object,
+  TResolverProps,
+  TResolverResult,
+> = {
   kind: 'FragmentReference';
-  readerArtifact: ReaderArtifact<TReadFromStore, TResolverProps, TResolverResult>;
+  readerArtifact: ReaderArtifact<
+    TReadFromStore,
+    TResolverProps,
+    TResolverResult
+  >;
   root: DataId;
   variables: { [index: string]: string } | null;
   // TODO: We should instead have ReaderAst<TResolverProps>
   nestedRefetchQueries: RefetchQueryArtifactWrapper[];
 };
 
-function assertIsEntrypoint<TReadFromStore extends Object, TResolverProps, TResolverResult>(
-  value: IsographEntrypoint<TReadFromStore, TResolverProps, TResolverResult> | typeof iso,
-): asserts value is IsographEntrypoint<TReadFromStore, TResolverProps, TResolverResult> {
+function assertIsEntrypoint<
+  TReadFromStore extends Object,
+  TResolverProps,
+  TResolverResult,
+>(
+  value:
+    | IsographEntrypoint<TReadFromStore, TResolverProps, TResolverResult>
+    | typeof iso,
+): asserts value is IsographEntrypoint<
+  TReadFromStore,
+  TResolverProps,
+  TResolverResult
+> {
   if (typeof value === 'function') throw new Error('Not a string');
 }
 
-type ExtractTReadFromStore<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;
+type ExtractTReadFromStore<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;
 // 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
@@ -185,7 +220,8 @@ export function useLazyReference<TEntrypoint>(
 
   // TODO add comment explaining why we never use this value
   // @ts-ignore
-  const data = useLazyDisposableState<PromiseWrapper<TResolverResult>>(cache).state;
+  const data =
+    useLazyDisposableState<PromiseWrapper<TResolverResult>>(cache).state;
 
   return {
     queryReference: {
@@ -198,8 +234,16 @@ export function useLazyReference<TEntrypoint>(
   };
 }
 
-export function read<TReadFromStore extends Object, TResolverProps, TResolverResult>(
-  fragmentReference: FragmentReference<TReadFromStore, TResolverProps, TResolverResult>,
+export function read<
+  TReadFromStore extends Object,
+  TResolverProps,
+  TResolverResult,
+>(
+  fragmentReference: FragmentReference<
+    TReadFromStore,
+    TResolverProps,
+    TResolverResult
+  >,
 ): TResolverResult {
   const variant = fragmentReference.readerArtifact.variant;
   if (variant.kind === 'Eager') {
@@ -313,7 +357,12 @@ function readData<TReadFromStore>(
               results.push(null);
               continue;
             }
-            const result = readData(field.selections, link.__link, variables, nestedRefetchQueries);
+            const result = readData(
+              field.selections,
+              link.__link,
+              variables,
+              nestedRefetchQueries,
+            );
             if (result.kind === 'MissingData') {
               return {
                 kind: 'MissingData',
@@ -361,7 +410,12 @@ function readData<TReadFromStore>(
           break;
         }
         const targetId = link.__link;
-        const data = readData(field.selections, targetId, variables, nestedRefetchQueries);
+        const data = readData(
+          field.selections,
+          targetId,
+          variables,
+          nestedRefetchQueries,
+        );
         if (data.kind === 'MissingData') {
           return {
             kind: 'MissingData',
@@ -398,12 +452,15 @@ function readData<TReadFromStore>(
           const refetchQueryArtifact = refetchQuery.artifact;
           const allowedVariables = refetchQuery.allowedVariables;
 
-          target[field.alias] = field.readerArtifact.resolver(refetchQueryArtifact, {
-            ...data.data,
-            // TODO continue from here
-            // variables need to be filtered for what we need just for the refetch query
-            ...filterVariables(variables, allowedVariables),
-          });
+          target[field.alias] = field.readerArtifact.resolver(
+            refetchQueryArtifact,
+            {
+              ...data.data,
+              // TODO continue from here
+              // variables need to be filtered for what we need just for the refetch query
+              ...filterVariables(variables, allowedVariables),
+            },
+          );
         }
         break;
       }
@@ -490,9 +547,21 @@ function missingFieldHandler(
   variables: { [index: string]: any } | null,
 ): Link | undefined {
   if (customMissingFieldHandler != null) {
-    return customMissingFieldHandler(storeRecord, root, fieldName, arguments_, variables);
+    return customMissingFieldHandler(
+      storeRecord,
+      root,
+      fieldName,
+      arguments_,
+      variables,
+    );
   } else {
-    return defaultMissingFieldHandler(storeRecord, root, fieldName, arguments_, variables);
+    return defaultMissingFieldHandler(
+      storeRecord,
+      root,
+      fieldName,
+      arguments_,
+      variables,
+    );
   }
 }
 
@@ -514,7 +583,9 @@ export function defaultMissingFieldHandler(
   }
 }
 
-export function setMissingFieldHandler(handler: typeof defaultMissingFieldHandler) {
+export function setMissingFieldHandler(
+  handler: typeof defaultMissingFieldHandler,
+) {
   customMissingFieldHandler = handler;
 }