@modern-js/new-action 1.21.5 → 2.0.0-beta.1

package/CHANGELOG.md

@@ -1,28 +1,50 @@
 # @modern-js/new-action
 
-## 1.21.5
+## 2.0.0-beta.1
 
-### Patch Changes
-
-- @modern-js/generator-common@2.4.10
-- @modern-js/generator-utils@2.4.10
-- @modern-js/utils@1.21.5
+### Major Changes
 
-## 1.21.4
+- dda38c9: chore: v2
 
 ### Patch Changes
 
-- @modern-js/utils@1.21.4
-- @modern-js/generator-common@2.4.9
-- @modern-js/generator-utils@2.4.9
+- Updated dependencies [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712d]
+  - @modern-js/utils@2.0.0-beta.1
+  - @modern-js/generator-common@3.0.0-beta.1
+  - @modern-js/generator-utils@3.0.0-beta.1
+
+## 2.0.0-beta.0
+
+### Major Changes
 
-## 1.21.3
+- dda38c9: chore: v2
 
 ### Patch Changes
 
-- @modern-js/generator-common@2.4.8
-- @modern-js/generator-utils@2.4.8
-- @modern-js/utils@1.21.3
+- Updated dependencies [edd1cfb1a]
+- Updated dependencies [cc971eabf]
+- Updated dependencies [5b9049f]
+- Updated dependencies [b8bbe036c]
+- Updated dependencies [d5a31df78]
+- Updated dependencies [dda38c9]
+- Updated dependencies [3bbea92b2]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be95]
+- Updated dependencies [14b712d]
+  - @modern-js/utils@2.0.0-beta.0
+  - @modern-js/generator-common@3.0.0-beta.0
+  - @modern-js/generator-utils@3.0.0-beta.0
 
 ## 1.21.2
 

package/dist/js/modern/module.js

@@ -1,7 +1,10 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 import { merge } from '@modern-js/utils/lodash';
-import { CodeSmith, GeneratorCore, MaterialsManager } from '@modern-js/codesmith';
-import { AppAPI, forEach } from '@modern-js/codesmith-api-app';
-import { i18n, ModuleNewActionSchema, ModuleActionFunctions, ModuleActionFunctionsDependencies, ModuleActionFunctionsDevDependencies, ModuleActionFunctionsPeerDependencies, ModuleNewActionGenerators, Solution } from '@modern-js/generator-common';
+import { CodeSmith } from '@modern-js/codesmith';
+import { FormilyAPI } from '@modern-js/codesmith-formily';
+import { i18n, getModuleNewActionSchema, ModuleActionFunctions, ModuleActionFunctionsDependencies, ModuleActionFunctionsDevDependencies, ModuleActionFunctionsPeerDependencies, ModuleNewActionGenerators, Solution } from '@modern-js/generator-common';
 import { getPackageManager, getModernPluginVersion } from '@modern-js/generator-utils';
 import { alreadyRepo, getGeneratorPath, hasEnabledFunction } from "./utils";
 export const ModuleNewAction = async options => {
@@ -14,13 +17,11 @@ export const ModuleNewAction = async options => {
     cwd = process.cwd()
   } = options;
   let UserConfig = {};
-
   try {
     UserConfig = JSON.parse(config);
   } catch (e) {
     throw new Error('config is not a valid json');
   }
-
   i18n.changeLanguage({
     locale: UserConfig.locale || locale
   });
@@ -28,66 +29,51 @@ export const ModuleNewAction = async options => {
     debug,
     registryUrl: registry
   });
-
   if (!alreadyRepo(cwd)) {
     smith.logger.warn('not valid modern.js repo');
   }
-
-  const mockGeneratorCore = new GeneratorCore({
-    logger: smith.logger,
-    materialsManager: new MaterialsManager(),
-    outputPath: ''
-  });
-  const appAPI = new AppAPI({
+  const formilyAPI = new FormilyAPI({
     materials: {},
     config: {},
     data: {},
     current: null
-  }, mockGeneratorCore);
+  });
   let hasOption = false;
