ztxkutils 2.10.66-14 → 2.10.66-16

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

@@ -1,126 +1,126 @@
-const compiler = require('vue-template-compiler');
-const transformJs = require('./transformJs');
-const transformPug = require('./transformPug');
-const transformHtml = require('./transformHtml');
-
-function openTag(sfcBlock) {
-  const { type, lang, src, scoped, module, attrs } = sfcBlock;
-
-  let tag = `<${type}`;
-  if (lang) tag += ` lang="${lang}"`;
-  if (src) tag += ` src="${src}"`;
-  if (scoped) tag += ' scoped';
-  if (module) {
-    if (typeof module === 'string') tag += ` module="${module}"`;
-    else tag += ' module';
-  }
-  for (let k in attrs) {
-    if (!['type', 'lang', 'src', 'scoped', 'module'].includes(k)) {
-      tag += ` ${k}="${attrs[k]}"`;
-    }
-  }
-  tag += '>';
-
-  return tag;
-}
-
-function closeTag(sfcBlock) {
-  return '</' + sfcBlock.type + '>';
-}
-
-function combineVue(template, script, sytles, customBlocks) {
-  return [template, script, ...sytles, ...customBlocks]
-    .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 {
-    primaryRegx = /[\u4e00-\u9fa5]/,
-    i18nObject = 'intl',
-    i18nMethod = '$t',
-    importCode = "import { intl } from 'di18n-vue';",
-    babelPresets = [],
-    babelPlugins = [],
-    ignoreComponents = [],
-    ignoreMethods = [],
-    pkMap = {},
-  } = options;
-
-  const sfc = compiler.parseComponent(source, {
-    pad: 'space',
-    deindent: false,
-  });
-
-  const { template, script, styles, customBlocks } = sfc;
-  let hasTouch = false;
-
-  if (template) {
-    const templateType = (template.lang || 'html').toLowerCase();
-
-    // transform template
-    if (['html', 'pug'].includes(templateType)) {
-      const transform = templateType === 'html' ? transformHtml : transformPug;
-
-      const ret = transform(
-        template.content,
-        {
-          allTranslated,
-          allUpdated,
-          allUsedKeys,
-        },
-        {
-          primaryRegx,
-          i18nObject: '',
-          i18nMethod,
-          importCode: '',
-          babelPresets,
-          babelPlugins,
-          ignoreComponents,
-          ignoreMethods,
-          pkMap,
-        }
-      );
-
-      template.content = ret.source;
-      hasTouch = ret.hasTouch;
-    } else {
-      console.warn(
-        `Unsupport type: ${templateType}, so the template is ignored`
-      );
-    }
-  }
-
-  // transform script
-  if (script) {
-    const ret = transformJs(
-      script.content,
-      {
-        allTranslated,
-        allUpdated,
-        allUsedKeys,
-      },
-      {
-        primaryRegx,
-        i18nObject,
-        i18nMethod,
-        importCode,
-        babelPresets,
-        babelPlugins,
-        ignoreComponents,
-        ignoreMethods,
-      }
-    );
-
-    script.content = ret.source;
-    hasTouch = hasTouch || ret.hasTouch;
-  }
-
-  const code = combineVue(template, script, styles, customBlocks);
-
-  return { source: code, hasTouch };
-};
+const compiler = require('vue-template-compiler');
+const transformJs = require('./transformJs');
+const transformPug = require('./transformPug');
+const transformHtml = require('./transformHtml');
+
+function openTag(sfcBlock) {
+  const { type, lang, src, scoped, module, attrs } = sfcBlock;
+
+  let tag = `<${type}`;
+  if (lang) tag += ` lang="${lang}"`;
+  if (src) tag += ` src="${src}"`;
+  if (scoped) tag += ' scoped';
+  if (module) {
+    if (typeof module === 'string') tag += ` module="${module}"`;
+    else tag += ' module';
+  }
+  for (let k in attrs) {
+    if (!['type', 'lang', 'src', 'scoped', 'module'].includes(k)) {
+      tag += ` ${k}="${attrs[k]}"`;
+    }
+  }
+  tag += '>';
+
+  return tag;
+}
+
+function closeTag(sfcBlock) {
+  return '</' + sfcBlock.type + '>';
+}
+
+function combineVue(template, script, sytles, customBlocks) {
+  return [template, script, ...sytles, ...customBlocks]
+    .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 {
+    primaryRegx = /[\u4e00-\u9fa5]/,
+    i18nObject = 'intl',
+    i18nMethod = '$t',
+    importCode = "import { intl } from 'di18n-vue';",
+    babelPresets = [],
+    babelPlugins = [],
+    ignoreComponents = [],
+    ignoreMethods = [],
+    pkMap = {},
+  } = options;
+
+  const sfc = compiler.parseComponent(source, {
+    pad: 'space',
+    deindent: false,
+  });
+
+  const { template, script, styles, customBlocks } = sfc;
+  let hasTouch = false;
+
+  if (template) {
+    const templateType = (template.lang || 'html').toLowerCase();
+
+    // transform template
+    if (['html', 'pug'].includes(templateType)) {
+      const transform = templateType === 'html' ? transformHtml : transformPug;
+
+      const ret = transform(
+        template.content,
+        {
+          allTranslated,
+          allUpdated,
+          allUsedKeys,
+        },
+        {
+          primaryRegx,
+          i18nObject: '',
+          i18nMethod,
+          importCode: '',
+          babelPresets,
+          babelPlugins,
+          ignoreComponents,
+          ignoreMethods,
+          pkMap,
+        }
+      );
+
+      template.content = ret.source;
+      hasTouch = ret.hasTouch;
+    } else {
+      console.warn(
+        `Unsupport type: ${templateType}, so the template is ignored`
+      );
+    }
+  }
+
+  // transform script
+  if (script) {
+    const ret = transformJs(
+      script.content,
+      {
+        allTranslated,
+        allUpdated,
+        allUsedKeys,
+      },
+      {
+        primaryRegx,
+        i18nObject,
+        i18nMethod,
+        importCode,
+        babelPresets,
+        babelPlugins,
+        ignoreComponents,
+        ignoreMethods,
+      }
+    );
+
+    script.content = ret.source;
+    hasTouch = hasTouch || ret.hasTouch;
+  }
+
+  const code = combineVue(template, script, styles, customBlocks);
+
+  return { source: code, hasTouch };
+};

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

