@circlesac/mack 26.2.2 → 26.2.4

package/build/src/index.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -79,7 +90,7 @@ function markdownToBlocks(body, options) {
         var lexer, tokenizer, origInlineText, tokens, blocks;
         return __generator(this, function (_a) {
             (0, validation_1.validateInput)(body);
-            lexer = new marked_1.marked.Lexer();
+            lexer = new marked_1.marked.Lexer(__assign(__assign({}, marked_1.marked.defaults), { mangle: false }));
             tokenizer = lexer.tokenizer;
             origInlineText = tokenizer.inlineText;
             // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/build/src/parser/internal.js

@@ -26,11 +26,16 @@ var slack_1 = require("../slack");
 var validation_1 = require("../validation");
 var recursionDepth = 0;
 /**
- * Escapes &, <, > for Slack mrkdwn format.
+ * Escapes &, <, > for Slack mrkdwn format while preserving Slack special
+ * patterns: <@U…>, <#C…>, <!here>, <!channel>, <!everyone>, <https://…>.
  * Only used in the section/mrkdwn code path (not rich_text).
  */
+var SLACK_MRKDWN_PATTERN = /(<(?:@[A-Z0-9]+(?:\|[^>]+)?|#[A-Z0-9]+(?:\|[^>]+)?|![a-z]+(?:\^[^>]+)*(?:\|[^>]+)?|https?:\/\/[^>]+)>)/g;
 function escapeForMrkdwn(text) {
-    return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+    return text
+        .split(SLACK_MRKDWN_PATTERN)
+        .map(function (part, i) { return (i % 2 === 1 ? part : part.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;")); })
+        .join("");
 }
 function parsePlainText(element) {
     var _a;
@@ -59,8 +64,16 @@ function parseMrkdwn(element) {
         (0, validation_1.validateRecursionDepth)(recursionDepth);
         switch (element.type) {
             case "link": {
-                var href = element.href && (0, validation_1.validateUrl)(element.href) ? element.href : "";
-                if (!href) {
+                var href = element.href || "";
+                // Handle Slack pipe format: <url|text> parsed as autolink by marked
+                var pipeIndex = href.indexOf("|");
+                if (pipeIndex > 0) {
+                    var url = href.slice(0, pipeIndex);
+                    if ((0, validation_1.validateUrl)(url)) {
+                        return "<".concat(url, "|").concat(href.slice(pipeIndex + 1), ">");
+                    }
+                }
+                if (!(0, validation_1.validateUrl)(href)) {
                     return element.tokens.flatMap(function (child) { return parseMrkdwn(child); }).join("");
                 }
                 return "<".concat(href, "|").concat(element.tokens.flatMap(function (child) { return parseMrkdwn(child); }).join(""), "> ");

package/package.json

@@ -38,5 +38,5 @@
     "test": "vitest run"
   },
   "types": "build/src/index.d.ts",
-  "version": "26.2.2"
+  "version": "26.2.4"
 }

package/src/index.ts

@@ -50,7 +50,7 @@ export type { ListOptions, ParsingOptions } from "./types"
 export async function markdownToBlocks(body: string, options: ParsingOptions = {}): Promise<(KnownBlock | TableBlock | RichTextBlock | VideoBlock)[]> {
 	validateInput(body)
 
-	const lexer = new marked.Lexer()
+	const lexer = new marked.Lexer({ ...marked.defaults, mangle: false })
 
 	// Override inlineText to prevent marked's default HTML entity escaping.
 	// We want raw text so that:

package/src/parser/internal.ts

@@ -39,11 +39,17 @@ type PhrasingToken =
 let recursionDepth = 0
 
 /**
- * Escapes &, <, > for Slack mrkdwn format.
+ * Escapes &, <, > for Slack mrkdwn format while preserving Slack special
+ * patterns: <@U…>, <#C…>, <!here>, <!channel>, <!everyone>, <https://…>.
  * Only used in the section/mrkdwn code path (not rich_text).
  */
+const SLACK_MRKDWN_PATTERN = /(<(?:@[A-Z0-9]+(?:\|[^>]+)?|#[A-Z0-9]+(?:\|[^>]+)?|![a-z]+(?:\^[^>]+)*(?:\|[^>]+)?|https?:\/\/[^>]+)>)/g
+
 function escapeForMrkdwn(text: string): string {
-	return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;")
+	return text
+		.split(SLACK_MRKDWN_PATTERN)
+		.map((part, i) => (i % 2 === 1 ? part : part.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;")))
+		.join("")
 }
 
 function parsePlainText(element: PhrasingToken): string[] {
@@ -78,8 +84,16 @@ function parseMrkdwn(element: Exclude<PhrasingToken, marked.Tokens.Image>): stri
 
 		switch (element.type) {
 			case "link": {
-				const href = element.href && validateUrl(element.href) ? element.href : ""
-				if (!href) {
+				const href = element.href || ""
+				// Handle Slack pipe format: <url|text> parsed as autolink by marked
+				const pipeIndex = href.indexOf("|")
+				if (pipeIndex > 0) {
+					const url = href.slice(0, pipeIndex)
+					if (validateUrl(url)) {
+						return `<${url}|${href.slice(pipeIndex + 1)}>`
+					}
+				}
+				if (!validateUrl(href)) {
 					return element.tokens.flatMap((child) => parseMrkdwn(child as Exclude<PhrasingToken, marked.Tokens.Image>)).join("")
 				}
 				return `<${href}|${element.tokens.flatMap((child) => parseMrkdwn(child as Exclude<PhrasingToken, marked.Tokens.Image>)).join("")}> `

package/tests/integration.spec.ts

@@ -489,8 +489,8 @@ i18n with plurals support and easy syntax.`
 			const blocks = await markdownToBlocks("Hello <@U12345> how are you?")
 			const allText = JSON.stringify(blocks)
 			expect(allText).toContain('"type":"section"')
-			// User mentions in section blocks use mrkdwn format
-			expect(allText).toContain("&lt;@U12345&gt;")
+			// User mentions in section blocks are preserved as Slack mrkdwn syntax
+			expect(allText).toContain("<@U12345>")
 		})
 
 		it("should parse slack formatting in list items", async () => {