ztxkutils 2.10.66-15 → 2.10.66-16

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

@@ -1,133 +1,133 @@
-const glob = require('glob');
-const fs = require('fs');
-const path = require('path');
-const inquirer = require('inquirer');
-const prettier = require('prettier');
-const FileConf = require('../conf/FileConf');
-const reactOptions = require('../utils/reactOptions');
-const vueOptions = require('../utils/vueOptions');
-const log = require('../utils/log');
-
-function getLocaleFiles({ path, exclude }) {
-  return glob.sync(`${path}/**/*.json`, {
-    ignore: (exclude || []).map((e) => `${path}/${e}`),
-  });
-}
-
-async function doInquire() {
-  // 1. whether overwrite?
-  let configExist = true;
-  try {
-    fs.accessSync('./zti18n.config.js');
-  } catch (e) {
-    configExist = false;
-  }
-
-  if (configExist) {
-    const ans = await inquirer.prompt([
-      {
-        name: 'overwrite',
-        type: 'confirm',
-        message: '配置文件 zti18n.config.js 已存在，是否覆盖？',
-      },
-    ]);
-
-    if (!ans.overwrite) process.exit(0);
-  }
-
-  // 2. first i18n?
-  let ans = await inquirer.prompt([
-    {
-      name: 'firstI18n',
-      type: 'confirm',
-      message: '是否初次国际化？',
-    },
-    {
-      name: 'localePath',
-      type: 'input',
-      message: '请输入现有国际化资源路径：',
-      when(answers) {
-        return !answers.firstI18n;
-      },
-    },
-  ]);
-
-  return ans;
-}
-
-module.exports = async function initFileConf(isVue) {
-  const answers = await doInquire();
-  const { localePath = 'locales', firstI18n } = answers;
-
-  const defaultOptions = isVue ? vueOptions : reactOptions;
-  const options = {
-    ...defaultOptions,
-    localeConf: { type: 'file', folder: localePath },
-  };
-
-  // 配置信息写入文件
-  fs.writeFileSync(
-    './zti18n.config.js',
-    prettier.format('module.exports = ' + JSON.stringify(options), {
-      parser: 'babel',
-      singleQuote: true,
-      trailingComma: 'es5',
-    }),
-    'utf8'
-  );
-
-  let createTasks = [];
-  const confService = new FileConf(options.localeConf.folder);
-
-  if (!firstI18n) {
-    // 非首次国际化，本地代码中已有国际化资源
-    const locales = getLocaleFiles({ path: localePath });
-
-    // 读取国际化资源
-    const data = locales.map((element) => {
-      // TODO: 支持国际化资源为 js 文件的情况，目前只支持为 json 文件。
-      const json = fs.readFileSync(element, {
-        encoding: 'utf-8',
-      });
-
-      // 使用现有文件名为语言 key
-      const key = path.parse(element).name;
-
-      return {
-        key,
-        value: JSON.parse(json),
-        confName: key,
-      };
-    });
-
-    createTasks = data.map(({ confName, value, key }) => {
-      let commentValue = {};
-      if (key !== options.primaryLocale) {
-        commentValue = data.find((d) => d.key === options.primaryLocale).value;
-      }
-      return confService.createConf(confName, value, commentValue, key);
-    });
-  } else {
-    // 首次国际化，只需要创建配置
-    createTasks = options.supportedLocales.map((key) => {
-      const value = { TBD: 'TBD' }; // 创建配置时，必须要有一个 k/V
-      const confName = key; // 初始化时，先创建测试环境的配置
-      return confService.createConf(confName, value, {}, key);
-    });
-  }
-
-  const createTaskResults = await Promise.all(createTasks);
-  log.success('[done] conf created');
-  console.log(createTaskResults);
-
-  // 将已有国际化资源的配置发布
-  if (!firstI18n) {
-    const publishTasks = options.supportedLocales.map((key) => {
-      return confService.publishConf(`${key}-test`);
-    });
-
-    const publishTaskResults = await Promise.all(publishTasks);
-    log.success('[done] conf published');
-    console.log(publishTaskResults);
-  }
-};
+const glob = require('glob');
+const fs = require('fs');
+const path = require('path');
+const inquirer = require('inquirer');
+const prettier = require('prettier');
+const FileConf = require('../conf/FileConf');
+const reactOptions = require('../utils/reactOptions');
+const vueOptions = require('../utils/vueOptions');
+const log = require('../utils/log');
+
+function getLocaleFiles({ path, exclude }) {
+  return glob.sync(`${path}/**/*.json`, {
+    ignore: (exclude || []).map((e) => `${path}/${e}`),
+  });
+}
+
+async function doInquire() {
+  // 1. whether overwrite?
+  let configExist = true;
+  try {
+    fs.accessSync('./zti18n.config.js');
+  } catch (e) {
+    configExist = false;
+  }
+
+  if (configExist) {
+    const ans = await inquirer.prompt([
+      {
+        name: 'overwrite',
+        type: 'confirm',
+        message: '配置文件 zti18n.config.js 已存在，是否覆盖？',
+      },
+    ]);
+
+    if (!ans.overwrite) process.exit(0);
+  }
+
+  // 2. first i18n?
+  let ans = await inquirer.prompt([
+    {
+      name: 'firstI18n',
+      type: 'confirm',
+      message: '是否初次国际化？',
+    },
+    {
+      name: 'localePath',
+      type: 'input',
+      message: '请输入现有国际化资源路径：',
+      when(answers) {
+        return !answers.firstI18n;
+      },
+    },
+  ]);
+
+  return ans;
+}
+
+module.exports = async function initFileConf(isVue) {
+  const answers = await doInquire();
+  const { localePath = 'locales', firstI18n } = answers;
+
+  const defaultOptions = isVue ? vueOptions : reactOptions;
+  const options = {
+    ...defaultOptions,
+    localeConf: { type: 'file', folder: localePath },
+  };
+
+  // 配置信息写入文件
+  fs.writeFileSync(
+    './zti18n.config.js',
+    prettier.format('module.exports = ' + JSON.stringify(options), {
+      parser: 'babel',
+      singleQuote: true,
+      trailingComma: 'es5',
+    }),
+    'utf8'
+  );
+
+  let createTasks = [];
+  const confService = new FileConf(options.localeConf.folder);
+
+  if (!firstI18n) {
+    // 非首次国际化，本地代码中已有国际化资源
+    const locales = getLocaleFiles({ path: localePath });
+
+    // 读取国际化资源
+    const data = locales.map((element) => {
+      // TODO: 支持国际化资源为 js 文件的情况，目前只支持为 json 文件。
+      const json = fs.readFileSync(element, {
+        encoding: 'utf-8',
+      });
+
+      // 使用现有文件名为语言 key
+      const key = path.parse(element).name;
+
+      return {
+        key,
+        value: JSON.parse(json),
+        confName: key,
+      };
+    });
+
+    createTasks = data.map(({ confName, value, key }) => {
+      let commentValue = {};
+      if (key !== options.primaryLocale) {
+        commentValue = data.find((d) => d.key === options.primaryLocale).value;
+      }
+      return confService.createConf(confName, value, commentValue, key);
+    });
+  } else {
+    // 首次国际化，只需要创建配置
+    createTasks = options.supportedLocales.map((key) => {
+      const value = { TBD: 'TBD' }; // 创建配置时，必须要有一个 k/V
+      const confName = key; // 初始化时，先创建测试环境的配置
+      return confService.createConf(confName, value, {}, key);
+    });
+  }
+
+  const createTaskResults = await Promise.all(createTasks);
+  log.success('[done] conf created');
+  console.log(createTaskResults);
+
+  // 将已有国际化资源的配置发布
+  if (!firstI18n) {
+    const publishTasks = options.supportedLocales.map((key) => {
+      return confService.publishConf(`${key}-test`);
+    });
+
+    const publishTaskResults = await Promise.all(publishTasks);
+    log.success('[done] conf published');
+    console.log(publishTaskResults);
+  }
+};

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

