@sap-ux/odata-service-inquirer 2.13.9 → 2.14.0

package/dist/index.js

@@ -102,7 +102,8 @@ function getEntityRelatedPrompts(metadata, templateType, isCapService = false, p
  * @returns the prompt answers
  */
 async function prompt(adapter, promptOptions, logger, enableGuidedAnswers, telemetryClient, isYUI = false, connectedSystem) {
-    if (adapter?.promptModule && promptOptions?.serviceSelection?.useAutoComplete) {
+    if (adapter?.promptModule &&
+        (promptOptions?.serviceSelection?.useAutoComplete ?? promptOptions?.capProject?.useAutoComplete)) {
         const pm = adapter.promptModule;
         pm.registerPrompt('autocomplete', inquirer_autocomplete_prompt_1.default);
     }

package/dist/prompts/connectionValidator.js

@@ -13,13 +13,13 @@ const types_1 = require("../types");
 const logger_helper_1 = __importDefault(require("./logger-helper"));
 const prompt_helpers_1 = require("./prompt-helpers");
 // Cert errors that may be ignored by the ignore cert errors prompt and NODE_TLS_REJECT_UNAUTHORIZED=0 setting
-const ignorableCertErrors = [
+const ignorableCertErrors = new Set([
     inquirer_common_1.ERROR_TYPE.CERT_SELF_SIGNED,
     inquirer_common_1.ERROR_TYPE.CERT_SELF_SIGNED_CERT_IN_CHAIN,
     inquirer_common_1.ERROR_TYPE.CERT_EXPIRED,
     inquirer_common_1.ERROR_TYPE.CERT_UKNOWN_OR_INVALID,
     inquirer_common_1.ERROR_TYPE.INVALID_SSL_CERTIFICATE
-];
+]);
 /**
  * Class that can be used to determine the connectivity using a service url, system url, or service info (UAA Key details) or reentrance ticket.
  * This will determine if if the service/catalog is reachable, authentication is required and generates ting messages to guide the user.
@@ -372,7 +372,7 @@ class ConnectionValidator {
             }
             catch (error) {
                 const errorType = inquirer_common_1.ErrorHandler.getErrorType(error?.response?.status ?? error?.code);
-                if (error?.isAxiosError && ignorableCertErrors.includes(errorType)) {
+                if (error?.isAxiosError && ignorableCertErrors.has(errorType)) {
                     logger_helper_1.default.logger.warn((0, i18n_1.t)('warnings.certificateErrors', { url: axiosConfig?.baseURL, error: errorType }));
                     logger_helper_1.default.logger.warn((0, i18n_1.t)('warnings.allowingUnauthorizedCertsNode'));
                     shouldIgnoreCertError = true;
@@ -729,7 +729,7 @@ class ConnectionValidator {
         }
         else if (inquirer_common_1.ErrorHandler.isCertError(status)) {
             this.validity.reachable = true;
-            this.validity.canSkipCertError = ignorableCertErrors.includes(inquirer_common_1.ErrorHandler.getErrorType(status));
+            this.validity.canSkipCertError = ignorableCertErrors.has(inquirer_common_1.ErrorHandler.getErrorType(status));
             this.validity.authenticated = false;
             return prompt_helpers_1.errorHandler.getValidationErrorHelp(status, false) ?? false;
         }

package/dist/prompts/datasources/cap-project/cap-helpers.js

@@ -14,15 +14,32 @@ const logger_helper_1 = __importDefault(require("../../logger-helper"));
 const prompt_helpers_1 = require("../../prompt-helpers");
 const inquirer_common_1 = require("@sap-ux/inquirer-common");
 const promises_1 = require("node:fs/promises");
+const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
+const node_process_1 = require("node:process");
 exports.enterCapPathChoiceValue = 'enterCapPath';
 /**
- * Search for CAP projects in the specified paths.
+ * Searches for CAP project root paths from given paths, searching up to 2 parent levels if needed in CLI environment.
+ * Returns sorted paths with priority given to projects matching the original paths, and tracks duplicate folder names.
  *
- * @param paths - The paths used to search for CAP projects
+ * @param paths - Array of file system paths to search for CAP projects
  * @returns The CAP project paths and the number of folders with the same name
  */
 async function getCapProjectPaths(paths) {
     const capProjectRoots = await (0, project_access_1.findCapProjects)({ wsFolders: paths });
+    if (capProjectRoots.length === 0 && (0, fiori_generator_shared_1.getHostEnvironment)() === fiori_generator_shared_1.hostEnvironment.cli) {
+        // If no CAP projects found, search parent directories (up to 2 levels)
+        const parentPath = (0, node_path_1.dirname)((0, node_process_1.cwd)());
+        const grandparentPath = (0, node_path_1.dirname)(parentPath);
+        // Second call is needed, since we don't want to traverse the whole fs
+        const capProjectsUp = await (0, project_access_1.findCapProjects)({
+            wsFolders: [parentPath, grandparentPath],
+            noTraversal: true
+        });
+        if (capProjectsUp.length > 0) {
+            // Add only the first found project from parent search, since we only want the current project's parent
+            capProjectRoots.push(capProjectsUp[0]);
+        }
+    }
     const capRootPaths = [];
     // Keep track of duplicate folder names to append the path to the name when displaying the choices
     const folderNameCount = new Map();

package/dist/prompts/datasources/cap-project/questions.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLocalCapProjectPrompts = getLocalCapProjectPrompts;
+const inquirer_common_1 = require("@sap-ux/inquirer-common");
 const odata_service_writer_1 = require("@sap-ux/odata-service-writer");
 const project_access_1 = require("@sap-ux/project-access");
 const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
@@ -56,13 +57,14 @@ function getLocalCapProjectPrompts(promptOptions) {
                 capChoices = await (0, cap_helpers_1.getCapProjectChoices)(promptOptions?.[types_1.promptNames.capProject]?.capSearchPaths ?? []);
                 return capChoices?.length > 1;
             },
-            type: 'list',
+            type: promptOptions?.[types_1.promptNames.capProject]?.useAutoComplete ? 'autocomplete' : 'list',
             name: types_1.promptNames.capProject,
             message: (0, i18n_1.t)('prompts.capProject.message'),
             default: () => {
                 const defChoice = getDefaultCapChoice(capChoices, defaultCapPath);
                 return defChoice;
             },
+            source: (prevAnswers, input) => (0, inquirer_common_1.searchChoices)(input, capChoices),
             choices: () => capChoices,
             guiOptions: {
                 applyDefaultWhenDirty: true,

package/dist/types.d.ts

@@ -216,6 +216,11 @@ export type CapProjectPromptOptions = {
      * The default selected CAP project choice, this is used to pre-select a CAP project based on the CAP project path.
      */
     defaultChoice?: string;
+    /**
+     * Use autocomplete for project selection instead of list (CLI only).
+     * Note: inquirer-autocomplete-prompt module is used for this feature and has to be registered with the inquirer instance.
+     */
+    useAutoComplete?: boolean;
 };
 export type CapServicePromptOptions = {
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/odata-service-inquirer",
   "description": "Prompts module that can prompt users for inputs required for odata service writing",
-  "version": "2.13.9",
+  "version": "2.14.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -29,16 +29,16 @@
     "i18next": "25.3.0",
     "inquirer-autocomplete-prompt": "2.0.1",
     "os-name": "4.0.1",
-    "@sap-ux/axios-extension": "1.25.5",
+    "@sap-ux/axios-extension": "1.25.6",
     "@sap-ux/btp-utils": "1.1.6",
-    "@sap-ux/fiori-generator-shared": "0.13.48",
+    "@sap-ux/fiori-generator-shared": "0.13.50",
     "@sap-ux/guided-answers-helper": "0.4.2",
-    "@sap-ux/telemetry": "0.6.50",
-    "@sap-ux/inquirer-common": "0.10.7",
+    "@sap-ux/telemetry": "0.6.52",
+    "@sap-ux/inquirer-common": "0.10.9",
     "@sap-ux/logger": "0.8.0",
     "@sap-ux/nodejs-utils": "0.2.11",
-    "@sap-ux/project-access": "1.33.0",
-    "@sap-ux/project-input-validator": "0.6.40",
+    "@sap-ux/project-access": "1.33.2",
+    "@sap-ux/project-input-validator": "0.6.42",
     "@sap-ux/store": "1.4.2"
   },
   "devDependencies": {
@@ -48,12 +48,12 @@
     "@types/inquirer": "8.2.6",
     "@types/lodash": "4.14.202",
     "jest-extended": "6.0.0",
-    "@sap-ux/fiori-generator-shared": "0.13.48",
-    "@sap-ux/fiori-elements-writer": "2.8.31",
-    "@sap-ux/fiori-freestyle-writer": "2.5.23",
+    "@sap-ux/fiori-generator-shared": "0.13.50",
+    "@sap-ux/fiori-elements-writer": "2.8.34",
+    "@sap-ux/fiori-freestyle-writer": "2.5.25",
     "@sap-ux/feature-toggle": "0.3.5",
-    "@sap-ux/odata-service-writer": "0.29.3",
-    "@sap-ux/cap-config-writer": "0.12.39"
+    "@sap-ux/odata-service-writer": "0.29.5",
+    "@sap-ux/cap-config-writer": "0.12.41"
   },
   "engines": {
     "node": ">=20.x"