@isograph/react 0.0.0-main-9cb0e598 → 0.0.0-main-6e56aa17

package/dist/index.d.ts

@@ -5,7 +5,7 @@ export { ROOT_ID, type DataId, type DataTypeValue, type IsographEnvironment, typ
 export { IsographEnvironmentProvider, useIsographEnvironment, type IsographEnvironmentProviderProps, } from './IsographEnvironmentProvider';
 export { useImperativeReference } from './useImperativeReference';
 export { EntrypointReader } from './EntrypointReader';
-export { EagerReaderArtifact, ComponentReaderArtifact, MutationReaderArtifact, RefetchReaderArtifact, ReaderAst, ReaderAstNode, ReaderLinkedField, ReaderMutationField, ReaderRefetchField, ReaderResolverField, ReaderResolverVariant, ReaderScalarField, } from './reader';
+export { EagerReaderArtifact, ComponentReaderArtifact, MutationReaderArtifact, RefetchReaderArtifact, ReaderAst, ReaderAstNode, ReaderLinkedField, ReaderResolverField, ReaderResolverVariant, ReaderScalarField, } from './reader';
 export { NormalizationAst, NormalizationAstNode, NormalizationLinkedField, NormalizationScalarField, IsographEntrypoint, assertIsEntrypoint, RefetchQueryNormalizationArtifact, RefetchQueryNormalizationArtifactWrapper, } from './entrypoint';
 export { readButDoNotEvaluate } from './read';
 export { useResult } from './useResult';

package/dist/read.js

@@ -132,7 +132,7 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, mutab
                 target[(_e = field.alias) !== null && _e !== void 0 ? _e : field.fieldName] = data.data;
                 break;
             }
-            case 'RefetchField': {
+            case 'ImperativelyLoadedField': {
                 const data = readData(environment, field.readerArtifact.readerAst, root, variables, 
                 // Refetch fields just read the id, and don't need refetch query artifacts
                 [], mutableEncounteredRecords);
@@ -151,31 +151,6 @@ function readData(environment, ast, root, variables, nestedRefetchQueries, mutab
                     const refetchQuery = nestedRefetchQueries[refetchQueryIndex];
                     const refetchQueryArtifact = refetchQuery.artifact;
                     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
-                    refetchQueryArtifact, Object.assign(Object.assign({}, data.data), filterVariables(variables, allowedVariables)));
-                }
-                break;
-            }
-            case 'MutationField': {
-                const data = readData(environment, field.readerArtifact.readerAst, root, variables, 
-                // Mutation don't need refetch query artifacts
-                [], mutableEncounteredRecords);
-                if (data.kind === 'MissingData') {
-                    return {
-                        kind: 'MissingData',
-                        reason: 'Missing data for ' + field.alias + ' on root ' + root,
-                        nestedReason: data,
-                    };
-                }
-                else {
-                    const refetchQueryIndex = field.refetchQuery;
-                    if (refetchQueryIndex == null) {
-                        throw new Error('refetchQuery is null in MutationField');
-                    }
-                    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));
                 }
                 break;

package/dist/reader.d.ts

@@ -24,7 +24,7 @@ export type MutationReaderArtifact<TReadFromStore extends Object> = {
     readonly readerAst: ReaderAst<unknown>;
     readonly resolver: (environment: IsographEnvironment, entrypoint: RefetchQueryNormalizationArtifact, readOutData: TReadFromStore, filteredVariables: any) => (mutationParams: any) => void;
 };
