formatferry 1.0.34 → 1.0.35

package/dist/index.js

@@ -58205,6 +58205,7 @@ var InputSanitizer = class {
       ALLOWED_TAGS: [
         "p",
         "br",
+        "hr",
         "div",
         "span",
         "h1",
@@ -58255,6 +58256,7 @@ var InputSanitizer = class {
           ALLOWED_TAGS: [
             "p",
             "br",
+            "hr",
             "div",
             "span",
             "h1",
@@ -59013,6 +59015,37 @@ var ConversionEngine = class {
     this.confluenceService = createConfluenceService(deps);
     this.addSlideMarkerRules(this.slackService);
     this.addSlideMarkerRules(this.confluenceService);
+    [
+      this.githubService,
+      this.commonmarkService,
+      this.customService,
+      this.discordService,
+      this.redditService,
+      this.rmarkdownService,
+      this.slackService,
+      this.confluenceService
+    ].forEach((service) => this.addGoogleDocsWrapperRule(service));
+  }
+  /**
+   * Google Docs wraps every copied selection in
+   * <b style="font-weight:normal" id="docs-internal-guid-...">. Treating that
+   * as bold puts a stray pair of bold markers around the whole document, so a
+   * <b>/<strong> whose inline style explicitly sets a non-bold weight is
+   * rendered as its plain content.
+   */
+  addGoogleDocsWrapperRule(service) {
+    service.addRule("googleDocsNonBoldWrapper", {
+      filter: (node) => {
+        if (node.nodeName !== "B" && node.nodeName !== "STRONG") return false;
+        const style = (node.getAttribute("style") || "").toLowerCase();
+        const matches = [...style.matchAll(/font-weight\s*:\s*([a-z0-9]+)/g)];
+        if (matches.length === 0) return false;
+        const weight = matches[matches.length - 1][1];
+        if (weight === "normal" || weight === "lighter") return true;
+        return /^\d+$/.test(weight) && parseInt(weight, 10) < 600;
+      },
+      replacement: (content) => content
+    });
   }
   /**
    * Create Discord-optimized Turndown service
@@ -59069,7 +59102,7 @@ ${plainText}
       },
       replacement: (_content, node) => {
         const checked = node.checked || node.hasAttribute("checked");
-        return checked ? "\u2611 " : "\u2610 ";
+        return (checked ? "\u2611" : "\u2610") + this.checkboxSpacer(node);
       }
     });
     return service;
@@ -59097,9 +59130,9 @@ ${plainText}
    * Converts Unicode checkboxes to [x] and [ ]
    */
   normalizeGitHubCheckboxes(markdown) {
-    let result = markdown;
-    result = result.replace(/^([-*]\s+)[☑✓✔■⬛]/gm, "$1[x]");
-    result = result.replace(/^([-*]\s+)[☐✗✘□⬜]/gm, "$1[ ]");
+    let result = markdown.replace(/^([ \t]*(?:[-*+]|\d+[.)])[ \t]+)\\\[([ xX])\\\]/gm, "$1[$2]");
+    result = result.replace(/^([ \t]*(?:[-*+]|\d+[.)])[ \t]+)[☑✓✔■⬛]/gm, "$1[x]");
+    result = result.replace(/^([ \t]*(?:[-*+]|\d+[.)])[ \t]+)[☐✗✘□⬜]/gm, "$1[ ]");
     return result;
   }
   /**
@@ -59107,10 +59140,10 @@ ${plainText}
    * Converts [x], [ ], and other checkbox patterns to emoji
    */
   normalizeDiscordCheckboxes(markdown) {
-    let result = markdown.replace(/^([-*]\s+)\[x\]/gmi, "$1\u2611");
-    result = result.replace(/^([-*]\s+)[✓✔■⬛]/gm, "$1\u2611");
-    result = result.replace(/^([-*]\s+)\[\s?\]/gm, "$1\u2610");
-    result = result.replace(/^([-*]\s+)[✗✘□⬜]/gm, "$1\u2610");
+    let result = markdown.replace(/^([ \t]*(?:[-*+]|\d+[.)])[ \t]+)\\?\[x\\?\]/gmi, "$1\u2611");
+    result = result.replace(/^([ \t]*(?:[-*+]|\d+[.)])[ \t]+)[✓✔■⬛]/gm, "$1\u2611");
+    result = result.replace(/^([ \t]*(?:[-*+]|\d+[.)])[ \t]+)\\?\[\s?\\?\]/gm, "$1\u2610");
+    result = result.replace(/^([ \t]*(?:[-*+]|\d+[.)])[ \t]+)[✗✘□⬜]/gm, "$1\u2610");
     return result;
   }
   /**
@@ -59580,6 +59613,11 @@ ${plainText}
   escapeTableCell(content) {
     return content.replace(/\|/g, "\\|").replace(/\s*<br>\s*/g, "<br>").trim();
   }
+  /** A space after a checkbox marker unless the label text already starts with one. */
+  checkboxSpacer(node) {
+    const next = node.nextSibling;
+    return next && /^\s/.test(next.textContent || "") ? "" : " ";
+  }
   addTaskListRules(service) {
     service.addRule("gfmTaskListCheckbox", {
       filter: (node) => {
@@ -59587,7 +59625,7 @@ ${plainText}
       },
       replacement: (_content, node) => {
         const checked = node.checked || node.hasAttribute("checked");
-        return checked ? "[x] " : "[ ] ";
+        return (checked ? "[x]" : "[ ]") + this.checkboxSpacer(node);
       }
     });
   }
