@tmsfe/tmskit 0.0.7 → 0.0.8

package/src/scripts/run/index.js

@@ -1,68 +1,97 @@
-const init = require('./init/index');
-const dev = require('./dev/index');
-const build = require('./build/index');
-const install = require('./install/index');
-const { createTask } = require('../../utils/widgets');
-const { MODE } = require('../../config/constant');
-const { readTmsConfig, readTmsPrivateCf, checkModules } = require('../../utils/tkitUtils');
-const { tmsModulesMergeLocalModuleCfg, subModulesMergeDepModules } = require('../../utils/tkitUtils');
-
-const handleModulesArg = (cmd, tmsPrivateCg) => {
-  // 单模块或多模块开发-用户通过脚手架参数指定的模块
-  if (cmd.module) {
-    const { argv } = process;
-    const reset = argv.indexOf('-m') > -1 ? argv.slice(argv.indexOf('-m') + 1) : [];
-    return [
-      cmd.module,
-      ...reset,
-    ];
-  }
-  // 单模块或多模块开发-用户在tms.private.js指定的模块
-  if (tmsPrivateCg?.modules && tmsPrivateCg?.modules.length > 0) {
-    return tmsPrivateCg?.modules;
-  }
-  // 全量模块
-  return MODE.all;
-};
-
-async function run(commandName, cmd) {
-  // 用户本地的私有项目配置（用来配置环境\模块信息\账号信息）
-  const tmsPrivateCg = readTmsPrivateCf();
-  // 处理module参数
-  const moduleArg = handleModulesArg(cmd, tmsPrivateCg);
-  const { env = tmsPrivateCg?.env } = cmd;
-  const tmsConfig = await createTask(readTmsConfig, '开始读取脚手架的配置项', '读取脚手架的配置项完成')(env);
-
-  let modules;
-  if (moduleArg === MODE.all) {
-    // 全量模块
-    modules = tmsConfig.modules;
-  } else {
-    // 检查用户输入modules的有效性
-    modules = checkModules(tmsConfig, [...new Set([...tmsConfig.mainPackages, ...moduleArg])]);
-  }
-
-  // tms.config.js的modules 合并 module.config.json的配置项
-  let newModules = tmsModulesMergeLocalModuleCfg(modules, tmsConfig.appName);
-  // A分包依赖了B分包的代码， merge B分包进行编译；
-  newModules = subModulesMergeDepModules(tmsConfig, newModules);
-
-  switch (commandName) {
-    case 'init':
-      init(tmsConfig, newModules, env);
-      return;
-    case 'dev':
-      dev(tmsConfig, newModules, env);
-      return;
-    case 'install':
-      install(tmsConfig, newModules, env);
-      return;
-    case 'build':
-      build(tmsConfig, newModules, env);
-      return;
-    default:
-      return;
-  }
-}
-
-module.exports = run;
+const init = require('./init/index');
+const dev = require('./dev/index');
+const build = require('./build/index');
+const install = require('./install/index');
+const { global } = require('../../utils/global');
+const {
+  readTmsConfig,
+  readTmsPrivateCf,
+  checkModules,
+  tmsModulesMergeLocalModuleCfg,
+  subModulesMergeDepModules,
+} = require('../../core/tmsMpconfig');
+
+const handleModuleArg = (cmd) => {
+  // 单模块或多模块开发-用户通过脚手架参数指定的模块
+  if (typeof cmd.module === 'string') {
+    return cmd.module.split(',');
+  }
+  return [];
+};
+/**
+ * 获取用户指定要跑的模块
+ * @param {Array} moduleArg 参数指定的模块
+ * @param {Object} modulePrivateCfg 私有配置里的模块
+ * @param {Array} moduleAll 当前小程序全部模块
+ */
+const getSpecificModules = (moduleArg, modulePrivateCfg, moduleAll) => {
+  if (moduleArg.length > 0) {
+    return moduleArg;
+  }
+  // 单模块或多模块开发-用户在tms.private.js指定的模块
+  if (modulePrivateCfg) {
+    if (modulePrivateCfg.include?.length > 0) {
+      return modulePrivateCfg.include;
+    }
+    if (modulePrivateCfg.exclude?.length > 0) {
+      return moduleAll.filter(module => !modulePrivateCfg.exclude.includes(module.name)).map(item => item.name);
+    }
+    if (modulePrivateCfg.blockRemote === true) {
+      return moduleAll.filter(module => module.repoInfo === undefined).map(item => item.name);
+    }
+  }
+  return moduleAll.map(item => item.name);
+};
+
+async function run(commandName, cmd) {
+  // 用户本地的私有项目配置（用来配置环境\模块信息\账号信息）
+  const tmsPrivateCf = readTmsPrivateCf();
+  const { env = tmsPrivateCf?.env } = cmd;
+  const tmsConfig = readTmsConfig(env);
+  // 处理module参数
+  const specificModules = getSpecificModules(
+    handleModuleArg(cmd),
+    tmsPrivateCf.modules,
+    tmsConfig.modules,
+  );
+
+  const modules = checkModules(tmsConfig, [
+    ...new Set([
+      ...tmsConfig.mainPackages,
+      ...specificModules,
+    ]),
+  ]);
+
+  // tms.config.js的modules 合并 module.config.json的配置项
+  let newModules = tmsModulesMergeLocalModuleCfg(modules, tmsConfig.appName);
+  // A分包依赖了B分包的代码， merge B分包进行编译；
+  newModules = subModulesMergeDepModules(tmsConfig, newModules);
+
+  // 缓存数据
+  global.setData({
+    env,
+    cmd,
+    tmsPrivateCf,
+  });
+
+  switch (commandName) {
+    case 'init':
+      init(tmsConfig, newModules, env);
+      return;
+    case 'dev':
+      global.setData('isDev', true);
+      dev(tmsConfig, newModules, env);
+      return;
+    case 'install':
+      install(tmsConfig, newModules, env);
+      return;
+    case 'build':
+      global.setData('isDev', false);
+      build(tmsConfig, newModules, env);
+      return;
+    default:
+      return;
+  }
+}
+
+module.exports = run;

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

