mduck 1.0.6 → 2.0.2

package/bin/mduck

@@ -1,2 +1,49 @@
-#!/bin/sh
-exec bun "$(dirname "$0")/mduck.js" "$@" 2>/dev/null || exec node "$(dirname "$0")/mduck.js" "$@"
+#!/bin/sh -
+':'; /*-
+test1=$(bun --version 2>&1) && exec bun "$0" "$@"
+test2=$(node --version 2>&1) && exec node "$0" "$@"
+exec printf '%s\n' "$test1" "$test2" 1>&2
+*/
+
+import { execFileSync } from "child_process";
+import { arch, platform } from "os";
+import { resolve, dirname } from "path";
+import { fileURLToPath } from "url";
+import { existsSync } from "fs";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const plat = platform();
+const a = arch();
+const ext = plat === "win32" ? ".exe" : "";
+const pkgName = `mduck-${plat}-${a}`;
+
+const candidates = [
+  // Typical node_modules layout (npx, npm install -g, etc.)
+  resolve(__dirname, "..", "node_modules", "@simplyhexagonal", pkgName, "bin", `mduck${ext}`),
+  // pnpm / hoisted layout
+  resolve(__dirname, "..", "..", "@simplyhexagonal", pkgName, "bin", `mduck${ext}`),
+  // Global install with lib/node_modules
+  resolve(__dirname, "..", "lib", "node_modules", "@simplyhexagonal", pkgName, "bin", `mduck${ext}`),
+  // Bun global layout
+  resolve(__dirname, "..", "..", "..", "@simplyhexagonal", pkgName, "bin", `mduck${ext}`),
+];
+
+const binary = candidates.find((c) => existsSync(c));
+
+if (!binary) {
+  const supported = ["darwin-arm64", "darwin-x64", "linux-arm64", "linux-x64", "win32-x64"];
+  console.error(`\n  mduck: no binary found for ${plat}-${a}\n`);
+  console.error(`  Supported platforms: ${supported.join(", ")}`);
+  console.error(`  Searched:`);
+  for (const c of candidates) {
+    console.error(`    - ${c}`);
+  }
+  console.error(`\n  Try reinstalling: npm install -g mduck\n`);
+  process.exit(1);
+}
+
+try {
+  execFileSync(binary, process.argv.slice(2), { stdio: "inherit" });
+} catch (e) {
+  process.exit(e.status ?? 1);
+}

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "mduck",
-  "version": "1.0.6",
+  "version": "2.0.2",
   "description": "A CLI tool to convert Markdown files into HTML and PDF documents using Tailwind CSS v4 for styling.",
   "files": [
     "bin/",
-    "src/template.html",
     "README.md"
   ],
   "keywords": [
@@ -19,26 +18,33 @@
   ],
   "author": "Jean M. Lescure",
   "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/simplyhexagonal/mduck.git"
+  },
   "bin": {
     "mduck": "./bin/mduck"
   },
   "scripts": {
-    "build": "tsup --config tsup.config.ts && chmod +x ./bin/mduck ./bin/mduck.js",
+    "build": "bun run build.ts",
+    "publish-all": "bun run publish.ts",
+    "publish-all:dry": "bun run publish.ts --dry-run",
+    "prepack": "bun run build",
     "dev": "bun --watch run ./src/index.ts convert test/input/test.md test/output/"
   },
   "type": "module",
