[JSONSelection] Support -> method syntax for inline data transforms

apollo-federation/src/sources/connect/expand/mod.rs

@@ -206,8 +206,6 @@ mod helpers {
     use crate::schema::position::TypeDefinitionPosition;
     use crate::schema::FederationSchema;
     use crate::schema::ValidFederationSchema;
-    use crate::sources::connect::json_selection::ExtractParameters;
-    use crate::sources::connect::json_selection::StaticParameter;
     use crate::sources::connect::url_template::Parameter;
     use crate::sources::connect::ConnectSpecDefinition;
     use crate::sources::connect::Connector;
@@ -799,36 +797,53 @@ mod helpers {
     fn extract_params_from_body(
         connector: &Connector,
     ) -> Result<HashSet<Parameter>, FederationError> {
-        let body_parameters = connector
-            .transport
-            .body
-            .as_ref()
-            .and_then(JSONSelection::extract_parameters)
-            .unwrap_or_default();
-
-        body_parameters
-            .iter()
-            .map(|StaticParameter { name, paths }| {
-                let mut parts = paths.iter();
-                let field = parts.next().ok_or(FederationError::internal(
-                    "expected parameter in JSONSelection to contain a field",
-                ))?;
-
-                match *name {
-                    "$args" => Ok(Parameter::Argument {
-                        argument: field,
-                        paths: parts.copied().collect(),
-                    }),
-                    "$this" => Ok(Parameter::Sibling {
-                        field,
-                        paths: parts.copied().collect(),
-                    }),
-                    other => Err(FederationError::internal(format!(
-                        "got unsupported parameter: {other}"
-                    ))),
-                }
-            })
-            .collect::<Result<HashSet<_>, _>>()
+        if let Some(body) = &connector.transport.body {
+            use crate::sources::connect::json_selection::CollectVarPaths;
+            let var_paths = body.collect_var_paths();
+
+            let mut results =
+                HashSet::with_capacity_and_hasher(var_paths.len(), Default::default());
+
+            for var_path in var_paths {
+                match var_path.var_name_and_nested_keys() {
+                    Some(("$args", keys)) => {
+                        let mut keys_iter = keys.into_iter();
+                        let first_key = keys_iter.next().ok_or(FederationError::internal(
+                            "expected at least one key in $args",
+                        ))?;
+                        results.insert(Parameter::Argument {
+                            argument: first_key,
+                            paths: keys_iter.collect(),
+                        });
+                    }
+                    Some(("$this", keys)) => {
+                        let mut keys_iter = keys.into_iter();
+                        let first_key = keys_iter.next().ok_or(FederationError::internal(
+                            "expected at least one key in $this",
+                        ))?;
+                        results.insert(Parameter::Sibling {
+                            field: first_key,
+                            paths: keys_iter.collect(),
+                        });
+                    }
+                    Some((other, _)) => {
+                        return Err(FederationError::internal(format!(
+                            "got unsupported parameter: {other}"
+                        )))
+                    }
+                    _ => {
+                        return Err(FederationError::internal(format!(
+                            "could not extract parameter from path: {:?}",
+                            var_path,
+                        )))
+                    }
+                };
+            }
+
+            Ok(results)
+        } else {
+            Ok(HashSet::default())
+        }
     }
 }
 

apollo-federation/src/sources/connect/expand/tests/snapshots/apollo_federation__sources__connect__expand__tests__nested_inputs__it_expands_supergraph-2.snap

@@ -78,10 +78,12 @@ expression: connectors.by_service_name
             body: None,
         },
         selection: Path(
-            Var(
-                "$",
-                Empty,
-            ),
+            PathSelection {
+                path: Var(
+                    "$",
+                    Empty,
+                ),
+            },
         ),
         config: None,
         max_requests: None,

apollo-federation/src/sources/connect/expand/tests/snapshots/apollo_federation__sources__connect__expand__tests__realistic__it_expands_supergraph-2.snap

@@ -64,15 +64,17 @@ expression: connectors.by_service_name
                                 Alias {
                                     name: "emailDomain",
                                 },
-                                Var(
-                                    "$args",
-                                    Key(
-                                        Field(
-                                            "email",
+                                PathSelection {
+                                    path: Var(
+                                        "$args",
+                                        Key(
+                                            Field(
+                                                "email",
+                                            ),
+                                            Empty,
                                         ),
-                                        Empty,
                                     ),
-                                ),
+                                },
                             ),
                         ],
                         star: None,

apollo-federation/src/sources/connect/expand/tests/snapshots/apollo_federation__sources__connect__expand__tests__simple__it_expands_supergraph-2.snap

@@ -209,15 +209,17 @@ expression: connectors.by_service_name
                                 Alias {
                                     name: "with_b",
                                 },
-                                Var(
-                                    "$this",
-                                    Key(
-                                        Field(
-                                            "b",
+                                PathSelection {
+                                    path: Var(
+                                        "$this",
+                                        Key(
+                                            Field(
+                                                "b",
+                                            ),
+                                            Empty,
                                         ),
-                                        Empty,
                                     ),
-                                ),
+                                },
                             ),
                         ],
                         star: None,
@@ -226,10 +228,12 @@ expression: connectors.by_service_name
             ),
         },
         selection: Path(
-            Var(
-                "$",
-                Empty,
-            ),
+            PathSelection {
+                path: Var(
+                    "$",
+                    Empty,
+                ),
+            },
         ),
         config: None,
         max_requests: None,

apollo-federation/src/sources/connect/expand/tests/snapshots/apollo_federation__sources__connect__expand__tests__steelthread__it_expands_supergraph-2.snap

@@ -219,15 +219,17 @@ expression: connectors.by_service_name
             body: None,
         },
         selection: Path(
-            Var(
-                "$",
-                Key(
-                    Field(
-                        "phone",
+            PathSelection {
+                path: Var(
+                    "$",
+                    Key(
+                        Field(
+                            "phone",
+                        ),
+                        Empty,
                     ),
-                    Empty,
                 ),
-            ),
+            },
         ),
         config: None,
         max_requests: None,