eat-js-sdk 2.2.5 → 2.2.6

package/dist/interaction-builder.mjs

@@ -19100,27 +19100,38 @@ registerInteraction("dropdown", createDropdownInteraction, DropdownComponent);
 const decodeNbsp = (text) => text.replace(/ /g, " ").replace(/ /g, " ");
 const stripTags = (s) => s.replace(/<[^>]+>/g, "");
 const hasHtmlTags = (s) => /<[^>]/.test(s);
+const getTagName = (tag) => tag.replace(/^<\/?([^\s>]+).*$/, "$1").toLowerCase();
 const extractHtmlWords = (htmlText) => {
-  const re = /(<\/[^>]+>)|(<[^>]+>)|(\S+)/g;
-  const result = [];
-  let openPending = "";
+  const re = /(<\/[^>]+>)|(<[^>]+>)|([^\s<>]+)/g;
+  const tokens = [];
   let m;
   while ((m = re.exec(htmlText)) !== null) {
-    if (m[3]) {
-      result.push(openPending + m[3]);
-      openPending = "";
-    } else if (m[2]) {
-      openPending += m[2];
-    } else if (m[1]) {
-      if (result.length > 0) {
-        result[result.length - 1] += m[1];
+    if (m[1]) tokens.push({ type: "close", value: m[1] });
+    else if (m[2]) tokens.push({ type: "open", value: m[2] });
+    else tokens.push({ type: "word", value: m[3] });
+  }
+  const words = [];
+  const openStack = [];
+  for (const tok of tokens) {
+    if (tok.type === "open") {
+      openStack.push(tok.value);
+    } else if (tok.type === "close") {
+      const closingName = getTagName(tok.value);
+      for (let i = openStack.length - 1; i >= 0; i--) {
+        if (getTagName(openStack[i]) === closingName) {
+          openStack.splice(i, 1);
+          break;
+        }
       }
+    } else {
+      words.push({ value: tok.value, openStack: [...openStack] });
     }
   }
-  if (openPending && result.length > 0) {
-    result[result.length - 1] += openPending;
-  }
-  return result;
+  return words.map(({ value, openStack: openStack2 }) => {
+    const open = openStack2.join("");
+    const close = [...openStack2].reverse().map((t2) => `</${getTagName(t2)}>`).join("");
+    return open + value + close;
+  });
 };
 const splitParagraphs = (rawText) => rawText.split(/<\/p>/i).map((p) => p.replace(/^<p>/i, "").trim()).filter(Boolean);
 const parseSentences = (rawText, correctAnswers = []) => {
@@ -19169,13 +19180,10 @@ const parseWords = (rawText, correctAnswers = []) => {
     const decoded = para.replace(/&lt;eat-contentful&gt;/g, "<eat-contentful>").replace(/&lt;\/eat-contentful&gt;/g, "</eat-contentful>");
     tokenRegex.lastIndex = 0;
     let match;
-    let pendingOpenTags = "";
-    const trailingOpenTagsRe = /((?:<(?!\/?eat-)[^>]+>)+\s*)$/;
     while ((match = tokenRegex.exec(decoded)) !== null) {
       if (match[2] !== void 0) {
-        const outerOpen = pendingOpenTags + (match[1] ?? "");
+        const outerOpen = match[1] ?? "";
         const outerClose = match[3] ?? "";
-        pendingOpenTags = "";
         const rawContent = match[2].trim();
         const displayText = decodeNbsp(rawContent);
         if (displayText) {
@@ -19191,10 +19199,7 @@ const parseWords = (rawText, correctAnswers = []) => {
         }
       } else if (match[4] !== void 0) {
         const rawChunk = match[4];
-        const trailingTagMatch = rawChunk.match(trailingOpenTagsRe);
-        pendingOpenTags = trailingTagMatch ? trailingTagMatch[1].trimEnd() : "";
-        const chunk = trailingTagMatch ? rawChunk.slice(0, -trailingTagMatch[1].length) : rawChunk;
-        const words = hasHtmlTags(chunk) ? extractHtmlWords(chunk) : chunk.split(/\s+/).filter(Boolean);
+        const words = hasHtmlTags(rawChunk) ? extractHtmlWords(rawChunk) : rawChunk.split(/\s+/).filter(Boolean);
         for (const word of words) {
           const visibleWord = hasHtmlTags(word) ? stripTags(word) : word;
           if (purePunctRe.test(visibleWord)) {
@@ -19209,7 +19214,15 @@ const parseWords = (rawText, correctAnswers = []) => {
           } else {
             while (correctAnswerIdSet.has(`${globalIndex}`)) globalIndex++;
             if (hasHtmlTags(word)) {
-              segments.push({ id: `${globalIndex}`, text: decodeNbsp(word) });
+              const innerVisible = stripTags(word);
+              const punctMatch = innerVisible.match(trailingPunctRe);
+              if (punctMatch) {
+                const punc = punctMatch[1];
+                const rebuilt = word.replace(new RegExp(punc.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") + "(</)"), "$1");
+                segments.push({ id: `${globalIndex}`, text: decodeNbsp(rebuilt), trailingPunctuation: punc });
+              } else {
+                segments.push({ id: `${globalIndex}`, text: decodeNbsp(word) });
+              }
             } else {
               const punctMatch = word.match(trailingPunctRe);
               const text = decodeNbsp(punctMatch ? word.slice(0, -punctMatch[1].length) : word);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eat-js-sdk",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "change version": "2.2.0",
   "description": "Authoring tool frontend SDK",
   "contributors": [