@sap-ux/ui5-application-inquirer 0.14.39 → 0.15.1

package/dist/prompts/index.js

@@ -46,10 +46,10 @@ async function getQuestions(ui5Versions, promptOptions, capCdsInfo, isYUI = fals
         [types_1.promptNames.description]: (0, prompts1_1.getDescriptionPrompt)(),
         [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.enableTypeScript]: (0, prompts1_1.getEnableTypeScriptPrompt)(),
         [types_1.promptNames.addDeployConfig]: (0, prompts1_1.getAddDeployConfigPrompt)(targetDir, promptOptions?.addDeployConfig, isCapProject),
         [types_1.promptNames.addFlpConfig]: (0, prompts1_1.getAddFlpConfigPrompt)(promptOptions?.addFlpConfig),
-        [types_1.promptNames.enableVirtualEndpoints]: (0, prompts1_1.getEnableVirtualEndpoints)(capCdsInfo),
+        [types_1.promptNames.enableVirtualEndpoints]: (0, prompts1_1.getEnableVirtualEndpoints)(),
         [types_1.promptNames.showAdvanced]: (0, prompts2_1.getShowAdvancedPrompt)(),
         [types_1.promptNames.ui5Theme]: (0, prompts2_1.getUI5ThemePrompt)(),
         [types_1.promptNames.enableEslint]: (0, prompts2_1.getEnableEsLintPrompt)(),
@@ -57,7 +57,7 @@ async function getQuestions(ui5Versions, promptOptions, capCdsInfo, isYUI = fals
         [types_1.promptNames.skipAnnotations]: (0, prompts2_1.getSkipAnnotationsPrompt)()
     };
     // Hide not applicable prompts based on passed options or if this is a CAP project
-    let questions = (0, prompt_helpers_1.hidePrompts)(keyedPrompts, promptOptions, isCapProject);
+    let questions = (0, prompt_helpers_1.hidePrompts)(keyedPrompts, promptOptions, capCdsInfo);
     // Add an additional condition to 'advanced' prompts so they can be shown/hidden at runtime
     applyAdvancedOption(questions, promptOptions);
     // Apply extended `validate`, `additionalMessages` or override `default` prompt properties

package/dist/prompts/prompt-helpers.d.ts

@@ -1,4 +1,5 @@
 import { promptNames, type UI5ApplicationPromptOptions, type UI5ApplicationQuestion } from '../types';
+import type { CdsUi5PluginInfo } from '@sap-ux/project-access';
 /**
  * Tests if a directory with the specified `appName` exists at the path specified by `targetPath`.
  *
@@ -30,8 +31,8 @@ export declare function isVersionIncluded(version: string, minVersion: string):
  *
  * @param prompts Keyed prompts object containing all possible prompts
  * @param promptOptions prompt options
- * @param isCapProject if we are generating into a CAP project certain prompts may be removed
+ * @param capCdsInfo CDS UI5 plugin information
  * @returns the updated questions
  */
-export declare function hidePrompts(prompts: Record<promptNames, UI5ApplicationQuestion>, promptOptions?: UI5ApplicationPromptOptions, isCapProject?: boolean): UI5ApplicationQuestion[];
+export declare function hidePrompts(prompts: Record<promptNames, UI5ApplicationQuestion>, promptOptions?: UI5ApplicationPromptOptions, capCdsInfo?: CdsUi5PluginInfo): UI5ApplicationQuestion[];
 //# sourceMappingURL=prompt-helpers.d.ts.map

package/dist/prompts/prompt-helpers.js

@@ -61,11 +61,12 @@ function isVersionIncluded(version, minVersion) {
  *
  * @param prompts Keyed prompts object containing all possible prompts
  * @param promptOptions prompt options
- * @param isCapProject if we are generating into a CAP project certain prompts may be removed
+ * @param capCdsInfo CDS UI5 plugin information
  * @returns the updated questions
  */
-function hidePrompts(prompts, promptOptions, isCapProject = false) {
+function hidePrompts(prompts, promptOptions, capCdsInfo) {
     const questions = [];
+    const isCapProject = !!capCdsInfo;
     if (promptOptions ?? isCapProject) {
         Object.keys(prompts).forEach((key) => {
             const promptKey = key;
@@ -74,7 +75,10 @@ function hidePrompts(prompts, promptOptions, isCapProject = false) {
             const hidePrompt = typeof promptOpt?.hide === 'function' ? promptOpt.hide(isCapProject) : promptOpt?.hide ?? false;
             if (!hidePrompt &&
                 // Target directory is determined by the CAP project. `enableEsLint` and `targetFolder` are not available for CAP projects
-                !([types_1.promptNames.targetFolder, types_1.promptNames.enableEslint].includes(types_1.promptNames[promptKey]) && isCapProject)) {
+                !([types_1.promptNames.targetFolder, types_1.promptNames.enableEslint].includes(types_1.promptNames[promptKey]) &&
+                    isCapProject) &&
+                // `enableTypeScript` and `enableVirtualEndpoints` should not be shown for certain CAP projects i.e CAP Java
+                !([types_1.promptNames.enableTypeScript, types_1.promptNames.enableVirtualEndpoints].includes(types_1.promptNames[promptKey]) && (capCdsInfo ? !capCdsInfo?.hasMinCdsVersion : false))) {
                 questions.push(prompts[promptKey]);
             }
         });

package/dist/prompts/prompts1.d.ts

@@ -1,7 +1,6 @@
 import { promptNames } from '../types';
 import type { UI5Version } from '@sap-ux/ui5-info';
 import type { UI5ApplicationPromptOptions, UI5ApplicationQuestion } from '../types';
-import type { CdsUi5PluginInfo } from '@sap-ux/project-access';
 /**
  * Gets the `name` prompt.
  *
@@ -51,10 +50,9 @@ export declare function getUI5VersionPrompt(ui5Versions?: UI5Version[], ui5Versi
 /**
  * Get the `enableTypeScript` prompt.
  *
- * @param capCdsInfo CDS UI5 plugin information
  * @returns The `enableTypeScript` prompt
  */
-export declare function getEnableTypeScriptPrompt(capCdsInfo?: CdsUi5PluginInfo): UI5ApplicationQuestion;
+export declare function getEnableTypeScriptPrompt(): UI5ApplicationQuestion;
 /**
  * Gets the `addDeployConfig` prompt.
  *
@@ -74,8 +72,7 @@ export declare function getAddFlpConfigPrompt(addFlpConfigOptions?: UI5Applicati
 /**
  * Get the `enableVirtualEndpoints` prompt.
  *
- * @param capCdsInfo CDS UI5 plugin information
  * @returns the `enableVirtualEndpoints` prompt
  */
-export declare function getEnableVirtualEndpoints(capCdsInfo?: CdsUi5PluginInfo): UI5ApplicationQuestion;
+export declare function getEnableVirtualEndpoints(): UI5ApplicationQuestion;
 //# sourceMappingURL=prompts1.d.ts.map

package/dist/prompts/prompts1.js

@@ -17,7 +17,6 @@ const i18n_1 = require("../i18n");
 const types_1 = require("../types");
 const prompt_helpers_1 = require("./prompt-helpers");
 const validators_1 = require("./validators");
-const yeoman_ui_types_1 = require("@sap-devx/yeoman-ui-types");
 /**
  * Gets the `name` prompt.
  *
@@ -168,24 +167,10 @@ function getUI5VersionPrompt(ui5Versions = [], ui5VersionPromptOptions) {
 /**
  * Get the `enableTypeScript` prompt.
  *
- * @param capCdsInfo CDS UI5 plugin information
  * @returns The `enableTypeScript` prompt
  */
-function getEnableTypeScriptPrompt(capCdsInfo) {
+function getEnableTypeScriptPrompt() {
     return {
-        when: () => {
-            if (capCdsInfo) {
-                return capCdsInfo.hasMinCdsVersion;
-            }
-            return true;
-        },
-        additionalMessages: (val) => {
-            let message;
-            if (val && capCdsInfo?.hasMinCdsVersion && !capCdsInfo?.isWorkspaceEnabled) {
-                message = { message: (0, i18n_1.t)('prompts.enableTypeScript.warningMsg'), severity: yeoman_ui_types_1.Severity.warning };
-            }
-            return message;
-        },
         type: 'confirm',
         name: types_1.promptNames.enableTypeScript,
         message: (0, i18n_1.t)('prompts.enableTypeScript.message'),
@@ -259,17 +244,10 @@ function getAddFlpConfigPrompt(addFlpConfigOptions) {
 /**
  * Get the `enableVirtualEndpoints` prompt.
  *
- * @param capCdsInfo CDS UI5 plugin information
  * @returns the `enableVirtualEndpoints` prompt
  */
-function getEnableVirtualEndpoints(capCdsInfo) {
+function getEnableVirtualEndpoints() {
     return {
-        when: (answers) => {
-            if (capCdsInfo) {
-                return capCdsInfo.isCdsUi5PluginEnabled || !!answers?.enableTypeScript;
-            }
-            return true;
-        },
         type: 'confirm',
         name: types_1.promptNames.enableVirtualEndpoints,
         guiOptions: {

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.39",
+  "version": "0.15.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -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.27"
+    "@sap-ux/cap-config-writer": "0.11.0"
   },
   "engines": {
     "node": ">=20.x"