-  const schema = forEach(ModuleNewActionSchema, schemaItem => {
-    if (ModuleActionFunctions.includes(schemaItem.key)) {
-      const enable = hasEnabledFunction(schemaItem.key, ModuleActionFunctionsDependencies, ModuleActionFunctionsDevDependencies, ModuleActionFunctionsPeerDependencies, cwd);
-      const {
-        when
-      } = schemaItem;
-      schemaItem.when = enable ? () => false : when;
-
-      if (!enable) {
-        hasOption = true;
-      }
+  const funcMap = {};
+  ModuleActionFunctions.forEach(func => {
+    const enable = hasEnabledFunction(func, ModuleActionFunctionsDependencies, ModuleActionFunctionsDevDependencies, ModuleActionFunctionsPeerDependencies, cwd);
+    funcMap[func] = enable;
+    if (!enable) {
+      hasOption = true;
     }
   });
-
   if (!hasOption) {
-    smith.logger.warn('no option can be enabled'); // eslint-disable-next-line no-process-exit
-
+    smith.logger.warn('no option can be enabled');
+    // eslint-disable-next-line no-process-exit
     process.exit(1);
   }
-
-  const ans = await appAPI.getInputBySchema(schema, UserConfig);
+  const ans = await formilyAPI.getInputBySchemaFunc(getModuleNewActionSchema, _objectSpread(_objectSpread({}, UserConfig), {}, {
+    funcMap
+  }));
   const actionType = ans.actionType;
   const action = ans[actionType];
   const generator = getGeneratorPath(ModuleNewActionGenerators[actionType][action], distTag);
-
   if (!generator) {
     throw new Error(`no valid option`);
   }
-
   const devDependency = ModuleActionFunctionsDevDependencies[action];
   const dependency = ModuleActionFunctionsDependencies[action];
   const peerDependency = ModuleActionFunctionsPeerDependencies[action];
-
   const getModulePluginVersion = packageName => {
     return getModernPluginVersion(Solution.Module, packageName, {
       registry,
       distTag
     });
   };
-
   const finalConfig = merge(UserConfig, ans, {
     locale: UserConfig.locale || locale,
-    packageManager: UserConfig.packageManager || (await getPackageManager(cwd))
+    packageManager: UserConfig.packageManager || (await getPackageManager(cwd)),
+    distTag
   }, {
     devDependencies: devDependency ? {
       [devDependency]: `${await getModulePluginVersion(devDependency)}`

package/dist/js/modern/monorepo.js

@@ -16,13 +16,11 @@ export const MonorepoNewAction = async options => {
     cwd = process.cwd()
   } = options;
   let UserConfig = {};
-
   try {
     UserConfig = JSON.parse(config);
   } catch (e) {
     throw new Error('config is not a valid json');
   }
-
   i18n.changeLanguage({
     locale: UserConfig.locale || locale
   });
@@ -30,12 +28,11 @@ export const MonorepoNewAction = async options => {
     debug,
     registryUrl: registry
   });
-
   if (!alreadyRepo(cwd)) {
     smith.logger.warn('not valid modern.js repo');
-  } // Determine if the plugin is a Monorepo dependency
-
+  }
 
+  // Determine if the plugin is a Monorepo dependency
   const plugins = plugin.map(plugin => {
     try {
       return path.join(require.resolve(plugin), '../../');
@@ -56,13 +53,11 @@ export const MonorepoNewAction = async options => {
     plugins
   });
   let generator = REPO_GENERATOR;
-
   if (process.env.CODESMITH_ENV === 'development') {
     generator = require.resolve(generator);
   } else if (distTag) {
     generator = `${generator}@${distTag}`;
   }
-
   const task = [{
     name: generator,
     config: finalConfig

package/dist/js/modern/mwa.js

@@ -1,7 +1,10 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 import { merge } from '@modern-js/utils/lodash';
-import { CodeSmith, GeneratorCore, MaterialsManager } from '@modern-js/codesmith';
-import { AppAPI, forEach } from '@modern-js/codesmith-api-app';
-import { MWANewActionSchema, MWAActionFunctions, MWAActionFunctionsDependencies, MWAActionFunctionsAppendTypeContent, MWAActionFunctionsDevDependencies, MWANewActionGenerators, i18n, Solution } from '@modern-js/generator-common';
+import { CodeSmith } from '@modern-js/codesmith';
+import { FormilyAPI } from '@modern-js/codesmith-formily';
+import { getMWANewActionSchema, MWAActionFunctions, MWAActionReactors, MWAActionFunctionsDependencies, MWAActionFunctionsAppendTypeContent, MWAActionReactorAppendTypeContent, MWAActionFunctionsDevDependencies, MWANewActionGenerators, i18n, Solution, MWAActionRefactorDependencies } from '@modern-js/generator-common';
 import { getModernPluginVersion, getPackageManager } from '@modern-js/generator-utils';
 import { alreadyRepo, getGeneratorPath, hasEnabledFunction } from "./utils";
 export const MWANewAction = async options => {
@@ -14,13 +17,11 @@ export const MWANewAction = async options => {
     cwd = process.cwd()
   } = options;
   let UserConfig = {};
-
   try {
     UserConfig = JSON.parse(config);
   } catch (e) {
     throw new Error('config is not a valid json');
   }
-
   i18n.changeLanguage({
     locale: UserConfig.locale || locale
   });
@@ -28,52 +29,47 @@ export const MWANewAction = async options => {
     debug,
     registryUrl: registry
   });
-
   if (!alreadyRepo(cwd)) {
     smith.logger.warn('not valid modern.js repo');
   }
-
-  const mockGeneratorCore = new GeneratorCore({
-    logger: smith.logger,
-    materialsManager: new MaterialsManager(),
-    outputPath: ''
-  });
-  const appAPI = new AppAPI({
+  const formilyAPI = new FormilyAPI({
     materials: {},
     config: {},
     data: {},
     current: null
-  }, mockGeneratorCore);
-  const schema = forEach(MWANewActionSchema, schemaItem => {
-    if (MWAActionFunctions.includes(schemaItem.key)) {
-      const enable = hasEnabledFunction(schemaItem.key, MWAActionFunctionsDependencies, MWAActionFunctionsDevDependencies, {}, cwd);
-      const {
-        when
-      } = schemaItem;
-      schemaItem.when = enable ? () => false : when;
-    }
   });
-  const ans = await appAPI.getInputBySchema(schema, UserConfig);
+  const funcMap = {};
+  MWAActionFunctions.forEach(func => {
+    const enable = hasEnabledFunction(func, MWAActionFunctionsDependencies, MWAActionFunctionsDevDependencies, {}, cwd);
+    funcMap[func] = enable;
+  });
+  const refactorMap = {};
+  MWAActionReactors.forEach(refactor => {
+    const enable = hasEnabledFunction(refactor, MWAActionRefactorDependencies, {}, {}, cwd);
+    refactorMap[refactor] = enable;
+  });
+  const ans = await formilyAPI.getInputBySchemaFunc(getMWANewActionSchema, _objectSpread(_objectSpread({}, UserConfig), {}, {
+    funcMap,
+    refactorMap
+  }));
   const actionType = ans.actionType;
   const action = ans[actionType];
   const generator = getGeneratorPath(MWANewActionGenerators[actionType][action], distTag);
-
   if (!generator) {
     throw new Error(`no valid option`);
   }
-
   const getMwaPluginVersion = packageName => {
     return getModernPluginVersion(Solution.MWA, packageName, {
       registry,
       distTag
     });
   };
-
   const devDependency = MWAActionFunctionsDevDependencies[action];
-  const dependency = MWAActionFunctionsDependencies[action];
+  const dependency = MWAActionFunctionsDependencies[action] || MWAActionRefactorDependencies[action];
   const finalConfig = merge(UserConfig, ans, {
     locale: UserConfig.locale || locale,
-    packageManager: UserConfig.packageManager || (await getPackageManager(cwd))
+    packageManager: UserConfig.packageManager || (await getPackageManager(cwd)),
+    distTag
   }, {
     devDependencies: devDependency ? {
       [devDependency]: `${await getMwaPluginVersion(devDependency)}`
@@ -81,7 +77,7 @@ export const MWANewAction = async options => {
     dependencies: dependency ? {
       [dependency]: `${await getMwaPluginVersion(dependency)}`
     } : {},
-    appendTypeContent: MWAActionFunctionsAppendTypeContent[action]
+    appendTypeContent: MWAActionFunctionsAppendTypeContent[action] || MWAActionReactorAppendTypeContent[action]
   });
   const task = [{
     name: generator,

package/dist/js/modern/utils/index.js

@@ -12,11 +12,9 @@ export const readJson = jsonPath => {
   if (!fs.existsSync(jsonPath)) {
     return {};
   }
-
   const jsonStr = fs.readFileSync(jsonPath, {
     encoding: 'utf8'
   });
-
   try {
     return json5.parse(jsonStr);
   } catch (error) {
@@ -26,29 +24,21 @@ export const readJson = jsonPath => {
 export function hasEnabledFunction(action, dependencies, devDependencies, peerDependencies, cwd) {
   const packageJsonPath = path.normalize(`${cwd}/package.json`);
   const packageJson = readJson(packageJsonPath);
-
   if (!dependencies[action] && !devDependencies[action]) {
     return false;
   }
-
   if (dependencies[action]) {
     var _packageJson$dependen;
-
     return (_packageJson$dependen = packageJson.dependencies) === null || _packageJson$dependen === void 0 ? void 0 : _packageJson$dependen[dependencies[action]];
   }
-
   if (peerDependencies[action]) {
     var _packageJson$peerDepe;
-
     return (_packageJson$peerDepe = packageJson.peerDependencies) === null || _packageJson$peerDepe === void 0 ? void 0 : _packageJson$peerDepe[peerDependencies[action]];
   }
-
   if (!peerDependencies[action] && devDependencies[action]) {
     var _packageJson$devDepen;
-
     return (_packageJson$devDepen = packageJson.devDependencies) === null || _packageJson$devDepen === void 0 ? void 0 : _packageJson$devDepen[devDependencies[action]];
   }
-
   return false;
 }
 export function getGeneratorPath(generator, distTag) {
@@ -57,6 +47,5 @@ export function getGeneratorPath(generator, distTag) {
   } else if (distTag) {
     return `${generator}@${distTag}`;
   }
-
   return generator;
 }

package/dist/js/node/index.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _utils = require("./utils");
-
 Object.keys(_utils).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _utils[key]) return;
@@ -16,9 +14,7 @@ Object.keys(_utils).forEach(function (key) {
     }
   });
 });
-
 var _mwa = require("./mwa");
-
 Object.keys(_mwa).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _mwa[key]) return;
@@ -29,9 +25,7 @@ Object.keys(_mwa).forEach(function (key) {
     }
   });
 });
-
 var _module = require("./module");
-
 Object.keys(_module).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _module[key]) return;
@@ -42,9 +36,7 @@ Object.keys(_module).forEach(function (key) {
     }
   });
 });
-
 var _monorepo = require("./monorepo");
-
 Object.keys(_monorepo).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _monorepo[key]) return;

package/dist/js/node/module.js

@@ -4,19 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ModuleNewAction = void 0;
-
 var _lodash = require("@modern-js/utils/lodash");
-
 var _codesmith = require("@modern-js/codesmith");
-
-var _codesmithApiApp = require("@modern-js/codesmith-api-app");
-
+var _codesmithFormily = require("@modern-js/codesmith-formily");
 var _generatorCommon = require("@modern-js/generator-common");
-
 var _generatorUtils = require("@modern-js/generator-utils");
-
 var _utils = require("./utils");
-
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 const ModuleNewAction = async options => {
   const {
     locale = 'zh',
@@ -27,81 +23,63 @@ const ModuleNewAction = async options => {
     cwd = process.cwd()
   } = options;
   let UserConfig = {};
-
   try {
     UserConfig = JSON.parse(config);
   } catch (e) {
     throw new Error('config is not a valid json');
   }
-
   _generatorCommon.i18n.changeLanguage({
     locale: UserConfig.locale || locale
   });
-
   const smith = new _codesmith.CodeSmith({
     debug,
     registryUrl: registry
   });
-
   if (!(0, _utils.alreadyRepo)(cwd)) {
     smith.logger.warn('not valid modern.js repo');
   }
-
-  const mockGeneratorCore = new _codesmith.GeneratorCore({
-    logger: smith.logger,
-    materialsManager: new _codesmith.MaterialsManager(),
-    outputPath: ''
-  });
-  const appAPI = new _codesmithApiApp.AppAPI({
+  const formilyAPI = new _codesmithFormily.FormilyAPI({
     materials: {},
     config: {},
     data: {},
     current: null
-  }, mockGeneratorCore);
+  });
   let hasOption = false;
-  const schema = (0, _codesmithApiApp.forEach)(_generatorCommon.ModuleNewActionSchema, schemaItem => {
-    if (_generatorCommon.ModuleActionFunctions.includes(schemaItem.key)) {
-      const enable = (0, _utils.hasEnabledFunction)(schemaItem.key, _generatorCommon.ModuleActionFunctionsDependencies, _generatorCommon.ModuleActionFunctionsDevDependencies, _generatorCommon.ModuleActionFunctionsPeerDependencies, cwd);
-      const {
-        when
-      } = schemaItem;
-      schemaItem.when = enable ? () => false : when;
-
-      if (!enable) {
-        hasOption = true;
-      }
+  const funcMap = {};
+  _generatorCommon.ModuleActionFunctions.forEach(func => {
+    const enable = (0, _utils.hasEnabledFunction)(func, _generatorCommon.ModuleActionFunctionsDependencies, _generatorCommon.ModuleActionFunctionsDevDependencies, _generatorCommon.ModuleActionFunctionsPeerDependencies, cwd);
+    funcMap[func] = enable;
+    if (!enable) {
+      hasOption = true;
     }
   });
-
   if (!hasOption) {
-    smith.logger.warn('no option can be enabled'); // eslint-disable-next-line no-process-exit
-
+    smith.logger.warn('no option can be enabled');
+    // eslint-disable-next-line no-process-exit
     process.exit(1);
   }
-
-  const ans = await appAPI.getInputBySchema(schema, UserConfig);
+  const ans = await formilyAPI.getInputBySchemaFunc(_generatorCommon.getModuleNewActionSchema, _objectSpread(_objectSpread({}, UserConfig), {}, {
+    funcMap
+  }));
   const actionType = ans.actionType;
   const action = ans[actionType];
   const generator = (0, _utils.getGeneratorPath)(_generatorCommon.ModuleNewActionGenerators[actionType][action], distTag);
-
   if (!generator) {
     throw new Error(`no valid option`);
   }
-
   const devDependency = _generatorCommon.ModuleActionFunctionsDevDependencies[action];
   const dependency = _generatorCommon.ModuleActionFunctionsDependencies[action];
   const peerDependency = _generatorCommon.ModuleActionFunctionsPeerDependencies[action];
-
   const getModulePluginVersion = packageName => {
     return (0, _generatorUtils.getModernPluginVersion)(_generatorCommon.Solution.Module, packageName, {
       registry,
       distTag
     });
   };
-
   const finalConfig = (0, _lodash.merge)(UserConfig, ans, {
     locale: UserConfig.locale || locale,
-    packageManager: UserConfig.packageManager || (await (0, _generatorUtils.getPackageManager)(cwd))
+    packageManager: UserConfig.packageManager || (await (0, _generatorUtils.getPackageManager)(cwd)),
+    distTag
   }, {
     devDependencies: devDependency ? {
       [devDependency]: `${await getModulePluginVersion(devDependency)}`
@@ -125,5 +103,4 @@ const ModuleNewAction = async options => {
     pwd: cwd
   });
 };
-
 exports.ModuleNewAction = ModuleNewAction;

package/dist/js/node/monorepo.js

@@ -4,23 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MonorepoNewAction = void 0;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _lodash = require("@modern-js/utils/lodash");
-
 var _codesmith = require("@modern-js/codesmith");
-
 var _generatorCommon = require("@modern-js/generator-common");
-
 var _generatorUtils = require("@modern-js/generator-utils");
-
 var _utils = require("./utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const REPO_GENERATOR = '@modern-js/repo-generator';
-
 const MonorepoNewAction = async options => {
   const {
     locale = 'zh',
@@ -32,27 +23,23 @@ const MonorepoNewAction = async options => {
     cwd = process.cwd()
   } = options;
   let UserConfig = {};
-
   try {
     UserConfig = JSON.parse(config);
   } catch (e) {
     throw new Error('config is not a valid json');
   }
-
   _generatorCommon.i18n.changeLanguage({
     locale: UserConfig.locale || locale
   });
-
   const smith = new _codesmith.CodeSmith({
     debug,
     registryUrl: registry
   });
-
   if (!(0, _utils.alreadyRepo)(cwd)) {
     smith.logger.warn('not valid modern.js repo');
-  } // Determine if the plugin is a Monorepo dependency
-
+  }
 
+  // Determine if the plugin is a Monorepo dependency
   const plugins = plugin.map(plugin => {
     try {
       return _path.default.join(require.resolve(plugin), '../../');
@@ -73,13 +60,11 @@ const MonorepoNewAction = async options => {
     plugins
   });
   let generator = REPO_GENERATOR;
-
   if (process.env.CODESMITH_ENV === 'development') {
     generator = require.resolve(generator);
   } else if (distTag) {
     generator = `${generator}@${distTag}`;
   }
-
   const task = [{
     name: generator,
     config: finalConfig
@@ -92,5 +77,4 @@ const MonorepoNewAction = async options => {
     pwd: cwd
   });
 };
-
 exports.MonorepoNewAction = MonorepoNewAction;

package/dist/js/node/mwa.js

@@ -4,19 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MWANewAction = void 0;
-
 var _lodash = require("@modern-js/utils/lodash");
-
 var _codesmith = require("@modern-js/codesmith");
-
-var _codesmithApiApp = require("@modern-js/codesmith-api-app");
-
+var _codesmithFormily = require("@modern-js/codesmith-formily");
 var _generatorCommon = require("@modern-js/generator-common");
-
 var _generatorUtils = require("@modern-js/generator-utils");
-
 var _utils = require("./utils");
-
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 const MWANewAction = async options => {
   const {
     locale = 'zh',
@@ -27,67 +23,59 @@ const MWANewAction = async options => {
     cwd = process.cwd()
   } = options;
   let UserConfig = {};
-
   try {
     UserConfig = JSON.parse(config);
   } catch (e) {
     throw new Error('config is not a valid json');
   }
-
   _generatorCommon.i18n.changeLanguage({
     locale: UserConfig.locale || locale
   });
-
   const smith = new _codesmith.CodeSmith({
     debug,
     registryUrl: registry
   });
-
   if (!(0, _utils.alreadyRepo)(cwd)) {
     smith.logger.warn('not valid modern.js repo');
   }
-
-  const mockGeneratorCore = new _codesmith.GeneratorCore({
-    logger: smith.logger,
-    materialsManager: new _codesmith.MaterialsManager(),
-    outputPath: ''
-  });
-  const appAPI = new _codesmithApiApp.AppAPI({
+  const formilyAPI = new _codesmithFormily.FormilyAPI({
     materials: {},
     config: {},
     data: {},
     current: null
-  }, mockGeneratorCore);
-  const schema = (0, _codesmithApiApp.forEach)(_generatorCommon.MWANewActionSchema, schemaItem => {
-    if (_generatorCommon.MWAActionFunctions.includes(schemaItem.key)) {
-      const enable = (0, _utils.hasEnabledFunction)(schemaItem.key, _generatorCommon.MWAActionFunctionsDependencies, _generatorCommon.MWAActionFunctionsDevDependencies, {}, cwd);
-      const {
-        when
-      } = schemaItem;
-      schemaItem.when = enable ? () => false : when;
-    }
   });
-  const ans = await appAPI.getInputBySchema(schema, UserConfig);
+  const funcMap = {};
+  _generatorCommon.MWAActionFunctions.forEach(func => {
+    const enable = (0, _utils.hasEnabledFunction)(func, _generatorCommon.MWAActionFunctionsDependencies, _generatorCommon.MWAActionFunctionsDevDependencies, {}, cwd);
+    funcMap[func] = enable;
+  });
+  const refactorMap = {};
+  _generatorCommon.MWAActionReactors.forEach(refactor => {
+    const enable = (0, _utils.hasEnabledFunction)(refactor, _generatorCommon.MWAActionRefactorDependencies, {}, {}, cwd);
+    refactorMap[refactor] = enable;
+  });
+  const ans = await formilyAPI.getInputBySchemaFunc(_generatorCommon.getMWANewActionSchema, _objectSpread(_objectSpread({}, UserConfig), {}, {
+    funcMap,
+    refactorMap
+  }));
   const actionType = ans.actionType;
   const action = ans[actionType];
   const generator = (0, _utils.getGeneratorPath)(_generatorCommon.MWANewActionGenerators[actionType][action], distTag);
-
   if (!generator) {
     throw new Error(`no valid option`);
   }
-
   const getMwaPluginVersion = packageName => {
     return (0, _generatorUtils.getModernPluginVersion)(_generatorCommon.Solution.MWA, packageName, {
       registry,
       distTag
     });
   };
-
   const devDependency = _generatorCommon.MWAActionFunctionsDevDependencies[action];
-  const dependency = _generatorCommon.MWAActionFunctionsDependencies[action];
+  const dependency = _generatorCommon.MWAActionFunctionsDependencies[action] || _generatorCommon.MWAActionRefactorDependencies[action];
   const finalConfig = (0, _lodash.merge)(UserConfig, ans, {
     locale: UserConfig.locale || locale,
-    packageManager: UserConfig.packageManager || (await (0, _generatorUtils.getPackageManager)(cwd))
+    packageManager: UserConfig.packageManager || (await (0, _generatorUtils.getPackageManager)(cwd)),
+    distTag
   }, {
     devDependencies: devDependency ? {
       [devDependency]: `${await getMwaPluginVersion(devDependency)}`
@@ -95,7 +83,7 @@ const MWANewAction = async options => {
     dependencies: dependency ? {
       [dependency]: `${await getMwaPluginVersion(dependency)}`
     } : {},
-    appendTypeContent: _generatorCommon.MWAActionFunctionsAppendTypeContent[action]
+    appendTypeContent: _generatorCommon.MWAActionFunctionsAppendTypeContent[action] || _generatorCommon.MWAActionReactorAppendTypeContent[action]
   });
   const task = [{
     name: generator,
@@ -109,5 +97,4 @@ const MWANewAction = async options => {
     pwd: cwd
   });
 };
-
 exports.MWANewAction = MWANewAction;

package/dist/js/node/utils/index.js

@@ -7,15 +7,10 @@ exports.alreadyRepo = alreadyRepo;
 exports.getGeneratorPath = getGeneratorPath;
 exports.hasEnabledFunction = hasEnabledFunction;
 exports.readJson = void 0;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _utils = require("@modern-js/utils");
-
 var _generatorUtils = require("@modern-js/generator-utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function alreadyRepo(cwd = process.cwd()) {
   try {
     return _generatorUtils.fs.existsSync(_path.default.resolve(cwd, 'package.json'));
@@ -23,61 +18,45 @@ function alreadyRepo(cwd = process.cwd()) {
     return false;
   }
 }
-
 const readJson = jsonPath => {
   if (!_generatorUtils.fs.existsSync(jsonPath)) {
     return {};
   }
-
   const jsonStr = _generatorUtils.fs.readFileSync(jsonPath, {
     encoding: 'utf8'
   });
-
   try {
     return _utils.json5.parse(jsonStr);
   } catch (error) {
     throw Error(`${jsonPath} is not a valid json, please check and try again.`);
   }
 };
-
 exports.readJson = readJson;
-
 function hasEnabledFunction(action, dependencies, devDependencies, peerDependencies, cwd) {
   const packageJsonPath = _path.default.normalize(`${cwd}/package.json`);
-
   const packageJson = readJson(packageJsonPath);
-
   if (!dependencies[action] && !devDependencies[action]) {
     return false;
   }
-
   if (dependencies[action]) {
     var _packageJson$dependen;
-
     return (_packageJson$dependen = packageJson.dependencies) === null || _packageJson$dependen === void 0 ? void 0 : _packageJson$dependen[dependencies[action]];
   }
-
   if (peerDependencies[action]) {
     var _packageJson$peerDepe;
-
     return (_packageJson$peerDepe = packageJson.peerDependencies) === null || _packageJson$peerDepe === void 0 ? void 0 : _packageJson$peerDepe[peerDependencies[action]];
   }
-
   if (!peerDependencies[action] && devDependencies[action]) {
     var _packageJson$devDepen;
-
     return (_packageJson$devDepen = packageJson.devDependencies) === null || _packageJson$devDepen === void 0 ? void 0 : _packageJson$devDepen[devDependencies[action]];
   }
-
   return false;
 }
-
 function getGeneratorPath(generator, distTag) {
   if (process.env.CODESMITH_ENV === 'development') {
     return _path.default.dirname(require.resolve(generator));
   } else if (distTag) {
     return `${generator}@${distTag}`;
   }
-
   return generator;
 }

package/dist/types/utils/index.d.ts

@@ -1,5 +1,5 @@
-import { ActionFunction } from '@modern-js/generator-common';
+import { ActionFunction, ActionRefactor } from '@modern-js/generator-common';
 export declare function alreadyRepo(cwd?: string): boolean;
 export declare const readJson: (jsonPath: string) => any;
-export declare function hasEnabledFunction(action: ActionFunction, dependencies: Record<string, string>, devDependencies: Record<string, string>, peerDependencies: Record<string, string>, cwd: string): any;
+export declare function hasEnabledFunction(action: ActionFunction | ActionRefactor, dependencies: Record<string, string>, devDependencies: Record<string, string>, peerDependencies: Record<string, string>, cwd: string): any;
 export declare function getGeneratorPath(generator: string, distTag: string): string;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.21.5",
+  "version": "2.0.0-beta.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -28,19 +28,19 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/codesmith": "1.6.3",
-    "@modern-js/codesmith-api-app": "1.6.3",
-    "@modern-js/generator-common": "2.4.10",
-    "@modern-js/generator-utils": "2.4.10",
-    "@modern-js/utils": "1.21.5"
+    "@modern-js/codesmith": "2.0.0",
+    "@modern-js/codesmith-formily": "2.0.0",
+    "@modern-js/generator-common": "3.0.0-beta.1",
+    "@modern-js/generator-utils": "3.0.0-beta.1",
+    "@modern-js/utils": "2.0.0-beta.1"
   },
   "devDependencies": {
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",
     "typescript": "^4",
-    "@scripts/build": "1.21.5",
-    "@scripts/jest-config": "1.21.5"
+    "@scripts/build": "2.0.0-beta.1",
+    "@scripts/jest-config": "2.0.0-beta.1"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -52,32 +52,9 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "wireit": {
-    "build": {
-      "command": "modern build",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json"
-      ],
-      "output": [
-        "dist/**/*"
-      ]
-    },
-    "test": {
-      "command": "jest --passWithNoTests",
-      "files": [
-        "src/**/*",
-        "tsconfig.json",
-        "package.json",
-        "tests/**/*"
-      ],
-      "output": []
-    }
-  },
   "scripts": {
     "new": "modern new",
-    "build": "wireit",
-    "test": "wireit"
+    "build": "modern build",
+    "test": "jest --passWithNoTests"
   }
 }