@tmsfe/tmskit 0.0.49 → 0.0.53

package/dist/index.cjs.js

@@ -120,23 +120,23 @@ const succeed$2 = (message = '') => {
 const warn$2 = message => {
   console.log(`${moment$1().format('YYYY-MM-DD HH:mm:ss')}`, chalk$5.yellow(message));
 };
-const info$k = (...args) => console.log(`${moment$1().format('YYYY-MM-DD HH:mm:ss')}`, ...args);
+const info$l = (...args) => console.log(`${moment$1().format('YYYY-MM-DD HH:mm:ss')}`, ...args);
 const infoNoTime$1 = (...args) => console.log(...args);
 var log$1 = {
   fail: fail$a,
   succeed: succeed$2,
   warn: warn$2,
-  info: info$k,
+  info: info$l,
   infoNoTime: infoNoTime$1
 };
 
 const ora$2 = require$$0__default;
 const path$h = require$$1__default$1;
-const fs$j = require$$0__default$1;
+const fs$k = require$$0__default$1;
 const shelljs$7 = require$$0__default$2;
 const glob = require$$4__default;
 const {
-  info: info$j
+  info: info$k
 } = log$1;
 const shelljsOptions = {
   slient: true,
@@ -145,7 +145,7 @@ const shelljsOptions = {
 
 // 获取当前目录
 const cwd = process.cwd();
-function resolve$k(...args) {
+function resolve$l(...args) {
   return path$h.resolve(cwd, ...args);
 }
 
@@ -178,7 +178,7 @@ function downloadRepoForGit$1(url, dest, branch) {
   const cwd = process.cwd();
   return new Promise((resolve, reject) => {
     // 如果目标目录不存在
-    if (fs$j.existsSync(dest)) {
+    if (fs$k.existsSync(dest)) {
       shelljs$7.rm('-rf', path$h.join(dest));
     }
     shelljs$7.mkdir('-p', dest);
@@ -278,7 +278,7 @@ function createTask$7(task, startText, endText) {
   return async (...args) => {
     const start = Date.now();
     const spinner = ora$2();
-    info$j(startText);
+    info$k(startText);
     spinner.start();
     const result = await task(...args);
     endText && spinner.succeed(`${endText}, 耗时${cost(start) / 1000}s`);
@@ -336,7 +336,7 @@ function findFiles(globPath, filter = []) {
 // 获取绝对路径
 function getAbsolutePath$6(pathDir, cwd = '') {
   let newPath = pathDir;
-  newPath = newPath.startsWith('/') ? newPath : resolve$k(cwd, newPath);
+  newPath = newPath.startsWith('/') ? newPath : resolve$l(cwd, newPath);
   newPath = newPath.endsWith('/') ? newPath.slice(0, newPath.length - 1) : newPath;
   return newPath;
 }
@@ -367,7 +367,7 @@ function getGitUser$2() {
   return res.stdout;
 }
 var widgets = {
-  resolve: resolve$k,
+  resolve: resolve$l,
   isObject,
   isArray,
   createTask: createTask$7,
@@ -872,10 +872,10 @@ var global_1 = {
   };
 })(tmsMpconfig);
 
-const fs$i = require$$0__default$1;
+const fs$j = require$$0__default$1;
 const path$f = require$$1__default$1;
 const {
-  info: info$i
+  info: info$j
 } = log$1;
 const {
   relativeCwdPath
@@ -885,12 +885,12 @@ const {
  * @param {string} dirname 目录名
  * @returns
  */
-const isDirEmpty = dirname => fs$i.promises.readdir(dirname).then(files => files.length === 0);
+const isDirEmpty = dirname => fs$j.promises.readdir(dirname).then(files => files.length === 0);
 
 // 判断是否是文件
 const isFile = pathName => {
   try {
-    const stat = fs$i.lstatSync(pathName);
+    const stat = fs$j.lstatSync(pathName);
     return stat.isFile();
   } catch {
     return false;
@@ -902,8 +902,8 @@ const isFile = pathName => {
  * @param {*} dirname 目录名
  */
 const ensureDirExist$6 = dirname => {
-  if (!fs$i.existsSync(dirname)) {
-    fs$i.mkdirSync(dirname, {
+  if (!fs$j.existsSync(dirname)) {
+    fs$j.mkdirSync(dirname, {
       recursive: true
     });
   }
@@ -911,25 +911,25 @@ const ensureDirExist$6 = dirname => {
 
 // 复制文件
 const copyFile = function (src, dest) {
-  if (fs$i.existsSync(dest)) {
-    fs$i.unlinkSync(dest);
+  if (fs$j.existsSync(dest)) {
+    fs$j.unlinkSync(dest);
   }
   const dir = path$f.dirname(dest);
   ensureDirExist$6(dir);
-  fs$i.copyFileSync(src, dest);
+  fs$j.copyFileSync(src, dest);
 };
 
 // 判断文件内容是否一致，不一致再进行拷贝
 function diffContentCopyFile(originFile, destFile) {
-  if (fs$i.existsSync(destFile)) {
-    const depDestContent = fs$i.readFileSync(destFile, 'utf8');
-    const depOriginContent = fs$i.readFileSync(originFile, 'utf8');
+  if (fs$j.existsSync(destFile)) {
+    const depDestContent = fs$j.readFileSync(destFile, 'utf8');
+    const depOriginContent = fs$j.readFileSync(originFile, 'utf8');
     if (depDestContent !== depOriginContent) {
-      info$i(`拷贝${relativeCwdPath(originFile)}内容到${relativeCwdPath(destFile)}`);
+      info$j(`拷贝${relativeCwdPath(originFile)}内容到${relativeCwdPath(destFile)}`);
       copyFile(originFile, destFile);
     }
   } else {
-    info$i(`拷贝${relativeCwdPath(originFile)}内容到${relativeCwdPath(destFile)}`);
+    info$j(`拷贝${relativeCwdPath(originFile)}内容到${relativeCwdPath(destFile)}`);
     copyFile(originFile, destFile);
   }
 }
@@ -940,7 +940,7 @@ function ext(filePath, extensions) {
   let extPath = '';
   // try catch需要包裹：用来处理'./lib/timer'没有后缀的情况
   try {
-    const stat = fs$i.lstatSync(newFilePath);
+    const stat = fs$j.lstatSync(newFilePath);
     if (stat.isDirectory()) {
       extPath = newFilePath[newFilePath.length - 1] === '/' ? 'index' : '/index';
       newFilePath += extPath;
@@ -948,7 +948,7 @@ function ext(filePath, extensions) {
   } catch (e) {}
   for (const ext of extensions) {
     const file = newFilePath.endsWith(ext) ? newFilePath : newFilePath + ext;
-    if (fs$i.existsSync(file)) {
+    if (fs$j.existsSync(file)) {
       return {
         ext,
         extPath: extPath + ext,
@@ -965,7 +965,7 @@ function ext(filePath, extensions) {
 
 // 判断文件是否在某个目录
 const fileInDir = (dir, file) => {
-  if (!fs$i.existsSync(dir) || !fs$i.existsSync(file)) {
+  if (!fs$j.existsSync(dir) || !fs$j.existsSync(file)) {
     return false;
   }
   const relativePath = path$f.relative(dir, file);
@@ -977,10 +977,10 @@ const fileInDir = (dir, file) => {
 function findAllFilesOfDir(dir) {
   const list = [];
   function listFile(dir) {
-    const arr = fs$i.readdirSync(dir);
+    const arr = fs$j.readdirSync(dir);
     arr.forEach(item => {
       const fullPath = path$f.join(dir, item);
-      const stats = fs$i.statSync(fullPath);
+      const stats = fs$j.statSync(fullPath);
       if (stats.isDirectory()) {
         listFile(fullPath);
       } else {
@@ -1019,10 +1019,10 @@ const render$1 = (files, metalsmith, next) => {
 };
 var render_1 = render$1;
 
-const fs$h = require$$0__default$1;
+const fs$i = require$$0__default$1;
 const inquirer$1 = require$$1__default$5;
 const {
-  resolve: resolve$j
+  resolve: resolve$k
 } = widgets;
 const {
   TEMPLATE_TKIT_DIR: TEMPLATE_TKIT_DIR$1
@@ -1034,11 +1034,11 @@ const {
  */
 const parseTemplateQuestions = dir => {
   let prompts = [];
-  if (!fs$h.existsSync(`${dir}/questions.json`)) {
+  if (!fs$i.existsSync(`${dir}/questions.json`)) {
     return prompts;
   }
   try {
-    const json = JSON.parse(fs$h.readFileSync(`${dir}/questions.json`));
+    const json = JSON.parse(fs$i.readFileSync(`${dir}/questions.json`));
     if (Array.isArray(json) && json.length > 0) {
       json.forEach((item, index) => {
         if (!isQuestionType(item)) {
@@ -1064,7 +1064,7 @@ const isQuestionType = result => {
   return true;
 };
 const ask$1 = templateDir => (files, metalsmith, next) => {
-  const prompts = parseTemplateQuestions(resolve$j(templateDir, TEMPLATE_TKIT_DIR$1));
+  const prompts = parseTemplateQuestions(resolve$k(templateDir, TEMPLATE_TKIT_DIR$1));
   const metadata = metalsmith.metadata();
   const filteredPrompts = prompts.filter(prompt => {
     if (metadata[prompt.name] && `${metadata[prompt.name]}`.trim() !== '') {
@@ -1132,7 +1132,7 @@ const report$b = (name, attrs = {}) => {
 var report_1 = report$b;
 
 const path$e = require$$1__default$1;
-const fs$g = require$$0__default$1;
+const fs$h = require$$0__default$1;
 const shelljs$6 = require$$0__default$2;
 const inquirer = require$$1__default$5;
 const {
@@ -1143,13 +1143,13 @@ const {
   CREATE_TEMPLATE_QUESTION
 } = constant;
 const {
-  resolve: resolve$i
+  resolve: resolve$j
 } = widgets;
 const io$2 = io$3;
 const {
   fail: fail$9,
   succeed: succeed$1,
-  info: info$h
+  info: info$i
 } = log$1;
 const generator = generator_1;
 const request = require$$0__default$6;
@@ -1163,7 +1163,7 @@ const report$a = report_1;
  */
 async function createProjectDir(targetDir) {
   // 如果目录非空或者已经存在，提示用户，做选择
-  if (fs$g.existsSync(targetDir)) {
+  if (fs$h.existsSync(targetDir)) {
     if (!(await io$2.isDirEmpty(targetDir))) {
       fail$9('该目录名已经存在，换个项目名字吧~');
       process.exit(1);
@@ -1183,13 +1183,13 @@ async function createProjectDir(targetDir) {
 function downloadAndUnZipTemplate(templateDir, templateUrl, templateName) {
   return new Promise((resolve, reject) => {
     const localZipPath = `${templateDir}/${templateName}.zip`;
-    const stream = fs$g.createWriteStream(localZipPath);
+    const stream = fs$h.createWriteStream(localZipPath);
     request(`${templateUrl}?v=${new Date().getTime()}`).pipe(stream).on('close', err => {
       if (err) {
         reject(err);
         return;
       }
-      fs$g.createReadStream(localZipPath).pipe(unzip.Extract({
+      fs$h.createReadStream(localZipPath).pipe(unzip.Extract({
         path: templateDir
       })).on('close', err => {
         if (err) {
@@ -1221,10 +1221,10 @@ async function create(projectName) {
   await createProjectDir(targetDir);
 
   // 新创建缓存目录
-  if (fs$g.existsSync(TEMPLATE_DIR)) {
+  if (fs$h.existsSync(TEMPLATE_DIR)) {
     shelljs$6.rm('-rf', TEMPLATE_DIR);
   }
-  fs$g.mkdirSync(TEMPLATE_DIR, {
+  fs$h.mkdirSync(TEMPLATE_DIR, {
     recursive: true
   });
 
@@ -1234,8 +1234,8 @@ async function create(projectName) {
   // 生成模板(1. 询问问题， 2. ejs生成模板  3.生成到目标目录)
   generator(path$e.join(TEMPLATE_DIR, TEMPLATE_NAME, projectType), targetDir).then(() => {
     shelljs$6.cd(projectName);
-    const hookFilePath = resolve$i(projectName, TEMPLATE_TKIT_DIR, 'hooks.js');
-    if (fs$g.existsSync(hookFilePath)) {
+    const hookFilePath = resolve$j(projectName, TEMPLATE_TKIT_DIR, 'hooks.js');
+    if (fs$h.existsSync(hookFilePath)) {
       const hooks = require(hookFilePath);
       if (hooks.afterCreate) {
         hooks.afterCreate.forEach(item => {
@@ -1248,7 +1248,7 @@ async function create(projectName) {
           }
         });
       }
-      shelljs$6.rm('-rf', resolve$i(projectName, TEMPLATE_TKIT_DIR));
+      shelljs$6.rm('-rf', resolve$j(projectName, TEMPLATE_TKIT_DIR));
     }
     report$a('create-success', {
       projectType
@@ -1256,12 +1256,12 @@ async function create(projectName) {
     succeed$1('项目创建完成.');
   }).catch(err => {
     fail$9(err.message);
-    info$h('详细的错误信息:', err);
+    info$i('详细的错误信息:', err);
   });
 }
 var create_1 = create;
 
-const fs$f = require$$0__default$1;
+const fs$g = require$$0__default$1;
 const path$d = require$$1__default$1;
 const shellJs$3 = require$$0__default$2;
 const {
@@ -1274,7 +1274,7 @@ const {
   createTask: createTask$6
 } = widgets;
 const {
-  info: info$g,
+  info: info$h,
   fail: fail$8
 } = log$1;
 
@@ -1286,9 +1286,9 @@ const {
 async function installCmd(npmName, cmd) {
   try {
     const cmdPackageJson = `${EXTEND_CMD}/package.json`;
-    if (!fs$f.existsSync(cmdPackageJson)) {
+    if (!fs$g.existsSync(cmdPackageJson)) {
       ensureDirExist$5(EXTEND_CMD);
-      fs$f.writeFileSync(cmdPackageJson, JSON.stringify({
+      fs$g.writeFileSync(cmdPackageJson, JSON.stringify({
         dependencies: {}
       }, null, 2));
     }
@@ -1307,7 +1307,7 @@ async function installCmd(npmName, cmd) {
     }), `开始下载${npmName}`, `下载${npmName}完成`)(npmName);
   } catch (e) {
     fail$8('构建出现错误:');
-    info$g(e);
+    info$h(e);
     process.exit(1);
   }
 }
@@ -1319,8 +1319,8 @@ async function installCmd(npmName, cmd) {
 function loadExtendCmd$1() {
   const cmdPackageJson = `${EXTEND_CMD}/package.json`;
   const cmdNpmDir = `${EXTEND_CMD}/node_modules`;
-  if (fs$f.existsSync(cmdPackageJson)) {
-    const content = fs$f.readFileSync(cmdPackageJson, 'utf8');
+  if (fs$g.existsSync(cmdPackageJson)) {
+    const content = fs$g.readFileSync(cmdPackageJson, 'utf8');
     const json = JSON.parse(content);
     const deps = json.dependencies || {};
     const cmdConfigs = [];
@@ -1328,7 +1328,7 @@ function loadExtendCmd$1() {
       // 检索cmd的npm包
       if (!/^tmskit-cmd-|^@[^/]+\/tmskit-cmd-/.test(name)) return false;
       const cmdConfig = path$d.join(cmdNpmDir, name, 'tms.config.js');
-      if (fs$f.existsSync(cmdConfig)) {
+      if (fs$g.existsSync(cmdConfig)) {
         cmdConfigs.push(cmdConfig);
       }
     });
@@ -1365,6 +1365,77 @@ var handleError_1 = {
   handleError: handleError$9
 };
 
+const {
+  resolve: resolve$i
+} = widgets;
+const {
+  info: info$g
+} = log$1;
+const fs$f = require$$0__default$1;
+
+/* eslint-disable no-param-reassign */
+/**
+ * 检查是否包含 meta-services 分包
+ * @param {Object} appJson app.json配置对象
+ * @returns {boolean}
+ */
+function hasMetaServicesSubpackage(appJson) {
+  return appJson.subpackages.some(s => s.root === 'modules/meta-services' || s.name === 'meta-services');
+}
+
+/**
+ * 处理 agent 配置：根据是否包含 meta-services 分包来添加或删除 agent 配置
+ * @param {Object} appJson app.json配置对象
+ */
+function handleAgentConfig$1(appJson) {
+  const hasMetaServices = hasMetaServicesSubpackage(appJson);
+  console.log('🔍', hasMetaServices ? '包含' : '不包含', 'meta-services 分包');
+  if (hasMetaServices) {
+    if (!appJson.agent) {
+      try {
+        appJson.agent = require(resolve$i('./agentConfig.json'));
+        info$g('已从 agentConfig.json 加载 agent 配置');
+      } catch (error) {
+        info$g('未找到 agentConfig.json，删除 agent 配置');
+        delete appJson.agent;
+      }
+    }
+  } else if (appJson.agent) {
+    delete appJson.agent;
+    info$g('已移除 agent 配置');
+  }
+}
+
+/**
+ * 处理 project.config.json 中的 packOptions.include 配置
+ * @param {Object} appJson app.json配置对象
+ * @param {string} outputDir 输出目录
+ */
+function handleProjectConfigInclude$1(appJson, outputDir) {
+  const projectConfigPath = resolve$i(outputDir, 'project.config.json');
+  if (!fs$f.existsSync(projectConfigPath)) return;
+  const projectConfig = require(projectConfigPath);
+  const hasMetaServices = hasMetaServicesSubpackage(appJson);
+  if (!projectConfig.packOptions) projectConfig.packOptions = {};
+  if (!projectConfig.packOptions.include) projectConfig.packOptions.include = [];
+  const existingIndex = projectConfig.packOptions.include.findIndex(item => item.type === 'folder' && item.value === 'modules/meta-services');
+  if (hasMetaServices && existingIndex === -1) {
+    projectConfig.packOptions.include.push({
+      type: 'folder',
+      value: 'modules/meta-services'
+    });
+    info$g('已添加 meta-services 到 project.config.json');
+  } else if (!hasMetaServices && existingIndex !== -1) {
+    projectConfig.packOptions.include.splice(existingIndex, 1);
+    info$g('已从 project.config.json 移除 meta-services');
+  }
+  fs$f.writeFileSync(projectConfigPath, JSON.stringify(projectConfig, null, 2));
+}
+var handleAgentConfig_1 = {
+  handleAgentConfig: handleAgentConfig$1,
+  handleProjectConfigInclude: handleProjectConfigInclude$1
+};
+
 /**
  * 生成编译后的app.json
  */
@@ -1391,6 +1462,10 @@ const {
   global: global$a
 } = global_1;
 const report$9 = report_1;
+const {
+  handleAgentConfig,
+  handleProjectConfigInclude
+} = handleAgentConfig_1;
 
 /**
  * 更新appJson里面的主包配置
@@ -1566,6 +1641,10 @@ async function buildOutputAppJson$3(tmsConfig, modules) {
 
     // 处理appJson中重复||冲突的地方
     fixAppJson(appJson);
+    // 处理 agent 配置：根据是否包含 meta-services 分包来添加或删除
+    handleAgentConfig(appJson);
+    // 处理 project.config.json 中的 packOptions.include 配置
+    handleProjectConfigInclude(appJson, tmsConfig.outputDir);
     // 更新主包，需在subpackages处理完成后执行， pages/
     updateMainPackages(appJson, tmsConfig.mainPackages);
 
@@ -4195,7 +4274,7 @@ var entry = [{
 
 var require$$12 = {
 	name: "@tmsfe/tmskit",
-	version: "0.0.49",
+	version: "0.0.53",
 	description: "tmskit",
 	main: "dist/index.cjs",
 	bin: {

package/package.json

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

package/src/core/buildAppJson.js

@@ -10,6 +10,7 @@ const { resolve, filterField } = require('../utils/widgets');
 const { handleError } = require('./handleError');
 const { global } = require('../utils/global');
 const report = require('../core/report');
+const { handleAgentConfig, handleProjectConfigInclude } = require('./handleAgentConfig');
 
 
 /**
@@ -191,6 +192,10 @@ async function buildOutputAppJson(tmsConfig, modules) {
 
     // 处理appJson中重复||冲突的地方
     fixAppJson(appJson);
+    // 处理 agent 配置：根据是否包含 meta-services 分包来添加或删除
+    handleAgentConfig(appJson);
+    // 处理 project.config.json 中的 packOptions.include 配置
+    handleProjectConfigInclude(appJson, tmsConfig.outputDir);
     // 更新主包，需在subpackages处理完成后执行， pages/
     updateMainPackages(appJson, tmsConfig.mainPackages);
 

package/src/core/handleAgentConfig.js

@@ -0,0 +1,70 @@
+const { resolve } = require('../utils/widgets');
+const { info } = require('../utils/log');
+const fs = require('fs');
+
+/* eslint-disable no-param-reassign */
+/**
+ * 检查是否包含 meta-services 分包
+ * @param {Object} appJson app.json配置对象
+ * @returns {boolean}
+ */
+function hasMetaServicesSubpackage(appJson) {
+  return appJson.subpackages.some(s => s.root === 'modules/meta-services' || s.name === 'meta-services');
+}
+
+/**
+ * 处理 agent 配置：根据是否包含 meta-services 分包来添加或删除 agent 配置
+ * @param {Object} appJson app.json配置对象
+ */
+function handleAgentConfig(appJson) {
+  const hasMetaServices = hasMetaServicesSubpackage(appJson);
+  console.log('🔍', hasMetaServices ? '包含' : '不包含', 'meta-services 分包');
+  if (hasMetaServices) {
+    if (!appJson.agent) {
+      try {
+        appJson.agent = require(resolve('./agentConfig.json'));
+        info('已从 agentConfig.json 加载 agent 配置');
+      } catch (error) {
+        info('未找到 agentConfig.json，删除 agent 配置');
+        delete appJson.agent;
+      }
+    }
+  } else if (appJson.agent) {
+    delete appJson.agent;
+    info('已移除 agent 配置');
+  }
+}
+
+/**
+ * 处理 project.config.json 中的 packOptions.include 配置
+ * @param {Object} appJson app.json配置对象
+ * @param {string} outputDir 输出目录
+ */
+function handleProjectConfigInclude(appJson, outputDir) {
+  const projectConfigPath = resolve(outputDir, 'project.config.json');
+  if (!fs.existsSync(projectConfigPath)) return;
+
+  const projectConfig = require(projectConfigPath);
+  const hasMetaServices = hasMetaServicesSubpackage(appJson);
+
+  if (!projectConfig.packOptions) projectConfig.packOptions = {};
+  if (!projectConfig.packOptions.include) projectConfig.packOptions.include = [];
+
+  const existingIndex = projectConfig.packOptions.include.findIndex(item => item.type === 'folder' && item.value === 'modules/meta-services');
+
+  if (hasMetaServices && existingIndex === -1) {
+    projectConfig.packOptions.include.push({ type: 'folder', value: 'modules/meta-services' });
+    info('已添加 meta-services 到 project.config.json');
+  } else if (!hasMetaServices && existingIndex !== -1) {
+    projectConfig.packOptions.include.splice(existingIndex, 1);
+    info('已从 project.config.json 移除 meta-services');
+  }
+
+  fs.writeFileSync(projectConfigPath, JSON.stringify(projectConfig, null, 2));
+}
+
+
+module.exports = {
+  handleAgentConfig,
+  handleProjectConfigInclude,
+};