@tmsfe/tmskit 0.0.26 → 0.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmsfe/tmskit",
-  "version": "0.0.26",
+  "version": "0.0.28",
   "description": "tmskit",
   "main": "dist/index.cjs",
   "bin": {

package/src/config/defaultTmsConfig.js

@@ -37,4 +37,7 @@ module.exports = {
       autoPrefixWXSS: true,
     },
   },
+  npm: {
+    registry: 'https://registry.npmjs.org/',
+  },
 };

package/src/core/cloneModules.js

@@ -21,10 +21,15 @@ function replaceGitUrlAccount(httpRepoUrl, moduleName) {
   const tmsConfig = global.getData('tmsConfig');
 
   let gitUrl = httpRepoUrl;
-
-  const { username = '', pass = '' } = tmsConfig?.gitAccount?.[moduleName] || tmsConfig?.gitAccount?.[httpRepoUrl] || {};
+  const gitGroupReg = /http(s)?:\/\/[^/]+\/[^/]+/;
+  const group = gitUrl.match(gitGroupReg)[0];
+  
+  const { username = '', pass = '' } = tmsConfig?.gitAccount?.[moduleName] 
+    || tmsConfig?.gitAccount?.[httpRepoUrl] 
+    || tmsConfig?.gitAccount?.[group] || {};
 
   const urlPrefixReg = /http(s)?:\/\//;
+  
   if (username && pass && urlPrefixReg.test(gitUrl)) {
     gitUrl = gitUrl.replace(urlPrefixReg, val => `${val}${encodeURIComponent(username)}:${pass}@`);
   }
@@ -160,7 +165,10 @@ function collectDownLoadTasksMap(sourceDir, targetDir,  modules) {
         if (fs.existsSync(sourcePath) && fs.existsSync(`${sourcePath}/.git`)) {
           promiseTask = (gitUrl, sourcePath, branch, httpRepoUrl) => {
             info(`git pull:${httpRepoUrl} --branch: ${branch}`);
-            return pullRepoForGit(sourcePath, branch);
+            return pullRepoForGit(sourcePath, branch).catch((e) => {
+              info(`pull代码失败:${e}, 开始git clone: ${httpRepoUrl}:${branch}`);
+              return downloadRepoForGit(gitUrl, sourcePath, branch);
+            });
           };
         } else {
           promiseTask = (gitUrl, sourcePath, branch, httpRepoUrl) => {

package/src/entry.js

@@ -45,17 +45,6 @@ module.exports = [
           require('./scripts/run/index')('dev', cmdOptions);
         },
       },
-      {
-        command: 'cloud',
-        description: '云函数开发',
-        options: [
-          ['-m, --module [moduleName]', '模块名称'],
-          ['-e, --env [env]', '环境变量'],
-        ],
-        action: (cmdOptions) => {
-          require('./scripts/run/index')('cloud', cmdOptions);
-        },
-      },
       {
         command: 'build',
         description: 'prod 打包编译',
@@ -92,6 +81,26 @@ module.exports = [
           require('./scripts/run/index')('upload', cmdOptions);
         },
       },
+      {
+        command: 'cloud-dev',
+        description: '云函数开发',
+        options: [
+          ['--cloud [cloud]', '模块名称'],
+        ],
+        action: (cmdOptions) => {
+          require('./scripts/run/index')('cloud-dev', cmdOptions);
+        },
+      },
+      // {
+      //   command: 'cloud-link',
+      //   description: '云函数开发',
+      //   options: [
+      //     ['--cloud [cloud]', '模块名称'],
+      //   ],
+      //   action: (cmdOptions) => {
+      //     require('./scripts/run/index')('cloud-link', cmdOptions);
+      //   },
+      // },
     ],
   },
 ];

package/src/scripts/run/cloud/check.js

