juice-email-cli 2.3.2 → 2.3.3

package/package.json

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

@@ -228,7 +228,7 @@ function registerSubCommands(containerPath, kind, nodePath, scriptPath, iconPath
     const viewKey = `${containerPath}\\shell\\${SUBCMDS.viewEdm}`;
     regAdd(viewKey, 'MUIVerb', 'REG_SZ', '📦 查看资源列表');
     regAdd(viewKey, 'Icon', 'REG_SZ', iconPath);
-    regAdd(`${viewKey}\\command`, '', 'REG_SZ', wrapInteractive(nodePath, scriptPath, 'view'));
+    regAdd(`${viewKey}\\command`, '', 'REG_SZ', wrapWithPause(nodePath, scriptPath, 'view'));
 
     const viewIntKey = `${containerPath}\\shell\\${SUBCMDS.viewEdmInt}`;
     regAdd(viewIntKey, 'MUIVerb', 'REG_SZ', '📋 浏览资源库');
@@ -246,52 +246,71 @@ function registerSubCommands(containerPath, kind, nodePath, scriptPath, iconPath
   }
 }
 
+// ─── 非交互命令包装（始终暂停以便用户查看输出）─────────────────────────────────
+
+function wrapWithPause(nodePath, scriptPath, cliArgs) {
+  const node = nodePath.replace(/'/g, "''");
+  const script = scriptPath.replace(/'/g, "''");
+  const ps = [
+    `& '${node}' '${script}' ${cliArgs}`,
+    `Write-Host ''`,
+    `Read-Host 'Press Enter to close'`,
+  ].join('; ');
+  return `powershell.exe -Command "${ps}"`;
+}
+
 // ─── 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.
+ */
 function registerDirBgMenus(nodePath, scriptPath, iconPath, pwshPath) {
-  // Register directory container subcommands
-  const dirContainer = `${HKCU_SHELL}\\${SUB_CMDS_CONTAINER_DIR}`;
-  const bgContainer = `${HKCU_SHELL}\\${SUB_CMDS_CONTAINER_BG}`;
+  const roots = [
+    `${HKCU_SHELL}\\Directory\\shell`,
+    `${HKCU_SHELL}\\Directory\\Background\\shell`,
+  ];
 
-  for (const containerPath of [dirContainer, bgContainer]) {
+  // 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 = `${containerPath}\\shell\\${SUBCMDS.initEdm}`;
+    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 = `${containerPath}\\shell\\${SUBCMDS.viewEdm}`;
+    const viewKey = `${root}\\JuiceEmail.View`;
     regAdd(viewKey, 'MUIVerb', 'REG_SZ', '📦 查看资源列表');
     regAdd(viewKey, 'Icon', 'REG_SZ', iconPath);
-    regAdd(`${viewKey}\\command`, '', 'REG_SZ', wrapInteractive(nodePath, scriptPath, 'view'));
+    regAdd(`${viewKey}\\command`, '', 'REG_SZ', wrapWithPause(nodePath, scriptPath, 'view'));
 
     // 📋 浏览资源库
-    const viewIntKey = `${containerPath}\\shell\\${SUBCMDS.viewEdmInt}`;
-    regAdd(viewIntKey, 'MUIVerb', 'REG_SZ', '📋 浏览资源库');
-    regAdd(viewIntKey, 'Icon', 'REG_SZ', iconPath);
-    regAdd(`${viewIntKey}\\command`, '', 'REG_SZ', wrapInteractive(nodePath, scriptPath, 'view -i'));
+    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 = `${containerPath}\\shell\\${SUBCMDS.pwsh}`;
+      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 '%1'"`);
+        `"${pwshPath}" -NoExit -Command "Set-Location -LiteralPath '%V'"`);
     }
   }
-
-  // Parent keys: Directory and Directory\Background
-  const dirParent = `${HKCU_SHELL}\\Directory\\shell\\${PARENT_KEY_NAME}`;
-  regAdd(dirParent, 'MUIVerb', 'REG_SZ', '📧 juice 邮件工具');
-  regAdd(dirParent, 'Icon', 'REG_SZ', iconPath);
-  regAdd(dirParent, 'ExtendedSubCommandsKey', 'REG_SZ', SUB_CMDS_CONTAINER_DIR);
-
-  const bgParent = `${HKCU_SHELL}\\Directory\\Background\\shell\\${PARENT_KEY_NAME}`;
-  regAdd(bgParent, 'MUIVerb', 'REG_SZ', '📧 juice 邮件工具');
-  regAdd(bgParent, 'Icon', 'REG_SZ', iconPath);
-  regAdd(bgParent, 'ExtendedSubCommandsKey', 'REG_SZ', SUB_CMDS_CONTAINER_BG);
 }
 
 // ─── 注册 ─────────────────────────────────────────────────────────────────────
