@tmsfe/tmskit 0.0.12 → 0.0.15-beta.0

package/src/core/tmsMpconfig.js

@@ -3,7 +3,7 @@
  */
 const loadash = require('lodash');
 const fs = require('fs');
-const { TMS_NAME, TMS_CONFIG_FILENAME, MODULE_CONFIG_FILENAME, TMS_PRIVATE_FILENAME } = require('../config/constant');
+const { TMS_CONFIG_FILENAME, MODULE_CONFIG_FILENAME, TMS_PRIVATE_FILENAME } = require('../config/constant');
 const { resolve, isObject, isArray } = require('../utils/widgets');
 const defaultTmsConfig = require('../config/defaultTmsConfig');
 const { fail } = require('../utils/log');
@@ -77,15 +77,18 @@ const readTmsPrivateCf = function () {
  * @param { array } modules
  * @returns
  */
-const checkModules = function (tmsConfig, modules) {
+const checkModules = function (tmsConfig, modules, isQuit = false) {
   const targetModules = [];
   modules.forEach((moduleName) => {
     const module = tmsConfig.modules.find(module => module.name === moduleName);
     module && targetModules.push(module);
   });
+
+
   if (targetModules.length === 0) {
-    fail(`你启动的模块无效，尝试 ${TMS_NAME} -m moduleName`);
-    process.exit(1);
+    fail(`你启动的模块无效${modules.join(',')}无效，请检查tms.config.json>modules>${modules.join(',')}
+    >name字段与module.config.json的name字段是否一致`);
+    isQuit && process.exit(1);
   }
   return targetModules;
 };
@@ -175,7 +178,7 @@ const tmsModulesMergeLocalModuleCfg = (modules, appName) => {
           }
         });
         if (!findModule) {
-          fail(`启动模块${moduleName}在${moduleConfigPath}没有找到，请检查配置`);
+          fail(`启动模块${moduleName}在${moduleConfigPath}没有找到或pages为空，请检查配置`);
           process.exit(1);
         }
       } catch (e) {
@@ -213,10 +216,12 @@ const subModulesMergeDepModules = (tmsConfig, modules) => {
       // 如果所有模块的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);
+        if (tmpModules.length > 0) {
+          isOver = false;
+          mergeModules = [...mergeModules, ...tmpModules];
+          mergeModules = tmsModulesMergeLocalModuleCfg(mergeModules, tmsConfig.appName);
+        }
       }
     });
   });

package/src/entry.js