@@ -1,24 +1,24 @@
-const path = require('path');
-const mergeOptions = require('../utils/mergeOptions');
-const log = require('../utils/log');
-
-module.exports = async function publish(programOption, env = '') {
-  const options = mergeOptions(programOption, ['locales']);
-
-  let confService = null;
-  if (options.localeConf.type === 'file') {
-    const FileConf = require('../conf/FileConf');
-    confService = new FileConf(options.locales);
-  } else {
-    const Conf = require(path.join(process.cwd(), options.localeConf.path));
-    confService = new Conf(options.localeConf);
-  }
-
-  const publishTasks = options.supportedLocales.map((key) => {
-    return confService.publishConf(`${key}-${env}`);
-  });
-
-  const publishTaskResults = await Promise.all(publishTasks);
-  log.success('[done] conf published');
-  console.log(publishTaskResults);
-};
+const path = require('path');
+const mergeOptions = require('../utils/mergeOptions');
+const log = require('../utils/log');
+
+module.exports = async function publish(programOption, env = '') {
+  const options = mergeOptions(programOption, ['locales']);
+
+  let confService = null;
+  if (options.localeConf.type === 'file') {
+    const FileConf = require('../conf/FileConf');
+    confService = new FileConf(options.locales);
+  } else {
+    const Conf = require(path.join(process.cwd(), options.localeConf.path));
+    confService = new Conf(options.localeConf);
+  }
+
+  const publishTasks = options.supportedLocales.map((key) => {
+    return confService.publishConf(`${key}-${env}`);
+  });
+
+  const publishTaskResults = await Promise.all(publishTasks);
+  log.success('[done] conf published');
+  console.log(publishTaskResults);
+};

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