@@ -1,105 +1,105 @@
-const fs = require('fs');
-const path = require('path');
-const prettier = require('prettier');
-const transformTs = require('./transformTs');
-const transformJs = require('./transformJs');
-const transformVue = require('./transformVue');
-const log = require('../utils/log');
-
-function transformReact(
-  codeFileInfo,
-  allTranslatedWord,
-  updatedTranslatedWord,
-  keysInUse,
-  option
-) {
-  const { filePath, currentEntry, currentOutput } = codeFileInfo;
-  const sourceCode = fs.readFileSync(filePath, 'utf8');
-  const isTSX = ['.ts', '.tsx'].includes(path.extname(filePath));
-
-  const transform = isTSX ? transformTs : transformJs;
-
-  const { source, hasTouch } = transform(
-    sourceCode,
-    {
-      allTranslated: allTranslatedWord,
-      allUpdated: updatedTranslatedWord,
-      allUsedKeys: keysInUse,
-    },
-    option
-  );
-
-  if (!option.extractOnly && hasTouch) {
-    let code = source;
-    if (option.prettier) {
-      const parser = isTSX ? 'typescript' : 'babel';
-      code = prettier.format(source, { ...option.prettier, parser });
-    }
-
-    const target = currentOutput
-      ? filePath.replace(currentEntry, currentOutput)
-      : filePath;
-    fs.writeFileSync(target, code, { encoding: 'utf-8' });
-  }
-}
-
-function transformVueAdapter(
-  codeFileInfo,
-  allTranslatedWord,
-  updatedTranslatedWord,
-  keysInUse,
-  option
-) {
-  const { filePath, currentEntry, currentOutput } = codeFileInfo;
-  const sourceCode = fs.readFileSync(filePath, 'utf8');
-
-  const { source, hasTouch } = transformVue(
-    sourceCode,
-    {
-      allTranslated: allTranslatedWord,
-      allUpdated: updatedTranslatedWord,
-      allUsedKeys: keysInUse,
-    },
-    option
-  );
-
-  if (!option.extractOnly && hasTouch) {
-    let code = source;
-    if (option.prettier) {
-      const parser = 'vue';
-      code = prettier.format(source, { ...option.prettier, parser });
-    }
-
-    const target = currentOutput
-      ? filePath.replace(currentEntry, currentOutput)
-      : filePath;
-    fs.writeFileSync(target, code, { encoding: 'utf-8' });
-  }
-}
-
-/**
- * 转换 react 和 普通 js 文件
- * @param {object} codeFileInfo 源码文件信息
- * @param {object} allTranslatedWord 现有的中文资源
- * @param {object} updatedTranslatedWord 在远端做过中文文案修改的 key/value
- * @param {array}  keysInUse 使用中的key
- * @param {object} option 透传过来的 di18n 配置
- */
-module.exports = function transformZeroToDi18n(
-  codeFileInfo,
-  allTranslatedWord,
-  updatedTranslatedWord,
-  keysInUse,
-  option
-) {
-  const { ext } = codeFileInfo;
-  const doTransform = ext === '.vue' ? transformVueAdapter : transformReact;
-  log.info(codeFileInfo.filePath);
-  doTransform(
-    codeFileInfo,
-    allTranslatedWord,
-    updatedTranslatedWord,
-    keysInUse,
-    option
-  );
-};
+const fs = require('fs');
+const path = require('path');
+const prettier = require('prettier');
+const transformTs = require('./transformTs');
+const transformJs = require('./transformJs');
+const transformVue = require('./transformVue');
+const log = require('../utils/log');
+
+function transformReact(
+  codeFileInfo,
+  allTranslatedWord,
+  updatedTranslatedWord,
+  keysInUse,
+  option
+) {
+  const { filePath, currentEntry, currentOutput, noImport } = codeFileInfo;
+  const sourceCode = fs.readFileSync(filePath, 'utf8');
+  const isTSX = ['.ts', '.tsx'].includes(path.extname(filePath));
+
+  const transform = isTSX ? transformTs : transformJs;
+
+  const { source, hasTouch } = transform(
+    sourceCode,
+    {
+      allTranslated: allTranslatedWord,
+      allUpdated: updatedTranslatedWord,
+      allUsedKeys: keysInUse,
+    },
+    option
+  );
+
+  if (!option.extractOnly && hasTouch && !noImport) {
+    let code = source;
+    if (option.prettier) {
+      const parser = isTSX ? 'typescript' : 'babel';
+      code = prettier.format(source, { ...option.prettier, parser });
+    }
+
+    const target = currentOutput
+      ? filePath.replace(currentEntry, currentOutput)
+      : filePath;
+    fs.writeFileSync(target, code, { encoding: 'utf-8' });
+  }
+}
+
+function transformVueAdapter(
+  codeFileInfo,
+  allTranslatedWord,
+  updatedTranslatedWord,
+  keysInUse,
+  option
+) {
+  const { filePath, currentEntry, currentOutput } = codeFileInfo;
+  const sourceCode = fs.readFileSync(filePath, 'utf8');
+
+  const { source, hasTouch } = transformVue(
+    sourceCode,
+    {
+      allTranslated: allTranslatedWord,
+      allUpdated: updatedTranslatedWord,
+      allUsedKeys: keysInUse,
+    },
+    option
+  );
+
+  if (!option.extractOnly && hasTouch) {
+    let code = source;
+    if (option.prettier) {
+      const parser = 'vue';
+      code = prettier.format(source, { ...option.prettier, parser });
+    }
+
+    const target = currentOutput
+      ? filePath.replace(currentEntry, currentOutput)
+      : filePath;
+    fs.writeFileSync(target, code, { encoding: 'utf-8' });
+  }
+}
+
+/**
+ * 转换 react 和 普通 js 文件
+ * @param {object} codeFileInfo 源码文件信息
+ * @param {object} allTranslatedWord 现有的中文资源
+ * @param {object} updatedTranslatedWord 在远端做过中文文案修改的 key/value
+ * @param {array}  keysInUse 使用中的key
+ * @param {object} option 透传过来的 di18n 配置
+ */
+module.exports = function transformZeroToDi18n(
+  codeFileInfo,
+  allTranslatedWord,
+  updatedTranslatedWord,
+  keysInUse,
+  option
+) {
+  const { ext } = codeFileInfo;
+  const doTransform = ext === '.vue' ? transformVueAdapter : transformReact;
+  log.info(codeFileInfo.filePath);
+  doTransform(
+    codeFileInfo,
+    allTranslatedWord,
+    updatedTranslatedWord,
+    keysInUse,
+    option
+  );
+};

