marp-dev-preview 0.1.7 → 0.1.8

package/package.json

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

package/src/args.mjs

@@ -3,15 +3,16 @@ import { hideBin } from 'yargs/helpers';
 
 export function parseArgs() {
   return yargs(hideBin(process.argv))
-    .usage('Usage: $0 <markdown-file> [options]')
-    .positional('markdown-file', {
+    .usage('Usage: $0 [options]')
+    .option('markdown-file', {
+      alias: 'm',
       describe: 'Path to the markdown file to preview',
       type: 'string'
     })
-    .option('theme-dir', {
+    .option('theme-set', {
       alias: 't',
-      describe: 'Directory for custom themes',
-      type: 'string'
+      describe: 'Directories for custom themes',
+      type: 'array'
     })
     .option('port', {
       alias: 'p',
@@ -27,6 +28,5 @@ export function parseArgs() {
     })
     .config('config', 'Path to a JSON config file')
     .default('config', '.mp-config.json')
-    .demandCommand(1, 'You must provide a markdown file.')
     .argv;
 }

package/src/marp-dev-preview.mjs

@@ -15,8 +15,8 @@ const __dirname = path.dirname(__filename);
 
 const argv = parseArgs();
 
-const markdownFile = argv._[0]
-const themeDir = argv.themeDir;
+const markdownFile = argv.markdownFile;
+const themeSet = argv.themeSet;
 const port = argv.port;
 const verbose = argv.verbose;
 
@@ -147,7 +147,7 @@ chokidar.watch(markdownFile).on('change', async () => {
   await reload(md);
 });
 
-initializeMarp(themeDir).then(() => {
+initializeMarp(themeSet).then(() => {
   createServer(port, markdownFile, markdownDir, renderMarp, reload, wss, __dirname);
 }).catch(error => {
   console.error("Failed to initialize Marp:", error);

package/src/marp-utils.mjs

@@ -8,35 +8,40 @@ import markdownItContainer from 'markdown-it-container';
 
 let marp;
 
-export async function initializeMarp(themeDir) {
+export async function initializeMarp(themeSet) {
   const options = { html: true, linkify: true, };
   marp = new Marp(options)
     .use(markdownItFootnote)
     .use(markdownItMark)
     .use(markdownItContainer, 'note');
 
-  if (!themeDir) {
+  if (!themeSet) {
     return marp;
   }
 
-  let stats = await fs.stat(themeDir).catch(() => null);
-  if (!stats) {
-    console.warn(`Theme directory "${themeDir}" does not exist.`);
-    return marp;
-  }
+  console.log("Initializing Marp with themes...");
+  for( const index in themeSet ) {
+    let themeDir = themeSet[index];
+    console.log("Processing theme directory:", themeDir);
+    let stats = await fs.stat(themeDir).catch(() => null);
+    if (!stats) {
+      console.warn(`   Theme directory does not exist.`);
+      continue;
+    }
 
-  if(!stats.isDirectory()) {
-    console.warn(`Theme directory "${themeDir}" is not a directory.`);
-    return marp;
-  }
+    if(!stats.isDirectory()) {
+      console.warn(`   Path is not a directory.`);
+      continue;
+    }
 
-  console.log("Loading themes from:", themeDir);
+    console.log("   Loading themes from:", themeDir);
 
-  const themeFiles = await fs.readdir(themeDir);
-  for (const file of themeFiles) {
-    if (path.extname(file) === '.css') {
-      const css = await fs.readFile(path.join(themeDir, file), 'utf8');
-      marp.themeSet.add(css);
+    const themeFiles = await fs.readdir(themeDir);
+    for (const file of themeFiles) {
+      if (path.extname(file) === '.css') {
+        const css = await fs.readFile(path.join(themeDir, file), 'utf8');
+        marp.themeSet.add(css);
+      }
     }
   }