ztxkutils 2.10.66-13-beta → 2.10.66-14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkutils",
-  "version": "2.10.66-13-beta",
+  "version": "2.10.66-14",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -52,17 +52,6 @@
     "ztxkui": "^0.4.1"
   },
   "dependencies": {
-    "crypto-js": "^4.1.1",
-    "decimal.js-light": "^2.5.1",
-    "dexie": "^3.2.3",
-    "i18next": "^23.16.4",
-    "js-base64": "^3.6.0",
-    "jwt-decode": "^3.1.2",
-    "screenfull": "^5.1.0",
-    "sockjs-client": "^1.5.1",
-    "stompjs": "^2.3.3",
-    "zt-sockjs-client": "^0.0.2",
-    "zt-stompjs": "^1.1.2",
     "@babel/core": "^7.18.10",
     "@babel/generator": "^7.18.0",
     "@babel/plugin-proposal-optional-chaining": "^7.18.9",
@@ -82,17 +71,29 @@
     "@prettier/plugin-pug": "^1.8.1",
     "@typescript-eslint/typescript-estree": "^3.8.0",
     "@vitalets/google-translate-api": "^8.0.0",
+    "babel-template": "^6.26.0",
     "chalk": "^3.0.0",
+    "commander": "^2.18.0",
+    "crypto-js": "^4.1.1",
+    "decimal.js-light": "^2.5.1",
+    "dexie": "^3.2.3",
+    "di18n-core": "^0.1.29",
     "glob": "^7.1.6",
+    "i18next": "^23.16.4",
+    "inquirer": "^6.2.2",
+    "js-base64": "^3.6.0",
+    "jwt-decode": "^3.1.2",
     "mustache": "^4.0.1",
     "parse5": "^5.1.1",
     "pug-lexer": "^4.1.0",
     "pug-parser": "^5.0.1",
     "pug-source-gen": "0.0.2",
-    "babel-template": "^6.26.0",
-    "commander": "^2.18.0",
-    "di18n-core": "^0.1.29",
-    "inquirer": "^6.2.2"
+    "screenfull": "^5.1.0",
+    "sockjs-client": "^1.5.1",
+    "stompjs": "^2.3.3",
+    "vue-template-compiler": "^2.7.16",
+    "zt-sockjs-client": "^0.0.2",
+    "zt-stompjs": "^1.1.2"
   },
   "peerDependencies": {
     "axios": ">=0.21.1",

package/zti18n-cli/bin/index.js

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 
-require("../");
+require('../');

package/zti18n-cli/index.js

@@ -12,7 +12,7 @@ program
   .on('--help', function () {
     console.log('  Examples:');
     console.log();
-    console.log('    $ di18n init -c ./config/prod.config.js');
+    console.log('    $ zti18n init -c ./config/prod.config.js');
     console.log();
   });
 

package/zti18n-cli/src/command/initFileConf.js

@@ -10,7 +10,7 @@ const log = require('../utils/log');
 
 function getLocaleFiles({ path, exclude }) {
   return glob.sync(`${path}/**/*.json`, {
-    ignore: (exclude || []).map(e => `${path}/${e}`),
+    ignore: (exclude || []).map((e) => `${path}/${e}`),
   });
 }
 
@@ -18,7 +18,7 @@ async function doInquire() {
   // 1. whether overwrite?
   let configExist = true;
   try {
-    fs.accessSync('./di18n.config.js');
+    fs.accessSync('./zti18n.config.js');
   } catch (e) {
     configExist = false;
   }
@@ -28,7 +28,7 @@ async function doInquire() {
       {
         name: 'overwrite',
         type: 'confirm',
-        message: '配置文件 di18n.config.js 已存在，是否覆盖？',
+        message: '配置文件 zti18n.config.js 已存在，是否覆盖？',
       },
     ]);
 
@@ -67,14 +67,12 @@ module.exports = async function initFileConf(isVue) {
 
   // 配置信息写入文件
   fs.writeFileSync(
-    './di18n.config.js',
-    prettier.format(
-      'module.exports = ' + JSON.stringify(options), {
-        parser: 'babel',
-        singleQuote: true,
-        trailingComma: 'es5',
-      }
-    ),
+    './zti18n.config.js',
+    prettier.format('module.exports = ' + JSON.stringify(options), {
+      parser: 'babel',
+      singleQuote: true,
+      trailingComma: 'es5',
+    }),
     'utf8'
   );
 
@@ -86,7 +84,7 @@ module.exports = async function initFileConf(isVue) {
     const locales = getLocaleFiles({ path: localePath });
 
     // 读取国际化资源
-    const data = locales.map(element => {
+    const data = locales.map((element) => {
       // TODO: 支持国际化资源为 js 文件的情况，目前只支持为 json 文件。
       const json = fs.readFileSync(element, {
         encoding: 'utf-8',
@@ -105,13 +103,13 @@ module.exports = async function initFileConf(isVue) {
     createTasks = data.map(({ confName, value, key }) => {
       let commentValue = {};
       if (key !== options.primaryLocale) {
-        commentValue = data.find(d => d.key === options.primaryLocale).value;
+        commentValue = data.find((d) => d.key === options.primaryLocale).value;
       }
       return confService.createConf(confName, value, commentValue, key);
     });
   } else {
     // 首次国际化，只需要创建配置
-    createTasks = options.supportedLocales.map(key => {
+    createTasks = options.supportedLocales.map((key) => {
       const value = { TBD: 'TBD' }; // 创建配置时，必须要有一个 k/V
       const confName = key; // 初始化时，先创建测试环境的配置
       return confService.createConf(confName, value, {}, key);
@@ -124,7 +122,7 @@ module.exports = async function initFileConf(isVue) {
 
   // 将已有国际化资源的配置发布
   if (!firstI18n) {
-    const publishTasks = options.supportedLocales.map(key => {
+    const publishTasks = options.supportedLocales.map((key) => {
       return confService.publishConf(`${key}-test`);
     });
 

package/zti18n-cli/src/command/publish.js

@@ -14,7 +14,7 @@ module.exports = async function publish(programOption, env = '') {
     confService = new Conf(options.localeConf);
   }
 
-  const publishTasks = options.supportedLocales.map(key => {
+  const publishTasks = options.supportedLocales.map((key) => {
     return confService.publishConf(`${key}-${env}`);
   });
 

package/zti18n-cli/src/conf/FileConf.js

@@ -27,11 +27,9 @@ module.exports = class FileConf extends BaseConf {
    * @param {string} key       locales标识
    */
   createConf(confName, values, refValues, key) {
-    const folder = (
-      this.localesDir.startsWith('/')
-        ? this.localesDir
-        : path.join(cwdPath, this.localesDir)
-    );
+    const folder = this.localesDir.startsWith('/')
+      ? this.localesDir
+      : path.join(cwdPath, this.localesDir);
 
     try {
       fs.accessSync(folder);
@@ -41,7 +39,7 @@ module.exports = class FileConf extends BaseConf {
 
     const configFilePath = path.join(folder, `${key}.json`);
     return new Promise((resolve, reject) => {
-      fs.writeFile(configFilePath, JSON.stringify(values, null, 2), err => {
+      fs.writeFile(configFilePath, JSON.stringify(values, null, 2), (err) => {
         if (err) {
           reject(err);
         } else {
@@ -60,8 +58,8 @@ module.exports = class FileConf extends BaseConf {
    */
   updateConf(confName, values, refValues, key) {
     const configFilePath = path.join(cwdPath, this.localesDir, `${key}.json`);
-    return new Promise(resolve => {
-      fs.writeFile(configFilePath, JSON.stringify(values, null, 2), err => {
+    return new Promise((resolve) => {
+      fs.writeFile(configFilePath, JSON.stringify(values, null, 2), (err) => {
         if (err) {
           resolve({
             code: -1,
@@ -92,13 +90,15 @@ module.exports = class FileConf extends BaseConf {
           data = content.length > 0 ? JSON.parse(content) : {};
           resolve({
             code: 0,
-            data: Object.keys(data).map(k => ({
+            data: Object.keys(data).map((k) => ({
               key: k,
               value: data[k],
             })),
           });
         } catch (err) {
-          reject(new Error(`请检查 ${configFilePath} 资源文件 JSON 格式是否正确`));
+          reject(
+            new Error(`请检查 ${configFilePath} 资源文件 JSON 格式是否正确`)
+          );
         }
       } else {
         reject(new Error(`资源文件 ${configFilePath} 不存在`));

package/zti18n-cli/src/index.js

@@ -3,7 +3,7 @@ const convert = require('./command/convert');
 const convert2 = require('./command/convert2');
 const collect = require('./command/collect');
 const publish = require('./command/publish');
-const option = require('../package.json');
+const option = require('../../package.json');
 
 module.exports = program;
 
@@ -26,9 +26,9 @@ program
     console.log('  Examples:');
     console.log();
     console.log('  sync without publish:');
-    console.log('    $ di18n sync -c ./config/prod.config.js');
+    console.log('    $ zti18n sync -c ./config/prod.config.js');
     console.log('  sync and then publish:');
-    console.log('    $ di18n sync -p -c ./config/prod.config.js');
+    console.log('    $ zti18n sync -p -c ./config/prod.config.js');
     console.log();
   });
 
@@ -41,7 +41,7 @@ program
   .on('--help', function () {
     console.log('  Examples:');
     console.log();
-    console.log('    $ di18n publish');
+    console.log('    $ zti18n publish');
     console.log();
   });
 
@@ -56,7 +56,7 @@ program
   .on('--help', function () {
     console.log('  Examples:');
     console.log();
-    console.log('    $ di18n convert -c ./config/prod.config.js');
+    console.log('    $ zti18n convert -c ./config/prod.config.js');
     console.log();
   });
 
@@ -70,6 +70,6 @@ program
   .on('--help', function () {
     console.log('  Examples:');
     console.log();
-    console.log('    $ di18n convert2 -c ./config/prod.config.js');
+    console.log('    $ zti18n convert2 -c ./config/prod.config.js');
     console.log();
   });

package/zti18n-cli/src/utils/log.js

@@ -1,8 +1,8 @@
 const chalk = require('chalk');
 
 module.exports = {
-  info: msg => console.log(chalk.cyan(msg)),
-  warning: msg => console.log(chalk.yellow(msg)),
-  success: msg => console.log(chalk.green(msg)),
-  error: msg => console.log(chalk.red(msg)),
+  info: (msg) => console.log(chalk.cyan(msg)),
+  warning: (msg) => console.log(chalk.yellow(msg)),
+  success: (msg) => console.log(chalk.green(msg)),
+  error: (msg) => console.log(chalk.red(msg)),
 };

package/zti18n-cli/src/utils/mergeOptions.js

@@ -7,11 +7,11 @@ const cwdPath = process.cwd();
 
 module.exports = function mergeOptions(programOption, programParameter) {
   const options = defaultOptions;
-  const configFileName = programOption.config || 'di18n.config.js';
+  const configFileName = programOption.config || 'zti18n.config.js';
 
   const configFilePath = path.join(cwdPath, configFileName);
 
-  // 读取 di18n-ast.config.js 中设置的参数，然后并入 options
+  // 读取 zti18n-ast.config.js 中设置的参数，然后并入 options
   if (fs.existsSync(configFilePath)) {
     let configurationFile = {};
     try {
@@ -30,7 +30,7 @@ module.exports = function mergeOptions(programOption, programParameter) {
   }
 
   // 处理命令行参数
-  programParameter.forEach(k => {
+  programParameter.forEach((k) => {
     const value = programOption[k];
     if (value) {
       if (k === 'exclude' && typeof value === 'string') {

package/zti18n-cli/src/utils/reactOptions.js

@@ -45,7 +45,6 @@ module.exports = {
   supportedLocales: ['zh-CN', 'en-US'],
 
   // import codes, <string>
-  // e.g. "import { intl } from 'di18n-react';"
   importCode: "import { intl } from 'di18n-react';",
 
   // i18n object, <string>

package/zti18n-cli/src/utils/vueOptions.js

@@ -45,7 +45,6 @@ module.exports = {
   supportedLocales: ['zh-CN', 'en-US'],
 
   // import codes, <string>
-  // e.g. "import { intl } from 'di18n-vue';"
   importCode: "import { intl } from 'di18n-vue';",
 
   // i18n object, <string>

package/zti18n-core/src/plugin/reactIntlToReactIntlUniversal.js

@@ -1,7 +1,7 @@
 const t = require('@babel/types');
 const log = require('../utils/log');
 
-const isChinese = function(text) {
+const isChinese = function (text) {
   return /[\u4e00-\u9fa5]/.test(text);
 };
 
@@ -52,7 +52,7 @@ function getPlugin(zhData, outObj) {
     });
   }
 
-  const plugin = function({ types: t }) {
+  const plugin = function ({ types: t }) {
     return {
       visitor: {
         ImportDeclaration(path) {
@@ -80,11 +80,11 @@ function getPlugin(zhData, outObj) {
 
           // 替换类似 this.props.intl.locale === 'en' 为 intl.options.currentLocale === 'en-US'
           if (
-            node.operator === '==='
-            && node.right.type === 'StringLiteral'
-            && node.right.value === 'en'
-            && node.left.type === 'MemberExpression'
-            && node.left.property.name === 'locale'
+            node.operator === '===' &&
+            node.right.type === 'StringLiteral' &&
+            node.right.value === 'en' &&
+            node.left.type === 'MemberExpression' &&
+            node.left.property.name === 'locale'
           ) {
             outObj.needRewrite = true;
             log.info("replace intl.locale === 'en'");
@@ -105,15 +105,15 @@ function getPlugin(zhData, outObj) {
           }
 
           if (
-            (parent.init.type === 'Identifier'
-              && parent.init.name === 'props')
-            || (parent.init.type === 'MemberExpression'
-              && parent.init.property.name === 'props')
+            (parent.init.type === 'Identifier' &&
+              parent.init.name === 'props') ||
+            (parent.init.type === 'MemberExpression' &&
+              parent.init.property.name === 'props')
           ) {
             // 处理掉 let { params, intl } = this.props; 中的 intl
             log.info('remove: this.props.intl');
             node.properties = node.properties.filter(
-              p => !p.value || p.value.name !== 'intl'
+              (p) => !p.value || p.value.name !== 'intl'
             );
           }
         },
@@ -124,7 +124,7 @@ function getPlugin(zhData, outObj) {
             outObj.needRewrite = true;
 
             const idNode = openingElement.attributes.find(
-              atr => atr.name.name === 'id'
+              (atr) => atr.name.name === 'id'
             );
 
             const id = idNode.value.value
@@ -132,7 +132,7 @@ function getPlugin(zhData, outObj) {
               : idNode.value.expression;
 
             const valuesNode = openingElement.attributes.find(
-              atr => atr.name.name === 'values'
+              (atr) => atr.name.name === 'values'
             );
             let callExpression;
 
@@ -173,7 +173,7 @@ function getPlugin(zhData, outObj) {
 
           const handleFormatMessageMethod = () => {
             const id = node.arguments[0].properties.find(
-              prop => prop.key.name === 'id'
+              (prop) => prop.key.name === 'id'
             ).value.value;
             outObj.needRewrite = true;
 
@@ -197,10 +197,10 @@ function getPlugin(zhData, outObj) {
           if (node.callee.type === 'MemberExpression') {
             if (node.callee.property.name === 'formatMessage') {
               if (
-                (node.callee.object.property
-                  && node.callee.object.property.name === 'intl')
-                || (node.callee.object.type === 'Identifier'
-                  && node.callee.object.name === 'intl')
+                (node.callee.object.property &&
+                  node.callee.object.property.name === 'intl') ||
+                (node.callee.object.type === 'Identifier' &&
+                  node.callee.object.name === 'intl')
               ) {
                 handleFormatMessageMethod();
               }

package/zti18n-core/src/plugin/reactIntlUniversalToDi18n.js

@@ -1,6 +1,6 @@
 const t = require('@babel/types');
 
-const replaceLineBreak = function(value) {
+const replaceLineBreak = function (value) {
   if (typeof value !== 'string') return value;
   return value.replace(/\n/g, ' ');
 };
@@ -30,14 +30,17 @@ function getPlugin(outObj, allConverted, intlAlias = 'intl') {
     );
   }
 
-  const plugin = function() {
+  const plugin = function () {
     return {
       visitor: {
         CallExpression(path) {
           const { node } = path;
 
           if (node.callee.type === 'MemberExpression') {
-            if (path.node.callee.object.name === intlAlias && path.node.callee.property.name === 'get') {
+            if (
+              path.node.callee.object.name === intlAlias &&
+              path.node.callee.property.name === 'get'
+            ) {
               const args = path.node.arguments;
 
               const orignKey = args[0].value;
@@ -45,7 +48,9 @@ function getPlugin(outObj, allConverted, intlAlias = 'intl') {
 
               const value = path.parentPath.parent.arguments[0].value;
 
-              path.parentPath.parentPath.replaceWith(makeReplace({ orignKey, value, variableObj }));
+              path.parentPath.parentPath.replaceWith(
+                makeReplace({ orignKey, value, variableObj })
+              );
             }
           }
         },

package/zti18n-core/src/transform/defaultPkMap.js

@@ -1,79 +1,79 @@
 // 当使用 HTML 模板时，由于大小写不敏感，为了避免转换中丢失大小写，需要提供组件的 Pascal 到 kebab 形式映射
 // 默认的如下（iview: https://github.com/iview/iview-loader/blob/master/src/tag-map.js）
 module.exports = {
-  'Switch': 'i-switch',
-  'Circle': 'i-circle',
-  'Affix': 'i-affix',
-  'Alert': 'i-alert',
-  'AnchorLink': 'i-anchor-link',
-  'Anchor': 'i-anchor',
-  'AutoComplete': 'i-auto-complete',
-  'Avatar': 'i-avatar',
-  'BackTop': 'i-back-top',
-  'Badge': 'i-badge',
-  'BreadcrumbItem': 'i-breadcrumb-item',
-  'Breadcrumb': 'i-breadcrumb',
-  'ButtonGroup': 'i-button-group',
-  'Button': 'i-button',
-  'Card': 'i-card',
-  'CarouselItem': 'i-carousel-item',
-  'Carousel': 'i-carousel',
-  'Cascader': 'i-cascader',
-  'CellGroup': 'i-cell-group',
-  'Cell': 'i-cell',
-  'CheckboxGroup': 'i-checkbox-group',
-  'Checkbox': 'i-checkbox',
-  'Col': 'i-col',
-  'Collapse': 'i-collapse',
-  'ColorPicker': 'i-color-picker',
-  'Content': 'i-content',
-  'DatePicker': 'i-date-picker',
-  'Divider': 'i-divider',
-  'Drawer': 'i-drawer',
-  'DropdownItem': 'i-dropdown-item',
-  'DropdownMenu': 'i-dropdown-menu',
-  'Dropdown': 'i-dropdown',
-  'Footer': 'i-footer',
-  'FormItem': 'i-form-item',
-  'Form': 'i-form',
-  'Header': 'i-header',
-  'Icon': 'i-icon',
-  'InputNumber': 'i-input-number',
-  'Input': 'i-input',
-  'Layout': 'i-layout',
-  'Menu': 'i-menu',
-  'MenuGroup': 'i-menu-group',
-  'MenuItem': 'i-menu-item',
-  'Sider': 'i-sider',
-  'Submenu': 'i-submenu',
-  'Modal': 'i-modal',
-  'OptionGroup': 'i-option-group',
-  'Option': 'i-option',
-  'Page': 'i-page',
-  'Panel': 'i-panel',
-  'Poptip': 'i-poptip',
-  'Progress': 'i-progress',
-  'RadioGroup': 'i-radio-group',
-  'Radio': 'i-radio',
-  'Rate': 'i-rate',
-  'Row': 'i-row',
-  'Scroll': 'i-scroll',
-  'Select': 'i-select',
-  'Slider': 'i-slider',
-  'Spin': 'i-spin',
-  'Split': 'i-split',
-  'Step': 'i-step',
-  'Steps': 'i-steps',
-  'Table': 'i-table',
-  'Tabs': 'i-tabs',
-  'TabPane': 'i-tab-pane',
-  'Tag': 'i-tag',
-  'TimelineItem': 'i-timeline-item',
-  'Timeline': 'i-timeline',
-  'TimePicker': 'i-time-picker',
-  'Time': 'i-time',
-  'Tooltip': 'i-tooltip',
-  'Transfer': 'i-transfer',
-  'Tree': 'i-tree',
-  'Upload': 'i-upload',
+  Switch: 'i-switch',
+  Circle: 'i-circle',
+  Affix: 'i-affix',
+  Alert: 'i-alert',
+  AnchorLink: 'i-anchor-link',
+  Anchor: 'i-anchor',
+  AutoComplete: 'i-auto-complete',
+  Avatar: 'i-avatar',
+  BackTop: 'i-back-top',
+  Badge: 'i-badge',
+  BreadcrumbItem: 'i-breadcrumb-item',
+  Breadcrumb: 'i-breadcrumb',
+  ButtonGroup: 'i-button-group',
+  Button: 'i-button',
+  Card: 'i-card',
+  CarouselItem: 'i-carousel-item',
+  Carousel: 'i-carousel',
+  Cascader: 'i-cascader',
+  CellGroup: 'i-cell-group',
+  Cell: 'i-cell',
+  CheckboxGroup: 'i-checkbox-group',
+  Checkbox: 'i-checkbox',
+  Col: 'i-col',
+  Collapse: 'i-collapse',
+  ColorPicker: 'i-color-picker',
+  Content: 'i-content',
+  DatePicker: 'i-date-picker',
+  Divider: 'i-divider',
+  Drawer: 'i-drawer',
+  DropdownItem: 'i-dropdown-item',
+  DropdownMenu: 'i-dropdown-menu',
+  Dropdown: 'i-dropdown',
+  Footer: 'i-footer',
+  FormItem: 'i-form-item',
+  Form: 'i-form',
+  Header: 'i-header',
+  Icon: 'i-icon',
+  InputNumber: 'i-input-number',
+  Input: 'i-input',
+  Layout: 'i-layout',
+  Menu: 'i-menu',
+  MenuGroup: 'i-menu-group',
+  MenuItem: 'i-menu-item',
+  Sider: 'i-sider',
+  Submenu: 'i-submenu',
+  Modal: 'i-modal',
+  OptionGroup: 'i-option-group',
+  Option: 'i-option',
+  Page: 'i-page',
+  Panel: 'i-panel',
+  Poptip: 'i-poptip',
+  Progress: 'i-progress',
+  RadioGroup: 'i-radio-group',
+  Radio: 'i-radio',
+  Rate: 'i-rate',
+  Row: 'i-row',
+  Scroll: 'i-scroll',
+  Select: 'i-select',
+  Slider: 'i-slider',
+  Spin: 'i-spin',
+  Split: 'i-split',
+  Step: 'i-step',
+  Steps: 'i-steps',
+  Table: 'i-table',
+  Tabs: 'i-tabs',
+  TabPane: 'i-tab-pane',
+  Tag: 'i-tag',
+  TimelineItem: 'i-timeline-item',
+  Timeline: 'i-timeline',
+  TimePicker: 'i-time-picker',
+  Time: 'i-time',
+  Tooltip: 'i-tooltip',
+  Transfer: 'i-transfer',
+  Tree: 'i-tree',
+  Upload: 'i-upload',
 };

package/zti18n-core/src/transform/transformHtml.js

@@ -50,12 +50,10 @@ function parse5Serialize(node, options) {
 function toKebab(tpl, pkMap = {}) {
   pkMap = { ...defaultPkMap, ...pkMap };
 
-  Object.keys(pkMap).forEach(i => {
-    tpl = (
-      tpl
-        .replace(new RegExp(`<${i}(?![a-zA-Z0-9-])`, 'g'), `<${pkMap[i]}`)
-        .replace(new RegExp(`</${i}>`, 'g'), `</${pkMap[i]}>`)
-    );
+  Object.keys(pkMap).forEach((i) => {
+    tpl = tpl
+      .replace(new RegExp(`<${i}(?![a-zA-Z0-9-])`, 'g'), `<${pkMap[i]}`)
+      .replace(new RegExp(`</${i}>`, 'g'), `</${pkMap[i]}>`);
   });
   return tpl;
 }
@@ -63,28 +61,22 @@ function toKebab(tpl, pkMap = {}) {
 function toPascal(tpl, pkMap = {}) {
   pkMap = { ...defaultPkMap, ...pkMap };
 
-  Object.keys(pkMap).forEach(i => {
-    tpl = (
-      tpl
-        .replace(new RegExp(`<${pkMap[i]}(?![a-zA-Z0-9-])`, 'g'), `<${i}`)
-        .replace(new RegExp(`</${pkMap[i]}>`, 'g'), `</${i}>`)
-    );
+  Object.keys(pkMap).forEach((i) => {
+    tpl = tpl
+      .replace(new RegExp(`<${pkMap[i]}(?![a-zA-Z0-9-])`, 'g'), `<${i}`)
+      .replace(new RegExp(`</${pkMap[i]}>`, 'g'), `</${i}>`);
   });
   return tpl;
 }
 
-function traverseHtml(ast, {
-  primaryRegx,
-  i18nMethod,
-  ignoreLines,
-}, returns) {
+function traverseHtml(ast, { primaryRegx, i18nMethod, ignoreLines }, returns) {
   const { allTranslated, allUpdated, allUsedKeys } = returns;
   const existValues = Object.keys(allTranslated);
 
   function shouldIgnore(node) {
     return (
-      node.sourceCodeLocation
-      && ignoreLines.includes(node.sourceCodeLocation.startLine)
+      node.sourceCodeLocation &&
+      ignoreLines.includes(node.sourceCodeLocation.startLine)
     );
   }
 
@@ -135,27 +127,33 @@ function traverseHtml(ast, {
 
     if (!hasTouch) return source;
 
-    return prettier.format(source1, {
-      parser: 'babel',
-      singleQuote: true,
-      semi: false,
-    }).trim();
+    return prettier
+      .format(source1, {
+        parser: 'babel',
+        singleQuote: true,
+        semi: false,
+      })
+      .trim();
   }
 
   function traverse(node) {
     if (node.childNodes) {
-      node.childNodes.forEach(childNode => traverse(childNode));
+      node.childNodes.forEach((childNode) => traverse(childNode));
     }
 
     // 处理属性
     if (!shouldIgnore(node) && node.attrs) {
-      node.attrs.forEach(attr => {
+      node.attrs.forEach((attr) => {
         const { name, value } = attr;
 
         // 非主语言或空，跳过
         if (!isPrimary(value) || !value) return;
 
-        if (name.startsWith('v-') || name.startsWith(':') || name.startsWith('@')) {
+        if (
+          name.startsWith('v-') ||
+          name.startsWith(':') ||
+          name.startsWith('@')
+        ) {
           // vue 指令
           // 引号里是 js 表达式，直接调用 transformJs 来转换
           const source = transformJsExpression(value);
@@ -213,11 +211,11 @@ function traverseHtml(ast, {
   }
 
   // 可能有 #comment 节点，需要找到 html 节点
-  const html = ast.childNodes.find(nd => nd.nodeName === 'html');
+  const html = ast.childNodes.find((nd) => nd.nodeName === 'html');
 
   if (html) {
     // 再找 body 节点
-    const body = html.childNodes.find(nd => nd.nodeName === 'body');
+    const body = html.childNodes.find((nd) => nd.nodeName === 'body');
 
     // 遍历
     if (body) traverse(body);
@@ -225,11 +223,7 @@ function traverseHtml(ast, {
 }
 
 module.exports = function transformHtml(source, localeInfo = {}, options = {}) {
-  const {
-    allTranslated = {},
-    allUpdated = {},
-    allUsedKeys = [],
-  } = localeInfo;
+  const { allTranslated = {}, allUpdated = {}, allUsedKeys = [] } = localeInfo;
 
   const {
     primaryRegx = /[\u4e00-\u9fa5]/,
@@ -261,7 +255,9 @@ module.exports = function transformHtml(source, localeInfo = {}, options = {}) {
 
   opts.ignoreLines = getIgnoreLines(source);
 
-  const ast = parse5.parse(toKebab(source, pkMap), { sourceCodeLocationInfo: true });
+  const ast = parse5.parse(toKebab(source, pkMap), {
+    sourceCodeLocationInfo: true,
+  });
   traverseHtml(ast, opts, r);
 
   let code = toPascal(parse5Serialize(ast), pkMap);

package/zti18n-core/src/transform/transformJs.js

@@ -53,16 +53,19 @@ function getIgnoreLines(ast) {
   return ignoreLines;
 }
 
-function makeVisitor({
-  primaryRegx,
-  i18nObject,
-  i18nMethod,
-  importCode,
-  ignoreLines,
-  ignoreMethods,
-  ignoreComponents,
-  ignoreAttributes,
-}, returns) {
+function makeVisitor(
+  {
+    primaryRegx,
+    i18nObject,
+    i18nMethod,
+    importCode,
+    ignoreLines,
+    ignoreMethods,
+    ignoreComponents,
+    ignoreAttributes,
+  },
+  returns
+) {
   const { allTranslated, allUpdated, allUsedKeys } = returns;
   const existValues = Object.keys(allTranslated);
   const hacked = {};
@@ -99,7 +102,7 @@ function makeVisitor({
   function makeObjectExpression(obj) {
     if (Object.prototype.toString.call(obj) === '[object Object]') {
       const ObjectPropertyArr = [];
-      Object.keys(obj).forEach(k => {
+      Object.keys(obj).forEach((k) => {
         ObjectPropertyArr.push(
           t.ObjectProperty(
             t.Identifier(k),
@@ -144,10 +147,7 @@ function makeVisitor({
 
     if (i18nObject) {
       return t.callExpression(
-        t.memberExpression(
-          t.identifier(i18nObject),
-          t.identifier(i18nMethod)
-        ),
+        t.memberExpression(t.identifier(i18nObject), t.identifier(i18nMethod)),
         objExp ? [v, objExp] : [v]
       );
     }
@@ -173,8 +173,8 @@ function makeVisitor({
       const { node } = path;
 
       if (
-        !shouldIgnore(node)
-        && node.quasis.some(word => isPrimary(word.value.cooked))
+        !shouldIgnore(node) &&
+        node.quasis.some((word) => isPrimary(word.value.cooked))
       ) {
         const tempArr = [...node.quasis, ...node.expressions];
         tempArr.sort((a, b) => a.start - b.start);
@@ -184,29 +184,27 @@ function makeVisitor({
         let needReplace = false;
         let slotIndex = 0;
 
-        tempArr.forEach(function(nd) {
+        tempArr.forEach(function (nd) {
           if (nd.type === 'TemplateElement') {
             value += nd.value.cooked;
             if (isPrimary(nd.value.cooked)) {
               needReplace = true;
             }
           } else if (nd.type === 'Identifier') {
-            value += `{${nd.name}}`;
+            value += `{{${nd.name}}}`;
             variable[nd.name] = nd.name;
             needReplace = true;
           } else {
             // 例如 CallExpression 等
             const identifier = `slot${slotIndex++}`;
-            value += `{${identifier}}`;
+            value += `{{${identifier}}}`;
             variable[identifier] = { isAstNode: true, value: nd };
             needReplace = true;
           }
         });
 
         if (needReplace && value.trim()) {
-          path.replaceWith(
-            makeReplace(value, variable)
-          );
+          path.replaceWith(makeReplace(value, variable));
         }
       }
       path.skip();
@@ -216,14 +214,14 @@ function makeVisitor({
       const { node } = path;
       const { value } = node;
 
-      const isTsLiteralType = node.type === 'StringLiteral' && (['TSLiteralType', 'TSEnumMember'].includes(path.parent.type))
+      const isTsLiteralType =
+        node.type === 'StringLiteral' &&
+        ['TSLiteralType', 'TSEnumMember'].includes(path.parent.type);
       if (!shouldIgnore(node) && isPrimary(node.value) && !isTsLiteralType) {
         switch (path.parent.type) {
           case 'ObjectProperty':
           case 'AssignmentExpression':
-            path.replaceWith(
-              makeReplace(value)
-            );
+            path.replaceWith(makeReplace(value));
             break;
           case 'CallExpression':
             let v = value;
@@ -233,9 +231,7 @@ function makeVisitor({
               v = allUpdated[value];
             }
 
-            path.replaceWith(
-              makeReplace(v)
-            );
+            path.replaceWith(makeReplace(v));
             break;
           case 'NewExpression':
             // XXX: 会出现吗?
@@ -251,17 +247,11 @@ function makeVisitor({
               //   );
               // }
             } else {
-              path.replaceWith(
-                t.JSXExpressionContainer(
-                  makeReplace(value)
-                )
-              );
+              path.replaceWith(t.JSXExpressionContainer(makeReplace(value)));
             }
             break;
           default:
-            path.replaceWith(
-              makeReplace(value)
-            );
+            path.replaceWith(makeReplace(value));
             break;
         }
 
@@ -306,15 +296,10 @@ function makeVisitor({
 
       // 可能需要更新 key
       if (
-        (
-          node.callee.type === 'MemberExpression'
-          && node.callee.object.name === i18nObject
-          && node.callee.property.name === i18nMethod
-        )
-        || (
-          node.callee.type === 'Identifier'
-          && node.callee.name === i18nMethod
-        )
+        (node.callee.type === 'MemberExpression' &&
+          node.callee.object.name === i18nObject &&
+          node.callee.property.name === i18nMethod) ||
+        (node.callee.type === 'Identifier' && node.callee.name === i18nMethod)
       ) {
         // 收集现有的 key
         const args = node.arguments;
@@ -333,9 +318,7 @@ function makeVisitor({
 
         if (allUpdated.hasOwnProperty(key)) {
           // 如果对应的中文已经在远端被修改，则自动更新代码
-          path.replaceWith(
-            makeReplace(allUpdated[key], variable)
-          );
+          path.replaceWith(makeReplace(allUpdated[key], variable));
         } else {
           if (Array.isArray(node.arguments) && node.arguments.length > 0) {
             if (!allUsedKeys.includes(key)) {
@@ -367,7 +350,9 @@ function makeVisitor({
       if (!node.ignore && !shouldIgnore(node)) {
         const { openingElement } = node;
         if (openingElement.name.name === 'Di18nTrans') {
-          const keyAtr = openingElement.attributes.find(atr => atr.name.name === 'i18nKey');
+          const keyAtr = openingElement.attributes.find(
+            (atr) => atr.name.name === 'i18nKey'
+          );
           if (!keyAtr) return;
 
           const key = keyAtr.value.value;
@@ -386,7 +371,12 @@ function makeVisitor({
             if (cur.type === 'JSXElement') {
               // 内部的文案加上标记，不再检测
               cur.children[0].ignore = true;
-              return prev + formatWhitespace(`<${index}>${cur.children[0].value}</${index}>`);
+              return (
+                prev +
+                formatWhitespace(
+                  `<${index}>${cur.children[0].value}</${index}>`
+                )
+              );
             }
 
             console.error(`${cur.type} node are not supported in Di18nTrans`);
@@ -405,11 +395,7 @@ function makeVisitor({
 
       if (!node.ignore && !shouldIgnore(node) && isPrimary(node.value)) {
         // 将中文替换为 JSX 表达式
-        path.replaceWith(
-          t.JSXExpressionContainer(
-            makeReplace(node.value)
-          )
-        );
+        path.replaceWith(t.JSXExpressionContainer(makeReplace(node.value)));
       }
 
       path.skip();
@@ -427,11 +413,7 @@ function makeVisitor({
 }
 
 module.exports = function transformJs(source, localeInfo = {}, options = {}) {
-  const {
-    allTranslated = {},
-    allUpdated = {},
-    allUsedKeys = [],
-  } = localeInfo;
+  const { allTranslated = {}, allUpdated = {}, allUsedKeys = [] } = localeInfo;
 
   const {
     primaryRegx = /[\u4e00-\u9fa5]/,
@@ -490,7 +472,11 @@ module.exports = function transformJs(source, localeInfo = {}, options = {}) {
   traverse(ast, visitor);
 
   // https://stackoverflow.com/a/55478641
-  let { code } = generate(ast, { retainLines: true, decoratorsBeforeExport: true }, source);
+  let { code } = generate(
+    ast,
+    { retainLines: true, decoratorsBeforeExport: true },
+    source
+  );
 
   if (!r.hasTouch) {
     code = source;

package/zti18n-core/src/transform/transformPug.js

@@ -8,44 +8,55 @@ const getIgnoreLines = require('../utils/getIgnoreLines');
 
 /* eslint-disable */
 // override to avoid unneeded escape: pug-source-gen/lib/code-generator.js
-genSource.CodeGenerator.prototype.attrs = function(attrs) {
+genSource.CodeGenerator.prototype.attrs = function (attrs) {
   var regularAttrs = [];
   var classes = '';
   var id;
-  attrs.forEach(function(attr) {
-    var constVal = '';
-    try {
-      constVal = constantinople.toConstant(attr.val);
-    } catch (ex) {}
-
-    if (attr.name === 'class' && !attr.escaped && constVal &&
-               /^\-?[_a-z][_a-z0-9\-]*$/i.test(constVal)) {
-      classes += '.' + constVal;
-    } else if (attr.name === 'id' && !id && !attr.escaped && constVal &&
-               /^[\w-]+$/.test(constVal)) {
-      id = constVal;
-    } else {
-      var attrOut = '';
-
-      // name
-      if (/^\w[^()[\]=!,`'"\s]*$/.test(attr.name)) {
-        attrOut += attr.name;
+  attrs.forEach(
+    function (attr) {
+      var constVal = '';
+      try {
+        constVal = constantinople.toConstant(attr.val);
+      } catch (ex) {}
+
+      if (
+        attr.name === 'class' &&
+        !attr.escaped &&
+        constVal &&
+        /^\-?[_a-z][_a-z0-9\-]*$/i.test(constVal)
+      ) {
+        classes += '.' + constVal;
+      } else if (
+        attr.name === 'id' &&
+        !id &&
+        !attr.escaped &&
+        constVal &&
+        /^[\w-]+$/.test(constVal)
+      ) {
+        id = constVal;
       } else {
-        var name = attr.name.replace(/\\/g, '\\\\');
-        attrOut += name;
-      }
+        var attrOut = '';
 
-      if (!(typeof constVal === 'boolean' && constVal === true)) {
-        // operator
-        attrOut += '=';
+        // name
+        if (/^\w[^()[\]=!,`'"\s]*$/.test(attr.name)) {
+          attrOut += attr.name;
+        } else {
+          var name = attr.name.replace(/\\/g, '\\\\');
+          attrOut += name;
+        }
 
-        // value
-        attrOut += attr.val;
-      }
+        if (!(typeof constVal === 'boolean' && constVal === true)) {
+          // operator
+          attrOut += '=';
 
-      regularAttrs.push(attrOut);
-    }
-  }.bind(this));
+          // value
+          attrOut += attr.val;
+        }
+
+        regularAttrs.push(attrOut);
+      }
+    }.bind(this)
+  );
 
   var out = '';
   if (id) out += '#' + id;
@@ -53,14 +64,11 @@ genSource.CodeGenerator.prototype.attrs = function(attrs) {
   if (regularAttrs.length) out += '(' + regularAttrs.join(' ') + ')';
 
   return out;
-}
+};
 /* eslint-enable */
 
-function traversePug(ast, {
-  primaryRegx,
-  i18nMethod,
-  ignoreLines,
-}, returns) { // returesallTranslatedWord, updatedTranslatedWord, keysInUse, ignores) {
+function traversePug(ast, { primaryRegx, i18nMethod, ignoreLines }, returns) {
+  // returesallTranslatedWord, updatedTranslatedWord, keysInUse, ignores) {
   const { allTranslated, allUpdated, allUsedKeys } = returns;
   const existValues = Object.keys(allTranslated);
 
@@ -133,18 +141,22 @@ function traversePug(ast, {
     }
 
     if (node.type === 'Block' && node.nodes) {
-      node.nodes.forEach(nd => traverse(nd));
+      node.nodes.forEach((nd) => traverse(nd));
     }
 
     // 处理属性
     if (!shouldIgnore(node) && node.attrs) {
-      node.attrs.forEach(attr => {
+      node.attrs.forEach((attr) => {
         const { name, val } = attr;
 
         // 非主语言，跳过
         if (!isPrimary(val)) return;
 
-        if (name.startsWith('v-') || name.startsWith(':') || name.startsWith('@')) {
+        if (
+          name.startsWith('v-') ||
+          name.startsWith(':') ||
+          name.startsWith('@')
+        ) {
           // vue 指令
           let value = val;
           if (['"', "'"].includes(val.charAt(0))) {
@@ -210,11 +222,7 @@ function traversePug(ast, {
 }
 
 module.exports = function transformPug(source, localeInfo = {}, options = {}) {
-  const {
-    allTranslated = {},
-    allUpdated = {},
-    allUsedKeys = [],
-  } = localeInfo;
+  const { allTranslated = {}, allUpdated = {}, allUsedKeys = [] } = localeInfo;
 
   const {
     primaryRegx = /[\u4e00-\u9fa5]/,
@@ -252,10 +260,12 @@ module.exports = function transformPug(source, localeInfo = {}, options = {}) {
   let code = source;
   if (r.hasTouch) {
     const genCode = genSource(ast);
-    code = prettier.format(genCode, {
-      filepath: 'xxx.pug',
-      pugAttributeSeparator: 'none',
-    }).trim();
+    code = prettier
+      .format(genCode, {
+        filepath: 'xxx.pug',
+        pugAttributeSeparator: 'none',
+      })
+      .trim();
   }
 
   return { source: code, hasTouch: r.hasTouch };

package/zti18n-core/src/transform/transformReactIntlToReactIntlUniversal.js

@@ -39,7 +39,7 @@ module.exports = function transformReactIntlToReactIntlUniversal(option) {
 
   let zhData = {};
 
-  targetLocales.forEach(element => {
+  targetLocales.forEach((element) => {
     if (path.extname(element) === '.json') {
       const json = fs.readFileSync(element, {
         encoding: 'utf-8',
@@ -88,7 +88,7 @@ module.exports = function transformReactIntlToReactIntlUniversal(option) {
     }
   }
 
-  targetFiles.forEach(element => {
+  targetFiles.forEach((element) => {
     log.info(`start: ${element}`);
     transformFile(element);
     log.success(`done: ${element}`);

package/zti18n-core/src/transform/transformReactIntlUniveralToDi18n.js

@@ -73,7 +73,7 @@ module.exports = function transformReactIntlUniveralToDi18n(option) {
 
   const outputs = output ? [].concat(output) : [];
   const targetFiles = [].concat(entry).reduce((prev, cur, index) => {
-    const files = getSourceFiles({ entry: cur, exclude }).map(file => ({
+    const files = getSourceFiles({ entry: cur, exclude }).map((file) => ({
       filePath: file,
       currentEntry: cur,
       currentOutput: outputs[index],
@@ -81,7 +81,7 @@ module.exports = function transformReactIntlUniveralToDi18n(option) {
     return prev.concat(files);
   }, []);
 
-  targetFiles.forEach(codeFileInfo => {
+  targetFiles.forEach((codeFileInfo) => {
     translate(codeFileInfo, allConverted, option);
     log.success(`done: ${codeFileInfo.filePath}`);
   });

package/zti18n-core/src/transform/transformTs.js

@@ -2,11 +2,7 @@ const presetTypescript = require('@babel/preset-typescript').default;
 const transformJs = require('./transformJs');
 
 module.exports = function transformTs(code, localeInfo = {}, options = {}) {
-  const {
-    allTranslated = {},
-    allUpdated = {},
-    allUsedKeys = [],
-  } = localeInfo;
+  const { allTranslated = {}, allUpdated = {}, allUsedKeys = [] } = localeInfo;
 
   const {
     primaryRegx = /[\u4e00-\u9fa5]/,

package/zti18n-core/src/transform/transformVue.js

@@ -30,16 +30,14 @@ function closeTag(sfcBlock) {
 
 function combineVue(template, script, sytles, customBlocks) {
   return [template, script, ...sytles, ...customBlocks]
-    .map(sfc => (sfc ? `${openTag(sfc)}\n${sfc.content.trim()}\n${closeTag(sfc)}\n` : ''))
+    .map((sfc) =>
+      sfc ? `${openTag(sfc)}\n${sfc.content.trim()}\n${closeTag(sfc)}\n` : ''
+    )
     .join('\n');
 }
 
 module.exports = function transformVue(source, localeInfo = {}, options = {}) {
-  const {
-    allTranslated = {},
-    allUpdated = {},
-    allUsedKeys = [],
-  } = localeInfo;
+  const { allTranslated = {}, allUpdated = {}, allUsedKeys = [] } = localeInfo;
 
   const {
     primaryRegx = /[\u4e00-\u9fa5]/,
@@ -91,7 +89,9 @@ module.exports = function transformVue(source, localeInfo = {}, options = {}) {
       template.content = ret.source;
       hasTouch = ret.hasTouch;
     } else {
-      console.warn(`Unsupport type: ${templateType}, so the template is ignored`);
+      console.warn(
+        `Unsupport type: ${templateType}, so the template is ignored`
+      );
     }
   }
 

package/zti18n-core/src/utils/log.js

@@ -1,8 +1,8 @@
 const chalk = require('chalk');
 
 module.exports = {
-  info: msg => console.log(chalk.cyan(msg)),
-  warning: msg => console.log(chalk.yellow(msg)),
-  success: msg => console.log(chalk.green(msg)),
-  error: msg => console.log(chalk.red(msg)),
+  info: (msg) => console.log(chalk.cyan(msg)),
+  warning: (msg) => console.log(chalk.yellow(msg)),
+  success: (msg) => console.log(chalk.green(msg)),
+  error: (msg) => console.log(chalk.red(msg)),
 };