ok

Author: dotansimha

lib/query-planner/src/planner/fetch/optimize/utils.rs

@@ -50,7 +50,7 @@ pub(crate) fn perform_fetch_step_merge(
         me.condition = other.condition.take();
     }
 
-    let scoped_aliases = me.output_new.safe_add_from_another_at_path(
+    let scoped_aliases = me.output_new.safe_migrate_from_another(
         &other.output_new,
         &other.response_path.slice_from(me.response_path.len()),
         (me.used_for_requires, other.used_for_requires),

lib/query-planner/src/planner/fetch/selections.rs

@@ -176,20 +176,19 @@ impl FetchStepSelections<MultiTypeFetchStep> {
         merge_selection_set(selections, selection_set, false);
     }
 
-    pub fn safe_add_from_another_at_path(
+    pub fn safe_migrate_from_another(
         &mut self,
         other: &Self,
         fetch_path: &MergePath,
         (self_used_for_requires, other_used_for_requires): (bool, bool),
     ) -> Vec<(String, AliasesRecords)> {
         let mut aliases_made: Vec<(String, AliasesRecords)> = Vec::new();
+        let maybe_merge_into = self.try_as_single().map(|str| str.to_string());
 
         for (definition_name, selection_set) in other.iter_selections() {
-            // let target_type_name = self
-            //     .get_definition_to_modify(fetch_path, definition_name)
-            //     .to_string();
+            let target_type = maybe_merge_into.as_ref().unwrap_or(definition_name);
             let current = self
-                .selections_for_definition_mut(&definition_name)
+                .selections_for_definition_mut(&target_type)
                 .expect("missing");
 
             if let Some(selection_at_path) = find_selection_set_by_path_mut(current, fetch_path) {
@@ -202,13 +201,13 @@ impl FetchStepSelections<MultiTypeFetchStep> {
                 );
 
                 if !current_aliases_made.is_empty() {
-                    aliases_made.push((definition_name.to_string(), current_aliases_made));
+                    aliases_made.push((target_type.to_string(), current_aliases_made));
                 }
             } else {
                 // TODO: Replace with error handling
                 panic!(
                     "[{}]: Path '{}' cannot be found in selection set: '{}'",
-                    definition_name, fetch_path, current
+                    target_type, fetch_path, current
                 );
             }
         }