@tmsfe/tmskit 0.0.18 → 0.0.21

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

@@ -2,19 +2,22 @@ const shelljs = require('shelljs');
 const compileDev = require('../../../compile/dev');
 const { resolve, filterField } = require('../../../utils/widgets');
 const init = require('../init/index');
-const { tmsModulesMergeLocalModuleCfg } = require('../../../core/tmsMpconfig');
+const { getModulesByMergeDepModules, getSubPackages } = require('../../../core/tmsMpconfig');
 const { info } = require('../../../utils/log');
 const { global } = require('../../../utils/global');
 const { CACHE_DIR } = require('../../../config/constant');
 
 
 // 用户编译分包时，需要将dist中其他分包(主包不能删除)的内容删除，否则其他分包的内容混入到主包(导致主包的体积超2M)
-function delOtherModule(tmsConfig, targetModules) {
-  const modules = tmsModulesMergeLocalModuleCfg(tmsConfig.modules.all, tmsConfig.appName);
-  const targetModulesName = targetModules.map(item => item.name);
-  modules.forEach((item) => {
-    if (item.root && targetModulesName.indexOf(item.name) === -1) {
-      const moduleRootDir = resolve(`dist/${item.root}`);
+function delOtherPackages(tmsConfig, targetSubPackages) {
+  // 获取所有模块，合并模块依赖的模块
+  const allModules = getModulesByMergeDepModules(tmsConfig, tmsConfig.modules.all);
+  // 获取所有的分包
+  const allSubPackages = getSubPackages(allModules);
+  const targetSubPackagesName = targetSubPackages.map(item => item.name);
+  allSubPackages.forEach((item) => {
+    if (item.root && targetSubPackagesName.indexOf(item.name) === -1) {
+      const moduleRootDir = resolve(`${tmsConfig.outputDir}/${item.root}`);
       shelljs.rm('-rf', `${moduleRootDir}/*`, { silent: true });
       // 解决微信开发者工具（dist/app.json: ["subpackages"][0]["root"] 字段需为 目录）错误 - 提前创建该目录
       // io.ensureDirExist(moduleRootDir);
@@ -22,8 +25,7 @@ function delOtherModule(tmsConfig, targetModules) {
   });
 }
 
-async function dev(tmsConfig, targetModules, env) {
-  let newModules = targetModules;
+async function dev(tmsConfig, targetModules) {
   const { noCache } = global.getData('cmd');
   if (noCache) {
     shelljs.rm('-rf', resolve(tmsConfig.outputDir));
@@ -31,10 +33,9 @@ async function dev(tmsConfig, targetModules, env) {
   }
 
   // 初始化操作
-  const initData = await init(tmsConfig, newModules);
-  newModules = initData.targetModules;
+  const { subPackages, modules: newModules } = await init(tmsConfig, targetModules);
 
-  info('当前dev启动的有效模块', newModules.map(item => item.name).sort());
+  info('当前dev启动的有效模块', newModules.map(item => item.moduleName).sort());
   if (typeof tmsConfig?.hooks?.beforeCompile === 'function') {
     await tmsConfig?.hooks?.beforeCompile({
       isDev: true,
@@ -42,8 +43,8 @@ async function dev(tmsConfig, targetModules, env) {
       modules: newModules,
     });
   };
-  delOtherModule(tmsConfig, newModules);
-  compileDev(tmsConfig, newModules, env);
+  delOtherPackages(tmsConfig, subPackages);
+  compileDev(tmsConfig, newModules, true);
 }
 
 module.exports = dev;

package/src/scripts/run/index.js

@@ -1,17 +1,16 @@
 /* eslint-disable no-param-reassign */
-const loadash = require('lodash');
 const init = require('./init/index');
 const dev = require('./dev/index');
 const build = require('./build/index');
 const install = require('./install/index');
 const cloud = require('./cloud/index');
+const { fail, info } = require('../../utils/log');
 const { global } = require('../../utils/global');
 const {
-  readTmsConfig,
-  readTmsPrivateCf,
-  checkModules,
-  tmsModulesMergeLocalModuleCfg,
-  subModulesMergeDepModules,
+  getTmsConfig,
+  getModulesByMergeDepModules,
+  getSubPackages,
+  getModulesByModuleNames,
 } = require('../../core/tmsMpconfig');
 
 const handleModuleArg = (cmd) => {
@@ -27,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;
   }
@@ -37,83 +36,68 @@ const getSpecificModules = (moduleArg, modules) => {
     return include;
   }
   if (exclude?.length > 0) {
-    return all.filter(module => !exclude.includes(module.name)).map(item => item.name);
+    return all.filter(module => !exclude.includes(module.moduleName)).map(item => item.moduleName);
   }
   if (blockRemote === true) {
-    return all.filter(module => module.repoInfo === undefined).map(item => item.name);
+    return all.filter(module => module.repoInfo === undefined).map(item => item.moduleName);
   }
-  return all.map(item => item.name);
+  return all.map(item => item.moduleName);
 };
 
-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);
-    }
-  });
+async function run(commandName, cmd) {
+  try {
+    // 用户本地的配置
+    const tmsConfig = getTmsConfig();
 
-  return res;
-};
+    // 缓存数据
+    global.setData({
+      cmd,
+      tmsConfig,
+    });
 
-async function run(commandName, cmd) {
-  // 用户本地的私有项目配置
-  const tmsPrivateCf = readTmsPrivateCf();
-  const { env = tmsPrivateCf?.env } = cmd;
-  let tmsConfig = readTmsConfig(env);
-  tmsConfig = mergeConfig(tmsConfig, tmsPrivateCf);
+    if (commandName === 'cloud') {
+      cloud(tmsConfig);
+      return;
+    }
+    otherCommands(tmsConfig, commandName, cmd);
+  } catch (error) {
+    const errMsg = typeof error === 'object' ? error.message : error;
+    fail(`构建出现错误: ${errMsg}`);
+    info('详细错误信息', error);
+    process.exit(1);
+  }
+}
 
+function otherCommands(tmsConfig, commandName, cmd) {
   // 处理module参数
-  const specificModules = getSpecificModules(
+  const specificModuleNames = getSpecificModuleNames(
     handleModuleArg(cmd),
     tmsConfig.modules,
   );
 
-  const modules = checkModules(
-    tmsConfig,
-    [
-      ...new Set([
-        ...tmsConfig.mainPackages,
-        ...specificModules,
-      ]),
-    ],
-    true,
-  );
-
-  // tms.config.js的modules 合并 module.config.json的配置项
-  let newModules = tmsModulesMergeLocalModuleCfg(modules, tmsConfig.appName);
-  // A分包依赖了B分包的代码， merge B分包进行编译；
-  newModules = subModulesMergeDepModules(tmsConfig, newModules);
+  // moduleNames => ['home', 'car']
+  const moduleNames = [...new Set([...specificModuleNames])];
+  const modules = getModulesByModuleNames(tmsConfig, moduleNames, false);
 
-  // 缓存数据
-  global.setData({
-    env,
-    cmd,
-    tmsConfig,
-  });
+  // 获取所有模块，合并模块依赖的模块
+  const newModules = getModulesByMergeDepModules(tmsConfig, modules, false);
+  // 获取所有的分包
+  const subPackages = getSubPackages(newModules);
 
   switch (commandName) {
     case 'init':
-      init(tmsConfig, newModules, env);
+      init(tmsConfig, newModules);
       return;
     case 'dev':
       global.setData('isDev', true);
-      dev(tmsConfig, newModules, env);
-      return;
-    case 'cloud':
-      cloud(tmsConfig, env);
+      dev(tmsConfig, newModules);
       return;
     case 'install':
-      install(tmsConfig, newModules, env);
+      install(tmsConfig, subPackages, false);
       return;
     case 'build':
       global.setData('isDev', false);
-      build(tmsConfig, newModules, env);
+      build(tmsConfig, newModules);
       return;
     default:
       return;

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

@@ -5,10 +5,9 @@ const { resolve, createTask } = require('../../../utils/widgets');
 const { buildOutputAppJson } = require('../../../core/buildAppJson');
 const { MODULE_CODE_DIR, DEFAULT_COPY_CONFIG } = require('../../../config/constant');
 const { cloneModules } = require('../../../core/cloneModules');
-const { tmsModulesMergeLocalModuleCfg, subModulesMergeDepModules } = require('../../../core/tmsMpconfig');
+const { getModulesByMergeDepModules, getSubPackages } = require('../../../core/tmsMpconfig');
 const { fail, info } = require('../../../utils/log');
 const install = require('../install');
-const { checkDependencies } = require('../../../core/checkDependencies');
 
 /**
  * 拷贝相关配置文件到编译输出目录
@@ -27,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(
@@ -54,12 +34,10 @@ async function task(tmsConfig, targetModules) {
     '下载模块代码码完成',
   )(MODULE_CODE_DIR, resolve('./'), targetModules);
 
-  // tms.config.js的modules 合并 module.config.json的配置项
-  let newModules = tmsModulesMergeLocalModuleCfg(targetModules, tmsConfig.appName);
-  // A分包依赖了B分包的代码， merge B分包进行编译；
-  newModules = subModulesMergeDepModules(tmsConfig, newModules);
-
-  checkConfig(newModules);
+  // 获取所有模块，合并模块依赖的模块
+  const newModules = getModulesByMergeDepModules(tmsConfig, targetModules, true);
+  // 获取所有的分包
+  const newSubPackages = getSubPackages(newModules);
 
   // 拷贝相关配置文件到输出目录
   await createTask(
@@ -69,9 +47,7 @@ async function task(tmsConfig, targetModules) {
   )(tmsConfig, DEFAULT_COPY_CONFIG);
 
   // install
-  if (checkDependencies(newModules, resolve('./'), tmsConfig.outputDir)) {
-    await install(tmsConfig, newModules);
-  }
+  await install(tmsConfig, newSubPackages, true);
 
   // 动态生成编译后的app.json;
   await createTask(
@@ -80,18 +56,19 @@ async function task(tmsConfig, targetModules) {
     '生成编译后的app.json完成',
   )(tmsConfig, newModules);
 
-  return newModules;
+  return {
+    modules: newModules,
+    subPackages: newSubPackages,
+  };
 }
 async function init(tmsConfig, targetModules) {
   try {
-    const newModules = await task(tmsConfig, targetModules);
+    const taskRes = await task(tmsConfig, targetModules);
 
-    return {
-      targetModules: newModules,
-    };
+    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

@@ -1,38 +1,128 @@
 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 { mpNpmInstallAll } = require('../../../core/npm');
-const { fail } = require('../../../utils/log');
+const { npmInstallAll } = require('../../../core/npm');
+const { info } = require('../../../utils/log');
+const { fileMd5 } = require('../../../utils/md5');
+const { isDependenciesUpdate } = require('../../../core/checkDependencies');
 
-async function install(tmsConfig, modules) {
+async function install(tmsConfig, subPackages, useCache = true) {
+  const cwd = process.cwd();
+  const npmInstallRes = await createTask(
+    npmInstall,
+    '小程序 开始npm install',
+    '小程序npm install 完成',
+  )(tmsConfig, subPackages, useCache);
+
+  // 如果npm install 没有命中缓存，则说明node_module有更新，此时必须构建miniprogram_npm
+  if (!npmInstallRes.isCache) {
+    // 构建miniprogram_npm, 不使用缓存
+    await createTask(
+      mpCiInstall,
+      '开始构建miniprogram_npm',
+      '构建miniprogram_npm 完成',
+    )(tmsConfig, subPackages, false);
+  } else {
+    // 构建miniprogram_npm
+    await createTask(
+      mpCiInstall,
+      '开始构建miniprogram_npm',
+      '构建miniprogram_npm 完成',
+    )(tmsConfig, subPackages, useCache);
+  }
+  shelljs.cd(cwd);
+}
+
+async function npmInstall(tmsConfig, subPackages, 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);
   });
 
-  // 小程序npm install
-  await createTask(
-    mpNpmInstallAll,
-    '小程序 开始npm install',
-    '小程序npm install 完成',
-  )(modules, resolve(tmsConfig.outputDir), `${CACHE_DIR}/node_modules`);
-
-  // 构建miniprogram_npm
-  await createTask(
-    buildMpNpm,
-    '开始构建miniprogram_npm',
-    '构建miniprogram_npm 完成',
-  )({ appId: tmsConfig.appId, projectPath: resolve('./'), privateKey: tmsConfig.privateKey });
+  await npmInstallAll(subPackages, resolve(tmsConfig.outputDir), `${CACHE_DIR}/node_modules`);
+  return { isCache: false };
+}
+
+// 构建miniprogram_npm
+async function mpCiInstall(tmsConfig, subPackages, useCache) {
+  const packageJsonFiles = [];
+  const rootPackFile = resolve(`${tmsConfig.outputDir}/package.json`);
+  if (fs.existsSync(rootPackFile)) {
+    packageJsonFiles.push(rootPackFile);
+  }
+  subPackages.forEach((item) => {
+    const packageJsonFile = resolve(`${tmsConfig.outputDir}/${item.root}/package.json`);
+    if (fs.existsSync(packageJsonFile)) {
+      packageJsonFiles.push(packageJsonFile);
+    }
+  });
+
+  let isCache = false;
+  const statusMap = { success: 1, doing: 2 };
+  if (useCache) {
+    let flag = true;
+    await Promise.all(packageJsonFiles.map(async (item) => {
+      const packageDir = path.dirname(item);
+      const mpDir = resolve(`${packageDir}/miniprogram_npm`);
+      const md5Value = await getMNPMd5(packageDir);
+      const preCache = getCache(mpDir, 'miniprogram_npm');
+      // console.log('miniprogram_npm', preCache, md5Value);
+      // 上一次构建成功 && 上次md5与当前本地的miniprogram_npm的md5 一致，才可以进入缓存
+      if (preCache?.status !== statusMap.success || preCache?.md5 !== md5Value) {
+        flag = false;
+      }
+    }));
+    isCache = flag;
+  }
+
+  if (isCache) {
+    info('miniprogram_npm命中缓存');
+    return;
+  }
+
+  // 即将构建，在cache中标记开始
+  await Promise.all(packageJsonFiles.map(async (item) => {
+    const packageDir = path.dirname(item);
+    const mpDir = resolve(`${packageDir}/miniprogram_npm`);
+    setCache(mpDir, 'miniprogram_npm', { md5: '', status: statusMap.doing });
+  }));
+
+  await buildMpNpm({ appId: tmsConfig.appId, projectPath: resolve('./'), privateKey: tmsConfig.privateKey });
+
+  // 构建成功后，计算md5写入cache
+  await Promise.all(packageJsonFiles.map(async (item) => {
+    const packageDir = path.dirname(item);
+    const mpDir = resolve(`${packageDir}/miniprogram_npm`);
+    const md5Value = await getMNPMd5(packageDir);
+    setCache(mpDir, 'miniprogram_npm', { md5: md5Value, status: statusMap.success });
+  }));
+}
+
+// 计算miniprogram_npm压缩文件的md5值
+async function getMNPMd5(cwd) {
+  const shellJsOption = { async: false, silent: true };
+  shelljs.cd(cwd);
+  if (fs.existsSync('miniprogram_npm')) {
+    shelljs.exec('tar -cvf ./miniprogram_npm.tar.gz ./miniprogram_npm',  { cwd, ...shellJsOption });
+    const tarDir = path.join(cwd, './miniprogram_npm.tar.gz');
+    const md5Value = await fileMd5(tarDir);
+    shelljs.rm('-rf', tarDir);
+    return md5Value;
+  }
+  return '';
 }
 
 module.exports = install;

package/src/utils/md5.js

@@ -0,0 +1,25 @@
+const crypto = require('crypto');
+const fs = require('fs');
+
+function fileMd5(filePath) {
+  return new Promise((resolve, reject) => {
+    const md5sum = crypto.createHash('md5');
+    const stream = fs.ReadStream(filePath);
+    stream.on('data', (d) => {
+      md5sum.update(d);
+    });
+
+    stream.on('error', (err) => {
+      reject(err);
+    });
+
+    stream.on('end', () => {
+      const hash = md5sum.digest('hex');
+      resolve(hash);
+    });
+  });
+}
+
+module.exports = {
+  fileMd5,
+};

package/src/utils/widgets.js

@@ -5,6 +5,7 @@ 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 };
@@ -196,6 +197,26 @@ const filterField = (obj, filterNames = []) => {
   return newObj;
 };
 
+// 检索出文件列表
+function findFiles(globPath, filter = []) {
+  return new Promise((resolve, reject) => {
+    glob(globPath, filter, (err, files) => {
+      if (err) {
+        reject(err);
+      }
+      resolve(files);
+    });
+  });
+}
+
+// 获取绝对路径
+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,
@@ -209,4 +230,6 @@ module.exports = {
   mergeMap,
   relativeCwdPath,
   filterField,
+  findFiles,
+  getAbsolutePath,
 };

package/src/core/isInIt.js

@@ -1,65 +0,0 @@
-const fs = require('fs');
-const { resolve } = require('../utils/widgets');
-const { MODULE_CODE_DIR } = require('../config/constant');
-const { checkRemoteModGitUrlBranch } = require('./cloneModules');
-const { checkDependencies } = require('./checkDependencies');
-const { fail } = require('../utils/log');
-
-function checkModule(targetModules) {
-  // 判断\源码\dist\是否存在用户指定的模块
-  for (const item of targetModules) {
-    // 此模块没有root字段(原因：没有merge到module.config.json的配置项。第三方模块的代码可能还没有下载)
-    if (!item.root) {
-      return true;
-    }
-
-    // 判断第三方远程模块git地址与branch是否有更新
-    if (checkRemoteModGitUrlBranch(MODULE_CODE_DIR, item)) {
-      return true;
-    }
-
-    // 判断源码目录是否有该模块
-    if (item.path && !fs.existsSync(resolve(item.path))) {
-      fail(`${item.path}模块代码路径不存在, 请检查tms.config.js的${item.name}模块的path`);
-      process.exit(1);
-    }
-  }
-  return false;
-}
-
-function isInit(tmsConfig, targetModules, contextDir) {
-  // 判断是否存在dist目录
-  if (!fs.existsSync(contextDir)) {
-    return true;
-  }
-  // 判断dist是否存在node_modules
-  if (!fs.existsSync(`${contextDir}/node_modules`)) {
-    return true;
-  }
-
-  // 判断dist是否存在miniprogram_npm
-  if (!fs.existsSync(`${contextDir}/miniprogram_npm`)) {
-    return true;
-  }
-
-  // 判断dist是否存在app.json
-  if (!fs.existsSync(`${contextDir}/app.json`)) {
-    return true;
-  }
-
-  // 判断模块信息
-  if (checkModule(targetModules, contextDir)) {
-    return true;
-  }
-
-  //  判断package.json的版本是否有新的版本
-  if (checkDependencies(targetModules, resolve('./'), tmsConfig.outputDir)) {
-    return true;
-  }
-  return false;
-}
-
-
-module.exports = {
-  isInit,
-};