@dkothule/md2pdf 1.0.4 → 1.0.6

package/README.md

@@ -54,18 +54,22 @@ npm i -g @dkothule/md2pdf
 2) Install runtime dependencies (system packages + `pandocfilters`):
 
 ```bash
-md2pdf-install-system-deps
+md2pdf-install-system-deps --yes
 ```
 
-Use `--yes` to skip the confirmation prompt (helpful for automation):
+If you prefer an interactive confirmation prompt, run:
 
 ```bash
-md2pdf-install-system-deps --yes
+md2pdf-install-system-deps
 ```
 
-3) Verify:
+3) Verify runtime tools + CLI:
 
 ```bash
+pandoc --version | head -n 1
+xelatex --version | head -n 1
+rsvg-convert --version
+python3 -c "import pandocfilters; print('pandocfilters ok')"
 md2pdf --version
 md2pdf --help
 ```
@@ -105,16 +109,20 @@ Install Finder context menu action:
 md2pdf-install-finder-action
 ```
 
-Uninstall Finder context menu action:
+If it does not appear in Finder right away:
+
+1. Right-click a `.md` file and choose `Quick Actions` -> `Customize...`
+2. Enable `Convert Markdown to PDF` under `Extensions` -> `Finder`
+3. Restart Finder:
 
 ```bash
-md2pdf-uninstall-finder-action
+killall Finder
 ```
 
-If Finder menu does not refresh immediately:
+Uninstall Finder context menu action:
 
 ```bash
