@chaoswise/intl 1.0.0 → 1.2.0

package/bin/scripts/util/transformAst.js

@@ -13,10 +13,12 @@ const pluginSyntaxAsyncGenerators = require('@babel/plugin-syntax-async-generato
 const pluginSyntaxDoExpressions = require('@babel/plugin-syntax-do-expressions');
 const pluginSyntaxDynamicImport = require('@babel/plugin-syntax-dynamic-import');
 const pluginSyntaxFunctionBind = require('@babel/plugin-syntax-function-bind');
+const pluginExportDefaultFrom = require('@babel/plugin-proposal-export-default-from');
 const presetTypescript = require('@babel/preset-typescript').default;
 
 const makeVisitorCollect = require('./makeVisitorCollect');
 const makeVisitorUpdate = require('./makeVisitorUpdate');
+const log = require('./log');
 
 // 获取文件中需要忽略转化通用国际化API规范的所有行号
 function getIgnoreLines(ast) {
@@ -69,16 +71,13 @@ module.exports = function (type, files = [], conf = {}, replaceWords) {
   const {
     entry,
     output,
-    primaryRegx,
-    importCode,
-    i18nObject,
-    i18nMethod,
     babelPresets = [],
     babelPlugins = [],
-    ignoreComponents,
-    ignoreMethods,
-    ignoreAttributes,
+    specialFileReg,
+
+    ...opts
   } = conf;
+  const { importCode } = opts;
 
   const allWords = []; // 收集到的所有词条
   const downloadIds = []; // 需要从平台下载的词条id
@@ -105,24 +104,18 @@ module.exports = function (type, files = [], conf = {}, replaceWords) {
       pluginSyntaxDoExpressions,
       pluginSyntaxDynamicImport,
       pluginSyntaxFunctionBind,
+      pluginExportDefaultFrom,
       ...babelPlugins,
     ],
   };
 
-  const opts = {
-    primaryRegx,
-    i18nObject,
-    i18nMethod,
-    importCode,
-    ignoreLines: [],
-    ignoreMethods,
-    ignoreComponents,
-    ignoreAttributes,
-  };
-
   // 处理所有文件
   files.forEach((file) => {
     const { filePath } = file;
+
+    if (specialFileReg.some(reg => reg.test(filePath))) {
+      file.special = true;
+    }
     const isTSX = ['.ts', '.tsx'].includes(path.extname(filePath));
 
     const r = {
@@ -133,7 +126,16 @@ module.exports = function (type, files = [], conf = {}, replaceWords) {
       hasTouch: false, // 是否存在需要替换的词条
     };
     const sourceCode = fs.readFileSync(filePath, 'utf8');
-    const ast = babel.parseSync(sourceCode, transformOptions);
+    
+    let ast;
+    try {
+      ast = babel.parseSync(sourceCode, transformOptions);
+    } catch (error) {
+      replaceWords && log.error(`文件解析出错：${file.filePath}
+      ${error}`)
+      return;
+    }
+
     opts.ignoreLines = getIgnoreLines(ast);
 
     let makeVisitor = makeVisitorCollect;
@@ -141,8 +143,14 @@ module.exports = function (type, files = [], conf = {}, replaceWords) {
       makeVisitor = makeVisitorUpdate
     }
 
-    const visitor = makeVisitor(opts, r);
-    traverse(ast, visitor);
+    try {
+      const visitor = makeVisitor(opts, r, file);
+      traverse(ast, visitor);
+    } catch (e) {
+      replaceWords && log.error(`文件解析出错：${file.filePath}
+      ${e}`)
+      return;
+    }
 
     // 不传入需要替换的文词条则不进行文件修改
     // 在只需要提取中文词条的情况下不传入replaceWords
@@ -156,7 +164,7 @@ module.exports = function (type, files = [], conf = {}, replaceWords) {
 
     if (!r.hasTouch) {
       code = sourceCode;
-    } else if (!r.hasImport && importCode) {
+    } else if (!r.hasImport && !file.special && importCode && Object.keys(replaceWords).length) {
       code = `${importCode}\n${code}`;
     }
 

package/bin/scripts/util/writeNewWordsFile.js

@@ -0,0 +1,30 @@
+const file = require('./file');
+const log = require('./log');
+const getGroupName = require('./getGroupName');
+
+module.exports = async function writeNewWordsFile(type, newWords) {
+  const isJson = type === 'json';
+  type = isJson? 'json': 'xlsx';
+  // 读取groupName
+  const groupName = getGroupName();
+  const fileName = `${groupName}.${type}`
+
+  // 写入json
+  if (isJson) {
+    const oldNewWords = file.readJson(fileName) || {};
+
+    file.write(
+      fileName,
+      JSON.stringify({ ...oldNewWords, ...newWords }, null, 2)
+    );
+  } else {
+    // 写入xlsx
+    const oldNewWords = file.readElsx(fileName)?.Sheet1 || [];
+    // 把新增的词条对象，转为数组
+    const newWordsArr = Object.entries(newWords).map(([id, word]) => ({ id, ...word }));
+    // 合并数据，并写入文件
+    file.writeXlsx(fileName, { Sheet1: [...oldNewWords, ...newWordsArr ] });
+  }
+
+  log.success(`需要翻译的文件在项目根目录的${fileName}中`);
+};

package/lib/index.js

@@ -25,4 +25,5 @@ _Object$defineProperty(exports, "useIntl", {
 });
 var _useIntl = _interopRequireDefault(require("./useIntl"));
 var _context = _interopRequireDefault(require("./useIntl/context"));
-var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
+var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal"));
+_reactIntlUniversal["default"].options.escapeHtml = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaoswise/intl",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "author": "cloudwiser",
   "description": "intl",
   "main": "lib/index.js",
@@ -67,19 +67,21 @@
     "babel-plugin-macros": "^3.1.0",
     "babel-plugin-polyfill-corejs3": "^0.5.2",
     "chalk": "^2.4.1",
+    "glob": "^8.0.3",
     "gulp": "^4.0.2",
     "gulp-babel": "^8.0.0",
-    "gulp-typescript": "^5.0.1",
     "gulp-connect": "^5.7.0",
     "gulp-jsdoc3": "^3.0.0",
+    "gulp-typescript": "^5.0.1",
     "prettier": "^2.8.1",
-    "glob": "^8.0.3",
     "react-intl-universal": "^2.6.11",
-    "uuid": "^9.0.0"
+    "uuid": "^9.0.0",
+    "xlsx": "^0.18.5"
   },
   "devDependencies": {
     "react": "^16.13.1",
     "react-dom": "^16.13.1"
   },
-  "license": "MIT"
+  "license": "MIT",
+  "gitHead": "e56a7289b5085c5d38813e85776dbd5f789606b0"
 }