md4x 0.0.18 → 0.0.20

package/lib/_shared.mjs

@@ -0,0 +1,56 @@
+const decoder = new TextDecoder();
+
+export function parseHtmlMeta(bytes) {
+  const nullIdx = bytes.indexOf(0);
+  if (nullIdx === -1) {
+    return { html: decoder.decode(bytes), codeBlocks: [] };
+  }
+  const htmlBytes = bytes.subarray(0, nullIdx);
+  const metaBytes = bytes.subarray(nullIdx + 1);
+  const html = decoder.decode(htmlBytes);
+  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 block = { start, end, lang: m.l || "" };
+    if (m.f) block.filename = m.f;
+    if (m.h) block.highlights = m.h;
+    return block;
+  });
+  return { html, codeBlocks };
+}
+
+export function parseHtmlWithHighlighting(bytes, highlighter) {
+  const { html, codeBlocks } = parseHtmlMeta(bytes);
+  if (codeBlocks.length === 0) return html;
+  let out = "";
+  let pos = 0;
+  for (const block of codeBlocks) {
+    const code = unescapeHtml(html.slice(block.start, block.end));
+    const highlighted = highlighter(code, block);
+    if (highlighted === undefined) {
+      out += html.slice(pos, block.end);
+    } else {
+      // Calculate <pre><code...> prefix length to replace the full wrapper
+      const preLen = block.lang
+        ? '<pre><code class="language-'.length + block.lang.length + '">'.length
+        : "<pre><code>".length;
+      out += html.slice(pos, block.start - preLen);
+      out += highlighted;
+      pos = block.end + "</code></pre>\n".length;
+      continue;
+    }
+    pos = block.end;
+  }
+  out += html.slice(pos);
+  return out;
+}
+
+function unescapeHtml(str) {
+  if (!str.includes("&")) return str;
+  return str
+    .replaceAll("&amp;", "&")
+    .replaceAll("&lt;", "<")
+    .replaceAll("&gt;", ">")
+    .replaceAll("&quot;", '"');
+}

package/lib/napi.d.mts

@@ -17,8 +17,11 @@ export type {
   RenderOptions,
 } from "./types.mjs";
 
