i18-fe-automator-beta 2.1.0 → 2.1.1

package/dist/commonjs/index.js

@@ -25,7 +25,6 @@ var stripAnsi = require('strip-ansi');
 require('shelljs');
 var process$1 = require('child_process');
 var _ = require('lodash');
-require('nanoid');
 var request$1 = require('request-promise');
 require('os');
 require('console');
@@ -399,7 +398,13 @@ async function upload$1(cliOpts = {}) {
   const cliUsername = cliOpts.username || undefined;
   const cliPassword = cliOpts.password || undefined;
   const cache = Boolean(cliOpts.cache);
-  const oneClick = cliEnv !== undefined && cliFiles !== undefined;
+  // 传了任一CLI参数即视为一键意图, 跳过"是否上传"确认(传参即意图)
+  const oneClick =
+    cliEnv !== undefined ||
+    cliFiles !== undefined ||
+    cliUsername !== undefined ||
+    cliPassword !== undefined ||
+    cache;
   // CLI参数校验前置(快速失败, 不进交互)
   if (cliEnv !== undefined) {
     const envArr = cliEnv
@@ -520,12 +525,12 @@ async function upload$1(cliOpts = {}) {
     ]);
     envValue = res.env;
   }
-  let envList = [];
-  if (envValue.indexOf("to") > -1) {
-    envList = envValue.replace("to-", "").split(",");
-  } else {
-    envList = [envValue];
-  }
+  // 统一解析: 去掉to-前缀(兼容交互选择值) → 按逗号拆分
+  const envList = envValue
+    .replace(/^to-/, "")
+    .split(",")
+    .map((item) => item.trim())
+    .filter(Boolean);
   const isPro = envList.length === 1 && envList[0] === "pro";
   // 3.凭据: CLI参数 > --cache缓存 > 交互(展示缓存默认值), 解析后回写缓存
   const secret = await resolveSecretQuestions({
@@ -942,6 +947,11 @@ async function excelFn(cliOpts = {}) {
       },
     ]);
     language = res.language;
