juice-email-cli 2.3.15 → 2.4.1

package/bin/juice.js

@@ -1,34 +1,36 @@
 #!/usr/bin/env node
-'use strict';
+import { Command } from 'commander';
+import { readFileSync } from 'fs';
+import { fileURLToPath } from 'url';
+import { dirname, resolve } from 'path';
+import chalk from 'chalk';
+import { run } from '../src/index.js';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const pkg = JSON.parse(readFileSync(resolve(__dirname, '..', 'package.json'), 'utf8'));
 
-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'));
+  ({ ExitPromptError } = await import('@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}`));
+      console.error('\n' + chalk.red(`  ✘ ${err.message}`));
       if (process.env.DEBUG) console.error(err);
       process.exit(1);
     }
   };
 }
 
+const program = new Command();
+
 program
   .name('juice')
   .description('生成符合各大邮件平台的内联 CSS HTML 邮件（同时输出标准版 + 压缩版）')
@@ -68,6 +70,24 @@ program
   交互模式（逐步选择品牌、模板、片段、配置）：
     juice
 
+════════════════════════════════════════════════════════════════
+  资源浏览
+════════════════════════════════════════════════════════════════
+
+  查看资源树：
+    juice view                      查看所有品牌、模板、系列、片段
+    juice view elabscience          查看指定品牌的模板和系列
+    juice view --templates          列出所有模板
+    juice view --series             列出所有系列
+    juice view --snippets           列出所有片段
+
+  拷贝到当前目录：
+    juice init                      交互式选择并拷贝模板/片段/配置
+    juice init --template <file>    仅拷贝指定模板 HTML
+    juice init --snippet <file>     仅拷贝指定片段 HTML
+    juice init --config <file>      仅拷贝指定配置 YAML
+    juice init --all [target]       拷贝整个 EDM 资源库
+
 ════════════════════════════════════════════════════════════════
   输出文件说明
 ════════════════════════════════════════════════════════════════
