juice-email-cli 2.3.9 → 2.3.11

package/README.md

@@ -122,9 +122,12 @@ juice view -i elabscience
 ### 拷贝资源到当前目录
 
 ```bash
-# 交互式选择并多选拷贝
+# 交互式选择（每步支持返回/退出）
 juice init
 
+# 拷贝整个 EDM 资源库
+juice init --all
+
 # 从指定 EDM 路径拷贝
 juice init elabscience/templates/standard
 
@@ -134,6 +137,13 @@ juice init --snippet edm/elabscience/series/literature/default/snippet.html
 juice init --config edm/elabscience/series/literature/default/juice.yaml
 ```
 
+交互拷贝进入变体后提供三个操作：
+- `🧩 仅片段+配置` — 快捷拷贝片段 HTML + juice.yaml（跳过模板）
+- `✅ 确认拷贝` — 按当前选择执行
+- `🔄 自定义选择` — 打开多选 checkbox 调整
+
+拷贝模板时自动附带 `favicon.ico`。配置文件冲突自动加版本号。
+
 ### 参数说明
 
 | 参数 | 简写 | 说明 |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "juice-email-cli",
-  "version": "2.3.9",
+  "version": "2.3.11",
   "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

@@ -195,7 +195,7 @@ async function interactiveInit(edmDir, cwd) {
       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) : ''}`));
 
-      // Loop: select → checkbox → confirm, allow back/modify at any point
+      // Loop: confirm / shortcuts / customize, allow back at any point
       let selected = copyItems.filter(c => c.checked).map(c => c.value);
       while (true) {
         const picked = selected
@@ -204,10 +204,14 @@ async function interactiveInit(edmDir, cwd) {
           .map(c => c.name.replace(/^[^\s]+\s/, ''));
         const summary = picked.length > 0 ? picked.join(' + ') : '(未选择)';
         const mainChoices = [];
+        // Quick shortcut: snippet + config only (skip template)
+        if (variant && copyItems.some(c => c.value === 'snippet') && copyItems.some(c => c.value === 'config')) {
+          mainChoices.push({ name: '🧩 仅片段 + 配置', value: 'snippet-config' });
+        }
         if (picked.length > 0) {
           mainChoices.push({ name: `✅ 确认拷贝（${summary}）`, value: 'confirm' });
         }
-        mainChoices.push({ name: `🔄 修改选择（${summary}）`, value: 'edit' });
+        mainChoices.push({ name: `🔄 自定义选择（${summary}）`, value: 'edit' });
 
         const action = await selectWithNav(
           '拷贝操作：',
@@ -225,6 +229,10 @@ async function interactiveInit(edmDir, cwd) {
           if (selected.length === 0) { console.log(chalk.dim('  (已清空选择)\n')); }
           continue;
         }
+        if (action === 'snippet-config') {
+          selected = ['snippet', 'config'];
+          continue;
+        }
 
         if (selected.length === 0) {
           console.log(chalk.gray('未选择任何内容。\n'));
@@ -339,7 +347,8 @@ function copyIcon(variantDir, versionDir, brandDir, cwd) {
   } catch (_) {}
   for (const src of candidates) {
     if (fs.existsSync(src)) {
-      const dest = copyFileToCwd(src, cwd, 'favicon.ico');
+      const dest = path.join(cwd, 'favicon.ico');
+      fs.copyFileSync(src, dest);
       return dest;
     }
   }

package/src/view.js

@@ -634,7 +634,8 @@ async function interactiveBrowse(edmDir, startParsed) {
             ];
             for (const isrc of iconSrcs) {
               if (fs.existsSync(isrc)) {
-                const idest = copyFileSafe(isrc, path.join(cwd, 'favicon.ico'));
+                const idest = path.join(cwd, 'favicon.ico');
+                fs.copyFileSync(isrc, idest);
                 console.log(`   ${chalk.cyan('·')} ${cwdRel(idest)}  ${chalk.gray('(图标, ' + fmtBytes(fs.statSync(idest).size) + ')')}`);
                 break;
               }