@tmsfe/tmskit 0.0.20 → 0.0.23

package/src/utils/log.js

@@ -40,9 +40,12 @@ const warn = (message) => {
 
 const info = (...args) => console.log(`${moment().format('YYYY-MM-DD HH:mm:ss')}`, ...args);
 
+const infoNoTime = (...args) => console.log(...args);
+
 module.exports = {
   fail,
   succeed,
   warn,
   info,
+  infoNoTime,
 };

package/src/utils/widgets.js

@@ -1,13 +1,10 @@
 
-const program = require('commander');
-const leven = require('leven');
 const ora = require('ora');
 const path = require('path');
 const fs = require('fs');
 const shelljs = require('shelljs');
 const glob = require('glob-ignore');
 const { info } = require('./log');
-const chalk = require('chalk');
 const shelljsOptions =  { slient: true, async: false };
 
 // 获取当前目录
@@ -16,28 +13,6 @@ function resolve(...args) {
   return path.resolve(cwd, ...args);
 };
 
-
-/**
- * 用户输入命令时，进行提示
- * @param {String} unknownCommand 非预期的命令
- * @returns {Undefined} 无需返回值
- */
-const suggestCommands = (unknownCommand) => {
-  const availableCommands = program.commands.map(cmd => cmd._name);
-
-  let suggestion;
-  availableCommands.forEach((cmd) => {
-    const isBestMatch = leven(cmd, unknownCommand) < leven(suggestion || '', unknownCommand);
-    if (leven(cmd, unknownCommand) < 3 && isBestMatch) {
-      suggestion = cmd;
-    }
-  });
-
-  if (suggestion) {
-    info(`  ${chalk.red(`Did you mean ${chalk.yellow(suggestion)}?`)}`);
-  }
-};
-
 /**
  * 判断变量是否是一个数组
  * @param { unknown } obj 变量
@@ -109,13 +84,15 @@ function pullRepoForGit(dest, branch) {
 
 /**
  * npm 下载依赖
- * @param {*} dir
+ * @param {string} dir 下载npm的目录
+ * @param {object} npm npm的配置 (见下获取npm源入参)
  * @returns
  */
-function npmInstall(dir) {
+function npmInstall(dir, npmConfig) {
   return new Promise((resolve, reject) => {
+    const registry = getNpmRegistry(npmConfig);
     shelljs.exec(
-      'npm install --production --registry http://mirrors.tencent.com/npm/',
+      `npm install --production ${registry}`,
       { cwd: dir, silent: true },
       (code, stdout, stderr) => {
         if (code !== 0) {
@@ -127,6 +104,28 @@ function npmInstall(dir) {
   });
 }
 
+// 获取npm源
+// 入参：{
+//   registry: "https://registry.npmjs.org/",
+//   scope: {
+//     "@tencent": "http://mirrors.tencent.com/npm/"
+//   }
+// }
+// 出参： --@tencent:registry=http://mirrors.tencent.com/npm/ --registry=https://registry.npmjs.org/
+function getNpmRegistry(npmConfig = {}) {
+  let resRegistry = '';
+  if (npmConfig.registry) {
+    resRegistry = ` --registry=${npmConfig.registry}`;
+  }
+
+  if (isObject(npmConfig.scope)) {
+    Object.keys(npmConfig.scope).forEach((key) => {
+      resRegistry += ` --${key}:registry=${npmConfig.scope[key]}`;
+    });
+  }
+  return resRegistry;
+}
+
 /**
  * 计算各项任务耗时
  * @param {Number} start 任务开始时间
@@ -167,11 +166,7 @@ const camelize = str => str.replace(/-(\w)/g, (a, c) => (c ? c.toUpperCase() : '
 
 const mergeMap = function (obj, src) {
   for (const [k, v] of src) {
-    if (obj.has(k)) {
-      obj.set(k, obj.get(k) + v);
-    } else {
-      obj.set(k, v);
-    }
+    obj.set(k, v);
   }
 
   return obj;
@@ -209,6 +204,33 @@ function findFiles(globPath, filter = []) {
   });
 }
 
+// 获取绝对路径
+function getAbsolutePath(pathDir, cwd = '') {
+  let newPath = pathDir;
+  newPath = newPath.startsWith('/') ? newPath : resolve(cwd, newPath);
+  newPath = newPath.endsWith('/') ? newPath.slice(0, newPath.length - 1) : newPath;
+  return newPath;
+}
+
+// 版本比较 => 1(大于), 0(等于), -1(小于)
+function versionCompare(v1, v2) {
+  // 将两个版本号拆成数组
+  const arr1 = v1.split('.');
+  const arr2 = v2.split('.');
+  const minLength = Math.min(arr1.length, arr2.length);
+  // 依次比较版本号每一位大小
+  for (let i = 0; i < minLength; i++) {
+    if (parseInt(arr1[i], 10) !== parseInt(arr2[i], 10)) {
+      return (parseInt(arr1[i], 10) > parseInt(arr2[i], 10)) ? 1 : -1;
+    }
+  }
+  // 若前几位分隔相同，则按分隔数比较。
+  if (arr1.length === arr2.length) {
+    return 0;
+  }
+  return (arr1.length > arr2.length) ? 1 : -1;
+}
+
 module.exports = {
   resolve,
   isObject,
@@ -216,11 +238,13 @@ module.exports = {
   createTask,
   downloadRepoForGit,
   pullRepoForGit,
-  suggestCommands,
   camelize,
   npmInstall,
   mergeMap,
   relativeCwdPath,
   filterField,
   findFiles,
+  getAbsolutePath,
+  getNpmRegistry,
+  versionCompare,
 };