i18-fe-automator-beta 1.0.13 → 2.0.0

package/dist/commonjs/index.js

@@ -19,6 +19,7 @@ var uuid = require('uuid');
 var eslint = require('eslint');
 var espree = require('espree');
 var node_module = require('node:module');
+var tsParser = require('@typescript-eslint/parser');
 var stripAnsi = require('strip-ansi');
 require('shelljs');
 var process$1 = require('child_process');
@@ -195,7 +196,7 @@ function uploadExcel({ data, token, env }) {
 
 //  获取命令行所在的目录
 function getRunCliPath({ directory = false, root = false } = {}) {
-  const __filename = url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('index.js', document.baseURI).href)));
+  const __filename = url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.js', document.baseURI).href)));
   const __dirname = path.dirname(__filename);
   if (root) {
     return path.resolve(__dirname, "../");
@@ -1821,12 +1822,10 @@ function getConditionValue(node, moduleArr,getPath) {
  * @fileoverview 国际化
  * @author ypf
  */
-const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('index.js', document.baseURI).href)));
+const require$1 = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.js', document.baseURI).href)));
 const VueESlintParserPath = require$1.resolve('vue-eslint-parser');
 const meta = {
-  name: "eslint-plugin-i18n",
-  version: "1.0.0",
-};
+  name: "eslint-plugin-i18n"};
 var i18n = {
   rules: {
     "no-single-chinese": noSingleChineseRule,
@@ -1856,8 +1855,8 @@ var i18n = {
         parser: {
           js: espree__namespace,
           jsx: espree__namespace, // 支持jsx语法
-          // ts: tsParser,
-          // tsx: tsParser,
+          ts: tsParser,
+          tsx: tsParser,
         },
       },
     },
@@ -2071,11 +2070,12 @@ async function lint$1(patterns, fix, rule, hook = {}) {
     rules$1[`i18n/no-single-${rule}`] = "warn";
   }
   const eslint$1 = new eslint.ESLint({
-    useEslintrc: false, // 不检测其他规则,只检测i18n规则, 不设置为false,则会检测项目中的.eslintrc.js文件规则
-    // 只检测js,jsx,vue文件
-    extensions: [".js", ".jsx", ".vue"],
+    useEslintrc: false, // 不加载项目中的 .eslintrc 文件, 即不检测执行项目里规则,只检测i18n规则, 不设置为false,则会检测项目中的.eslintrc.js文件规则
+    // allowInlineConfig: false, // 禁止解析文件内的 /* eslint-disable */ 等注释,否则虽然设置了useEslintrc:false, 它也会检测/* eslint-disable */等注释,然后找不到该规则的定义，从而检测出错误.但⚠️该规则会导致eslint-disable 失效
+    // 只检测js,jsx,vue,ts,tsx文件
+    extensions: [".js", ".jsx", ".vue",'ts', 'tsx'],
     fix: fix || false, // 是否自动修复
-    overrideConfigFile: null,
+    overrideConfigFile: null, // 所有规则通过下面overrideConfig配置,不使用基于文件的配置方式,如传配指定配置文件路径
     plugins: { [meta.name]: i18n }, // 必须写,下面的extends才能识别, 和配置文件那种不一样,配置文件那种只写extends就行,不用写plugins
     overrideConfig: {
       extends: [
@@ -2089,6 +2089,16 @@ async function lint$1(patterns, fix, rule, hook = {}) {
   try {
     // 检查文件
     const results = await eslint$1.lintFiles(patterns);
+    results.forEach(item=>{
+      if(item?.messages?.length){
+        // 脚本只会检测脚本自定义的规则,但是在项目中运行发现eslint-disable-line xx规则会报找不到规则的错误,如
+        //  error Definition for rule '@typescript-eslint/no-unused-vars' was not found @typescript-eslint/no-unused-vars
+        // 这种报错没有messageId,忽略掉
+        item.messages=item.messages.filter(message=>{
+          return message.messageId
+        });
+      }
+    });
     hook.lintFilesAfter && (await hook.lintFilesAfter(results, Loading$1));
     if (!fix) {
       // 判断是否有匹配到错误
@@ -2549,7 +2559,6 @@ function translateUtil(appid, key, projectName, isLintFix) {
     let str = "";
     let cutArr = [];
     console.log(chalk.green(`共有${allArr.length}条数据需要翻译`));
-    console.log(allArr,'allArr');
     
     allArr.forEach((item, index) => {
       if (str.length > 2000) {

package/dist/esm/index.mjs

@@ -17,6 +17,7 @@ import { v5 } from 'uuid';
 import { ESLint } from 'eslint';
 import * as espree from 'espree';
 import { createRequire } from 'node:module';
+import tsParser from '@typescript-eslint/parser';
 import stripAnsi from 'strip-ansi';
 import 'shelljs';
 import process$1 from 'child_process';
@@ -26,10 +27,10 @@ import request$1 from 'request-promise';
 import 'os';
 import 'console';
 
-function Loading() {
+function Loading$1() {
   this.spinner = ora();
 }
-var Loading$1 = new Loading().spinner;
+var Loading = new Loading$1().spinner;
 
 //加密
 function encrypt(word, keyStr) {
@@ -46,7 +47,7 @@ function encrypt(word, keyStr) {
 function login(data) {
   data.password = encrypt(md5$1(data.password));
   const env=data.env;
-  Loading$1.start(`${env}: 登录中...`);
+  Loading.start(`${env}: 登录中...`);
   return new Promise((resolve, reject) => {
     request(
       {
@@ -60,11 +61,11 @@ function login(data) {
       function (error, response, body) {
         const res = body;
         if (!error && res.code == 200) {
-          Loading$1.succeed(`${env}: 登录成功`);
+          Loading.succeed(`${env}: 登录成功`);
           const access_token = res.data.access_token;
           resolve(access_token);
         } else {
-          Loading$1.fail(`${env}: 登录失败`);
+          Loading.fail(`${env}: 登录失败`);
           console.log(chalk.red(error || res.msg));
         }
       }
@@ -73,7 +74,7 @@ function login(data) {
 }
 
 function importExcel({ uploadFilePath, token, env }) {
-  Loading$1.start(`${env}: 导入文件中...`);
+  Loading.start(`${env}: 导入文件中...`);
   const stream = fs.createReadStream(uploadFilePath);
   return new Promise((resolve, reject) => {
     request(
@@ -94,10 +95,10 @@ function importExcel({ uploadFilePath, token, env }) {
       function (error, response, body) {
         const res = JSON.parse(body);
         if (!error && res.code == 200) {
-          Loading$1.succeed(`${env}: 导入文件成功`);
+          Loading.succeed(`${env}: 导入文件成功`);
           resolve(true);
         } else {
-          Loading$1.fail(`${env}: 导入文件失败`);
+          Loading.fail(`${env}: 导入文件失败`);
           console.log(
             chalk.red(error || (res.data ? JSON.stringify(res.data) : res.msg))
           );
@@ -142,7 +143,7 @@ function readExcel({ uploadFilePath }) {
 }
 
 function uploadExcel({ data, token, env }) {
-  Loading$1.start(`${env}: 导入项目 ${data.projectList.join()}`);
+  Loading.start(`${env}: 导入项目 ${data.projectList.join()}`);
   return new Promise((resolve, reject) => {
     request(
       {
@@ -160,10 +161,10 @@ function uploadExcel({ data, token, env }) {
       function (error, response, body) {
         const res = body;
         if (!error && res.code == 200) {
-          Loading$1.succeed(`${env}: 导入项目成功`);
+          Loading.succeed(`${env}: 导入项目成功`);
           resolve(true);
         } else {
-          Loading$1.fail(`${env}: 导入项目失败`);
+          Loading.fail(`${env}: 导入项目失败`);
           console.log(chalk.red(error || res.msg || res.message));
         }
       }
@@ -810,7 +811,7 @@ function getApplicationList({ appName, env, token }) {
 }
 // 获取应用按钮权限配置
 function getApplicationButtonConfig({ appId, env, token }) {
-  Loading$1.start(`获取按钮权限配置中...`);
+  Loading.start(`获取按钮权限配置中...`);
   return new Promise((resolve, reject) => {
     request(
       {
@@ -828,10 +829,10 @@ function getApplicationButtonConfig({ appId, env, token }) {
       function (error, response, body) {
         const res = body;
         if (!error && res.code == 200) {
-          Loading$1.succeed(`获取${env}环境按钮权限配置成功`);
+          Loading.succeed(`获取${env}环境按钮权限配置成功`);
           resolve(res.data);
         } else {
-          Loading$1.fail(`获取${env}环境按钮权限配置失败`);
+          Loading.fail(`获取${env}环境按钮权限配置失败`);
           console.log(chalk.red(error || JSON.stringify(res.data)));
         }
       }
@@ -869,7 +870,7 @@ function deleteApplicationButtonConfig({ data, env, token }) {
 }
 // 新增应用按钮权限
 function addApplicationButtonConfig({ data, env, token }) {
-  Loading$1.start(`新增按钮权限 ${data.code} 中...`);
+  Loading.start(`新增按钮权限 ${data.code} 中...`);
   return new Promise((resolve, reject) => {
     request(
       {
@@ -887,10 +888,10 @@ function addApplicationButtonConfig({ data, env, token }) {
       function (error, response, body) {
         const res = body;
         if (!error && res.code == 200) {
-          Loading$1.succeed(`${data.code}`);
+          Loading.succeed(`${data.code}`);
           resolve(true);
         } else {
-          Loading$1.fail(`${data.code}`);
+          Loading.fail(`${data.code}`);
           console.log(chalk.red(error || JSON.stringify(res.data)));
         }
       }
@@ -1008,9 +1009,9 @@ async function syncSassConfig() {
               token: toToken,
             });
           });
-          Loading$1.start(`删除${to}环境按钮权限配置中...`);
+          Loading.start(`删除${to}环境按钮权限配置中...`);
           await Promise.all(deleteButtonPromiseList);
-          Loading$1.succeed(`删除${to}环境按钮权限配置成功`);
+          Loading.succeed(`删除${to}环境按钮权限配置成功`);
         }
       } catch (error) {
         console.log(chalk.red(`删除${to}环境按钮权限配置失败`));
@@ -1799,12 +1800,10 @@ function getConditionValue(node, moduleArr,getPath) {
  * @fileoverview 国际化
  * @author ypf
  */
-const require = createRequire(import.meta.url);
-const VueESlintParserPath = require.resolve('vue-eslint-parser');
+const require$1 = createRequire(import.meta.url);
+const VueESlintParserPath = require$1.resolve('vue-eslint-parser');
 const meta = {
-  name: "eslint-plugin-i18n",
-  version: "1.0.0",
-};
+  name: "eslint-plugin-i18n"};
 var i18n = {
   rules: {
     "no-single-chinese": noSingleChineseRule,
@@ -1834,8 +1833,8 @@ var i18n = {
         parser: {
           js: espree,
           jsx: espree, // 支持jsx语法
-          // ts: tsParser,
-          // tsx: tsParser,
+          ts: tsParser,
+          tsx: tsParser,
         },
       },
     },
@@ -2049,11 +2048,12 @@ async function lint$1(patterns, fix, rule, hook = {}) {
     rules$1[`i18n/no-single-${rule}`] = "warn";
   }
   const eslint = new ESLint({
-    useEslintrc: false, // 不检测其他规则,只检测i18n规则, 不设置为false,则会检测项目中的.eslintrc.js文件规则
-    // 只检测js,jsx,vue文件
-    extensions: [".js", ".jsx", ".vue"],
+    useEslintrc: false, // 不加载项目中的 .eslintrc 文件, 即不检测执行项目里规则,只检测i18n规则, 不设置为false,则会检测项目中的.eslintrc.js文件规则
+    // allowInlineConfig: false, // 禁止解析文件内的 /* eslint-disable */ 等注释,否则虽然设置了useEslintrc:false, 它也会检测/* eslint-disable */等注释,然后找不到该规则的定义，从而检测出错误.但⚠️该规则会导致eslint-disable 失效
+    // 只检测js,jsx,vue,ts,tsx文件
+    extensions: [".js", ".jsx", ".vue",'ts', 'tsx'],
     fix: fix || false, // 是否自动修复
-    overrideConfigFile: null,
+    overrideConfigFile: null, // 所有规则通过下面overrideConfig配置,不使用基于文件的配置方式,如传配指定配置文件路径
     plugins: { [meta.name]: i18n }, // 必须写,下面的extends才能识别, 和配置文件那种不一样,配置文件那种只写extends就行,不用写plugins
     overrideConfig: {
       extends: [
@@ -2063,20 +2063,30 @@ async function lint$1(patterns, fix, rule, hook = {}) {
       rules: rules$1,
     },
   });
-  Loading$1.start(`检测中...`);
+  Loading.start(`检测中...`);
   try {
     // 检查文件
     const results = await eslint.lintFiles(patterns);
-    hook.lintFilesAfter && (await hook.lintFilesAfter(results, Loading$1));
+    results.forEach(item=>{
+      if(item?.messages?.length){
+        // 脚本只会检测脚本自定义的规则,但是在项目中运行发现eslint-disable-line xx规则会报找不到规则的错误,如
+        //  error Definition for rule '@typescript-eslint/no-unused-vars' was not found @typescript-eslint/no-unused-vars
+        // 这种报错没有messageId,忽略掉
+        item.messages=item.messages.filter(message=>{
+          return message.messageId
+        });
+      }
+    });
+    hook.lintFilesAfter && (await hook.lintFilesAfter(results, Loading));
     if (!fix) {
       // 判断是否有匹配到错误
       const hasErrors = results.some(
         (result) => result.messages && result.messages.length
       );
       if (!hasErrors) {
-        return Loading$1.succeed(`没有要修复的错误`);
+        return Loading.succeed(`没有要修复的错误`);
       }
-      Loading$1.succeed(`检测完成`);
+      Loading.succeed(`检测完成`);
       // 如果没有fix,则直接输出错误
       return console.log(stylish(results));
     }
@@ -2085,11 +2095,11 @@ async function lint$1(patterns, fix, rule, hook = {}) {
       (result) => result.output || result.warningCount
     );
     if (!hasErrors1) {
-      return Loading$1.succeed(`没有要修复的错误`);
+      return Loading.succeed(`没有要修复的错误`);
     }
     // 输出回原文件
     await ESLint.outputFixes(results);
-    Loading$1.succeed(`替换空key完成`);
+    Loading.succeed(`替换空key完成`);
     inquirer
       .prompt([
         {
@@ -2108,7 +2118,7 @@ async function lint$1(patterns, fix, rule, hook = {}) {
         }
       });
   } catch (error) {
-    Loading$1.fail(`检测失败`);
+    Loading.fail(`检测失败`);
     console.error(chalk.red(error));
   }
 }
@@ -2527,7 +2537,6 @@ function translateUtil(appid, key, projectName, isLintFix) {
     let str = "";
     let cutArr = [];
     console.log(chalk.green(`共有${allArr.length}条数据需要翻译`));
-    console.log(allArr,'allArr');
     
     allArr.forEach((item, index) => {
       if (str.length > 2000) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18-fe-automator-beta",
-  "version": "1.0.13",
+  "version": "2.0.0",
   "description": "i18-fe-automator-beta内测版本,只用于key: ''替换、检测中文规则等",
   "type": "module",
   "bin": {
@@ -15,6 +15,9 @@
     "dist/commonjs",
     "dist/esm"
   ],
+  "engines": {
+    "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+  },
   "keywords": [],
   "author": "pengfei.yin",
   "license": "MIT",
@@ -23,6 +26,7 @@
     "rollup": "^4.9.1"
   },
   "dependencies": {
+    "@typescript-eslint/parser": "^8.53.1",
     "chalk": "^5.3.0",
     "commander": "^11.1.0",
     "crypto-js": "^4.2.0",