jjb-cmd 1.0.9 → 1.0.11

package/bin/command.js

@@ -28,7 +28,7 @@ commander.command('pull -- <文件夹名称必填。>').description('-- 文件
 
 //多省多应用命令
 commander.command('mp -- <multi prov多省多应用启动dev>').description('-- multi prov多省多应用合并').action(res => {
-  MergeScripts(res);
+  MergeScripts(res, 'mp');
   console.log('start test')
 });
 

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "jjb-cmd",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "jjb脚手架工具",
   "main": "index.js",
   "scripts": {
-    "test": "node bin/command.js help",
-    "publish": "npm publish"
+    "test": "node bin/command.js help"
   },
   "bin": {
     "jjb-cmd": "bin/command.js"

package/src/cli.merge.js

@@ -9,38 +9,55 @@ let vesselPath = '';
 //input传入参数 指令:地区:环境 start:chongqing:dev
 let commandArr = [];
 //application数据
-let applicationData = {};
 const fromFileData = {};
+const applicationJson = {};
 
 /**
  * input 指令:地区:环境 start:chongqing:dev
  */
-module.exports = input => {
+module.exports = (input, source) => {
   commandArr = input.split(':');
   projectPath = path.resolve('./project');
   vesselPath = path.resolve('./vessel/src');
+  let applicationPath = vesselPath;
+  if (source === 'mp') {
+    applicationPath = vesselPath + '/application';
+    utils.CreatePaths(vesselPath, ['application']);
+  }
   const inputRegion = commandArr[1];
   const settingJson = JSON.parse(fs.readFileSync(`${projectPath}/${inputRegion}/setting.json`).toString());
   TileItems(settingJson.items, () => {
-    fromFileData.router.forEach(itemPath => {
-      const itemPathArr = itemPath.split(inputRegion);
-      console.log(itemPath)
-      const filePathArr = itemPathArr.split('/');
-      const application = filePathArr[1];
-      if (!applicationData[application]) {
-        applicationData[application] = {
-          routerConfig: [],
-          routerPath: []
-        };
-      }
-      applicationJson[application].routerConfig.push(`{ path: '${fromItem.path}', component: () => import('${fromItem.file}') }`);
-      applicationJson[application].routerPath.push(fromItem.path);
-      utils.CreatePaths(vesselPath, filePathArr.slice(2, filePathArr.length - 1)).then(() => {
-        const filePath = filePathArr.slice(2, filePathArr.length);
-        const fileContent = fs.readFileSync(`${projectPath}/${inputRegion}/${filePath.join('/')}`).toString();
-        fs.writeFileSync(`${projectPath}/${inputRegion}/${filePath.join('/')}`, fileContent);
+
+    Object.keys(fromFileData).forEach(fileKey => {
+      fromFileData[fileKey].forEach(fromItem => {
+        const itemPathArr = fromItem.pathAdr.split(fromItem.region);
+        const filePathArr = itemPathArr[1].split('/');
+        const application = filePathArr[1];
+        if (!applicationJson[application]) {
+          applicationJson[application] = {
+            routerConfig: [],
+            routerPath: []
+          };
+        }
+        applicationJson[application].routerConfig.push(`{ path: '${fromItem.path}', component: () => import('${fromItem.file}') }`);
+        applicationJson[application].routerPath.push(fromItem.path);
+
+        let applicationStr = filePathArr.join('/');
+
+        const strArr = applicationStr.split('/');
+        utils.CreatePaths(applicationPath, strArr.slice(0, strArr.length - 1)).then(() => {
+          if (fromItem.pathAdr.match(/(.png|.svg)/) != null) {
+            const imageFile = fs.readFileSync(fromItem.pathAdr, 'binary');
+            fs.writeFileSync(`${applicationPath}/${applicationStr}`, imageFile, 'binary');
+          } else {
+            const fileContent = fs.readFileSync(fromItem.pathAdr).toString();
+            fs.writeFileSync(`${applicationPath}/${applicationStr}`, fileContent);
+          }
+        });
+
       });
     });
+
   });
 };
 
@@ -56,10 +73,11 @@ function TileItems (items, cb) {
     item.from.forEach((from, fromIndex) => {
       const pathArr = [];
       utils.DeepScanner(projectPath + '/' + region + '/' + from.file, pathArr);
+      const newPathArr = pathArr.map(pathItem => ({ region, pathAdr: pathItem, ...from }));
       if (!fromFileData[from.fileType]) {
-        fromFileData[from.fileType] = pathArr;
+        fromFileData[from.fileType] = newPathArr;
       } else {
-        fromFileData[from.fileType] = fromFileData[from.fileType].concat(pathArr);
+        fromFileData[from.fileType] = fromFileData[from.fileType].concat(newPathArr);
       }
       if (index === items.length - 1 && fromIndex === item.from.length - 1) {
         cb();

package/src/cli.pull.js

@@ -60,7 +60,7 @@ module.exports = input => {
                               let commonToolsFile = fs.readFileSync(commonToolsPath).toString();
                               let commonWebsiteFile = fs.readFileSync(commonWebsitePath).toString();
                               commonToolsFile = commonToolsFile.replace('return __planA();', 'return process.env;');
-                              commonWebsiteFile = commonWebsiteFile.replace(/const\srelation\s=\srequire\(`\/src\/application\/\${mainMenu.code}\/enumerate\/menu`\)\.default;/g, 'const relation = require(`/src/enumerate/menu`).default;');
+                              commonWebsiteFile = commonWebsiteFile.replace(/const\srelation\s=\srequire\(`~\/application\/\${module.code}\/enumerate\/menu`\)\.default;/, "const relation = require('~/enumerate/menu').default;");
                               fs.writeFileSync(commonToolsPath, commonToolsFile);
                               fs.writeFileSync(commonWebsitePath, commonWebsiteFile);
                             } else {

package/src/util.js

@@ -100,4 +100,50 @@ exports.CopyFile = (srcPath, tarPath, cb) => {
   })
 
   rs.pipe(ws)
-}
+};
+
+/**
+ * 深度获取目录路径
+ * @param path
+ * @param pathChildren
+ * @constructor
+ */
+exports.DeepScanner = (path, pathChildren) => {
+  const that = this;
+  const itemList = fs.readdirSync(path);
+  itemList.forEach(item => {
+    const childPath = `${path}/${item}`;
+    const stat = fs.statSync(childPath);
+    if (stat.isDirectory()) {
+      that.DeepScanner(childPath, pathChildren);
+    } else {
+      pathChildren.push(childPath);
+    }
+  });
+};
+
+/**
+ * 创建目录路径
+ * @param pathArr
+ */
+exports.CreatePaths = (rootPath, pathArr) => {
+  return new Promise(resolve => {
+    const linkStr = [];
+    pathArr.forEach((item, index) => {
+      const dirPath = rootPath + '/' + linkStr.join('/') + '/' + item;
+      try {
+        const stat = fs.statSync(dirPath);
+        if (stat.isDirectory()) {
+          index === pathArr.length - 1 && resolve();
+        } else {
+          fs.mkdirSync(dirPath);
+          index === pathArr.length - 1 && resolve();
+        }
+      } catch (e) {
+        fs.mkdirSync(dirPath);
+        index === pathArr.length - 1 && resolve();
+      }
+      linkStr.push(item);
+    });
+  });
+};