@mks2508/telegram-message-builder 0.2.0 → 0.3.0

package/src/builder.test.ts

@@ -0,0 +1,465 @@
+import { describe, it, expect } from "bun:test";
+import { TelegramMessageBuilder } from "./builder";
+
+describe("TelegramMessageBuilder", () => {
+  describe("Initialization", () => {
+    it("should create builder with HTML default", () => {
+      const builder = TelegramMessageBuilder.text();
+      expect(builder.getParseMode()).toBe("html");
+    });
+
+    it("should allow setting parse mode to markdown", () => {
+      const builder = TelegramMessageBuilder.text().setParseMode("markdown");
+      expect(builder.getParseMode()).toBe("markdown");
+    });
+
+    it("should allow setting parse mode to markdownv2", () => {
+      const builder = TelegramMessageBuilder.text().setParseMode("markdownv2");
+      expect(builder.getParseMode()).toBe("markdownv2");
+    });
+  });
+
+  describe("Formatting Methods - HTML Mode", () => {
+    it("should format title with bold", () => {
+      const message = TelegramMessageBuilder.text().title("Test Title").build();
+      expect(message.text).toContain("<b>Test Title</b>");
+    });
+
+    it("should format section with underline", () => {
+      const message = TelegramMessageBuilder.text()
+        .section("Test Section")
+        .build();
+      expect(message.text).toContain("<u>Test Section</u>");
+    });
+
+    it("should format line with key and value", () => {
+      const message = TelegramMessageBuilder.text()
+        .line("Status", "Active")
+        .build();
+      expect(message.text).toContain("Status: Active");
+    });
+
+    it("should format line with bold option", () => {
+      const message = TelegramMessageBuilder.text()
+        .line("Status", "Active", { bold: true })
+        .build();
+      expect(message.text).toContain("Status: <b>Active</b>");
+    });
+
+    it("should format line with italic option", () => {
+      const message = TelegramMessageBuilder.text()
+        .line("Status", "Active", { italic: true })
+        .build();
+      expect(message.text).toContain("Status: <i>Active</i>");
+    });
+
+    it("should format line with code option", () => {
+      const message = TelegramMessageBuilder.text()
+        .line("Command", "npm install", { code: true })
+        .build();
+      expect(message.text).toContain("Command: <code>npm install</code>");
+    });
+
+    it("should format line with underline option", () => {
+      const message = TelegramMessageBuilder.text()
+        .line("Note", "Important", { underline: true })
+        .build();
+      expect(message.text).toContain("Note: <u>Important</u>");
+    });
+
+    it("should format code block", () => {
+      const message = TelegramMessageBuilder.text()
+        .codeBlock("const x = 1;")
+        .build();
+      expect(message.text).toContain("<pre><code>const x = 1;</code></pre>");
+    });
+
+    it("should format code block with language", () => {
+      const message = TelegramMessageBuilder.text()
+        .codeBlock("const x = 1;", "javascript")
+        .build();
+      expect(message.text).toContain(
+        '<pre><code class="language-javascript">const x = 1;</code></pre>',
+      );
+    });
+
+    it("should format list item", () => {
+      const message = TelegramMessageBuilder.text().listItem("Item 1").build();
+      expect(message.text).toContain("• Item 1");
+    });
+
+    it("should add separator", () => {
+      const message = TelegramMessageBuilder.text().separator().build();
+      expect(message.text).toContain("---");
+    });
+
+    it("should add raw text with escaping", () => {
+      const message = TelegramMessageBuilder.text()
+        .text("<b>Hello</b>")
+        .build();
+      expect(message.text).toContain("&lt;b&gt;Hello&lt;/b&gt;");
+    });
+
+    it("should format link", () => {
+      const message = TelegramMessageBuilder.text()
+        .link("Click here", "https://example.com")
+        .build();
+      expect(message.text).toContain(
+        '<a href="https://example.com">Click here</a>',
+      );
+    });
+
+    it("should format mention with default name", () => {
+      const message = TelegramMessageBuilder.text().mention(123456).build();
+      expect(message.text).toContain(
+        '<a href="tg://user?id=123456">user123456</a>',
+      );
+    });
+
+    it("should format mention with custom name", () => {
+      const message = TelegramMessageBuilder.text()
+        .mention(123456, "John Doe")
+        .build();
+      expect(message.text).toContain(
+        '<a href="tg://user?id=123456">John Doe</a>',
+      );
+    });
+
+    it("should format hashtag", () => {
+      const message = TelegramMessageBuilder.text().hashtag("test").build();
+      expect(message.text).toContain(
+        '<a href="tg://hashtag?tag=test">#test</a>',
+      );
+    });
+  });
+
+  describe("Formatting Methods - Markdown Mode", () => {
+    it("should format title with bold markdown", () => {
+      const message = TelegramMessageBuilder.text()
+        .setParseMode("markdown")
+        .title("Test Title")
+        .build();
+      expect(message.text).toContain("*Test Title*");
+    });
+
+    it("should format section with underline markdown (HTML fallback)", () => {
+      const message = TelegramMessageBuilder.text()
+        .setParseMode("markdown")
+        .section("Test Section")
+        .build();
+      expect(message.text).toContain("<u>Test Section</u>");
+    });
+
+    it("should format line with bold option markdown", () => {
+      const message = TelegramMessageBuilder.text()
+        .setParseMode("markdown")
+        .line("Status", "Active", { bold: true })
+        .build();
+      expect(message.text).toContain("Status: *Active*");
+    });
+
+    it("should format code block markdown", () => {
+      const message = TelegramMessageBuilder.text()
+        .setParseMode("markdown")
+        .codeBlock("const x = 1;")
+        .build();
+      expect(message.text).toContain("const x = 1;\n");
+    });
+
+    it("should format code block with language markdown", () => {
+      const message = TelegramMessageBuilder.text()
+        .setParseMode("markdown")
+        .codeBlock("const x = 1;", "javascript")
+        .build();
+      expect(message.text).toContain("javascript\nconst x = 1;\n");
+    });
+
+    it("should format link markdown", () => {
+      const message = TelegramMessageBuilder.text()
+        .setParseMode("markdown")
+        .link("Click here", "https://example.com")
+        .build();
+      expect(message.text).toContain("[Click here](https://example.com)");
+    });
+
+    it("should format mention markdown", () => {
+      const message = TelegramMessageBuilder.text()
+        .setParseMode("markdown")
+        .mention(123456, "John")
+        .build();
+      expect(message.text).toContain("tg://user?id=123456");
+    });
+
+    it("should format hashtag markdown", () => {
+      const message = TelegramMessageBuilder.text()
+        .setParseMode("markdown")
+        .hashtag("test")
+        .build();
+      expect(message.text).toContain("#test");
+    });
+  });
+
+  describe("Formatting Methods - MarkdownV2 Mode", () => {
+    it("should format title with bold markdownv2", () => {
+      const message = TelegramMessageBuilder.text()
+        .setParseMode("markdownv2")
+        .title("Test Title")
+        .build();
+      expect(message.text).toContain("*Test Title*");
+    });
+
+    it("should format section with underline markdownv2", () => {
+      const message = TelegramMessageBuilder.text()
+        .setParseMode("markdownv2")
+        .section("Test Section")
+        .build();
+      expect(message.text).toContain("__Test Section__");
+    });
+
+    it("should format line with bold option markdownv2", () => {
+      const message = TelegramMessageBuilder.text()
+        .setParseMode("markdownv2")
+        .line("Status", "Active", { bold: true })
+        .build();
+      expect(message.text).toContain("Status: *Active*");
+    });
+
+    it("should format line with italic option markdownv2", () => {
+      const message = TelegramMessageBuilder.text()
+        .setParseMode("markdownv2")
+        .line("Status", "Active", { italic: true })
+        .build();
+      expect(message.text).toContain("Status: _Active_");
+    });
+
+    it("should format code block markdownv2", () => {
+      const message = TelegramMessageBuilder.text()
+        .setParseMode("markdownv2")
+        .codeBlock("const x = 1;")
+        .build();
+      expect(message.text).toContain("const x = 1;\n");
+    });
+
+    it("should format link markdownv2", () => {
+      const message = TelegramMessageBuilder.text()
+        .setParseMode("markdownv2")
+        .link("Click here", "https://example.com")
+        .build();
+      expect(message.text).toContain("[Click here](https://example.com)");
+    });
+
+    it("should format mention markdownv2", () => {
+      const message = TelegramMessageBuilder.text()
+        .setParseMode("markdownv2")
+        .mention(123456, "John")
+        .build();
+      expect(message.text).toContain("[John](tg://user?id=123456)");
+    });
+
+    it("should format hashtag markdownv2", () => {
+      const message = TelegramMessageBuilder.text()
+        .setParseMode("markdownv2")
+        .hashtag("test")
+        .build();
+      expect(message.text).toContain("#test");
+    });
+  });
+
+  describe("Layout Methods", () => {
+    it("should add single newline", () => {
+      const message = TelegramMessageBuilder.text()
+        .text("Line 1")
+        .newline()
+        .text("Line 2")
+        .build();
+      // Each newline adds "\n\n" to parts, and parts are joined with "\n"
+      // Result: "Line 1" + "\n" (join) + "\n\n" (newline) + "\n" (join) + "Line 2"
+      // = "Line 1\n\n\n\nLine 2"
+      expect(message.text).toContain("Line 1");
+      expect(message.text).toContain("Line 2");
+      expect(message.text).toMatch(/Line 1\n\n\n\nLine 2/);
+    });
+
+    it("should add multiple newlines", () => {
+      const message = TelegramMessageBuilder.text()
+        .text("Line 1")
+        .newline(3)
+        .text("Line 2")
+        .build();
+      // 3 newlines = each adds "\n\n", joined with "\n"
+      expect(message.text).toContain("Line 1");
+      expect(message.text).toContain("Line 2");
+    });
+
+    it("should add separator between content", () => {
+      const message = TelegramMessageBuilder.text()
+        .text("Before")
+        .separator()
+        .text("After")
+        .build();
+      expect(message.text).toContain("Before\n---\nAfter");
+    });
+  });
+
+  describe("Method Chaining", () => {
+    it("should support fluent API chaining", () => {
+      const message = TelegramMessageBuilder.text()
+        .title("Welcome")
+        .newline()
+        .section("User Info")
+        .line("Name", "John", { bold: true })
+        .line("Email", "john@example.com")
+        .separator()
+        .codeBlock("console.log('Hello');", "javascript")
+        .build();
+
+      expect(message.text).toContain("<b>Welcome</b>");
+      expect(message.text).toContain("Name: <b>John</b>");
+      expect(message.text).toContain("Email: john@example.com");
+      expect(message.text).toContain("---");
+      expect(message.text).toContain("language-javascript");
+      expect(message.parse_mode).toBe("html");
+    });
+
+    it("should work with markdown mode chaining", () => {
+      const message = TelegramMessageBuilder.text()
+        .setParseMode("markdown")
+        .title("Welcome")
+        .line("Status", "Active", { bold: true })
+        .link("Click", "https://example.com")
+        .build();
+
+      expect(message.text).toContain("*Welcome*");
+      expect(message.text).toContain("Status: *Active*");
+      expect(message.text).toContain("[Click](https://example.com)");
+      expect(message.parse_mode).toBe("markdown");
+    });
+  });
+
+  describe("Build Options", () => {
+    it("should build with default HTML parse mode", () => {
+      const message = TelegramMessageBuilder.text().title("Test").build();
+
+      expect(message.parse_mode).toBe("html");
+      expect(message.text).toContain("<b>Test</b>");
+    });
+
+    it("should build with custom option", () => {
+      const message = TelegramMessageBuilder.text()
+        .setOption("disable_web_page_preview", true)
+        .title("Test")
+        .build();
+
+      expect(message.disable_web_page_preview).toBe(true);
+    });
+
+    it("should build with multiple custom options", () => {
+      const message = TelegramMessageBuilder.text()
+        .setOptions({
+          disable_web_page_preview: true,
+          protect_content: true,
+        })
+        .title("Test")
+        .build();
+
+      expect(message.disable_web_page_preview).toBe(true);
+      expect(message.protect_content).toBe(true);
+    });
+
+    it("should return TelegramMessage interface structure", () => {
+      const message = TelegramMessageBuilder.text().title("Test").build();
+
+      expect(message).toHaveProperty("text");
+      expect(message).toHaveProperty("parse_mode");
+      expect(typeof message.text).toBe("string");
+      expect(typeof message.parse_mode).toBe("string");
+    });
+  });
+
+  describe("Complex Messages", () => {
+    it("should build complex message with all features", () => {
+      const message = TelegramMessageBuilder.text()
+        .title("User Profile")
+        .newline()
+        .section("Personal Information")
+        .line("Name", "John Doe", { bold: true })
+        .line("Age", "30", { code: true })
+        .line("Status", "Active", { italic: true })
+        .newline()
+        .section("Contact")
+        .line("Email", "john@example.com")
+        .line("Telegram", "@johndoe")
+        .separator()
+        .codeBlock("const user = { name: 'John', age: 30 };", "javascript")
+        .newline()
+        .listItem("Feature 1")
+        .listItem("Feature 2")
+        .listItem("Feature 3")
+        .newline()
+        .link("View Profile", "https://example.com/profile")
+        .mention(123456, "John Doe")
+        .hashtag("profile")
+        .setOption("disable_notification", true)
+        .build();
+
+      expect(message.text).toContain("<b>User Profile</b>");
+      expect(message.text).toContain("<u>Personal Information</u>");
+      expect(message.text).toContain("Name: <b>John Doe</b>");
+      expect(message.text).toContain("Age: <code>30</code>");
+      expect(message.text).toContain("Status: <i>Active</i>");
+      expect(message.text).toContain("---");
+      expect(message.text).toContain("language-javascript");
+      expect(message.text).toContain("• Feature 1");
+      expect(message.text).toContain("View Profile");
+      expect(message.text).toContain("tg://user?id=123456");
+      expect(message.text).toContain("#profile");
+      expect(message.disable_notification).toBe(true);
+    });
+
+    it("should handle empty message", () => {
+      const message = TelegramMessageBuilder.text().build();
+      expect(message.text).toBe("");
+    });
+
+    it("should escape HTML special characters in text", () => {
+      const message = TelegramMessageBuilder.text()
+        .text("<script>alert('xss')</script>")
+        .build();
+      expect(message.text).toContain("&lt;script&gt;");
+      expect(message.text).not.toContain("<script>");
+    });
+  });
+
+  describe("Cross-Mode Consistency", () => {
+    it("should build same message in HTML, Markdown, and MarkdownV2", () => {
+      const html = TelegramMessageBuilder.text()
+        .title("Test")
+        .line("Status", "Active", { bold: true })
+        .build();
+
+      const markdown = TelegramMessageBuilder.text()
+        .setParseMode("markdown")
+        .title("Test")
+        .line("Status", "Active", { bold: true })
+        .build();
+
+      const markdownv2 = TelegramMessageBuilder.text()
+        .setParseMode("markdownv2")
+        .title("Test")
+        .line("Status", "Active", { bold: true })
+        .build();
+
+      expect(html.text).toContain("<b>Test</b>");
+      expect(html.text).toContain("Status: <b>Active</b>");
+      expect(html.parse_mode).toBe("html");
+
+      expect(markdown.text).toContain("*Test*");
+      expect(markdown.text).toContain("Status: *Active*");
+      expect(markdown.parse_mode).toBe("markdown");
+
+      expect(markdownv2.text).toContain("*Test*");
+      expect(markdownv2.text).toContain("Status: *Active*");
+      expect(markdownv2.parse_mode).toBe("markdownv2");
+    });
+  });
+});

