antd-management-fast-develop 1.1.91 → 1.1.92

package/bin/cli.js

@@ -20,7 +20,7 @@ program
   .command('generate')
   .description('generate file from data source and template')
   .option('--dataPath <string>', 'data json source file path')
-  .option('--dataExtraPath <string>', 'data extra json source file path')
+  .option('--folderName <string>', 'folder Name contain the function component')
   .option(
     '--relativeFolder <bool>',
     'file will be generate by the relative folder path, default is "."',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-develop",
-  "version": "1.1.91",
+  "version": "1.1.92",
   "description": "",
   "license": "ISC",
   "author": "",

package/src/cliCollection/generate.js

@@ -12,15 +12,20 @@ const {
   promptInfo,
   exec,
   mkdirSync,
+  promptError,
 } = require('easy-soft-develop');
 const { generate } = require('../tools/generate');
 
 exports.run = function (s, o) {
   const {
-    _optionValues: { dataPath = '', dataExtraPath = '', relativeFolder = '.' },
+    _optionValues: {
+      dataPath = '',
+      folderName = 'FunctionSpecialComponent',
+      relativeFolder = '.',
+    },
   } = o;
 
-  if (checkStringIsEmpty(dataPath) && checkStringIsEmpty(dataExtraPath)) {
+  if (checkStringIsEmpty(dataPath)) {
     promptWarn(
       'please input data json file path or data extra json file path, use --help to get help info',
     );
@@ -28,13 +33,19 @@ exports.run = function (s, o) {
     exit();
   }
 
-  const removeCmd = `rimraf ${relativeFolder}/FunctionExtra`;
+  if (checkStringIsEmpty(folderName)) {
+    promptError('folder name disallow empty, use --help to get help info!');
 
-  promptInfo(`remove FunctionExtra: ${removeCmd}`);
+    exit();
+  }
+
+  const removeCmd = `rimraf ${relativeFolder}/${folderName}`;
+
+  promptInfo(`remove ${folderName}: ${removeCmd}`);
 
   exec(removeCmd);
 
-  mkdirSync(`${relativeFolder}/FunctionExtra`, {
+  mkdirSync(`${relativeFolder}/${folderName}`, {
     recursive: true,
   });
 
@@ -48,21 +59,7 @@ exports.run = function (s, o) {
     if (isObject(data) && Array.isArray(data.list)) {
       promptInfo('File will generate, please wait a moment');
 
-      const list = generate(data.list, relativeFolder);
-
-      crateFileSuccess = true;
-
-      exportList = [...exportList, ...list];
-    }
-  }
-
-  if (!checkStringIsEmpty(dataExtraPath)) {
-    const dataExtra = readJsonFileSync(dataExtraPath);
-
-    if (isObject(dataExtra) && Array.isArray(dataExtra.list)) {
-      promptInfo('File extra will generate, please wait a moment');
-
-      const list = generate(dataExtra.list, relativeFolder);
+      const list = generate(data.list, folderName, relativeFolder);
 
       crateFileSuccess = true;
 
@@ -73,7 +70,7 @@ exports.run = function (s, o) {
   if (crateFileSuccess) {
     if (exportList.length > 0) {
       writeFileSync(
-        `${relativeFolder}/FunctionExtra/index.jsx`,
+        `${relativeFolder}/${folderName}/index.jsx`,
         exportList.join(''),
         {
           coverFile: true,

package/src/tools/generate.js

@@ -13,7 +13,7 @@ const {
 
 let { templateContent } = require('../template');
 
-function generate(dataSource, relativeFolder) {
+function generate(dataSource, folderName, relativeFolder) {
   const dataAdjust = dataSource.map((o) => adjustSource(o));
 
   const exportList = [];
@@ -23,10 +23,10 @@ function generate(dataSource, relativeFolder) {
 
     let content = compile(templateContent)({ o });
 
-    mkdirSync(`${relativeFolder}/FunctionExtra/${o.functionSegment}`);
+    mkdirSync(`${relativeFolder}/${folderName}/${o.functionSegment}`);
 
     writeFileSync(
-      `${relativeFolder}/FunctionExtra/${o.functionSegment}/index.jsx`,
+      `${relativeFolder}/${folderName}/${o.functionSegment}/index.jsx`,
       content,
       {
         coverFile: true,
@@ -34,7 +34,7 @@ function generate(dataSource, relativeFolder) {
     );
 
     promptSuccess(
-      `Generate "${relativeFolder}/FunctionExtra/${o.functionSegment}/index.jsx" complete`,
+      `Generate "${relativeFolder}/${folderName}/${o.functionSegment}/index.jsx" complete`,
     );
 
     exportList.push(`export * from './${o.functionSegment}';`);