@retrivora-ai/rag-engine 1.3.3 → 1.3.4

package/dist/index.js

@@ -335,10 +335,9 @@ function sanitizeJson(raw) {
   s = s.replace(/,\s*([}\]])/g, "$1");
   s = s.replace(/([{,])\s*""\s*(?=[,}])/g, "$1");
   {
+    const stack = [];
     let inString = false;
     let escape = false;
-    let braces = 0;
-    let brackets = 0;
     for (const ch of s) {
       if (escape) {
         escape = false;
@@ -353,23 +352,21 @@ function sanitizeJson(raw) {
         continue;
       }
       if (inString) continue;
-      if (ch === "{") braces++;
-      else if (ch === "}") braces--;
-      else if (ch === "[") brackets++;
-      else if (ch === "]") brackets--;
+      if (ch === "{" || ch === "[") {
+        stack.push(ch);
+      } else if (ch === "}") {
+        if (stack[stack.length - 1] === "{") stack.pop();
+      } else if (ch === "]") {
+        if (stack[stack.length - 1] === "[") stack.pop();
+      }
     }
     if (inString) s += '"';
-    while (brackets > 0) {
-      s += "]";
-      brackets--;
-    }
-    while (braces > 0) {
-      s += "}";
-      braces--;
+    for (let i = stack.length - 1; i >= 0; i--) {
+      s += stack[i] === "{" ? "}" : "]";
     }
   }
   const lastClose = Math.max(s.lastIndexOf("}"), s.lastIndexOf("]"));
-  if (lastClose !== -1 && lastClose < s.length - 1) {
+  if (lastClose !== -1 && lastClose < s.length - 1 && /\S/.test(s.slice(lastClose + 1))) {
     s = s.substring(0, lastClose + 1);
   }
   return s;

package/dist/index.mjs

@@ -298,10 +298,9 @@ function sanitizeJson(raw) {
   s = s.replace(/,\s*([}\]])/g, "$1");
   s = s.replace(/([{,])\s*""\s*(?=[,}])/g, "$1");
   {
+    const stack = [];
     let inString = false;
     let escape = false;
-    let braces = 0;
-    let brackets = 0;
     for (const ch of s) {
       if (escape) {
         escape = false;
@@ -316,23 +315,21 @@ function sanitizeJson(raw) {
         continue;
       }
       if (inString) continue;
-      if (ch === "{") braces++;
-      else if (ch === "}") braces--;
-      else if (ch === "[") brackets++;
-      else if (ch === "]") brackets--;
+      if (ch === "{" || ch === "[") {
+        stack.push(ch);
+      } else if (ch === "}") {
+        if (stack[stack.length - 1] === "{") stack.pop();
+      } else if (ch === "]") {
+        if (stack[stack.length - 1] === "[") stack.pop();
+      }
     }
     if (inString) s += '"';
-    while (brackets > 0) {
-      s += "]";
-      brackets--;
-    }
-    while (braces > 0) {
-      s += "}";
-      braces--;
+    for (let i = stack.length - 1; i >= 0; i--) {
+      s += stack[i] === "{" ? "}" : "]";
     }
   }
   const lastClose = Math.max(s.lastIndexOf("}"), s.lastIndexOf("]"));
-  if (lastClose !== -1 && lastClose < s.length - 1) {
+  if (lastClose !== -1 && lastClose < s.length - 1 && /\S/.test(s.slice(lastClose + 1))) {
     s = s.substring(0, lastClose + 1);
   }
   return s;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@retrivora-ai/rag-engine",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "description": "Retrivora AI is a plug-and-play AI engine for RAG chat experiences — generic vector DB + LLM provider, embeddable or standalone.",
   "author": "Abhinav Alkuchi",
   "license": "MIT",

package/src/components/MessageBubble.tsx

@@ -46,36 +46,45 @@ function sanitizeJson(raw: string): string {
   // 6. Remove completely empty key-value pairs left by prior cleanup
   s = s.replace(/([{,])\s*""\s*(?=[,}])/g, '$1');
 
-  // 7. Balance braces/brackets: walk char-by-char, track depth, append closers
-  //    Do this BEFORE the lastValidIndex trim so we don't cut valid JSON.
+  // 7. Stack-based structure balancer.
+  //    Walk every character, maintain a stack of openers so we close each
+  //    unclosed structure with its exact matching closer — in the right order.
+  //    This is the critical fix: a flat counter approach appends all ]'s then
+  //    all }'s, which corrupts nested structures like {..., [..., {...}]}.
   {
+    const stack: ('{' | '[')[] = [];
     let inString = false;
     let escape = false;
-    let braces = 0;
-    let brackets = 0;
 
     for (const ch of s) {
       if (escape) { escape = false; continue; }
       if (ch === '\\' && inString) { escape = true; continue; }
       if (ch === '"') { inString = !inString; continue; }
       if (inString) continue;
-      if (ch === '{') braces++;
-      else if (ch === '}') braces--;
-      else if (ch === '[') brackets++;
-      else if (ch === ']') brackets--;
+
+      if (ch === '{' || ch === '[') {
+        stack.push(ch);
+      } else if (ch === '}') {
+        if (stack[stack.length - 1] === '{') stack.pop();
+        // mismatched closer — leave stack alone (sanitize step 5 handles trailing commas)
+      } else if (ch === ']') {
+        if (stack[stack.length - 1] === '[') stack.pop();
+      }
     }
 
-    // Close any unclosed string first
+    // Close any unterminated string literal first
     if (inString) s += '"';
-    // Then close structures in the correct order
-    while (brackets > 0) { s += ']'; brackets--; }
-    while (braces > 0) { s += '}'; braces--; }
+
+    // Close every unclosed opener in reverse (innermost first)
+    for (let i = stack.length - 1; i >= 0; i--) {
+      s += stack[i] === '{' ? '}' : ']';
+    }
   }
 
-  // 8. Trim to the last valid closing char only if there is trailing garbage
-  //    (e.g. a partial second object after the first one ends)
+  // 8. Trim trailing garbage that appears after the outermost closing char.
+  //    Only fires when something non-whitespace follows the last } or ].
   const lastClose = Math.max(s.lastIndexOf('}'), s.lastIndexOf(']'));
-  if (lastClose !== -1 && lastClose < s.length - 1) {
+  if (lastClose !== -1 && lastClose < s.length - 1 && /\S/.test(s.slice(lastClose + 1))) {
     s = s.substring(0, lastClose + 1);
   }
 
@@ -211,10 +220,7 @@ export function MessageBubble({
       const mentioned =
         contentLower.includes(p.name.toLowerCase()) ||
         (p.brand ? contentLower.includes(p.brand.toLowerCase()) : false);
-      if (mentioned) {
-        seen.add(id);
-        return true;
-      }
+      if (mentioned) { seen.add(id); return true; }
       return false;
     });
   }, [productsFromSources, productsFromContent, message.content]);