@tmsfe/tmskit 0.0.5 → 0.0.8

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

@@ -2,45 +2,40 @@ 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 { npmInstallAll } = require('../../../utils/npmUtils');
-const { buildMpNpm } = require('../../../utils/mpCiUtils');
-const {  MODULE_CODE_DIR, CACHE_DIR, DEFAULT_COPY_CONFIG, DEFAULT_MODULE_DIR } = require('../../../config/constant');
-const { cloneModules } = require('../../../utils/cloneModules');
-const { tmsModulesMergeLocalModuleCfg } = require('../../../utils/tkitUtils');
-const { fail } = require('../../../utils/log');
+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');
 
 /**
- * 拷贝package.json\模块的代码到编译输出目录
+ * 拷贝相关配置文件到编译输出目录
  * @param { object } tmsConfig
  * @param { array } modules
  * @param { array } defaultFiles 默认需要拷贝的配置项
  * @returns
  */
 const cpFilesToOutput = function (tmsConfig, targetModules, defaultFiles) {
-  const outputDir = resolve(tmsConfig.webpack.outputDir);
+  const outputDir = resolve(tmsConfig.outputDir);
   io.ensureDirExist(outputDir);
   defaultFiles.forEach((item) => {
     if (fs.existsSync(resolve(item))) {
-      shelljs.cp('-rf', resolve(item), resolve(tmsConfig.webpack.outputDir, item));
+      shelljs.cp('-rf', resolve(item), resolve(tmsConfig.outputDir, item));
     }
   });
 
-  // 拷贝模块的代码到编译输出目录
+  // 拷贝模块的package.json到编译输出目录
   targetModules.forEach((item) => {
-    const outputModuleDir = resolve(`${tmsConfig.webpack.outputDir}/${item.root}`);
+    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);
     }
-    if (!fs.existsSync(outputModuleDir)) {
-      shelljs.mkdir('-p', outputModuleDir);
-    } else {
-      // 删除除了node_modules、miniprogram_npm 的其他文件
-      // eslint-disable-next-line
-      shelljs.exec('find . -not \( -name node_modules -or -name miniprogram_npm \)  -delete', { silent: true });
-    }
-    shelljs.cp('-Rf', `${resolve(item.path)}/*`, outputModuleDir);
+    io.ensureDirExist(outputModuleDir);
+    const modulePackagePath = resolve(item.path, 'package.json');
+    if (fs.existsSync(modulePackagePath)) shelljs.cp('-Rf', modulePackagePath, outputModuleDir);
   });
 };
 
