mdv-live 0.3.0 → 0.3.2

package/CHANGELOG.md

@@ -5,6 +5,26 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.3.2] - 2026-01-31
+
+### Changed
+
+- Refactored codebase with extracted helper functions and constants
+- Simplified CSS with consolidated variables (--success, --warning, --danger)
+- Reduced styles.css by 84 lines, app.js by 45 lines
+- Added ARIA attributes for improved accessibility
+- Standardized test helpers and imports
+
+### Fixed
+
+- File tree not updating on file structure changes (add/delete/rename)
+
+## [0.3.1] - 2026-01-31
+
+### Changed
+
+- Minor code cleanup and organization
+
 ## [0.3.0] - 2026-01-31
 
 ### Added

package/README.md

@@ -87,7 +87,7 @@ macOSで`.md`ファイルをダブルクリックしてMDVで開けるように
 which mdv
 
 # セットアップスクリプトを実行
-curl -fsSL https://raw.githubusercontent.com/panhouse/mdv/main/scripts/setup-macos-app.sh | bash
+curl -fsSL https://raw.githubusercontent.com/panhouse/mdv-live/main/scripts/setup-macos-app.sh | bash
 ```
 
 または、リポジトリをクローンしている場合：
@@ -175,8 +175,8 @@ paginate: true
 
 ```bash
 # Clone repository
-git clone https://github.com/panhouse/mdv.git
-cd mdv
+git clone https://github.com/panhouse/mdv-live.git
+cd mdv-live
 
 # Install dependencies
 npm install

package/bin/mdv.js

@@ -5,18 +5,20 @@
  * Compatible with the original Python mdv-live CLI
  */
 
-import { createMdvServer } from '../src/server.js';
+import { execSync } from 'node:child_process';
+import fs from 'node:fs/promises';
+import { createServer as createNetServer } from 'node:net';
+import path from 'node:path';
 import { parseArgs } from 'node:util';
-import { execSync, spawn } from 'child_process';
-import { createServer as createNetServer } from 'net';
-import path from 'path';
-import fs from 'fs/promises';
+
 import open from 'open';
 
+import { createMdvServer } from '../src/server.js';
+
 const DEFAULT_PORT = 8642;
+const MARP_FRONTMATTER_PATTERN = /^---\s*\n[\s\S]*?marp:\s*true[\s\S]*?\n---/;
 