package/src/escaping.test.ts

@@ -68,7 +68,7 @@ describe("Escaping", () => {
       const reserved = "_*[]()~`>#+-=|{}.!";
       const result = fmt.escapeMarkdownV2(reserved);
       expect(result).toBe(
-        "\\_\\*\\[\\]\\]\\)\\~\\`\\>\\#\\+\\-\\=\\|\\{\\}\\}.\\!",
+        "\\_\\*\\[\\]\\(\\)\\~\\`\\>\\#\\+\\-\\=\\|\\{\\}\\.\\!",
       );
     });
 
@@ -122,7 +122,7 @@ describe("Escaping", () => {
     it("should select MarkdownV2 mode", () => {
       const text = "[]()~`>#+-=|{}.!";
       const result = fmt.escape(text, "markdownv2");
-      expect(result).toBe("\\[\\]\\)\\~\\`\\>\\#\\+\\-\\=\\|\\{\\}\\}.\\!");
+      expect(result).toBe("\\[\\]\\(\\)\\~\\`\\>\\#\\+\\-\\=\\|\\{\\}\\.\\!");
     });
 
     it("should default to HTML mode", () => {

package/src/formatters/index.d.ts

@@ -1,4 +1,8 @@
 import type { ParseMode } from "../types";
+import { boldMD, italicMD, codeMD, codeBlockMD, linkMD, mentionMD, hashtagMD, underlineMD, strikethroughMD, spoilerMD, emailMD, urlMD, customEmojiMD, rawMD } from "./markdown";
+import { boldMDv2, italicMDv2, underlineMDv2, strikethroughMDv2, spoilerMDv2, codeMDv2, codeBlockMDv2, linkMDv2, mentionMDv2, hashtagMDv2, emailMDv2, urlMDv2, customEmojiMDv2, rawMDv2, escapeMDv2 } from "./markdownv2";
+export * from "./markdown";
+export * from "./markdownv2";
 export declare function escapeHTML(text: string): string;
 export declare function escapeMarkdown(text: string): string;
 export declare function escapeMarkdownV2(text: string): string;
@@ -16,6 +20,19 @@ export declare function hashtag(tag: string): string;
 export declare function customEmoji(emojiId: string): string;
 export declare function email(email: string): string;
 export declare function url(link: string): string;
+/**
+ * Raw HTML string - bypasses escaping for combining pre-formatted content
+ *
+ * @example
+ * ```typescript
+ * // Instead of this (which escapes inner tags):
+ * fmt.bold(fmt.italic("Text")) // <b>&lt;i&gt;Text&lt;/i&gt;</b>
+ *
+ * // Use this:
+ * fmt.bold(fmt.raw(fmt.italic("Text"))) // <b><i>Text</i></b>
+ * ```
+ */
+export declare function raw(html: string): string;
 export declare function escape(text: string, mode?: ParseMode): string;
 export declare const fmt: {
     bold: typeof bold;
@@ -36,5 +53,35 @@ export declare const fmt: {
     escapeHTML: typeof escapeHTML;
     escapeMarkdown: typeof escapeMarkdown;
     escapeMarkdownV2: typeof escapeMarkdownV2;
+    raw: typeof raw;
+    boldMD: typeof boldMD;
+    italicMD: typeof italicMD;
+    codeMD: typeof codeMD;
+    codeBlockMD: typeof codeBlockMD;
+    linkMD: typeof linkMD;
+    mentionMD: typeof mentionMD;
+    hashtagMD: typeof hashtagMD;
+    underlineMD: typeof underlineMD;
+    strikethroughMD: typeof strikethroughMD;
+    spoilerMD: typeof spoilerMD;
+    emailMD: typeof emailMD;
+    urlMD: typeof urlMD;
+    customEmojiMD: typeof customEmojiMD;
+    rawMD: typeof rawMD;
+    boldMDv2: typeof boldMDv2;
+    italicMDv2: typeof italicMDv2;
+    underlineMDv2: typeof underlineMDv2;
+    strikethroughMDv2: typeof strikethroughMDv2;
+    spoilerMDv2: typeof spoilerMDv2;
+    codeMDv2: typeof codeMDv2;
+    codeBlockMDv2: typeof codeBlockMDv2;
+    linkMDv2: typeof linkMDv2;
+    mentionMDv2: typeof mentionMDv2;
+    hashtagMDv2: typeof hashtagMDv2;
+    emailMDv2: typeof emailMDv2;
+    urlMDv2: typeof urlMDv2;
+    customEmojiMDv2: typeof customEmojiMDv2;
+    rawMDv2: typeof rawMDv2;
+    escapeMDv2: typeof escapeMDv2;
 };
 //# sourceMappingURL=index.d.ts.map

package/src/formatters/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAM/C;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAMnD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAOrD;AAED,wBAAgB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEzC;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAElD;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE5C;AAED,wBAAgB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEzC;AAED,wBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAExC;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAIjE;AAED,wBAAgB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAG7D;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED,wBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAExC;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,SAAkB,GAAG,MAAM,CASrE;AAED,eAAO,MAAM,GAAG;;;;;;;;;;;;;;;;;;;CAmBf,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAG1C,OAAO,EACL,MAAM,EACN,QAAQ,EACR,MAAM,EACN,WAAW,EACX,MAAM,EACN,SAAS,EACT,SAAS,EACT,WAAW,EACX,eAAe,EACf,SAAS,EACT,OAAO,EACP,KAAK,EACL,aAAa,EACb,KAAK,EACN,MAAM,YAAY,CAAC;AAEpB,OAAO,EACL,QAAQ,EACR,UAAU,EACV,aAAa,EACb,iBAAiB,EACjB,WAAW,EACX,QAAQ,EACR,aAAa,EACb,QAAQ,EACR,WAAW,EACX,WAAW,EACX,SAAS,EACT,OAAO,EACP,eAAe,EACf,OAAO,EACP,UAAU,EACX,MAAM,cAAc,CAAC;AAGtB,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAE7B,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAM/C;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAMnD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAOrD;AAED,wBAAgB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEzC;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAElD;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE5C;AAED,wBAAgB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEzC;AAED,wBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAExC;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAIjE;AAED,wBAAgB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAG7D;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED,wBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAExC;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAExC;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,SAAkB,GAAG,MAAM,CASrE;AAED,eAAO,MAAM,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsDf,CAAC"}

package/src/formatters/index.ts

@@ -1,5 +1,45 @@
 import type { ParseMode } from "../types";
 
+// Import Markdown and MarkdownV2 formatters for use in fmt object
+import {
+  boldMD,
+  italicMD,
+  codeMD,
+  codeBlockMD,
+  linkMD,
+  mentionMD,
+  hashtagMD,
+  underlineMD,
+  strikethroughMD,
+  spoilerMD,
+  emailMD,
+  urlMD,
+  customEmojiMD,
+  rawMD,
+} from "./markdown";
+
+import {
+  boldMDv2,
+  italicMDv2,
+  underlineMDv2,
+  strikethroughMDv2,
+  spoilerMDv2,
+  codeMDv2,
+  codeBlockMDv2,
+  linkMDv2,
+  mentionMDv2,
+  hashtagMDv2,
+  emailMDv2,
+  urlMDv2,
+  customEmojiMDv2,
+  rawMDv2,
+  escapeMDv2,
+} from "./markdownv2";
+
+// Re-export all formatters for external use
+export * from "./markdown";
+export * from "./markdownv2";
+
 export function escapeHTML(text: string): string {
   return text
     .replace(/&/g, "&")
@@ -56,7 +96,7 @@ export function pre(text: string): string {
 export function codeBlock(text: string, language?: string): string {
   return language
     ? `<pre><code class="language-${language}">${escapeHTML(text)}</code></pre>`
-    : `<pre>${escapeHTML(text)}</pre>`;
+    : `<pre><code>${escapeHTML(text)}</code></pre>`;
 }
 
 export function link(text: string, url: string): string {
@@ -84,6 +124,22 @@ export function url(link: string): string {
   return `<a href="${escapeHTML(link)}">${escapeHTML(link)}</a>`;
 }
 
+/**
+ * Raw HTML string - bypasses escaping for combining pre-formatted content
+ *
+ * @example
+ * ```typescript
+ * // Instead of this (which escapes inner tags):
+ * fmt.bold(fmt.italic("Text")) // <b>&lt;i&gt;Text&lt;/i&gt;</b>
+ *
+ * // Use this:
+ * fmt.bold(fmt.raw(fmt.italic("Text"))) // <b><i>Text</i></b>
+ * ```
+ */
+export function raw(html: string): string {
+  return html;
+}
+
 export function escape(text: string, mode: ParseMode = "html"): string {
   switch (mode) {
     case "html":
@@ -96,6 +152,7 @@ export function escape(text: string, mode: ParseMode = "html"): string {
 }
 
 export const fmt = {
+  // HTML formatters
   bold,
   italic,
   underline,
@@ -114,4 +171,38 @@ export const fmt = {
   escapeHTML,
   escapeMarkdown,
   escapeMarkdownV2,
+  raw,
+
+  // Markdown formatters
+  boldMD,
+  italicMD,
+  codeMD,
+  codeBlockMD,
+  linkMD,
+  mentionMD,
+  hashtagMD,
+  underlineMD,
+  strikethroughMD,
+  spoilerMD,
+  emailMD,
+  urlMD,
+  customEmojiMD,
+  rawMD,
+
+  // MarkdownV2 formatters
+  boldMDv2,
+  italicMDv2,
+  underlineMDv2,
+  strikethroughMDv2,
+  spoilerMDv2,
+  codeMDv2,
+  codeBlockMDv2,
+  linkMDv2,
+  mentionMDv2,
+  hashtagMDv2,
+  emailMDv2,
+  urlMDv2,
+  customEmojiMDv2,
+  rawMDv2,
+  escapeMDv2,
 };