@modern-js/new-action 1.21.2 → 2.0.0-beta.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @modern-js/new-action
 
+## 2.0.0-beta.0
+
+### Major Changes
+
+- dda38c9: chore: v2
+
+### Patch Changes
+
+- 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
 
 ### Patch Changes

package/dist/js/modern/module.js

@@ -1,7 +1,13 @@
+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 => {
@@ -33,29 +39,20 @@ export const ModuleNewAction = async options => {
     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;
+  const funcMap = {};
+  ModuleActionFunctions.forEach(func => {
+    const enable = hasEnabledFunction(func, ModuleActionFunctionsDependencies, ModuleActionFunctionsDevDependencies, ModuleActionFunctionsPeerDependencies, cwd);
+    funcMap[func] = enable;
 
-      if (!enable) {
-        hasOption = true;
-      }
+    if (!enable) {
+      hasOption = true;
     }
   });
 
@@ -65,7 +62,9 @@ export const ModuleNewAction = async options => {
     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);
@@ -80,7 +79,8 @@ export const ModuleNewAction = async options => {
 
   const getModulePluginVersion = packageName => {
     return getModernPluginVersion(Solution.Module, packageName, {
-      registry
+      registry,
+      distTag
     });
   };
 

package/dist/js/modern/mwa.js

@@ -1,7 +1,13 @@
+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 => {
@@ -33,27 +39,26 @@ export const MWANewAction = async options => {
     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);
@@ -64,12 +69,13 @@ export const MWANewAction = async options => {
 
   const getMwaPluginVersion = packageName => {
     return getModernPluginVersion(Solution.MWA, packageName, {
-      registry
+      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))
@@ -80,7 +86,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/test.js

@@ -0,0 +1,4 @@
+import { MWANewAction } from ".";
+MWANewAction({
+  locale: 'zh'
+});

package/dist/js/node/module.js

@@ -9,7 +9,7 @@ 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");
 
@@ -17,6 +17,12 @@ 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',
@@ -47,29 +53,21 @@ const ModuleNewAction = async options => {
     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;
     }
   });
 
@@ -79,7 +77,9 @@ const ModuleNewAction = async options => {
     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);
@@ -94,7 +94,8 @@ const ModuleNewAction = async options => {
 
   const getModulePluginVersion = packageName => {
     return (0, _generatorUtils.getModernPluginVersion)(_generatorCommon.Solution.Module, packageName, {
-      registry
+      registry,
+      distTag
     });
   };
 

package/dist/js/node/mwa.js

@@ -9,7 +9,7 @@ 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");
 
@@ -17,6 +17,12 @@ 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',
@@ -47,27 +53,30 @@ const MWANewAction = async options => {
     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);
@@ -78,12 +87,13 @@ const MWANewAction = async options => {
 
   const getMwaPluginVersion = packageName => {
     return (0, _generatorUtils.getModernPluginVersion)(_generatorCommon.Solution.MWA, packageName, {
-      registry
+      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))
@@ -94,7 +104,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,

package/dist/js/node/test.js

@@ -0,0 +1,7 @@
+"use strict";
+
+var _ = require(".");
+
+(0, _.MWANewAction)({
+  locale: 'zh'
+});

package/dist/types/test.d.ts

@@ -0,0 +1 @@
+export {};

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.2",
+  "version": "2.0.0-beta.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -28,15 +28,15 @@
   },
   "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.7",
-    "@modern-js/generator-utils": "2.4.7",
-    "@modern-js/utils": "1.21.2"
+    "@modern-js/codesmith": "2.0.0",
+    "@modern-js/codesmith-formily": "2.0.0",
+    "@modern-js/generator-common": "3.0.0-beta.0",
+    "@modern-js/generator-utils": "3.0.0-beta.0",
+    "@modern-js/utils": "2.0.0-beta.0"
   },
   "devDependencies": {
-    "@scripts/build": "1.21.2",
-    "@scripts/jest-config": "1.21.2",
+    "@scripts/build": "2.0.0-beta.0",
+    "@scripts/jest-config": "2.0.0-beta.0",
     "@types/jest": "^27",
     "@types/node": "^14",
     "jest": "^27",
@@ -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"
   }
 }