juice-email-cli 2.3.12 → 2.3.14

package/package.json

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

package/src/snippet.js

@@ -772,12 +772,23 @@ async function runSnippetMode({ snippet, template, config: cliConfigPath, output
     // 命令行完整指定（-s + -f），自动检测
     priorityConfigPath = findLocalConfig(snippetDir) || findLocalConfig(process.cwd());
   } else {
-    // 交互模式（只有 -s），收集 CWD + 片段目录配置
-    const configs = collectConfigs([
-      { dir: snippetDir, label: path.basename(snippetDir), markOptimal: true },
-      { dir: process.cwd(), label: '当前目录' },
-    ]);
-    const configChoice = await promptConfig(configs);
+    // 交互模式（只有 -s），列出片段目录下的全部配置
+    let configs = findConfigs(snippetDir, path.basename(snippetDir));
+    // If -c also specified, collect from its directory too
+    let preferredPath = null;
+    if (cliConfigPath) {
+      preferredPath = path.resolve(cliConfigPath);
+      if (fs.existsSync(preferredPath)) {
+        const cfgDir = path.dirname(preferredPath);
+        if (path.resolve(cfgDir) !== path.resolve(snippetDir)) {
+          configs = [
+            ...findConfigs(cfgDir, path.basename(cfgDir)),
+            ...configs,
+          ];
+        }
+      }
+    }
+    const configChoice = await promptConfig(configs, preferredPath);
     priorityConfigPath = (configChoice.type === 'file') ? configChoice.path : null;
   }
 
@@ -880,9 +891,25 @@ async function runInteractiveMode({ config: cliConfigPath }) {
     return;
   }
 
-  // 5. 选择配置文件
-  const configs = findConfigs(variant.path, path.basename(variant.path));
-  const configChoice = await promptConfig(configs, cliConfigPath);
+  // 5. 选择配置文件 — 收集：变体目录 + 指定配置的目录
+  let configs = findConfigs(variant.path, path.basename(variant.path));
+
+  let preferredPath = null;
+  if (cliConfigPath) {
+    preferredPath = path.resolve(cliConfigPath);
+    if (fs.existsSync(preferredPath)) {
+      const cfgDir = path.dirname(preferredPath);
+      // Collect from specified config's directory if different from variant dir
+      if (path.resolve(cfgDir) !== path.resolve(variant.path)) {
+        configs = [
+          ...findConfigs(cfgDir, path.basename(cfgDir)),
+          ...configs,
+        ];
+      }
+    }
+  }
+
+  const configChoice = await promptConfig(configs, preferredPath);
 
   let priorityConfigPath = null;
   let configFileName = '(跳过)';