fix!: not escaping strings

CHANGELOG.md

@@ -2,8 +2,9 @@
 
 ## Unreleased
 
-- added support for prepending to lists [x, ..xs]
+- added support for prepending to lists `[x, ..xs]`
 - reworked generics for custom types to be more flexible and type-safe
+- fix not escaping srtings
 
 ## v0.2.1 - 2024-11-13
 

src/gleamgen/expression.gleam

@@ -686,12 +686,7 @@ pub fn render(
   case expression.internal {
     IntLiteral(value) -> value |> int.to_string() |> doc.from_string()
     FloatLiteral(value) -> value |> float.to_string() |> doc.from_string()
-    StrLiteral(value) ->
-      doc.concat([
-        doc.from_string("\""),
-        doc.from_string(value),
-        doc.from_string("\""),
-      ])
+    StrLiteral(value) -> render.escape_string(value)
     BoolLiteral(True) -> doc.from_string("True")
     BoolLiteral(False) -> doc.from_string("False")
     NilLiteral -> doc.from_string("Nil")
@@ -749,9 +744,7 @@ fn render_panicking_expression(name: String, as_string: Option(String)) {
       doc.concat([
         doc.from_string(name <> " as"),
         doc.space,
-        doc.from_string("\""),
-        doc.from_string(value),
-        doc.from_string("\""),
+        render.escape_string(value),
       ])
       |> doc.group
     None -> doc.from_string(name)

src/gleamgen/matcher.gleam

@@ -646,7 +646,7 @@ pub fn to_unchecked(
 pub fn render(matcher: Matcher(_, _)) -> render.Rendered {
   case matcher {
     Variable(name, ..) -> doc.from_string(name)
-    StringLiteral(literal, ..) -> doc.from_string("\"" <> literal <> "\"")
+    StringLiteral(literal, ..) -> render.escape_string(literal)
     IntLiteral(literal, ..) -> literal |> int.to_string() |> doc.from_string()
     BoolLiteral(True, ..) -> doc.from_string("True")
     BoolLiteral(False, ..) -> doc.from_string("False")

src/gleamgen/render.gleam

@@ -1,4 +1,5 @@
 import glam/doc
+import gleam/string
 
 pub type Rendered {
   Render(doc: doc.Document)
@@ -48,3 +49,25 @@ pub fn body(
   |> doc.append(doc.concat([between_brackets, doc.from_string("}")]))
   |> doc.group
 }
+
+@internal
+pub fn escape_string(string: String) -> doc.Document {
+  let escaped = do_escape_string(string, "")
+  doc.concat([
+    doc.from_string("\""),
+    doc.from_string(escaped),
+    doc.from_string("\""),
+  ])
+}
+
+fn do_escape_string(original: String, escaped: String) -> String {
+  case string.pop_grapheme(original) {
+    Ok(#("\"", rest)) -> {
+      do_escape_string(rest, escaped <> "\\\"")
+    }
+    Ok(#(c, rest)) -> {
+      do_escape_string(rest, escaped <> c)
+    }
+    Error(Nil) -> escaped
+  }
+}

test/gleamgen_test.gleam

@@ -37,6 +37,27 @@ pub fn simple_string_test() {
   |> should.equal("\"hello\"")
 }
 
+pub fn string_escape_quote_test() {
+  expression.string("hel\"lo")
+  |> expression.render(render.default_context())
+  |> render.to_string()
+  |> should.equal("\"hel\\\"lo\"")
+}
+
+pub fn string_escape_slash_test() {
+  expression.string("hello\\hi")
+  |> expression.render(render.default_context())
+  |> render.to_string()
+  |> should.equal("\"hello\\hi\"")
+}
+
+pub fn empty_string_test() {
+  expression.string("")
+  |> expression.render(render.default_context())
+  |> render.to_string()
+  |> should.equal("\"\"")
+}
+
 pub fn simple_tuple_test() {
   expression.tuple3(
     expression.int(3),