@gadmin2n/cli 0.0.124 → 0.0.125

package/actions/new.action.js

@@ -43,9 +43,9 @@ class NewAction extends abstract_action_1.AbstractAction {
                 ? projectDirectory
                 : (0, path_1.join)(process.cwd(), projectDirectory);
             // Angular DevKit schematics 引擎始终把 --directory 当作相对于 cwd 的路径处理。
-            // 若用户传入绝对路径，需转换为相对路径再传给引擎，否则会被重复拼接 cwd。
-            if ((directoryOption === null || directoryOption === void 0 ? void 0 : directoryOption.value) && (0, path_1.isAbsolute)(directoryOption.value)) {
-                directoryOption.value = (0, path_1.relative)(process.cwd(), directoryOption.value);
+            // projectDirectory 已包含 appName（父目录 + appName），将其转为相对路径传给引擎。
+            if (directoryOption === null || directoryOption === void 0 ? void 0 : directoryOption.value) {
+                directoryOption.value = (0, path_1.relative)(process.cwd(), projectAbsDir);
             }
             yield generateApplicationFiles(inputs, options).catch(exports.exit);
             const shouldSkipInstall = options.some((option) => option.name === 'skip-install' && option.value === true);
@@ -198,8 +198,12 @@ exports.NewAction = NewAction;
 const getApplicationNameInput = (inputs) => inputs.find((input) => input.name === 'name');
 const getOptionByName = (inputs, option) => { var _a; return (_a = inputs.find((input) => input.name === option)) === null || _a === void 0 ? void 0 : _a.value; };
 const getProjectDirectory = (applicationName, directoryOption) => {
-    return ((directoryOption && directoryOption.value) ||
-        (0, formatting_1.normalizeToKebabOrSnakeCase)(applicationName.value));
+    const appName = (0, formatting_1.normalizeToKebabOrSnakeCase)(applicationName.value);
+    if (directoryOption === null || directoryOption === void 0 ? void 0 : directoryOption.value) {
+        // --directory 是父目录，项目实际创建在 <directory>/<appName> 下
+        return (0, path_1.join)(directoryOption.value, appName);
+    }
+    return appName;
 };
 const askForMissingInformation = (inputs, options) => __awaiter(void 0, void 0, void 0, function* () {
     console.info(ui_1.MESSAGES.PROJECT_INFORMATION_START);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gadmin2n/cli",
-  "version": "0.0.124",
+  "version": "0.0.125",
   "description": "Gadmin - modern, fast, powerful node.js web framework (@cli)",
   "publishConfig": {
     "access": "public"