@memori.ai/memori-react 7.17.0 → 7.17.2

package/src/components/ChatBubble/ChatBubble.tsx

@@ -35,8 +35,16 @@ marked.use({
   gfm: true,
   pedantic: false,
   renderer: {
-    link: ({ href, title, text }) => {
-      const cleanHref = cleanUrl(href);
+    link: ({
+      href,
+      title,
+      text,
+    }: {
+      href: string | null;
+      title?: string | null;
+      text: string;
+    }) => {
+      const cleanHref = href ? cleanUrl(href) : null;
 
       if (cleanHref === null) {
         return text;
@@ -54,71 +62,69 @@ marked.use({
 marked.use(markedLinkifyIt());
 marked.use(markedExtendedTables());
 
-const parseSquaredBrackets = (text: string) => {
-  const rows = text.split('\n');
-
-  return rows.reduce((acc, row) => {
-    if (row.includes('=')) {
-      let result = '';
-      let isEscaped = false;
-      for (let i = 0; i < row.length; i++) {
-        if (row[i] === '[' && !isEscaped) {
-          result += '\\[';
-        } else if (row[i] === ']' && !isEscaped) {
-          result += '\\]';
-        } else {
-          result += row[i];
-        }
-        isEscaped = row[i] === '\\' && !isEscaped;
-      }
-
-      return acc?.length ? `${acc}\n${result}` : result;
-    } else {
-      return acc?.length ? `${acc}\n${row}` : row;
-    }
-  }, '');
-};
-
-const renderMsg = (text: string, useMathFormatting = false) => {
+// Update the renderMsg function to properly handle math formatting
+const renderMsg = (text: string, useMathFormatting = false): string => {
   try {
-    let parsedText = (
-      marked.parse(
-        text
-          // remove leading and trailing whitespaces
-          .trim()
-          // remove markdown links
-          .replaceAll(
-            /\[([^\]]+)\]\(([^\)]+)\)/g,
-            '<a href="$2" target="_blank" rel="noopener noreferrer">$1</a>'
-          )
-          // remove markdown multiline code blocks but keep the content
-          .replaceAll(/```markdown([^```]+)```/g, '$1')
-          .replaceAll('($', '( $')
-          .replaceAll(':$', ': $')
-          .replaceAll('\frac', '\\frac')
-          .replaceAll('\beta', '\\beta')
-          .replaceAll('cdot', '\\cdot')
-      ) as string
-    ).trim();
-
+    // Preprocessing del testo per gestire i delimitatori LaTeX
+    let preprocessedText = text
+      .trim()
+      .replaceAll(
+        /\[([^\]]+)\]\(([^\)]+)\)/g,
+        '<a href="$2" target="_blank" rel="noopener noreferrer">$1</a>'
+      )
+      .replaceAll(/```markdown([^```]+)```/g, '$1')
+      .replaceAll('($', '( $')
+      .replaceAll(':$', ': $')
+      .replaceAll('\frac', '\\frac')
+      .replaceAll('\beta', '\\beta')
+      .replaceAll('cdot', '\\cdot');
+    
+    // Correzione dei delimitatori LaTeX inconsistenti
     if (useMathFormatting) {
-      parsedText = parseSquaredBrackets(parsedText.replace(/\n/g, '<br>'));
+      // Normalizza tutti i delimitatori LaTeX per equazioni su linea separata
+      // Da \\[ ... \\] o \\[ ... ] a $$ ... $$
+      preprocessedText = preprocessedText.replace(
+        /\\+\[(.*?)\\*\]/gs,
+        (_, content) => {
+          return `$$${content}$$`;
+        }
+      );
+      
+      // Gestione dei delimitatori [ ... ] che dovrebbero essere equazioni
+      preprocessedText = preprocessedText.replace(
+        /\[([^[\]]+?)\]/g,
+        (match, content) => {
+          // Verifica se sembra una formula matematica
+          if (/[\\+a-z0-9_{}^=\-\+\*\/]+/i.test(content) && 
+              !match.startsWith('[http') && 
+              !match.includes('](')) {
+            return `$$${content}$$`;
+          }
+          return match; // Mantieni invariati i link e altre strutture
+        }
+      );
     }
 
+    // Ora procedi con il parsing markdown
+    let parsedText = marked
+      .parse(preprocessedText)
+      .toString()
+      .trim();
+
+    // Sanitizza l'HTML
     parsedText = DOMPurify.sanitize(parsedText, {
       ADD_ATTR: ['target'],
     });
 
-    return (
-      parsedText
-        // replace consecutive <br> with a single <br>
-        .replace(/(<br>)+/g, '<br>')
-        // remove empty paragraphs
-        .replace(/<p><\/p>/g, '<br>')
-        .replace(/<p><br><\/p>/g, '<br>')
-    );
+    // Pulizia del testo finale
+    const finalText = parsedText
+      .replace(/(<br>)+/g, '<br>')
+      .replace(/<p><\/p>/g, '<br>')
+      .replace(/<p><br><\/p>/g, '<br>');
+
+    return finalText;
   } catch (e) {
-    console.error(e);
+    console.error('Error rendering message:', e);
     return text;
   }
 };
@@ -189,16 +195,14 @@ const ChatBubble: React.FC<Props> = ({
       !message.fromUser &&
       useMathFormatting
     ) {
-      // @ts-ignore
-      // eslint-disable-next-line no-undef
-      if ('MathJax' in window && window.MathJax.typesetPromise)
-        // @ts-ignore
-        // eslint-disable-next-line no-undef
-        window.MathJax.typesetPromise(['.memori-chat--bubble-content']);
+      // Add type declaration for MathJax
+      const mathJax = (window as any).MathJax;
+      if (mathJax?.typesetPromise) {
+        mathJax.typesetPromise(['.memori-chat--bubble-content']);
+      }
     }
   }, [message.text, message.fromUser, useMathFormatting]);
 
-  
   return (
     <>
       {(message.initial || isFirst) && (