@sap-ux/ui5-application-inquirer 0.7.15 → 0.8.0

package/dist/prompts/prompts.d.ts

@@ -11,4 +11,11 @@ import type { UI5ApplicationPromptOptions, UI5ApplicationQuestion } from '../typ
  * @returns the prompts
  */
 export declare function getQuestions(ui5Versions: UI5Version[], promptOptions?: UI5ApplicationPromptOptions, capCdsInfo?: CdsUi5PluginInfo, isYUI?: boolean): UI5ApplicationQuestion[];
+/**
+ * Get the `enableTypeScript` prompt.
+ *
+ * @param capCdsInfo CDS UI5 plugin information
+ * @returns The `enableTypeScript` prompt
+ */
+export declare function getEnableTypeScriptPrompt(capCdsInfo?: CdsUi5PluginInfo): UI5ApplicationQuestion;
 //# sourceMappingURL=prompts.d.ts.map

package/dist/prompts/prompts.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getQuestions = getQuestions;
+exports.getEnableTypeScriptPrompt = getEnableTypeScriptPrompt;
 const inquirer_common_1 = require("@sap-ux/inquirer-common");
 const project_access_1 = require("@sap-ux/project-access");
 const project_input_validator_1 = require("@sap-ux/project-input-validator");
@@ -9,6 +10,7 @@ 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");
 /**
  * Get the prompts that will provide input for UI5 application writing.
  *
@@ -34,15 +36,14 @@ function getQuestions(ui5Versions, promptOptions, capCdsInfo, isYUI = false) {
         [types_1.promptNames.description]: getDescriptionPrompt(),
         [types_1.promptNames.targetFolder]: getTargetFolderPrompt(targetDir, promptOptions?.[types_1.promptNames.targetFolder]?.validateFioriAppFolder),
         [types_1.promptNames.ui5Version]: getUI5VersionPrompt(ui5Versions, promptOptions?.ui5Version),
+        [types_1.promptNames.enableTypeScript]: getEnableTypeScriptPrompt(capCdsInfo),
         [types_1.promptNames.addDeployConfig]: getAddDeployConfigPrompt(targetDir, promptOptions?.addDeployConfig, isCapProject),
         [types_1.promptNames.addFlpConfig]: getAddFlpConfigPrompt(promptOptions?.addFlpConfig),
         [types_1.promptNames.showAdvanced]: getShowAdvancedPrompt(),
         [types_1.promptNames.ui5Theme]: getUI5ThemePrompt(),
         [types_1.promptNames.enableEslint]: getEnableEsLintPrompt(),
         [types_1.promptNames.enableCodeAssist]: getEnableCodeAssistPrompt(),
-        [types_1.promptNames.skipAnnotations]: getSkipAnnotationsPrompt(),
-        [types_1.promptNames.enableNPMWorkspaces]: getEnableNPMWorkspacesPrompt(capCdsInfo),
-        [types_1.promptNames.enableTypeScript]: getEnableTypeScriptPrompt(capCdsInfo)
+        [types_1.promptNames.skipAnnotations]: 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);
@@ -62,12 +63,17 @@ function getQuestions(ui5Versions, promptOptions, capCdsInfo, isYUI = false) {
  */
 function getEnableTypeScriptPrompt(capCdsInfo) {
     return {
-        when: (answers) => {
+        when: () => {
             if (capCdsInfo) {
-                return capCdsInfo.isCdsUi5PluginEnabled || !!answers?.enableNPMWorkspaces;
+                return capCdsInfo.isCdsUi5PluginEnabled || (capCdsInfo.hasMinCdsVersion && !capCdsInfo.hasCdsUi5Plugin);
             }
             return true;
         },
+        additionalMessages: (val) => {
+            if (val && capCdsInfo?.hasMinCdsVersion && !capCdsInfo?.hasCdsUi5Plugin) {
+                return { message: (0, i18n_1.t)('prompts.appEnableTypeScriptWarningMessage'), severity: yeoman_ui_types_1.Severity.warning };
+            }
+        },
         type: 'confirm',
         name: types_1.promptNames.enableTypeScript,
         message: (0, i18n_1.t)('prompts.appEnableTypeScriptMessage'),
@@ -77,29 +83,6 @@ function getEnableTypeScriptPrompt(capCdsInfo) {
         }
     };
 }
-/**
- * Get the `enableNPMWorkspaces` prompt.
- *
- * @param capCdsInfo CDS UI5 plugin information
- * @returns The `enableNPMWorkspaces` prompt
- */
-function getEnableNPMWorkspacesPrompt(capCdsInfo) {
-    return {
-        when: () => {
-            if (capCdsInfo) {
-                return capCdsInfo.hasMinCdsVersion && !capCdsInfo.hasCdsUi5Plugin;
-            }
-            return false;
-        },
-        type: 'confirm',
-        name: types_1.promptNames.enableNPMWorkspaces,
-        message: (0, i18n_1.t)('prompts.appEnableNpmWorkspacesMessage'),
-        default: false,
-        guiOptions: {
-            breadcrumb: (0, i18n_1.t)('prompts.appEnableNpmWorkspacesBreadcrumb')
-        }
-    };
-}
 /**
  * Get the `skipAnnotations` prompt. Skipping annotation generation can be useful for CAP projects
  * where annotations may have been already created along with the service.

package/dist/translations/ui5-application-inquirer.i18n.json

@@ -28,9 +28,8 @@
         "appEnableCodeAssistBreadcrumb": "Code Assist",
         "appSkipAnnotationsMessage": "Skip generation of associated annotations.cds file",
         "appSkipAnnotationsBreadcrumb": "Skip Annotations",
-        "appEnableNpmWorkspacesMessage": "Generation of this application can update the CAP project to use NPM workspaces and an associated CDS plugin library (cds-plugin-ui5). Do you want to enable this feature? (Note: this is requirement for generating with TypeScript)",
-        "appEnableNpmWorkspacesBreadcrumb": "Enable NPM Workspaces",
         "appEnableTypeScriptMessage": "Enable TypeScript",
+        "appEnableTypeScriptWarningMessage": "The CAP project will be updated to use NPM workspaces (this is a requirement for generating with TypeScript)",
         "appShowAdvancedOptionsMessage": "Configure advanced options",
         "appShowAdvancedOptionsHint": "Choosing 'No' will apply defaults"
     },

package/dist/types.d.ts

@@ -15,7 +15,6 @@ export interface UI5ApplicationAnswers {
     enableCodeAssist?: boolean;
     skipAnnotations?: boolean;
     enableTypeScript?: boolean;
-    enableNPMWorkspaces?: boolean;
     showAdvanced?: boolean;
 }
 /**
@@ -51,7 +50,6 @@ export declare enum promptNames {
     addFlpConfig = "addFlpConfig",
     ui5Theme = "ui5Theme",
     enableEslint = "enableEslint",
-    enableNPMWorkspaces = "enableNPMWorkspaces",
     enableCodeAssist = "enableCodeAssist",
     skipAnnotations = "skipAnnotations",
     enableTypeScript = "enableTypeScript",
@@ -122,7 +120,7 @@ type NamePromptOptions = {
 /**
  * These are boolean value prompt option keys
  */
-type booleanPromptKeys = 'addDeployConfig' | 'addFlpConfig' | 'enableEslint' | 'skipAnnotations' | 'enableTypeScript' | 'enableCodeAssist' | 'showAdvanced' | 'enableNPMWorkspaces';
+type booleanPromptKeys = 'addDeployConfig' | 'addFlpConfig' | 'enableEslint' | 'skipAnnotations' | 'enableTypeScript' | 'enableCodeAssist' | 'showAdvanced';
 type stringValuePromptType = Omit<typeof promptNames, booleanPromptKeys>;
 type stringValuePrompts = stringValuePromptType[keyof stringValuePromptType];
 type booleanValuePromptType = Pick<typeof promptNames, booleanPromptKeys>;

package/dist/types.js

@@ -35,7 +35,6 @@ var promptNames;
     promptNames["addFlpConfig"] = "addFlpConfig";
     promptNames["ui5Theme"] = "ui5Theme";
     promptNames["enableEslint"] = "enableEslint";
-    promptNames["enableNPMWorkspaces"] = "enableNPMWorkspaces";
     promptNames["enableCodeAssist"] = "enableCodeAssist";
     promptNames["skipAnnotations"] = "skipAnnotations";
     promptNames["enableTypeScript"] = "enableTypeScript";

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.7.15",
+  "version": "0.8.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -23,7 +23,7 @@
     "inquirer-autocomplete-prompt": "2.0.1",
     "lodash": "4.17.21",
     "semver": "7.5.4",
-    "@sap-ux/inquirer-common": "0.5.2",
+    "@sap-ux/inquirer-common": "0.5.3",
     "@sap-ux/project-access": "1.28.7",
     "@sap-ux/project-input-validator": "0.3.3",
     "@sap-ux/ui5-info": "0.8.3"
@@ -35,7 +35,7 @@
     "@types/lodash": "4.14.202",
     "@types/semver": "7.5.4",
     "inquirer": "8.2.6",
-    "@sap-ux/cap-config-writer": "0.7.59"
+    "@sap-ux/cap-config-writer": "0.7.60"
   },
   "engines": {
     "node": ">=18.x"