@@ -0,0 +1,34 @@
+const fs = require('fs');
+
+/**
+ * 检查云函数的配置项
+ * @param {*} tmsConfig
+ */
+function checkCloudConfig(tmsConfig) {
+  if (!tmsConfig.cloudModules) {
+    return '你没有在tms.config.js的cloudModules注册云函数';
+  }
+  if (!tmsConfig.cloudDir) {
+    return '你没有在tms.config.js配置云函数编译目录cloudDir';
+  }
+  return;
+}
+
+/**
+ * 检查云函数源码目录是否存在
+ * @param {Array} clouds [{name: '', sourcePath: '', targetPath: ''}]
+ */
+function checkSrcPathIsExist(clouds) {
+  for (const item of clouds) {
+    if (!fs.existsSync(item.sourcePath)) {
+      return `${item.name}云函数的${item.sourcePath}目录不存在, 请检查tms.config.js>cloudModules>all云函数的配置目录`;
+    }
+  }
+  return;
+}
+
+
+module.exports = {
+  checkCloudConfig,
+  checkSrcPathIsExist,
+};

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

@@ -0,0 +1,146 @@
+const shellJs = require('shelljs');
+const ora = require('ora');
+const path = require('path');
+const chalk = require('chalk');
+const { resolve, createTask } = require('../../../utils/widgets');
+const { handleError } = require('../../../core/handleError');
+const { ensureDirExist } = require('../../../utils/io');
+const { src, dest, parallel, series } = require('gulp');
+const watch = require('../../../compile/plugins/gulp-watch');
+const { info, fail } = require('../../../utils/log');
+const getCloudsOfListen = require('./getClouds');
+const { checkCloudConfig, checkSrcPathIsExist } = require('./check');
+const { runInstall } = require('./install');
+
+/**
+ * 获取云函数的编译任务
+ * @param {array} clouds  [{name: '', sourcePath: '', targetPath: ''}]
+ * @param {object} srcOption gulp.src的参数
+ * @returns Map {'${sourcePath}': {taskFn: () => {}, targetPath: 'xxx'}}
+ */
+const getCompileTasks = (clouds, srcOption) => {
+  const compileTasksMap = new Map();
+  clouds.forEach((item) => {
+    compileTasksMap.set(item.sourcePath, {
+      targetPath: item.targetPath,
+      taskFn: (sourceFile, targetPath) => {
+        const newGlobValue = Array.isArray(sourceFile) ? sourceFile : `${item.sourcePath}/**/*`;
+        const newDestPath = targetPath ? targetPath : item.targetPath;
+
+        const srcPipe = src(newGlobValue, srcOption);
+        return srcPipe
+          .pipe(dest(newDestPath))
+          .on('error', (err) => {
+            fail(`监听报错${err}`);
+          });
+      },
+    });
+  });
+  return compileTasksMap;
+};
+
+const getTargetFile = (sourceFile, sourcePath, targetPath) => {
+  const sourceFileRelativeModule = path.relative(sourcePath, sourceFile);
+  const targetFile = resolve(targetPath, sourceFileRelativeModule);
+  return targetFile;
+};
+
+/**
+ * 开始启动编译
+ * @param {Map} compileTasksMap {'${sourcePath}': {taskFn: () => {}, targetPath: 'xxx'}}
+ */
+const runCompile = (compileTasksMap, callback) => {
+  async function end(next) {
+    // 监听其他文件
+    compileTasksMap.forEach(({ taskFn, targetPath }, sourcePath) => {
+      runWatch(
+        sourcePath,
+        { ignoreInitial: true, events: ['add', 'change', 'unlink', 'addDir', 'unlinkDir'] },
+        taskFn,
+        targetPath,
+      );
+    });
+    callback && callback();
+    next();
+  }
+
+  const compileTasksArr = [];
+  compileTasksMap.forEach(({ taskFn }) => {
+    compileTasksArr.push(taskFn);
+  });
+  // 一次性完成编译任务（编译完成后再添加watch任务-封装到end函数里面）
+  series(parallel(...compileTasksArr), end)();
+};
+
+/**
+ * 监听文件变动
+ * @param {*} sourcePath 云函数的源码目录
+ * @param {*} watchOptions gulp-watch的参数
+ * @param {*} callback  监听到变动的回调
+ * @param {*} targetPath 云函数的编译目录
+ */
+const runWatch = (sourcePath, watchOptions, callback, targetPath) => {
+  watch(sourcePath, {
+    ...watchOptions,
+  }, (vinyl) => {
+    const sourceFile = vinyl.history[0];
+    const sourceFileDirArr = sourceFile.replace(/\\/g, '/').split('/');
+    const sourceFileName = sourceFileDirArr.slice(sourceFileDirArr.length - 2).join('/');
+
+    const targetFile = getTargetFile(sourceFile, sourcePath, targetPath);
+    if (vinyl.event === 'unlink' || vinyl.event === 'unlinkDir') {
+      info(`删除${sourceFileName}`);
+      shellJs.rm('-rf', targetFile);
+      return;
+    }
+    info(`${sourceFileName}有更新`);
+    return callback([sourceFile],  path.dirname(targetFile));
+  });
+};
+
+
+module.exports = async (tmsConfig, cmdOptions) => {
+  try {
+    const sTime = new Date().getTime();
+    const spinner = ora();
+    spinner.start();
+
+    // 检查云函数的配置项
+    const configErrMsg = checkCloudConfig(tmsConfig);
+    if (configErrMsg) {
+      throw new Error(configErrMsg);
+    }
+
+    // 确保云函数的编译目录存在
+    ensureDirExist(resolve(tmsConfig.cloudDir));
+
+    // 获取需要监听的云函数列表
+    const clouds = getCloudsOfListen(tmsConfig, cmdOptions);
+    // 检查云函数源码目录是否存在
+    const srcNotExistErrMsg = checkSrcPathIsExist(clouds);
+    if (srcNotExistErrMsg) {
+      throw new Error(srcNotExistErrMsg);
+    }
+
+    // 打印启动云函数列表
+    info('当前启动云函数列表:', clouds.map(item => item.name).sort());
+
+    // npm install
+    await createTask(
+      runInstall,
+      '开始npm install',
+      'npm install完成',
+    )(clouds, tmsConfig);
+
+    // 获取云函数列表的编译任务
+    const compileTasksMap = getCompileTasks(clouds, { allowEmpty: true });
+    runCompile(compileTasksMap, () => {
+      const eTime = new Date().getTime() - sTime;
+      spinner.succeed(chalk.green(`首次编译完成, 耗时${eTime / 1000}s, 微信开发者工具打开项目即可预览。`));
+      spinner.stop();
+    });
+  } catch (e) {
+    info('编译出现详细错误', e);
+    handleError(`编译出现错误: ${e}`, true);
+  }
+};