@@ -28,7 +28,7 @@ module.exports = [
         options: [
           ['-m, --module [moduleName]', '模块名称'],
           ['-e, --env [env]', '环境变量'],
-          ['-latest, --latest', '下载最新第三方模块代码、安装最新依赖'],
+          ['-noCache, --noCache', '不使用缓存功能'],
         ],
         action: (cmd) => {
           require('./scripts/run/index')('dev', cmd);

package/src/index.js

@@ -39,9 +39,7 @@ function registerCommand(program, commands) {
 registerCommand(program, commands);
 
 program.on('--help', () => {
-  info();
   info(`  Run ${chalk.cyan(`${TMS_NAME}  <command> --help`)} for detailed usage of given command.`);
-  info();
 });
 
 // 捕获未注册的命令
@@ -49,8 +47,7 @@ program
   .arguments('<command>')
   .action((cmd) => {
     program.outputHelp();
-    info(`  ${chalk.red(`Unknown command ${chalk.yellow(cmd)}.`)}`);
-    info();
+    info(` ${chalk.red(`Unknown command ${chalk.yellow(cmd)}.`)}`);
     suggestCommands(cmd);
     process.exitCode = 1;
   });

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

@@ -2,10 +2,10 @@ const shelljs = require('shelljs');
 const compileDev = require('../../../compile/dev');
 const { resolve } = require('../../../utils/widgets');
 const init = require('../init/index');
-const { isInit } = require('../../../core/isInIt');
 const { tmsModulesMergeLocalModuleCfg } = require('../../../core/tmsMpconfig');
 const { info } = require('../../../utils/log');
 const { global } = require('../../../utils/global');
+const { CACHE_DIR } = require('../../../config/constant');
 
 
 // 用户编译分包时，需要将dist中其他分包(主包不能删除)的内容删除，否则其他分包的内容混入到主包(导致主包的体积超2M)
@@ -24,16 +24,20 @@ function delOtherModule(tmsConfig, targetModules) {
 
 async function dev(tmsConfig, targetModules, env) {
   let newModules = targetModules;
-  const isLatest = global.getData('cmd').latest;
-
-  // 判断是否进行init命令
-  if (isLatest || isInit(tmsConfig, targetModules, resolve('dist'))) {
-    // init函数 下载第三方代码后，会将最新的tms.config.js的modules 合并 module.config.json的配置项返回
-    const initData = await init(tmsConfig, newModules);
-    newModules = initData.targetModules;
+  const { noCache } = global.getData('cmd');
+  if (noCache) {
+    shelljs.rm('-rf', resolve('dist'));
+    shelljs.rm('-rf', CACHE_DIR);
   }
 
+  // 初始化操作
+  const initData = await init(tmsConfig, newModules);
+  newModules = initData.targetModules;
+
   info('当前dev启动的有效模块', newModules.map(item => item.name).sort());
+  if (typeof tmsConfig?.hooks?.beforeCompile === 'function') {
+    tmsConfig?.hooks?.beforeCompile({ isDev: true, tmsConfig, modules: newModules });
+  };
   delOtherModule(tmsConfig, newModules);
   compileDev(tmsConfig, newModules, env);
 }

package/src/scripts/run/index.js

@@ -55,12 +55,16 @@ async function run(commandName, cmd) {
     tmsConfig.modules,
   );
 
-  const modules = checkModules(tmsConfig, [
-    ...new Set([
-      ...tmsConfig.mainPackages,
-      ...specificModules,
-    ]),
-  ]);
+  const modules = checkModules(
+    tmsConfig,
+    [
+      ...new Set([
+        ...tmsConfig.mainPackages,
+        ...specificModules,
+      ]),
+    ],
+    true,
+  );
 
   // tms.config.js的modules 合并 module.config.json的配置项
   let newModules = tmsModulesMergeLocalModuleCfg(modules, tmsConfig.appName);
@@ -72,6 +76,7 @@ async function run(commandName, cmd) {
     env,
     cmd,
     tmsPrivateCf,
+    tmsConfig,
   });
 
   switch (commandName) {

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

@@ -3,12 +3,12 @@ const fs = require('fs');
 const io = require('../../../utils/io');
 const { resolve, createTask } = require('../../../utils/widgets');
 const { buildOutputAppJson } = require('../../../core/buildAppJson');
-const { symLink } = require('../../../core/symbolicLink');
 const { MODULE_CODE_DIR, DEFAULT_COPY_CONFIG } = require('../../../config/constant');
 const { cloneModules } = require('../../../core/cloneModules');
 const { tmsModulesMergeLocalModuleCfg, subModulesMergeDepModules } = require('../../../core/tmsMpconfig');
 const { fail, info } = require('../../../utils/log');
 const install = require('../install');
+const { checkDependencies } = require('../../../core/checkDependencies');
 
 /**
  * 拷贝相关配置文件到编译输出目录
@@ -39,6 +39,25 @@ const cpFilesToOutput = function (tmsConfig, targetModules, 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(
@@ -52,6 +71,8 @@ async function task(tmsConfig, targetModules) {
   // A分包依赖了B分包的代码， merge B分包进行编译；
   newModules = subModulesMergeDepModules(tmsConfig, newModules);
 
+  checkConfig(newModules);
+
   // 拷贝相关配置文件到输出目录
   await createTask(
     cpFilesToOutput,
@@ -60,7 +81,9 @@ async function task(tmsConfig, targetModules) {
   )(tmsConfig, newModules, DEFAULT_COPY_CONFIG);
 
   // install
-  await install(tmsConfig, newModules, false);
+  if (checkDependencies(newModules, resolve('./'), tmsConfig.outputDir)) {
+    await install(tmsConfig, newModules);
+  }
 
   // 动态生成编译后的app.json;
   await createTask(
@@ -69,12 +92,6 @@ async function task(tmsConfig, targetModules) {
     '生成编译后的app.json完成',
   )(tmsConfig, newModules);
 
-  await createTask(
-    symLink,
-    '开始创建软链接',
-    '创建软链接完成',
-  )(tmsConfig);
-
   return newModules;
 }
 async function init(tmsConfig, targetModules) {
@@ -86,7 +103,7 @@ async function init(tmsConfig, targetModules) {
     };
   } catch (error) {
     const errMsg = typeof error === 'object' ? error.message : error;
-    fail(`init流程出现错误${errMsg}`);
+    fail(`初始化流程出现错误${errMsg}`);
     info('详细的错误信息', error);
     process.exit(1);
   }

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

@@ -1,10 +1,10 @@
 const { createTask, resolve } = require('../../../utils/widgets');
 const { buildMpNpm } = require('../../../core/mpCi');
 const { CACHE_DIR } = require('../../../config/constant');
-const { cloudNpmInstall, mpNpmInstallAll } = require('../../../core/npm');
+const { mpNpmInstallAll } = require('../../../core/npm');
 const { global } = require('../../../utils/global');
 
-async function install(tmsConfig, modules, isCloud = false) {
+async function install(tmsConfig, modules) {
   // 小程序npm install
   await createTask(
     mpNpmInstallAll,
@@ -19,13 +19,6 @@ async function install(tmsConfig, modules, isCloud = false) {
     '开始构建miniprogram_npm',
     '构建miniprogram_npm 完成',
   )({ appId: tmsConfig.appId, projectPath: resolve('./'), privateKey: tmsPrivateCf.privateKey });
-
-  // 安装云函数的
-  isCloud && createTask(
-    cloudNpmInstall,
-    '云函数npm install',
-    '云函数npm install安装完毕',
-  )(resolve(tmsConfig.cloudDir));
 }
 
 module.exports = install;

package/src/utils/io.js

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const { info } = require('../utils/log');
+const { relativeCwdPath } = require('../utils/widgets');
 /**
  * 判断目录是否为空
  * @param {string} dirname 目录名
@@ -44,11 +45,11 @@ function diffContentCopyFile(originFile, destFile) {
     const depDestContent = fs.readFileSync(destFile, 'utf8');
     const depOriginContent = fs.readFileSync(originFile, 'utf8');
     if (depDestContent !== depOriginContent) {
-      info(`拷贝${originFile}内容到${destFile}`);
+      info(`拷贝${relativeCwdPath(originFile)}内容到${relativeCwdPath(destFile)}`);
       copyFile(originFile, destFile);
     }
   } else {
-    info(`拷贝${originFile}内容到${destFile}`);
+    info(`拷贝${relativeCwdPath(originFile)}内容到${relativeCwdPath(destFile)}`);
     copyFile(originFile, destFile);
   }
 }

package/src/utils/log.js

@@ -1,4 +1,5 @@
 const chalk = require('chalk');
+const moment = require('moment');
 
 /**
  * 本文件提供无依赖的在终端打印彩色文字的方法。
@@ -13,7 +14,7 @@ const resetCfg = decodeURIComponent('%1B%5B0m'); // \033[0m转义后的字符按
 const fail = (message = '') => {
   const redStyleConfig = decodeURIComponent('%1B%5B41%3B30m'); // \033[41;30m转义后的字符按，console时输出红色文字
   const greenFontStyleConfig = decodeURIComponent('%1B%5B41%3B37m'); // \033[41;30m转义后的字符按，console时输出红底白色文字
-  console.log(`${redStyleConfig} ERROR ${greenFontStyleConfig} ${message}${resetCfg}`); // eslint-disable-line no-console
+  console.log(`${moment().format('YYYY-MM-DD HH:mm:ss')}`, `${redStyleConfig} ERROR ${greenFontStyleConfig} ${message}${resetCfg}`); // eslint-disable-line no-console
 };
 
 /**
@@ -24,7 +25,7 @@ const fail = (message = '') => {
 const succeed = (message = '') => {
   const greenStyleConfig = decodeURIComponent('%1B%5B42%3B30m'); // \033[42;30m转义后的字符按，console时输出绿色文字
   const greenFontStyleConfig = decodeURIComponent('%1B%5B40%3B32m'); // \033[40;32m转义后的字符按，console时输出绿色文字
-  console.log(`${greenStyleConfig} Success ${greenFontStyleConfig} ${message}${resetCfg}`); // eslint-disable-line no-console
+  console.log(`${moment().format('YYYY-MM-DD HH:mm:ss')}`, `${greenStyleConfig} Success ${greenFontStyleConfig} ${message}${resetCfg}`); // eslint-disable-line no-console
 };
 
 
@@ -34,10 +35,10 @@ const succeed = (message = '') => {
  * @returns {undefined} 无
  */
 const warn = (message) => {
-  console.log(chalk.yellow(message));
+  console.log(`${moment().format('YYYY-MM-DD HH:mm:ss')}`, chalk.yellow(message));
 };
 
-const info = (...args) => console.log(...args);
+const info = (...args) => console.log(`${moment().format('YYYY-MM-DD HH:mm:ss')}`, ...args);
 
 module.exports = {
   fail,

package/src/utils/widgets.js

@@ -114,7 +114,7 @@ function pullRepoForGit(dest, branch) {
 function npmInstall(dir) {
   return new Promise((resolve, reject) => {
     shelljs.exec(
-      'npx yarn --production --registry http://mirrors.tencent.com/npm/',
+      'npm install --production --registry http://mirrors.tencent.com/npm/',
       { cwd: dir, silent: true },
       (code, stdout, stderr) => {
         if (code !== 0) {
@@ -144,14 +144,13 @@ function createTask(task, startText, endText) {
   return async (...args) => {
     const start = Date.now();
 
-    const spinner = ora(startText);
-
+    const spinner = ora();
+    info(startText);
     spinner.start();
-    info('\n');
 
     const result = await task(...args);
 
-    endText && spinner.succeed(`${endText}, ${cost(start)}ms`);
+    endText && spinner.succeed(`${endText}, 耗时${cost(start) / 1000}s`);
     spinner.stop();
 
     return result;
@@ -165,6 +164,22 @@ function createTask(task, startText, endText) {
  */
 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);
+    }
+  }
+
+  return obj;
+};
+
+const relativeCwdPath = function (file) {
+  return path.relative(process.cwd(), file);
+};
+
 module.exports = {
   resolve,
   isObject,
@@ -175,4 +190,6 @@ module.exports = {
   suggestCommands,
   camelize,
   npmInstall,
+  mergeMap,
+  relativeCwdPath,
 };