fix: generator config clean up. (#2251)

Co-authored-by: meskill <[email protected]>
Co-authored-by: Ranjit Mahadik <[email protected]>
Co-authored-by: Tushar Mathur <[email protected]>

src/cli/generator/config.rs

@@ -83,16 +83,22 @@ impl Location<UnResolved> {
 pub struct Input<Status = UnResolved> {
     #[serde(flatten)]
     pub source: Source<Status>,
-    pub field_name: String,
-    pub operation: Operation,
 }
 
 #[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub enum Source<Status = UnResolved> {
-    Curl { src: Location<Status> },
-    Proto { src: Location<Status> },
-    Config { src: Location<Status> },
+    #[serde(rename_all = "camelCase")]
+    Curl {
+        src: Location<Status>,
+        field_name: String,
+    },
+    Proto {
+        src: Location<Status>,
+    },
+    Config {
+        src: Location<Status>,
+    },
 }
 
 #[derive(Deserialize, Serialize, Debug, Default)]
@@ -104,14 +110,6 @@ pub struct Output<Status = UnResolved> {
     pub format: Option<config::Source>,
 }
 
-#[derive(Deserialize, Serialize, Debug, Default)]
-#[serde(rename_all = "camelCase")]
-pub enum Operation {
-    #[default]
-    Query,
-    Mutation,
-}
-
 #[derive(Debug)]
 pub enum Resolved {}
 
@@ -139,9 +137,9 @@ impl Output<UnResolved> {
 impl Source<UnResolved> {
     pub fn resolve(self, parent_dir: Option<&Path>) -> anyhow::Result<Source<Resolved>> {
         match self {
-            Source::Curl { src } => {
+            Source::Curl { src, field_name } => {
                 let resolved_path = src.into_resolved(parent_dir);
-                Ok(Source::Curl { src: resolved_path })
+                Ok(Source::Curl { src: resolved_path, field_name })
             }
             Source::Proto { src, .. } => {
                 let resolved_path = src.into_resolved(parent_dir);
@@ -158,11 +156,7 @@ impl Source<UnResolved> {
 impl Input<UnResolved> {
     pub fn resolve(self, parent_dir: Option<&Path>) -> anyhow::Result<Input<Resolved>> {
         let resolved_source = self.source.resolve(parent_dir)?;
-        Ok(Input {
-            source: resolved_source,
-            field_name: self.field_name,
-            operation: self.operation,
-        })
+        Ok(Input { source: resolved_source })
     }
 }
 
@@ -193,14 +187,12 @@ mod tests {
 
     #[test]
     fn test_config_codec() {
-        let config = Config::default().inputs(vec![
-            //
-            Input {
+        let config = Config::default().inputs(vec![Input {
+            source: Source::Curl {
+                src: location("https://example.com"),
                 field_name: "test".to_string(),
-                operation: Operation::Query,
-                source: Source::Curl { src: location("https://example.com") },
             },
-        ]);
+        }]);
         let actual = serde_json::to_string_pretty(&config).unwrap();
         insta::assert_snapshot!(actual)
     }

src/cli/generator/generator.rs

@@ -93,13 +93,13 @@ impl Generator {
 
         for input in config.inputs {
             match input.source {
-                Source::Curl { src, .. } => {
+                Source::Curl { src, field_name } => {
                     let url = src.0;
                     let contents = reader.read_file(&url).await?.content;
                     input_samples.push(Input::Json {
                         url: url.parse()?,
                         response: serde_json::from_str(&contents)?,
-                        field_name: input.field_name,
+                        field_name,
                     });
                 }
                 Source::Proto { src } => {

src/cli/generator/snapshots/tailcall__cli__generator__config__tests__config_codec.snap

@@ -6,10 +6,9 @@ expression: actual
   "inputs": [
     {
       "curl": {
-        "src": "https://example.com"
-      },
-      "fieldName": "test",
-      "operation": "query"
+        "src": "https://example.com",
+        "fieldName": "test"
+      }
     }
   ],
   "output": {},

tailcall-fixtures/fixtures/generator/simple-json.json

@@ -1,21 +1,17 @@
 {
   "inputs": [
     {
-      "URL": {
-        "url": "https://jsonplaceholder.typicode.com/posts/1"
-      },
-      "fieldName": "post",
-      "operation": "Query"
+      "curl": {
+        "src": "https://jsonplaceholder.typicode.com/posts/1",
+        "fieldName": "post"
+      }
     },
     {
-      "URL": {
-        "url": "https://jsonplaceholder.typicode.com/posts"
-      },
-      "fieldName": "posts",
-      "operation": "Query"
+      "proto": {
+        "src": "../protobuf/news.proto"
+      }
     }
   ],
-
   "preset": {
     "mergeType": 1,
     "consolidateURL": 0.5