package/zti18n-core/src/translate/google.js

@@ -1,6 +1,6 @@
-// https://github.com/matheuss/google-translate-api/issues/79#issuecomment-427841889
-const googleTranslate = require('@vitalets/google-translate-api');
-
-module.exports = function translateByGoogle(text, targetLang) {
-  return googleTranslate(text, { client: 'gtx', to: targetLang });
-};
+// https://github.com/matheuss/google-translate-api/issues/79#issuecomment-427841889
+const googleTranslate = require('@vitalets/google-translate-api');
+
+module.exports = function translateByGoogle(text, targetLang) {
+  return googleTranslate(text, { client: 'gtx', to: targetLang });
+};

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

@@ -1,3 +1,3 @@
-exports.REACT_JS = 'js';
-exports.REACT_TS = 'ts';
-exports.VUE = 'vue';
+exports.REACT_JS = 'js';
+exports.REACT_TS = 'ts';
+exports.VUE = 'vue';

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

@@ -1,14 +1,14 @@
-module.exports = function getIgnoreLines(tpl) {
-  // 仅支持 // di18n-disable 和 // di18n-enable 注释指令
-  const ignores = [];
-  let ignoring = false;
-
-  const lines = tpl.split(/\n|\r\n/g);
-  for (let i = 0; i < lines.length; i++) {
-    if (lines[i].includes('di18n-disable')) ignoring = true;
-    if (lines[i].includes('di18n-enable')) ignoring = false;
-    if (ignoring) ignores.push(i + 1);
-  }
-
-  return ignores;
-};
+module.exports = function getIgnoreLines(tpl) {
+  // 仅支持 // di18n-disable 和 // di18n-enable 注释指令
+  const ignores = [];
+  let ignoring = false;
+
+  const lines = tpl.split(/\n|\r\n/g);
+  for (let i = 0; i < lines.length; i++) {
+    if (lines[i].includes('di18n-disable')) ignoring = true;
+    if (lines[i].includes('di18n-enable')) ignoring = false;
+    if (ignoring) ignores.push(i + 1);
+  }
+
+  return ignores;
+};

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

@@ -1,3 +1,3 @@
-module.exports = function isChinese(text) {
-  return /[\u4e00-\u9fa5]/.test(text);
-};
+module.exports = function isChinese(text) {
+  return /[\u4e00-\u9fa5]/.test(text);
+};

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)),
-};
+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)),
+};