-killall Finder
+md2pdf-uninstall-finder-action
 ```
 
 After installation, right-click any `.md` file in Finder:
@@ -218,6 +226,9 @@ md2pdf ./tests/samples/mermaid-all-diagram-types.md --keep-mermaid-assets
 - Flowchart/graph labels missing in PDF: keep `MERMAID_AUTO_PDF_FALLBACK=true`.
 - Diagram taking a full page: keep `MERMAID_PDF_FIT=true`.
 - PDF engine missing: install `xelatex` or set `PDF_ENGINE`.
+- On macOS, if `xelatex` is still missing after `md2pdf-install-system-deps`:
+  - Add TeX to PATH: `echo 'export PATH="/Library/TeX/texbin:$PATH"' >> ~/.zshrc && source ~/.zshrc`
+  - If binary is still missing: `sudo /Library/TeX/texbin/tlmgr install collection-xetex`
 
 ## Keywords
 

package/install-system-deps.sh

@@ -5,6 +5,7 @@ set -euo pipefail
 
 YES=0
 OS="$(uname -s)"
+PYTHON_BIN=""
 
 usage() {
   cat <<EOF
@@ -71,30 +72,143 @@ confirm_install() {
 }
 
 has_pandocfilters() {
-  python3 - <<'PY' >/dev/null 2>&1
+  local python_bin="$1"
+  "$python_bin" - <<'PY' >/dev/null 2>&1
 import pandocfilters
 PY
 }
 
+resolve_python_bin() {
+  local candidate
+  local -a candidates
+
+  candidates=("/opt/homebrew/bin/python3" "/usr/local/bin/python3")
+  if command -v python3 >/dev/null 2>&1; then
+    candidates+=("$(command -v python3)")
+  fi
+
+  for candidate in "${candidates[@]}"; do
+    [[ -n "$candidate" ]] || continue
+    [[ -x "$candidate" ]] || continue
+    if "$candidate" -c 'import sys; print(sys.executable)' >/dev/null 2>&1; then
+      printf '%s' "$candidate"
+      return 0
+    fi
+  done
+
+  return 1
+}
+
+ensure_python_bin() {
+  if PYTHON_BIN="$(resolve_python_bin)"; then
+    echo "Using Python interpreter: $PYTHON_BIN"
+    return
+  fi
+
+  echo "Error: python3 not found after dependency installation." >&2
+  if [[ "$OS" == "Darwin" ]]; then
+    echo "Install Python with Homebrew and retry:" >&2
+    echo "  brew install python" >&2
+  elif [[ "$OS" == "Linux" ]]; then
+    echo "Install Python and pip, then retry:" >&2
+    echo "  sudo apt-get install -y python3 python3-pip" >&2
+  fi
+  exit 1
+}
+
+ensure_python_pip() {
+  local python_bin="$1"
+  if "$python_bin" -m pip --version >/dev/null 2>&1; then
+    return
+  fi
+
+  "$python_bin" -m ensurepip --upgrade >/dev/null 2>&1 || true
+  "$python_bin" -m pip --version >/dev/null 2>&1
+}
+
 install_python_dependency() {
-  if has_pandocfilters; then
+  local python_bin="$1"
+
+  if ! ensure_python_pip "$python_bin"; then
+    echo "Error: pip is not available for $python_bin." >&2
+    echo "Install pip and retry. Example:" >&2
+    echo "  $python_bin -m ensurepip --upgrade" >&2
+    exit 1
+  fi
+
+  if has_pandocfilters "$python_bin"; then
     echo "Python dependency already installed: pandocfilters"
     return
   fi
 
   echo "Installing Python dependency: pandocfilters"
-  if python3 -m pip install --user pandocfilters; then
+  if "$python_bin" -m pip install --user pandocfilters; then
     return
   fi
 
-  if python3 -m pip install pandocfilters --break-system-packages; then
+  if "$python_bin" -m pip install pandocfilters --break-system-packages; then
     return
   fi
 
   echo "Failed to install pandocfilters automatically." >&2
   echo "Please install manually with one of:" >&2
-  echo "  python3 -m pip install --user pandocfilters" >&2
-  echo "  python3 -m pip install pandocfilters --break-system-packages" >&2
+  echo "  $python_bin -m pip install --user pandocfilters" >&2
+  echo "  $python_bin -m pip install pandocfilters --break-system-packages" >&2
+  exit 1
+}
+
+ensure_tex_path_macos() {
+  local tex_bin="/Library/TeX/texbin"
+  if [[ ! -d "$tex_bin" ]]; then
+    return
+  fi
+
+  case ":$PATH:" in
+    *":$tex_bin:"*)
+      ;;
+    *)
+      export PATH="$tex_bin:$PATH"
+      ;;
+  esac
+}
+
+ensure_xelatex_macos() {
+  ensure_tex_path_macos
+  if command -v xelatex >/dev/null 2>&1; then
+    return
+  fi
+
+  echo "Installing BasicTeX for xelatex..."
+  brew install --cask basictex
+  ensure_tex_path_macos
+
+  if command -v xelatex >/dev/null 2>&1; then
+    return
+  fi
+
+  local tlmgr_bin="/Library/TeX/texbin/tlmgr"
+  if [[ -x "$tlmgr_bin" ]]; then
+    if [[ -t 0 ]]; then
+      echo "BasicTeX installed but xelatex is still missing. Installing TeX collection-xetex..."
+      sudo "$tlmgr_bin" install collection-xetex || true
+      ensure_tex_path_macos
+    else
+      echo "BasicTeX installed but xelatex is still missing."
+      echo "Run this command to install it:"
+      echo "  sudo $tlmgr_bin install collection-xetex"
+    fi
+  fi
+
+  if command -v xelatex >/dev/null 2>&1; then
+    return
+  fi
+
+  echo "Error: xelatex is still not available." >&2
+  echo "If /Library/TeX/texbin/xelatex exists, add TeX to PATH and restart your shell:" >&2
+  echo "  echo 'export PATH=\"/Library/TeX/texbin:\$PATH\"' >> ~/.zshrc" >&2
+  echo "  source ~/.zshrc" >&2
+  echo "If xelatex binary is missing, install it with:" >&2
+  echo "  sudo /Library/TeX/texbin/tlmgr install collection-xetex" >&2
   exit 1
 }
 
@@ -111,11 +225,7 @@ install_macos() {
     brew install node
   fi
 
-  if ! command -v xelatex >/dev/null 2>&1; then
-    echo "Installing BasicTeX for xelatex..."
-    brew install --cask basictex
-    echo "BasicTeX installed. You may need to restart your shell before retrying."
-  fi
+  ensure_xelatex_macos
 }
 
 install_debian_ubuntu() {
@@ -152,6 +262,7 @@ else
   exit 1
 fi
 
-install_python_dependency
+ensure_python_bin
+install_python_dependency "$PYTHON_BIN"
 
 echo "Runtime dependencies installed."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dkothule/md2pdf",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Markdown to PDF converter with high-resolution Mermaid diagram rendering",
   "author": "Deepak Kothule",
   "license": "MIT",

package/scripts/install_md2pdf_quick_action.sh

@@ -117,6 +117,42 @@ if [[ ! -x "\$MD2PDF_SCRIPT" ]] && [[ -z "\$(command -v md2pdf 2>/dev
   print -u2 -- "Error: md2pdf is not in PATH: \$PATH"
   exit 127
 fi
+
+unset PYTHONNOUSERSITE
+pick_python_with_pandocfilters() {
+  local candidate
+  local -a candidates
+  candidates=("/opt/homebrew/bin/python3" "/usr/local/bin/python3")
+  if [[ -n "\$(command -v python3 2>/dev/null)" ]]; then
+    candidates+=("\$(command -v python3)")
+  fi
+
+  for candidate in "\${candidates[@]}"; do
+    [[ -n "\$candidate" ]] || continue
+    [[ -x "\$candidate" ]] || continue
+    if "\$candidate" - <<'PY' >/dev/null 2>&1
+import pandocfilters
+PY
+    then
+      print -r -- "\$candidate"
+      return 0
+    fi
+  done
+  return 1
+}
+
+PYTHON_BIN="\$(pick_python_with_pandocfilters || true)"
+if [[ -z "\$PYTHON_BIN" ]]; then
+  print -u2 -- "Error: Missing Python dependency: pandocfilters."
+  print -u2 -- "Install with:"
+  if [[ -x /opt/homebrew/bin/python3 ]]; then
+    print -u2 -- "  /opt/homebrew/bin/python3 -m pip install --user pandocfilters"
+  fi
+  print -u2 -- "  python3 -m pip install --user pandocfilters"
+  exit 1
+fi
+export PYTHON="\$PYTHON_BIN"
+
 for f in "\$@"; do
   case "\$f" in
     *.md|*.MD) ;;
@@ -255,5 +291,8 @@ echo "Installed Quick Action: $WORKFLOW_NAME"
 echo "Location: $WORKFLOW_DIR"
 echo "Using md2pdf executable: $MD2PDF_SCRIPT"
 echo
-echo "If it does not appear immediately in Finder context menu, restart Finder:"
+echo "If it does not appear in Finder context menu:"
+echo "  1) Right-click a .md file -> Quick Actions -> Customize..."
+echo "  2) Enable '$WORKFLOW_NAME' in Extensions -> Finder"
+echo "  3) Restart Finder"
 echo "  killall Finder"