-// Parse command line arguments
-const options = {
+const OPTIONS = {
   port: {
     type: 'string',
     short: 'p',
@@ -60,6 +62,9 @@ const options = {
   }
 };
 
+/**
+ * Display help message
+ */
 function showHelp() {
   console.log(`
 MDV - Markdown Viewer with file tree + live preview + Marp support
@@ -99,6 +104,7 @@ Examples:
 
 /**
  * Get running MDV server processes
+ * @returns {{pid: string, port: string, command: string}[]} Array of process info
  */
 function getMdvProcesses() {
   try {
@@ -139,7 +145,8 @@ function getMdvProcesses() {
 }
 
 /**
- * List running MDV servers
+ * List running MDV servers to console
+ * @returns {number} Exit code (0 = success)
  */
 function listServers() {
   const processes = getMdvProcesses();
@@ -165,6 +172,9 @@ function listServers() {
 
 /**
  * Kill MDV server(s)
+ * @param {string|null} target - Specific PID to kill, or null for all
+ * @param {boolean} killAll - Whether to kill all servers
+ * @returns {number} Exit code (0 = success, 1 = error)
  */
 function killServers(target, killAll) {
   if (target) {
@@ -212,14 +222,27 @@ function killServers(target, killAll) {
 }
 
 /**
- * Convert markdown to PDF using marp-cli
+ * Check if markdown content is a Marp presentation
+ * @param {string} content - Markdown file content
+ * @returns {boolean} True if content has Marp frontmatter
+ */
+function isMarpFile(content) {
+  return MARP_FRONTMATTER_PATTERN.test(content);
+}
+
+/**
+ * Convert markdown to PDF using appropriate tool
+ * - Marp slides: use marp-cli
+ * - Regular markdown: use md-to-pdf for A4 document format
+ * @param {string} inputPath - Input markdown file path
+ * @param {string} [outputPath] - Output PDF file path
+ * @returns {Promise<number>} Exit code (0 = success, 1 = error)
  */
 async function convertToPdf(inputPath, outputPath) {
   const resolved = path.resolve(inputPath);
 
-  try {
-    await fs.access(resolved);
-  } catch {
+  const fileExists = await fs.access(resolved).then(() => true).catch(() => false);
+  if (!fileExists) {
     console.error(`Error: File not found: ${inputPath}`);
     return 1;
   }
@@ -230,51 +253,98 @@ async function convertToPdf(inputPath, outputPath) {
     return 1;
   }
 
+  const content = await fs.readFile(resolved, 'utf-8');
+  const isMarp = isMarpFile(content);
   const defaultOutput = resolved.replace(/\.(md|markdown)$/i, '.pdf');
   const finalOutput = outputPath ? path.resolve(outputPath) : defaultOutput;
 
   console.log(`Converting ${inputPath} to PDF...`);
 
+  if (isMarp) {
+    return convertMarpToPdf(resolved, finalOutput);
+  }
+  return convertMarkdownToPdf(resolved, finalOutput);
+}
+
+/**
+ * Convert Marp presentation to PDF using marp-cli
+ * @param {string} inputPath - Resolved input file path
+ * @param {string} outputPath - Resolved output file path
+ * @returns {Promise<number>} Exit code
+ */
+async function convertMarpToPdf(inputPath, outputPath) {
   try {
-    // Use marp-cli for PDF conversion (supports Marp slides)
-    execSync(`npx @marp-team/marp-cli "${resolved}" --pdf -o "${finalOutput}"`, {
+    execSync(`npx @marp-team/marp-cli --no-stdin "${inputPath}" --pdf -o "${outputPath}"`, {
       encoding: 'utf-8',
       stdio: 'inherit'
     });
-    console.log(`PDF saved: ${finalOutput}`);
+    console.log(`PDF saved: ${outputPath}`);
     return 0;
-  } catch (err) {
+  } catch {
+    console.error('Error: PDF conversion failed');
+    return 1;
+  }
+}
+
+/**
+ * Convert regular markdown to PDF using md-to-pdf (A4 format)
+ * @param {string} inputPath - Resolved input file path
+ * @param {string} outputPath - Resolved output file path
+ * @returns {Promise<number>} Exit code
+ */
+async function convertMarkdownToPdf(inputPath, outputPath) {
+  console.log('Converting as document (A4 portrait)...');
+
+  try {
+    const pdfOptions = '{"format":"A4","margin":{"top":"20mm","right":"20mm","bottom":"20mm","left":"20mm"}}';
+    execSync(`npx md-to-pdf "${inputPath}" --pdf-options '${pdfOptions}'`, {
+      encoding: 'utf-8',
+      stdio: 'inherit',
+      cwd: path.dirname(inputPath)
+    });
+
+    // md-to-pdf outputs to same directory with .pdf extension
+    const generatedPdf = inputPath.replace(/\.(md|markdown)$/i, '.pdf');
+    if (generatedPdf !== outputPath) {
+      await fs.rename(generatedPdf, outputPath);
+    }
+
+    console.log(`PDF saved: ${outputPath}`);
+    return 0;
+  } catch {
     console.error('Error: PDF conversion failed');
-    console.error('Make sure Node.js and npx are installed');
+    console.error('Make sure md-to-pdf is available (npx md-to-pdf)');
     return 1;
   }
 }
 
 /**
- * Check if a port is available
+ * Check if a port is available for binding
+ * @param {number} port - Port number to check
+ * @returns {Promise<boolean>} True if port is available
  */
-async function isPortAvailable(port) {
+function isPortAvailable(port) {
   return new Promise((resolve) => {
     const server = createNetServer();
     server.once('error', () => resolve(false));
-    server.once('listening', () => {
-      server.close(() => resolve(true));
-    });
+    server.once('listening', () => server.close(() => resolve(true)));
     server.listen(port);
   });
 }
 
 /**
  * Find an available port starting from the given port
+ * @param {number} startPort - Starting port number
+ * @param {number} [maxRetries=100] - Maximum ports to try
+ * @returns {Promise<number|null>} Available port or null if none found
  */
 async function findAvailablePort(startPort, maxRetries = 100) {
-  for (let i = 0; i < maxRetries; i++) {
-    const port = startPort + i;
-    const available = await isPortAvailable(port);
-    if (available) {
+  for (let offset = 0; offset < maxRetries; offset++) {
+    const port = startPort + offset;
+    if (await isPortAvailable(port)) {
       return port;
     }
-    if (i > 0) {
+    if (offset > 0) {
       console.log(`ポート ${port - 1} は使用中です。${port} を試します...`);
     }
   }
@@ -282,29 +352,40 @@ async function findAvailablePort(startPort, maxRetries = 100) {
 }
 
 /**
- * Start MDV server with auto port increment
+ * Resolve target path to root directory and optional initial file
+ * @param {string} targetPath - User-provided path
+ * @returns {Promise<{rootDir: string, initialFile: string|null}>}
  */
-async function startViewer(targetPath, startPort, openBrowser) {
-  let rootDir = process.cwd();
-  let initialFile = null;
+async function resolveTargetPath(targetPath) {
+  if (!targetPath || targetPath === '.') {
+    return { rootDir: process.cwd(), initialFile: null };
+  }
 
-  if (targetPath && targetPath !== '.') {
-    const resolved = path.resolve(targetPath);
-    try {
-      const stats = await fs.stat(resolved);
-      if (stats.isDirectory()) {
-        rootDir = resolved;
-      } else if (stats.isFile()) {
-        rootDir = path.dirname(resolved);
-        initialFile = path.basename(resolved);
-      }
-    } catch {
-      console.error(`Error: Path not found: ${targetPath}`);
-      process.exit(1);
+  const resolved = path.resolve(targetPath);
+  try {
+    const stats = await fs.stat(resolved);
+    if (stats.isDirectory()) {
+      return { rootDir: resolved, initialFile: null };
+    }
+    if (stats.isFile()) {
+      return { rootDir: path.dirname(resolved), initialFile: path.basename(resolved) };
     }
+  } catch {
+    console.error(`Error: Path not found: ${targetPath}`);
+    process.exit(1);
   }
+  return { rootDir: process.cwd(), initialFile: null };
+}
+
+/**
+ * Start MDV server with auto port increment
+ * @param {string} targetPath - Target directory or file path
+ * @param {number} startPort - Starting port number
+ * @param {boolean} openBrowser - Whether to open browser automatically
+ */
+async function startViewer(targetPath, startPort, openBrowser) {
+  const { rootDir, initialFile } = await resolveTargetPath(targetPath);
 
-  // Find available port
   const port = await findAvailablePort(startPort);
   if (!port) {
     console.error('Error: 利用可能なポートが見つかりませんでした');
@@ -315,7 +396,6 @@ async function startViewer(targetPath, startPort, openBrowser) {
     console.log(`ポート ${startPort} は使用中のため、${port} で起動します`);
   }
 
-  // Create and start server
   const mdv = createMdvServer({ rootDir, port });
   await mdv.start();
 
@@ -337,11 +417,14 @@ async function startViewer(targetPath, startPort, openBrowser) {
   }
 }
 
-async function main() {
-  let args;
+/**
+ * Parse command line arguments safely
+ * @returns {{values: object, positionals: string[]}}
+ */
+function parseCommandLineArgs() {
   try {
-    args = parseArgs({
-      options,
+    return parseArgs({
+      options: OPTIONS,
       allowPositionals: true,
       strict: false
     });
@@ -350,33 +433,33 @@ async function main() {
     showHelp();
     process.exit(1);
   }
+}
 
-  const { values, positionals } = args;
+/**
+ * Main entry point
+ */
+async function main() {
+  const { values, positionals } = parseCommandLineArgs();
 
-  // Help
   if (values.help) {
     showHelp();
     process.exit(0);
   }
 
-  // Version
   if (values.version) {
-    console.log('mdv v0.3.0');
+    console.log('mdv v0.3.2');
     process.exit(0);
   }
 
-  // List servers
   if (values.list) {
     process.exit(listServers());
   }
 
-  // Kill servers
   if (values.kill) {
     const pid = positionals[0] || null;
     process.exit(killServers(pid, values.all));
   }
 
-  // PDF conversion
   if (values.pdf) {
     const inputPath = positionals[0];
     if (!inputPath) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mdv-live",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Markdown Viewer - File tree + Live preview + Marp support + Hot reload",
   "main": "src/server.js",
   "bin": {
@@ -30,11 +30,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/panhouse/mdv.git"
+    "url": "git+https://github.com/panhouse/mdv-live.git"
   },
-  "homepage": "https://github.com/panhouse/mdv#readme",
+  "homepage": "https://github.com/panhouse/mdv-live#readme",
   "bugs": {
-    "url": "https://github.com/panhouse/mdv/issues"
+    "url": "https://github.com/panhouse/mdv-live/issues"
   },
   "files": [
     "bin/",

package/scripts/setup-macos-app.sh

@@ -43,7 +43,7 @@ Usage:
 - Double-click any .md file
 - Drag & drop .md files onto this app
 
-Version: 0.3.0 (Node.js)" buttons {"OK"} default button "OK" with title "MDV"
+Version: 0.3.1 (Node.js)" buttons {"OK"} default button "OK" with title "MDV"
 end run
 EOF
 
@@ -127,9 +127,9 @@ cat << 'EOF' > "$TEMP_DIR/$APP_NAME/Contents/Info.plist"
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.0</string>
+	<string>0.3.1</string>
 	<key>CFBundleVersion</key>
-	<string>0.3.0</string>
+	<string>0.3.1</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.13</string>
 </dict>