@chaoswise/intl 1.0.0 → 1.1.0

package/bin/chaoswise-intl.js

@@ -1,9 +1,10 @@
 #!/usr/bin/env node
 const runCollect = require('./scripts/collect');
 const runUpdate = require('./scripts/update');
+const runInitConfig = require('./scripts/initConfig');
 
 // 可执行的指令
-const SCRIPTS = ['collect', 'update'];
+const SCRIPTS = ['intl', 'collect', 'update'];
 
 const args = process.argv.slice(2);
 
@@ -14,6 +15,9 @@ const scriptIndex = args.findIndex(arg => {
 
 const script = scriptIndex === -1 ? args[0] : args[scriptIndex];
 
+if(script === 'init') {
+  runInitConfig();
+}
 if(script === 'collect') {
   runCollect();
 }

package/bin/scripts/collect.js

@@ -5,11 +5,24 @@ const getTargetFiles = require('./util/getTargetFiles');
 const transformAst = require('./util/transformAst');
 const log = require('./util/log');
 const file = require('./util/file');
+const getGroupName = require('./util/getGroupName');
+const { readWordJson } = require('./util/getWord');
 
 const service = require('./service');
 
-async function init() {
+async function collect() {
+  log.info('词条扫描中...')
   const conf = getConf();
+
+  // 读取wordJson
+  if (conf.localWordPath && !readWordJson(conf.localWordPath)) {
+    log.error('localWordPath配置有误');
+    process.exit(1);
+  }
+  // 读取groupName
+  const groupName = getGroupName();
+
+  // 获取需要遍历的文件
   const files = getTargetFiles(conf);
 
   // 遍历文件，并对代码进行ast处理的方法：transformAst(type, files, conf, replaceWords)
@@ -18,19 +31,25 @@ async function init() {
 
   // 在国际化平台中获取所有已存在中文信息
   const res = await service.searchByZh(info.allWords);
+
+  if (res.code !== 10000) {
+    log.error('请求数据出错:' + res.msg);
+    process.exit(1);
+  }
+
   const wordsMap = res.data;
 
   const replaceWords = {}; // { zh: id } 需要在代码中替换的词条id
   const newWords = {}; // { zh1: '待翻译', zh2: '请选择:中文1/中文2' }
-  Object.entries(wordsMap).forEach(([zh, value]) => {
+  Object.entries(wordsMap).forEach(([word, value]) => {
     // 如果当前中文词条在平台中存在，且对应英文翻译有且只有一条，那么直接替换代码中的中文为当前id，否则生成临时key，让开发者手动确认
     if (value.length === 1) {
-      replaceWords[zh] = value[0].key;
+      replaceWords[word] = value[0].key;
     } else {
       const id = uuidv4();
-      replaceWords[zh] = id;
+      replaceWords[word] = id;
       newWords[id] = {
-        zh,
+        zh: word,
         en:
           value.length === 0
             ? '待翻译'
@@ -50,18 +69,15 @@ async function init() {
   if (Object.keys(newWords).length) {
     const newWordsJsonPath = 'newWords.json';
 
-    let oldNewWords = file.readJson(newWordsJsonPath) || {};
+    const oldNewWords = file.readJson(newWordsJsonPath) || {};
     file.write(
       newWordsJsonPath,
-      JSON.stringify({ ...oldNewWords, ...newWords }, null, 2)
+      JSON.stringify({ ...oldNewWords, ...newWords, groupName }, null, 2)
     );
 
-    // 先注释掉，开始做指标时，会用到
-    // const package = file.read('package.json');
-    // file.write(newWordsJsonPath, JSON.stringify({ ...oldNewWords, ...newWords, projectName: package.name }, null, 2));
     log.success(`需要翻译的文件在项目根目录的newWords.json中`);
   }
 }
 
-// init();
-module.exports = init;
+// collect();
+module.exports = collect;

package/bin/scripts/conf/default.js

@@ -8,7 +8,6 @@ module.exports = function (excludes = []) {
     // exclude pattern, <string array>
     // e.g. ['**/dist/**', '**/*.config.js', '**/*.data.js']
     exclude: [
-      '**/router.config.js',
       '**/src/public/**',
       '**/_MOCK_/**'
     ],
@@ -19,7 +18,7 @@ module.exports = function (excludes = []) {
 
     // ignored components, <string array>
     // e.g. ['EventTracker']
-    ignoreComponents: [],
+    ignoreComponents: ['style', 'svg'],
 
     // ignored methods, <string array>
     // e.g. ['MirrorTrack']
@@ -41,6 +40,8 @@ module.exports = function (excludes = []) {
     // e.g. 't'
     i18nMethod: 'get',
 
+    i18nDefaultFunctionKey: 'd',
+
     // babel配置项
     babelPresets: [],
     babelPlugins: [],
@@ -54,6 +55,40 @@ module.exports = function (excludes = []) {
       endOfLine: 'lf',
     },
 
+    // <Tag id={{ key: 'id' }} defaultMessage='中文' />
+    // intlTag 是 'Tag'
+    // intlTagIdPath 是 'id.key'
+    // intlTagDefaultWordPath 是 'defaultMessage'，并且如果不配置，默认是'defaultMessage'
+    intlTag: '',
+    intlTagIdPath: '',
+    intlTagDefaultWordPath: '',
+
+    // intl.formatMessage({
+    //   key: 'id',
+    //   defaultMessage: '默认值',
+    // })
+    // intlFunctionName 是 intl.formatMessage
+    // intlFunctionIdPath 是 '0.key'。 如果 配置成 'key' 也行，intlFunctionIdPath如果不以数字开头，会在前面加上'0.' 'key' 就会变成 '0.key'
+    // intlFunctionDefaultWordPath 是 '0.defaultMessage',其他的说明同intlFunctionIdPath
+    intlFunctionName: '',
+    intlFunctionIdPath: '',
+    intlFunctionDefaultWordPath: '',
+
+    // 做过国际化的项目，中文config的路径。例如：'src/local/zh.json'
+    localWordPath: '',
+
+    // 配置 需要被脚本删除的依赖包的名字
+    removePkgName: [],
+
+    // 需要删除的函数和装饰器 的名称
+    removeFunctionName: ['injectIntl'],
+
+    // package.json中项目名称的key
+    groupNameKey: 'packageName',
+
+    // 特殊文件处理的正则  这里默认匹配router.config.js
+    specialFileReg: [/src\/config\/router\.config\.js/],
+
     // 国际化平台地址
     baseURL: 'http://10.0.1.133:18000',
   };

package/bin/scripts/conf/getCustomConfig.js

@@ -0,0 +1,8 @@
+const file = require('../util/file');
+
+module.exports = function () {
+  // 获取用户自定义配置文件
+  const customConfig = file.readJs('.intlconfig.js');
+
+  return customConfig;
+};

package/bin/scripts/conf/index.js

@@ -1,25 +1,5 @@
 const getDefaultConfig = require('./default');
-const file = require('../util/file');
-const prettier = require('prettier');
-
-function createCustomConfig() {
-  // 默认生成的配置文件，不需要给出全量可配置属性
-  const ignoreAttributes = [
-    'primaryRegx',
-    'importCode',
-    'i18nObject',
-    'i18nMethod',
-    'baseURL',
-  ];
-  const defaultConfig = getDefaultConfig(ignoreAttributes);
-
-  const code = `module.exports = ${JSON.stringify(defaultConfig, null, 2)};`;
-
-  file.write(
-    '.intlconfig.js',
-    prettier.format(code, { ...defaultConfig.prettier, parser: 'babel' })
-  );
-}
+const getCustomConfig = require('./getCustomConfig');
 
 // 内置一些，不需要被扫描的函数
 const ignoreMethods = [
@@ -28,11 +8,8 @@ Object.keys(console).forEach(key => ignoreMethods.push(`console.${key}`))
 
 module.exports = function () {
   // 获取用户自定义配置文件
-  const customConfig = file.readJs('.intlconfig.js');
+  const customConfig = getCustomConfig() || {};
 
-  if (!customConfig) {
-    createCustomConfig();
-  }
   // 合并配置文件
   const finalyConf = { ...getDefaultConfig(), ...customConfig };
 

package/bin/scripts/conf/initConfig.js

@@ -0,0 +1,37 @@
+const getCustomConfig = require('./getCustomConfig');
+const getDefaultConfig = require('./default');
+const file = require('../util/file');
+const prettier = require('prettier');
+const log = require('../util/log');
+
+module.exports = function initConfig() {
+  const customConfigName = '.intlconfig.js'
+
+  const customConfig = getCustomConfig();
+
+  if (customConfig) {
+    console.log(`${customConfigName}已存在，请手动删除本地已经有的配置文件再重新执行 npm run intl-init`);
+    return;
+  }
+
+  // 默认生成的配置文件，不需要给出全量可配置属性
+  const ignoreAttributes = [
+    'primaryRegx',
+    'importCode',
+    'i18nObject',
+    'i18nMethod',
+    'i18nDefaultFunctionKey',
+    'specialFileReg',
+    'baseURL',
+  ];
+  const defaultConfig = getDefaultConfig(ignoreAttributes);
+
+  const code = `module.exports = ${JSON.stringify(defaultConfig, null, 2)};`;
+
+  file.write(
+    customConfigName,
+    prettier.format(code, { ...defaultConfig.prettier, parser: 'babel' })
+  );
+
+  log.success(`初始化配置文件成功：.intlconfig.js`);
+}

package/bin/scripts/initConfig.js

@@ -0,0 +1,3 @@
+const initConfig = require('./conf/initConfig');
+
+module.exports = initConfig;

package/bin/scripts/service/index.js

@@ -24,6 +24,6 @@ exports.searchByZh = (zhs) => {
 };
 
 // 根据词条id获取所有数据库词条信息
-exports.getJson = (ids) => {
-  return axios.post('/getJson', ids);
+exports.getJson = ({ groupName, downloadIds }) => {
+  return axios.post('/getJson', { groupName, downloadIds });
 };

package/bin/scripts/update.js

@@ -5,7 +5,7 @@ const downloadJson = require('./util/downloadJson');
 const log = require('./util/log');
 const file = require('./util/file');
 
-async function replace() {
+async function update() {
   const conf = getConf();
   const files = getTargetFiles(conf);
 
@@ -13,7 +13,7 @@ async function replace() {
   const relationKey = file.readJson('relationKey.json') || {};
 
   const info = transformAst('update', files, conf, relationKey);
-  downloadJson(info.downloadIds);
+  await downloadJson(info.downloadIds);
 
   const needDelete = Boolean(Object.keys(relationKey).length);
   if (needDelete) {
@@ -23,10 +23,10 @@ async function replace() {
     log.success('newWords.json和relationKey.json 已删除');
   }
 
-  log.success('脚本执行成功2222');
+  log.success('脚本执行成功');
 }
 
-// replace();
-module.exports = replace;
+// update();
+module.exports = update;
 
 

package/bin/scripts/util/downloadJson.js

@@ -1,8 +1,17 @@
 const service = require('../service');
 const file = require('./file');
+const log = require('./log');
+const getGroupName = require('./getGroupName');
 
 module.exports = async function downloadJson(downloadIds) {
-  const res = await service.getJson(downloadIds);
+  // 读取groupName
+  const groupName = getGroupName();
+
+  const res = await service.getJson({ groupName, downloadIds });
+  if (res.code !== 10000) {
+    log.error(res.msg);
+    process.exit(1);
+  }
   const { zh, en } = res.data;
   file.write('locales/zh-CN.json', JSON.stringify(zh, null, 2));
   file.write('locales/en-US.json', JSON.stringify(en, null, 2));

package/bin/scripts/util/getGroupName.js

@@ -0,0 +1,15 @@
+const file = require('./file');
+const log = require('./log');
+const getConf = require('../conf');
+
+module.exports = function getGroupName() {
+  const conf = getConf();
+  // 读取packageName
+  const package = file.readJson('package.json');
+  const groupName = package?.[conf.groupNameKey];
+  if (!groupName) {
+    log.error(`package.json中，groupName不能为空`);
+    process.exit(1);
+  }
+  return groupName;
+};

package/bin/scripts/util/getWord.js

@@ -0,0 +1,13 @@
+const file = require('./file');
+
+let wordJson = null;
+// 根据中文配置文件和id，来获取实际的中文
+exports.readWordJson = function (localWordPath) {
+  wordJson = file.readJson(localWordPath);
+  return Boolean(wordJson);
+}
+// 根据中文配置文件和id，来获取实际的中文
+exports.getWord = function (id) {
+  const word = (wordJson || {})[id];
+  return word;
+}

package/bin/scripts/util/makeVisitorCollect.js

@@ -1,30 +1,160 @@
 const log = require('./log');
 const t = require('@babel/types');
+const generate = require('@babel/generator').default;
+const { getWord } = require('./getWord');
+const specialMatch = require('./specialMatch');
+const { FormPath } = require('@formily/antd');
 
-module.exports = function(
+module.exports = function (
   {
     primaryRegx,
     i18nObject,
     i18nMethod,
+    i18nDefaultFunctionKey,
     importCode,
     ignoreLines,
     ignoreMethods,
     ignoreComponents = [],
     ignoreAttributes,
+    intlTag,
+    intlTagIdPath,
+    intlTagDefaultWordPath,
+    intlFunctionName,
+    intlFunctionIdPath,
+    intlFunctionDefaultWordPath,
+    removePkgName,
+    localWordPath,
+    removeFunctionName,
   },
-  returns
+  returns,
+  { filePath, special },
 ) {
+
+  // jsx默认 defaultMessage
+  intlTagDefaultWordPath = intlTagDefaultWordPath || 'defaultMessage';
+
   const { replaceWords, allWords, downloadIds } = returns;
   const hacked = {};
 
+  // 在没有replaceWords的情况下，不用log信息，这里统一处理
+  const properLog = {};
+  Object.keys(log).forEach(fnName => {
+    properLog[fnName] = (...args) => {
+      if (!Object.keys(replaceWords).length) return;
+      log[fnName](...args);
+    }
+  })
+
+  // 获取完整路劲。例如：path='key',返回'0.key'
+  function getFullPath (path) {
+    if (!path) return path;
+    if (typeof path !== 'string') return path;
+    if (/^[0-9]/.test(path)) {
+      return path;
+    }
+
+    let preFixPath = '0';
+    if (!/^\./.test(path)) {
+      preFixPath = '0.';
+    }
+    return preFixPath + path;
+  }
+  // 插入注释
+  function insertFailCommon(node) {
+    const commentStr = ' @chaoswise/intl脚本替换失败 ';
+    const comment = node?.leadingComments?.value
+    if (comment && comment.trim() === commentStr) return;
+    t.addComment(node, 'leading', commentStr);
+  }
+
+  // 获取国际化jsx标签中的id或者defaultMessage
+  function getJsxTagChaoswiseIntlValue(openingElement, intlTagValuePath) {
+    // <Tag id={{ x: ['id'] }} defaultMessage={{ x: ['中文'] }} />
+    // valueAst是{ x: ['id'] }的ast
+    let valueAst;
+    // intlTagValuePath 是 id.x.0
+    // valueKey 是 id
+    // valuePath 是 x.0
+    let valueKey = intlTagValuePath;
+    let valuePath = '';
+
+    const index = (intlTagValuePath || '').indexOf('.');
+    if (index !== -1) {
+      valueKey = intlTagValuePath.slice(0, index);
+      valuePath = intlTagValuePath.slice(index + 1);
+    }
+
+    // <Tag {...props} />不能找到对应的值
+    valueAst = openingElement.attributes.find((item) => {
+      return item?.name?.name === valueKey;
+    })?.value;
+    // intlTagValuePath配置不正确就会找不到value
+    // 比如<Tag id2='id' />  把intlTagValuePath配置为id就不行，因为这里应该是id2
+    if (!valueAst) return false;
+
+    // 如果是jsx容器，就 去掉jsx容器,拿里面的值
+    // 从{{ x: ['id'] }}  变为  { x: ['id'] }
+    if (valueAst.type === 'JSXExpressionContainer') {
+      valueAst = valueAst.expression;
+    }
+
+    // 把ast转为js， 再用FormPath.getIn来取最终的值
+    const { code: valueCode } = generate(valueAst);
+    var chaoswiseIntlValue;
+    try {
+      eval('var chaoswiseIntlValue =' + valueCode);
+      chaoswiseIntlValue = FormPath.getIn(chaoswiseIntlValue, valuePath);
+    } catch (e) {
+      // var a = 'id'; <Tag id={a} 这样会出错
+    }
+
+    if (typeof chaoswiseIntlValue !== 'string') {
+      return false;
+    }
+
+    return chaoswiseIntlValue;
+  }
+
+  // 获取函数名称 fn/object.fn/object.a.b.c/intl.get().d
+  function getFnName(node) {
+    let fnName = '';
+    while (['CallExpression', 'MemberExpression', 'Identifier'].includes(node?.type)) {
+      if (node.type === 'CallExpression') {
+        let name = getFnName(node.callee);
+        fnName = `${name}().` + fnName;
+        break;
+      } else if (node.type === 'MemberExpression') {
+        fnName = `${node.property.name}.` + fnName;
+        if (node.object.name) {
+          fnName = `${node.object.name}.` + fnName;
+        }
+        node = node.object;
+      } else if (node.type === 'Identifier') {
+        // 这里获取修饰器的函数名称
+        fnName = fnName || (node.name + '.')
+        break;
+      }
+    }
+
+    // 把最后的 点. 取消
+    fnName = fnName.slice(0, -1);
+    return fnName;
+  }
+
   // XXX: [TRICKY] 防止中文转码为 unicode
   function hackValue(value, id) {
     if (id) hacked[id] = true;
 
+    // 字符串默认是单引号，如果模板字符串中出现单引号，需要转义，把 ' 换成 \'
+    // 就算用户自定配置字符串为双引号，也没事，默认会转义双引号，但是默认不会处理单引号，所以自己手动处理
+    if (/\'/.test(id)) {
+      id = id.replace(/\'/g, '\\\'');
+    }
+
     return Object.assign(t.StringLiteral(value), {
       extra: {
         raw: `'${id}'`, // id
-        rawValue: value, // zh
+        rawValue: value, // word
       },
     });
   }
@@ -37,8 +167,12 @@ module.exports = function(
     return false;
   }
 
-  // 是否命中替换的正则
+  // 是否命中替换条件
   function isPrimary(str) {
+    if (special) {
+      // 如果匹配到了替换过的，就返回false。为了防止多次执行collect，多次嵌套替换
+      if (specialMatch(str)) return false;
+    }
     return primaryRegx.test(str);
   }
 
@@ -58,28 +192,37 @@ module.exports = function(
   function makeObjectExpression(obj) {
     if (Object.prototype.toString.call(obj) !== '[object Object]') return null;
 
-    // 存储每一项变量
-    const ObjectPropertyArr = [];
-    Object.keys(obj).forEach((k) => {
-      const node = obj[k].value;
-      // 模板字符串中，变量存在函数调用的情况下：如果当前变量为函数，那么需要处理函数的中文参数，比如：`hello ${getText('中文')}`
-      if (!shouldIgnore(node) && node?.type === 'CallExpression') {
-        node.arguments = dealArgs(node.arguments);
-      }
-      ObjectPropertyArr.push(
-        t.ObjectProperty(
+    // 模板字符串中，转换后，如果第二项参数还有中文，或者更深层级有中文，这里处理好
+    // 模板字符串转换前`${f(`aa${f('中文')}中文`)}中文`
+    /* 转换后
+    intl
+      .get('id1', {
+        slot0: f(
+          intl
+            .get('id2', { slot0: f(intl.get('id3').d('中文')) })
+            .d('aa{slot0}中文')
+        ),
+      })
+      .d('{slot0}中文');
+   */
+    const keys = Object.keys(obj);
+    const datas = dealArgs(Object.values(obj).map(item => item.value || item));
+
+    return t.ObjectExpression(
+      keys.map((k, i) => {
+        const node = datas[i];
+        return t.ObjectProperty(
           t.Identifier(k),
-          obj[k].isAstNode ? obj[k].value : t.Identifier(obj[k])
+          obj[k].isAstNode ? node : t.Identifier(obj[k])
         )
-      );
-    });
-    return t.ObjectExpression(ObjectPropertyArr);
+      })
+    );
   }
 
   // 更新allWords
-  function updateWordsInfo(zh) {
-    if (allWords.includes(zh)) return;
-    allWords.push(zh);
+  function updateWordsInfo(word) {
+    if (allWords.includes(word)) return;
+    allWords.push(word);
   }
 
   // 处理函数的argments
@@ -87,7 +230,7 @@ module.exports = function(
     if (!Array.isArray(args)) return args;
     const resArgs = []; // 参数处理完，用resArgs保存
     args.forEach(node => {
-       // 字符串变量
+      // 字符串变量
       if (node.type === 'StringLiteral' && isPrimary(node.value)) {
         resArgs.push(makeReplace(node.value));
       }
@@ -141,6 +284,11 @@ module.exports = function(
     // 将中文词条替换为国际化api:init.t(id/key)
     const id = replaceWords[value];
 
+    // 特殊文件处理
+    if (special) {
+      const str = `${i18nObject ? `${i18nObject}.` : ''}${i18nMethod}("${id}").${i18nDefaultFunctionKey}("${value}")`;
+      return hackValue(str, str,);
+    }
     // 生成新的ast节点
     const v = hackValue(value, id);
     const objExp = makeObjectExpression(variables);
@@ -157,7 +305,7 @@ module.exports = function(
             : t.identifier(i18nMethod),
           objExp ? [v, objExp] : [v]
         )
-        , t.identifier('d')
+        , t.identifier(i18nDefaultFunctionKey)
       ),
       [defaultV]
     );
@@ -230,67 +378,119 @@ module.exports = function(
     }
     return { needReplace, value };
   }
+
   // 函数表达式
   function dealCallExpressionNode(node) {
     const res = {
       needReplace: false,
       value: null,
       skip: false,
+      remove: false,
     }
     if (shouldIgnore(node)) {
       res.skip = true;
       return res;
     }
 
+    const fnName = getFnName(node.callee);
+
     // 处理 ignoreMethods
-    if (node.callee.type === 'MemberExpression') {
-      let parentNode = '';
-      if (node.callee.object.name) {
-        parentNode = node.callee.object.name;
-      } else if (node.callee.object.property) {
-        // 处理忽略类似 a.b.c 方法情况
-        parentNode = node.callee.object.property.name;
-      }
+    if ([
+      ...(ignoreMethods || []),
+      `${i18nObject}.${i18nMethod}`, // intl.get
+      `${i18nObject}.${i18nMethod}().${i18nDefaultFunctionKey}`, // intl.get().d
+    ].includes(fnName)) {
+      res.skip = true;
+      return res;
+    }
 
-      const callExpression = `${parentNode}.${node.callee.property.name}`;
+    // 需要删除的函数
+    if (removeFunctionName.includes(fnName)) {
+      // 文件需要修改
+      returns.hasTouch = true;
+      res.remove = true;
+      return res;
+    }
+
+    // 已经做过国际化的项目，替换国际化函数
+    if (fnName === intlFunctionName) {
+      res.skip = true;
 
-      if (ignoreMethods.includes(callExpression)) {
-        res.skip = true;
-        return res;
+      const argsAst = node.arguments;
+      // 把ast转为js， 再用FormPath.getIn来取最终的值
+      const { code: argsCode } = generate(t.arrayExpression(argsAst));
+      let chaoswiseIntlId
+      var chaoswiseIntlIdData
+      try {
+        eval('var chaoswiseIntlIdData =' + argsCode);
+        chaoswiseIntlId = FormPath.getIn(chaoswiseIntlIdData, getFullPath(intlFunctionIdPath));
+      } catch (e) {
+        // var a = 'id'; f(a) 这样会出错
+        // TODO
       }
-    }
 
-    if (node.callee.type === 'Identifier') {
-      if (ignoreMethods.includes(node.callee.name)) {
-        res.skip = true;
-        return res;
+      let value = getWord(chaoswiseIntlId);
+      if (!value) {
+        let defautValue = FormPath.getIn(chaoswiseIntlIdData, getFullPath(intlFunctionDefaultWordPath));
+        if (typeof defautValue === 'string') {
+          value = defautValue;
+        } else {
+          if (intlFunctionIdPath && !chaoswiseIntlId) {
+            properLog.warn(`intlFunctionIdPath配置有误,在文件${filePath}中函数为${intlFunctionName},按照intlFunctionIdPath(${intlFunctionIdPath})未找到对应的数据`)
+          }
+          if (localWordPath && chaoswiseIntlId && !value) {
+            properLog.warn(`在${localWordPath}中未找到id为${chaoswiseIntlId}的数据`)
+          }
+          if (intlFunctionDefaultWordPath) {
+            properLog.warn(`intlFunctionDefaultWordPath配置有误,在文件${filePath}中函数为${intlFunctionName},按照intlFunctionDefaultWordPath(${intlFunctionDefaultWordPath})未找到对应的数据`)
+          }
+          insertFailCommon(node);
+        }
+      }
+
+      if (value && isPrimary(value)) {
+        res.needReplace = true;
+        res.value = value;
       }
     }
 
     return res;
   }
 
+  // TODO
+  /* 
+  this.props.intl = lang === 'zh'? '中文': 'en'
+  intl.get(id).d('中文')
+  this.props.intl.lang = 'zh' ==> intl.lang = 'zh'
+  replaceName: { ['this.props.intl.lang']: () => 'intl.lang' }
+  或者replaceName: { ['this.props.intl.lang']: 'intl.lang' }
+  */
   return {
     // 导入声明，比如：import foo from "mod";
     ImportDeclaration(path) {
       // 是否已经导入过 intl 的依赖
       const m = importCode.match(/from ["'](.*)["']/);
       const pkgName = m ? m[1] : '';
-      if (path.node.source.value === pkgName) {
+      const name = path.node.source.value;
+      if (name === pkgName) {
         returns.hasImport = true;
       }
+      if (removePkgName.includes(name)) {
+        path.remove();
+        returns.hasTouch = true;
+      }
       path.skip();
     },
 
-    // 字符串模版，比如：`我的${bar}${fun('哈哈')}中文` intl.t(我的{bar}{slot1}中文,{bar:fdsafdsdf,slot1:fn()})
+    // 字符串模版，比如：`我的${bar}${fun('哈哈')}中文` intl.get(我的{bar}{slot1}中文,{bar:fdsafdsdf,slot1:fn()})
     TemplateLiteral(path) {
       const { node } = path;
 
       const { needReplace, value, variable, } = dealTemplateLiteralNode(node);
       if (needReplace) {
         path.replaceWith(makeReplace(value, Object.keys(variable).length ? variable : null));
+        path.skip();
       }
-      path.skip();
     },
 
     // 字符串变量
@@ -307,7 +507,18 @@ module.exports = function(
         path.replaceWith(res);
         path.skip();
       } else if (isPrimary(value)) {
-        log.warn('ignore 1!!!!!!', value);
+        properLog.warn('ignore 1!!!!!!', value);
+      }
+    },
+
+    // 修饰器
+    Decorator(path) {
+      const { node } = path;
+      const fnName = getFnName(node.expression);
+      if (removeFunctionName.includes(fnName)) {
+        returns.hasTouch = true;
+        path.remove();
+        path.skip();
       }
     },
 
@@ -315,13 +526,83 @@ module.exports = function(
     CallExpression(path) {
       const { node } = path;
 
-      const { needReplace, value, skip } = dealCallExpressionNode(node);
+      const { needReplace, value, skip, remove } = dealCallExpressionNode(node);
+      
+      if (remove) {
+        if (node.arguments.length === 1) {
+          // 去掉外侧的包裹组件
+          path.replaceWith(node.arguments[0]);
+        } else {
+          // f( 1, 2)
+          //  1, 2
+          // 移除函数有问题，这里不处理
+        }
+
+        return;
+      }
+
       if (needReplace) {
         path.replaceWith(makeReplace(value));
       }
       if (skip) path.skip();
     },
 
+    // jsx标签
+    JSXElement(path) {
+      const { node } = path;
+      const { openingElement } = node;
+      const jsxName = openingElement.name.name;
+
+      // 不解析jsx中的style标签
+      if (ignoreComponents.includes(jsxName)) {
+        path.skip();
+        return;
+      }
+
+      // 如果是配置的国际化jsx标签
+      if (!shouldIgnore(node) && intlTag && jsxName === intlTag) {
+
+        let id = getJsxTagChaoswiseIntlValue(openingElement, intlTagIdPath || 'id');
+
+        let word = getWord(id);
+
+        if (!word) {
+          // 根据id找不到中文，就找jsx标签的默认中文
+          let defaultValue = getJsxTagChaoswiseIntlValue(openingElement, intlTagDefaultWordPath);
+          if (typeof defaultValue === 'string') {
+            word = defaultValue;
+          } else {
+            if (!intlTagIdPath) {
+              properLog.warn(`intlTagIdPath未配置`);
+            } else {
+              if (!id) {
+                properLog.warn(`intlTagIdPath配置有误，文件${filePath}`);
+              } else {
+                // word找不到
+                localWordPath && properLog.warn(`在${localWordPath}中未找到id为${id}的中文`);
+              }
+            }
+            if (defaultValue === false) {
+              properLog.warn(`intlTagDefaultWordPath配置有误，文件${filePath}`);
+            }
+            insertFailCommon(node);
+          }
+        }
+        if (word && isPrimary(word)) {
+          // 替换国际化标签，<FormatMessage id='zhongwenid' defaultMessage="中文" />  换成 {intl.get(id).d('中文')}
+          const parentNodeType = path.parentPath?.node?.type;
+          let res = makeReplace(word);
+
+          // 如果节点的父节点是JSXFragment或者JSXElement，那么就包一层JSXExpressionContainer
+          if (['JSXFragment', 'JSXElement'].includes(parentNodeType)) {
+            res = t.JSXExpressionContainer(res);
+          }
+          path.replaceWith(res);
+        }
+        path.skip();
+      }
+    },
+
     // JSX文本节点
     JSXText(path) {
       const { node } = path;

package/bin/scripts/util/makeVisitorUpdate.js

@@ -1,12 +1,16 @@
 const t = require('@babel/types');
+const specialMatch = require('./specialMatch');
 
 module.exports = function f(
   {
     i18nObject,
     i18nMethod,
     importCode,
+    ignoreLines,
+    i18nDefaultFunctionKey,
   },
-  returns
+  returns,
+  { special },
 ) {
   const { replaceWords, downloadIds } = returns;
 
@@ -33,6 +37,14 @@ module.exports = function f(
     return str.trim().replace(/\s+/g, ' ');
   }
 
+  // 是否忽略
+  function shouldIgnore(node) {
+    if (node?.loc) {
+      return ignoreLines.includes(node.loc.start.line);
+    }
+    return false;
+  }
+
   // 处理模板字符串中的变量
   function makeObjectExpression(obj) {
     if (Object.prototype.toString.call(obj) !== '[object Object]') return null;
@@ -118,6 +130,31 @@ module.exports = function f(
   }
 
   return {
+    // 字符串变量  src/config/router.config.js中的id进行替换
+    StringLiteral(path) {
+      const { node } = path;
+      let { value } = node;
+
+      if (!shouldIgnore(node) && special) {
+        // intl.get('id').d(中文) 获取id和中文
+        const { id, defaultValue } = specialMatch(value) || {};
+        if (!id) return;
+
+        const finalyId = replaceWords[id];
+        if (finalyId) {
+          returns.hasTouch = true;
+          downloadIds.push(finalyId);
+
+          const str = `${i18nObject ? `${i18nObject}.` : ''}${i18nMethod}("${finalyId}").${i18nDefaultFunctionKey}("${defaultValue}")`;
+          const newStr = hackValue(str, str,);
+          path.replaceWith(newStr);
+          path.skip();
+        } else {
+          downloadIds.push(id);
+        }
+      }
+    },
+
     // 导入声明，比如：import foo from "mod";
     ImportDeclaration(path) {
       // 是否已经导入过 intl 的依赖

package/bin/scripts/util/specialMatch.js

@@ -0,0 +1,14 @@
+const getConf = require('../conf');
+
+let reg;
+
+module.exports = function (str) {
+  if (!reg) {
+    const conf = getConf();
+    const { i18nObject, i18nMethod, i18nDefaultFunctionKey } = conf;
+    reg = new RegExp(`${i18nObject? `${i18nObject}\\.`: ''}${i18nMethod}\\([\\'\\"]([^\\)]*)[\\'\\"]\\)\\.${i18nDefaultFunctionKey}\\([\\'\\"]([^\\)]*)[\\'\\"]\\)`);
+  }
+  const res = str.match(reg);
+  if (!res) return;
+  return { id: res[1], defaultValue: res[2] };
+}

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}
+      ${e}`)
+      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/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.1.0",
   "author": "cloudwiser",
   "description": "intl",
   "main": "lib/index.js",
@@ -67,13 +67,13 @@
     "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"
   },
@@ -81,5 +81,6 @@
     "react": "^16.13.1",
     "react-dom": "^16.13.1"
   },
-  "license": "MIT"
+  "license": "MIT",
+  "gitHead": "6ed1475f01a4130625bbed5cf0a4daadde68d43e"
 }