juice-email-cli 2.3.3 → 2.3.4

package/bin/juice.js

@@ -103,6 +103,7 @@ program
   .option('-t, --template <file-path>', '仅拷贝模板 HTML 文件')
   .option('-s, --snippet <file-path>', '仅拷贝片段 HTML 文件')
   .option('-c, --config <file-path>', '仅拷贝配置 YAML 文件')
+  .option('--all [target]', '拷贝整个 EDM 资源目录到当前或指定目录')
   .action(async (initPath, options) => {
     const { runInitMode } = require('../src/init');
     await runInitMode({
@@ -110,6 +111,7 @@ program
       template: options.template || null,
       snippet: options.snippet || null,
       config: options.config || null,
+      all: options.all !== undefined ? (options.all || true) : null,
     });
   });
 

package/package.json

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

package/src/context-menu.js

@@ -262,54 +262,60 @@ function wrapWithPause(nodePath, scriptPath, cliArgs) {
 // ─── Directory / Background 菜单注册 ──────────────────────────────────────────
 
 /**
- * Register individual shell commands for Directory and Directory\Background.
- * ExtendedSubCommandsKey doesn't work reliably for non-file-type associations,
- * so we register each item as a standalone shell verb.
+ * Register Directory and Background right-click menus using SubCommands
+ * + CommandStore (same format as file-type menus for consistent UX).
  */
 function registerDirBgMenus(nodePath, scriptPath, iconPath, pwshPath) {
+  const node = nodePath.replace(/'/g, "''");
+  const script = scriptPath.replace(/'/g, "''");
+
+  // CommandStore subcommand names
+  const DIR_VIEW    = 'JuiceEmailDir.View';
+  const DIR_COPYALL = 'JuiceEmailDir.CopyAll';
+  const DIR_COPYPICK= 'JuiceEmailDir.CopyPick';
+  const DIR_PWSH    = 'JuiceEmailDir.Pwsh';
+
+  // Helper: register a CommandStore entry
+  function regCmd(name, label, psCmd) {
+    const cmdKey = `${HKCU_SHELL}\\${name}`;
+    regAdd(cmdKey, 'MUIVerb', 'REG_SZ', label);
+    regAdd(cmdKey, 'Icon', 'REG_SZ', iconPath);
+    // Always pause so user can see output
+    const fullPs = `${psCmd}; Write-Host ''; Read-Host 'Press Enter to close'`;
+    regAdd(`${cmdKey}\\command`, '', 'REG_SZ', `powershell.exe -Command "${fullPs}"`);
+  }
+
+  // View: non-interactive, no directory dependency
+  regCmd(DIR_VIEW, '📋 查看可用资源', `& '${node}' '${script}' view`);
+
+  // CopyAll: copy entire EDM to clicked directory
+  regCmd(DIR_COPYALL, '📦 拷贝全部资源', `& '${node}' '${script}' init --all '%V'`);
+
+  // CopyPick: interactive, cd to directory first so output lands there
+  regCmd(DIR_COPYPICK, '📥 选择资源拷贝', `Set-Location '%V'; & '${node}' '${script}' init`);
+
+  // Pwsh
+  if (pwshPath) {
+    const pwshKey = `${HKCU_SHELL}\\${DIR_PWSH}`;
+    regAdd(pwshKey, 'MUIVerb', 'REG_SZ', '📂 在此打开终端');
+    regAdd(pwshKey, 'Icon', 'REG_SZ', pwshPath);
+    regAdd(`${pwshKey}\\command`, '', 'REG_SZ',
+      `"${pwshPath}" -NoExit -Command "Set-Location -LiteralPath '%V'"`);
+  }
+
+  // Build SubCommands string
+  const subCmds = [DIR_VIEW, DIR_COPYALL, DIR_COPYPICK];
+  if (pwshPath) subCmds.push(DIR_PWSH);
+
+  // Parent keys: Directory + Directory\Background
   const roots = [
     `${HKCU_SHELL}\\Directory\\shell`,
     `${HKCU_SHELL}\\Directory\\Background\\shell`,
   ];
-
-  // First, clean up old keys from all previous versions to prevent stale entries
   for (const root of roots) {
-    // Old parent key (ExtendedSubCommandsKey approach, v2.x commit 3fc761e)
-    regDelete(`${root}\\${PARENT_KEY_NAME}`);
-    // Old individual entries from any prior version
-    regDelete(`${root}\\JuiceEmail.Init`);
-    regDelete(`${root}\\JuiceEmail.View`);
-    regDelete(`${root}\\JuiceEmail.Browse`);
-    regDelete(`${root}\\JuiceEmail.Pwsh`);
-  }
-
-  for (const root of roots) {
-    // 📥 从资源库拷贝到此处
-    const initKey = `${root}\\JuiceEmail.Init`;
-    regAdd(initKey, 'MUIVerb', 'REG_SZ', '📥 从资源库拷贝到此处');
-    regAdd(initKey, 'Icon', 'REG_SZ', iconPath);
-    regAdd(`${initKey}\\command`, '', 'REG_SZ', wrapInteractive(nodePath, scriptPath, 'init'));
-
-    // 📦 查看资源列表
-    const viewKey = `${root}\\JuiceEmail.View`;
-    regAdd(viewKey, 'MUIVerb', 'REG_SZ', '📦 查看资源列表');
-    regAdd(viewKey, 'Icon', 'REG_SZ', iconPath);
-    regAdd(`${viewKey}\\command`, '', 'REG_SZ', wrapWithPause(nodePath, scriptPath, 'view'));
-
-    // 📋 浏览资源库
-    const browseKey = `${root}\\JuiceEmail.Browse`;
-    regAdd(browseKey, 'MUIVerb', 'REG_SZ', '📋 浏览资源库');
-    regAdd(browseKey, 'Icon', 'REG_SZ', iconPath);
-    regAdd(`${browseKey}\\command`, '', 'REG_SZ', wrapInteractive(nodePath, scriptPath, 'view -i'));
-
-    // 📂 在此打开终端
-    if (pwshPath) {
-      const pwshKey = `${root}\\JuiceEmail.Pwsh`;
-      regAdd(pwshKey, 'MUIVerb', 'REG_SZ', '📂 在此打开终端');
-      regAdd(pwshKey, 'Icon', 'REG_SZ', pwshPath);
-      regAdd(`${pwshKey}\\command`, '', 'REG_SZ',
-        `"${pwshPath}" -NoExit -Command "Set-Location -LiteralPath '%V'"`);
-    }
+    regAdd(`${root}\\${PARENT_KEY_NAME}`, 'MUIVerb', 'REG_SZ', '📧 用 juice 生成邮件 HTML');
+    regAdd(`${root}\\${PARENT_KEY_NAME}`, 'Icon', 'REG_SZ', iconPath);
+    regAdd(`${root}\\${PARENT_KEY_NAME}`, 'SubCommands', 'REG_SZ', subCmds.join(';'));
   }
 }
 
@@ -367,8 +373,20 @@ async function registerContextMenu() {
     regAdd(parentKey, 'ExtendedSubCommandsKey', 'REG_SZ', SUB_CMDS_CONTAINER_YAML);
   }
 
-  // Directory / Background → 独立容器
+  // Directory / Background → 子菜单（SubCommands + CommandStore）
   console.log(chalk.gray('  注册文件夹/空白处菜单...'));
+  // Clean up old individual entries from v2.3.x before registering new format
+  for (const root of [`${HKCU_SHELL}\\Directory\\shell`, `${HKCU_SHELL}\\Directory\\Background\\shell`]) {
+    regDelete(`${root}\\${PARENT_KEY_NAME}`);
+    regDelete(`${root}\\JuiceEmail.Init`);
+    regDelete(`${root}\\JuiceEmail.View`);
+    regDelete(`${root}\\JuiceEmail.Browse`);
+    regDelete(`${root}\\JuiceEmail.Pwsh`);
+  }
+  // Clean up old CommandStore entries for Dir menu (from any prior version)
+  for (const name of ['JuiceEmailDir.View', 'JuiceEmailDir.CopyAll', 'JuiceEmailDir.CopyPick', 'JuiceEmailDir.Pwsh']) {
+    regDelete(`${HKCU_SHELL}\\${name}`);
+  }
   registerDirBgMenus(nodePath, scriptPath, iconPath, pwshPath);
 
   if (!ok) {
@@ -392,10 +410,11 @@ async function registerContextMenu() {
     `      ├── 📋 浏览资源库                →  juice view -i\n` +
     (pwshPath ? `      └── 📂 打开 PowerShell\n` : '') +
     `\n  ${chalk.bold('文件夹 / 空白处')} 右键：\n` +
-    `      📥 从资源库拷贝到此处         →  juice init\n` +
-    `      📦 查看资源列表              →  juice view\n` +
-    `      📋 浏览资源库                →  juice view -i\n` +
-    (pwshPath ? `      📂 在此打开终端\n` : '') +
+    `    ${chalk.bold('📧 用 juice 生成邮件 HTML')}\n` +
+    `      ├── 📋 查看可用资源             →  juice view\n` +
+    `      ├── 📦 拷贝全部资源             →  juice init --all\n` +
+    `      ├── 📥 选择资源拷贝             →  juice init\n` +
+    (pwshPath ? `      └── 📂 在此打开终端\n` : '') +
     '\n' +
     chalk.gray('  注意：如菜单未出现，请重启文件资源管理器（explorer.exe）。\n')
   );
@@ -422,18 +441,22 @@ async function unregisterContextMenu() {
     if (regDelete(`${root}\\${PARENT_KEY_NAME}`)) removed++;
   }
 
-  // 清理 Directory / Background 独立菜单项 + 旧版父键
+  // 清理 Directory / Background 父菜单 + 旧版独立条目
   const dirBgRoots = [
     `${HKCU_SHELL}\\Directory\\shell`,
     `${HKCU_SHELL}\\Directory\\Background\\shell`,
   ];
-  const dirBgKeys = ['JuiceEmail.Init', 'JuiceEmail.View', 'JuiceEmail.Browse', 'JuiceEmail.Pwsh',
-                      PARENT_KEY_NAME];  // PARENT_KEY_NAME = 'JuiceEmail' (old ExtendedSubCommandsKey parent)
+  // New parent key + old individual entries from v2.3.x
+  const dirBgKeys = [PARENT_KEY_NAME, 'JuiceEmail.Init', 'JuiceEmail.View', 'JuiceEmail.Browse', 'JuiceEmail.Pwsh'];
   for (const root of dirBgRoots) {
     for (const key of dirBgKeys) {
       if (regDelete(`${root}\\${key}`)) removed++;
     }
   }
+  // CommandStore entries for Dir menus
+  for (const name of ['JuiceEmailDir.View', 'JuiceEmailDir.CopyAll', 'JuiceEmailDir.CopyPick', 'JuiceEmailDir.Pwsh']) {
+    if (regDelete(`${HKCU_SHELL}\\${name}`)) removed++;
+  }
 
   // 清理所有子命令容器（含旧版 Dir/Bg 容器）
   if (regDelete(`${HKCU_SHELL}\\${SUB_CMDS_CONTAINER_HTML}`)) removed++;

package/src/init.js

@@ -71,8 +71,7 @@ function deriveDefaultName(filePath) {
 async function directCopy(srcPath, cwd) {
   const resolved = path.resolve(srcPath);
   if (!fs.existsSync(resolved)) {
-    console.error(chalk.red(`\n  ✘ 文件不存在：${resolved}\n`));
-    process.exit(1);
+    throw new Error(`文件不存在：${resolved}`);
   }
 
   const destName = await promptOutputName(
@@ -231,9 +230,110 @@ async function interactiveInit(edmDir, cwd) {
 
 // ─── Main Entry ──────────────────────────────────────────────────────────────
 
-async function runInitMode({ initPath, template, snippet, config }) {
+function copyDir(src, dest) {
+  fs.mkdirSync(dest, { recursive: true });
+  for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
+    const srcPath = path.join(src, entry.name);
+    const destPath = path.join(dest, entry.name);
+    if (entry.isDirectory()) {
+      copyDir(srcPath, destPath);
+    } else {
+      fs.copyFileSync(srcPath, destPath);
+    }
+  }
+}
+
+function dirSize(dir) {
+  let size = 0;
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    const p = path.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      size += dirSize(p);
+    } else {
+      size += fs.statSync(p).size;
+    }
+  }
+  return size;
+}
+
+function countFiles(dir) {
+  let count = 0;
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    if (entry.isDirectory()) {
+      count += countFiles(path.join(dir, entry.name));
+    } else {
+      count++;
+    }
+  }
+  return count;
+}
+
+function findNextEdmVersion(targetDir) {
+  let v = 1;
+  while (true) {
+    const candidate = path.join(targetDir, 'edm-v' + v);
+    if (!fs.existsSync(candidate)) return candidate;
+    v++;
+  }
+}
+
+async function runInitMode({ initPath, template, snippet, config, all }) {
   const cwd = process.cwd();
 
+  // --all: copy entire EDM directory
+  if (all) {
+    let edmDir;
+    try {
+      edmDir = resolveEdmDir();
+    } catch (err) {
+      console.error(chalk.red(`\n  ✘ ${err.message}\n`));
+      process.exit(1);
+    }
+    const target = all === true ? cwd : path.resolve(all);
+    const destDir = path.join(target, 'edm');
+
+    // Prevent deleting the source when target overlaps
+    if (path.resolve(edmDir) === path.resolve(destDir)) {
+      console.log(chalk.yellow('目标目录与 EDM 资源库相同，无需拷贝。\n'));
+      return;
+    }
+    console.log(chalk.cyan(`\n  拷贝 EDM 资源库...`));
+    console.log(chalk.gray(`  源：${edmDir}`));
+    console.log(chalk.gray(`  目标：${destDir}`));
+
+    if (fs.existsSync(destDir)) {
+      const { select } = await import('@inquirer/prompts');
+      const vName = findNextEdmVersion(target);
+      const action = await select({
+        message: `目录 ${destDir} 已存在：`,
+        choices: [
+          { name: '覆盖', value: 'overwrite' },
+          { name: `自动版本号（${path.basename(vName)}）`, value: 'version' },
+          { name: '取消', value: 'cancel' },
+        ],
+      });
+      if (action === 'cancel') {
+        console.log(chalk.gray('已取消。\n'));
+        return;
+      }
+      if (action === 'version') {
+        copyDir(edmDir, vName);
+        const edmSize = dirSize(vName);
+        const fileCount = countFiles(vName);
+        console.log(chalk.green(`\n✔ 已拷贝 EDM 资源库 → ${path.basename(vName)}（${fileCount} 个文件，${fmtBytes(edmSize)}）\n`));
+        return;
+      }
+      // overwrite: remove and replace
+      fs.rmSync(destDir, { recursive: true, force: true });
+    }
+
+    copyDir(edmDir, destDir);
+    const edmSize = dirSize(destDir);
+    const fileCount = countFiles(destDir);
+    console.log(chalk.green(`\n✔ 已拷贝 EDM 资源库（${fileCount} 个文件，${fmtBytes(edmSize)}）\n`));
+    return;
+  }
+
   // Direct copy modes
   if (template) {
     await directCopy(template, cwd);

package/src/view.js

@@ -12,6 +12,27 @@ function fmtBytes(b) {
   return b < 1024 ? `${b} B` : `${(b / 1024).toFixed(1)} KB`;
 }
 
+/**
+ * Copy src to dest, auto-versioning (-v1, -v2, ...) if dest exists.
+ * Returns the actual destination path used.
+ */
+function copyFileSafe(srcPath, destPath) {
+  if (!fs.existsSync(destPath)) {
+    fs.copyFileSync(srcPath, destPath);
+    return destPath;
+  }
+  const parsed = path.parse(destPath);
+  let v = 1;
+  while (true) {
+    const alt = path.join(parsed.dir, parsed.name + '-v' + v + parsed.ext);
+    if (!fs.existsSync(alt)) {
+      fs.copyFileSync(srcPath, alt);
+      return alt;
+    }
+    v++;
+  }
+}
+
 // ─── Path Parser ──────────────────────────────────────────────────────────────
 
 /**
@@ -327,13 +348,17 @@ async function showCheckbox(title, choices) {
  * Trigger copy via the init module.
  */
 async function copyResource(type, resourcePath, cwd) {
-  const { runInitMode } = require('./init');
-  if (type === 'template') {
-    await runInitMode({ template: resourcePath });
-  } else if (type === 'snippet') {
-    await runInitMode({ snippet: resourcePath });
-  } else if (type === 'config') {
-    await runInitMode({ config: resourcePath });
+  try {
+    const { runInitMode } = require('./init');
+    if (type === 'template') {
+      await runInitMode({ template: resourcePath });
+    } else if (type === 'snippet') {
+      await runInitMode({ snippet: resourcePath });
+    } else if (type === 'config') {
+      await runInitMode({ config: resourcePath });
+    }
+  } catch (err) {
+    console.error(chalk.red(`  ✘ 拷贝失败：${err.message}`));
   }
 }
 
@@ -551,7 +576,7 @@ async function interactiveBrowse(edmDir, startParsed) {
       if (versions.length > 0) {
         const tplPath = versions[0].templatePath;
         copyItems.push({
-          name: '📋 模板 HTML',
+          name: `📋 模板 HTML（${versions[0].meta.name || versions[0].name}）`,
           value: 'template',
           description: path.basename(tplPath),
           checked: true,
@@ -588,7 +613,9 @@ async function interactiveBrowse(edmDir, startParsed) {
         });
 
         if (selected.length > 0) {
-          const defaultBaseName = `${current.brand}-${current.series}-${current.variant}`;
+          // Include template version in default name for clarity
+          const versionName = versions.length > 0 ? versions[0].name : 'template';
+          const defaultBaseName = `${current.brand}-${versionName}-${current.series}-${current.variant}`;
           const { promptOutputName: pn } = require('./snippet');
           const outputBaseName = await pn(defaultBaseName, process.cwd());
           const cwd = process.cwd();
@@ -596,28 +623,22 @@ async function interactiveBrowse(edmDir, startParsed) {
 
           console.log(chalk.green('\n✔ 已拷贝：'));
           if (selected.includes('template') && versions.length > 0) {
-            const tplPath = versions[0].templatePath;
-            const dest = path.join(cwd, outputBaseName + path.extname(tplPath));
-            fs.copyFileSync(tplPath, dest);
-            console.log(`   ${chalk.cyan('·')} ${cwdRel(dest)}  ${chalk.gray('(模板, ' + fmtBytes(fs.statSync(dest).size) + ')')}`);
+            const src = versions[0].templatePath;
+            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) + ')')}`);
           }
           if (selected.includes('snippet') && fs.existsSync(snipPath)) {
             const dest = path.join(cwd, outputBaseName + '-snippet' + path.extname(snipPath));
-            fs.copyFileSync(snipPath, dest);
-            console.log(`   ${chalk.cyan('·')} ${cwdRel(dest)}  ${chalk.gray('(片段, ' + fmtBytes(fs.statSync(dest).size) + ')')}`);
+            const actual = copyFileSafe(snipPath, dest);
+            console.log(`   ${chalk.cyan('·')} ${cwdRel(actual)}  ${chalk.gray('(片段, ' + fmtBytes(fs.statSync(actual).size) + ')')}`);
           }
           if (selected.includes('config') && configs.length > 0) {
             const optimal = configs.find(c => c.isOptimal);
             const cfgPath = optimal ? optimal.path : configs[0].path;
             const dest = path.join(cwd, 'juice.yaml');
-            if (fs.existsSync(dest)) {
-              const alt = path.join(cwd, 'juice-v1.yaml');
-              fs.copyFileSync(cfgPath, alt);
-              console.log(`   ${chalk.cyan('·')} ${cwdRel(alt)}  ${chalk.gray('(配置, ' + fmtBytes(fs.statSync(alt).size) + ')')}`);
-            } else {
-              fs.copyFileSync(cfgPath, dest);
-              console.log(`   ${chalk.cyan('·')} ${cwdRel(dest)}  ${chalk.gray('(配置, ' + fmtBytes(fs.statSync(dest).size) + ')')}`);
-            }
+            const actual = copyFileSafe(cfgPath, dest);
+            console.log(`   ${chalk.cyan('·')} ${cwdRel(actual)}  ${chalk.gray('(配置, ' + fmtBytes(fs.statSync(actual).size) + ')')}`);
           }
           console.log();
         }