Merge 6817e90 into d9e6554

graphqxl_synthesizer/src/synth_description.rs

@@ -1,4 +1,5 @@
 use crate::synths::{Synth, SynthConfig, SynthContext};
+use crate::utils::escape_non_escaped_quotes;
 
 pub(crate) struct DescriptionSynth {
     pub(crate) text: String,
@@ -27,14 +28,14 @@ impl Synth for DescriptionSynth {
             for line in self.text.split('\n') {
                 result += "\n";
                 result += &" ".repeat(context.indent_lvl * self.indent_spaces);
-                result += line;
+                result += &escape_non_escaped_quotes(line);
             }
             result += "\n";
             result += &" ".repeat(context.indent_lvl * self.indent_spaces);
             result += "\"\"\"";
         } else {
             result += "\"";
-            result += &self.text;
+            result += &escape_non_escaped_quotes(&self.text);
             result += "\"";
         }
         result

graphqxl_synthesizer/src/synth_value_data.rs

@@ -1,4 +1,4 @@
-use crate::utils::is_last_iter;
+use crate::utils::{escape_non_escaped_quotes, is_last_iter};
 use crate::{Synth, SynthContext};
 use graphqxl_parser::{ValueBasicData, ValueData};
 
@@ -22,7 +22,7 @@ impl Synth for ValueDataSynth {
                     res
                 }
                 ValueBasicData::Boolean(v) => v.to_string(),
-                ValueBasicData::String(v) => format!("\"{v}\""),
+                ValueBasicData::String(v) => format!("\"{}\"", escape_non_escaped_quotes(v)),
             },
             ValueData::List(items) => {
                 let mut summed = "[".to_string();

graphqxl_synthesizer/src/utils/escape_non_escaped_quotes.rs

@@ -0,0 +1,18 @@
+pub(crate) fn escape_non_escaped_quotes(str: &str) -> String {
+    str.replace("\\\"", "\"").replace('\"', "\\\"")
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_escapes_quotes() {
+        assert_eq!(escape_non_escaped_quotes("\""), "\\\"")
+    }
+
+    #[test]
+    fn test_not_escapes_already_escaped_quote() {
+        assert_eq!(escape_non_escaped_quotes("\\\""), "\\\"")
+    }
+}

graphqxl_synthesizer/src/utils/mod.rs

@@ -1,3 +1,5 @@
+mod escape_non_escaped_quotes;
 mod is_last_iter;
 
+pub(crate) use escape_non_escaped_quotes::*;
 pub(crate) use is_last_iter::*;

src/main.rs

@@ -11,6 +11,9 @@ struct Args {
     #[clap()]
     input: String,
 
+    #[clap(long)]
+    output: Option<String>,
+
     #[clap(long)]
     indent_spaces: Option<usize>,
 
@@ -20,7 +23,9 @@ struct Args {
 
 fn main() -> Result<()> {
     let args = Args::parse();
-    let out_path = if args.input.ends_with("graphqxl") {
+    let out_path = if let Some(out_path) = args.output {
+        out_path
+    } else if args.input.ends_with("graphqxl") {
         args.input[..args.input.len() - 2].to_string() + "l"
     } else {
         args.input.to_string() + ".graphql"