@@ -373,11 +392,10 @@ async function registerContextMenu() {
     `      ├── 📋 浏览资源库                →  juice view -i\n` +
     (pwshPath ? `      └── 📂 打开 PowerShell\n` : '') +
     `\n  ${chalk.bold('文件夹 / 空白处')} 右键：\n` +
-    `    ${chalk.bold('📧 juice 邮件工具')}\n` +
-    `      ├── 📥 从资源库拷贝到此处         →  juice init\n` +
-    `      ├── 📦 查看资源列表              →  juice view\n` +
-    `      ├── 📋 浏览资源库                →  juice view -i\n` +
-    (pwshPath ? `      └── 📂 在此打开终端\n` : '') +
+    `      📥 从资源库拷贝到此处         →  juice init\n` +
+    `      📦 查看资源列表              →  juice view\n` +
+    `      📋 浏览资源库                →  juice view -i\n` +
+    (pwshPath ? `      📂 在此打开终端\n` : '') +
     '\n' +
     chalk.gray('  注意：如菜单未出现，请重启文件资源管理器（explorer.exe）。\n')
   );
@@ -395,22 +413,35 @@ async function unregisterContextMenu() {
 
   let removed = 0;
 
-  // 清理 HKCU 父菜单（4 个文件类型 + Directory + Background）
+  // 清理 HKCU 父菜单（文件类型）
   const allRoots = [
     ...HTML_ROOTS,
     ...YAML_ROOTS,
-    `${HKCU_SHELL}\\Directory\\shell`,
-    `${HKCU_SHELL}\\Directory\\Background\\shell`,
   ];
   for (const root of allRoots) {
     if (regDelete(`${root}\\${PARENT_KEY_NAME}`)) removed++;
   }
 
-  // 清理所有子命令容器
+  // 清理 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)
+  for (const root of dirBgRoots) {
+    for (const key of dirBgKeys) {
+      if (regDelete(`${root}\\${key}`)) removed++;
+    }
+  }
+
+  // 清理所有子命令容器（含旧版 Dir/Bg 容器）
   if (regDelete(`${HKCU_SHELL}\\${SUB_CMDS_CONTAINER_HTML}`)) removed++;
   if (regDelete(`${HKCU_SHELL}\\${SUB_CMDS_CONTAINER_YAML}`)) removed++;
   if (regDelete(`${HKCU_SHELL}\\${SUB_CMDS_CONTAINER_DIR}`)) removed++;
   if (regDelete(`${HKCU_SHELL}\\${SUB_CMDS_CONTAINER_BG}`)) removed++;
+  if (regDelete(`${HKCU_SHELL}\\${SUB_CMDS_CONTAINER_DIR}`)) removed++;
+  if (regDelete(`${HKCU_SHELL}\\${SUB_CMDS_CONTAINER_BG}`)) removed++;
 
   // 清理旧版共享容器（v2.1.14 之前只有一个容器）
   regDelete(`${HKCU_SHELL}\\JuiceEmail.SubCommands`);

package/src/view.js

@@ -420,20 +420,6 @@ async function interactiveBrowse(edmDir, startParsed) {
             description: allSeries.length + ' 个系列',
           });
         }
