mdv-live 0.3.1 → 0.3.2

package/src/rendering/index.js

@@ -52,46 +52,47 @@ export async function renderFile(filePath) {
   const content = await fs.readFile(filePath, 'utf-8');
   const fileType = getFileType(filePath);
 
-  // Markdown files
   if (fileType.type === 'markdown') {
-    // Check if it's a Marp presentation
-    if (isMarp(content)) {
-      const { html, css } = renderMarp(content);
-      return {
-        content: html,
-        css,
-        raw: content,
-        fileType: 'markdown',
-        isMarp: true
-      };
-    }
+    return renderMarkdownFile(content);
+  }
 
-    // Regular markdown
-    const html = renderMarkdown(content);
+  if (fileType.type === 'code') {
     return {
-      content: html,
+      content: renderCode(content, fileType.lang),
       raw: content,
-      fileType: 'markdown',
-      isMarp: false
+      fileType: 'code'
     };
   }
 
-  // Code files
-  if (fileType.type === 'code') {
-    const html = renderCode(content, fileType.lang);
+  return {
+    content: renderText(content),
+    raw: content,
+    fileType: 'text'
+  };
+}
+
+/**
+ * Render markdown content, detecting Marp presentations
+ * @param {string} content - Raw markdown content
+ * @returns {Object} Rendered content and metadata
+ */
+function renderMarkdownFile(content) {
+  if (isMarp(content)) {
+    const { html, css } = renderMarp(content);
     return {
       content: html,
+      css,
       raw: content,
-      fileType: 'code'
+      fileType: 'markdown',
+      isMarp: true
     };
   }
 
-  // Plain text
-  const html = renderText(content);
   return {
-    content: html,
+    content: renderMarkdown(content),
     raw: content,
-    fileType: 'text'
+    fileType: 'markdown',
+    isMarp: false
   };
 }
 

package/src/rendering/markdown.js

@@ -60,67 +60,54 @@ function convertFrontmatter(content) {
  */
 function protectMermaidBlocks(content) {
   const blocks = [];
-  const protected_ = content.replace(MERMAID_PATTERN, (match, code) => {
+  const protectedContent = content.replace(MERMAID_PATTERN, (match, code) => {
     blocks.push(code);
     return `<!--MERMAID_PLACEHOLDER_${blocks.length - 1}-->`;
   });
-  return { content: protected_, blocks };
+  return { content: protectedContent, blocks };
 }
 
 /**
- * Restore Mermaid blocks after markdown processing
- * @param {string} html - Rendered HTML
- * @param {string[]} blocks - Mermaid code blocks
+ * Escape HTML entities for safe display
+ * @param {string} text - Text to escape
  * @returns {string}
  */
-function restoreMermaidBlocks(html, blocks) {
-  blocks.forEach((code, i) => {
-    const escaped = code
-      .replace(/&/g, '&amp;')
-      .replace(/</g, '&lt;')
-      .replace(/>/g, '&gt;');
-    const mermaidHtml = `<pre><code class="language-mermaid">${escaped}</code></pre>`;
-
-    // Replace both paragraph-wrapped and bare placeholders
-    html = html.replace(`<p><!--MERMAID_PLACEHOLDER_${i}--></p>`, mermaidHtml);
-    html = html.replace(`<!--MERMAID_PLACEHOLDER_${i}-->`, mermaidHtml);
-  });
-  return html;
+function escapeHtmlEntities(text) {
+  return text
+    .replace(/&/g, '&amp;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;');
 }
 
 /**
- * Add line numbers to rendered elements for editor sync
+ * Restore Mermaid blocks after markdown processing
  * @param {string} html - Rendered HTML
+ * @param {string[]} blocks - Mermaid code blocks
  * @returns {string}
  */
-function addLineNumbers(html) {
-  // This is a simplified version - the full implementation would
-  // track source positions during rendering
-  return html;
+function restoreMermaidBlocks(html, blocks) {
+  let result = html;
+  for (let i = 0; i < blocks.length; i++) {
+    const escaped = escapeHtmlEntities(blocks[i]);
+    const mermaidHtml = `<pre><code class="language-mermaid">${escaped}</code></pre>`;
+    // Replace both paragraph-wrapped and bare placeholders
+    result = result
+      .replace(`<p><!--MERMAID_PLACEHOLDER_${i}--></p>`, mermaidHtml)
+      .replace(`<!--MERMAID_PLACEHOLDER_${i}-->`, mermaidHtml);
+  }
+  return result;
 }
 
 /**
  * Render markdown to HTML
  * @param {string} content - Markdown content
- * @returns {string} HTML
+ * @returns {string}
  */
 export function renderMarkdown(content) {
-  // Convert frontmatter to code block
-  content = convertFrontmatter(content);
-
-  // Protect Mermaid blocks
-  const { content: protected_, blocks } = protectMermaidBlocks(content);
-
-  // Render markdown
-  let html = md.render(protected_);
-
-  // Restore Mermaid blocks
-  html = restoreMermaidBlocks(html, blocks);
-
-  // Add line numbers
-  html = addLineNumbers(html);
-
-  return html;
+  const withFrontmatter = convertFrontmatter(content);
+  const { content: protectedContent, blocks } = protectMermaidBlocks(withFrontmatter);
+  const html = md.render(protectedContent);
+  return restoreMermaidBlocks(html, blocks);
 }
 
 export default { renderMarkdown, isMarp };

package/src/server.js

@@ -7,103 +7,90 @@ import express from 'express';
 import { createServer } from 'http';
 import path from 'path';
 import { fileURLToPath } from 'url';
-import { setupWebSocket } from './websocket.js';
-import { setupWatcher } from './watcher.js';
-import { setupTreeRoutes } from './api/tree.js';
+
 import { setupFileRoutes } from './api/file.js';
-import { setupUploadRoutes } from './api/upload.js';
 import { setupPdfRoutes } from './api/pdf.js';
+import { setupTreeRoutes } from './api/tree.js';
+import { setupUploadRoutes } from './api/upload.js';
+import { setupWatcher } from './watcher.js';
+import { setupWebSocket } from './websocket.js';
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const STATIC_DIR = path.join(__dirname, 'static');
+const VERSION = '0.3.2';
 
 /**
- * Create and configure the MDV server
- * @param {Object} options - Server options
- * @param {string} options.rootDir - Root directory to serve
- * @param {number} options.port - Port to listen on
- * @returns {Object} Server instance and control functions
+ * Setup API routes for the Express app
+ * @param {express.Application} app - Express application instance
  */
-export function createMdvServer(options) {
-  const { rootDir, port = 8080 } = options;
-
-  const app = express();
-  const server = createServer(app);
-
-  // Store root directory in app locals for access in routes
-  app.locals.rootDir = path.resolve(rootDir);
-
-  // Middleware
-  app.use(express.json());
-  app.use(express.urlencoded({ extended: true }));
-
-  // Static files
-  const staticDir = path.join(__dirname, 'static');
-  app.use('/static', express.static(staticDir));
-
-  // API routes
+function setupApiRoutes(app) {
   setupTreeRoutes(app);
   setupFileRoutes(app);
   setupUploadRoutes(app);
   setupPdfRoutes(app);
 
-  // Server info endpoint
   app.get('/api/info', (req, res) => {
     res.json({
       rootPath: app.locals.rootDir,
-      version: '0.3.1'
+      version: VERSION
     });
   });
 
-  // Shutdown endpoint
   app.post('/api/shutdown', (req, res) => {
     res.json({ success: true });
-    setTimeout(() => {
-      process.exit(0);
-    }, 100);
+    setTimeout(() => process.exit(0), 100);
   });
+}
+
+/**
+ * Create and configure the MDV server
+ * @param {Object} options - Server options
+ * @param {string} options.rootDir - Root directory to serve
+ * @param {number} [options.port=8080] - Port to listen on
+ * @returns {{ app: express.Application, server: http.Server, watcher: FSWatcher, wss: WebSocketServer, port: number, start: () => Promise<{port: number}>, stop: () => Promise<void> }}
+ */
+export function createMdvServer(options) {
+  const { rootDir, port = 8080 } = options;
+
+  const app = express();
+  const server = createServer(app);
+
+  app.locals.rootDir = path.resolve(rootDir);
+
+  app.use(express.json());
+  app.use(express.urlencoded({ extended: true }));
+  app.use('/static', express.static(STATIC_DIR));
+
+  setupApiRoutes(app);
 
-  // Serve index.html for root
   app.get('/', (req, res) => {
-    res.sendFile(path.join(staticDir, 'index.html'));
+    res.sendFile(path.join(STATIC_DIR, 'index.html'));
   });
 
-  // Setup WebSocket
   const wss = setupWebSocket(server);
-
-  // Setup file watcher
   const watcher = setupWatcher(app.locals.rootDir, wss);
 
-  // Store watcher reference
   app.locals.watcher = watcher;
   app.locals.wss = wss;
 
-  return {
-    app,
-    server,
-    watcher,
-    wss,
-    port,
-
-    start() {
-      return new Promise((resolve) => {
-        server.listen(port, () => {
-          console.log(`MDV server running at http://localhost:${port}`);
-          resolve({ port });
-        });
-      });
-    },
-
-    stop() {
-      return new Promise((resolve) => {
-        watcher.close();
-        wss.close();
-        server.close(() => {
-          resolve();
-        });
+  function start() {
+    return new Promise((resolve) => {
+      server.listen(port, () => {
+        console.log(`MDV server running at http://localhost:${port}`);
+        resolve({ port });
       });
-    }
-  };
+    });
+  }
+
+  function stop() {
+    return new Promise((resolve) => {
+      watcher.close();
+      wss.close();
+      server.close(resolve);
+    });
+  }
+
+  return { app, server, watcher, wss, port, start, stop };
 }
 
 export default createMdvServer;