@@ -1,21 +1,21 @@
-module.exports = class BaseConf {
-  createService() {
-    return Promise.resolve(true);
-  }
-
-  createConf() {
-    throw new Error('`createConf` must be overrided');
-  }
-
-  updateConf() {
-    throw new Error('`updateConf` must be overrided');
-  }
-
-  getConf() {
-    throw new Error('`getConf` must be overrided');
-  }
-
-  publishConf() {
-    return Promise.resolve(true);
-  }
-};
+module.exports = class BaseConf {
+  createService() {
+    return Promise.resolve(true);
+  }
+
+  createConf() {
+    throw new Error('`createConf` must be overrided');
+  }
+
+  updateConf() {
+    throw new Error('`updateConf` must be overrided');
+  }
+
+  getConf() {
+    throw new Error('`getConf` must be overrided');
+  }
+
+  publishConf() {
+    return Promise.resolve(true);
+  }
+};

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

@@ -1,116 +1,116 @@
-const fs = require('fs');
-const path = require('path');
-const BaseConf = require('./BaseConf');
-const log = require('../utils/log');
-
-const cwdPath = process.cwd();
-
-module.exports = class FileConf extends BaseConf {
-  constructor(folder) {
-    super();
-    this.localesDir = folder;
-  }
-
-  /**
-   * 创建一个服务
-   */
-  createService() {
-    log.info('No need to create service in FileConf');
-    return super.createService();
-  }
-
-  /**
-   * 创建一个配置
-   * @param {string} confName  配置名称
-   * @param {object} values    KV值
-   * @param {object} refValues 参数备注
-   * @param {string} key       locales标识
-   */
-  createConf(confName, values, refValues, key) {
-    const folder = this.localesDir.startsWith('/')
-      ? this.localesDir
-      : path.join(cwdPath, this.localesDir);
-
-    try {
-      fs.accessSync(folder);
-    } catch (e) {
-      fs.mkdirSync(folder);
-    }
-
-    const configFilePath = path.join(folder, `${key}.json`);
-    return new Promise((resolve, reject) => {
-      fs.writeFile(configFilePath, JSON.stringify(values, null, 2), (err) => {
-        if (err) {
-          reject(err);
-        } else {
-          resolve(configFilePath);
-        }
-      });
-    });
-  }
-
-  /**
-   * 更新一个配置
-   * @param {string} confName  配置名称
-   * @param {object} values    KV值
-   * @param {object} refValues 参数备注
-   * @param {string} key       locales标识
-   */
-  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) => {
-        if (err) {
-          resolve({
-            code: -1,
-            message: err.message,
-          });
-        } else {
-          resolve({
-            code: 0,
-            data: configFilePath,
-          });
-        }
-      });
-    });
-  }
-
-  /**
-   * 获取配置值
-   * @param {string} _  配置名称
-   * @param {string} key  key
-   */
-  getConf(confName, key) {
-    const configFilePath = path.join(cwdPath, this.localesDir, `${key}.json`);
-    return new Promise((resolve, reject) => {
-      if (fs.existsSync(configFilePath)) {
-        let data = {};
-        try {
-          const content = fs.readFileSync(configFilePath);
-          data = content.length > 0 ? JSON.parse(content) : {};
-          resolve({
-            code: 0,
-            data: Object.keys(data).map((k) => ({
-              key: k,
-              value: data[k],
-            })),
-          });
-        } catch (err) {
-          reject(
-            new Error(`请检查 ${configFilePath} 资源文件 JSON 格式是否正确`)
-          );
-        }
-      } else {
-        reject(new Error(`资源文件 ${configFilePath} 不存在`));
-      }
-    });
-  }
-
-  /**
-   * 发布指定的配置
-   */
-  publishConf() {
-    log.info('No need to publish in FileConf');
-    return super.publishConf();
-  }
-};
+const fs = require('fs');
+const path = require('path');
+const BaseConf = require('./BaseConf');
+const log = require('../utils/log');
+
+const cwdPath = process.cwd();
+
+module.exports = class FileConf extends BaseConf {
+  constructor(folder) {
+    super();
+    this.localesDir = folder;
+  }
+
+  /**
+   * 创建一个服务
+   */
+  createService() {
+    log.info('No need to create service in FileConf');
+    return super.createService();
+  }
+
+  /**
+   * 创建一个配置
+   * @param {string} confName  配置名称
+   * @param {object} values    KV值
+   * @param {object} refValues 参数备注
+   * @param {string} key       locales标识
+   */
+  createConf(confName, values, refValues, key) {
+    const folder = this.localesDir.startsWith('/')
+      ? this.localesDir
+      : path.join(cwdPath, this.localesDir);
+
+    try {
+      fs.accessSync(folder);
+    } catch (e) {
+      fs.mkdirSync(folder);
+    }
+
+    const configFilePath = path.join(folder, `${key}.json`);
+    return new Promise((resolve, reject) => {
+      fs.writeFile(configFilePath, JSON.stringify(values, null, 2), (err) => {
+        if (err) {
+          reject(err);
+        } else {
+          resolve(configFilePath);
+        }
+      });
+    });
+  }
+
+  /**
+   * 更新一个配置
+   * @param {string} confName  配置名称
+   * @param {object} values    KV值
+   * @param {object} refValues 参数备注
+   * @param {string} key       locales标识
+   */
+  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) => {
+        if (err) {
+          resolve({
+            code: -1,
+            message: err.message,
+          });
+        } else {
+          resolve({
+            code: 0,
+            data: configFilePath,
+          });
+        }
+      });
+    });
+  }
+
+  /**
+   * 获取配置值
+   * @param {string} _  配置名称
+   * @param {string} key  key
+   */
+  getConf(confName, key) {
+    const configFilePath = path.join(cwdPath, this.localesDir, `${key}.json`);
+    return new Promise((resolve, reject) => {
+      if (fs.existsSync(configFilePath)) {
+        let data = {};
+        try {
+          const content = fs.readFileSync(configFilePath);
+          data = content.length > 0 ? JSON.parse(content) : {};
+          resolve({
+            code: 0,
+            data: Object.keys(data).map((k) => ({
+              key: k,
+              value: data[k],
+            })),
+          });
+        } catch (err) {
+          reject(
+            new Error(`请检查 ${configFilePath} 资源文件 JSON 格式是否正确`)
+          );
+        }
+      } else {
+        reject(new Error(`资源文件 ${configFilePath} 不存在`));
+      }
+    });
+  }
+
+  /**
+   * 发布指定的配置
+   */
+  publishConf() {
+    log.info('No need to publish in FileConf');
+    return super.publishConf();
+  }
+};