create-marp-presentation 1.1.0 → 1.2.0

package/README.md

@@ -1,64 +1,72 @@
 # Create Marp Presentation
 
-Create a new Marp presentation with a single command.
+Create beautiful presentations in Markdown. Zero setup.
 
-## Installation
+## Quick Start
 
 ```bash
 npx create-marp-presentation my-presentation
+cd my-presentation
+npm run dev
 ```
 
-## Usage
+That's it! Edit `presentation.md` and see changes live at `http://localhost:8080`.
 
-```bash
-cd my-presentation
-npm run dev     # Live preview
-npm run build:all  # Build all formats
-```
+## VSCode Setup
 
-## Features
+For the best editing experience, install [Marp for VSCode](https://marketplace.visualstudio.com/items?itemName=marp-team.marp-vscode):
 
-- 🚀 One-command setup
-- 📝 Markdown slides
-- 🎨 Marp themes
-- 📦 HTML, PDF, PPTX export
-- 📁 Static files support
-- 🔥 Live preview
+1. Open VSCode
+2. Press `Ctrl+Shift+X` (or `Cmd+Shift+X` on Mac)
+3. Search "Marp for VSCode"
+4. Click Install
 
-## Local Testing
+After installing, open any `.md` file and click the **Marp: Preview** button in the top-right corner.
 
-To test project generation without publishing to npm:
+## What You Get
 
-```bash
-# Clone the repository
-git clone https://github.com/echernyshev/marp-presentation-template.git
-cd marp-presentation-template
+- **Markdown slides** - Write presentations in plain text
+- **Live preview** - See changes instantly in browser
+- **Export anywhere** - HTML, PDF, PPTX with one command
+- **Themes** - Beautiful built-in themes, add more anytime
+- **Static files** - Images and assets copied automatically
 
-# Install dependencies for tests
-npm install
+## Commands
 
-# Run tests
-npm test
+| Command | What it does |
+|---------|--------------|
+| `npm run dev` | Live preview at http://localhost:8080 |
+| `npm run build:all` | Export to HTML, PDF, and PPTX |
+| `npm run clean` | Remove output folder |
 
-# Create a test project (interactive mode)
-node index.js test-project
+## Theme Management
 
-# Check the contents
-cd test-project
-ls -la
-npm run dev
-```
+Add and switch themes anytime.
 
-Other example commands:
+### Quick Theme Commands
 
 ```bash
-# Create a test project without examples
-echo "n" | node index.js test-project-minimal
+npm run theme:add        # Interactive: select themes to add
+npm run theme:add beam   # Add specific themes
+npm run theme:list       # See what's available
+npm run theme:set marpx  # Change active theme
 ```
 
-## Documentation
+When you create a project, you'll be prompted to add themes. Add more later with `npm run theme:add`.
+
+[See full theme documentation →](docs/theme-management.md)
+
+## Local Development
 
-After creating a project, read the README in the project folder.
+To test without publishing to npm:
+
+```bash
+git clone https://github.com/echernyshev/marp-presentation-template.git
+cd marp-presentation-template
+npm install
+npm test
+node index.js test-project
+```
 
 ## License
 

package/index.js

@@ -1,184 +1,131 @@
 #!/usr/bin/env node
 
-const fs = require('fs');
-const path = require('path');
-const { spawnSync } = require('child_process');
-const readline = require('readline');
-
-const projectName = process.argv[2];
-
-if (!projectName) {
-  console.error('Please provide a project name:');
-  console.error('  npx create-marp-presentation <project-name>');
-  process.exit(1);
-}
-
-// Валидация имени проекта
-const validName = /^[a-z0-9][a-z0-9-]*[a-z0-9]$|^[a-z0-9]$/;
-if (!validName.test(projectName)) {
-  console.error(`Invalid project name: "${projectName}"`);
-  console.error('Project name must be lowercase, contain only letters, numbers, and hyphens.');
-  process.exit(1);
-}
-
-const projectPath = path.join(process.cwd(), projectName);
-
-// Запрос на создание примеров слайдов
-async function askCreateExamples() {
-  return new Promise((resolve) => {
-    // Интерактивный режим — спрашиваем пользователя
-    if (process.stdin.isTTY) {
-      const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout
-      });
-
-      rl.question('Create example slides file? (Y/n) ', (answer) => {
-        rl.close();
-        const normalized = answer.toLowerCase().trim();
-        resolve(normalized !== 'n' && normalized !== 'no');
-      });
-    } else {
-      // Неинтерактивный режим — читаем из stdin если есть данные
-      let input = '';
-      process.stdin.setEncoding('utf8');
-
-      process.stdin.on('readable', () => {
-        let chunk;
-        while ((chunk = process.stdin.read()) !== null) {
-          input += chunk;
-        }
-      });
-
-      process.stdin.on('end', () => {
-        const normalized = input.toLowerCase().trim();
-        // Если ввод пустой, создаём примеры по умолчанию
-        if (normalized === '') {
-          resolve(true);
-        } else {
-          resolve(normalized !== 'n' && normalized !== 'no');
-        }
-      });
-
-      // Если stdin не имеет данных сразу, завершаем
-      if (process.stdin.readableLength === 0) {
-        // Даем небольшое время на появление данных
-        setTimeout(() => {
-          if (input === '') {
-            process.stdin.destroy();
-            resolve(true);
-          }
-        }, 10);
-      }
-    }
-  });
-}
+/**
+ * create-marp-presentation - CLI entry point
+ * Supports dual entry points:
+ *   1. npx create-marp-presentation <name> [--path <dir>] - Create new project
+ *   2. npx create-marp-presentation theme:add <path> [themes...] - Add themes to existing project
+ */
 
