tweak mutual best friend setter

Author: rbalicki2

crates/generate_artifacts/src/generate_artifacts.rs

@@ -291,14 +291,14 @@ fn get_artifact_path_and_content_impl<TNetworkProtocol: NetworkProtocol>(
                                 default_value: None,
                             };
 
-                            let (wrapped_map, variable_definitions_iter): (_, Vec<_>) =
+                            let (wrapped_map, variable_definitions_iter) =
                                 match client_scalar_selectable.refetch_strategy.as_ref().expect(
                                     "Expected a refetch strategy. \
-                                        This is indicative of a bug in Isograph.",
+                                    This is indicative of a bug in Isograph.",
                                 ) {
                                     RefetchStrategy::RefetchFromRoot => (
                                         selection_map_wrapped(merged_selection_map.clone(), vec![]),
-                                        variable_definitions_iter.collect(),
+                                        variable_definitions_iter.collect::<Vec<_>>(),
                                     ),
                                     RefetchStrategy::UseRefetchField(_) => {
                                         let wrapped_map = selection_map_wrapped(

demos/pet-demo/src/components/Pet/MutualBestFriendSetter.tsx

@@ -4,7 +4,15 @@ import {
   useImperativeReference,
 } from '@isograph/react';
 import { iso } from '../__isograph/iso';
-import { Button } from '@mui/material';
+import { Button, Card, CardContent } from '@mui/material';
+
+/**
+ * This is a bit of a contrived demo that shows that @loadable fields on
+ * root mutations work.
+ *
+ * Note that we are fetching some additional, unused, fields, so that
+ * the PetBestFriendCard continues to work. This is somewhat awkward!
+ */
 
 export const setMututalBestFriend = iso(`
   field Mutation.MututalBestFriendSetterMutation(
@@ -18,16 +26,19 @@ export const setMututalBestFriend = iso(`
       pet {
         id
         best_friend_relationship {
+          picture_together
           best_friend {
             id
+            name
+            Avatar
           }
         }
       }
     }
     MutualBestFriendSetterOtherSide @loadable
   }
 `)(({ data }) => {
-  if (!data.set_pet_best_friend.pet.best_friend_relationship?.best_friend.id) {
+  if (!data.set_pet_best_friend.pet.best_friend_relationship) {
     throw new Error('Somehow the new best friend id was not set');
   }
 
@@ -86,21 +97,33 @@ export const MutualBestFriendSetter = iso(`
     iso(`entrypoint Mutation.MututalBestFriendSetterMutation`),
   );
 
-  if (!mutationRef) {
-    return (
-      <Button
-        onClick={() => {
-          loadMutation({
+  const cardContent = !mutationRef ? (
+    <Button
+      onClick={() => {
+        loadMutation(
+          {
             id: data.id,
             new_best_friend_id: '0',
-          });
-        }}
-        variant="contained"
-      >
-        Set best friend to Makayla
-      </Button>
-    );
-  } else {
-    return <FragmentRenderer fragmentReference={mutationRef} />;
-  }
+          },
+          {
+            shouldFetch: 'Yes',
+          },
+        );
+      }}
+      variant="contained"
+    >
+      Set best friend to Makayla
+    </Button>
+  ) : (
+    <FragmentRenderer fragmentReference={mutationRef} />
+  );
+
+  return (
+    <Card
+      variant="outlined"
+      sx={{ width: 450, boxShadow: 3, backgroundColor: '#BBB' }}
+    >
+      <CardContent>{cardContent}</CardContent>
+    </Card>
+  );
 });

demos/pet-demo/src/components/__isograph/Mutation/MututalBestFriendSetterMutation/normalization_ast.ts

@@ -46,8 +46,23 @@ const normalizationAst: NormalizationAst = {
                       fieldName: "id",
                       arguments: null,
                     },
+                    {
+                      kind: "Scalar",
+                      fieldName: "name",
+                      arguments: null,
+                    },
+                    {
+                      kind: "Scalar",
+                      fieldName: "picture",
+                      arguments: null,
+                    },
                   ],
                 },
+                {
+                  kind: "Scalar",
+                  fieldName: "picture_together",
+                  arguments: null,
+                },
               ],
             },
           ],

demos/pet-demo/src/components/__isograph/Mutation/MututalBestFriendSetterMutation/param_type.ts

@@ -1,4 +1,5 @@
 import { type Mutation__MutualBestFriendSetterOtherSide__output_type } from '../../Mutation/MutualBestFriendSetterOtherSide/output_type';
+import { type Pet__Avatar__output_type } from '../../Pet/Avatar/output_type';
 import { type LoadableField, type ExtractParameters } from '@isograph/react';
 import { type Mutation__MutualBestFriendSetterOtherSide__param } from '../../Mutation/MutualBestFriendSetterOtherSide/param_type';
 import type { Mutation__MututalBestFriendSetterMutation__parameters } from './parameters_type';
@@ -9,8 +10,11 @@ export type Mutation__MututalBestFriendSetterMutation__param = {
       readonly pet: {
         readonly id: string,
         readonly best_friend_relationship: ({
+          readonly picture_together: (string | null),
           readonly best_friend: {
             readonly id: string,
+            readonly name: string,
+            readonly Avatar: Pet__Avatar__output_type,
           },
         } | null),
       },

demos/pet-demo/src/components/__isograph/Mutation/MututalBestFriendSetterMutation/query_text.ts

@@ -5,7 +5,10 @@ export default 'mutation MututalBestFriendSetterMutation($id: ID!, $new_best_fri
       best_friend_relationship {\
         best_friend {\
           id,\
+          name,\
+          picture,\
         },\
+        picture_together,\
       },\
     },\
   },\

demos/pet-demo/src/components/__isograph/Mutation/MututalBestFriendSetterMutation/resolver_reader.ts

@@ -2,6 +2,7 @@ import type {ComponentReaderArtifact, ExtractSecondParam, ReaderAst } from '@iso
 import { Mutation__MututalBestFriendSetterMutation__param } from './param_type';
 import { setMututalBestFriend as resolver } from '../../../Pet/MutualBestFriendSetter';
 import Mutation__MutualBestFriendSetterOtherSide__entrypoint from '../../Mutation/MutualBestFriendSetterOtherSide/entrypoint';
+import Pet__Avatar__resolver_reader from '../../Pet/Avatar/resolver_reader';
 
 const readerAst: ReaderAst<Mutation__MututalBestFriendSetterMutation__param> = [
   {
@@ -48,6 +49,13 @@ const readerAst: ReaderAst<Mutation__MututalBestFriendSetterMutation__param> = [
             isUpdatable: false,
             refetchQueryIndex: null,
             selections: [
+              {
+                kind: "Scalar",
+                fieldName: "picture_together",
+                alias: null,
+                arguments: null,
+                isUpdatable: false,
+              },
               {
                 kind: "Linked",
                 fieldName: "best_friend",
@@ -64,6 +72,20 @@ const readerAst: ReaderAst<Mutation__MututalBestFriendSetterMutation__param> = [
                     arguments: null,
                     isUpdatable: false,
                   },
+                  {
+                    kind: "Scalar",
+                    fieldName: "name",
+                    alias: null,
+                    arguments: null,
+                    isUpdatable: false,
+                  },
+                  {
+                    kind: "Resolver",
+                    alias: "Avatar",
+                    arguments: null,
+                    readerArtifact: Pet__Avatar__resolver_reader,
+                    usedRefetchQueries: [],
+                  },
                 ],
               },
             ],