@tmsfe/tmskit 0.0.20 → 0.0.23

package/src/core/buildAppJson.js

@@ -8,6 +8,8 @@ const { fail, info } = require('../utils/log');
 const { resolve, filterField } = require('../utils/widgets');
 const { handleError } = require('./handleError');
 const { global } = require('../utils/global');
+const report = require('../core/report');
+
 
 /**
  * 更新appJson里面的主包配置
@@ -145,6 +147,7 @@ function buildOutputAppJson(tmsConfig, modules) {
         appJson,
         isDev: global.getData('isDev'),
       });
+      report('hooks:updateAppJson');
     }
     return appJson;
   } catch (e) {

package/src/core/checkDependencies.js

@@ -1,17 +1,20 @@
 const fs = require('fs');
 const semver = require('semver');
-const { resolve } = require('../utils/widgets');
+const { resolve, getAbsolutePath } = require('../utils/widgets');
 const path = require('path');
 const shelljs = require('shelljs');
 const { handleError } = require('./handleError');
 
 const getLatestVersion = (npmName) => {
   const data = shelljs.exec(`npm view ${npmName} version`);
-  return data.stdout || '0.0.0';
+  if (data.code === 0) {
+    return data.stdout;
+  }
+  return '0.0.0';
 };
 
 // 收集package.json
-function collectHasPackageJson(modules, cwd, outputDir) {
+function collectPackageJson(subPackages, cwd, outputDir) {
   const packageJsonName = 'package.json';  // 查找文件名
   // 1.1根目录的package.json
   const packageArr = [
@@ -21,8 +24,8 @@ function collectHasPackageJson(modules, cwd, outputDir) {
     },
   ];
   // 1.2模块的package.json
-  modules.forEach((item) => {
-    const srcPackageDir = path.join(cwd, item.path, 'package.json');
+  subPackages.forEach((item) => {
+    const srcPackageDir = `${getAbsolutePath(item.path)}/package.json`;
     if (fs.existsSync(srcPackageDir)) {
       packageArr.push({
         srcPackageDir,
@@ -48,14 +51,14 @@ function readPackageDependencies(srcPackageDir) {
 
 /**
  * 检查package.json的依赖大于node_module的版本，则返回true
- * @param {*} modules 模块
+ * @param {*} subPackages 模块
  * @param {*} cwd  待检查package.json所在的目录 (eg: 当前执行脚本的目录)
  * @param {*} outputDir  待检查node_modules存放的目录 （eg: dist/node_modules）
  * @returns
  */
