@tmsfe/tmskit 0.0.19 → 0.0.22

package/src/scripts/run/install/index.js

@@ -2,22 +2,22 @@ const shelljs = require('shelljs');
 const fs = require('fs');
 const path = require('path');
 const io = require('../../../utils/io');
-const { createTask, resolve } = require('../../../utils/widgets');
+const { createTask, resolve, getAbsolutePath } = require('../../../utils/widgets');
 const { buildMpNpm } = require('../../../core/mpCi');
-const { setCache, getCache } = require('../../../core/cache');
-const { CACHE_DIR } = require('../../../config/constant');
+const { setCache, getCache } = require('./cache');
+const { NODE_MODULES_DIR } = require('../../../config/constant');
 const { npmInstallAll } = require('../../../core/npm');
-const { fail, info } = require('../../../utils/log');
+const { info } = require('../../../utils/log');
 const { fileMd5 } = require('../../../utils/md5');
 const { isDependenciesUpdate } = require('../../../core/checkDependencies');
 
-async function install(tmsConfig, modules, env, useCache = true) {
+async function install(tmsConfig, subPackages, useCache = true) {
   const cwd = process.cwd();
   const npmInstallRes = await createTask(
     npmInstall,
     '小程序 开始npm install',
     '小程序npm install 完成',
-  )(tmsConfig, modules, useCache);
+  )(tmsConfig, subPackages, useCache);
 
   // 如果npm install 没有命中缓存，则说明node_module有更新，此时必须构建miniprogram_npm
   if (!npmInstallRes.isCache) {
@@ -26,48 +26,44 @@ async function install(tmsConfig, modules, env, useCache = true) {
       mpCiInstall,
       '开始构建miniprogram_npm',
       '构建miniprogram_npm 完成',
-    )(tmsConfig, modules, false);
+    )(tmsConfig, subPackages, false);
   } else {
     // 构建miniprogram_npm
     await createTask(
       mpCiInstall,
       '开始构建miniprogram_npm',
       '构建miniprogram_npm 完成',
-    )(tmsConfig, modules, useCache);
+    )(tmsConfig, subPackages, useCache);
   }
   shelljs.cd(cwd);
 }
 
-async function npmInstall(tmsConfig, modules, useCache) {
+async function npmInstall(tmsConfig, subPackages, useCache) {
   // 如果依赖没有更新和使用缓存数据（则命中缓存）
-  if (!isDependenciesUpdate(modules, resolve('./'), tmsConfig.outputDir) && useCache) {
+  if (!isDependenciesUpdate(subPackages, resolve('./'), tmsConfig.outputDir) && useCache) {
     info('node_modules命中缓存');
     return { isCache: true };
   }
   // 拷贝模块的package.json到编译输出目录
-  modules.forEach((item) => {
+  subPackages.forEach((item) => {
     const outputModuleDir = resolve(`${tmsConfig.outputDir}/${item.root}`);
-    if (!fs.existsSync(resolve(item.path))) {
-      fail(`${item.path}模块代码路径不存在, 请检查tms.config.js的${item.name}模块的path`);
-      process.exit(1);
-    }
     io.ensureDirExist(outputModuleDir);
-    const modulePackagePath = resolve(item.path, 'package.json');
+    const modulePackagePath = `${getAbsolutePath(item.path)}/package.json`;
     if (fs.existsSync(modulePackagePath)) shelljs.cp('-Rf', modulePackagePath, outputModuleDir);
   });
 
-  await npmInstallAll(modules, resolve(tmsConfig.outputDir), `${CACHE_DIR}/node_modules`);
+  await npmInstallAll(subPackages, resolve(tmsConfig.outputDir), NODE_MODULES_DIR);
   return { isCache: false };
 }
 
 // 构建miniprogram_npm
-async function mpCiInstall(tmsConfig, modules, useCache) {
+async function mpCiInstall(tmsConfig, subPackages, useCache) {
   const packageJsonFiles = [];
   const rootPackFile = resolve(`${tmsConfig.outputDir}/package.json`);
   if (fs.existsSync(rootPackFile)) {
     packageJsonFiles.push(rootPackFile);
   }
-  modules.forEach((item) => {
+  subPackages.forEach((item) => {
     const packageJsonFile = resolve(`${tmsConfig.outputDir}/${item.root}/package.json`);
     if (fs.existsSync(packageJsonFile)) {
       packageJsonFiles.push(packageJsonFile);
@@ -121,8 +117,9 @@ async function getMNPMd5(cwd) {
   shelljs.cd(cwd);
   if (fs.existsSync('miniprogram_npm')) {
     shelljs.exec('tar -cvf ./miniprogram_npm.tar.gz ./miniprogram_npm',  { cwd, ...shellJsOption });
-    const md5Value = await fileMd5('./miniprogram_npm.tar.gz');
-    shelljs.rm('-rf', path.join(cwd, './miniprogram_npm.tar.gz'));
+    const tarDir = path.join(cwd, './miniprogram_npm.tar.gz');
+    const md5Value = await fileMd5(tarDir);
+    shelljs.rm('-rf', tarDir);
     return md5Value;
   }
   return '';

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