-  "devDependencies": {
-    "@types/bun": "latest",
-    "tsup": "^8.5.1"
+  "optionalDependencies": {
+    "@simplyhexagonal/mduck-darwin-arm64": "2.0.0",
+    "@simplyhexagonal/mduck-darwin-x64": "2.0.0",
+    "@simplyhexagonal/mduck-linux-arm64": "2.0.0",
+    "@simplyhexagonal/mduck-linux-x64": "2.0.0",
+    "@simplyhexagonal/mduck-win32-x64": "2.0.0"
   },
-  "peerDependencies": {
-    "typescript": "^5"
-  },
-  "dependencies": {
+  "devDependencies": {
     "@tailwindcss/typography": "^0.5.19",
     "citty": "^0.2.1",
     "marked": "^17.0.4",
-    "puppeteer": "^24.38.0",
+    "puppeteer-core": "^24.38.0",
     "tailwindcss": "^4.2.1"
   }
 }

package/bin/mduck.cmd

@@ -1,9 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-set scriptdir=%~dp0
-set scriptpath=!scriptdir!mduck.js
-
-bun "!scriptpath!" %* 2>nul
-if !errorlevel! equ 0 goto :eof
-
-node "!scriptpath!" %*

package/bin/mduck.js

@@ -1,317 +0,0 @@
-// src/index.ts
-import { mkdir, readFile, stat, writeFile } from "fs/promises";
-import { basename, dirname, extname, isAbsolute, join, resolve, sep } from "path";
-import { createRequire } from "module";
-import { pathToFileURL } from "url";
-import { defineCommand, runMain } from "citty";
-import { marked } from "marked";
-import puppeteer from "puppeteer";
-import { compile } from "tailwindcss";
-
-// src/template.html
-var template_default = '<!DOCTYPE html>\n<html lang="en">\n<head>\n    <meta charset="UTF-8">\n    <meta name="viewport" content="width=device-width, initial-scale=1.0">\n    <title>Document</title>\n</head>\n<body>\n    <article class="prose lg:prose-xl print:prose-sm mx-auto my-8 print:m-0 px-4">\n    [BODY]\n    </article>\n    <style>\n        @media print {\n            @page {\n                margin: 2cm !important; /* Sets a 2cm margin on all sides of every printed page */\n            }\n        }\n        table {\n            border: 1px solid black;\n            border-collapse: collapse;\n        }\n        th, td {\n            border: 1px solid black;\n            padding: 0.5em;\n        }\n    </style>\n</body>\n</html>\n';
-
-// package.json
-var package_default = {
-  name: "mduck",
-  version: "1.0.5",
-  description: "A CLI tool to convert Markdown files into HTML and PDF documents using Tailwind CSS v4 for styling.",
-  files: [
-    "bin/",
-    "src/template.html",
-    "README.md"
-  ],
-  keywords: [
-    "markdown",
-    "md",
-    "html",
-    "pdf",
-    "converter",
-    "cli",
-    "tailwind",
-    "puppeteer"
-  ],
-  author: "Jean M. Lescure",
-  license: "Apache-2.0",
-  bin: {
-    mduck: "./bin/mduck.js"
-  },
-  scripts: {
-    build: "tsup --config tsup.config.ts",
-    dev: "bun --watch run ./src/index.ts convert test/input/test.md test/output/"
-  },
-  type: "module",
-  devDependencies: {
-    "@types/bun": "latest",
-    tsup: "^8.5.1"
-  },
-  peerDependencies: {
-    typescript: "^5"
-  },
-  dependencies: {
-    "@tailwindcss/typography": "^0.5.19",
-    citty: "^0.2.1",
-    marked: "^17.0.4",
-    puppeteer: "^24.38.0",
-    tailwindcss: "^4.2.1"
-  }
-};
-
-// src/index.ts
-var BODY_PLACEHOLDER = "[BODY]";
-var DEFAULT_TEMPLATE_HTML = template_default;
-var DEFAULT_EJECTED_TEMPLATE_FILENAME = "mduck.template.html";
-var RUNTIME_ENTRY_DIR = dirname(resolve(process.argv[1] ?? process.cwd()));
-var require2 = createRequire(resolve(RUNTIME_ENTRY_DIR, "__mduck_require__.cjs"));
-var TAILWIND_INPUT_CSS = `@import "tailwindcss";
-@plugin "@tailwindcss/typography";`;
-var pageBreak = {
-  name: "pageBreak",
-  level: "inline",
-  start: (src) => src.indexOf("[PAGE-BREAK]"),
-  tokenizer: (src) => {
-    if (src.startsWith("[PAGE-BREAK]")) {
-      return { type: "pageBreak", raw: "[PAGE-BREAK]" };
-    }
-  },
-  renderer: () => '<div class="break-after-page"></div>'
-};
-var toAbsolutePath = (filePath) => {
-  return isAbsolute(filePath) ? filePath : resolve(process.cwd(), filePath);
-};
-var inferOutputPath = (inputPath) => {
-  const inputExt = extname(inputPath).toLowerCase();
-  if (inputExt === ".md") {
-    return inputPath.slice(0, -3) + ".html";
-  }
-  return `${inputPath}.html`;
-};
-var inferHtmlBasename = (inputPath) => {
-  return basename(inferOutputPath(inputPath));
-};
-var inferPdfPath = (htmlOutputPath) => {
-  const outputExt = extname(htmlOutputPath).toLowerCase();
-  if (!outputExt) {
-    return `${htmlOutputPath}.pdf`;
-  }
-  return `${htmlOutputPath.slice(0, -outputExt.length)}.pdf`;
-};
-var renderDocument = (template, markdownHtml) => {
-  const body = markdownHtml;
-  if (template.includes(BODY_PLACEHOLDER)) {
-    return template.replace(BODY_PLACEHOLDER, body);
-  }
-  const bodyCloseTag = "</body>";
-  if (template.includes(bodyCloseTag)) {
-    return template.replace(bodyCloseTag, `${body}
-${bodyCloseTag}`);
-  }
-  return `${template}
-${body}`;
-};
-var collectTailwindCandidates = (html) => {
-  const candidates = /* @__PURE__ */ new Set(["prose", "lg:prose-xl", "mx-auto", "my-8", "px-4"]);
-  const classRegex = /class\s*=\s*"([^"]+)"/g;
-  for (const match of html.matchAll(classRegex)) {
-    const classValue = match[1];
-    for (const className of classValue?.split(/\s+/) ?? []) {
-      const trimmed = className.trim();
-      if (trimmed) {
-        candidates.add(trimmed);
-      }
-    }
-  }
-  return Array.from(candidates);
-};
-var resolveCssImportPath = (id, base) => {
-  if (id === "tailwindcss") {
-    return require2.resolve("tailwindcss/index.css", { paths: [base, process.cwd()] });
-  }
-  if (id.startsWith("tailwindcss/")) {
-    const resolvedId = id.endsWith(".css") ? id : `${id}.css`;
-    return require2.resolve(resolvedId, { paths: [base, process.cwd()] });
-  }
-  try {
-    return require2.resolve(id, { paths: [base] });
-  } catch {
-    return require2.resolve(id, { paths: [process.cwd()] });
-  }
-};
-var compileTailwindCss = async (html) => {
-  const compiler = await compile(TAILWIND_INPUT_CSS, {
-    base: process.cwd(),
-    from: "mduck.inline.css",
-    loadModule: async (id, base) => {
-      const resolvedPath = resolveCssImportPath(id, base);
-      const imported = await import(pathToFileURL(resolvedPath).href);
-      const module = imported.default ?? imported;
-      return { path: resolvedPath, base: dirname(resolvedPath), module };
-    },
-    loadStylesheet: async (id, base) => {
-      const resolvedPath = resolveCssImportPath(id, base);
-      const content = await readFile(resolvedPath, "utf8");
-      return { path: resolvedPath, base: dirname(resolvedPath), content };
-    }
-  });
-  return compiler.build(collectTailwindCandidates(html));
-};
-var inlineCssInHead = (html, css) => {
-  const styleTag = `<style>${css}</style>`;
-  const headCloseTag = "</head>";
-  if (html.includes(headCloseTag)) {
-    return html.replace(headCloseTag, `  ${styleTag}
-${headCloseTag}`);
-  }
-  return `${styleTag}
-${html}`;
-};
-var renderPdf = async (html, outputPath) => {
-  const browser = await puppeteer.launch();
-  try {
-    const page = await browser.newPage();
-    await page.setContent(html, { waitUntil: "networkidle0" });
-    await page.pdf({
-      path: outputPath,
-      format: "Letter",
-      printBackground: true,
-      preferCSSPageSize: true
-    });
-  } finally {
-    await browser.close();
-  }
-};
-var resolveEjectedTemplatePath = async (outputArg) => {
-  if (!outputArg) {
-    return resolve(process.cwd(), DEFAULT_EJECTED_TEMPLATE_FILENAME);
-  }
-  const resolvedTargetPath = toAbsolutePath(outputArg);
-  const targetStats = await stat(resolvedTargetPath).catch(() => null);
-  const looksLikeDirectory = outputArg.endsWith(sep) || outputArg.endsWith("/");
-  const isDirectoryTarget = Boolean(targetStats?.isDirectory() || looksLikeDirectory);
-  if (isDirectoryTarget) {
-    return join(resolvedTargetPath, DEFAULT_EJECTED_TEMPLATE_FILENAME);
-  }
-  return resolvedTargetPath;
-};
-var runEjectTemplate = async (outputArg) => {
-  const templateOutputPath = await resolveEjectedTemplatePath(outputArg);
-  await mkdir(dirname(templateOutputPath), { recursive: true });
-  await writeFile(templateOutputPath, DEFAULT_TEMPLATE_HTML, "utf8");
-  console.log(`Wrote template to: ${templateOutputPath}`);
-};
-var runVersion = async () => {
-  const version = typeof package_default.version === "string" ? package_default.version : "unknown";
-  console.log(version);
-};
-var runConvert = async (inputArg, outputArg, templateArg) => {
-  marked.use({ extensions: [pageBreak] });
-  const inputPath = toAbsolutePath(inputArg);
-  let outputPath = toAbsolutePath(outputArg ?? inferOutputPath(inputPath));
-  let activeTemplateHtml = DEFAULT_TEMPLATE_HTML;
-  const inputStats = await stat(inputPath).catch(() => null);
-  if (!inputStats) {
-    throw new Error(`Input file does not exist: ${inputPath}`);
-  }
-  if (!inputStats.isFile()) {
-    throw new Error(`Input path is not a file: ${inputPath}`);
-  }
-  if (outputArg) {
-    const outputStats = await stat(outputPath).catch(() => null);
-    if (outputStats?.isDirectory()) {
-      outputPath = join(outputPath, inferHtmlBasename(inputPath));
-    }
-  }
-  if (templateArg) {
-    const templatePath = toAbsolutePath(templateArg);
-    const templateStats = await stat(templatePath).catch(() => null);
-    if (!templateStats) {
-      throw new Error(`Template file does not exist: ${templatePath}`);
-    }
-    if (!templateStats.isFile()) {
-      throw new Error(`Template path is not a file: ${templatePath}`);
-    }
-    activeTemplateHtml = await readFile(templatePath, "utf8");
-  }
-  const markdown = await readFile(inputPath, "utf8");
-  const markdownHtml = await marked.parse(markdown);
-  const documentHtml = renderDocument(activeTemplateHtml, markdownHtml);
-  const tailwindCss = await compileTailwindCss(documentHtml);
-  const html = inlineCssInHead(documentHtml, tailwindCss);
-  const pdfOutputPath = inferPdfPath(outputPath);
-  console.log("Rendering HTML...");
-  await mkdir(dirname(outputPath), { recursive: true });
-  await writeFile(outputPath, html, "utf8");
-  console.log(`Wrote HTML to: ${outputPath}`);
-  console.log("Rendering PDF...");
-  await mkdir(dirname(pdfOutputPath), { recursive: true });
-  await renderPdf(html, pdfOutputPath);
-  console.log(`Wrote PDF to: ${pdfOutputPath}`);
-};
-var convertCommand = defineCommand({
-  meta: {
-    name: "convert",
-    description: "Convert Markdown files to HTML and PDF."
-  },
-  args: {
-    inputFile: {
-      type: "positional",
-      description: "Input markdown file path",
-      required: true
-    },
-    outputFile: {
-      type: "positional",
-      description: "Optional output HTML file path (or existing directory)",
-      required: false
-    },
-    template: {
-      type: "string",
-      description: "Optional HTML template path (absolute or relative)",
-      required: false,
-      alias: "t"
-    }
-  },
-  run: async ({ args }) => {
-    const inputArg = String(args.inputFile);
-    const outputArg = typeof args.outputFile === "string" ? args.outputFile : void 0;
-    const templateArg = typeof args.template === "string" ? args.template : void 0;
-    await runConvert(inputArg, outputArg, templateArg);
-  }
-});
-var ejectTemplateCommand = defineCommand({
-  meta: {
-    name: "eject-template",
-    description: "Write the default HTML template to disk."
-  },
-  args: {
-    outputTemplatePath: {
-      type: "positional",
-      description: "Optional output file path or target directory",
-      required: false
-    }
-  },
-  run: async ({ args }) => {
-    const outputArg = typeof args.outputTemplatePath === "string" ? args.outputTemplatePath : void 0;
-    await runEjectTemplate(outputArg);
-  }
-});
-var versionCommand = defineCommand({
-  meta: {
-    name: "version",
-    description: "Print current CLI version."
-  },
-  run: async () => {
-    await runVersion();
-  }
-});
-var main = defineCommand({
-  meta: {
-    name: "mduck",
-    description: "Convert Markdown files to HTML/PDF and manage templates."
-  },
-  subCommands: {
-    convert: convertCommand,
-    "eject-template": ejectTemplateCommand,
-    version: versionCommand
-  }
-});
-await runMain(main);

package/src/template.html

@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Document</title>
-</head>
-<body>
-    <article class="prose lg:prose-xl print:prose-sm mx-auto my-8 print:m-0 px-4">
-    [BODY]
-    </article>
-    <style>
-        @media print {
-            @page {
-                margin: 2cm !important; /* Sets a 2cm margin on all sides of every printed page */
-            }
-        }
-        table {
-            border: 1px solid black;
-            border-collapse: collapse;
-        }
-        th, td {
-            border: 1px solid black;
-            padding: 0.5em;
-        }
-    </style>
-</body>
-</html>