@sap-ux/ui5-application-inquirer 0.14.26 → 0.14.28

package/dist/prompts/index.d.ts

@@ -10,5 +10,5 @@ import type { CdsUi5PluginInfo } from '@sap-ux/project-access';
  * @param [isYUI] - optional, default is `false`. Changes the behaviour of some validation since YUI does not re-validate prompts that may be inter-dependant.
  * @returns the prompts
  */
-export declare function getQuestions(ui5Versions: UI5Version[], promptOptions?: UI5ApplicationPromptOptions, capCdsInfo?: CdsUi5PluginInfo, isYUI?: boolean): UI5ApplicationQuestion[];
+export declare function getQuestions(ui5Versions: UI5Version[], promptOptions?: UI5ApplicationPromptOptions, capCdsInfo?: CdsUi5PluginInfo, isYUI?: boolean): Promise<UI5ApplicationQuestion[]>;
 //# sourceMappingURL=index.d.ts.map

package/dist/prompts/index.js

@@ -1,11 +1,17 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getQuestions = getQuestions;
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
 // Nullish coalescing operator lint warnings disabled as its not appropriate in most cases where empty strings are not considered valid
+const os_1 = __importDefault(require("os"));
+const path_1 = require("path");
 const inquirer_common_1 = require("@sap-ux/inquirer-common");
 const prompts1_1 = require("./prompts1");
 const prompts2_1 = require("./prompts2");
+const project_input_validator_1 = require("@sap-ux/project-input-validator");
 const types_1 = require("../types");
 const prompt_helpers_1 = require("./prompt-helpers");
 /**
@@ -17,21 +23,28 @@ const prompt_helpers_1 = require("./prompt-helpers");
  * @param [isYUI] - optional, default is `false`. Changes the behaviour of some validation since YUI does not re-validate prompts that may be inter-dependant.
  * @returns the prompts
  */
-function getQuestions(ui5Versions, promptOptions, capCdsInfo, isYUI = false) {
+async function getQuestions(ui5Versions, promptOptions, capCdsInfo, isYUI = false) {
     // Set shared defaults
     const appName = typeof promptOptions?.[types_1.promptNames.name]?.default === 'string'
         ? promptOptions[types_1.promptNames.name].default
         : promptOptions?.[types_1.promptNames.name]?.defaultValue;
-    const targetDir = typeof promptOptions?.[types_1.promptNames.targetFolder]?.default === 'string'
+    let targetDir = typeof promptOptions?.[types_1.promptNames.targetFolder]?.default === 'string'
         ? promptOptions[types_1.promptNames.targetFolder].default // Default functions will be applied later, these replace the existing defaults
         : promptOptions?.[types_1.promptNames.targetFolder]?.defaultValue ?? process.cwd();
+    const shouldValidateFioriAppFolder = promptOptions?.[types_1.promptNames.targetFolder]?.validateFioriAppFolder;
+    if (shouldValidateFioriAppFolder) {
+        const isValidFolder = await (0, project_input_validator_1.validateFioriAppProjectFolder)(targetDir);
+        if (isValidFolder !== true) {
+            targetDir = (0, path_1.join)(os_1.default.homedir(), 'projects');
+        }
+    }
     const isCapProject = !!capCdsInfo;
     const keyedPrompts = {
         [types_1.promptNames.name]: (0, prompts1_1.getNamePrompt)(targetDir, isCapProject, appName, isYUI),
         [types_1.promptNames.title]: (0, prompts1_1.getTitlePrompt)(),
         [types_1.promptNames.namespace]: (0, prompts1_1.getNamespacePrompt)(appName),
         [types_1.promptNames.description]: (0, prompts1_1.getDescriptionPrompt)(),
-        [types_1.promptNames.targetFolder]: (0, prompts1_1.getTargetFolderPrompt)(targetDir, promptOptions?.[types_1.promptNames.targetFolder]?.validateFioriAppFolder),
+        [types_1.promptNames.targetFolder]: (0, prompts1_1.getTargetFolderPrompt)(targetDir, shouldValidateFioriAppFolder),
         [types_1.promptNames.ui5Version]: (0, prompts1_1.getUI5VersionPrompt)(ui5Versions, promptOptions?.ui5Version),
         [types_1.promptNames.enableTypeScript]: (0, prompts1_1.getEnableTypeScriptPrompt)(capCdsInfo),
         [types_1.promptNames.addDeployConfig]: (0, prompts1_1.getAddDeployConfigPrompt)(targetDir, promptOptions?.addDeployConfig, isCapProject),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/ui5-application-inquirer",
   "description": "Prompts module that can prompt users for inputs required for UI5 application writing",
-  "version": "0.14.26",
+  "version": "0.14.28",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -23,9 +23,9 @@
     "inquirer-autocomplete-prompt": "2.0.1",
     "lodash": "4.17.21",
     "semver": "7.5.4",
-    "@sap-ux/inquirer-common": "0.7.23",
+    "@sap-ux/inquirer-common": "0.7.24",
     "@sap-ux/project-access": "1.30.7",
-    "@sap-ux/project-input-validator": "0.6.11",
+    "@sap-ux/project-input-validator": "0.6.12",
     "@sap-ux/ui5-info": "0.12.0"
   },
   "devDependencies": {
@@ -35,7 +35,7 @@
     "@types/lodash": "4.14.202",
     "@types/semver": "7.5.4",
     "inquirer": "8.2.6",
-    "@sap-ux/cap-config-writer": "0.10.19"
+    "@sap-ux/cap-config-writer": "0.10.20"
   },
   "engines": {
     "node": ">=20.x"