juice-email-cli 2.3.5 → 2.3.7

package/bin/juice.js

@@ -5,6 +5,29 @@ const { program } = require('commander');
 const path = require('path');
 const pkg = require('../package.json');
 const { run } = require('../src/index');
+let ExitPromptError;
+try {
+  ({ ExitPromptError } = require('@inquirer/core'));
+} catch (_) {}
+
+/**
+ * Wrap an async action handler to catch Ctrl+C and other errors gracefully.
+ */
+function safeAction(fn) {
+  return async (...args) => {
+    try {
+      await fn(...args);
+    } catch (err) {
+      if (ExitPromptError && err instanceof ExitPromptError) {
+        // Ctrl+C — exit silently
+        process.exit(0);
+      }
+      console.error('\n' + require('chalk').red(`  ✘ ${err.message}`));
+      if (process.env.DEBUG) console.error(err);
+      process.exit(1);
+    }
+  };
+}
 
 program
   .name('juice')
@@ -87,7 +110,7 @@ program
   .option('--templates', '列出所有模板')
   .option('--series', '列出所有系列')
   .option('--snippets', '列出所有片段')
-  .action(async (viewPath, options) => {
+  .action(safeAction(async (viewPath, options) => {
     const { runViewMode } = require('../src/view');
     await runViewMode({
       viewPath: viewPath || null,
@@ -96,7 +119,7 @@ program
         : (options.series ? 'series'
         : (options.snippets ? 'snippets' : null)),
     });
-  });
+  }));
 
 // ─── Subcommand: juice init ─────────────────────────────────────────────
 program
@@ -106,7 +129,7 @@ program
   .option('-s, --snippet <file-path>', '仅拷贝片段 HTML 文件')
   .option('-c, --config <file-path>', '仅拷贝配置 YAML 文件')
   .option('--all [target]', '拷贝整个 EDM 资源目录到当前或指定目录')
-  .action(async (initPath, options) => {
+  .action(safeAction(async (initPath, options) => {
     const { runInitMode } = require('../src/init');
     await runInitMode({
       initPath: initPath || null,
@@ -115,11 +138,11 @@ program
       config: options.config || null,
       all: options.all !== undefined ? (options.all || true) : null,
     });
-  });
+  }));
 
 // ─── Default action (backward compatible) ───────────────────────────────
 program
