@modern-js/new-action 2.49.4 → 2.50.0

package/dist/cjs/constants.js

@@ -0,0 +1,31 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var constants_exports = {};
+__export(constants_exports, {
+  enableAlreadyText: () => enableAlreadyText
+});
+module.exports = __toCommonJS(constants_exports);
+const 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."
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  enableAlreadyText
+});

package/dist/cjs/module.js

@@ -27,6 +27,7 @@ var import_codesmith_formily = require("@modern-js/codesmith-formily");
 var import_generator_common = require("@modern-js/generator-common");
 var import_generator_utils = require("@modern-js/generator-utils");
 var import_utils = require("./utils");
+var import_constants = require("./constants");
 const ModuleNewAction = async (options) => {
   const { locale = "zh", distTag = "", debug = false, registry = "", config = "{}", cwd = process.cwd(), needInstall = true } = options;
   let UserConfig = {};
@@ -35,8 +36,9 @@ const ModuleNewAction = async (options) => {
   } catch (e) {
     throw new Error("config is not a valid json");
   }
+  const language = UserConfig.locale || locale;
   import_generator_common.i18n.changeLanguage({
-    locale: UserConfig.locale || locale
+    locale: language
   });
   const smith = new import_codesmith.CodeSmith({
     debug,
@@ -65,11 +67,14 @@ const ModuleNewAction = async (options) => {
     process.exit(1);
   }
   const ans = await formilyAPI.getInputBySchemaFunc(import_generator_common.getModuleNewActionSchema, {
-    ...UserConfig,
-    funcMap
+    ...UserConfig
   });
   const actionType = ans.actionType;
   const action = ans[actionType];
+  if (actionType === import_generator_common.ActionType.Function && funcMap[action]) {
+    smith.logger.error(import_constants.enableAlreadyText[language]);
+    return;
+  }
   const generator = (0, import_utils.getGeneratorPath)(import_generator_common.ModuleNewActionGenerators[actionType][action], distTag);
   if (!generator) {
     throw new Error(`no valid option`);

package/dist/cjs/mwa.js

@@ -27,6 +27,7 @@ var import_codesmith_formily = require("@modern-js/codesmith-formily");
 var import_generator_common = require("@modern-js/generator-common");
 var import_generator_utils = require("@modern-js/generator-utils");
 var import_utils = require("./utils");
+var import_constants = require("./constants");
 const MWANewAction = async (options) => {
   const { locale = "zh", distTag = "", debug = false, registry = "", config = "{}", cwd = process.cwd(), needInstall = true } = options;
   let UserConfig = {};
@@ -35,8 +36,9 @@ const MWANewAction = async (options) => {
   } catch (e) {
     throw new Error("config is not a valid json");
   }
+  const language = UserConfig.locale || locale;
   import_generator_common.i18n.changeLanguage({
-    locale: UserConfig.locale || locale
+    locale: language
   });
   const smith = new import_codesmith.CodeSmith({
     debug,
@@ -62,12 +64,14 @@ const MWANewAction = async (options) => {
     refactorMap[refactor] = enable;
   });
   const ans = await formilyAPI.getInputBySchemaFunc(import_generator_common.getMWANewActionSchema, {
-    ...UserConfig,
-    funcMap,
-    refactorMap
+    ...UserConfig
   });
   const actionType = ans.actionType;
   const action = ans[actionType];
+  if (actionType === import_generator_common.ActionType.Function && funcMap[action] || actionType === import_generator_common.ActionType.Refactor && refactorMap[action]) {
+    smith.logger.error(import_constants.enableAlreadyText[language]);
+    return;
+  }
   const generator = (0, import_utils.getGeneratorPath)(import_generator_common.MWANewActionGenerators[actionType][action], distTag);
   if (!generator) {
     throw new Error(`no valid option`);

package/dist/esm/constants.js

@@ -0,0 +1,7 @@
+const 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."
+};
+export {
+  enableAlreadyText
+};

package/dist/esm/module.js

@@ -1,9 +1,10 @@
 import { merge } from "@modern-js/utils/lodash";
 import { CodeSmith } from "@modern-js/codesmith";
 import { FormilyAPI } from "@modern-js/codesmith-formily";
-import { i18n, getModuleNewActionSchema, ModuleActionFunctions, ModuleActionFunctionsDependencies, ModuleActionFunctionsDevDependencies, ModuleActionFunctionsPeerDependencies, ModuleNewActionGenerators, Solution, ModuleNewActionPluginName, ModuleNewActionPluginDependence } from "@modern-js/generator-common";
+import { i18n, getModuleNewActionSchema, ModuleActionFunctions, ModuleActionFunctionsDependencies, ModuleActionFunctionsDevDependencies, ModuleActionFunctionsPeerDependencies, ModuleNewActionGenerators, ActionType, Solution, ModuleNewActionPluginName, ModuleNewActionPluginDependence } from "@modern-js/generator-common";
 import { getPackageManager, getModernPluginVersion } from "@modern-js/generator-utils";
 import { alreadyRepo, getGeneratorPath, hasEnabledFunction, usePluginNameExport } from "./utils";
+import { enableAlreadyText } from "./constants";
 const ModuleNewAction = async (options) => {
   const { locale = "zh", distTag = "", debug = false, registry = "", config = "{}", cwd = process.cwd(), needInstall = true } = options;
   let UserConfig = {};
@@ -12,8 +13,9 @@ const ModuleNewAction = async (options) => {
   } catch (e) {
     throw new Error("config is not a valid json");
   }
+  const language = UserConfig.locale || locale;
   i18n.changeLanguage({
-    locale: UserConfig.locale || locale
+    locale: language
   });
   const smith = new CodeSmith({
     debug,
@@ -42,11 +44,14 @@ const ModuleNewAction = async (options) => {
     process.exit(1);
   }
   const ans = await formilyAPI.getInputBySchemaFunc(getModuleNewActionSchema, {
-    ...UserConfig,
-    funcMap
+    ...UserConfig
   });
   const actionType = ans.actionType;
   const action = ans[actionType];
+  if (actionType === ActionType.Function && funcMap[action]) {
+    smith.logger.error(enableAlreadyText[language]);
+    return;
+  }
   const generator = getGeneratorPath(ModuleNewActionGenerators[actionType][action], distTag);
   if (!generator) {
     throw new Error(`no valid option`);

package/dist/esm/mwa.js

@@ -1,9 +1,10 @@
 import { merge } from "@modern-js/utils/lodash";
 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, MWANewActionPluginName, MWANewActionPluginDependence } from "@modern-js/generator-common";
+import { getMWANewActionSchema, MWAActionFunctions, MWAActionReactors, MWAActionFunctionsDependencies, MWAActionFunctionsAppendTypeContent, MWAActionReactorAppendTypeContent, MWAActionFunctionsDevDependencies, MWANewActionGenerators, ActionType, i18n, Solution, MWAActionRefactorDependencies, MWANewActionPluginName, MWANewActionPluginDependence } from "@modern-js/generator-common";
 import { getModernPluginVersion, getPackageManager } from "@modern-js/generator-utils";
 import { alreadyRepo, getGeneratorPath, hasEnabledFunction, usePluginNameExport } from "./utils";
+import { enableAlreadyText } from "./constants";
 const MWANewAction = async (options) => {
   const { locale = "zh", distTag = "", debug = false, registry = "", config = "{}", cwd = process.cwd(), needInstall = true } = options;
   let UserConfig = {};
@@ -12,8 +13,9 @@ const MWANewAction = async (options) => {
   } catch (e) {
     throw new Error("config is not a valid json");
   }
+  const language = UserConfig.locale || locale;
   i18n.changeLanguage({
-    locale: UserConfig.locale || locale
+    locale: language
   });
   const smith = new CodeSmith({
     debug,
@@ -39,12 +41,14 @@ const MWANewAction = async (options) => {
     refactorMap[refactor] = enable;
   });
   const ans = await formilyAPI.getInputBySchemaFunc(getMWANewActionSchema, {
-    ...UserConfig,
-    funcMap,
-    refactorMap
+    ...UserConfig
   });
   const actionType = ans.actionType;
   const action = ans[actionType];
+  if (actionType === ActionType.Function && funcMap[action] || actionType === ActionType.Refactor && refactorMap[action]) {
+    smith.logger.error(enableAlreadyText[language]);
+    return;
+  }
   const generator = getGeneratorPath(MWANewActionGenerators[actionType][action], distTag);
   if (!generator) {
     throw new Error(`no valid option`);

package/dist/types/constants.d.ts

@@ -0,0 +1 @@
+export declare const enableAlreadyText: Record<string, string>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.49.4",
+  "version": "2.50.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -36,9 +36,9 @@
     "@modern-js/codesmith": "2.3.5",
     "@modern-js/codesmith-formily": "2.3.5",
     "@swc/helpers": "0.5.3",
-    "@modern-js/generator-common": "3.3.22",
-    "@modern-js/generator-utils": "3.3.22",
-    "@modern-js/utils": "2.49.4"
+    "@modern-js/generator-common": "3.3.23",
+    "@modern-js/utils": "2.50.0",
+    "@modern-js/generator-utils": "3.3.23"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -46,8 +46,8 @@
     "jest": "^29",
     "ts-node": "^10.9.1",
     "typescript": "^5",
-    "@scripts/jest-config": "2.49.4",
-    "@scripts/build": "2.49.4"
+    "@scripts/jest-config": "2.50.0",
+    "@scripts/build": "2.50.0"
   },
   "sideEffects": false,
   "publishConfig": {