@examind/block-sdk 0.1.11 → 0.1.13

package/dist/index.js

@@ -1724,70 +1724,61 @@ 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;
+    const results = [];
+    const textNodes = [];
     for (const childNode of node.childNodes) {
-      const processedChildren = traverse2(childNode);
-      for (const child of processedChildren) {
-        if (child.type !== "text") continue;
-        const textNode = child;
-        if (!childResult) {
-          childResult = {
-            ...textNode,
-            style: this.mergeStyles(textNode.style, styleAttr)
-          };
+      for (const child of traverse2(childNode)) {
+        if (child.type === "text") {
+          const textNode = child;
+          textNodes.push(textNode);
         } else {
-          childResult.text += textNode.text;
-          childResult.format |= textNode.format || 0;
-          if (textNode.style) {
-            childResult.style = this.mergeStyles(
-              childResult.style,
-              textNode.style
-            );
-          }
+          results.push(child);
         }
       }
     }
-    if (childResult) {
-      childResult.style = this.mergeStyles(
-        childResult.style,
+    if (textNodes.length > 0) {
+      const mergedTextNode = this.mergeTextNodes(
+        textNodes,
         styleAttr
       );
-      return childResult;
+      results.push(mergedTextNode);
+    } else if (node.text.trim()) {
+      results.push(this.createTextNode(node.text, styleAttr));
     }
-    const textContent = node.text;
-    if (textContent.trim() !== "") {
-      return {
-        detail: 0,
-        format: 0,
-        mode: "normal",
-        style: styleAttr,
-        text: textContent,
-        type: "text",
-        version: 1
-      };
+    return results;
+  }
+  mergeTextNodes(textNodes, spanStyle) {
+    const result = { ...textNodes[0] };
+    result.style = this.mergeStyles(result.style, spanStyle);
+    for (let i = 1; i < textNodes.length; i++) {
+      const node = textNodes[i];
+      result.text += node.text;
+      result.format |= node.format || 0;
+      result.style = this.mergeStyles(result.style, node.style);
     }
-    return null;
+    return result;
+  }
+  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

@@ -1697,70 +1697,61 @@ 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;
+    const results = [];
+    const textNodes = [];
     for (const childNode of node.childNodes) {
-      const processedChildren = traverse2(childNode);
-      for (const child of processedChildren) {
-        if (child.type !== "text") continue;
-        const textNode = child;
-        if (!childResult) {
-          childResult = {
-            ...textNode,
-            style: this.mergeStyles(textNode.style, styleAttr)
-          };
+      for (const child of traverse2(childNode)) {
+        if (child.type === "text") {
+          const textNode = child;
+          textNodes.push(textNode);
         } else {
-          childResult.text += textNode.text;
-          childResult.format |= textNode.format || 0;
-          if (textNode.style) {
-            childResult.style = this.mergeStyles(
-              childResult.style,
-              textNode.style
-            );
-          }
+          results.push(child);
         }
       }
     }
-    if (childResult) {
-      childResult.style = this.mergeStyles(
-        childResult.style,
+    if (textNodes.length > 0) {
+      const mergedTextNode = this.mergeTextNodes(
+        textNodes,
         styleAttr
       );
-      return childResult;
+      results.push(mergedTextNode);
+    } else if (node.text.trim()) {
+      results.push(this.createTextNode(node.text, styleAttr));
     }
-    const textContent = node.text;
-    if (textContent.trim() !== "") {
-      return {
-        detail: 0,
-        format: 0,
-        mode: "normal",
-        style: styleAttr,
-        text: textContent,
-        type: "text",
-        version: 1
-      };
+    return results;
+  }
+  mergeTextNodes(textNodes, spanStyle) {
+    const result = { ...textNodes[0] };
+    result.style = this.mergeStyles(result.style, spanStyle);
+    for (let i = 1; i < textNodes.length; i++) {
+      const node = textNodes[i];
+      result.text += node.text;
+      result.format |= node.format || 0;
+      result.style = this.mergeStyles(result.style, node.style);
     }
-    return null;
+    return result;
+  }
+  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.11",
+  "version": "0.1.13",
   "@comment version": [
     "Don't specify package version here. It will be injected by publish workflow."
   ],