@@ -111,7 +131,7 @@ program
   .option('--series', '列出所有系列')
   .option('--snippets', '列出所有片段')
   .action(safeAction(async (viewPath, options) => {
-    const { runViewMode } = require('../src/view');
+    const { runViewMode } = await import('../src/view.js');
     await runViewMode({
       viewPath: viewPath || null,
       interactive: !!options.interactive,
@@ -130,7 +150,7 @@ program
   .option('-c, --config <file-path>', '仅拷贝配置 YAML 文件')
   .option('--all [target]', '拷贝整个 EDM 资源目录到当前或指定目录')
   .action(safeAction(async (initPath, options) => {
-    const { runInitMode } = require('../src/init');
+    const { runInitMode } = await import('../src/init.js');
     await runInitMode({
       initPath: initPath || null,
       template: options.template || null,
@@ -143,21 +163,19 @@ program
 // ─── Default action (backward compatible) ───────────────────────────────
 program
   .action(safeAction(async (options) => {
-    // 注册/卸载右键菜单
     if (options.install) {
-      const { registerContextMenu } = require('../src/context-menu');
+      const { registerContextMenu } = await import('../src/context-menu.js');
       await registerContextMenu();
       return;
     }
     if (options.uninstall) {
-      const { unregisterContextMenu } = require('../src/context-menu');
+      const { unregisterContextMenu } = await import('../src/context-menu.js');
       await unregisterContextMenu();
       return;
     }
 
-    // --snippet / -s 模式：片段组装
     if (options.snippet) {
-      const { runSnippetMode } = require('../src/snippet');
+      const { runSnippetMode } = await import('../src/snippet.js');
       await runSnippetMode({
         snippet: options.snippet,
         template: options.file,
@@ -167,7 +185,6 @@ program
       return;
     }
 
-    // 普通模式：-f 指定文件
     let inputFile = options.file;
     if (!inputFile && program.args.length > 0) {
       inputFile = program.args[0];
@@ -181,10 +198,8 @@ program
       return;
     }
 
-    // 全交互模式：无 --snippet，无 -f
-    const { runInteractiveMode } = require('../src/snippet');
+    const { runInteractiveMode } = await import('../src/snippet.js');
     await runInteractiveMode({ config: options.config });
   }));
 
-program.allowUnknownOption(false);
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "juice-email-cli",
-  "version": "2.3.15",
+  "version": "2.4.1",
+  "type": "module",
   "description": "CLI tool to generate email-client-compatible HTML with juice (CSS inlining) + Mustache templating + minification",
   "main": "src/index.js",
   "bin": {
@@ -36,17 +37,17 @@
     "url": "https://github.com/GuoSirius/juice-cli/issues"
   },
   "dependencies": {
-    "@inquirer/prompts": "^5.0.2",
-    "chalk": "^4.1.2",
-    "commander": "^11.1.0",
+    "@inquirer/prompts": "^8.4.3",
+    "chalk": "^5.6.2",
+    "commander": "^14.0.3",
     "html-minifier-terser": "^7.2.0",
-    "js-yaml": "^4.1.0",
-    "juice": "^10.0.0",
+    "js-yaml": "^4.1.1",
+    "juice": "^11.1.1",
     "mustache": "^4.2.0",
-    "ora": "^5.4.1"
+    "ora": "^9.4.0"
   },
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=24.0.0"
   },
   "files": [
     "bin/",

package/src/context-menu.js

@@ -1,5 +1,3 @@
-'use strict';
-
 /**
  * Windows 右键菜单注册 / 取消注册
  *
@@ -32,10 +30,13 @@
  *       └── 📂 在此打开终端           （可选）
  */
 
-const { spawnSync } = require('child_process');
-const fs = require('fs');
-const path = require('path');
-const chalk = require('chalk');
+import { spawnSync } from 'child_process';
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import chalk from 'chalk';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 // ─── 路径工具 ─────────────────────────────────────────────────────────────────
 
@@ -459,4 +460,4 @@ async function unregisterContextMenu() {
   }
 }
 
-module.exports = { registerContextMenu, unregisterContextMenu };
+export { registerContextMenu, unregisterContextMenu };

package/src/index.js

@@ -1,25 +1,25 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const os = require('os');
-const yaml = require('js-yaml');
-const juice = require('juice');
-const Mustache = require('mustache');
-const chalk = require('chalk');
-const ora = require('ora');
-const { minify: htmlMinify } = require('html-minifier-terser');
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+import { fileURLToPath } from 'url';
+import yaml from 'js-yaml';
+import juice from 'juice';
+import Mustache from 'mustache';
+import chalk from 'chalk';
+import ora from 'ora';
+import { minify as htmlMinify } from 'html-minifier-terser';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 // ─── 从 defaults/juice.yaml 加载默认配置 ─────────────────────────────────────
 
-const DEFAULT_CONFIG_PATH = path.resolve(__dirname, '..', 'defaults', 'juice.yaml');
+export const DEFAULT_CONFIG_PATH = path.resolve(__dirname, '..', 'defaults', 'juice.yaml');
 
 function loadDefaultConfig() {
   try {
     const content = fs.readFileSync(DEFAULT_CONFIG_PATH, 'utf8');
     return yaml.load(content) || {};
   } catch (e) {
-    // 如果 defaults/juice.yaml 不存在，使用内置最小配置
     console.warn(chalk.yellow(`  ⚠  无法加载默认配置 ${DEFAULT_CONFIG_PATH}，使用内置默认值\n`));
     return {};
   }
@@ -27,34 +27,20 @@ function loadDefaultConfig() {
 
 const CODE_DEFAULTS = loadDefaultConfig();
 
-// 用户主目录候选（支持 yaml/yml）
 const HOME_CANDIDATES = [
   path.join(os.homedir(), 'juice.yaml'),
   path.join(os.homedir(), 'juice.yml'),
 ];
 
-function resolveHomeConfig() {
+export function resolveHomeConfig() {
   return HOME_CANDIDATES.find((c) => fs.existsSync(c)) || null;
 }
 
 // ─── 配置文件查找 ─────────────────────────────────────────────────────────────
 
-/**
- * 查找用户配置文件
- *
- * 配置加载顺序（优先级从低到高）：
- *   1. CLI 内置默认值（defaults/juice.yaml）
- *   2. 用户主目录 ~/juice.yaml（如果存在）
- *   3. 优先配置文件（-c 指定 或 输入文件同级目录，二者互斥）
- *
- * 返回：
- *   - highPriorityPath: 高优先级配置路径（-c 指定 或 输入文件同级目录，二者互斥）
- *   - homePath: 用户主目录配置路径（可能不存在）
- */
-function findConfigs(configPath, inputFile) {
+export function findConfigs(configPath, inputFile) {
   let highPriorityPath = null;
 
-  // 1. 优先使用 -c 指定的配置文件
   if (configPath) {
     const resolved = path.resolve(configPath);
     if (!fs.existsSync(resolved)) {
@@ -62,7 +48,6 @@ function findConfigs(configPath, inputFile) {
     }
     highPriorityPath = resolved;
   }
-  // 2. 否则使用输入文件同级目录下的配置（互斥）
   else if (inputFile) {
     const inputDir = path.dirname(path.resolve(inputFile));
     const fileCandidates = [
@@ -82,7 +67,7 @@ function findConfigs(configPath, inputFile) {
 
 // ─── 配置文件加载 ─────────────────────────────────────────────────────────────
 
-function loadYaml(filePath) {
+export function loadYaml(filePath) {
   if (!filePath || !fs.existsSync(filePath)) return {};
   try {
     return yaml.load(fs.readFileSync(filePath, 'utf8')) || {};
@@ -91,10 +76,9 @@ function loadYaml(filePath) {
   }
 }
 
-/**
- * 深度合并（后面的覆盖前面的），仅对普通对象递归，数组/基本类型直接覆盖
- */
-function deepMerge(base, ...overrides) {
+// ─── 深度合并 ─────────────────────────────────────────────────────────────────
+
+export function deepMerge(base, ...overrides) {
   let result = Object.assign({}, base);
   for (const src of overrides) {
     if (!src || typeof src !== 'object' || Array.isArray(src)) continue;
@@ -118,24 +102,17 @@ function deepMerge(base, ...overrides) {
   return result;
 }
 
-/**
- * 配置合并，返回最终生效配置
- *
- * 合并顺序（优先级从低到高）：
- *   CLI 内置默认值  <  用户目录 ~/juice.yaml  <  优先配置（-c/输入目录）
- */
-function buildConfig(highPriorityPath, homePath) {
+// ─── 配置合并 ─────────────────────────────────────────────────────────────────
+
+export function buildConfig(highPriorityPath, homePath) {
   const layers = [];
 
-  // 1. CLI 内置默认值（最低优先级）
   layers.push({ label: 'CLI 内置默认值', data: CODE_DEFAULTS });
 
-  // 2. 用户目录配置（如果有）
   if (homePath) {
     layers.push({ label: `用户目录配置 (${homePath})`, data: loadYaml(homePath) });
   }
 
-  // 3. 优先配置（最高优先级，-c 指定 或 输入文件同级目录，互斥）
   if (highPriorityPath) {
     layers.push({ label: `优先配置 (${highPriorityPath})`, data: loadYaml(highPriorityPath) });
   }
@@ -146,10 +123,9 @@ function buildConfig(highPriorityPath, homePath) {
 
 // ─── HTML 模板处理 ────────────────────────────────────────────────────────────
 
-function processTemplate(inputFile, config) {
+export function processTemplate(inputFile, config) {
   const htmlRaw = fs.readFileSync(inputFile, 'utf8');
 
-  // 1. Mustache 变量替换（根据 rawHtml 配置决定是否转义 HTML）
   const originalEscape = Mustache.escape;
   let htmlWithVars;
   try {
@@ -161,18 +137,16 @@ function processTemplate(inputFile, config) {
     Mustache.escape = originalEscape;
   }
 
-  // 2. 收集 extraCssFiles
   const basePath = path.dirname(path.resolve(inputFile));
   const extraCss = collectExtraCss(basePath, config);
 
-  // 3. juice CSS 内联
   const juiceOpts = Object.assign({}, config.juice || {});
   delete juiceOpts.extraCssFiles;
 
   return juice(htmlWithVars, { ...juiceOpts, extraCss });
 }
 
-function collectExtraCss(basePath, config) {
+export function collectExtraCss(basePath, config) {
   const extraFiles = (config.juice && config.juice.extraCssFiles) || [];
   if (!extraFiles.length) return '';
   return extraFiles
@@ -189,7 +163,7 @@ function collectExtraCss(basePath, config) {
 
 // ─── 压缩 ─────────────────────────────────────────────────────────────────────
 
-async function minifyHtml(html, minifyConfig) {
+export async function minifyHtml(html, minifyConfig) {
   return htmlMinify(html, {
     removeConditionalComments: false,
     ...(minifyConfig || {}),
@@ -208,39 +182,46 @@ function resolveOutputPaths(inputFile, config) {
   };
 }
 
+// ─── 格式化 ───────────────────────────────────────────────────────────────────
+
+export function fmtSize(str) {
+  const b = Buffer.byteLength(str, 'utf8');
+  return b < 1024 ? `${b} B` : `${(b / 1024).toFixed(1)} KB`;
+}
+
+export function savings(original, minified) {
+  const orig = Buffer.byteLength(original, 'utf8');
+  const mini = Buffer.byteLength(minified, 'utf8');
+  return (((orig - mini) / orig) * 100).toFixed(1) + '%';
+}
+
 // ─── 主入口 ───────────────────────────────────────────────────────────────────
 
-async function run({ file, config: configPath }) {
+export async function run({ file, config: configPath }) {
   const spinner = ora({ text: '正在处理...', color: 'cyan' }).start();
 
   try {
-    // 1. 输入文件
     const inputFile = path.resolve(file);
     if (!fs.existsSync(inputFile)) {
       spinner.fail(chalk.red(`输入文件不存在：${inputFile}`));
       process.exit(1);
     }
 
-    // 2. 查找配置（-c 和输入文件同级目录互斥）+ 合并
     const { highPriorityPath, homePath } = findConfigs(configPath, inputFile);
     const { config, layers } = buildConfig(highPriorityPath, homePath);
     const encoding = (config.output && config.output.encoding) || 'utf8';
 
-    // 3. CSS 内联
     spinner.text = `CSS 内联处理：${path.basename(inputFile)}`;
     const resultHtml = processTemplate(inputFile, config);
 
-    // 4. 输出路径
     const outPaths = resolveOutputPaths(inputFile, config);
 
-    // 5. 写出标准版
     spinner.text = '写出 .output.html ...';
     if (fs.existsSync(outPaths.normal)) {
       spinner.warn(chalk.yellow(`目标文件已存在，将覆盖：${outPaths.normal}`));
     }
     fs.writeFileSync(outPaths.normal, resultHtml, encoding);
 
-    // 6. 压缩并写出
     spinner.text = '写出 .minified.html ...';
     if (fs.existsSync(outPaths.minified)) {
       spinner.warn(chalk.yellow(`目标文件已存在，将覆盖：${outPaths.minified}`));
@@ -248,7 +229,6 @@ async function run({ file, config: configPath }) {
     const minified = await minifyHtml(resultHtml, config.minify);
     fs.writeFileSync(outPaths.minified, minified, encoding);
 
-    // 7. 汇报
     const layerLines = layers
       .map((l) => `    ${chalk.gray('·')} ${l.label}`)
       .join('\n');
@@ -267,16 +247,3 @@ async function run({ file, config: configPath }) {
     process.exit(1);
   }
 }
-
-function fmtSize(str) {
-  const b = Buffer.byteLength(str, 'utf8');
-  return b < 1024 ? `${b} B` : `${(b / 1024).toFixed(1)} KB`;
-}
-
-function savings(original, minified) {
-  const orig = Buffer.byteLength(original, 'utf8');
-  const mini = Buffer.byteLength(minified, 'utf8');
-  return (((orig - mini) / orig) * 100).toFixed(1) + '%';
-}
-
-module.exports = { run, findConfigs, buildConfig, processTemplate, minifyHtml, deepMerge, collectExtraCss, loadYaml, fmtSize, savings, DEFAULT_CONFIG_PATH, resolveHomeConfig };

package/src/init.js

@@ -1,13 +1,14 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const chalk = require('chalk');
-const {
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import chalk from 'chalk';
+import {
   resolveEdmDir, loadMeta, findBrands, findTemplateVersions,
   findSeriesDirs, filterSeries, findSnippetVariants, findConfigs,
   promptOutputName,
-} = require('./snippet');
+} from './snippet.js';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 function fmtBytes(b) {
   return b < 1024 ? `${b} B` : `${(b / 1024).toFixed(1)} KB`;
@@ -433,7 +434,7 @@ async function runInitMode({ initPath, template, snippet, config, all }) {
   }
 
   if (initPath) {
-    const { parseViewPath } = require('./view');
+    const { parseViewPath } = await import('./view.js');
     let edmDir;
     try {
       edmDir = resolveEdmDir();
@@ -526,4 +527,4 @@ async function runInitMode({ initPath, template, snippet, config, all }) {
   await interactiveInit(edmDir, cwd);
 }
 
-module.exports = { runInitMode };
+export { runInitMode };

package/src/snippet.js

@@ -1,12 +1,11 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const os = require('os');
-const juice = require('juice');
-const Mustache = require('mustache');
-const chalk = require('chalk');
-const {
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+import { fileURLToPath } from 'url';
+import juice from 'juice';
+import Mustache from 'mustache';
+import chalk from 'chalk';
+import {
   loadYaml,
   deepMerge,
   collectExtraCss,
@@ -14,7 +13,9 @@ const {
   fmtSize,
   savings,
   DEFAULT_CONFIG_PATH,
-} = require('./index');
+} from './index.js';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 // ─── EDM 目录解析 ──────────────────────────────────────────────────────────────
 
@@ -948,7 +949,7 @@ async function runInteractiveMode({ config: cliConfigPath }) {
   });
 }
 
-module.exports = {
+export {
   runSnippetMode,
   runInteractiveMode,
   // EDM resolution & scanning

package/src/view.js

@@ -1,12 +1,10 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const chalk = require('chalk');
-const {
+import fs from 'fs';
+import path from 'path';
+import chalk from 'chalk';
+import {
   resolveEdmDir, loadMeta, findBrands, findTemplateVersions,
   findSeriesDirs, findSnippetVariants, findConfigs,
-} = require('./snippet');
+} from './snippet.js';
 
 function fmtBytes(b) {
   return b < 1024 ? `${b} B` : `${(b / 1024).toFixed(1)} KB`;
@@ -349,7 +347,7 @@ async function showCheckbox(title, choices) {
  */
 async function copyResource(type, resourcePath, cwd) {
   try {
-    const { runInitMode } = require('./init');
+    const { runInitMode } = await import('./init.js');
     if (type === 'template') {
       await runInitMode({ template: resourcePath });
     } else if (type === 'snippet') {
@@ -616,7 +614,7 @@ async function interactiveBrowse(edmDir, startParsed) {
           // 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 { promptOutputName: pn } = await import('./snippet.js');
           const outputBaseName = await pn(defaultBaseName, process.cwd());
           const cwd = process.cwd();
           const cwdRel = (p) => './' + path.relative(cwd, p);
@@ -714,7 +712,7 @@ async function runViewMode({ viewPath, interactive, scope }) {
       });
       if (action === 'copy') {
         console.log();
-        const { runInitMode } = require('./init');
+        const { runInitMode } = await import('./init.js');
         await runInitMode({ template: picked.version.templatePath });
         console.log();
       }
@@ -792,7 +790,7 @@ async function runViewMode({ viewPath, interactive, scope }) {
         actions
       );
       if (action === 'exit') return;
-      const { runInitMode } = require('./init');
+      const { runInitMode } = await import('./init.js');
       console.log();
       if (action === 'snippet') {
         await runInitMode({ snippet: snipPath });
@@ -872,7 +870,7 @@ async function runViewMode({ viewPath, interactive, scope }) {
           variantData: picked.variant,
         };
       } else {
-        const { runInitMode } = require('./init');
+        const { runInitMode } = await import('./init.js');
         console.log();
         if (action === 'copy-snippet') {
           await runInitMode({ snippet: picked.snippetPath });
@@ -938,4 +936,4 @@ async function runViewMode({ viewPath, interactive, scope }) {
   printFullTree(edmDir);
 }
 
-module.exports = { runViewMode, parseViewPath };
+export { runViewMode, parseViewPath };