@apteva/apteva-kit 0.1.76 → 0.1.77

package/dist/index.js

@@ -606,6 +606,14 @@ function findMatchingBracket(text, startIndex) {
   }
   return -1;
 }
+function findOpeningBracket(text) {
+  const squareIndex = text.indexOf("[");
+  const curlyIndex = text.indexOf("{");
+  if (squareIndex === -1 && curlyIndex === -1) return null;
+  if (squareIndex === -1) return { index: curlyIndex, char: "{" };
+  if (curlyIndex === -1) return { index: squareIndex, char: "[" };
+  return squareIndex < curlyIndex ? { index: squareIndex, char: "[" } : { index: curlyIndex, char: "{" };
+}
 function parseWidgetsFromText(text) {
   const segments = [];
   let hasWidgets = false;
@@ -619,13 +627,14 @@ function parseWidgetsFromText(text) {
     const typeMatch = afterStart.match(/^@ui:(\w+)/);
     if (typeMatch) {
       const widgetType = typeMatch[1];
-      const bracketOpenIndex = afterStart.indexOf("[");
-      if (bracketOpenIndex === -1) {
+      const afterType = afterStart.slice(typeMatch[0].length);
+      const bracketInfo = findOpeningBracket(afterType);
+      if (!bracketInfo) {
         processText = text.slice(0, lastWidgetStart);
         pendingWidgetType = widgetType;
         hasPendingWidget = true;
       } else {
-        const fullBracketStart = lastWidgetStart + bracketOpenIndex;
+        const fullBracketStart = lastWidgetStart + typeMatch[0].length + bracketInfo.index;
         const bracketEnd = findMatchingBracket(text, fullBracketStart);
         if (bracketEnd === -1) {
           if (STREAMABLE_WIDGET_TYPES.includes(widgetType)) {
@@ -667,16 +676,22 @@ function parseWidgetsFromText(text) {
   if (hasPendingWidget) {
     processText = processText.replace(/[\s:;\-–—\.]+$/g, "");
   }
-  const startPattern = /@ui:(\w+)\[/g;
+  const startPattern = /@ui:(\w+)([\[{])/g;
   let match;
   while ((match = startPattern.exec(processText)) !== null) {
     const widgetType = match[1];
+    const openingBracket = match[2];
     const bracketStart = match.index + match[0].length - 1;
     const bracketEnd = findMatchingBracket(processText, bracketStart);
     if (bracketEnd === -1) {
       continue;
     }
-    const jsonContent = processText.slice(bracketStart + 1, bracketEnd);
+    let jsonContent;
+    if (openingBracket === "[") {
+      jsonContent = processText.slice(bracketStart + 1, bracketEnd);
+    } else {
+      jsonContent = processText.slice(bracketStart, bracketEnd + 1);
+    }
     if (match.index > currentIndex) {
       const textContent = processText.slice(currentIndex, match.index).trim();
       if (textContent) {