md4x 0.0.20 → 0.0.22

package/lib/_shared.mjs

@@ -1,23 +1,29 @@
 const decoder = new TextDecoder();
 
-export function parseHtmlMeta(bytes) {
+function parseCodeMeta(bytes, extraFields) {
   const nullIdx = bytes.indexOf(0);
   if (nullIdx === -1) {
-    return { html: decoder.decode(bytes), codeBlocks: [] };
+    return { output: decoder.decode(bytes), codeBlocks: [] };
   }
-  const htmlBytes = bytes.subarray(0, nullIdx);
+  const outBytes = bytes.subarray(0, nullIdx);
   const metaBytes = bytes.subarray(nullIdx + 1);
-  const html = decoder.decode(htmlBytes);
+  const output = decoder.decode(outBytes);
   const meta = JSON.parse(decoder.decode(metaBytes));
   const codeBlocks = meta.map((m) => {
-    const start = decoder.decode(htmlBytes.subarray(0, m.s)).length;
-    const end = decoder.decode(htmlBytes.subarray(0, m.e)).length;
+    const start = decoder.decode(outBytes.subarray(0, m.s)).length;
+    const end = decoder.decode(outBytes.subarray(0, m.e)).length;
     const block = { start, end, lang: m.l || "" };
     if (m.f) block.filename = m.f;
     if (m.h) block.highlights = m.h;
+    if (extraFields) extraFields(block, m);
     return block;
   });
-  return { html, codeBlocks };
+  return { output, codeBlocks };
+}
+
+export function parseHtmlMeta(bytes) {
+  const { output, codeBlocks } = parseCodeMeta(bytes);
+  return { html: output, codeBlocks };
 }
 
 export function parseHtmlWithHighlighting(bytes, highlighter) {
@@ -54,3 +60,56 @@ function unescapeHtml(str) {
     .replaceAll(">", ">")
     .replaceAll(""", '"');
 }
+
+const DIM = "\x1b[2m";
+const DIM_OFF = "\x1b[22m";
+
+export function parseAnsiMeta(bytes) {
+  const { output, codeBlocks } = parseCodeMeta(bytes, (block, m) => {
+    if (m.i) block.prefix = m.i;
+  });
+  return { ansi: output, codeBlocks };
+}
+
+export function parseAnsiWithHighlighting(bytes, highlighter) {
+  const { ansi, codeBlocks } = parseAnsiMeta(bytes);
+  if (codeBlocks.length === 0) return ansi;
+  let out = "";
+  let pos = 0;
+  for (const block of codeBlocks) {
+    const region = ansi.slice(block.start, block.end);
+    const prefix = block.prefix || "  ";
+    // Strip DIM wrapper and extract raw code by removing prefix from each line
+    let inner = region;
+    if (inner.startsWith(DIM)) inner = inner.slice(DIM.length);
+    if (inner.endsWith(DIM_OFF)) inner = inner.slice(0, -DIM_OFF.length);
+    const code = inner
+      .split("\n")
+      .filter((l) => l.length > 0)
+      .map((l) => (l.startsWith(prefix) ? l.slice(prefix.length) : l))
+      .join("\n");
+    const highlighted = highlighter(code, block);
+    if (highlighted === undefined) {
+      out += ansi.slice(pos, block.end);
+    } else {
+      out += ansi.slice(pos, block.start);
+      // Wrap each line with the indent prefix
+      const lines = highlighted.split("\n");
+      for (let i = 0; i < lines.length; i++) {
+        if (lines[i].length > 0) {
+          out += prefix + lines[i];
+        }
+        if (i < lines.length - 1) {
+          out += "\n";
+        }
+      }
+      // Ensure trailing newline
+      if (!highlighted.endsWith("\n")) out += "\n";
+      pos = block.end;
+      continue;
+    }
+    pos = block.end;
+  }
+  out += ansi.slice(pos);
+  return out;
+}

package/lib/cli.mjs

@@ -6,6 +6,7 @@ import {
   renderToHtml,
   renderToAnsi,
   renderToText,
+  renderToMarkdown,
   parseAST,
   parseMeta,
   heal,
@@ -24,6 +25,8 @@ const { values, positionals } = parseArgs({
     "html-title": { type: "string" },
     "html-css": { type: "string" },
     heal: { type: "boolean", default: false },
+    "show-urls": { type: "boolean", default: false },
+    "show-frontmatter": { type: "boolean", default: false },
     stat: { type: "boolean", short: "s", default: false },
     help: { type: "boolean", short: "h", default: false },
     version: { type: "boolean", short: "v", default: false },
@@ -45,8 +48,10 @@ ${_g("Usage:")} ${_b("md4x")} ${_d("[OPTION]... [FILE]")}
 
 ${_g("General options:")}
   ${_c("-o")}, ${_c("--output")}=${_d("FILE")}     Output file ${_d("(default: stdout)")}
-  ${_c("-t")}, ${_c("--format")}=${_d("FORMAT")}   Output format: ${_c("html")}, ${_c("text")}, ${_c("ast")}, ${_c("ansi")}, ${_c("meta")}, ${_c("heal")} ${_d("(default: ansi for TTY, text otherwise)")}
+  ${_c("-t")}, ${_c("--format")}=${_d("FORMAT")}   Output format: ${_c("html")}, ${_c("text")}, ${_c("ast")}, ${_c("ansi")}, ${_c("meta")}, ${_c("markdown")}, ${_c("heal")} ${_d("(default: ansi for TTY, text otherwise)")}
       ${_c("--heal")}             Heal incomplete markdown before rendering
+      ${_c("--show-urls")}         Show link URLs after link text ${_d("(ANSI only)")}
+      ${_c("--show-frontmatter")}  Show frontmatter content ${_d("(ANSI only)")}
   ${_c("-s")}, ${_c("--stat")}            Measure parsing time
   ${_c("-h")}, ${_c("--help")}            Display this help and exit
   ${_c("-v")}, ${_c("--version")}         Display version and exit
@@ -92,7 +97,15 @@ if (values.version) {
   process.exit(0);
 }
 
-const supportedFormats = ["html", "ast", "ansi", "text", "meta", "heal"];
+const supportedFormats = [
+  "html",
+  "ast",
+  "ansi",
+  "text",
+  "meta",
+  "markdown",
+  "heal",
+];
 const format = values.format;
 if (!supportedFormats.includes(format)) {
   process.stderr.write(`Unknown format: ${format}\n`);
@@ -165,7 +178,11 @@ switch (format) {
     output = renderToHtml(input, healOpt);
     break;
   case "ansi":
-    output = renderToAnsi(input, healOpt);
+    output = renderToAnsi(input, {
+      ...healOpt,
+      showUrls: values["show-urls"],
+      showFrontmatter: values["show-frontmatter"],
+    });
     break;
   case "text":
     output = renderToText(input, healOpt);
@@ -176,6 +193,9 @@ switch (format) {
   case "meta":
     output = JSON.stringify(parseMeta(input, healOpt), null, 2);
     break;
+  case "markdown":
+    output = renderToMarkdown(input, healOpt);
+    break;
   case "heal":
     output = heal(input);
     break;

package/lib/napi.d.mts

@@ -2,6 +2,7 @@ import type {
   ComarkTree,
   ComarkMeta,
   HtmlOptions,
+  AnsiOptions,
   RenderOptions,
 } from "./types.mjs";
 
@@ -14,6 +15,7 @@ export type {
   ComarkHeading,
   ComarkMeta,
   HtmlOptions,
+  AnsiOptions,
   RenderOptions,
 } from "./types.mjs";
 
@@ -24,8 +26,10 @@ export interface NAPIBinding {
   renderToHtmlMeta(input: string): Buffer;
   renderToAST(input: string, flags?: number): string;
   renderToAnsi(input: string, flags?: number): string;
+  renderToAnsiMeta(input: string): Buffer;
   renderToMeta(input: string, flags?: number): string;
   renderToText(input: string, flags?: number): string;
+  renderToMarkdown(input: string, flags?: number): string;
   heal(input: string): string;
 }
 
@@ -43,10 +47,7 @@ export declare function parseAST(
   input: string,
   opts?: RenderOptions,
 ): ComarkTree;
-export declare function renderToAnsi(
-  input: string,
-  opts?: RenderOptions,
-): string;
+export declare function renderToAnsi(input: string, opts?: AnsiOptions): string;
 export declare function renderToMeta(
   input: string,
   opts?: RenderOptions,
@@ -59,4 +60,8 @@ export declare function renderToText(
   input: string,
   opts?: RenderOptions,
 ): string;
+export declare function renderToMarkdown(
+  input: string,
+  opts?: RenderOptions,
+): string;
 export declare function heal(input: string): string;

package/lib/napi.mjs

@@ -1,4 +1,7 @@
-import { parseHtmlWithHighlighting } from "./_shared.mjs";
+import {
+  parseHtmlWithHighlighting,
+  parseAnsiWithHighlighting,
+} from "./_shared.mjs";
 
 // --- internal ---
 
@@ -62,8 +65,18 @@ export function parseAST(input, opts) {
 }
 
 export function renderToAnsi(input, opts) {
-  const flags = opts?.heal ? HEAL_FLAG : 0;
-  return getBinding().renderToAnsi(str(input), flags);
+  let flags = opts?.heal ? HEAL_FLAG : 0;
+  if (opts?.showUrls) flags |= 0x0010;
+  if (opts?.showFrontmatter) flags |= 0x0020;
+  if (!opts?.highlighter) {
+    return getBinding().renderToAnsi(str(input), flags);
+  }
+  const s = opts?.heal ? getBinding().heal(str(input)) : str(input);
+  const buf = getBinding().renderToAnsiMeta(s);
+  return parseAnsiWithHighlighting(
+    new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength),
+    opts.highlighter,
+  );
 }
 
 export function renderToMeta(input, opts) {
@@ -76,6 +89,11 @@ export function renderToText(input, opts) {
   return getBinding().renderToText(str(input), flags);
 }
 
+export function renderToMarkdown(input, opts) {
+  const flags = opts?.heal ? HEAL_FLAG : 0;
+  return getBinding().renderToMarkdown(str(input), flags);
+}
+
 export function parseMeta(input, opts) {
   const meta = JSON.parse(renderToMeta(input, opts));
   if (!meta.title && meta.headings?.[0]) {

package/lib/types.d.mts

@@ -34,6 +34,18 @@ export interface RenderOptions {
   heal?: boolean;
 }
 
+export interface AnsiOptions extends RenderOptions {
+  /**
+   * Custom highlighter function for fenced code blocks. If provided, code blocks
+   * are passed through this callback which can return custom ANSI-highlighted output.
+   */
+  highlighter?: AnsiCodeBlockHighlighter;
+  /** Show link URLs after link text (e.g. `text (url)`). Default: false (links are clickable via OSC 8). */
+  showUrls?: boolean;
+  /** Show frontmatter content as dim text. Default: false (frontmatter is suppressed). */
+  showFrontmatter?: boolean;
+}
+
 export interface HtmlOptions extends RenderOptions {
   /** Generate a full HTML document with `<!DOCTYPE html>`, `<head>`, and `<body>`. */
   full?: boolean;
@@ -70,3 +82,25 @@ export interface HtmlWithCodeBlocks {
   /** Metadata for each fenced code block in document order */
   codeBlocks: CodeBlock[];
 }
+
+export interface AnsiCodeBlock {
+  /** Character offset in ANSI string where code block starts (including DIM escape) */
+  start: number;
+  /** Character offset in ANSI string where code block ends (including DIM_OFF escape) */
+  end: number;
+  /** Language identifier (empty string if none) */
+  lang: string;
+  /** Filename from `[filename]` syntax */
+  filename?: string;
+  /** Highlighted line numbers from `{1-3,5}` syntax */
+  highlights?: number[];
+  /** Line indent prefix (includes ANSI escapes for colored bars in nested contexts) */
+  prefix?: string;
+}
+
+export type AnsiCodeBlockHighlighter = (
+  /** Raw code content (indentation stripped) */
+  code: string,
+  /** Code block metadata (lang, filename, highlights, offsets) */
+  block: AnsiCodeBlock,
+) => string | undefined;

package/lib/wasm/common.mjs

@@ -1,4 +1,7 @@
-import { parseHtmlWithHighlighting } from "../_shared.mjs";
+import {
+  parseHtmlWithHighlighting,
+  parseAnsiWithHighlighting,
+} from "../_shared.mjs";
 
 // --- internal ---
 
@@ -57,27 +60,14 @@ function render(exports, fn, input, ...extra) {
   return result;
 }
 
-const HEAL_FLAG = 0x0100;
-
-export function renderToHtml(input, opts) {
-  let flags = opts?.full ? 0x0008 : 0;
-  if (opts?.heal) flags |= HEAL_FLAG;
-  const exports = _getExports();
-  if (!opts?.highlighter) {
-    return render(exports, exports.md4x_to_html, input, flags);
-  }
-  const {
-    memory,
-    md4x_alloc,
-    md4x_free,
-    md4x_to_html_meta,
-    md4x_result_ptr,
-    md4x_result_size,
-  } = exports;
+/* Render with a meta function, returning raw bytes for highlighter processing. */
+function renderMetaBytes(exports, metaFn, input) {
+  const { memory, md4x_alloc, md4x_free, md4x_result_ptr, md4x_result_size } =
+    exports;
   const encoded = new TextEncoder().encode(str(input));
   const ptr = md4x_alloc(encoded.length);
   new Uint8Array(memory.buffer).set(encoded, ptr);
-  const ret = md4x_to_html_meta(ptr, encoded.length);
+  const ret = metaFn(ptr, encoded.length);
   md4x_free(ptr);
   if (ret !== 0) {
     throw new Error("md4x: render failed");
@@ -85,8 +75,25 @@ export function renderToHtml(input, opts) {
   const outPtr = md4x_result_ptr();
   const outSize = md4x_result_size();
   const bytes = new Uint8Array(memory.buffer, outPtr, outSize);
+  return { bytes, outPtr };
+}
+
+const HEAL_FLAG = 0x0100;
+
+export function renderToHtml(input, opts) {
+  let flags = opts?.full ? 0x0008 : 0;
+  if (opts?.heal) flags |= HEAL_FLAG;
+  const exports = _getExports();
+  if (!opts?.highlighter) {
+    return render(exports, exports.md4x_to_html, input, flags);
+  }
+  const { bytes, outPtr } = renderMetaBytes(
+    exports,
+    exports.md4x_to_html_meta,
+    input,
+  );
   const result = parseHtmlWithHighlighting(bytes, opts.highlighter);
-  md4x_free(outPtr);
+  exports.md4x_free(outPtr);
   return result;
 }
 
@@ -101,9 +108,22 @@ export function parseAST(input, opts) {
 }
 
 export function renderToAnsi(input, opts) {
-  const flags = opts?.heal ? HEAL_FLAG : 0;
+  let flags = opts?.heal ? HEAL_FLAG : 0;
+  if (opts?.showUrls) flags |= 0x0010;
+  if (opts?.showFrontmatter) flags |= 0x0020;
   const exports = _getExports();
-  return render(exports, exports.md4x_to_ansi, input, flags);
+  if (!opts?.highlighter) {
+    return render(exports, exports.md4x_to_ansi, input, flags);
+  }
+  const s = opts?.heal ? heal(str(input)) : str(input);
+  const { bytes, outPtr } = renderMetaBytes(
+    exports,
+    exports.md4x_to_ansi_meta,
+    s,
+  );
+  const result = parseAnsiWithHighlighting(bytes, opts.highlighter);
+  exports.md4x_free(outPtr);
+  return result;
 }
 
 export function renderToMeta(input, opts) {
@@ -118,6 +138,12 @@ export function renderToText(input, opts) {
   return render(exports, exports.md4x_to_text, input, flags);
 }
 
+export function renderToMarkdown(input, opts) {
+  const flags = opts?.heal ? HEAL_FLAG : 0;
+  const exports = _getExports();
+  return render(exports, exports.md4x_to_markdown, input, flags);
+}
+
 export function parseMeta(input, opts) {
   const meta = JSON.parse(renderToMeta(input, opts));
   if (!meta.title && meta.headings?.[0]) {

package/lib/wasm/default.mjs

@@ -6,6 +6,7 @@ export {
   parseMeta,
   renderToMeta,
   renderToText,
+  renderToMarkdown,
   heal,
 } from "./common.mjs";
 

package/lib/wasm/index.d.mts

@@ -2,6 +2,7 @@ import type {
   ComarkTree,
   ComarkMeta,
   HtmlOptions,
+  AnsiOptions,
   RenderOptions,
 } from "../types.mjs";
 
@@ -14,6 +15,7 @@ export type {
   ComarkHeading,
   ComarkMeta,
   HtmlOptions,
+  AnsiOptions,
   RenderOptions,
 } from "../types.mjs";
 
@@ -36,10 +38,7 @@ export declare function parseAST(
   input: string,
   opts?: RenderOptions,
 ): ComarkTree;
-export declare function renderToAnsi(
-  input: string,
-  opts?: RenderOptions,
-): string;
+export declare function renderToAnsi(input: string, opts?: AnsiOptions): string;
 export declare function renderToMeta(
   input: string,
   opts?: RenderOptions,
@@ -52,4 +51,8 @@ export declare function renderToText(
   input: string,
   opts?: RenderOptions,
 ): string;
+export declare function renderToMarkdown(
+  input: string,
+  opts?: RenderOptions,
+): string;
 export declare function heal(input: string): string;

package/lib/wasm/unwasm.mjs

@@ -6,6 +6,7 @@ export {
   parseMeta,
   renderToMeta,
   renderToText,
+  renderToMarkdown,
   heal,
 } from "./common.mjs";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "md4x",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "repository": "unjs/md4x",
   "license": "MIT",
   "type": "module",