marp-dev-preview 0.3.1 → 0.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marp-dev-preview",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "A CLI tool to preview Marp markdown files.",
   "main": "src/marp-dev-preview.mjs",
   "type": "module",

package/src/marp-dev-preview.mjs

@@ -168,7 +168,7 @@ if (themeSet) {
 }
 
 initializeMarp(themeSet, containers).then(() => {
-  const app = createServer(markdownDir, renderMarp, reload, wss, __dirname);
+  const app = createServer(markdownDir, themeSet ?? [], renderMarp, reload, wss, __dirname);
   const server = http.createServer(app);
 
   server.on('upgrade', (request, socket, head) => {

package/src/marp-utils.mjs

@@ -13,7 +13,7 @@ export function getMarp() {
 }
 
 
-export async function initializeMarp(themeSet, containers) {
+export async function initializeMarp(themeSet, containers = []) {
   const options = { html: true, linkify: true, };
   marp = new Marp(options)
     .use(markdownItFootnote)

package/src/server.mjs

@@ -2,9 +2,12 @@ import express from 'express';
 import path from 'path';
 import { promises as fs } from 'fs';
 
-export function createServer(markdownDir, renderMarp, reload, wss, __dirname) {
+export function createServer(markdownDir, themeDirs, renderMarp, reload, wss, __dirname) {
   const app = express();
 
+  for (const themeDir of themeDirs) {
+    app.use(express.static(themeDir));
+  }
   app.use(express.static(markdownDir));
   app.use(express.text({ type: 'text/markdown' }));
   app.use(express.json());

package/test/marp-dev-preview.test.mjs

@@ -3,20 +3,41 @@
 // This is necessary because jest has issues with importing express, which is a CJS module,
 // in a project that uses ES modules ("type": "module" in package.json).
 import { createServer } from '../src/server.mjs';
+import express from 'express';
 
 describe('Server', () => {
+  beforeEach(() => {
+    express.static.mockClear();
+  });
+
   it('should create a server', () => {
     const markdownDir = '.';
+    const themeDirs = [];
     const renderMarp = jest.fn();
     const reload = jest.fn();
     const wss = { clients: [] };
     const __dirname = '.';
 
-    const app = createServer(markdownDir, renderMarp, reload, wss, __dirname);
+    const app = createServer(markdownDir, themeDirs, renderMarp, reload, wss, __dirname);
 
     expect(app).toBeDefined();
     expect(typeof app.use).toBe('function');
     expect(typeof app.get).toBe('function');
     expect(typeof app.post).toBe('function');
   });
+
+  it('should mount theme directories before the markdown directory', () => {
+    const markdownDir = '/slides';
+    const themeDirs = ['/themes/a', '/themes/b'];
+    const renderMarp = jest.fn();
+    const reload = jest.fn();
+    const wss = { clients: [] };
+    const __dirname = '.';
+
+    createServer(markdownDir, themeDirs, renderMarp, reload, wss, __dirname);
+
+    expect(express.static).toHaveBeenNthCalledWith(1, '/themes/a');
+    expect(express.static).toHaveBeenNthCalledWith(2, '/themes/b');
+    expect(express.static).toHaveBeenNthCalledWith(3, '/slides');
+  });
 });