@sap-ux/project-access 1.25.6 → 1.26.0

package/dist/project/cap.js

@@ -121,9 +121,12 @@ async function getCapModelAndServices(projectRoot) {
     let services = cds.compile.to.serviceinfo(model, { root: _projectRoot }) ?? [];
     if (services.map) {
         services = services.map((value) => {
+            const { endpoints, urlPath } = value;
+            const odataEndpoint = endpoints?.find((endpoint) => endpoint.kind === 'odata');
+            const endpointPath = odataEndpoint?.path ?? urlPath;
             return {
                 name: value.name,
-                urlPath: uniformUrl(value.urlPath),
+                urlPath: uniformUrl(endpointPath),
                 runtime: value.runtime
             };
         });

package/dist/project/info.d.ts

@@ -37,15 +37,16 @@ export declare function getProjectType(projectRoot: string): Promise<ProjectType
  */
 export declare function getMinUI5VersionFromManifest(manifest: Manifest): string | string[] | undefined;
 /**
- * Returns the minUI5Version as string[].
+ * Returns the valid minUI5Version(s) as string[].
  *
  * @param manifest - manifest object
+ * @param noValidation - disables the semver validation
  * @returns minUI5Version, as an array of strings
  */
-export declare function getMinUI5VersionAsArray(manifest: Manifest): string[];
+export declare function getMinUI5VersionAsArray(manifest: Manifest, noValidation?: boolean): string[];
 /**
- * Returns the minUI5Version in string format.
- * If it is defined as an arry, returns the minimum version from it.
+ * Returns the minUI5Version in string format (if valid).
+ * If it is defined as an array, returns the minimum valid version from it.
  *
  * @param manifest - manifest object
  * @returns the minimum version as string

package/dist/project/info.js

@@ -210,33 +210,40 @@ function getMinUI5VersionFromManifest(manifest) {
 }
 exports.getMinUI5VersionFromManifest = getMinUI5VersionFromManifest;
 /**
- * Returns the minUI5Version as string[].
+ * Returns the valid minUI5Version(s) as string[].
  *
  * @param manifest - manifest object
+ * @param noValidation - disables the semver validation
  * @returns minUI5Version, as an array of strings
  */
-function getMinUI5VersionAsArray(manifest) {
-    let result = [];
+function getMinUI5VersionAsArray(manifest, noValidation = false) {
+    const result = [];
+    const manifestVariablePattern = /^\$\{.*\}$/; // minUI5Version can also contain variable entries like ${sap.ui5.dist.version}
     const minUI5Version = getMinUI5VersionFromManifest(manifest);
     if (minUI5Version) {
-        result = Array.isArray(minUI5Version) ? minUI5Version : [minUI5Version];
+        const minUI5VersionArray = Array.isArray(minUI5Version) ? minUI5Version : [minUI5Version];
+        minUI5VersionArray.forEach((version) => {
+            if (noValidation || (0, semver_1.valid)(version) || manifestVariablePattern.test(version)) {
+                result.push(version);
+            }
+        });
     }
     return result;
 }
 exports.getMinUI5VersionAsArray = getMinUI5VersionAsArray;
 /**
- * Returns the minUI5Version in string format.
- * If it is defined as an arry, returns the minimum version from it.
+ * Returns the minUI5Version in string format (if valid).
+ * If it is defined as an array, returns the minimum valid version from it.
  *
  * @param manifest - manifest object
  * @returns the minimum version as string
  */
 function getMinimumUI5Version(manifest) {
     let result;
-    const minUI5VersionArray = getMinUI5VersionAsArray(manifest);
-    if (minUI5VersionArray.length > 0) {
-        minUI5VersionArray.forEach((version) => {
-            if ((0, semver_1.valid)(version) && (!result || (0, semver_1.gte)(result, version))) {
+    const validVersionsArray = getMinUI5VersionAsArray(manifest);
+    if (validVersionsArray.length > 0) {
+        validVersionsArray.forEach((version) => {
+            if (!result || (0, semver_1.gte)(result, version)) {
                 result = version;
             }
         });

package/dist/types/cap/index.d.ts

@@ -227,6 +227,12 @@ export interface ServiceInfo {
     name: string;
     urlPath: string;
     runtime?: string;
+    endpoints?: [
+        {
+            kind: string;
+            path: string;
+        }
+    ];
 }
 /**
  * CDS version information extracted from package json that was used to compile the project when determining the service.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap-ux/project-access",
-  "version": "1.25.6",
+  "version": "1.26.0",
   "description": "Library to access SAP Fiori tools projects",
   "repository": {
     "type": "git",
@@ -36,7 +36,7 @@
     "@types/mem-fs": "1.1.2",
     "@types/mem-fs-editor": "7.0.1",
     "@types/semver": "7.5.2",
-    "@ui5/manifest": "1.61.0",
+    "@ui5/manifest": "1.66.0",
     "vscode-uri": "3.0.7",
     "@sap-ux/logger": "0.6.0"
   },