-  .action(async (options) => {
+  .action(safeAction(async (options) => {
     // 注册/卸载右键菜单
     if (options.install) {
       const { registerContextMenu } = require('../src/context-menu');
@@ -161,7 +184,7 @@ program
     // 全交互模式：无 --snippet，无 -f
     const { runInteractiveMode } = require('../src/snippet');
     await runInteractiveMode({ config: options.config });
-  });
+  }));
 
 program.allowUnknownOption(false);
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "juice-email-cli",
-  "version": "2.3.5",
+  "version": "2.3.7",
   "description": "CLI tool to generate email-client-compatible HTML with juice (CSS inlining) + Mustache templating + minification",
   "main": "src/index.js",
   "bin": {

package/src/init.js

@@ -6,8 +6,7 @@ const chalk = require('chalk');
 const {
   resolveEdmDir, loadMeta, findBrands, findTemplateVersions,
   findSeriesDirs, findSnippetVariants, findConfigs,
-  promptBrand, promptTemplateVersion, promptSeries, promptSnippetVariant,
-  promptOutputName, checkOutputConflicts, findNextVersion,
+  promptOutputName,
 } = require('./snippet');
 
 function fmtBytes(b) {
@@ -90,141 +89,203 @@ async function directCopy(srcPath, cwd) {
 
 // ─── Interactive Init ────────────────────────────────────────────────────────
 
+/**
+ * Wrap @inquirer/prompts select with back/exit navigation.
+ * Returns the chosen value, 'back', or 'exit'.
+ */
+async function selectWithNav(choices, showBack) {
+  const { select } = await import('@inquirer/prompts');
+  const all = [];
+  if (showBack) all.push({ name: '.. 返回上级', value: 'back' });
+  all.push(...choices);
+  all.push({ name: '✕ 退出', value: 'exit' });
+  return select({ message: choices[0] ? undefined : '', choices: all, loop: false });
+}
+
 async function interactiveInit(edmDir, cwd) {
-  const brands = findBrands(edmDir);
-  const brand = await promptBrand(brands);
-  const versions = findTemplateVersions(brand.path);
-  const version = await promptTemplateVersion(versions);
-
-  // Series selection
-  const allSeries = findSeriesDirs(brand.path);
-  let series = null;
-  let variant = null;
-
-  if (allSeries.length > 0) {
-    const { select } = await import('@inquirer/prompts');
-    const seriesChoices = [
-      { name: '[跳过] 仅使用模板', value: null },
-      ...allSeries.map(s => {
-        const meta = s.meta;
-        const display = meta.name
-          ? formatName(meta, s.name)
-          : chalk.bold.cyan(s.name);
-        return {
-          name: display,
+  let step = 'brand';
+  let brand = null, version = null, series = null, variant = null;
+
+  while (true) {
+    if (step === 'brand') {
+      const brands = findBrands(edmDir);
+      const choices = brands.map(b => ({
+        name: formatName(b.meta, b.name) + (b.meta.description ? ' — ' + chalk.dim(b.meta.description) : ''),
+        value: b,
+      }));
+      const result = await selectWithNav(choices, false);
+      if (result === 'exit') { console.log(chalk.gray('已退出。\n')); return; }
+      brand = result;
+      step = 'version';
+      continue;
+    }
+
+    if (step === 'version') {
+      const versions = findTemplateVersions(brand.path);
+      const choices = versions.map(v => ({
+        name: formatName(v.meta, v.name) + (v.meta.description ? ' — ' + chalk.dim(v.meta.description) : ''),
+        value: v,
+      }));
+      const result = await selectWithNav(choices, true);
+      if (result === 'back') { step = 'brand'; continue; }
+      if (result === 'exit') { console.log(chalk.gray('已退出。\n')); return; }
+      version = result;
+      step = 'series';
+      continue;
+    }
+
+    if (step === 'series') {
+      const allSeries = findSeriesDirs(brand.path);
+      if (allSeries.length === 0) {
+        series = null;
+        step = 'copy';
+        continue;
+      }
+      const choices = [
+        { name: '[跳过] 仅使用模板', value: null },
+        ...allSeries.map(s => ({
+          name: formatName(s.meta, s.name) + (s.meta.description ? ' — ' + chalk.dim(s.meta.description) : ''),
           value: s,
-          description: meta.description || undefined,
-        };
-      }),
-    ];
-    series = await select({
-      message: '选择片段系列（可选）：',
-      choices: seriesChoices,
-    });
-
-    if (series) {
+        })),
+      ];
+      const result = await selectWithNav(choices, true);
+      if (result === 'back') { step = 'version'; continue; }
+      if (result === 'exit') { console.log(chalk.gray('已退出。\n')); return; }
+      series = result;
+      step = series ? 'variant' : 'copy';
+      continue;
+    }
+
+    if (step === 'variant') {
       const variants = findSnippetVariants(series.path);
-      if (variants.length > 0) {
-        variant = await promptSnippetVariant(variants);
+      if (variants.length === 0) {
+        variant = null;
+        step = 'copy';
+        continue;
       }
+      const choices = variants.map(v => ({
+        name: formatName(v.meta, v.name) + (v.meta.description ? ' — ' + chalk.dim(v.meta.description) : ''),
+        value: v,
+      }));
+      const result = await selectWithNav(choices, true);
+      if (result === 'back') { step = 'series'; continue; }
+      if (result === 'exit') { console.log(chalk.gray('已退出。\n')); return; }
+      variant = result;
+      step = 'copy';
+      continue;
     }
-  }
 
-  // Multi-select what to copy
-  const copyItems = [];
-  copyItems.push({
-    name: '📋 模板 HTML',
-    value: 'template',
-    description: path.basename(version.templatePath),
-    checked: true,
-  });
-
-  if (variant) {
-    const snipPath = path.join(variant.path, 'snippet.html');
-    if (fs.existsSync(snipPath)) {
+    if (step === 'copy') {
+      // Multi-select what to copy
+      const copyItems = [];
       copyItems.push({
-        name: '🧩 片段 HTML',
-        value: 'snippet',
-        description: path.basename(snipPath),
+        name: `📋 模板 HTML（${version.meta.name || version.name}）`,
+        value: 'template',
+        description: path.basename(version.templatePath),
         checked: true,
       });
-    }
 
-    const configs = findConfigs(variant.path);
-    if (configs.length > 0) {
-      copyItems.push({
-        name: '⚙️ 配置文件',
-        value: 'config',
-        description: configs.map(c => c.name).join(', '),
-        checked: true,
+      if (variant) {
+        const snipPath = path.join(variant.path, 'snippet.html');
+        if (fs.existsSync(snipPath)) {
+          copyItems.push({
+            name: '🧩 片段 HTML',
+            value: 'snippet',
+            description: path.basename(snipPath),
+            checked: true,
+          });
+        }
+        const configs = findConfigs(variant.path);
+        if (configs.length > 0) {
+          copyItems.push({
+            name: '⚙️ 配置文件',
+            value: 'config',
+            description: configs.map(c => c.name).join(', '),
+            checked: true,
+          });
+        }
+      }
+
+      // Show summary before multi-select
+      console.log(chalk.dim(`\n  品牌：${brand.meta.name || brand.name}  →  模板：${version.meta.name || version.name}`));
+      if (series) console.log(chalk.dim(`  系列：${series.meta.name || series.name}${variant ? '  →  变体：' + (variant.meta.name || variant.name) : ''}`));
+
+      const { checkbox } = await import('@inquirer/prompts');
+      const navCopyItems = [
+        ...copyItems,
+        { name: '.. 返回上级', value: 'back' },
+        { name: '✕ 退出', value: 'exit' },
+      ];
+      const selected = await checkbox({
+        message: '选择要拷贝的内容：',
+        choices: navCopyItems,
       });
-    }
-  }
 
-  const { checkbox } = await import('@inquirer/prompts');
-  const selected = await checkbox({
-    message: '选择要拷贝的内容：',
-    choices: copyItems,
-  });
+      // Filter out nav values
+      if (selected.includes('exit')) { console.log(chalk.gray('已退出。\n')); return; }
+      if (selected.includes('back')) {
+        step = series ? 'variant' : 'series';
+        continue;
+      }
 
-  if (selected.length === 0) {
-    console.log(chalk.gray('未选择任何内容，已取消。\n'));
-    return;
-  }
+      const realSelected = selected.filter(s => s !== 'back' && s !== 'exit');
+      if (realSelected.length === 0) {
+        console.log(chalk.gray('未选择任何内容，已跳过。\n'));
+        return;
+      }
 
-  // Output name
-  const defaultBaseName = variant
-    ? `${brand.name}-${version.name}-${series.name}-${variant.name}`
-    : `${brand.name}-${version.name}`;
-  const outputBaseName = await promptOutputName(defaultBaseName, cwd);
+      // Output name
+      const defaultBaseName = variant
+        ? `${brand.name}-${version.name}-${series.name}-${variant.name}`
+        : `${brand.name}-${version.name}`;
+      const outputBaseName = await promptOutputName(defaultBaseName, cwd);
 
-  // Copy files
-  console.log(chalk.green('\n✔ 已拷贝：'));
-  const cwdRel = (p) => './' + path.relative(cwd, p);
+      // Copy files
+      console.log(chalk.green('\n✔ 已拷贝：'));
+      const cwdRel = (p) => './' + path.relative(cwd, p);
 
-  if (selected.includes('template')) {
-    const destName = outputBaseName + path.extname(version.templatePath);
-    const dest = copyFileToCwd(version.templatePath, cwd, destName);
-    console.log(`   ${chalk.cyan('·')} ${cwdRel(dest)}  ${chalk.gray('(模板, ' + fmtBytes(fs.statSync(dest).size) + ')')}`);
-  }
+      if (realSelected.includes('template')) {
+        const destName = outputBaseName + path.extname(version.templatePath);
+        const dest = copyFileToCwd(version.templatePath, cwd, destName);
+        console.log(`   ${chalk.cyan('·')} ${cwdRel(dest)}  ${chalk.gray('(模板, ' + fmtBytes(fs.statSync(dest).size) + ')')}`);
+        // Auto-copy icon
+        const icon = copyIcon(variant ? variant.path : null, version.path, brand.path, cwd);
+        if (icon) console.log(`   ${chalk.cyan('·')} ${cwdRel(icon)}  ${chalk.gray('(图标, ' + fmtBytes(fs.statSync(icon).size) + ')')}`);
+      }
 
-  if (selected.includes('snippet') && variant) {
-    const snipPath = path.join(variant.path, 'snippet.html');
-    const destName = outputBaseName + '-snippet' + path.extname(snipPath);
-    const dest = copyFileToCwd(snipPath, cwd, destName);
-    console.log(`   ${chalk.cyan('·')} ${cwdRel(dest)}  ${chalk.gray('(片段, ' + fmtBytes(fs.statSync(dest).size) + ')')}`);
-  }
+      if (realSelected.includes('snippet') && variant) {
+        const snipPath = path.join(variant.path, 'snippet.html');
+        const destName = outputBaseName + '-snippet' + path.extname(snipPath);
+        const dest = copyFileToCwd(snipPath, cwd, destName);
+        console.log(`   ${chalk.cyan('·')} ${cwdRel(dest)}  ${chalk.gray('(片段, ' + fmtBytes(fs.statSync(dest).size) + ')')}`);
+      }
 
-  if (selected.includes('config') && variant) {
-    const configs = findConfigs(variant.path);
-    let cfgPath;
-    if (configs.length === 1) {
-      cfgPath = configs[0].path;
-    } else {
-      // Use optimal config
-      const optimal = configs.find(c => c.isOptimal);
-      cfgPath = optimal ? optimal.path : configs[0].path;
-    }
-    const dest = copyFileToCwd(cfgPath, cwd, 'juice.yaml');
-    console.log(`   ${chalk.cyan('·')} ${cwdRel(dest)}  ${chalk.gray('(配置, ' + fmtBytes(fs.statSync(dest).size) + ')')}`);
-  }
+      if (realSelected.includes('config') && variant) {
+        const configs = findConfigs(variant.path);
+        const optimal = configs.find(c => c.isOptimal);
+        const cfgPath = optimal ? optimal.path : configs[0].path;
+        const dest = copyFileToCwd(cfgPath, cwd, 'juice.yaml');
+        console.log(`   ${chalk.cyan('·')} ${cwdRel(dest)}  ${chalk.gray('(配置, ' + fmtBytes(fs.statSync(dest).size) + ')')}`);
+      }
 
-  // Summary
-  console.log();
-  if (selected.includes('snippet') && selected.includes('template')) {
-    const snipFile = outputBaseName + '-snippet' + path.extname(path.join(variant.path, 'snippet.html'));
-    const tplFile = outputBaseName + path.extname(version.templatePath);
-    console.log(
-      '  ' + chalk.dim('💡 下一步：') + '\n' +
-      '     ' + chalk.cyan(`juice -s ${snipFile} -f ${tplFile}`) +
-      (selected.includes('config') ? chalk.cyan(' -c juice.yaml') : '') + '\n'
-    );
-  } else if (selected.includes('template')) {
-    const tplFile = outputBaseName + path.extname(version.templatePath);
-    console.log(
-      '  ' + chalk.dim('💡 下一步：') + '\n' +
-      '     ' + chalk.cyan(`juice -f ${tplFile}`) + '\n'
-    );
+      console.log();
+      if (realSelected.includes('snippet') && realSelected.includes('template')) {
+        const snipFile = outputBaseName + '-snippet' + path.extname(path.join(variant.path, 'snippet.html'));
+        const tplFile = outputBaseName + path.extname(version.templatePath);
+        console.log(
+          '  ' + chalk.dim('💡 下一步：') + '\n' +
+          '     ' + chalk.cyan(`juice -s ${snipFile} -f ${tplFile}`) +
+          (realSelected.includes('config') ? chalk.cyan(' -c juice.yaml') : '') + '\n'
+        );
+      } else if (realSelected.includes('template')) {
+        const tplFile = outputBaseName + path.extname(version.templatePath);
+        console.log(
+          '  ' + chalk.dim('💡 下一步：') + '\n' +
+          '     ' + chalk.cyan(`juice -f ${tplFile}`) + '\n'
+        );
+      }
+      return;
+    }
   }
 }
 
@@ -268,6 +329,30 @@ function countFiles(dir) {
   return count;
 }
 
+/**
+ * Find and copy favicon.ico alongside the template.
+ * Lookup: variant dir → template version dir → brand's first template → skip
+ */
+function copyIcon(variantDir, versionDir, brandDir, cwd) {
+  const candidates = [];
+  if (variantDir) candidates.push(path.join(variantDir, 'favicon.ico'));
+  if (versionDir) candidates.push(path.join(versionDir, 'favicon.ico'));
+  // First template version in brand
+  try {
+    const versions = findTemplateVersions(brandDir);
+    if (versions.length > 0) {
+      candidates.push(path.join(versions[0].path, 'favicon.ico'));
+    }
+  } catch (_) {}
+  for (const src of candidates) {
+    if (fs.existsSync(src)) {
+      const dest = copyFileToCwd(src, cwd, 'favicon.ico');
+      return dest;
+    }
+  }
+  return null;
+}
+
 function findNextEdmVersion(targetDir) {
   let v = 1;
   while (true) {
@@ -308,12 +393,12 @@ async function runInitMode({ initPath, template, snippet, config, all }) {
         message: `目录 ${destDir} 已存在：`,
         choices: [
           { name: '覆盖', value: 'overwrite' },
-          { name: `自动版本号（${path.basename(vName)}）`, value: 'version' },
-          { name: '取消', value: 'cancel' },
+          { name: `版本（${path.basename(vName)}）`, value: 'version' },
+          { name: '跳过', value: 'skip' },
         ],
       });
-      if (action === 'cancel') {
-        console.log(chalk.gray('已取消。\n'));
+      if (action === 'skip') {
+        console.log(chalk.gray('已跳过。\n'));
         return;
       }
       if (action === 'version') {
@@ -409,6 +494,8 @@ async function runInitMode({ initPath, template, snippet, config, all }) {
         const destName = outputBaseName + path.extname(tplPath);
         const dest = copyFileToCwd(tplPath, cwd, destName);
         console.log(`   ${chalk.cyan('·')} ${cwdRel(dest)}  ${chalk.gray('(模板, ' + fmtBytes(fs.statSync(dest).size) + ')')}`);
+        const icon = copyIcon(parsed.variantData.path, version.path, brandDir, cwd);
+        if (icon) console.log(`   ${chalk.cyan('·')} ${cwdRel(icon)}  ${chalk.gray('(图标, ' + fmtBytes(fs.statSync(icon).size) + ')')}`);
       }
       if (selected.includes('snippet') && fs.existsSync(snipPath)) {
         const destName = outputBaseName + '-snippet' + path.extname(snipPath);

package/src/view.js

@@ -627,6 +627,18 @@ async function interactiveBrowse(edmDir, startParsed) {
             const dest = path.join(cwd, outputBaseName + path.extname(src));
             const actual = copyFileSafe(src, dest);
             console.log(`   ${chalk.cyan('·')} ${cwdRel(actual)}  ${chalk.gray('(模板, ' + fmtBytes(fs.statSync(actual).size) + ')')}`);
+            // Auto-copy icon: variant dir → template version dir → first version in brand
+            const iconSrcs = [
+              path.join(current.variantData.path, 'favicon.ico'),
+              path.join(versions[0].path, 'favicon.ico'),
+            ];
+            for (const isrc of iconSrcs) {
+              if (fs.existsSync(isrc)) {
+                const idest = copyFileSafe(isrc, path.join(cwd, 'favicon.ico'));
+                console.log(`   ${chalk.cyan('·')} ${cwdRel(idest)}  ${chalk.gray('(图标, ' + fmtBytes(fs.statSync(idest).size) + ')')}`);
+                break;
+              }
+            }
           }
           if (selected.includes('snippet') && fs.existsSync(snipPath)) {
             const dest = path.join(cwd, outputBaseName + '-snippet' + path.extname(snipPath));