fix: make sure all input types end up in the expanded supergraph

[lennyburdette]

this is particularly annoying because the original types might have join__* directives that refer to subgraphs that no longer exist

---

Checklist

Complete the checklist (and note appropriate exceptions) before the PR is marked ready-for-review.

• Changes are compatible¹
• Documentation² completed
• Performance impact assessed and acceptable
• Tests added and passing³
  • Unit Tests
  • Integration Tests
  • Manual Tests

Exceptions

Note any exceptions here

Notes

Footnotes

1. It may be appropriate to bring upcoming changes to the attention of other (impacted) groups. Please endeavour to do this before seeking PR approval. The mechanism for doing this will vary considerably, so use your judgement as to how and when to do this. ↩

2. Configuration is an important part of many changes. Where applicable please try to document configuration examples. ↩

3. Tick whichever testing boxes are applicable. If you are adding Manual Tests, please document the manual testing (extensively) in the Exceptions. ↩

[svc-apollo-docs]

✅ Docs preview has no changes

The preview was not built because there were no changes.

Build ID: 48d1c8726efb8dc309cb065d

[lennyburdette]

@dylan-apollo for some reason the snapshot results have connect/v0.1 instead of v0.2 in them and i can't figure out how I changed that. any ideas?

[lennyburdette]

Nevermind, it's from composing with fed 2.10, not 2.11 preview

[andrewmcgivery]

Is this meant to be here?

[dylan-apollo]

LGTM, though the code is dense enough that we totally could be missing something

[dylan-apollo]

Suggested change

	let new_subgraph_names_to_enum_values: HashMap<_, _> = to_join_graph_enum
	.values
	.iter()
	.map(|(name, value)| {
	let new_subgraph_names = value
	.directives
	.iter()
	.find(|d| d.name == name!(join__graph))
	.and_then(|d| {
	d.arguments
	.iter()
	.find(|a| a.name == name!(name))
	.and_then(|a| a.value.as_str())
	})
	.ok_or_else(|| "no name argument on join__graph".to_string())?;
	Ok::<_, String>((new_subgraph_names, name))
	})
	.try_collect()?;
	let new_subgraph_names_to_enum_values: HashMap<_, _> = to_join_graph_enum
	.values
	.iter()
	.map(|(name, value)| {
	value
	.directives
	.iter()
	.find(|d| d.name == name!(join__graph))
	.and_then(|d| {
	d.arguments
	.iter()
	.find(|a| a.name == name!(name))
	.and_then(|a| a.value.as_str())
	})
	.ok_or("no name argument on join__graph")
	.map(|new_subgraph_name| (new_subgraph_name, name))
	})
	.try_collect()?;

Two little improvements here:

1. .map at the end instead of assigning and using Ok::<>
2. .ok_or with &str since we didn't need to extra String in the error.

Same thing can be done in the second HashMap, but also there should probably be a single function that translates the join__Graph into the hashmap rather than replicating it.

[lennyburdette]

this is great, thank you!