package/src/scripts/run/cloud/getClouds.js

@@ -0,0 +1,46 @@
+const { resolve, getAbsolutePath } = require('../../../utils/widgets');
+
+// 处理tms.config.cloudModules的兼容数据
+function getTmsCloudModules(tmsConfig) {
+  const { cloudModules } = tmsConfig;
+  if (Array.isArray(tmsConfig.cloudModules)) {
+    return {
+      all: [...tmsConfig.cloudModules],
+      include: [],
+    };
+  }
+  return cloudModules;
+}
+
+/**
+ * 获取需要监听的云函数
+ * @param {*} tmsConfig {}
+ * @param {*} cmdOptions eg：{clouds: 'aggrecarshop,car'}
+ * @returns
+ * [{ name: '', sourcePath: '', targetPath: ''}]
+ */
+function getCloudsOfListen(tmsConfig, cmdOptions) {
+  // 获取tmsconfig配置的云函数的配置项
+  const cloudModules = getTmsCloudModules(tmsConfig);
+
+  let includeClouds = cmdOptions?.cloud?.split(',') || cloudModules.include || [];
+
+  // 如果没有配置include, 默认使用所有的数据云函数列表
+  if (includeClouds.length === 0) {
+    includeClouds = cloudModules.all.map(item => item.name);
+  }
+
+  const result = [];
+  for (const item of cloudModules.all) {
+    if (includeClouds.includes(item.name)) {
+      result.push({
+        name: item.name,
+        sourcePath: `${getAbsolutePath(item.path)}`,
+        targetPath: resolve(tmsConfig.cloudDir, item.name),
+      });
+    }
+  }
+  return result;
+}
+
+module.exports = getCloudsOfListen;

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

