@examind/block-sdk 0.1.10 → 0.1.12

package/dist/index.js

@@ -767,12 +767,21 @@ function hasFormat(format, type) {
   return (format & formatFlag) !== 0;
 }
 function encodeHTMLEntities(text) {
-  return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+  return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/\u00A0/g, "&nbsp;");
+}
+function preserveSpaces(text) {
+  return text.replace(/ {2,}/g, (match) => {
+    let result = "";
+    for (let i = 0; i < match.length; i++) {
+      result += i % 2 === 0 ? " " : "&nbsp;";
+    }
+    return result;
+  });
 }
 var TextNodeHandler = class extends NodeHandler {
   processNode(node) {
     if (!isSerializedTextNode(node)) return null;
-    let result = encodeHTMLEntities(node.text);
+    let result = preserveSpaces(encodeHTMLEntities(node.text));
     if (hasFormat(node.format, "subscript")) {
       result = `<sub>${result}</sub>`;
     } else if (hasFormat(node.format, "superscript")) {
@@ -1715,27 +1724,15 @@ var import_node_html_parser20 = require("node-html-parser");
 var TextNode = import_node_html_parser20.parse.TextNode;
 var SpanNodeHandler = class extends NodeHandler2 {
   processNode(node) {
-    if (!(node instanceof import_node_html_parser20.HTMLElement)) return null;
-    if (node.tagName !== "SPAN") return null;
-    if (!node.hasAttribute("style")) return null;
-    const styleAttr = node.getAttribute("style");
-    if (!styleAttr) return null;
+    if (!(node instanceof import_node_html_parser20.HTMLElement) || node.tagName !== "SPAN")
+      return null;
+    const styleAttr = node.getAttribute("style") || "";
     if (node.childNodes.length === 1 && node.childNodes[0] instanceof TextNode) {
-      const textContent2 = node.text;
-      return {
-        detail: 0,
-        format: 0,
-        mode: "normal",
-        style: styleAttr,
-        text: textContent2,
-        type: "text",
-        version: 1
-      };
+      return this.createTextNode(node.text, styleAttr);
     }
     let childResult = null;
     for (const childNode of node.childNodes) {
-      const processedChildren = traverse2(childNode);
-      for (const child of processedChildren) {
+      for (const child of traverse2(childNode)) {
         if (child.type !== "text") continue;
         const textNode = child;
         if (!childResult) {
@@ -1746,39 +1743,32 @@ var SpanNodeHandler = class extends NodeHandler2 {
         } else {
           childResult.text += textNode.text;
           childResult.format |= textNode.format || 0;
-          if (textNode.style) {
-            childResult.style = this.mergeStyles(
-              childResult.style,
-              textNode.style
-            );
-          }
+          childResult.style = this.mergeStyles(
+            childResult.style,
+            textNode.style
+          );
         }
       }
     }
-    if (childResult) {
-      childResult.style = this.mergeStyles(
-        childResult.style,
-        styleAttr
-      );
-      return childResult;
-    }
-    const textContent = node.text;
-    if (textContent.trim() !== "") {
-      return {
-        detail: 0,
-        format: 0,
-        mode: "normal",
-        style: styleAttr,
-        text: textContent,
-        type: "text",
-        version: 1
-      };
-    }
-    return null;
+    if (childResult) return childResult;
+    const textContent = node.text.trim();
+    return textContent ? this.createTextNode(node.text, styleAttr) : null;
+  }
+  createTextNode(text, style) {
+    return {
+      detail: 0,
+      format: 0,
+      mode: "normal",
+      style,
+      text,
+      type: "text",
+      version: 1
+    };
   }
   mergeStyles(existingStyle, newStyle) {
-    if (!existingStyle) return newStyle;
-    if (!newStyle) return existingStyle;
+    if (!existingStyle && !newStyle) return "";
+    if (!existingStyle) return newStyle ?? "";
+    if (!newStyle) return existingStyle ?? "";
     return `${existingStyle};${newStyle}`.replace(/;;/g, ";").replace(/^;/, "").replace(/;$/, "");
   }
 };

package/dist/index.mjs

@@ -740,12 +740,21 @@ function hasFormat(format, type) {
   return (format & formatFlag) !== 0;
 }
 function encodeHTMLEntities(text) {
-  return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+  return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/\u00A0/g, "&nbsp;");
+}
+function preserveSpaces(text) {
+  return text.replace(/ {2,}/g, (match) => {
+    let result = "";
+    for (let i = 0; i < match.length; i++) {
+      result += i % 2 === 0 ? " " : "&nbsp;";
+    }
+    return result;
+  });
 }
 var TextNodeHandler = class extends NodeHandler {
   processNode(node) {
     if (!isSerializedTextNode(node)) return null;
-    let result = encodeHTMLEntities(node.text);
+    let result = preserveSpaces(encodeHTMLEntities(node.text));
     if (hasFormat(node.format, "subscript")) {
       result = `<sub>${result}</sub>`;
     } else if (hasFormat(node.format, "superscript")) {
@@ -1688,27 +1697,15 @@ import { HTMLElement as HTMLElement20, parse } from "node-html-parser";
 var TextNode = parse.TextNode;
 var SpanNodeHandler = class extends NodeHandler2 {
   processNode(node) {
-    if (!(node instanceof HTMLElement20)) return null;
-    if (node.tagName !== "SPAN") return null;
-    if (!node.hasAttribute("style")) return null;
-    const styleAttr = node.getAttribute("style");
-    if (!styleAttr) return null;
+    if (!(node instanceof HTMLElement20) || node.tagName !== "SPAN")
+      return null;
+    const styleAttr = node.getAttribute("style") || "";
     if (node.childNodes.length === 1 && node.childNodes[0] instanceof TextNode) {
-      const textContent2 = node.text;
-      return {
-        detail: 0,
-        format: 0,
-        mode: "normal",
-        style: styleAttr,
-        text: textContent2,
-        type: "text",
-        version: 1
-      };
+      return this.createTextNode(node.text, styleAttr);
     }
     let childResult = null;
     for (const childNode of node.childNodes) {
-      const processedChildren = traverse2(childNode);
-      for (const child of processedChildren) {
+      for (const child of traverse2(childNode)) {
         if (child.type !== "text") continue;
         const textNode = child;
         if (!childResult) {
@@ -1719,39 +1716,32 @@ var SpanNodeHandler = class extends NodeHandler2 {
         } else {
           childResult.text += textNode.text;
           childResult.format |= textNode.format || 0;
-          if (textNode.style) {
-            childResult.style = this.mergeStyles(
-              childResult.style,
-              textNode.style
-            );
-          }
+          childResult.style = this.mergeStyles(
+            childResult.style,
+            textNode.style
+          );
         }
       }
     }
-    if (childResult) {
-      childResult.style = this.mergeStyles(
-        childResult.style,
-        styleAttr
-      );
-      return childResult;
-    }
-    const textContent = node.text;
-    if (textContent.trim() !== "") {
-      return {
-        detail: 0,
-        format: 0,
-        mode: "normal",
-        style: styleAttr,
-        text: textContent,
-        type: "text",
-        version: 1
-      };
-    }
-    return null;
+    if (childResult) return childResult;
+    const textContent = node.text.trim();
+    return textContent ? this.createTextNode(node.text, styleAttr) : null;
+  }
+  createTextNode(text, style) {
+    return {
+      detail: 0,
+      format: 0,
+      mode: "normal",
+      style,
+      text,
+      type: "text",
+      version: 1
+    };
   }
   mergeStyles(existingStyle, newStyle) {
-    if (!existingStyle) return newStyle;
-    if (!newStyle) return existingStyle;
+    if (!existingStyle && !newStyle) return "";
+    if (!existingStyle) return newStyle ?? "";
+    if (!newStyle) return existingStyle ?? "";
     return `${existingStyle};${newStyle}`.replace(/;;/g, ";").replace(/^;/, "").replace(/;$/, "");
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@examind/block-sdk",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "@comment version": [
     "Don't specify package version here. It will be injected by publish workflow."
   ],