eat-js-sdk 2.2.8 → 2.2.10

package/dist/interaction-builder.mjs

@@ -19098,31 +19098,103 @@ 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 isSuperSubTag = (tag) => {
+  const name = getTagName(tag);
+  return name === "sup" || name === "sub";
+};
 const extractHtmlWords = (htmlText) => {
-  const re = /(<\/[^>]+>)|(<[^>]+>)|([^\s<>]+)/g;
+  const re = /(\s+)|(<\/[^>]+>)|(<[^>]+>)|([^\s<>]+)/g;
   const tokens = [];
   let m;
   while ((m = re.exec(htmlText)) !== null) {
-    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] });
+    if (m[1]) tokens.push({ type: "space", value: m[1] });
+    else if (m[2]) tokens.push({ type: "close", value: m[2] });
+    else if (m[3]) tokens.push({ type: "open", value: m[3] });
+    else tokens.push({ type: "word", value: m[4] });
   }
   const words = [];
   const openStack = [];
-  for (const tok of tokens) {
+  const pendingMergeStack = [];
+  let lastWasSpace = true;
+  let mergingIntoLast = false;
+  let mergeDepth = 0;
+  for (let i = 0; i < tokens.length; i++) {
+    const tok = tokens[i];
+    if (tok.type === "space") {
+      for (const t2 of pendingMergeStack) openStack.push(t2);
+      pendingMergeStack.length = 0;
+      lastWasSpace = true;
+      continue;
+    }
     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;
+      if (mergingIntoLast) {
+        mergeDepth++;
+        words[words.length - 1].value += tok.value;
+      } else if (!lastWasSpace && words.length > 0) {
+        if (isSuperSubTag(tok.value)) {
+          const pendingDepth = pendingMergeStack.length;
+          for (const t2 of pendingMergeStack) {
+            words[words.length - 1].value += t2;
+          }
+          pendingMergeStack.length = 0;
+          mergingIntoLast = true;
+          mergeDepth = pendingDepth + 1;
+          words[words.length - 1].value += tok.value;
+        } else {
+          pendingMergeStack.push(tok.value);
+        }
+      } else {
+        for (const t2 of pendingMergeStack) openStack.push(t2);
+        pendingMergeStack.length = 0;
+        openStack.push(tok.value);
+      }
+      continue;
+    }
+    if (tok.type === "close") {
+      if (mergingIntoLast) {
+        words[words.length - 1].value += tok.value;
+        mergeDepth--;
+        if (mergeDepth <= 0) {
+          mergingIntoLast = false;
+          mergeDepth = 0;
+        }
+      } else if (pendingMergeStack.length > 0) {
+        const closingName = getTagName(tok.value);
+        let found = false;
+        for (let j = pendingMergeStack.length - 1; j >= 0; j--) {
+          if (getTagName(pendingMergeStack[j]) === closingName) {
+            pendingMergeStack.splice(j, 1);
+            found = true;
+            break;
+          }
+        }
+        if (!found) {
+          for (let j = openStack.length - 1; j >= 0; j--) {
+            if (getTagName(openStack[j]) === closingName) {
+              openStack.splice(j, 1);
+              break;
+            }
+          }
+        }
+      } else {
+        const closingName = getTagName(tok.value);
+        for (let j = openStack.length - 1; j >= 0; j--) {
+          if (getTagName(openStack[j]) === closingName) {
+            openStack.splice(j, 1);
+            break;
+          }
         }
       }
+      continue;
+    }
+    if (mergingIntoLast) {
+      words[words.length - 1].value += tok.value;
     } else {
+      for (const t2 of pendingMergeStack) openStack.push(t2);
+      pendingMergeStack.length = 0;
       words.push({ value: tok.value, openStack: [...openStack] });
     }
+    lastWasSpace = false;
   }
   return words.map(({ value, openStack: openStack2 }) => {
     const open = openStack2.join("");

package/package.json

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