@@ -0,0 +1,31 @@
+const shellJs = require('shelljs');
+const fs = require('fs');
+const { resolve, npmInstall } = require('../../../utils/widgets');
+const { ensureDirExist } = require('../../../utils/io');
+const { info } = require('../../../utils/log');
+
+/**
+ * npm install
+ * @param {array} clouds  [{name: '', sourcePath: '', targetPath: ''}]
+ */
+const runInstall = async (clouds, tmsConfig) => {
+  const promises = [];
+
+  for (const item of clouds) {
+    ensureDirExist(item.targetPath);
+    const packageFilePath = resolve(item.sourcePath, 'package.json');
+    if (fs.existsSync(packageFilePath)) {
+      shellJs.cp('-Rf', resolve(packageFilePath), item.targetPath);
+      promises.push(() => {
+        info(`云函数${item.name}: npm install`);
+        return npmInstall(item.targetPath, tmsConfig.npm);
+      });
+    }
+  };
+  await Promise.all(promises.map(item => item()));
+};
+
+
+module.exports = {
+  runInstall,
+};

package/src/scripts/run/cloud/link.js

@@ -0,0 +1,37 @@
+const fs = require('fs');
+const { info } = require('../../../utils/log');
+const { resolve } = require('../../../utils/widgets');
+const { ensureDirExist } = require('../../../utils/io');
+const { warn, succeed } = require('../../../utils/log');
+const getCloudsOfListen = require('./getClouds');
+const { handleError } = require('../../../core/handleError');
+const { checkCloudConfig } = require('./check');
+
+module.exports = async (tmsConfig, cmdOptions) => {
+  try {
+    ensureDirExist(resolve(tmsConfig.cloudDir));
+    checkCloudConfig(tmsConfig);
+
+    // 获取需要监听的云函数列表
+    const clouds = getCloudsOfListen(tmsConfig, cmdOptions);
+    // 打印启动云函数列表
+    info('当前启动云函数列表:', clouds.map(item => item.name).sort());
+
+
+    clouds.forEach((item) => {
+      if (!fs.existsSync(item.sourcePath)) {
+        warn(`云函数${item.sourcePath}不存在`);
+        return;
+      }
+      const stat = fs.lstatSync(item.targetPath);
+      if (!stat.isSymbolicLink()) {
+        fs.symlinkSync(item.sourcePath, item.targetPath);
+      }
+    });
+
+    succeed('云函数创建软链成功');
+  } catch (e) {
+    info('创建软链详细错误', e);
+    handleError(`创建软链错误: ${e}`, true);
+  }
+};

package/src/scripts/run/index.js

@@ -5,7 +5,8 @@ const build = require('./build/index');
 const install = require('./install/index');
 const preview = require('./preview/index');
 const upload = require('./upload/index');
-const cloud = require('./cloud/index');
+const cloudLink = require('./cloud/link');
+const cloudDev = require('./cloud/dev');
 const { fail, info } = require('../../utils/log');
 const { global } = require('../../utils/global');
 const report = require('../../core/report');
@@ -57,9 +58,14 @@ async function run(commandName, cmdOptions) {
       tmsConfig,
     });
 
-    if (commandName === 'cloud') {
-      cloud(tmsConfig);
-      report('run:cloud', { appName: tmsConfig?.appName });
+    if (commandName === 'cloud-link') {
+      cloudLink(tmsConfig, cmdOptions);
+      report('run:cloud-link', { appName: tmsConfig?.appName });
+      return;
+    }
+    if (commandName === 'cloud-dev') {
+      cloudDev(tmsConfig, cmdOptions);
+      report('run:cloud-dev', { appName: tmsConfig?.appName });
       return;
     }
     otherCommands(tmsConfig, commandName, cmdOptions);

package/src/core/symbolicLink.js

@@ -1,33 +0,0 @@
-const fs = require('fs');
-const { resolve } = require('../utils/widgets');
-const { ensureDirExist } = require('../utils/io');
-const { warn, succeed } = require('../utils/log');
-
-/**
- * 根据相关配置创建软链接
- * @param { object } tmsConfig
- */
-const symLink = (tmsConfig) => {
-  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);
-      }
-    });
-    succeed('云函数创建软链成功');
-  } else {
-    warn('你没有在tms.config.js的cloudModules注册云函数');
-  }
-};
-
-module.exports = {
-  symLink,
-};

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

@@ -1,10 +0,0 @@
-const { symLink } = require('../../../core/symbolicLink');
-const { handleError } = require('../../../core/handleError');
-
-module.exports = async (tmsConfig) => {
-  try {
-    await symLink(tmsConfig);
-  } catch (e) {
-    handleError(`创建软链错误: ${e}`, true);
-  }
-};