+export type * from "./types.mjs";
+
 export interface NAPIBinding {
   renderToHtml(input: string, flags?: number): string;
+  renderToHtmlMeta(input: string): Buffer;
   renderToAST(input: string, flags?: number): string;
   renderToAnsi(input: string, flags?: number): string;
   renderToMeta(input: string, flags?: number): string;

package/lib/napi.mjs

@@ -1,7 +1,16 @@
+import { parseHtmlWithHighlighting } from "./_shared.mjs";
+
 // --- internal ---
 
 let binding;
 
+function str(input) {
+  if (input == null) return "";
+  if (typeof input !== "string")
+    throw new TypeError("md4x: input must be a string");
+  return input;
+}
+
 function getBinding(opts) {
   if (binding) return binding;
   if (opts?.binding) {
@@ -33,12 +42,19 @@ const HEAL_FLAG = 0x0100;
 export function renderToHtml(input, opts) {
   let flags = opts?.full ? 0x0008 : 0;
   if (opts?.heal) flags |= HEAL_FLAG;
-  return getBinding().renderToHtml(input, flags);
+  if (!opts?.highlighter) {
+    return getBinding().renderToHtml(str(input), flags);
+  }
+  const buf = getBinding().renderToHtmlMeta(str(input));
+  return parseHtmlWithHighlighting(
+    new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength),
+    opts.highlighter,
+  );
 }
 
 export function renderToAST(input, opts) {
   const flags = opts?.heal ? HEAL_FLAG : 0;
-  return getBinding().renderToAST(input, flags);
+  return getBinding().renderToAST(str(input), flags);
 }
 
 export function parseAST(input, opts) {
@@ -47,17 +63,17 @@ export function parseAST(input, opts) {
 
 export function renderToAnsi(input, opts) {
   const flags = opts?.heal ? HEAL_FLAG : 0;
-  return getBinding().renderToAnsi(input, flags);
+  return getBinding().renderToAnsi(str(input), flags);
 }
 
 export function renderToMeta(input, opts) {
   const flags = opts?.heal ? HEAL_FLAG : 0;
-  return getBinding().renderToMeta(input, flags);
+  return getBinding().renderToMeta(str(input), flags);
 }
 
 export function renderToText(input, opts) {
   const flags = opts?.heal ? HEAL_FLAG : 0;
-  return getBinding().renderToText(input, flags);
+  return getBinding().renderToText(str(input), flags);
 }
 
 export function parseMeta(input, opts) {
@@ -69,5 +85,5 @@ export function parseMeta(input, opts) {
 }
 
 export function heal(input) {
-  return getBinding().heal(input);
+  return getBinding().heal(str(input));
 }

package/lib/types.d.mts

@@ -37,4 +37,36 @@ export interface RenderOptions {
 export interface HtmlOptions extends RenderOptions {
   /** Generate a full HTML document with `<!DOCTYPE html>`, `<head>`, and `<body>`. */
   full?: boolean;
+
+  /**
+   * Custom highlighter function for fenced code blocks. If provided, this will cause
+   */
+  highlighter: CodeBlockHighlighter;
+}
+
+export interface CodeBlock {
+  /** Character offset in HTML string where code content starts (after `<code...>`) */
+  start: number;
+  /** Character offset in HTML string where code content ends (before `</code>`) */
+  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[];
+}
+
+export type CodeBlockHighlighter = (
+  /** Raw code content (HTML entities unescaped) */
+  code: string,
+  /** Code block metadata (lang, filename, highlights, offsets) */
+  block: CodeBlock,
+) => string | undefined;
+
+export interface HtmlWithCodeBlocks {
+  /** The HTML string */
+  html: string;
+  /** Metadata for each fenced code block in document order */
+  codeBlocks: CodeBlock[];
 }

package/lib/wasm/common.mjs

@@ -1,3 +1,5 @@
+import { parseHtmlWithHighlighting } from "../_shared.mjs";
+
 // --- internal ---
 
 let _instance;
@@ -28,10 +30,17 @@ export const _imports = {
   },
 };
 
+function str(input) {
+  if (input == null) return "";
+  if (typeof input !== "string")
+    throw new TypeError("md4x: input must be a string");
+  return input;
+}
+
 function render(exports, fn, input, ...extra) {
   const { memory, md4x_alloc, md4x_free, md4x_result_ptr, md4x_result_size } =
     exports;
-  const encoded = new TextEncoder().encode(input);
+  const encoded = new TextEncoder().encode(str(input));
   const ptr = md4x_alloc(encoded.length);
   new Uint8Array(memory.buffer).set(encoded, ptr);
   const ret = fn(ptr, encoded.length, ...extra);
@@ -54,7 +63,31 @@ export function renderToHtml(input, opts) {
   let flags = opts?.full ? 0x0008 : 0;
   if (opts?.heal) flags |= HEAL_FLAG;
   const exports = _getExports();
-  return render(exports, exports.md4x_to_html, input, flags);
+  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;
+  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);
+  md4x_free(ptr);
+  if (ret !== 0) {
+    throw new Error("md4x: render failed");
+  }
+  const outPtr = md4x_result_ptr();
+  const outSize = md4x_result_size();
+  const bytes = new Uint8Array(memory.buffer, outPtr, outSize);
+  const result = parseHtmlWithHighlighting(bytes, opts.highlighter);
+  md4x_free(outPtr);
+  return result;
 }
 
 export function renderToAST(input, opts) {

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "md4x",
-  "version": "0.0.18",
-  "repository": "pi0/md4x",
+  "version": "0.0.20",
+  "repository": "unjs/md4x",
   "license": "MIT",
   "type": "module",
   "exports": {
     "./wasm": {
       "types": "./lib/wasm/index.d.mts",
       "unwasm": "./lib/wasm/unwasm.mjs",
-      "default": "./lib/wasm/defult.mjs"
+      "default": "./lib/wasm/default.mjs"
     },
     "./napi": "./lib/napi.mjs",
     "./build/md4x.wasm": "./build/md4x.wasm",
@@ -16,7 +16,7 @@
       "node": "./lib/napi.mjs",
       "default": {
         "unwasm": "./lib/wasm/unwasm.mjs",
-        "default": "./lib/wasm/defult.mjs"
+        "default": "./lib/wasm/default.mjs"
       }
     }
   },