+    // 用户选择不翻译则直接退出(一键模式传 --lang 视为翻译, 不进入该询问)
+    if (!res.isTranslate) {
+      console.log(chalk.green(`已跳过${language}列翻译`));
+      return;
+    }
   }
   const content = data.slice(1);
   const zhArr = content.map((row) => {
@@ -1214,8 +1224,9 @@ async function sassMain(rawCliOpts = {}) {
 async function syncSassFlow(cliOpts) {
   const { from: cliFrom, to: cliTo, app: cliApp } = cliOpts;
   const envList = ["mit", "sit", "uat"];
+  // 传了任一同步参数即视为一键意图, 自动同意使用须知(传参即意图)
   const oneClick =
-    cliFrom !== undefined && cliTo !== undefined && cliApp !== undefined;
+    cliFrom !== undefined || cliTo !== undefined || cliApp !== undefined;
   if (!oneClick) {
     const { notice } = await inquirer.prompt([
       {
@@ -1290,14 +1301,36 @@ async function syncSassFlow(cliOpts) {
     console.log(chalk.red(`查询${from}环境应用列表失败: ${e.message || e}`));
     process.exit(1);
   }
-  const { appName } = await inquirer.prompt([
-    {
-      message: "请选择应用名称",
-      name: "appName",
-      type: "rawlist",
-      choices: applicationList,
-    },
-  ]);
+  if (!applicationList.length) {
+    console.log(chalk.red(`${from}环境未找到该应用`));
+    process.exit(1);
+  }
+  // 一键模式: 唯一匹配或精确匹配CLI传入的应用名时自动选中(与新增按钮权限流程一致)
+  let appName;
+  if (applicationList.length === 1) {
+    appName = applicationList[0].name;
+    console.log(chalk.gray(`唯一匹配,已自动选中: ${appName}`));
+  } else if (oneClick) {
+    const exactMatch = applicationList.find((item) => item.name === cliApp);
+    if (!exactMatch) {
+      console.log(
+        chalk.red(`${from}环境未精确匹配到应用: ${cliApp}, 请更换关键字`)
+      );
+      process.exit(1);
+    }
+    appName = exactMatch.name;
+    console.log(chalk.gray(`精确匹配,已自动选中: ${appName}`));
+  } else {
+    const res = await inquirer.prompt([
+      {
+        message: "请选择应用名称",
+        name: "appName",
+        type: "rawlist",
+        choices: applicationList,
+      },
+    ]);
+    appName = res.appName;
+  }
   const appId = applicationList.find((item) => item.name === appName).id;
   let fromButtonList;
   try {
@@ -2952,7 +2985,8 @@ function getGitChangedFiles() {
     return allFiles;
   } catch (error) {
     // git命令失败(如不在git仓库中运行)属于使用错误, 以退出码1结束
-    exitError("获取git修改文件失败，请确保在git仓库中运行");
+    console.log(chalk.red("获取git修改文件失败，请确保在git仓库中运行"));
+    process.exit(1);
   }
 }
 // const spinner = ora();
@@ -3452,12 +3486,7 @@ function translateUtil(appid, key, projectName, isLintFix, isMergeDecision) {
                 let EN = result[index1].dst;
                 EN = EN[0].toUpperCase() + EN.slice(1);
                 item1.EN = EN;
-                if (isLintFix) {
-                  // item1.key = nanoid().replace("_", "a");
-                  item1.key = id + "-" + key;
-                } else {
-                  item1.key = id + "-" + key;
-                }
+                item1.key = id + "-" + key;
               }
             });
             resolve(true);

package/dist/esm/index.mjs

@@ -23,7 +23,6 @@ import stripAnsi from 'strip-ansi';
 import 'shelljs';
 import process$1, { execSync } from 'child_process';
 import _ from 'lodash';
-import 'nanoid';
 import request$1 from 'request-promise';
 import 'os';
 import 'console';
@@ -377,7 +376,13 @@ async function upload$1(cliOpts = {}) {
   const cliUsername = cliOpts.username || undefined;
   const cliPassword = cliOpts.password || undefined;
   const cache = Boolean(cliOpts.cache);
-  const oneClick = cliEnv !== undefined && cliFiles !== undefined;
+  // 传了任一CLI参数即视为一键意图, 跳过"是否上传"确认(传参即意图)
+  const oneClick =
+    cliEnv !== undefined ||
+    cliFiles !== undefined ||
+    cliUsername !== undefined ||
+    cliPassword !== undefined ||
+    cache;
   // CLI参数校验前置(快速失败, 不进交互)
   if (cliEnv !== undefined) {
     const envArr = cliEnv
@@ -498,12 +503,12 @@ async function upload$1(cliOpts = {}) {
     ]);
     envValue = res.env;
   }
-  let envList = [];
-  if (envValue.indexOf("to") > -1) {
-    envList = envValue.replace("to-", "").split(",");
-  } else {
-    envList = [envValue];
-  }
+  // 统一解析: 去掉to-前缀(兼容交互选择值) → 按逗号拆分
+  const envList = envValue
+    .replace(/^to-/, "")
+    .split(",")
+    .map((item) => item.trim())
+    .filter(Boolean);
   const isPro = envList.length === 1 && envList[0] === "pro";
   // 3.凭据: CLI参数 > --cache缓存 > 交互(展示缓存默认值), 解析后回写缓存
   const secret = await resolveSecretQuestions({
@@ -920,6 +925,11 @@ async function excelFn(cliOpts = {}) {
       },
     ]);
     language = res.language;
+    // 用户选择不翻译则直接退出(一键模式传 --lang 视为翻译, 不进入该询问)
+    if (!res.isTranslate) {
+      console.log(chalk.green(`已跳过${language}列翻译`));
+      return;
+    }
   }
   const content = data.slice(1);
   const zhArr = content.map((row) => {
@@ -1192,8 +1202,9 @@ async function sassMain(rawCliOpts = {}) {
 async function syncSassFlow(cliOpts) {
   const { from: cliFrom, to: cliTo, app: cliApp } = cliOpts;
   const envList = ["mit", "sit", "uat"];
+  // 传了任一同步参数即视为一键意图, 自动同意使用须知(传参即意图)
   const oneClick =
-    cliFrom !== undefined && cliTo !== undefined && cliApp !== undefined;
+    cliFrom !== undefined || cliTo !== undefined || cliApp !== undefined;
   if (!oneClick) {
     const { notice } = await inquirer.prompt([
       {
@@ -1268,14 +1279,36 @@ async function syncSassFlow(cliOpts) {
     console.log(chalk.red(`查询${from}环境应用列表失败: ${e.message || e}`));
     process.exit(1);
   }
-  const { appName } = await inquirer.prompt([
-    {
-      message: "请选择应用名称",
-      name: "appName",
-      type: "rawlist",
-      choices: applicationList,
-    },
-  ]);
+  if (!applicationList.length) {
+    console.log(chalk.red(`${from}环境未找到该应用`));
+    process.exit(1);
+  }
+  // 一键模式: 唯一匹配或精确匹配CLI传入的应用名时自动选中(与新增按钮权限流程一致)
+  let appName;
+  if (applicationList.length === 1) {
+    appName = applicationList[0].name;
+    console.log(chalk.gray(`唯一匹配,已自动选中: ${appName}`));
+  } else if (oneClick) {
+    const exactMatch = applicationList.find((item) => item.name === cliApp);
+    if (!exactMatch) {
+      console.log(
+        chalk.red(`${from}环境未精确匹配到应用: ${cliApp}, 请更换关键字`)
+      );
+      process.exit(1);
+    }
+    appName = exactMatch.name;
+    console.log(chalk.gray(`精确匹配,已自动选中: ${appName}`));
+  } else {
+    const res = await inquirer.prompt([
+      {
+        message: "请选择应用名称",
+        name: "appName",
+        type: "rawlist",
+        choices: applicationList,
+      },
+    ]);
+    appName = res.appName;
+  }
   const appId = applicationList.find((item) => item.name === appName).id;
   let fromButtonList;
   try {
@@ -2930,7 +2963,8 @@ function getGitChangedFiles() {
     return allFiles;
   } catch (error) {
     // git命令失败(如不在git仓库中运行)属于使用错误, 以退出码1结束
-    exitError("获取git修改文件失败，请确保在git仓库中运行");
+    console.log(chalk.red("获取git修改文件失败，请确保在git仓库中运行"));
+    process.exit(1);
   }
 }
 // const spinner = ora();
@@ -3430,12 +3464,7 @@ function translateUtil(appid, key, projectName, isLintFix, isMergeDecision) {
                 let EN = result[index1].dst;
                 EN = EN[0].toUpperCase() + EN.slice(1);
                 item1.EN = EN;
-                if (isLintFix) {
-                  // item1.key = nanoid().replace("_", "a");
-                  item1.key = id + "-" + key;
-                } else {
-                  item1.key = id + "-" + key;
-                }
+                item1.key = id + "-" + key;
               }
             });
             resolve(true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18-fe-automator-beta",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "i18-fe-automator-beta内测版本,只用于key: ''替换、检测中文规则等",
   "type": "module",
   "bin": {