Fix JSON Lines handling using new pretty printing

gnieh · Mar 23, 2024 · cef0a41 · cef0a41
1 parent b856965
commit cef0a41
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/site/cookbooks/jsonlines.md b/site/cookbooks/jsonlines.md
@@ -53,7 +53,7 @@ val array =
     .through(readJsonLines)
     .through(fs2.data.json.ast.tokenize)
     .through(fs2.data.json.wrap.asTopLevelArray)
-    .through(fs2.data.json.render.pretty())
+    .through(fs2.data.json.render.prettyPrint(width = 35))
 
 array
   .compile
@@ -80,9 +80,13 @@ Similarly, using `fs2` and `fs2-data` operators, we can generate a stream that w
 ```scala mdoc
 def writeJsonLines(input: Stream[IO, Json]): Stream[IO, Byte] =
   input
-    .flatMap { data =>
+    .map { data =>
       // rule #2: values must be encoded on single lines
-      Stream.emit(data).through(fs2.data.json.ast.tokenize).through(fs2.data.json.render.compact)
+      Stream.emit(data)
+            .through(fs2.data.json.ast.tokenize)
+            .through(fs2.data.json.render.compact)
+            .compile
+            .string
     }
     // rule #3: new line delimiter is '\n'
     .intersperse("\n")

diff --git a/site/cookbooks/scripts/jsonlines.scala b/site/cookbooks/scripts/jsonlines.scala
@@ -40,9 +40,13 @@ object JsonLines
 
   def writeJsonLines(input: Stream[IO, Json]): Stream[IO, Byte] =
     input
-      .flatMap { data =>
+      .map { data =>
         // rule #2: values must be encoded on single lines
-        Stream.emit(data).through(fs2.data.json.ast.tokenize).through(fs2.data.json.render.compact)
+        Stream.emit(data)
+          .through(fs2.data.json.ast.tokenize)
+          .through(fs2.data.json.render.compact)
+          .compile
+          .string
       }
       // rule #3: new line delimiter is '\n'
       .intersperse("\n")
@@ -67,7 +71,7 @@ object JsonLines
           .through(readJsonLines)
           .through(fs2.data.json.ast.tokenize)
           .through(fs2.data.json.wrap.asTopLevelArray)
-          .through(fs2.data.json.render.pretty())
+          .through(fs2.data.json.render.prettyPrint())
           .through(fs2.text.utf8.encode)
           .through(fs2.io.stdout)
           .compile