@tmsfe/tmskit 0.0.5-beta.4 → 0.0.6

package/src/utils/buildAppJson.js

@@ -1,25 +1,23 @@
 const fs = require('fs');
-const { DEFAULT_MODULE_DIR, MODULE_CONFIG_FILENAME, MODULE_CONFIG_INVALID_KEY } = require('../config/constant');
+const { MODULE_CONFIG_FILENAME, MODULE_CONFIG_INVALID_KEY } = require('../config/constant');
 const { fail } = require('./log');
 const { resolve, isObject, isArray } = require('./widgets');
+const { handleError } = require('./handleError');
 
 /**
  * 获取每个模块下面的信息，并且收集，后续更新到appJson里面
  * @param { object } file 操作目录下面所有的文件
  * @param { string } appName 小程序的名称
  */
-function setModuleConfig(file, appName, moduleDir) {
+
+function setModuleConfig(file, appName) {
   const content = file.contents ? JSON.parse(file.contents.toString()) : JSON.parse(file);
 
-  if (isObject(content)) {
-    content.root = content.root.indexOf(moduleDir) > -1 ? content.root : `${moduleDir}/${content.root}`;
-  }
 
   if (isArray(content)) {
     let i = content.length - 1;
     while (i >= 0) {
       let current = content[i];
-      current.root = current.root.indexOf(moduleDir) > -1 ? current.root : `${moduleDir}/${current.root}`;
 
       if (appName && current.mpConfig && current.mpConfig[appName]) {
         current = { ...current, ...current.mpConfig[appName] };
@@ -38,16 +36,17 @@ function setModuleConfig(file, appName, moduleDir) {
 /**
  * 递归获取本地所有模块的配置信息
  */
-function getLocalModuleConfig(modules = [], appName, moduleDir, moduleConfigFilename) {
+function getLocalModuleConfig(modules = [], appName, moduleConfigFilename) {
   const modulesConfig = {};
 
   modules.forEach(({ path }) => {
     const moduleConfigPath = resolve(path, moduleConfigFilename);
     if (fs.existsSync(moduleConfigPath)) {
       const content = fs.readFileSync(moduleConfigPath, 'utf-8');
-      modulesConfig[moduleConfigPath] = setModuleConfig(content, appName, moduleDir);
+      modulesConfig[moduleConfigPath] = setModuleConfig(content, appName);
     }
   });
+
   return modulesConfig;
 }
 
@@ -111,10 +110,22 @@ const updateSubpackages = (appJson, modulesConfig) => {
   // eslint-disable-next-line
   for (const name in modulesConfig) {
     const moduleInfo = isObject(modulesConfig[name]) ? [modulesConfig[name]] : modulesConfig[name];
+    // 过滤 pages 为空的情况
+    const validModules = getValidModules(moduleInfo);
     // eslint-disable-next-line
-    appJson.subpackages = appJson.subpackages.concat(moduleInfo);
+    appJson.subpackages = appJson.subpackages.concat(validModules);
   }
 };
+/**
+ * 过滤页面为空的分包
+ * @param {Array} moduleCfg 模块配置内容
+ * @returns pages不为空的分包
+ */
+const getValidModules = (moduleCfg) => {
+  // 过滤 pages 为空的情况
+  const validModules = moduleCfg.filter(item => item.pages.length > 0);
+  return validModules;
+};
 
 /**
  * 处理合并subpackages后的appjson, 整理重复不合法的地方
@@ -127,6 +138,11 @@ const processAppJson = (appJson) => {
   const subps = subpackages.map((subp) => {
     const invalidKeys = [];
     Object.keys(subp).forEach((key) => {
+      if (key === 'dependencies') {
+        // eslint-disable-next-line
+        delete subp.dependencies;
+        return;
+      }
       if (key === 'plugins') {
         Object.keys(subp.plugins).forEach((pk) => {
           pluginsMap[pk] ? pluginsMap[pk].push(`分包${subp.name}`) : pluginsMap[pk] = [`分包${subp.name}`];
@@ -164,7 +180,7 @@ const processAppJson = (appJson) => {
   })
     .reduce((pre, cur) => pre + cur, '');
   if (pluginsErrMsg) {
-    fail(pluginsErrMsg);
+    fail(`plugins配置出现错误:${pluginsErrMsg}`);
   }
   // eslint-disable-next-line
   appJson.subpackages = subps;
@@ -177,24 +193,29 @@ const processAppJson = (appJson) => {
  * @param {array} modules
  * @returns
  */
-function buildOutputAppJson(tmsConfig, modules) {
-  // 获取当前 modules 下的所有子模块的配置内容
-  const modulesConfig = getLocalModuleConfig(modules, tmsConfig.appName, DEFAULT_MODULE_DIR, MODULE_CONFIG_FILENAME);
-  // 获取app.json的配置
-  const appJson = getAppJsonContent(resolve('./app.json'));
-  // 更新app.json中的subpackages
-  updateSubpackages(appJson, modulesConfig);
-  // 处理appJson中重复||冲突的地方
-  processAppJson(appJson);
-  // 更新主包，需在subpackages处理完成后执行， pages/
-  updateMainPackages(appJson, tmsConfig.mainPackages, DEFAULT_MODULE_DIR);
-
-  fs.writeFileSync(resolve(`${tmsConfig.gulp.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
-
-  return appJson;
+function buildOutputAppJson(tmsConfig, modules, isDev) {
+  try {
+    // 获取当前 modules 下的所有子模块的配置内容
+    const modulesConfig = getLocalModuleConfig(modules, tmsConfig.appName, MODULE_CONFIG_FILENAME);
+    // 获取app.json的配置
+    const appJson = getAppJsonContent(resolve('./app.json'));
+    // 更新app.json中的subpackages
+    updateSubpackages(appJson, modulesConfig);
+    // 处理appJson中重复||冲突的地方
+    processAppJson(appJson);
+    // 更新主包，需在subpackages处理完成后执行， pages/
+    updateMainPackages(appJson, tmsConfig.mainPackages);
+
+    fs.writeFileSync(resolve(`${tmsConfig.outputDir}/app.json`), JSON.stringify(appJson, null, 2), 'utf8');
+
+    return appJson;
+  } catch (e) {
+    handleError(`生成app.json出现错误: ${e}`, isDev);
+  }
 }
 
 module.exports = {
   setModuleConfig,
+  getValidModules,
   buildOutputAppJson,
 };

package/src/utils/checkDependencies.js

@@ -2,8 +2,8 @@ const fs = require('fs');
 const semver = require('semver');
 const { resolve } = require('./widgets');
 const path = require('path');
-const { fail } = require('./log');
 const shelljs = require('shelljs');
+const { handleError } = require('./handleError');
 
 const getLatestVersion = (npmName) => {
   const data = shelljs.exec(`npm view ${npmName} version`);
@@ -17,7 +17,7 @@ const getLatestVersion = (npmName) => {
  * @param {*} outputDir  待检查node_modules存放的目录 （eg: dist/node_modules）
  * @returns
  */
-const checkDependencies = (modules, cwd, outputDir) => {
+const checkDependencies = (modules, cwd, outputDir, isDev) => {
   // 步骤1. 收集package.json
   const packageJsonName = 'package.json';  // 查找文件名
   // 1.1根目录的package.json
@@ -41,12 +41,12 @@ const checkDependencies = (modules, cwd, outputDir) => {
   // 步骤2. 比较package.json的依赖与node_modules依赖的版本号
   for (const item of packageArr) {
     const packageJson = fs.readFileSync(item.srcPackageDir, 'utf-8');
-    let dependencies;
+    let dependencies = {};
     try {
-      dependencies = JSON.parse(packageJson).dependencies;
+      const json = JSON.parse(packageJson);
+      dependencies = json?.dependencies ? json?.dependencies : {};
     } catch (e) {
-      fail(`解析${packageJson}报错，请检查是否是正确的json配置项`);
-      process.exit(1);
+      handleError(`解析${item.srcPackageDir}报错，请检查是否是正确的json配置项`, isDev);
     }
     const dependenciesKeys = Object.keys(dependencies);
     for (const key of dependenciesKeys) {

package/src/utils/cloneModules.js

@@ -1,9 +1,29 @@
 const MetalSmith = require('metalsmith');
 const { getGlobalInstance } = require('./global.js');
 const { downloadRepoForGit, resolve } = require('./widgets');
+const { readTmsPrivateCf } = require('../utils/tkitUtils');
 const { fail } = require('./log');
 const fs = require('fs');
 const shelljs = require('shelljs');
+const { handleError } = require('./handleError.js');
+
+/**
+ * 处理用户没有clone git仓库权限问题——拼接账号信息
+ * @param {*} httpRepoUrl
+ * @param {*} moduleName
+ * @returns
+ */
+function replaceGitUrlAccount(httpRepoUrl, moduleName, privateCf) {
+  let gitUrl = httpRepoUrl;
+  const { username = '', pass = '' } = privateCf?.gitAccout?.[moduleName] || {};
+
+  const urlPrefixReg = /http(s)?:\/\//;
+  if (username && pass && urlPrefixReg.test(gitUrl)) {
+    gitUrl = gitUrl.replace(urlPrefixReg, val => `${val}${encodeURIComponent(username)}:${pass}@`);
+  }
+
+  return gitUrl;
+}
 
 /**
  * 对克隆下来的模块进行相应的文件处理操作，比如收集处理模块信息，进行信息缓存等操作
@@ -14,15 +34,15 @@ const shelljs = require('shelljs');
  */
 function moveFile(sourceDir, targetDir, ignore = []) {
   // 删除不是文件夹的文件
-  return new Promise((resolve) => {
+  return new Promise((resolve, reject) => {
     MetalSmith(__dirname)
       .ignore(ignore)
       .source(sourceDir)
       .destination(targetDir)
       .build((e) => {
         if (e) {
-          fail(e); // eslint-disable-line
-          console.log('MetalSmith 详细的错误信息:', e);
+          fail(`${sourceDir} moveFile ${targetDir}出现错误: ${e}`);
+          reject(e);
         }
         resolve();
       });
@@ -33,13 +53,17 @@ function moveFile(sourceDir, targetDir, ignore = []) {
  * 下载目标模块
  * @param { string } sourceDir 缓存文件夹
  * @param { string } targetDir 目标文件夹
+ * @param { boolean } isDev 是否是dev
  * @returns { array } modules 描述模块的列表
  */
-async function cloneModules(sourceDir, targetDir, modules) {
+async function cloneModules(sourceDir, targetDir, modules, isDev) {
+  // 用户本地的私有项目配置（用来配置环境\模块信息\账号信息）
+  const privateCf = readTmsPrivateCf();
+
   // 根据小程序的配置文件下载模块， 并且处理信息
-  for (const moduleInfo of modules) { // eslint-disable-line
+  for (const moduleInfo of modules) {
     if (moduleInfo.repoInfo) {
-      await downLoadAndMoveModule(sourceDir, targetDir, moduleInfo);
+      await downLoadAndMoveModule(sourceDir, targetDir, moduleInfo, privateCf, isDev);
     }
   }
 }
@@ -48,13 +72,14 @@ async function cloneModules(sourceDir, targetDir, modules) {
  * 下载模块信息并且将它移动到对应的位置
  * @param { string } sourceDir 代码缓存文件夹
  * @param { string } targetDir 代码要放到的目标文件夹
+ * @param { boolean } isDev 是否是dev
  * @returns { array } moduleInfo 描述模块的信息
  */
-async function downLoadAndMoveModule(sourceDir, targetDir,  moduleInfo) {
-  const { repoInfo: { buildGitTag, httpRepoUrl }, path } = moduleInfo;
+async function downLoadAndMoveModule(sourceDir, targetDir,  moduleInfo, privateCf, isDev) {
+  const { repoInfo: { buildGitTag, httpRepoUrl }, path, name } = moduleInfo;
 
   // 源码临时存在的源目录
-  let sourcePath = resolve(sourceDir, path);
+  let sourcePath = resolve(sourceDir, name);
   // 源码要放到目标目录
   const targetPath = resolve(targetDir, path);
   // 设置模块的构建分支
@@ -66,22 +91,23 @@ async function downLoadAndMoveModule(sourceDir, targetDir,  moduleInfo) {
 
   try {
     if (!moduleInCache) {
-      await downloadRepoForGit(httpRepoUrl, sourcePath, cloneBranch);
+      // 处理仓库权限问题
+      const gitUrl = replaceGitUrlAccount(httpRepoUrl, name, privateCf);
+      await downloadRepoForGit(gitUrl, sourcePath, cloneBranch);
       globalInstance.setModuleCache(httpRepoUrl, cloneBranch, sourcePath);
     } else {
       sourcePath = globalInstance.getModuleCache(httpRepoUrl, cloneBranch).dest;
     }
 
     if (fs.existsSync(targetPath)) {
-      shelljs.rm('-rf', targetPath);
+      shelljs.rm('-rf', `${targetPath}/*`);
     }
     await moveFile(sourcePath, targetPath, [
       'node_modules',
       '.git',
     ]);
   } catch (e) {
-    fail(`downLoadAndMoveModule ${e}`);  // eslint-disable-line
-    process.exit(-1);
+    handleError(e, isDev);
   }
 }
 

package/src/utils/handleError.js

@@ -0,0 +1,16 @@
+const { fail } = require('./log');
+
+function handleError(error, isDev = false) {
+  const errMsg = typeof error === 'object' ? error.message : error;
+  if (isDev) {
+    fail(errMsg);
+  } else {
+    fail(errMsg);
+    process.exit(1);
+  }
+}
+
+module.exports = {
+  handleError,
+};
+

package/src/utils/io.js

@@ -32,7 +32,7 @@ const copyFile = function (src, dest) {
   if (fs.existsSync(dest)) {
     fs.unlinkSync(dest);
   }
-  const dir = dest.substr(0, dest.lastIndexOf('/'));
+  const dir = path.dirname(dest);
   ensureDirExist(dir);
   fs.copyFileSync(src, dest);
 };

package/src/utils/mpCiUtils.js

@@ -1,4 +1,3 @@
-/* eslint-disable require-jsdoc */
 const ci = require('miniprogram-ci');
 const path = require('path');
 

package/src/utils/npmUtils.js

@@ -2,55 +2,74 @@
  * 本文件主要负责项目或者分包依赖的npm的安装
  */
 const fs = require('fs');
+const fsExtra = require('fs-extra');
+const crypto = require('crypto');
 const path = require('path');
 const shell = require('shelljs');
 const glob = require('glob-ignore');
 const LOG = require('./log');
 
-const dirpath = process.cwd(); // 项目根目录
+const shellJsOption = { async: false, silent: true };
+const dirPath = process.cwd(); // 项目根目录
 
-const getTarNpmFilename = targetDir => `${targetDir.replace(/\//g, '-')}.tar.gz`;
+const install = async (packageJsonPath = '', retry = true, cacheDir) => {
+  const obj = {};
+  const packageContent = fs.readFileSync(packageJsonPath);
+  const packageJson = JSON.parse(packageContent);
+  obj.dependencies = packageJson.dependencies || {};
+  // obj.devDependencies = packageJson.devDependencies || {};
 
-// 缓存npm包
-const npmCache = function (targetDir, cacheDir) {
-  if (!fs.existsSync(cacheDir)) {
-    fs.mkdirSync(cacheDir);
+  // dependencies和devDependencies字段为空,没有需要安装的npm包,直接return
+  // if (Object.keys(obj.dependencies).length === 0 && Object.keys(obj.devDependencies).length === 0) {
+  if (Object.keys(obj.dependencies).length === 0) {
+    return;
   }
-  const tarNpmFilename = getTarNpmFilename(targetDir);
-  const tarNpmFilePath = `${cacheDir}/${tarNpmFilename}`;
-  if (fs.existsSync(tarNpmFilePath)) {
-    shell.rm('-rf', tarNpmFilePath);
-  }
-  const cmd = `tar -zcvf ${tarNpmFilePath} ./node_modules`;
-  shell.exec(cmd, { async: true, silent: true });
-  // tar -zcvf /Users/odile/.tmskit/node_modules.tar.gz  ./node_modules
-};
 
-// 获取缓存npm包
-const getNpmCache = function (targetDir, cacheDir) {
-  const tarNpmFilename = getTarNpmFilename(targetDir);
-  const tarNpmFilePath = `${cacheDir}/${tarNpmFilename}`;
-  if (fs.existsSync(tarNpmFilePath)) {
-    const cmd = `tar -zxvf ${tarNpmFilePath} -C ./`;
-    shell.exec(cmd, { async: false, silent: true });
+  // 以package.json中dependencies字段stringify后的md5值作为缓存key
+  // 任意包名或者版本号的差异,将导致md5后的差异,从而导致缓存失效,重新下载
+  // 如此来保证npm缓存的准确性
+  const str = JSON.stringify(obj);
+  const key = crypto.createHash('md5').update(str)
+    .digest('hex');
+  const keyPath = path.join(cacheDir, key);
+  const tarFile = path.join(keyPath, 'node_modules.tar.gz');
+
+  // npm缓存路径不存在
+  // 或者缓存的包大小小于512byte,认为缓存不合法
+  // 清空缓存目录,重新下载npm包缓存
+  const missCache =  !fsExtra.pathExistsSync(keyPath)
+    || !fsExtra.existsSync(tarFile)
+    || fsExtra.statSync(tarFile).size < 512;
+  if (missCache) {
+    console.log(`未命中缓存，下载${packageJsonPath}依赖`);
+    fsExtra.emptydirSync(keyPath);
+    shell.cp('-f', packageJsonPath, keyPath);
+    shell.cd(keyPath);
+    try {
+      shell.exec('npx yarn --production --registry http://mirrors.tencent.com/npm/', shellJsOption);
+    } catch (err) {
+      console.log('err', err);
+      if (retry) {
+        return await install(packageJsonPath, false);
+      }
+      throw err;
+    }
+    shell.exec('tar -zcvf ./node_modules.tar.gz ./node_modules', shellJsOption);
+    shell.exec('rm -rf ./node_modules',  shellJsOption);
   }
-  // tar -zxvf /Users/odile/.tmskit/node_modules.tar.gz  -C ./
+  shell.cp('-Rf', tarFile, `${path.dirname(packageJsonPath)}/`);
+  shell.cd(path.dirname(packageJsonPath));
+
+  shell.exec('tar -xzvf ./node_modules.tar.gz -C ./',  shellJsOption);
+  shell.exec('rm -rf ./node_modules.tar.gz', shellJsOption);
+  return { missCache, key };
 };
 
 
 // 遍历安装指定目录下所有项目的npm依赖
 const mpNpmInstallAll = async (modules, contextDir, cacheDir) => {
   const packageJsonFiles = await findAllPackageJson(modules, contextDir);
-  await Promise.all(packageJsonFiles.map(file => new Promise((resolve) => {
-    const dir = path.dirname(file);
-    shell.cd(dir);
-    if (!fs.existsSync(`${dir}/node_modules`)) {
-      getNpmCache(dir, cacheDir);
-    }
-    shell.exec('npx pnpm install --prod --registry http://mirrors.tencent.com/npm/', { silent: false });
-    resolve();
-    npmCache(dir, cacheDir);
-  })));
+  await Promise.all(packageJsonFiles.map(file => install(file, true, cacheDir)));
 };
 
 /**
@@ -106,10 +125,9 @@ const findFilesByFilter = (startPath, filter) => {
  */
 const findAllPackageJson = (subRoots = [], contextDir) => {
   const packageJsonName = 'package.json';         // 查找文件名
-  const cwd = contextDir || dirpath;
+  const cwd = contextDir || dirPath;
   const result = [path.join(cwd, packageJsonName)]; // 默认填充根目录下的package.json
 
-
   subRoots.forEach((subRoot) => {
     if (!subRoot.root) {
       LOG.fail(`请检查${subRoot.name}的module.config.json是否有root字段`);

package/src/utils/tkitUtils.js

@@ -1,13 +1,14 @@
 const loadash = require('lodash');
 const fs = require('fs');
-const { TMS_NAME, TMS_CONFIG_FILENAME, MODULE_CONFIG_FILENAME } = require('../config/constant');
+const { TMS_NAME, TMS_CONFIG_FILENAME, MODULE_CONFIG_FILENAME, TMS_PRIVATE_FILENAME } = require('../config/constant');
 const { resolve, isObject } = require('./widgets');
-const { setModuleConfig } = require('./buildAppJson');
+const { setModuleConfig, getValidModules } = require('./buildAppJson');
 const defaultTmsConfig = require('../config/defaultTmsConfig');
 const { fail } = require('./log');
+const path = require('path');
 
 /**
- * 读取tms.config.json
+ * 读取tms.config.js
  * @param env {string} 环境变量
  */
 const readTmsConfig = function (env) {
@@ -22,9 +23,45 @@ const readTmsConfig = function (env) {
   });
   // 合并默认值
   loadash.mergeWith(tmsConfig, defaultTmsConfig);
+  // modules兼容处理
+  tmsConfig.modules = convertModules(tmsConfig.modules);
   return tmsConfig;
 };
 
+// convertModules 处理默认值
+const convertModules = (modules) => {
+  const newModules = [];
+  modules.forEach((module, index) => {
+    const newModule = {};
+    if (typeof module === 'string') {
+      // 路径字符串
+      Object.assign(newModule, {
+        name: path.basename(module),
+        path: module,
+      });
+    } else if (typeof module === 'object') {
+      Object.assign(newModule, module);
+      if (module.name === undefined) {
+        newModule.name = path.basename(module.path);
+      }
+    }
+    newModules.push(newModule);
+  });
+  return newModules;
+};
+
+/**
+ * 读取tms.private.js
+ */
+const readTmsPrivateCf = function () {
+  let tmsPrivateCg;
+  const tmsPrivatePath = resolve(TMS_PRIVATE_FILENAME);
+  if (fs.existsSync(tmsPrivatePath)) {
+    tmsPrivateCg = require(tmsPrivatePath);
+  }
+  return tmsPrivateCg;
+};
+
 /**
  * 从tms.config.json中检索用户传入的有效modules
  * @param { object } tmsConfig
@@ -32,7 +69,7 @@ const readTmsConfig = function (env) {
  * @returns
  */
 const checkModules = function (tmsConfig, modules) {
-  const targetModules =  [];
+  const targetModules = [];
   modules.forEach((moduleName) => {
     const module = tmsConfig.modules.find(module => module.name === moduleName);
     module && targetModules.push(module);
@@ -51,22 +88,29 @@ const checkModules = function (tmsConfig, modules) {
  * @param {string} moduleDir
  * @returns
  */
-const tmsModulesMergeLocalModuleCfg = (modules, appName, moduleDir) => {
+const tmsModulesMergeLocalModuleCfg = (modules, appName) => {
   const newModules = [];
   modules.forEach(({ path: relativePath, name: moduleName }, moduleIndex) => {
     const moduleConfigPath = resolve(relativePath, MODULE_CONFIG_FILENAME);
     if (fs.existsSync(moduleConfigPath)) {
-      let moduleConfigContent = fs.readFileSync(moduleConfigPath, 'utf-8');
-      moduleConfigContent = setModuleConfig(moduleConfigContent, appName, moduleDir);
-      const moduleContentArr = isObject(moduleConfigContent) ? [moduleConfigContent] : moduleConfigContent;
-      moduleContentArr.forEach(({ name }, moduleContentArrIndex) => {
-        if (name === moduleName) {
-          newModules.push({
-            ...modules[moduleIndex],
-            ...moduleContentArr[moduleContentArrIndex],
-          });
-        }
-      });
+      try {
+        let moduleConfigContent = fs.readFileSync(moduleConfigPath, 'utf-8');
+        moduleConfigContent = setModuleConfig(moduleConfigContent, appName);
+        const moduleContentArr = isObject(moduleConfigContent) ? [moduleConfigContent] : moduleConfigContent;
+        getValidModules(moduleContentArr).forEach(({ name }, moduleContentArrIndex) => {
+          if (name === moduleName) {
+            newModules.push({
+              ...modules[moduleIndex],
+              ...moduleContentArr[moduleContentArrIndex],
+            });
+          }
+        });
+      } catch (e) {
+        fail(`${moduleConfigPath}配置错误: ${e}`);
+        newModules.push({
+          ...modules[moduleIndex],
+        });
+      }
     } else {
       newModules.push({
         ...modules[moduleIndex],
@@ -76,9 +120,39 @@ const tmsModulesMergeLocalModuleCfg = (modules, appName, moduleDir) => {
   return newModules;
 };
 
+/**
+ * 分包依赖了分包的模块 合并所依赖的modules
+ * @param { object } tmsConfig
+ * @param {array} modules
+ * @param {string} moduleDir
+ * @returns
+ */
+const subModulesMergeDepModules = (tmsConfig, modules) => {
+  const moduleNames = [];
+  modules.forEach(({ name: moduleName }) => {
+    moduleNames.push(moduleName);
+  });
+  let mergeModules = modules;
+  let isOver = true;
+  modules.forEach(({ dependencies: dependencyModules }) => {
+    dependencyModules?.forEach((item) => {
+      // 如果所有模块的dep都在moduleNames内，则所有依赖都齐了
+      // 否则递归处理，根据name找到相关配置加到modules里
+      if (moduleNames.indexOf(item) === -1) {
+        isOver = false;
+        const tmpModules = checkModules(tmsConfig, [...new Set([item])]);
+        mergeModules = [...mergeModules, ...tmpModules];
+        mergeModules = tmsModulesMergeLocalModuleCfg(mergeModules, tmsConfig.appName);
+      }
+    });
+  });
+  return isOver ? mergeModules : subModulesMergeDepModules(tmsConfig, mergeModules);
+};
 
 module.exports = {
   readTmsConfig,
+  readTmsPrivateCf,
   checkModules,
   tmsModulesMergeLocalModuleCfg,
+  subModulesMergeDepModules,
 };

package/src/utils/widgets.js

@@ -7,7 +7,7 @@ const fs = require('fs');
 const shelljs = require('shelljs');
 const download = require('download-git-repo');
 const chalk = require('chalk');
-const shelljsOptons =  { slient: true };
+const shelljsOptions =  { slient: true };
 
 // 获取当前目录
 const cwd = process.cwd();
@@ -96,7 +96,7 @@ function downloadRepo(dest, downloadOptions = { repoUrl: '', gitUrl: '', branch:
 function downloadRepoForGit(url, dest, branch) {
   const cwd = process.cwd();
 
-  return new Promise((resolve) => {
+  return new Promise((resolve, reject) => {
     // 如果目标目录不存在
     if (fs.existsSync(dest)) {
       shelljs.rm('-rf', path.join(dest));
@@ -105,7 +105,10 @@ function downloadRepoForGit(url, dest, branch) {
     shelljs.mkdir('-p', dest);
     shelljs.cd(dest);
 
-    shelljs.exec(`git clone ${url} ${dest} --branch ${branch} --depth 1`, shelljsOptons);
+    const gitCloneRes = shelljs.exec(`git clone ${url} ${dest} --branch ${branch} --depth 1`, shelljsOptions);
+    if (gitCloneRes.code !== 0) {
+      reject(gitCloneRes.stderr);
+    }
 
     shelljs.cd(cwd);
     resolve();
@@ -129,22 +132,16 @@ const cost = start => Date.now() - start;
 function createTask(task, startText, endText) {
   return async (...args) => {
     const start = Date.now();
-    let result;
 
     const spinner = ora(startText);
+
     spinner.start();
+    console.log('\n');
 
-    try {
-      result = await task(...args);
-    } catch (e) {
-      result = e;
-      console.log(chalk.red(e));
+    const result = await task(...args);
 
-      process.exit(-1);
-    } finally {
-      endText && spinner.succeed(`${endText}, ${cost(start)}ms`);
-      spinner.stop();
-    }
+    endText && spinner.succeed(`${endText}, ${cost(start)}ms`);
+    spinner.stop();
 
     return result;
   };