-// Validate path to prevent traversal attacks
-const resolvedPath = path.resolve(projectPath);
-if (!resolvedPath.startsWith(path.resolve(process.cwd()))) {
-  console.error('Invalid project path: path traversal detected.');
-  process.exit(1);
-}
+const path = require('path');
 
-// Проверка существования папки
-if (fs.existsSync(projectPath)) {
-  console.error(`Directory "${projectName}" already exists.`);
-  process.exit(1);
-}
+const { createProject, validateProjectName, parsePathArg } = require('./cli/commands/create-project');
+const { addThemesToExistingProject } = require('./cli/commands/add-themes-cli');
+const { validateOutputPath } = require('./cli/utils/file-utils');
 
-// Получаем путь к template
+// Paths
 const templatePath = path.join(__dirname, 'template');
-
-// Рекурсивное копирование директории
-const copyDir = (src, dest) => {
-  const entries = fs.readdirSync(src, { withFileTypes: true });
-
-  for (const entry of entries) {
-    const srcPath = path.join(src, entry.name);
-    const destPath = path.join(dest, entry.name);
-
-    if (entry.isDirectory()) {
-      fs.mkdirSync(destPath, { recursive: true });
-      copyDir(srcPath, destPath);
-    } else {
-      fs.copyFileSync(srcPath, destPath);
-    }
-  }
-};
-
-// Копирование опциональных файлов
-const copyOptionalFiles = (destPath) => {
-  const optionalPath = path.join(__dirname, 'template-optional');
-
-  // Копируем examples.md
-  const examplesSrc = path.join(optionalPath, 'examples.md');
-  const examplesDest = path.join(destPath, 'examples.md');
-  if (fs.existsSync(examplesSrc)) {
-    fs.copyFileSync(examplesSrc, examplesDest);
+const themesLibraryPath = path.join(__dirname, 'themes');
+
+/**
+ * Show usage information
+ * @param {boolean} isError - If true, write to stderr and exit with error code
+ */
+function showUsage(isError = false) {
+  const output = isError ? console.error : console.log;
+  output('Please provide a project name:');
+  output('  npx create-marp-presentation <project-name> [--path <output-dir>]');
+  output('');
+  output('Or use the theme:add command:');
+  output('  npx create-marp-presentation theme:add <project-path> [theme-names...]');
+  output('');
+  output('Examples:');
+  output('  npx create-marp-presentation my-project');
+  output('  npx create-marp-presentation my-project --path /tmp');
+  output('  npx create-marp-presentation my-project --path ~/projects');
+  output('  npx create-marp-presentation theme:add ./my-project');
+  output('  npx create-marp-presentation theme:add ./my-project beam marpx');
+  output('');
+
+  if (isError) {
+    process.exit(1);
   }
+}
 
-  // Копируем демо-изображение
-  const demoImageSrc = path.join(optionalPath, 'static', 'demo-image.png');
-  const demoImageDest = path.join(destPath, 'static', 'demo-image.png');
-  if (fs.existsSync(demoImageSrc)) {
-    fs.copyFileSync(demoImageSrc, demoImageDest);
+/**
+ * Handle theme:add command
+ * @param {string[]} args - Command arguments
+ */
+async function handleThemeAdd(args) {
+  const targetPath = args[0];
+  if (!targetPath) {
+    console.error('Usage: npx create-marp-presentation theme:add <project-path> [theme-names...]');
+    process.exit(1);
   }
-};
 
-console.log(`Creating Marp presentation: ${projectName}`);
-console.log();
+  const themeNames = args.slice(1); // Additional arguments are theme names
 
-// Основной async flow
-(async () => {
   try {
-    // Запрашиваем создание примеров
-    const createExamples = await askCreateExamples();
-
-    // Создаём папку проекта
-    fs.mkdirSync(projectPath, { recursive: true });
-
-    // Рекурсивно копируем template
-    copyDir(templatePath, projectPath);
-
-    console.log('✓ Project created');
-
-    // Копируем опциональные файлы
-    if (createExamples) {
-      copyOptionalFiles(projectPath);
-      console.log('✓ Example slides added');
-      console.log('✓ Demo image added to static/');
-    }
-    console.log();
-
-    // Запускаем npm install
-    console.log('Installing dependencies...');
-    const installResult = spawnSync('npm', ['install'], {
-      cwd: projectPath,
-      stdio: 'inherit',
+    await addThemesToExistingProject(targetPath, {
+      themesLibraryPath,
+      themeNames: themeNames.length > 0 ? themeNames : null
     });
+  } catch (error) {
+    console.error(`Error: ${error.message}`);
+    process.exit(1);
+  }
+}
 
-    if (installResult.status !== 0) {
-      console.error();
-      console.error('Failed to install dependencies.');
-      console.error('Please run "cd ' + projectName + ' && npm install" manually.');
+/**
+ * Handle project creation command
+ * @param {string} projectName - Name of the project
+ * @param {string[]} args - Remaining arguments (e.g., --path)
+ */
+async function handleProjectCreation(projectName, args = []) {
+  // Parse --path argument if present
+  const { pathIndex } = parsePathArg(args);
+  let outputPath = process.cwd();
+
+  if (pathIndex !== null) {
+    const pathArg = args[pathIndex + 1];
+    const validation = validateOutputPath(pathArg);
+    if (!validation.valid) {
+      console.error(`Invalid --path: "${pathArg}"`);
+      console.error(validation.error);
       process.exit(1);
     }
+    outputPath = validation.resolvedPath;
+  }
 
-    console.log();
-    console.log('✓ Dependencies installed');
-    console.log();
-    console.log('Next steps:');
-    console.log(`  cd ${projectName}`);
-    console.log('  npm run dev        # Start live preview');
-    if (createExamples) {
-      console.log('  marp examples.md   # Preview example slides');
+  try {
+    await createProject(projectName, {
+      outputPath,
+      templatePath,
+      themesLibraryPath
+    });
+  } catch (error) {
+    if (error.message === 'Invalid project name' || error.message === 'Project directory already exists') {
+      process.exit(1);
     }
-    console.log('  npm run build:all  # Build all formats');
-    console.log();
-
-  } catch (err) {
-    console.error('Error creating project:', err.message);
+    console.error('Error creating project:', error.message);
     process.exit(1);
   }
-})();
+}
+
+/**
+ * Main entry point
+ */
+async function main() {
+  const [command, ...args] = process.argv.slice(2);
+
+  switch (command) {
+    case 'theme:add':
+      await handleThemeAdd(args);
+      break;
+
+    case undefined:
+      showUsage(true); // Exit with error code 1
+      break;
+
+    default:
+      // Treat as project name (backward compatible)
+      await handleProjectCreation(command, args);
+      break;
+  }
+}
+
+// Run
+main().catch(error => {
+  console.error('Unexpected error:', error.message);
+  process.exit(1);
+});