juice-email-cli 2.3.6 → 2.3.8

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.6",
+  "version": "2.3.8",
   "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

@@ -93,13 +93,13 @@ async function directCopy(srcPath, cwd) {
  * Wrap @inquirer/prompts select with back/exit navigation.
  * Returns the chosen value, 'back', or 'exit'.
  */
-async function selectWithNav(choices, showBack) {
+async function selectWithNav(message, 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 });
+  return select({ message, choices: all, loop: false });
 }
 
 async function interactiveInit(edmDir, cwd) {
@@ -113,7 +113,7 @@ async function interactiveInit(edmDir, cwd) {
         name: formatName(b.meta, b.name) + (b.meta.description ? ' — ' + chalk.dim(b.meta.description) : ''),
         value: b,
       }));
-      const result = await selectWithNav(choices, false);
+      const result = await selectWithNav('选择品牌：', choices, false);
       if (result === 'exit') { console.log(chalk.gray('已退出。\n')); return; }
       brand = result;
       step = 'version';
@@ -126,7 +126,7 @@ async function interactiveInit(edmDir, cwd) {
         name: formatName(v.meta, v.name) + (v.meta.description ? ' — ' + chalk.dim(v.meta.description) : ''),
         value: v,
       }));
-      const result = await selectWithNav(choices, true);
+      const result = await selectWithNav('选择模板版本：', choices, true);
       if (result === 'back') { step = 'brand'; continue; }
       if (result === 'exit') { console.log(chalk.gray('已退出。\n')); return; }
       version = result;
@@ -148,7 +148,7 @@ async function interactiveInit(edmDir, cwd) {
           value: s,
         })),
       ];
-      const result = await selectWithNav(choices, true);
+      const result = await selectWithNav('选择片段系列：', choices, true);
       if (result === 'back') { step = 'version'; continue; }
       if (result === 'exit') { console.log(chalk.gray('已退出。\n')); return; }
       series = result;
@@ -167,7 +167,7 @@ async function interactiveInit(edmDir, cwd) {
         name: formatName(v.meta, v.name) + (v.meta.description ? ' — ' + chalk.dim(v.meta.description) : ''),
         value: v,
       }));
-      const result = await selectWithNav(choices, true);
+      const result = await selectWithNav('选择片段变体：', choices, true);
       if (result === 'back') { step = 'series'; continue; }
       if (result === 'exit') { console.log(chalk.gray('已退出。\n')); return; }
       variant = result;
@@ -367,11 +367,13 @@ async function runInitMode({ initPath, template, snippet, config, all }) {
 
   // --all: copy entire EDM directory
   if (all) {
-    let edmDir;
-    try {
-      edmDir = resolveEdmDir();
-    } catch (err) {
-      console.error(chalk.red(`\n  ✘ ${err.message}\n`));
+    // Always use package built-in EDM for --all (not CWD's local copy)
+    const pkgEdm = path.resolve(__dirname, '..', 'edm');
+    const edmDir = fs.existsSync(pkgEdm) ? pkgEdm : (() => {
+      try { return resolveEdmDir(); } catch (_) { return null; }
+    })();
+    if (!edmDir) {
+      console.error(chalk.red('\n  ✘ EDM 资源库不存在，无法拷贝。\n'));
       process.exit(1);
     }
     const target = all === true ? cwd : path.resolve(all);