From 6b38241aaf0d1d09373e80c6908d8dbb39e92f48 Mon Sep 17 00:00:00 2001
From: Vaibhav Gupta <vbv@boundaryml.com>
Date: Thu, 13 Jun 2024 16:19:03 -0700
Subject: [PATCH] Fixed the deserializer when it comes to massive markdown

---
 .../parser/fixing_parser/json_parse_state.rs  | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/engine/baml-lib/jsonish/src/jsonish/parser/fixing_parser/json_parse_state.rs b/engine/baml-lib/jsonish/src/jsonish/parser/fixing_parser/json_parse_state.rs
index 6ccc8ad3f..a052bb6a6 100644
--- a/engine/baml-lib/jsonish/src/jsonish/parser/fixing_parser/json_parse_state.rs
+++ b/engine/baml-lib/jsonish/src/jsonish/parser/fixing_parser/json_parse_state.rs
@@ -168,35 +168,43 @@ impl JsonParseState {
                             if let Some((_, next_c)) = next.peek() {
                                 match next_c {
                                     '\n' => {
+                                        log::debug!("Closing due to: newline after comma");
                                         return Some(idx);
                                     }
                                     ' ' => {
+                                        log::debug!("Testing for comment after space + comma");
                                         // If after the space we have "//" or "/*" or the beginning of a key, we'll close the string
-                                        while let Some((_, c)) = next.next() {
-                                            match c {
-                                                ' ' => {}
-                                                '\n' => {
-                                                    return Some(idx);
-                                                }
+                                        let mut buffer = ",".to_string();
+                                        while let Some((_, next_next_c)) = next.next() {
+                                            buffer.push(next_next_c);
+                                            match next_next_c {
+                                                ' ' | '\n' => {}
                                                 '/' => match next.peek() {
                                                     Some((_, '/')) => {
+                                                        // This is likely a comment
                                                         return Some(idx);
                                                     }
                                                     Some((_, '*')) => {
+                                                        // This is likely a comment
                                                         return Some(idx);
                                                     }
                                                     _ => {
-                                                        let _ = self.consume(c);
+                                                        // let _ = self.consume(c);
                                                     }
                                                 },
                                                 '"' => {
+                                                    // This is likely a new key
+                                                    log::debug!("Closing due to: new key after space + comma");
                                                     return Some(idx);
                                                 }
                                                 x => {
-                                                    let _ = self.consume(x);
+                                                    break;
                                                 }
                                             }
                                         }
+                                        for c in buffer.chars() {
+                                            let _ = self.consume(c);
+                                        }
                                     }
                                     _ => {
                                         let _ = self.consume(c);