create-marp-presentation 1.2.1 → 1.2.2

package/docs/plans/2026-02-28-conflict-resolution-fix.md

@@ -0,0 +1,62 @@
+# Conflict Resolution Bug Fix Design
+
+**Date:** 2026-02-28
+**Status:** Designed
+**Issue:** Dialog repeats when resolving single theme conflict
+
+## Problem Description
+
+When adding themes to an existing project, if a user selects an already existing theme, a conflict dialog appears. However, when the user chooses an action (Skip/Overwrite), the dialog repeats instead of resolving the conflict.
+
+## Root Cause
+
+In `lib/add-themes-command.js`, the `_resolveConflictsInteractive` method doesn't handle the return values `'skip'` and `'overwrite'` from `promptConflictResolution`.
+
+When there's a single conflict:
+1. `promptConflictResolution` returns `'skip'`, `'overwrite'`, or `'cancel'`
+2. The code only checks for `'skip-all'`, `'overwrite-all'`, and `'cancel'`
+3. When result is `'skip'` or `'overwrite'`, none of the conditions match
+4. Code falls through to the `for` loop
+5. User gets prompted again → **dialog repeats**
+
+## Solution
+
+Add explicit handling for `'skip'` and `'overwrite'` values in `_resolveConflictsInteractive`.
+
+### Code Changes
+
+**File:** `lib/add-themes-command.js`
+**Method:** `_resolveConflictsInteractive` (lines 303-333)
+
+Add after line 318 (after `if (result === 'cancel')`):
+```javascript
+// Handle single conflict responses
+if (result === 'skip') return { overwrite: [] };
+if (result === 'overwrite') return { overwrite: conflicts };
+```
+
+### Updated Logic Flow
+
+| Return Value | Behavior |
+|--------------|----------|
+| `skip-all` | Skip all conflicts |
+| `overwrite-all` | Overwrite all conflicts |
+| `cancel` | Cancel operation |
+| `skip` | Skip single conflict |
+| `overwrite` | Overwrite single conflict |
+| `choose-each` | Prompt for each conflict individually |
+
+## Test Scenarios
+
+1. **Single conflict - Skip**: Theme skipped, no dialog repeat
+2. **Single conflict - Overwrite**: Theme overwritten, no dialog repeat
+3. **Single conflict - Cancel**: Operation cancelled
+4. **Multiple conflicts - choose-each**: Individual prompts for each
+5. **Multiple conflicts - skip-all/overwrite-all**: Existing behavior verified
+
+## Backward Compatibility
+
+- No changes to public API
+- Return values remain consistent
+- Existing tests should pass without modification
+- Custom prompt handlers still work via `this.options.prompts?.resolveConflicts`

package/lib/add-themes-command.js