@@ -1,87 +1,95 @@
-const shelljs = require('shelljs');
-const fs = require('fs');
-const io = require('../../../utils/io');
-const { resolve, createTask } = require('../../../utils/widgets');
-const { buildOutputAppJson } = require('../../../utils/buildAppJson');
-const {  MODULE_CODE_DIR, DEFAULT_COPY_CONFIG } = require('../../../config/constant');
-const { cloneModules } = require('../../../utils/cloneModules');
-const { tmsModulesMergeLocalModuleCfg, subModulesMergeDepModules } = require('../../../utils/tkitUtils');
-const { fail } = require('../../../utils/log');
-const install = require('../install');
-
-/**
- * 拷贝相关配置文件到编译输出目录
- * @param { object } tmsConfig
- * @param { array } modules
- * @param { array } defaultFiles 默认需要拷贝的配置项
- * @returns
- */
-const cpFilesToOutput = function (tmsConfig, targetModules, defaultFiles) {
-  const outputDir = resolve(tmsConfig.outputDir);
-  io.ensureDirExist(outputDir);
-  defaultFiles.forEach((item) => {
-    if (fs.existsSync(resolve(item))) {
-      shelljs.cp('-rf', resolve(item), resolve(tmsConfig.outputDir, item));
-    }
-  });
-
-  // 拷贝模块的package.json到编译输出目录
-  targetModules.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');
-    if (fs.existsSync(modulePackagePath)) shelljs.cp('-Rf', modulePackagePath, outputModuleDir);
-  });
-};
-
-async function task(tmsConfig, targetModules, isDev) {
-  // 下载和移动代码
-  await createTask(
-    cloneModules,
-    '开始下载模块代码完成',
-    '下载模块代码码完成',
-  )(MODULE_CODE_DIR, resolve('./'), targetModules, isDev);
-
-  // tms.config.js的modules 合并 module.config.json的配置项
-  let newModules = tmsModulesMergeLocalModuleCfg(targetModules, tmsConfig.appName);
-  // A分包依赖了B分包的代码， merge B分包进行编译；
-  newModules = subModulesMergeDepModules(tmsConfig, newModules);
-
-  // 拷贝相关配置文件到输出目录
-  await createTask(
-    cpFilesToOutput,
-    '开始拷贝文件到编译输出目录',
-    '拷贝文件到编译输出目录完成',
-  )(tmsConfig, newModules, DEFAULT_COPY_CONFIG);
-
-  // install
-  await install(tmsConfig, newModules, false);
-
-  // 动态生成编译后的app.json;
-  await createTask(
-    buildOutputAppJson,
-    '开始生成编译后的app.json',
-    '生成编译后的app.json完成',
-  )(tmsConfig, newModules, isDev);
-
-  return newModules;
-}
-async function init(tmsConfig, targetModules, isDev) {
-  try {
-    const newModules = await task(tmsConfig, targetModules, isDev);
-
-    return {
-      targetModules: newModules,
-    };
-  } catch (error) {
-    const errMsg = typeof error === 'object' ? error.message : error;
-    fail(`init流程出现错误${errMsg}`);
-    process.exit(1);
-  }
-}
-
-module.exports = init;
+const shelljs = require('shelljs');
+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');
+
+/**
+ * 拷贝相关配置文件到编译输出目录
+ * @param { object } tmsConfig
+ * @param { array } modules
+ * @param { array } defaultFiles 默认需要拷贝的配置项
+ * @returns
+ */
+const cpFilesToOutput = function (tmsConfig, targetModules, defaultFiles) {
+  const outputDir = resolve(tmsConfig.outputDir);
+  io.ensureDirExist(outputDir);
+  defaultFiles.forEach((item) => {
+    if (fs.existsSync(resolve(item))) {
+      shelljs.cp('-rf', resolve(item), resolve(tmsConfig.outputDir, item));
+    }
+  });
+
+  // 拷贝模块的package.json到编译输出目录
+  targetModules.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');
+    if (fs.existsSync(modulePackagePath)) shelljs.cp('-Rf', modulePackagePath, outputModuleDir);
+  });
+};
+
+async function task(tmsConfig, targetModules) {
+  // 下载和移动代码
+  await createTask(
+    cloneModules,
+    '开始下载模块代码',
+    '下载模块代码码完成',
+  )(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);
+
+  // 拷贝相关配置文件到输出目录
+  await createTask(
+    cpFilesToOutput,
+    '开始拷贝文件到编译输出目录',
+    '拷贝文件到编译输出目录完成',
+  )(tmsConfig, newModules, DEFAULT_COPY_CONFIG);
+
+  // install
+  await install(tmsConfig, newModules, false);
+
+  // 动态生成编译后的app.json;
+  await createTask(
+    buildOutputAppJson,
+    '开始生成编译后的app.json',
+    '生成编译后的app.json完成',
+  )(tmsConfig, newModules);
+
+  await createTask(
+    symLink,
+    '开始创建软链接',
+    '创建软链接完成',
+  )(tmsConfig);
+
+  return newModules;
+}
+async function init(tmsConfig, targetModules) {
+  try {
+    const newModules = await task(tmsConfig, targetModules);
+
+    return {
+      targetModules: newModules,
+    };
+  } catch (error) {
+    const errMsg = typeof error === 'object' ? error.message : error;
+    fail(`init流程出现错误${errMsg}`);
+    info('详细的错误信息', error);
+    process.exit(1);
+  }
+}
+
+module.exports = init;

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

