formatferry 1.0.30 → 1.0.32

package/dist/index.js

@@ -58500,6 +58500,25 @@ function normalizeAtlassianHTML(html, domParser) {
 
 // ../../src/shared/confluence-slack-services.ts
 var import_turndown = __toESM(require_turndown_cjs(), 1);
+function escapeSlackEntities(text) {
+  return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
+var ZERO_WIDTH_SPACE = "\u200B";
+function escapeSlackText(text) {
+  return escapeSlackEntities(text).replace(
+    /(^|[^\p{L}\p{N}])([*_~`])/gu,
+    `$1${ZERO_WIDTH_SPACE}$2`
+  );
+}
+function slackLabel(text) {
+  return text.replace(/\|/g, "\uFF5C");
+}
+function escapeConfluenceText(text) {
+  return text.replace(/([{}[\]\\])/g, "\\$1").replace(/(^|\n)([*#-])(?=\s)/g, "$1\\$2").replace(/(^|[^\p{L}\p{N}\\])([*_+\-^~])(?=\S)/gu, "$1\\$2").replace(
+    /(?<=\S)([*_+\-^~])(?=$|[^\p{L}\p{N}])/gu,
+    (m, c, offset, str) => str[offset - 1] === "\\" ? m : `\\${c}`
+  );
+}
 function createSlackService(deps) {
   const service = new import_turndown.default({
     headingStyle: "atx",
@@ -58509,6 +58528,7 @@ function createSlackService(deps) {
     fence: "```",
     emDelimiter: "_"
   });
+  service.escape = escapeSlackText;
   deps.addListRules(service);
   deps.addPdfPageMarkerRules(service);
   service.addRule("slackBold", {
@@ -58557,12 +58577,33 @@ function createSlackService(deps) {
       const fontFamily = style.toLowerCase();
       return fontFamily.includes("monospace") || fontFamily.includes("courier") || fontFamily.includes("consolas") || fontFamily.includes("monaco") || fontFamily.includes("menlo") || fontFamily.includes("source code") || fontFamily.includes("fira code") || fontFamily.includes("roboto mono") || fontFamily.includes("ubuntu mono");
     },
-    replacement: (content) => {
-      const trimmed = content.trim();
+    replacement: (content, node) => {
+      const trimmed = escapeSlackEntities((node.textContent || "").trim());
       if (!trimmed) return content;
       return trimmed.includes("`") ? `\`\` ${trimmed} \`\`` : `\`${trimmed}\``;
     }
   });
+  service.addRule("slackCodeBlock", {
+    filter: (node) => node.nodeName === "PRE",
+    replacement: (_content, node) => {
+      const code = (node.textContent || "").replace(/\n$/, "");
+      return `
+
+\`\`\`
+${escapeSlackEntities(code)}
+\`\`\`
+
+`;
+    }
+  });
+  service.addRule("slackInlineCode", {
+    filter: (node) => node.nodeName === "CODE" && node.parentNode?.nodeName !== "PRE",
+    replacement: (content, node) => {
+      const code = escapeSlackEntities(node.textContent || "");
+      if (!code) return content;
+      return code.includes("`") ? `\`\` ${code} \`\`` : `\`${code}\``;
+    }
+  });
   service.addRule("slackHeading", {
     filter: ["h1", "h2", "h3", "h4", "h5", "h6"],
     replacement: (content) => content.trim() ? `*${content.trim()}*
@@ -58599,8 +58640,8 @@ function createSlackService(deps) {
   service.addRule("slackLink", {
     filter: (node) => node.nodeName === "A" && !!node.getAttribute("href"),
     replacement: (content, node) => {
-      const href = node.getAttribute("href") || "";
-      const text = content.trim().replace(/\|/g, " ");
+      const href = escapeSlackEntities(node.getAttribute("href") || "");
+      const text = slackLabel(content.trim());
       if (!text || text === href) return `<${href}>`;
       return `<${href}|${text}>`;
     }
@@ -58608,15 +58649,15 @@ function createSlackService(deps) {
   service.addRule("slackImage", {
     filter: "img",
     replacement: (_content, node) => {
-      const src = node.getAttribute("src") || "";
-      const alt = (node.getAttribute("alt") || "image").replace(/\|/g, " ");
+      const src = escapeSlackEntities(node.getAttribute("src") || "");
+      const alt = slackLabel(escapeSlackEntities(node.getAttribute("alt") || "image"));
       return `<${src}|${alt}>`;
     }
   });
   service.addRule("slackTable", {
     filter: "table",
     replacement: (_content, node) => {
-      const plainText = deps.tableToPlainText(node);
+      const plainText = escapeSlackEntities(deps.tableToPlainText(node));
       return `\`\`\`
 ${plainText}
 \`\`\`
@@ -58664,6 +58705,7 @@ function createConfluenceService(deps) {
     codeBlockStyle: "fenced",
     emDelimiter: "_"
   });
+  service.escape = escapeConfluenceText;
   deps.addPdfPageMarkerRules(service);
   service.addRule("confluenceHeading", {
     filter: ["h1", "h2", "h3", "h4", "h5", "h6"],
@@ -58754,7 +58796,10 @@ ${codeContent}
       const fontFamily = style.toLowerCase();
       return fontFamily.includes("monospace") || fontFamily.includes("courier") || fontFamily.includes("consolas") || fontFamily.includes("monaco") || fontFamily.includes("menlo") || fontFamily.includes("source code") || fontFamily.includes("fira code") || fontFamily.includes("roboto mono") || fontFamily.includes("ubuntu mono");
     },
-    replacement: (content) => content.trim() ? `{{${content.trim().replace(/}+/g, (m) => m.split("").join(" "))}}}` : content
+    replacement: (content, node) => {
+      const code = (node.textContent || "").trim();
+      return code ? `{{${code.replace(/}+/g, (m) => m.split("").join(" "))}}}` : content;
+    }
   });
   service.addRule("confluenceLink", {
     filter: (node) => node.nodeName === "A" && !!node.getAttribute("href"),
@@ -64544,8 +64589,8 @@ import { readFileSync as readFileSync5 } from "fs";
 import { resolve, dirname as dirname3 } from "path";
 import { fileURLToPath } from "url";
 var getVersion = () => {
-  if ("1.0.30") {
-    return "1.0.30";
+  if ("1.0.32") {
+    return "1.0.32";
   }
   try {
     const __dirname2 = dirname3(fileURLToPath(import.meta.url));

package/package.json

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