-export type ReaderAstNode = ReaderScalarField | ReaderLinkedField | ReaderResolverField | ReaderRefetchField | ReaderMutationField;
+export type ReaderAstNode = ReaderScalarField | ReaderLinkedField | ReaderResolverField | ReaderImperativelyLoadedField;
 export type ReaderAst<TReadFromStore> = ReadonlyArray<ReaderAstNode>;
 export type ReaderScalarField = {
     readonly kind: 'Scalar';
@@ -52,15 +52,9 @@ export type ReaderResolverField = {
     readonly arguments: Arguments | null;
     readonly usedRefetchQueries: number[];
 };
-export type ReaderRefetchField = {
-    readonly kind: 'RefetchField';
+export type ReaderImperativelyLoadedField = {
+    readonly kind: 'ImperativelyLoadedField';
     readonly alias: string;
-    readonly readerArtifact: RefetchReaderArtifact;
-    readonly refetchQuery: number;
-};
-export type ReaderMutationField = {
-    readonly kind: 'MutationField';
-    readonly alias: string;
-    readonly readerArtifact: MutationReaderArtifact<any>;
+    readonly readerArtifact: MutationReaderArtifact<any> | RefetchReaderArtifact;
     readonly refetchQuery: number;
 };

package/package.json

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

package/src/index.ts

@@ -34,8 +34,6 @@ export {
   ReaderAst,
   ReaderAstNode,
   ReaderLinkedField,
-  ReaderMutationField,
-  ReaderRefetchField,
   ReaderResolverField,
   ReaderResolverVariant,
   ReaderScalarField,

package/src/read.ts

@@ -193,7 +193,7 @@ function readData<TReadFromStore>(
         target[field.alias ?? field.fieldName] = data.data;
         break;
       }
-      case 'RefetchField': {
+      case 'ImperativelyLoadedField': {
         const data = readData(
           environment,
           field.readerArtifact.readerAst,
@@ -218,44 +218,6 @@ function readData<TReadFromStore>(
           const refetchQueryArtifact = refetchQuery.artifact;
           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
-            refetchQueryArtifact,
-            {
-              // @ts-expect-error
-              ...data.data,
-              ...filterVariables(variables, allowedVariables),
-            },
-          );
-        }
-        break;
-      }
-      case 'MutationField': {
-        const data = readData(
-          environment,
-          field.readerArtifact.readerAst,
-          root,
-          variables,
-          // Mutation don't need refetch query artifacts
-          [],
-          mutableEncounteredRecords,
-        );
-        if (data.kind === 'MissingData') {
-          return {
-            kind: 'MissingData',
-            reason: 'Missing data for ' + field.alias + ' on root ' + root,
-            nestedReason: data,
-          };
-        } else {
-          const refetchQueryIndex = field.refetchQuery;
-          if (refetchQueryIndex == null) {
-            throw new Error('refetchQuery is null in MutationField');
-          }
-          const refetchQuery = nestedRefetchQueries[refetchQueryIndex];
-          const refetchQueryArtifact = refetchQuery.artifact;
-          const allowedVariables = refetchQuery.allowedVariables;
-
           target[field.alias] = field.readerArtifact.resolver(
             environment,
             refetchQueryArtifact,

package/src/reader.ts

@@ -64,8 +64,7 @@ export type ReaderAstNode =
   | ReaderScalarField
   | ReaderLinkedField
   | ReaderResolverField
-  | ReaderRefetchField
-  | ReaderMutationField;
+  | ReaderImperativelyLoadedField;
 
 // @ts-ignore
 export type ReaderAst<TReadFromStore> = ReadonlyArray<ReaderAstNode>;
@@ -98,17 +97,9 @@ export type ReaderResolverField = {
   readonly usedRefetchQueries: number[];
 };
 
-export type ReaderRefetchField = {
-  readonly kind: 'RefetchField';
+export type ReaderImperativelyLoadedField = {
+  readonly kind: 'ImperativelyLoadedField';
   readonly alias: string;
-  readonly readerArtifact: RefetchReaderArtifact;
-  readonly refetchQuery: number;
-};
-
-export type ReaderMutationField = {
-  readonly kind: 'MutationField';
-  readonly alias: string;
-  // TODO don't pass any here
-  readonly readerArtifact: MutationReaderArtifact<any>;
+  readonly readerArtifact: MutationReaderArtifact<any> | RefetchReaderArtifact;
   readonly refetchQuery: number;
 };