@tmsfe/tmskit 0.0.20 → 0.0.21

package/src/scripts/run/index.js

@@ -1,5 +1,4 @@
 /* eslint-disable no-param-reassign */
-const loadash = require('lodash');
 const init = require('./init/index');
 const dev = require('./dev/index');
 const build = require('./build/index');
@@ -8,11 +7,10 @@ const cloud = require('./cloud/index');
 const { fail, info } = require('../../utils/log');
 const { global } = require('../../utils/global');
 const {
-  readTmsConfig,
-  readTmsPrivateCf,
-  checkModules,
+  getTmsConfig,
   getModulesByMergeDepModules,
   getSubPackages,
+  getModulesByModuleNames,
 } = require('../../core/tmsMpconfig');
 
 const handleModuleArg = (cmd) => {
@@ -28,7 +26,7 @@ const handleModuleArg = (cmd) => {
  * @param {Object} modulePrivateCfg 私有配置里的模块
  * @param {Array} moduleAll 当前小程序全部模块
  */
-const getSpecificModules = (moduleArg, modules) => {
+const getSpecificModuleNames = (moduleArg, modules) => {
   if (moduleArg.length > 0) {
     return moduleArg;
   }
@@ -46,86 +44,22 @@ const getSpecificModules = (moduleArg, modules) => {
   return all.map(item => item.moduleName);
 };
 
-/**
- * 合并tms.config.js 与 tms.private.config.js的配置项
- * @param {*} tmsConfig
- * @param {*} tmsPrivateCf
- * @returns
- */
-const mergeConfig = (tmsConfig, tmsPrivateCf) => {
-  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;
-};
-
 async function run(commandName, cmd) {
   try {
-  // 用户本地的私有项目配置
-    const tmsPrivateCf = readTmsPrivateCf();
-    const { env = tmsPrivateCf?.env } = cmd;
-    let tmsConfig = readTmsConfig(env);
-    tmsConfig = mergeConfig(tmsConfig, tmsPrivateCf);
-
-    // 处理module参数
-    const specificModules = getSpecificModules(
-      handleModuleArg(cmd),
-      tmsConfig.modules,
-    );
-
-    const modules = checkModules(
-      tmsConfig,
-      [
-        ...new Set([
-          ...tmsConfig.mainPackages,
-          ...specificModules,
-        ]),
-      ],
-      true,
-    );
-
-    // 获取所有模块，合并模块依赖的模块
-    const newModules = getModulesByMergeDepModules(tmsConfig, modules);
-    // 获取所有的分包
-    const subPackages = getSubPackages(newModules);
+    // 用户本地的配置
+    const tmsConfig = getTmsConfig();
 
     // 缓存数据
     global.setData({
-      env,
       cmd,
       tmsConfig,
     });
 
-    switch (commandName) {
-      case 'init':
-        init(tmsConfig, newModules);
-        return;
-      case 'dev':
-        global.setData('isDev', true);
-        dev(tmsConfig, newModules);
-        return;
-      case 'cloud':
-        cloud(tmsConfig);
-        return;
-      case 'install':
-        install(tmsConfig, subPackages, false);
-        return;
-      case 'build':
-        global.setData('isDev', false);
-        build(tmsConfig, newModules);
-        return;
-      default:
-        return;
+    if (commandName === 'cloud') {
+      cloud(tmsConfig);
+      return;
     }
+    otherCommands(tmsConfig, commandName, cmd);
   } catch (error) {
     const errMsg = typeof error === 'object' ? error.message : error;
     fail(`构建出现错误: ${errMsg}`);
@@ -134,4 +68,40 @@ async function run(commandName, cmd) {
   }
 }
 
+function otherCommands(tmsConfig, commandName, cmd) {
+  // 处理module参数
+  const specificModuleNames = getSpecificModuleNames(
+    handleModuleArg(cmd),
+    tmsConfig.modules,
+  );
+
+  // moduleNames => ['home', 'car']
+  const moduleNames = [...new Set([...specificModuleNames])];
+  const modules = getModulesByModuleNames(tmsConfig, moduleNames, false);
+
+  // 获取所有模块，合并模块依赖的模块
+  const newModules = getModulesByMergeDepModules(tmsConfig, modules, false);
+  // 获取所有的分包
+  const subPackages = getSubPackages(newModules);
+
+  switch (commandName) {
+    case 'init':
+      init(tmsConfig, newModules);
+      return;
+    case 'dev':
+      global.setData('isDev', true);
+      dev(tmsConfig, newModules);
+      return;
+    case 'install':
+      install(tmsConfig, subPackages, false);
+      return;
+    case 'build':
+      global.setData('isDev', false);
+      build(tmsConfig, newModules);
+      return;
+    default:
+      return;
+  }
+}
+
 module.exports = run;

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

@@ -26,25 +26,6 @@ const cpFilesToOutput = function (tmsConfig, defaultFiles) {
   });
 };
 
-/**
- * 校验相关配置项
- * @param {*} targetModules
- * @returns
- */
-function checkConfig(targetModules) {
-  for (const item of targetModules) {
-    if (!item.root) {
-      throw new Error(`检查${item.name} module.config.json的root字段`);
-    }
-
-    // 判断源码目录是否有该模块
-    if (item.path && !fs.existsSync(resolve(item.path))) {
-      throw new Error(`${item.path}模块代码路径不存在, 请检查tms.config.js的${item.name}模块的path`);
-    }
-  }
-  return true;
-}
-
 async function task(tmsConfig, targetModules) {
   // 下载和移动代码
   await createTask(
@@ -58,8 +39,6 @@ async function task(tmsConfig, targetModules) {
   // 获取所有的分包
   const newSubPackages = getSubPackages(newModules);
 
-  checkConfig(newSubPackages);
-
   // 拷贝相关配置文件到输出目录
   await createTask(
     cpFilesToOutput,
@@ -68,8 +47,7 @@ async function task(tmsConfig, targetModules) {
   )(tmsConfig, DEFAULT_COPY_CONFIG);
 
   // install
-  await install(tmsConfig, newSubPackages);
-
+  await install(tmsConfig, newSubPackages, true);
 
   // 动态生成编译后的app.json;
   await createTask(
@@ -90,7 +68,7 @@ async function init(tmsConfig, targetModules) {
     return taskRes;
   } catch (error) {
     const errMsg = typeof error === 'object' ? error.message : error;
-    fail(`初始化流程出现错误${errMsg}`);
+    fail(`初始化流程出现错误: ${errMsg}`);
     info('详细的错误信息', error);
     process.exit(1);
   }

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 { 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, 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, 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), `${CACHE_DIR}/node_modules`);
   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);

package/src/utils/widgets.js

@@ -209,6 +209,14 @@ 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;
+}
+
 module.exports = {
   resolve,
   isObject,
@@ -223,4 +231,5 @@ module.exports = {
   relativeCwdPath,
   filterField,
   findFiles,
+  getAbsolutePath,
 };