@@ -1,29 +1,31 @@
-const { createTask, resolve } = require('../../../utils/widgets');
-const { buildMpNpm } = require('../../../utils/mpCiUtils');
-const { CACHE_DIR } = require('../../../config/constant');
-const { cloudNpmInstall, mpNpmInstallAll } = require('../../../utils/npmUtils');
-
-async function install(tmsConfig, modules, isCloud = false) {
-  // 小程序npm install
-  await createTask(
-    mpNpmInstallAll,
-    '小程序 开始npm install',
-    '小程序npm install 完成',
-  )(modules, resolve(tmsConfig.outputDir), `${CACHE_DIR}/node_modules`);
-
-  // 构建miniprograme_npm
-  await createTask(
-    buildMpNpm,
-    '开始构建miniprograme_npm',
-    '构建miniprograme_npm 完成',
-  )({ appId: tmsConfig.appId, projectPath: resolve('./'), privateKey: tmsConfig.privateKey });
-
-  // 安装云函数的
-  isCloud && createTask(
-    cloudNpmInstall,
-    '云函数npm install',
-    '云函数npm install安装完毕',
-  )(resolve(tmsConfig.cloudDir));
-}
-
-module.exports = install;
+const { createTask, resolve } = require('../../../utils/widgets');
+const { buildMpNpm } = require('../../../core/mpCi');
+const { CACHE_DIR } = require('../../../config/constant');
+const { cloudNpmInstall, mpNpmInstallAll } = require('../../../core/npm');
+const { global } = require('../../../utils/global');
+
+async function install(tmsConfig, modules, isCloud = false) {
+  // 小程序npm install
+  await createTask(
+    mpNpmInstallAll,
+    '小程序 开始npm install',
+    '小程序npm install 完成',
+  )(modules, resolve(tmsConfig.outputDir), `${CACHE_DIR}/node_modules`);
+
+  const tmsPrivateCf = global.getData('tmsPrivateCf');
+  // 构建miniprogram_npm
+  await createTask(
+    buildMpNpm,
+    '开始构建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/findCssImport.js

@@ -1,30 +1,30 @@
-/* eslint-disable no-param-reassign */
-const strip = require('strip-comments');
-// 匹配规则
-const MATCH_RULE = new RegExp(/@import *(?:url\(['"]?([^'")]+)['"]?\)|['"]([^'"]+)['"]);?/g);
-
-/**
- * 获取样式文件中的@import语句
- * @param code 代码片段
- * @returns 结果数组
- */
-const findCssImports = (code) => {
-  // 将buffer转成字符串
-  code = code.toString();
-  // 去除注释
-  code = strip.block(code);
-  // 定义最后返回的结果
-  const result = [];
-  let matchList;
-  // 循环遍历代码段，直至匹配结果为空
-  while ((matchList = MATCH_RULE.exec(code))) {
-    // 存入结果数组
-    result.push(matchList?.[1] || matchList?.[2]);
-  }
-  // 返回结果
-  return result;
-};
-
-module.exports = {
-  findCssImports,
-};
+/* eslint-disable no-param-reassign */
+const strip = require('strip-comments');
+// 匹配规则
+const MATCH_RULE = new RegExp(/@import *(?:url\(['"]?([^'")]+)['"]?\)|['"]([^'"]+)['"]);?/g);
+
+/**
+ * 获取样式文件中的@import语句
+ * @param code 代码片段
+ * @returns 结果数组
+ */
+const findCssImports = (code) => {
+  // 将buffer转成字符串
+  code = code.toString();
+  // 去除注释
+  code = strip.block(code);
+  // 定义最后返回的结果
+  const result = [];
+  let matchList;
+  // 循环遍历代码段，直至匹配结果为空
+  while ((matchList = MATCH_RULE.exec(code))) {
+    // 存入结果数组
+    result.push(matchList?.[1] || matchList?.[2]);
+  }
+  // 返回结果
+  return result;
+};
+
+module.exports = {
+  findCssImports,
+};

package/src/utils/global.js

@@ -1,36 +1,22 @@
-class Globale {
-  constructor() {
-    this.moduleCache = {};
-  }
-
-  setModuleCache(url, branch, dest) {
-    const instance =  getGlobalInstance();
-
-    const key = `${branch}:${url}`;
-
-    instance.moduleCache[key] = {
-      dest,
-    };
-
-    return instance.moduleCache[key];
-  }
-
-  getModuleCache(url, branch) {
-    const instance = getGlobalInstance();
-
-    return instance.moduleCache[`${branch}:${url}`];
-  }
-}
-
-let instance;
-function getGlobalInstance() {
-  if (instance) {
-    return instance;
-  }
-
-  return instance = new Globale();
-}
-
-module.exports = {
-  getGlobalInstance,
-};
+const global = {
+  data: {},
+  setData(...args) {
+    if (args.length === 1) {
+      Object.keys(args[0]).forEach((k) => {
+        if (args[0][k]) {
+          this.data[k] = args[0][k];
+        }
+      });
+    } else {
+      const [name, value] = args;
+      this.data[name] = value;
+    }
+  },
+  getData(name) {
+    return this.data[name];
+  },
+};
+
+module.exports = {
+  global,
+};