-const isDependenciesUpdate = (modules, cwd, outputDir) => {
+const isDependenciesUpdate = (subPackages, cwd, outputDir) => {
   // 步骤1. 收集package.json
-  const packageArr = collectHasPackageJson(modules, cwd, outputDir);
+  const packageArr = collectPackageJson(subPackages, cwd, outputDir);
   // 步骤2. 比较package.json的依赖与node_modules依赖的版本号
   return checkPackageVersion(packageArr);
 };

package/src/core/cloneModules.js

@@ -39,6 +39,9 @@ function replaceGitUrlAccount(httpRepoUrl, moduleName) {
  * @returns { undefined } no return
  */
 function moveFile(sourceDir, targetDir, ignore = []) {
+  if (fs.existsSync(targetDir)) {
+    shelljs.rm('-rf', targetDir);
+  }
   // 删除不是文件夹的文件
   return new Promise((resolve, reject) => {
     MetalSmith(__dirname)

package/src/core/npm.js

@@ -6,10 +6,10 @@ 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('../utils/log');
 const { npmInstall } = require('../utils/widgets');
 const { handleError } = require('./handleError');
+const { global } = require('../utils/global');
 
 const shellJsOption = { async: false, silent: true };
 const dirPath = process.cwd(); // 项目根目录
@@ -76,7 +76,8 @@ const collectNpmTasksMap = (packageJsonFiles, cacheDir) => {
             fsExtra.emptydirSync(cacheNMPath);
             shell.cp('-f', packageJsonPath, cacheNMPath);
             log.info(`npm install: ${packageJsonPath}`);
-            return npmInstall(cacheNMPath).then(() => {
+            const tmsConfig = global.getData('tmsConfig');
+            return npmInstall(cacheNMPath, tmsConfig.npm).then(() => {
               const newShellJsOption = {
                 ...shellJsOption,
                 cwd: cacheNMPath,
@@ -104,9 +105,9 @@ const collectNpmTasksMap = (packageJsonFiles, cacheDir) => {
 
 
 // 遍历安装指定目录下所有项目的npm依赖
-const npmInstallAll = async (modules, contextDir, cacheDir) => {
+const npmInstallAll = async (subPackages, contextDir, cacheDir) => {
   const cwd = process.cwd();
-  const packageJsonFiles = await findAllPackageJson(modules, contextDir);
+  const packageJsonFiles = await findAllPackageJson(subPackages, contextDir);
 
   // 收集npm install的任务
   const npmTasksMap = collectNpmTasksMap(packageJsonFiles, cacheDir);
@@ -189,10 +190,6 @@ const findAllPackageJson = (subRoots = [], contextDir) => {
   const result = [path.join(cwd, packageJsonName)]; // 默认填充根目录下的package.json
 
   subRoots.forEach((subRoot) => {
-    if (!subRoot.root) {
-      log.fail(`请检查${subRoot.name}的module.config.json是否有root字段`);
-      process.exit(1);
-    }
     const toppath = path.join(cwd, subRoot.root); // 从该目录开始查找package.json文件
     const list = findFilesByFilter(toppath, packageJsonName);
 
@@ -202,26 +199,10 @@ const findAllPackageJson = (subRoots = [], contextDir) => {
   return result;
 };
 
-function cloudNpmInstall(contextDir) {
-  return new Promise((resolve, reject) => {
-    glob(`${contextDir}/**/package.json`, ['node_modules', 'miniprogram_npm'], (err, files) => {
-      if (err) {
-        reject(err);
-      }
-      files.forEach((file) => {
-        const dir = path.dirname(file);
-        shell.cd(dir);
-        shell.exec('npx npm install --production --registry http://mirrors.tencent.com/npm/', { silent: false });
-      });
-      resolve();
-    });
-  });
-}
-
 
 module.exports = {
-  cloudNpmInstall,
   npmInstallAll,
   findAllPackageJson,
+  findFilesByFilter,
 };
 

package/src/core/recommendVersion.js

@@ -0,0 +1,118 @@
+const fs = require('fs');
+const path = require('path');
+const shelljs = require('shelljs');
+const chalk = require('chalk');
+const request = require('request');
+const inquirer = require('inquirer');
+const { infoNoTime } = require('../utils/log');
+const packageJson = require('../../package.json');
+const { VERSION_CACHE_FILE, VERSION_URL } = require('../config/constant');
+const { ensureDirExist } = require('../utils/io');
+const { versionCompare } = require('../utils/widgets');
+
+// 获取推荐的tmskit版本
+function getRecommendVersion() {
+  return new Promise((resolve, reject) => {
+    request(`${VERSION_URL}?v=${new Date().getTime()}`, (error, response, body) => {
+      if (!error && response && response.statusCode === 200) {
+        resolve(JSON.parse(body));
+      } else {
+        reject(response.statusCode);
+      }
+    });
+  });
+}
+
+// 获取当前用户tmskit的版本
+function getUserTmskitVersion() {
+  const data = shelljs.exec('tmskit -v', { async: false, silent: true });
+  if (data.code === 0) {
+    // tmskit 0.0.21 => 0.0.21
+    return data.slice(7);
+  }
+  return '0.0.0';
+}
+
+// 询问用户是否安装最新版本
+function isInstallLatestVersion() {
+  return inquirer.prompt([
+    {
+      type: 'confirm',
+      name: 'isInstall',
+      message: '是否安装最新版本',
+      choices: [{
+        name: '否',
+        value: false,
+      }, {
+        name: '是',
+        value: true,
+      }],
+    },
+  ]);
+}
+
+// 获取tmskit的版本是否推荐过
+function getVersionIsRecommend(version) {
+  const filePath = VERSION_CACHE_FILE;
+  if (!fs.existsSync(filePath)) {
+    return false;
+  }
+  const content = require(filePath);
+  return content?.[version];
+}
+
+// 设置tmskit版本推荐过
+function setVersionRecommend(version, isRecommend) {
+  const filePath = VERSION_CACHE_FILE;
+  if (!fs.existsSync(filePath)) {
+    const dir = path.dirname(filePath);
+    ensureDirExist(dir);
+    fs.writeFileSync(filePath, '{}');
+  }
+  const content = require(filePath);
+  content[version] = isRecommend;
+  fs.writeFileSync(filePath, JSON.stringify(content, null, 2));
+}
+
+// 推荐理由
+function displayRecommends(arr = []) {
+  infoNoTime(chalk.green('构建工具有新的版本~~:'));
+  arr.forEach((item) => {
+    infoNoTime(chalk.green(item));
+  });
+}
+
+// 推荐tmskit的安装版本
+async function recommendVersion() {
+  try {
+    // 获取当前用户安装的版本
+    const tmskitVersion = getUserTmskitVersion();
+    // 获取官方推荐版本
+    const recommendRes = await getRecommendVersion();
+    const recommendVersion = recommendRes.version;
+    // 当前用户安装版本小于官方推荐版本 && 该版本没有推荐过
+    if (versionCompare(tmskitVersion, recommendVersion) === -1 && !getVersionIsRecommend(recommendVersion)) {
+      displayRecommends(recommendRes.version_detail);
+      // 设置该版本推荐过
+      setVersionRecommend(recommendVersion, true);
+      // 询问用户是否安装最新版本
+      const installRes = await isInstallLatestVersion(recommendRes);
+      if (installRes.isInstall) {
+        // mac
+        if (process.platform === 'darwin') {
+          infoNoTime(`将执行以下命令: ${chalk.green(`sudo npm install -g ${packageJson.name}@${recommendVersion}`)}`);
+          shelljs.exec(`sudo npm install -g ${packageJson.name}@${recommendVersion}`, { async: false, silent: false });
+          process.exit(-1);
+        } else {
+          // window
+          infoNoTime(`请使用超级管理员执行以下命令: ${chalk.green(`npm install -g ${packageJson.name}@${recommendVersion}`)}`);
+          process.exit(-1);
+        }
+      }
+    }
+  } catch {}
+}
+
+module.exports = {
+  recommendVersion,
+};

package/src/core/report.js

@@ -0,0 +1,30 @@
+const request = require('request');
+const shelljs = require('shelljs');
+const apiUrl = 'https://tim.map.qq.com/basic/tmskit/upload';
+
+function getGitUser() {
+  const res = shelljs.exec('git config user.name', { async: false, silent: true });
+  return res.stdout;
+}
+
+const report = (name, attrs = {}) => {
+  try {
+    const param = [];
+    param[27] = name;
+    param[28] = 'tmskit';
+    param[29] = getGitUser();
+    param[30] = JSON.stringify(attrs);
+
+    for (let i = 0; i < 40; i++) {
+      if (!param[i]) param[i] = null;
+    };
+
+    request.post({ url: apiUrl, json: { param } });
+    // (error, response, body) => {
+    //   console.log('body:', body);
+    // }
+  } catch (e) {
+  }
+};
+
+module.exports = report;

package/src/core/symbolicLink.js

@@ -1,32 +1,30 @@
 const fs = require('fs');
 const { resolve } = require('../utils/widgets');
-const { handleError } = require('./handleError');
 const { ensureDirExist } = require('../utils/io');
-const { warn } = require('../utils/log');
+const { warn, succeed } = require('../utils/log');
 
 /**
  * 根据相关配置创建软链接
  * @param { object } tmsConfig
  */
 const symLink = (tmsConfig) => {
-  try {
-    ensureDirExist(resolve(tmsConfig.cloudDir));
-    if (tmsConfig.cloudModules) {
-      tmsConfig.cloudModules.forEach((item) => {
-        const sourcePath = resolve(item.path);
-        const targetPath = resolve(tmsConfig.cloudDir, item.name);
+  ensureDirExist(resolve(tmsConfig.cloudDir));
+  if (tmsConfig.cloudModules) {
+    tmsConfig.cloudModules.forEach((item) => {
+      const sourcePath = resolve(item.path);
+      const targetPath = resolve(tmsConfig.cloudDir, item.name);
 
-        if (!fs.existsSync(sourcePath)) {
-          warn(`云函数${sourcePath}不存在`);
-          return;
-        }
-        if (!fs.existsSync(targetPath)) {
-          fs.symlinkSync(sourcePath, targetPath);
-        }
-      });
-    }
-  } catch (e) {
-    handleError(`创建软链错误: ${e}`);
+      if (!fs.existsSync(sourcePath)) {
+        warn(`云函数${sourcePath}不存在`);
+        return;
+      }
+      if (!fs.existsSync(targetPath)) {
+        fs.symlinkSync(sourcePath, targetPath);
+      }
+    });
+    succeed('云函数创建软链成功');
+  } else {
+    warn('你没有在tms.config.js的cloudModules注册云函数');
   }
 };
 

package/src/core/tmsMpconfig.js

@@ -4,62 +4,86 @@
 /* eslint-disable no-param-reassign, no-nested-ternary */
 const loadash = require('lodash');
 const fs = require('fs');
+const path = require('path');
 const { TMS_CONFIG_FILENAME, MODULE_CONFIG_FILENAME, TMS_PRIVATE_FILENAME } = require('../config/constant');
-const { resolve, isObject, isArray } = require('../utils/widgets');
+const { resolve, isObject, isArray, getAbsolutePath } = require('../utils/widgets');
 const defaultTmsConfig = require('../config/defaultTmsConfig');
 const { fail } = require('../utils/log');
 
 /**
  * 读取tms.config.js
- * @param env {string} 环境变量
+ *  @param {string} configPath tms.config.js的路径
  */
-const readTmsConfig = function (env) {
-  const tmsConfigPath = resolve(TMS_CONFIG_FILENAME);
+const readTmsConfig = function (configPath) {
+  const tmsConfigPath = configPath ? `${configPath}/${TMS_CONFIG_FILENAME}` : resolve(TMS_CONFIG_FILENAME);
   if (!fs.existsSync(tmsConfigPath)) {
-    fail('当前执行目录没有tms.config.js的配置项，请进行配置');
+    fail(`${path.dirname(tmsConfigPath)}没有找到tms.config.js，请进行配置`);
     process.exit(1);
   }
   const tmsConfigFn = require(tmsConfigPath);
-  const tmsConfig = tmsConfigFn({
-    env,
-  });
+  const tmsConfig = typeof tmsConfigFn === 'function' ? tmsConfigFn() : tmsConfigFn;
 
   // 合并默认值
-  return loadash.mergeWith(defaultTmsConfig, tmsConfig);
+  return loadash.mergeWith({}, defaultTmsConfig, tmsConfig);
 };
 
 
 /**
  * 读取tms.private.config.js
+ * @param {string} configPath tms.private.config.js的路径
  */
-const readTmsPrivateCf = function () {
+const readTmsPrivateCf = function (configPath) {
   let tmsPrivateCf = {};
-  const tmsPrivatePath = resolve(TMS_PRIVATE_FILENAME);
+  const tmsPrivatePath = configPath ? `${configPath}/${TMS_PRIVATE_FILENAME}` : resolve(TMS_PRIVATE_FILENAME);
   if (fs.existsSync(tmsPrivatePath)) {
-    tmsPrivateCf = require(tmsPrivatePath);
+    const tmsPrivateFn = require(tmsPrivatePath);
+    tmsPrivateCf = typeof tmsPrivateFn === 'function' ? tmsPrivateFn() : tmsPrivateFn;
   }
 
   return tmsPrivateCf;
 };
 
 /**
- * 从tms.config.json中检索用户传入的有效modules
+ * 获取tms.config.js， tms.private.config.js的配置项
+ *  @param {string} configPath config.js的路径
+ * @returns
+ */
+const getTmsConfig = (configPath) => {
+  const tmsPrivateCf = readTmsPrivateCf(configPath);
+  const tmsConfig = readTmsConfig(configPath);
+
+  const modules = {};
+  if (Array.isArray(tmsConfig.modules)) {
+    modules.all = tmsConfig.modules;
+    tmsConfig.modules = modules;
+  }
+  // 合并默认值
+  const res = loadash.mergeWith(tmsConfig, tmsPrivateCf, (objValue, srcValue) => {
+    if (loadash.isArray(objValue) && objValue[0] && loadash.isObject(objValue[0])) {
+      return objValue.concat(srcValue);
+    }
+  });
+
+  return res;
+};
+
+/**
+ * 根据moduleNames获取modules
  * @param { object } tmsConfig
- * @param { array } modules
+ * @param { array } moduleNames
+ * @param {boolean} errorIsQuit 找不到配置文件是否退出
  * @returns
  */
-const checkModules = function (tmsConfig, modules, isQuit = false) {
+const getModulesByModuleNames = function (tmsConfig, moduleNames = []) {
   const targetModules = [];
-  modules.forEach((moduleName) => {
+  moduleNames.forEach((moduleName) => {
     const module = tmsConfig.modules.all.find(module => module.moduleName === moduleName);
-    module && targetModules.push(module);
+    if (!module) {
+      throw new Error(`你启动的模块${moduleName}在tms.config.js的modules.all中没有注册`);
+    }
+    targetModules.push(module);
   });
 
-  if (targetModules.length === 0) {
-    fail(`你启动的模块无效${modules.join(',')}无效，请检查tms.config.json>modules>${modules.join(',')}
-    >name字段与module.config.json的name字段是否一致`);
-    isQuit && process.exit(1);
-  }
   return targetModules;
 };
 
@@ -94,25 +118,32 @@ function adaptMpCgContent(fileContent, appName) {
   return content;
 }
 
+const adaptDependencies = function (dependencies, subPackages) {
+  const newDependencies = dependencies || [];
+  subPackages.forEach((item) => {
+    if (item.dependencies) {
+      dependencies = newDependencies.concat(item.dependencies);
+    }
+  });
+  return newDependencies;
+};
+
+const adaptSubPackages = function (moduleConfig, appName) {
+  const subPackages = isObject(moduleConfig) && moduleConfig.subPackages
+    ? moduleConfig.subPackages
+    : isObject(moduleConfig) ? [moduleConfig] : moduleConfig;
+  return adaptMpCgContent(subPackages, appName);
+};
+
 /**
  * 获取模块module.config.json中的配置信息
  * @param {array} modules 用户要编译的模块列表
  * @param { string } appName 小程序的名称
- * @param {boolean} notFindIsQuit 找不到配置文件是否退出
  */
-function getModulesConfig(modules = [], appName, notFindIsQuit) {
+function getModulesConfig(modules = [], appName) {
   const modulesConfig = [];
   modules.forEach((moduleItem) => {
-    if (!moduleItem.path) {
-      throw new Error(`${moduleItem.moduleName}模块路径配置没有找到`);
-    }
     const moduleConfigPath = resolve(moduleItem.path, MODULE_CONFIG_FILENAME);
-    if (!fs.existsSync(moduleConfigPath)) {
-      if (notFindIsQuit) {
-        throw new Error(`${moduleItem.moduleName}模块的配置文件module.config.json在${moduleItem.path}目录下没有找到`);
-      }
-      return;
-    }
     let moduleConfig;
     try {
       moduleConfig = JSON.parse(fs.readFileSync(moduleConfigPath, 'utf-8'));
@@ -121,26 +152,15 @@ function getModulesConfig(modules = [], appName, notFindIsQuit) {
     }
 
     // 兼容历史逻辑，后续可删除--- start
-    if (!moduleItem.moduleName) moduleItem.moduleName = moduleItem.name;
-    delete moduleItem.name;
-
-    let subPackages = isObject(moduleConfig) && moduleConfig.subPackages
-      ? moduleConfig.subPackages
-      : isObject(moduleConfig) ? [moduleConfig] : moduleConfig;
-
-    subPackages = adaptMpCgContent(subPackages, appName);
-    let dependencies = moduleConfig.dependencies || [];
-    subPackages.forEach((item) => {
-      item.path = moduleItem.path;
-      if (item.dependencies) {
-        dependencies = dependencies.concat(item.dependencies);
-      }
-    });
-    moduleItem.subPackages = subPackages;
-    moduleItem.dependencies = dependencies;
+    const subPackages = adaptSubPackages(moduleConfig, appName);
+    const dependencies = adaptDependencies(moduleConfig.dependencies, subPackages);
+    moduleConfig = {
+      ...(isObject(moduleConfig) ? moduleConfig : {}),
+      subPackages,
+      dependencies,
+    };
     // 兼容逻辑--- end
-
-    modulesConfig.push(moduleItem);
+    modulesConfig.push(moduleConfig);
   });
 
   return modulesConfig;
@@ -154,40 +174,98 @@ function getModulesConfig(modules = [], appName, notFindIsQuit) {
 const getSubPackages = (modules) => {
   const newSubPackages = [];
   modules.forEach((module) => {
-    (module.subPackages || []).forEach((item) => {
+    (module.subPackages || []).forEach((subPackage) => {
       newSubPackages.push({
-        path: module.path,
-        ...item,
+        ...subPackage,
       });
     });
   });
   return newSubPackages;
 };
 
+/**
+ * 获取分包的root字段
+ * @param {*} modulePath 模块的编译路径
+ * @param {*} root 分包的root字段
+ * @returns
+ */
+const getSubPackageRoot = function (modulePath, root) {
+  return root.startsWith(modulePath) ? root : `${modulePath}/${root}`;
+};
+
+// 获取分包的源码路径
+const  getSubPackageSrcPath = function (tmsConfig, module, subPackage) {
+  const srcModulePath = getAbsolutePath(module.path);
+  const buildModulePath = resolve(tmsConfig.outputDir, module.modulePath);
+
+  const subPackageRoot = getSubPackageRoot(module.modulePath, subPackage.root);
+  const buildSubPackagePath = resolve(tmsConfig.outputDir, subPackageRoot);
+
+  const subPackageRelativeModule = path.relative(buildModulePath, buildSubPackagePath);
+  const srcSubPackagePath = path.join(srcModulePath, subPackageRelativeModule);
+
+  return srcSubPackagePath;
+};
+
+const checkModuleItem = (tmsConfig, tmsModuleItem, moduleConfig) => {
+  const newModuleItem = { ...tmsModuleItem, ...moduleConfig };
+
+  // 兼容逻辑
+  if (!newModuleItem.moduleName) newModuleItem.moduleName = newModuleItem.name;
+  delete newModuleItem.name;
+
+  // 参数校验-模块源码路径
+  if (!newModuleItem.path) {
+    throw new Error(`${newModuleItem.moduleName}模块没有找到path字段，请检查tms.config.js的modules.all>module>path路径`);
+  }
+
+  // 参数校验-模块编译路径
+  if (!newModuleItem.modulePath) {
+    throw new Error(`${newModuleItem.moduleName}模块的module.config.json中没有找到modulePath字段`);
+  }
+  // 参数校验-分包校验
+  for (const subPackage of newModuleItem.subPackages) {
+    if (!subPackage.root) {
+      throw new Error(`${newModuleItem.moduleName}模块的module.config.json中没有找到${subPackage.name}分包的root字段`);
+    }
+
+    // 参数校验-判断分包源码目录是否存在
+    const subPackageSrcPath = getSubPackageSrcPath(tmsConfig, newModuleItem, subPackage);
+    if (!subPackageSrcPath || !fs.existsSync(subPackageSrcPath)) {
+      throw new Error(`没有找到${newModuleItem.moduleName}模块的${subPackage.name}分包源码：${subPackageSrcPath}`);
+    }
+    subPackage.path = subPackageSrcPath;
+  }
+  return newModuleItem;
+};
+
 /**
  * 获取所有的模块，合并模块的依赖模块
  * @param { object } tmsConfig
  * @param {array} modules
- * @param {boolean} notFindIsQuit 找不到配置文件是否退出
+ * @param {boolean} errorIsQuit 找不到配置文件是否退出
  * @returns
  */
-const getModulesByMergeDepModules = (tmsConfig, modules, notFindIsQuit = false) => {
+const getModulesByMergeDepModules = (tmsConfig, modules, errorIsQuit = false) => {
   const allModules = new Map();
   function dfs(tmsConfig, modules) {
     modules.forEach((moduleItem) => {
-      const [moduleConfig = {}] = getModulesConfig([moduleItem], tmsConfig.appName, notFindIsQuit);
+      const moduleConfigPath = resolve(moduleItem.path, MODULE_CONFIG_FILENAME);
+      if (!fs.existsSync(moduleConfigPath)) {
+        if (!allModules.has(moduleItem.moduleName)) {
+          allModules.set(moduleItem.moduleName, moduleItem);
+        }
+        if (errorIsQuit) {
+          throw new Error(`${moduleItem.moduleName}模块的配置文件module.config.json在${moduleItem.path}目录下没有找到`);
+        }
+        return;
+      }
+      const [moduleConfig = {}] = getModulesConfig([moduleItem], tmsConfig.appName);
 
       if (!allModules.has(moduleItem.moduleName)) {
-        allModules.set(moduleItem.moduleName, { ...moduleItem, ...moduleConfig });
-
-        const dependenciesModules = [];
-        (moduleConfig?.dependencies || []).forEach((dependenciesModule) => {
-          tmsConfig.modules.all.forEach((module) => {
-            if (dependenciesModule === module.moduleName) {
-              dependenciesModules.push({ ...module });
-            }
-          });
-        });
+        allModules.set(moduleItem.moduleName, checkModuleItem(tmsConfig, moduleItem, moduleConfig));
+
+        const dependenciesModules = getModulesByModuleNames(tmsConfig, moduleConfig?.dependencies);
         if (dependenciesModules.length) {
           dfs(tmsConfig, dependenciesModules);
         }
@@ -207,7 +285,8 @@ module.exports = {
   readTmsConfig,
   readTmsPrivateCf,
   getModulesConfig,
-  checkModules,
+  getModulesByModuleNames,
   getSubPackages,
   getModulesByMergeDepModules,
+  getTmsConfig,
 };