@@ -59653,60 +59691,78 @@ ${plainText}
     service.addRule("enhancedList", {
       filter: ["ul", "ol"],
       replacement: (content, node) => {
-        const listType = node?.nodeName.toLowerCase();
         const items = Array.from(node.children).filter(
           (child) => child.nodeName.toLowerCase() === "li"
         );
         if (items.length === 0) return content;
-        let markdown = "\n";
-        const isOrdered = listType === "ol";
-        const marker = isOrdered ? "1." : service.options.bulletListMarker || "-";
-        items.forEach((item, index) => {
-          const itemContent = this.processListItem(item, service);
-          const actualMarker = isOrdered ? `${index + 1}.` : marker;
-          markdown += `${actualMarker} ${itemContent}
-`;
-        });
-        return markdown + "\n";
+        return "\n" + this.renderList(node, service) + "\n";
       }
     });
   }
-  processListItem(item, service, depth = 0) {
-    let content = "";
-    const TEXT_NODE = 3;
-    const ELEMENT_NODE2 = 1;
-    Array.from(item.childNodes).forEach((child) => {
-      if (child.nodeType === TEXT_NODE) {
-        content += child.textContent || "";
-      } else if (child.nodeType === ELEMENT_NODE2) {
-        const element = child;
-        if (element.nodeName.toLowerCase() === "ul" || element.nodeName.toLowerCase() === "ol") {
-          const nestedContent = this.processNestedList(element, service, depth + 1);
-          content += "\n" + nestedContent;
-        } else {
-          content += service.turndown(element.outerHTML);
-        }
-      }
-    });
-    return content.trim();
-  }
-  processNestedList(list, service, depth) {
+  /**
+   * Render a list with markers at column 0. Continuation lines of each item
+   * (extra paragraphs, nested lists) are indented to the item's content
+   * column (marker width + 1), which is what CommonMark/GFM require for them
+   * to stay inside the item: 2 spaces under "- ", 3 under "1. ", 4 under "10. ".
+   */
+  renderList(list, service) {
     const items = Array.from(list.children).filter(
       (child) => child.nodeName.toLowerCase() === "li"
     );
-    if (items.length === 0) return "";
-    let markdown = "";
     const isOrdered = list.nodeName.toLowerCase() === "ol";
-    const indent = "  ".repeat(depth);
-    const marker = isOrdered ? "1." : service.options.bulletListMarker || "-";
+    const bullet = service.options.bulletListMarker || "-";
+    let markdown = "";
     items.forEach((item, index) => {
-      const itemContent = this.processListItem(item, service, depth);
-      const actualMarker = isOrdered ? `${index + 1}.` : marker;
-      markdown += `${indent}${actualMarker} ${itemContent}
+      const marker = isOrdered ? `${index + 1}.` : bullet;
+      const indent = " ".repeat(marker.length + 1);
+      const body = this.processListItem(item, service);
+      const lines = body.split("\n");
+      const indented = lines.map((line, i) => i === 0 || line === "" ? line : indent + line).join("\n");
+      markdown += `${marker} ${indented}
 `;
     });
     return markdown;
   }
+  /**
+   * Render one list item's content relative to its own content column.
+   * Inline runs and block children are converted together, so whitespace
+   * between sibling spans survives (Google Docs emits one span per run) and
+   * multiple paragraphs stay separated.
+   */
+  processListItem(item, service) {
+    const parts = [];
+    const ELEMENT_NODE2 = 1;
+    const doc = item.ownerDocument;
+    let buffer = doc.createElement("div");
+    const flush = () => {
+      if (buffer.childNodes.length > 0) {
+        const md = service.turndown(buffer).trim();
+        if (md) parts.push(md);
+      }
+      buffer = doc.createElement("div");
+    };
+    Array.from(item.childNodes).forEach((child) => {
+      const name = child.nodeType === ELEMENT_NODE2 ? child.nodeName.toLowerCase() : "";
+      if (name === "ul" || name === "ol") {
+        flush();
+        const nested = this.renderList(child, service).replace(/\n+$/, "");
+        if (nested) parts.push(nested);
+      } else {
+        buffer.appendChild(child.cloneNode(true));
+      }
+    });
+    flush();
+    let content = "";
+    parts.forEach((part, i) => {
+      if (i === 0) {
+        content = part;
+        return;
+      }
+      const isList = /^(?:[-*+]|\d+\.) /.test(part);
+      content += (isList ? "\n" : "\n\n") + part;
+    });
+    return content;
+  }
   addSlideMarkerRules(service) {
     service.addRule("pptxSlideMarker", {
       filter: (node) => node.nodeName === "DIV" && node.hasAttribute("data-slide-marker"),
@@ -64775,8 +64831,8 @@ import { readFileSync as readFileSync5 } from "fs";
 import { resolve, dirname as dirname3 } from "path";
 import { fileURLToPath } from "url";
 var getVersion = () => {
-  if ("1.0.34") {
-    return "1.0.34";
+  if ("1.0.35") {
+    return "1.0.35";
   }
   try {
     const __dirname2 = dirname3(fileURLToPath(import.meta.url));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "formatferry",
-  "version": "1.0.34",
+  "version": "1.0.35",
   "description": "Format Ferry CLI — Convert HTML, DOCX, PDF, XLSX, CSV, JSON, XML, PPTX to Markdown",
   "keywords": [
     "markdown",