@@ -319,7 +319,11 @@ class AddThemesCommand {
     if (result === 'overwrite-all') return { overwrite: conflicts };
     if (result === 'cancel') return { overwrite: [] };
 
-    // Handle 'choose-each' or individual conflicts
+    // Handle single conflict responses
+    if (result === 'skip') return { overwrite: [] };
+    if (result === 'overwrite') return { overwrite: conflicts };
+
+    // Handle 'choose-each' - prompt for each conflict individually
     const overwrite = [];
     for (const conflict of conflicts) {
       const choice = await Prompts.promptSingleConflict(conflict);

package/lib/prompts.js

@@ -17,11 +17,16 @@ class Prompts {
       return [];
     }
 
-    const choices = availableThemes.map(theme => ({
-      name: theme.name,
-      value: theme.name,
-      checked: false
-    }));
+    const choices = availableThemes.map(theme => {
+      const displayName = theme.description
+        ? `${theme.name} - ${theme.description}`
+        : theme.name;
+      return {
+        name: displayName,
+        value: theme.name,
+        checked: false
+      };
+    });
 
     return await inquirer.checkbox({
       message: 'Select themes to add:',
@@ -152,6 +157,18 @@ class Prompts {
     });
   }
 
+  /**
+   * Prompt user for new theme description
+   *
+   * @returns {Promise<string|null>} Theme description or null if skipped
+   */
+  static async promptNewThemeDescription() {
+    return await inquirer.input({
+      message: 'Theme description (optional - press Enter to skip):',
+      default: ''
+    });
+  }
+
   /**
    * Prompt user for conflict resolution
    *

package/lib/theme-manager.js

@@ -4,6 +4,7 @@ const path = require('path');
 const { ThemeResolver } = require('./theme-resolver');
 const { VSCodeIntegration } = require('./vscode-integration');
 const { Frontmatter } = require('./frontmatter');
+const { Prompts } = require('./prompts');
 const {
   ThemeNotFoundError,
   ThemeAlreadyExistsError,
@@ -173,10 +174,11 @@ class ThemeManager {
    * @param {string|null} parent - Parent theme name or null
    * @param {string} location - 'root', 'existing' folder name, or 'new'
    * @param {string} newFolderName - Required if location is 'new'
+   * @param {string|null} description - Optional theme description
    * @throws {ThemeAlreadyExistsError} If theme with same name already exists
    * @throws {Error} If location is 'new' but newFolderName not provided
    */
-  createTheme(name, parent, location, newFolderName = null) {
+  createTheme(name, parent, location, newFolderName = null, description = null) {
     // Check for duplicate
     if (this.getTheme(name)) {
       throw new ThemeAlreadyExistsError(name);
@@ -198,7 +200,11 @@ class ThemeManager {
     }
 
     // Generate CSS content
-    let css = `/* @theme ${name} */\n\n`;
+    let css = `/* @theme ${name}`;
+    if (description && description.trim()) {
+      css += `\n * @description ${description.trim()}`;
+    }
+    css += ` */\n\n`;
 
     if (parent) {
       css += `@import "${parent}";\n\n`;

package/lib/theme-resolver.js

@@ -7,11 +7,12 @@ const path = require('path');
  * Represents a Marp theme
  */
 class Theme {
-  constructor(name, cssPath, css, dependencies = []) {
+  constructor(name, cssPath, css, dependencies = [], description = null) {
     this.name = name;
     this.path = cssPath;
     this.css = css;
     this.dependencies = dependencies;
+    this.description = description;
     this.isSystem = ['default', 'gaia', 'uncover'].includes(name);
   }
 }
@@ -81,6 +82,22 @@ class ThemeResolver {
     return dependencies;
   }
 
+  /**
+   * Extract @description from CSS comment directive
+   * Pattern: /* @description text *\/
+   *
+   * @param {string} cssContent - CSS file content
+   * @returns {string|null} Description text or null if not found
+   */
+  static extractDescription(cssContent) {
+    // Match /* @description text */ - supports multi-line comments
+    // The [\s\S]*? allows matching across newlines (non-greedy)
+    const descRegex = /\/\*[\s\S]*?@description\s+([^\r\n*]+)[\s\S]*?\*\//;
+    const match = cssContent.match(descRegex);
+
+    return match ? match[1].trim() : null;
+  }
+
   /**
    * Resolve theme from a CSS file
    *
@@ -97,8 +114,9 @@ class ThemeResolver {
     const filename = path.basename(cssPath);
     const name = this.extractThemeName(css, filename) || filename;
     const dependencies = this.extractDependencies(css);
+    const description = this.extractDescription(css);
 
-    return new Theme(name, cssPath, css, dependencies);
+    return new Theme(name, cssPath, css, dependencies, description);
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-marp-presentation",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Create a new Marp presentation project with one command. Manage themes quickly and easily with the CLI.",
   "bin": {
     "create-marp-presentation": "index.js"

package/themes/beam/beam.css

@@ -1,4 +1,5 @@
 /* @theme beam */
+/* @description Beamer-inspired theme with clean headers and footer bars */
 /* Author: rnd195 https://github.com/rnd195/ */
 /* beam license - GNU GPLv3 https://github.com/rnd195/my-marp-themes/blob/live/licenses/LICENSE_beam */
 /* License of beamer which inspired this theme - GNU GPLv2 https://github.com/rnd195/my-marp-themes/blob/live/licenses/LICENSE_GPLv2 */

package/themes/default-clean/default-clean.css

@@ -1,5 +1,5 @@
 /* @theme default-clean */
-/* A clean, minimal theme based on default */
+/* @description A clean, minimal theme based on default */
 
 @import "default";
 

package/themes/gaia-dark/gaia-dark.css

@@ -1,5 +1,5 @@
 /* @theme gaia-dark */
-/* A dark variant of the gaia theme */
+/* @description A dark variant of the gaia theme */
 
 @import "gaia";
 

package/themes/marpx/marpx.css

@@ -31,8 +31,9 @@
 *
 * ================================================================================ */
 
-/* 
+/*
 * @theme marpx
+* @description Modern multi-format theme with auto-scaling support
 *
 * @auto-scaling true
 * @size 16:9 1280px 720px

package/themes/marpx/socrates.css

@@ -1,4 +1,5 @@
 /* @theme socrates */
+/* @description A classic teaching theme based on marpx */
 
 @import "marpx";
 

package/themes/uncover-minimal/uncover-minimal.css

@@ -1,5 +1,5 @@
 /* @theme uncover-minimal */
-/* A minimal variant of the uncover theme */
+/* @description A minimal variant of the uncover theme */
 
 @import "uncover";