@@ -48,13 +43,14 @@ async function task(tmsConfig, targetModules) {
   // 下载和移动代码
   await createTask(
     cloneModules,
-    '开始下载模块代码完成',
+    '开始下载模块代码',
     '下载模块代码码完成',
   )(MODULE_CODE_DIR, resolve('./'), targetModules);
 
   // tms.config.js的modules 合并 module.config.json的配置项
-  const newModules = tmsModulesMergeLocalModuleCfg(targetModules, tmsConfig.appName, DEFAULT_MODULE_DIR);
-  console.log('当前init的有效模块', newModules.map(item => item.name));
+  let newModules = tmsModulesMergeLocalModuleCfg(targetModules, tmsConfig.appName);
+  // A分包依赖了B分包的代码， merge B分包进行编译；
+  newModules = subModulesMergeDepModules(tmsConfig, newModules);
 
   // 拷贝相关配置文件到输出目录
   await createTask(
@@ -63,19 +59,8 @@ async function task(tmsConfig, targetModules) {
     '拷贝文件到编译输出目录完成',
   )(tmsConfig, newModules, DEFAULT_COPY_CONFIG);
 
-  // npm install
-  await createTask(
-    npmInstallAll,
-    '开始npm install',
-    'npm install 完成',
-  )(newModules, resolve(tmsConfig.webpack.outputDir), `${CACHE_DIR}/node_modules`);
-
-  // 构建miniprograme_npm
-  await createTask(
-    buildMpNpm,
-    '开始构建miniprograme_npm',
-    '构建miniprograme_npm 完成',
-  )({ appId: tmsConfig.appId, projectPath: resolve('./'), privateKey: tmsConfig.privateKey });
+  // install
+  await install(tmsConfig, newModules, false);
 
   // 动态生成编译后的app.json;
   await createTask(
@@ -84,14 +69,27 @@ async function task(tmsConfig, targetModules) {
     '生成编译后的app.json完成',
   )(tmsConfig, newModules);
 
+  await createTask(
+    symLink,
+    '开始创建软链接',
+    '创建软链接完成',
+  )(tmsConfig);
+
   return newModules;
 }
-async function bootstrap(tmsConfig, targetModules) {
-  const newModules = await task(tmsConfig, targetModules);
+async function init(tmsConfig, targetModules) {
+  try {
+    const newModules = await task(tmsConfig, targetModules);
 
-  return {
-    targetModules: newModules,
-  };
+    return {
+      targetModules: newModules,
+    };
+  } catch (error) {
+    const errMsg = typeof error === 'object' ? error.message : error;
+    fail(`init流程出现错误${errMsg}`);
+    info('详细的错误信息', error);
+    process.exit(1);
+  }
 }
 
-module.exports = bootstrap;
+module.exports = init;

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

@@ -1,39 +1,31 @@
-const shelljs = require('shelljs');
-const { createTask } = require('../../../utils/widgets');
-const { buildMpNpm } = require('../../../utils/mpCiUtils');
-const glob = require('glob-ignore');
-const path = require('path');
+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');
 
-function npmInstall(contextDir) {
-  return new Promise((resolve, reject) => {
-    glob(`${contextDir}/**/package.json`, ['node_modules', 'miniprogram_npm'], (err, files) => {
-      if (err) {
-        reject(err);
-      }
-      files.forEach((file) => {
-        const dir = path.dirname(file);
-        shelljs.cd(dir);
-        shelljs.exec('npx pnpm install --prod --registry http://mirrors.tencent.com/npm/', { silent: false });
-      });
-      resolve();
-    });
-  });
-}
-
-async function install(contextDir) {
-  // npm install
+async function install(tmsConfig, modules, isCloud = false) {
+  // 小程序npm install
   await createTask(
-    npmInstall,
-    '开始npm install',
-    'npm install完成',
-  )(contextDir);
+    mpNpmInstallAll,
+    '小程序 开始npm install',
+    '小程序npm install 完成',
+  )(modules, resolve(tmsConfig.outputDir), `${CACHE_DIR}/node_modules`);
 
-  // 构建miniprograme_npm
+  const tmsPrivateCf = global.getData('tmsPrivateCf');
+  // 构建miniprogram_npm
   await createTask(
     buildMpNpm,
     '开始构建miniprogram_npm',
     '构建miniprogram_npm 完成',
-  )({ appId: 'null', projectPath: contextDir, privateKey: 'null' });
+  )({ 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

@@ -0,0 +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,
+};

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();
-}
+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 = {
-  getGlobalInstance,
+  global,
 };

package/src/utils/io.js

@@ -1,10 +1,23 @@
 const fs = require('fs');
+const path = require('path');
+const { info } = require('../utils/log');
 /**
  * 判断目录是否为空
  * @param {string} dirname 目录名
  * @returns
  */
 const isDirEmpty = dirname => fs.promises.readdir(dirname).then(files => files.length === 0);
+
+// 判断是否是文件
+const isFile = (pathName) => {
+  try {
+    const stat = fs.lstatSync(pathName);
+    return stat.isFile();
+  } catch {
+    return false;
+  }
+};
+
 /**
  * 确保目录存在，不存在就创建一个
  * @param {*} dirname 目录名
@@ -15,7 +28,80 @@ const ensureDirExist = (dirname) => {
   }
 };
 
+// 复制文件
+const copyFile = function (src, dest) {
+  if (fs.existsSync(dest)) {
+    fs.unlinkSync(dest);
+  }
+  const dir = path.dirname(dest);
+  ensureDirExist(dir);
+  fs.copyFileSync(src, dest);
+};
+
+// 判断文件内容是否一致，不一致再进行拷贝
+function diffContentCopyFile(originFile, destFile) {
+  if (fs.existsSync(destFile)) {
+    const depDestContent = fs.readFileSync(destFile, 'utf8');
+    const depOriginContent = fs.readFileSync(originFile, 'utf8');
+    if (depDestContent !== depOriginContent) {
+      info(`拷贝${originFile}内容到${destFile}`);
+      copyFile(originFile, destFile);
+    }
+  } else {
+    info(`拷贝${originFile}内容到${destFile}`);
+    copyFile(originFile, destFile);
+  }
+}
+
+// 添加后缀
+function ext(filePath, extensions) {
+  let newFilePath = filePath;
+  let extPath = '';
+  // try catch需要包裹：用来处理'./lib/timer'没有后缀的情况
+  try {
+    const stat = fs.lstatSync(newFilePath);
+    if (stat.isDirectory()) {
+      extPath = newFilePath[newFilePath.length - 1] === '/' ? 'index' : '/index';
+      newFilePath += extPath;
+    }
+  } catch (e) {}
+
+  for (const ext of extensions) {
+    const file = newFilePath.endsWith(ext) ? newFilePath : newFilePath + ext;
+    if (fs.existsSync(file)) {
+      return {
+        ext,
+        extPath: extPath + ext,
+        file,
+      };
+    }
+  }
+  return {
+    ext: '',
+    extPath,
+    file: filePath,
+  };
+}
+
+// 判断文件是否在某个目录
+const fileInDir = (dir, file) => {
+  if (!fs.existsSync(dir) || !fs.existsSync(file)) {
+    return false;
+  }
+  const relativePath = path.relative(dir, file);
+  if (relativePath.startsWith('..')) {
+    return false;
+  }
+  return true;
+};
+
+
 module.exports = {
   isDirEmpty,
+  copyFile,
+  diffContentCopyFile,
   ensureDirExist,
+  ext,
+  fileInDir,
+  isFile,
 };

package/src/utils/log.js

@@ -37,8 +37,11 @@ const warn = (message) => {
   console.log(chalk.yellow(message));
 };
 
+const info = (...args) => console.log(...args);
+
 module.exports = {
   fail,
   succeed,
   warn,
+  info,
 };

package/src/utils/widgets.js

@@ -5,9 +5,9 @@ const ora = require('ora');
 const path = require('path');
 const fs = require('fs');
 const shelljs = require('shelljs');
-const download = require('download-git-repo');
+const { info } = require('./log');
 const chalk = require('chalk');
-const shelljsOptons =  { slient: true };
+const shelljsOptions =  { slient: true, async: false };
 
 // 获取当前目录
 const cwd = process.cwd();
@@ -15,11 +15,6 @@ function resolve(...args) {
   return path.resolve(cwd, ...args);
 };
 
-/**
- * 封装logs
- * @returns {Undefined} 无需返回值
- */
-const log = (...args) => console.log(...args);
 
 /**
  * 用户输入命令时，进行提示
@@ -38,7 +33,7 @@ const suggestCommands = (unknownCommand) => {
   });
 
   if (suggestion) {
-    log(`  ${chalk.red(`Did you mean ${chalk.yellow(suggestion)}?`)}`);
+    info(`  ${chalk.red(`Did you mean ${chalk.yellow(suggestion)}?`)}`);
   }
 };
 
@@ -60,55 +55,74 @@ function isArray(obj) {
   return Object.prototype.toString.call(obj) === '[object Array]';
 }
 
+
 /**
- * 下载模块到目标目录
+ * 下载模块代码
+ * @param { string } url 模块地址
  * @param { string } dest 目标地址
- * @param { object } downloadOptions 模块下载配置 { repoUrl-仓库地址, gitUrl-git地址, branch-分支或者tag }
+ * @param { string } branch 分支名
  * @returns { undefined } no return
  */
-function downloadRepo(dest, downloadOptions = { repoUrl: '', gitUrl: '', branch: '' }) {
-  const { repoUrl, gitUrl, branch } = downloadOptions;
+function downloadRepoForGit(url, dest, branch) {
+  const cwd = process.cwd();
+  return new Promise((resolve, reject) => {
+    // 如果目标目录不存在
+    if (fs.existsSync(dest)) {
+      shelljs.rm('-rf', path.join(dest));
+    }
 
-  if (fs.existsSync(dest)) {
-    shelljs.rm('-rf', dest);
-  }
+    shelljs.mkdir('-p', dest);
+    shelljs.cd(dest);
 
-  shelljs.mkdir('-p', dest);
-  return new Promise((resolve) => {
-    download(`${repoUrl}#${branch}`, dest, { clone: true }, async (e) => {
-      if (e) {
-        console.log(e) // eslint-disable-line
-        await downloadRepoForGit(gitUrl, dest, branch);
+    shelljs.exec(`git clone ${url} ${dest} --branch ${branch} --depth 1`,  { silent: true }, (code, stdout, stderr) => {
+      if (code !== 0) {
+        reject(stderr);
       }
-
+      shelljs.cd(cwd);
       resolve();
     });
   });
 }
 
+
 /**
- * 下载模块到目标目录备用方案
- * @param { string } url 模块地址
- * @param { string } dest 目标地址
+ * pull模块代码
+ * @param { string } dest 下载代码的路径
  * @param { string } branch 分支名
  * @returns { undefined } no return
  */
-function downloadRepoForGit(url, dest, branch) {
+function pullRepoForGit(dest, branch) {
   const cwd = process.cwd();
-
-  return new Promise((resolve) => {
-    // 如果目标目录不存在
-    if (fs.existsSync(dest)) {
-      shelljs.rm('-rf', path.join(dest));
-    }
-
-    shelljs.mkdir('-p', dest);
+  return new Promise((resolve, reject) => {
     shelljs.cd(dest);
+    shelljs.exec('git config pull.rebase false', shelljsOptions);
+    shelljs.exec(`git pull origin ${branch}`, { silent: true }, (code, stdout, stderr) => {
+      if (code !== 0) {
+        reject(stderr);
+      }
+      shelljs.cd(cwd);
+      resolve();
+    });
+  });
+}
 
-    shelljs.exec(`git clone ${url} ${dest} --branch ${branch} --depth 1`, shelljsOptons);
-
-    shelljs.cd(cwd);
-    resolve();
+/**
+ * npm 下载依赖
+ * @param {*} dir
+ * @returns
+ */
+function npmInstall(dir) {
+  return new Promise((resolve, reject) => {
+    shelljs.exec(
+      'npx yarn --production --registry http://mirrors.tencent.com/npm/',
+      { cwd: dir, silent: true },
+      (code, stdout, stderr) => {
+        if (code !== 0) {
+          reject(stderr);
+        }
+        resolve();
+      },
+    );
   });
 }
 
@@ -129,22 +143,16 @@ const cost = start => Date.now() - start;
 function createTask(task, startText, endText) {
   return async (...args) => {
     const start = Date.now();
-    let result;
 
     const spinner = ora(startText);
+
     spinner.start();
+    info('\n');
 
-    try {
-      result = await task(...args);
-    } catch (e) {
-      result = e;
-      console.log(chalk.red(e));
+    const result = await task(...args);
 
-      process.exit(-1);
-    } finally {
-      endText && spinner.succeed(`${endText}, ${cost(start)}ms`);
-      spinner.stop();
-    }
+    endText && spinner.succeed(`${endText}, ${cost(start)}ms`);
+    spinner.stop();
 
     return result;
   };
@@ -159,12 +167,12 @@ const camelize = str => str.replace(/-(\w)/g, (a, c) => (c ? c.toUpperCase() : '
 
 module.exports = {
   resolve,
-  log,
   isObject,
   isArray,
   createTask,
-  downloadRepo,
   downloadRepoForGit,
+  pullRepoForGit,
   suggestCommands,
   camelize,
+  npmInstall,
 };

package/main.js

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-
-require('./dist/index.cjs'); // eslint-disable-line