@sap-ux/odata-service-inquirer 0.1.12 → 0.2.1

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

@@ -101,9 +101,10 @@ exports.getCapProjectChoices = getCapProjectChoices;
  * @param serviceInfo - The service info
  * @param projectPath - The project path
  * @param appPath - The app path
+ * @param cdsVersionInfo - The cds version info
  * @returns a cap service choice
  */
-function createCapServiceChoice(capModel, serviceInfo, projectPath, appPath) {
+function createCapServiceChoice(capModel, serviceInfo, projectPath, appPath, cdsVersionInfo) {
     var _a, _b, _c;
     const srvDef = (_a = capModel.definitions) === null || _a === void 0 ? void 0 : _a[serviceInfo.name];
     /* eslint-disable-next-line  @typescript-eslint/no-explicit-any */
@@ -127,7 +128,8 @@ function createCapServiceChoice(capModel, serviceInfo, projectPath, appPath) {
             projectPath,
             appPath,
             // Assume Node.js if not defined
-            capType: serviceInfo.runtime ? serviceInfo.runtime : 'Node.js'
+            capType: serviceInfo.runtime ? serviceInfo.runtime : 'Node.js',
+            cdsVersionInfo
         };
         return {
             name: capService.capType
@@ -154,17 +156,19 @@ function getCapServiceChoices(capProjectPaths) {
         try {
             let capServices = [];
             let capModel;
+            let capCdsVersionInfo;
             try {
                 // Workaround for missing clear cache functionality in `getCapModelAnsdServices`, this resets the cds.resolve.cache.
                 // If this is not done then errors can be thrown where out-of-processs changes to the files system have occurred
                 yield (0, project_access_1.getCdsRoots)(capProjectPaths.path, true);
                 // Load the CAP model and services
-                const { model, services } = yield (0, project_access_1.getCapModelAndServices)({
+                const { model, services, cdsVersionInfo } = yield (0, project_access_1.getCapModelAndServices)({
                     projectRoot: capProjectPaths.path,
                     logger: logger_helper_1.default.logger
                 });
                 capServices = services;
                 capModel = model;
+                capCdsVersionInfo = cdsVersionInfo;
             }
             catch (error) {
                 prompt_helpers_1.errorHandler.logErrorMsgs(error);
@@ -177,7 +181,7 @@ function getCapServiceChoices(capProjectPaths) {
             logger_helper_1.default.logger.debug(`CDS model source paths: ${JSON.stringify(capModel.$sources)}`);
             const serviceChoices = capServices
                 .map((service) => {
-                return createCapServiceChoice(capModel, service, projectPath, appPath);
+                return createCapServiceChoice(capModel, service, projectPath, appPath, capCdsVersionInfo);
             })
                 .filter((service) => !!service); // filter undefined entries
             return serviceChoices !== null && serviceChoices !== void 0 ? serviceChoices : [];

package/dist/types.d.ts

@@ -1,6 +1,7 @@
 import type { IValidationLink } from '@sap-devx/yeoman-ui-types';
 import type { YUIQuestion } from '@sap-ux/inquirer-common';
 import type { OdataVersion } from '@sap-ux/odata-service-writer';
+import type { CdsVersionInfo } from '@sap-ux/project-access';
 import type { ListChoiceOptions } from 'inquirer';
 /**
  * This file contains types that are exported by the module and are needed for consumers using the APIs `prompt` and `getPrompts`.
@@ -71,6 +72,10 @@ export interface CapService {
      * The path to the CAP project.
      */
     projectPath: string;
+    /**
+     * The CDS info for the Cds instance that was used to compile the project when determining the service.
+     */
+    cdsVersionInfo?: CdsVersionInfo;
     /**
      * The name of the CAP service as identified by the cds model.
      */
@@ -85,7 +90,7 @@ export interface CapService {
      */
     serviceCdsPath?: string;
     /**
-     * The runtime of the CAP service.
+     * The runtime of the Cds instance that was used to compile the project when determining the service.
      */
     capType?: CapRuntime;
     /**

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": "0.1.12",
+  "version": "0.2.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -23,10 +23,10 @@
     "i18next": "23.5.1",
     "os-name": "4.0.1",
     "@sap-ux/btp-utils": "0.14.4",
+    "@sap-ux/telemetry": "0.4.30",
     "@sap-ux/inquirer-common": "0.2.8",
     "@sap-ux/logger": "0.5.1",
-    "@sap-ux/project-access": "1.20.4",
-    "@sap-ux/telemetry": "0.4.28"
+    "@sap-ux/project-access": "1.21.1"
   },
   "devDependencies": {
     "@sap-devx/yeoman-ui-types": "1.14.4",
@@ -35,7 +35,7 @@
     "@types/lodash": "4.14.202",
     "jest-extended": "3.2.4",
     "lodash": "4.17.21",
-    "@sap-ux/odata-service-writer": "0.19.2",
+    "@sap-ux/odata-service-writer": "0.20.1",
     "@sap-ux/feature-toggle": "0.1.1"
   },
   "engines": {