-
-        // Copy options
-        if (versions.length > 0) {
-          choices.push({
-            name: '📥 拷贝模板到当前目录',
-            value: { action: 'copy-template' },
-          });
-        }
-        if (allSeries.length > 0) {
-          choices.push({
-            name: '📥 拷贝配置到当前目录',
-            value: { action: 'copy-config-brand' },
-          });
-        }
         break;
       }
 
@@ -511,27 +497,15 @@ async function interactiveBrowse(edmDir, startParsed) {
         if (infoLines.length > 0) {
           console.log(chalk.dim('\n  ' + infoLines.join('\n  ') + '\n'));
         }
-        // Copy actions
-        if (fs.existsSync(snipPath)) {
-          choices.push({
-            name: '📥 拷贝片段到当前目录',
-            value: { action: 'copy-snippet' },
-          });
-        }
-        if (configs.length > 0) {
-          choices.push({
-            name: '📥 拷贝配置到当前目录',
-            value: { action: 'copy-config' },
-          });
-        }
-        // Also allow copying the template
+        // Multi-select copy
+        const hasResources = fs.existsSync(snipPath) || configs.length > 0;
         let versions;
         const brandDir = path.join(edmDir, current.brand);
         try { versions = findTemplateVersions(brandDir); } catch (_) { versions = []; }
-        if (versions.length > 0) {
+        if (hasResources || versions.length > 0) {
           choices.push({
-            name: '📥 拷贝模板到当前目录',
-            value: { action: 'copy-template' },
+            name: '📥 拷贝到当前目录',
+            value: { action: 'copy-multi' },
           });
         }
         break;
@@ -558,125 +532,95 @@ async function interactiveBrowse(edmDir, startParsed) {
 
     // Copy actions
     if (result.action === 'copy-template') {
-      let tplPath;
-      if (current.level === 'brand') {
-        const brandDir = path.join(edmDir, current.brand);
-        const versions = findTemplateVersions(brandDir);
-        if (versions.length === 1) {
-          tplPath = versions[0].templatePath;
-        } else {
-          // Let user pick which template version
-          const tplChoices = versions.map(v => ({
-            name: formatName(v.meta, v.name) + formatDesc(v.meta),
-            value: v.templatePath,
-          }));
-          tplPath = await showMenu('选择要拷贝的模板版本', tplChoices);
-        }
-      } else if (current.templatePath) {
-        tplPath = current.templatePath;
-      } else if (current.versionData) {
-        tplPath = current.versionData.templatePath;
-      } else {
-        const brandDir = path.join(edmDir, current.brand);
-        const versions = findTemplateVersions(brandDir);
-        if (versions.length === 0) continue;
-        if (versions.length === 1) {
-          tplPath = versions[0].templatePath;
-        } else {
-          const tplChoices = versions.map(v => ({
-            name: formatName(v.meta, v.name) + formatDesc(v.meta),
-            value: v.templatePath,
-          }));
-          tplPath = await showMenu('选择要拷贝的模板版本', tplChoices);
-        }
-      }
-      if (tplPath) {
+      const v = current.versionData;
+      if (v && v.templatePath) {
         console.log();
-        await copyResource('template', tplPath, process.cwd());
+        await copyResource('template', v.templatePath, process.cwd());
         console.log();
       }
       continue;
     }
 
-    if (result.action === 'copy-snippet') {
+    if (result.action === 'copy-multi') {
+      const brandDir = path.join(edmDir, current.brand);
+      const copyItems = [];
+
+      // Template
+      let versions;
+      try { versions = findTemplateVersions(brandDir); } catch (_) { versions = []; }
+      if (versions.length > 0) {
+        const tplPath = versions[0].templatePath;
+        copyItems.push({
+          name: '📋 模板 HTML',
+          value: 'template',
+          description: path.basename(tplPath),
+          checked: true,
+        });
+      }
+
+      // Snippet
       const snipPath = path.join(current.variantData.path, 'snippet.html');
       if (fs.existsSync(snipPath)) {
-        console.log();
-        await copyResource('snippet', snipPath, process.cwd());
-        console.log();
+        copyItems.push({
+          name: '🧩 片段 HTML',
+          value: 'snippet',
+          description: path.basename(snipPath),
+          checked: true,
+        });
       }
-      continue;
-    }
 
-    if (result.action === 'copy-config') {
+      // Config
       const configs = findConfigs(current.variantData.path);
-      if (configs.length === 1) {
-        console.log();
-        await copyResource('config', configs[0].path, process.cwd());
-        console.log();
-      } else if (configs.length > 1) {
-        const cfgChoices = configs.map(c => ({
-          name: c.isOptimal ? c.name + chalk.green(' (最优配对)') : c.name,
-          value: c.path,
-        }));
-        const cfgPath = await showMenu('选择要拷贝的配置文件', cfgChoices);
-        if (cfgPath) {
-          console.log();
-          await copyResource('config', cfgPath, process.cwd());
-          console.log();
-        }
-      }
-      continue;
-    }
-
-    if (result.action === 'copy-config-brand') {
-      // From brand level: pick series → variant → config
-      const brandDir = path.join(edmDir, current.brand);
-      const allSeries = findSeriesDirs(brandDir);
-      if (allSeries.length === 0) continue;
-
-      let series;
-      if (allSeries.length === 1) {
-        series = allSeries[0];
-      } else {
-        const sChoices = allSeries.map(s => ({
-          name: formatName(s.meta, s.name) + formatDesc(s.meta),
-          value: s,
-        }));
-        series = await showMenu('选择系列', sChoices);
+      if (configs.length > 0) {
+        copyItems.push({
+          name: '⚙️ 配置文件',
+          value: 'config',
+          description: configs.map(c => c.name).join(', '),
+          checked: true,
+        });
       }
-      if (!series) continue;
 
-      const variants = findSnippetVariants(series.path);
-      if (variants.length === 0) continue;
-      let variant;
-      if (variants.length === 1) {
-        variant = variants[0];
-      } else {
-        const vChoices = variants.map(v => ({
-          name: formatName(v.meta, v.name) + formatDesc(v.meta),
-          value: v,
-        }));
-        variant = await showMenu('选择变体', vChoices);
-      }
-      if (!variant) continue;
+      if (copyItems.length > 0) {
+        const { checkbox } = await import('@inquirer/prompts');
+        const selected = await checkbox({
+          message: '选择要拷贝的内容：',
+          choices: copyItems,
+        });
 
-      const configs = findConfigs(variant.path);
-      if (configs.length === 0) continue;
-      let cfgPath;
-      if (configs.length === 1) {
-        cfgPath = configs[0].path;
-      } else {
-        const cfgChoices = configs.map(c => ({
-          name: c.isOptimal ? c.name + chalk.green(' (最优配对)') : c.name,
-          value: c.path,
-        }));
-        cfgPath = await showMenu('选择配置文件', cfgChoices);
-      }
-      if (cfgPath) {
-        console.log();
-        await copyResource('config', cfgPath, process.cwd());
-        console.log();
+        if (selected.length > 0) {
+          const defaultBaseName = `${current.brand}-${current.series}-${current.variant}`;
+          const { promptOutputName: pn } = require('./snippet');
+          const outputBaseName = await pn(defaultBaseName, process.cwd());
+          const cwd = process.cwd();
+          const cwdRel = (p) => './' + path.relative(cwd, p);
+
+          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) + ')')}`);
+          }
+          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) + ')')}`);
+          }
+          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) + ')')}`);
+            }
+          }
+          console.log();
+        }
       }
       continue;
     }