npm - @dunkinfrunkin/mdcat - Versions diffs - 0.1.9 → 0.1.11 - Mend

@dunkinfrunkin/mdcat 0.1.9 → 0.1.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@dunkinfrunkin/mdcat",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "View markdown files beautifully in your terminal",
   "type": "module",
   "bin": {

package/src/cli.js CHANGED Viewed

@@ -3,7 +3,7 @@ import { readFileSync, writeFileSync } from "fs";
 import { resolve, basename } from "path";
 import { tmpdir } from "os";
 import { execFileSync } from "child_process";
-import { marked } from "marked";
+import { marked, Marked } from "marked";
 import { renderTokens } from "./render.js";
 import { launch } from "./tui.js";
 import { toDocx } from "./docx.js";
@@ -45,14 +45,28 @@ if (args[0] === "--version" || args[0] === "-v") {
 const MAX_COLS = 100;
+function escapeHtml(s) {
+  return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+}
 function openInBrowser(title, content) {
-  const html = marked.parse(content);
+  // Use a custom renderer that escapes raw HTML tokens so bare <tag> in
+  // markdown text isn't swallowed by the browser.
+  const webMarked = new Marked({ gfm: true });
+  webMarked.use({
+    renderer: {
+      html(token) {
+        return escapeHtml(token.text);
+      },
+    },
+  });
+  const html = webMarked.parse(content);
   const page = `<!DOCTYPE html>
 <html lang="en">
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>${title}</title>
+  <title>${escapeHtml(title)}</title>
   <style>
     * { box-sizing: border-box; margin: 0; padding: 0; }
     body {
@@ -98,9 +112,10 @@ function openInBrowser(title, content) {
 }
 function runTUI(title, content) {
-  const cols = Math.min(process.stdout.columns || 80, MAX_COLS);
+  const termCols = process.stdout.columns || 80;
+  const cols = Math.min(termCols, MAX_COLS);
   const tokens = marked.lexer(content);
-  const lines = renderTokens(tokens, cols);
+  const lines = renderTokens(tokens, cols, termCols > MAX_COLS ? termCols : undefined);
   launch(title, lines);
 }

package/src/docx.js CHANGED Viewed

@@ -104,7 +104,9 @@ function htmlDecode(s) {
     .replace(/&gt;/g, ">")
     .replace(/&quot;/g, '"')
     .replace(/&#39;/g, "'")
-    .replace(/&nbsp;/g, " ");
+    .replace(/&nbsp;/g, " ")
+    .replace(/&#(\d+);/g, (_, n) => String.fromCharCode(Number(n)))
+    .replace(/&#x([0-9a-fA-F]+);/g, (_, h) => String.fromCharCode(parseInt(h, 16)));
 }
 // ─── Block token → Paragraph[] ──────────────────────────────────────────────

package/src/render.js CHANGED Viewed

@@ -95,7 +95,9 @@ function htmlDecode(s) {
     .replace(/&gt;/g, ">")
     .replace(/&quot;/g, '"')
     .replace(/&#39;/g, "'")
-    .replace(/&nbsp;/g, " ");
+    .replace(/&nbsp;/g, " ")
+    .replace(/&#(\d+);/g, (_, n) => String.fromCharCode(Number(n)))
+    .replace(/&#x([0-9a-fA-F]+);/g, (_, h) => String.fromCharCode(parseInt(h, 16)));
 }
 // ─── Inline renderer ───────────────────────────────────────────────────────────
@@ -202,11 +204,6 @@ function code(tok, w) {
   // Expand tabs to 2 spaces
   const rawText = (tok.text ?? "").replace(/\t/g, "  ");
-  // innerW = content width between borders (1 space padding each side)
-  const innerW = w - 2;
-  // borderW = total inner span for the box (includes the 1px padding each side)
-  const borderW = innerW + 2;
   let rawLines;
   if (rawText === "") {
     rawLines = [""];
@@ -239,13 +236,21 @@ function code(tok, w) {
   // Pad to same length just in case highlight produced different line count
   while (highlighted.length < rawLines.length) highlighted.push("");
+  // Size the box to the longest line (capped at terminal width)
+  const maxLineW = highlighted.reduce((m, l) => Math.max(m, vlen(l)), 0);
+  const langTagLen = lang ? 1 + lang.length + 1 : 0; // " lang " visual chars
+  // innerW = content area between pipes (1 space padding each side)
+  // Must fit: longest line, lang tag in top border, and minimum 4 chars
+  const innerW = Math.min(w - 2, Math.max(maxLineW, langTagLen + 2, 4));
+  // borderW = total inner span for the box (includes the 1-char padding each side)
+  const borderW = innerW + 2;
   const lines = [""];
   // Top border: ┌─ lang ─────┐ or ┌──────────────┐
   let top;
   if (lang) {
     const langTag = " " + c.codeLang(lang) + " ";
-    const langTagLen = 1 + lang.length + 1; // visual chars
     const fill = Math.max(0, borderW - langTagLen - 1); // -1 for leading "─"
     top =
       c.border("┌─") +
@@ -463,7 +468,7 @@ function hr(w) {
 // ─── Token dispatcher ──────────────────────────────────────────────────────────
-function token(tok, w) {
+function token(tok, w, tableW) {
   try {
     switch (tok.type) {
       case "heading":
@@ -477,7 +482,7 @@ function token(tok, w) {
       case "list":
         return ["", ...list(tok, w, 0), ""];
       case "table":
-        return table(tok, w);
+        return table(tok, tableW ?? w);
       case "hr":
         return hr(w);
       case "space":
@@ -499,9 +504,11 @@ function token(tok, w) {
  *
  * @param {import("marked").Token[]} tokens  - Output of `marked.lexer()`
  * @param {number} cols                      - Terminal width (default 80)
+ * @param {number} [fullCols]               - Uncapped terminal width for tables
  * @returns {string[]}
  */
-export function renderTokens(tokens, cols = 80) {
+export function renderTokens(tokens, cols = 80, fullCols) {
   const w = Math.max(20, cols - MARGIN.length * 2);
-  return tokens.flatMap((tok) => token(tok, w));
+  const tableW = fullCols ? Math.max(20, fullCols - MARGIN.length * 2) : undefined;
+  return tokens.flatMap((tok) => token(tok, w, tableW));
 }