@modern-js/repo-generator 3.3.21 → 3.3.23

package/dist/index.js

@@ -84031,17 +84031,14 @@ var MWAActionTypesMap = {
   [ActionType.Function]: MWAActionFunctions,
   [ActionType.Refactor]: MWAActionReactors
 };
-var getMWANewActionSchema = (extra = {}) => {
-  const { funcMap = {}, refactorMap = {} } = extra;
-  const funcs = MWAActionFunctions.filter((func) => !funcMap[func]);
-  const refactors = MWAActionReactors.filter((reactor) => !refactorMap[reactor]);
+var getMWANewActionSchema = () => {
   return {
     type: "object",
     properties: {
       actionType: {
         type: "string",
         title: i18n2.t(localeKeys2.action.self),
-        enum: MWAActionTypes.filter((type) => type === ActionType.Function ? funcs.length > 0 : true).filter((type) => type === ActionType.Refactor ? refactors.length > 0 : true).map((type) => ({
+        enum: MWAActionTypes.map((type) => ({
           value: type,
           label: ActionTypeText[type](),
           type: [
@@ -84072,7 +84069,7 @@ var getMWANewActionSchema = (extra = {}) => {
       [ActionType.Function]: {
         type: "string",
         title: ActionTypeQuestionText[ActionType.Function](),
-        enum: funcs.map((func) => ({
+        enum: MWAActionFunctions.map((func) => ({
           value: func,
           label: ActionFunctionText[func]()
         })),
@@ -84092,7 +84089,7 @@ var getMWANewActionSchema = (extra = {}) => {
       [ActionType.Refactor]: {
         type: "string",
         title: ActionTypeQuestionText[ActionType.Refactor](),
-        enum: refactors.map((refactor) => ({
+        enum: MWAActionReactors.map((refactor) => ({
           value: refactor,
           label: ActionRefactorText[refactor]()
         })),
@@ -84215,8 +84212,7 @@ var ModuleActionFunctions = [
 var ModuleActionTypesMap = {
   [ActionType.Function]: ModuleActionFunctions
 };
-var getModuleNewActionSchema = (extra = {}) => {
-  const { funcMap = {} } = extra;
+var getModuleNewActionSchema = () => {
   return {
     type: "object",
     properties: {
@@ -84234,7 +84230,7 @@ var getModuleNewActionSchema = (extra = {}) => {
       [ActionType.Function]: {
         type: "string",
         title: ActionTypeQuestionText[ActionType.Function](),
-        enum: ModuleActionFunctions.filter((func) => !funcMap[func]).map((func) => ({
+        enum: ModuleActionFunctions.map((func) => ({
           value: func,
           label: ActionFunctionText[func]()
         })),
@@ -85804,6 +85800,14 @@ async function usePluginNameExport(solution, options) {
 
 // ../../new-action/dist/esm/mwa.js
 var import_lodash10 = require("@modern-js/utils/lodash");
+
+// ../../new-action/dist/esm/constants.js
+var enableAlreadyText = {
+  zh: "当前功能已开启，请确认对应插件依赖是否已安装。若需重新开启该功能，请移除插件依赖后再次尝试。",
+  en: "The current function has been enabled. Please confirm whether the corresponding plugin dependencies have been installed. If you need to re-enable this function, please remove the plugin dependencies and try again."
+};
+
+// ../../new-action/dist/esm/mwa.js
 var MWANewAction = async (options) => {
   const { locale = "zh", distTag = "", debug = false, registry: registry2 = "", config = "{}", cwd = process.cwd(), needInstall = true } = options;
   let UserConfig = {};
@@ -85812,8 +85816,9 @@ var MWANewAction = async (options) => {
   } catch (e) {
     throw new Error("config is not a valid json");
   }
+  const language = UserConfig.locale || locale;
   i18n2.changeLanguage({
-    locale: UserConfig.locale || locale
+    locale: language
   });
   const smith = new CodeSmith({
     debug,
@@ -85839,12 +85844,14 @@ var MWANewAction = async (options) => {
     refactorMap[refactor] = enable;
   });
   const ans = await formilyAPI.getInputBySchemaFunc(getMWANewActionSchema, {
-    ...UserConfig,
-    funcMap,
-    refactorMap
+    ...UserConfig
   });
   const actionType = ans.actionType;
   const action2 = ans[actionType];
+  if (actionType === ActionType.Function && funcMap[action2] || actionType === ActionType.Refactor && refactorMap[action2]) {
+    smith.logger.error(enableAlreadyText[language]);
+    return;
+  }
   const generator = getGeneratorPath2(MWANewActionGenerators[actionType][action2], distTag);
   if (!generator) {
     throw new Error(`no valid option`);
@@ -85906,8 +85913,9 @@ var ModuleNewAction = async (options) => {
   } catch (e) {
     throw new Error("config is not a valid json");
   }
+  const language = UserConfig.locale || locale;
   i18n2.changeLanguage({
-    locale: UserConfig.locale || locale
+    locale: language
   });
   const smith = new CodeSmith({
     debug,
@@ -85936,11 +85944,14 @@ var ModuleNewAction = async (options) => {
     process.exit(1);
   }
   const ans = await formilyAPI.getInputBySchemaFunc(getModuleNewActionSchema, {
-    ...UserConfig,
-    funcMap
+    ...UserConfig
   });
   const actionType = ans.actionType;
   const action2 = ans[actionType];
+  if (actionType === ActionType.Function && funcMap[action2]) {
+    smith.logger.error(enableAlreadyText[language]);
+    return;
+  }
   const generator = getGeneratorPath2(ModuleNewActionGenerators[actionType][action2], distTag);
   if (!generator) {
     throw new Error(`no valid option`);

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.3.21",
+  "version": "3.3.23",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -23,7 +23,7 @@
     "/dist/index.js"
   ],
   "dependencies": {
-    "@modern-js/utils": "2.49.3"
+    "@modern-js/utils": "2.50.0"
   },
   "devDependencies": {
     "@modern-js/codesmith": "2.3.5",
@@ -32,15 +32,15 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@modern-js/base-generator": "3.3.21",
-    "@modern-js/generator-common": "3.3.21",
-    "@modern-js/generator-plugin": "3.3.21",
-    "@modern-js/generator-utils": "3.3.21",
-    "@modern-js/monorepo-generator": "3.3.21",
-    "@modern-js/module-generator": "3.3.21",
-    "@modern-js/mwa-generator": "3.3.21",
-    "@scripts/build": "2.49.3",
-    "@scripts/jest-config": "2.49.3"
+    "@modern-js/generator-common": "3.3.23",
+    "@modern-js/generator-utils": "3.3.23",
+    "@modern-js/base-generator": "3.3.23",
+    "@modern-js/module-generator": "3.3.23",
+    "@modern-js/monorepo-generator": "3.3.23",
+    "@scripts/build": "2.50.0",
+    "@modern-js/mwa-generator": "3.3.23",
+    "@scripts/jest-config": "2.50.0",
+    "@modern-js/generator-plugin": "3.3.23"
   },
   "sideEffects": false,
   "publishConfig": {