@sap-ux/project-access 1.35.16 → 1.35.18

package/dist/project/cap.d.ts

@@ -95,6 +95,21 @@ export declare function getCdsServices(projectRoot: string, ignoreErrors?: boole
  * @returns - string containing the edmx
  */
 export declare function readCapServiceMetadataEdmx(root: string, uri: string, version?: 'v2' | 'v4'): Promise<string>;
+/**
+ * Checks whether a given URL path matches one of the supported service prefix patterns
+ * and ends with the expected service suffix path.
+ *
+ * Currently method validates against DwC service patterns, supported patterns:
+ * - `/ui/<inbound-service-name>/v<version>/<suffix>`
+ * - `/<string>.<string>/external-ui/<inbound-service-name>/v<version>/<suffix>`
+ *
+ * The `<suffix>` (e.g. `odata/v4/myService`) must match exactly.
+ *
+ * @param path - The full request path to validate.
+ * @param expectedSuffixPath - The expected service path (e.g. `odata/v4/myService`).
+ * @returns `true` if the path matches one of the supported patterns and ends with the expected suffix.
+ */
+export declare function isMatchingServiceUri(path: string, expectedSuffixPath: string): boolean;
 /**
  * Get CAP CDS project environment config for project root.
  *

package/dist/project/cap.js

@@ -12,6 +12,7 @@ exports.getCdsFiles = getCdsFiles;
 exports.getCdsRoots = getCdsRoots;
 exports.getCdsServices = getCdsServices;
 exports.readCapServiceMetadataEdmx = readCapServiceMetadataEdmx;
+exports.isMatchingServiceUri = isMatchingServiceUri;
 exports.getCapEnvironment = getCapEnvironment;
 exports.clearCdsModuleCache = clearCdsModuleCache;
 exports.clearGlobalCdsModulePromiseCache = clearGlobalCdsModulePromiseCache;
@@ -333,6 +334,9 @@ function extractCdsFilesFromMessage(sources) {
  * @returns - uniform url
  */
 function uniformUrl(url) {
+    if (!url) {
+        return '';
+    }
     return url
         .replace(/\\/g, '/')
         .replace(/\/\//g, '/')
@@ -361,6 +365,41 @@ async function readCapServiceMetadataEdmx(root, uri, version = 'v4') {
         throw Error(`Error while reading CAP service metadata. Path: '${root}', service uri: '${uri}', error: '${error.toString()}'}`);
     }
 }
+/**
+ * Normalizes a service URL path by removing a leading and/or trailing slash.
+ *
+ * @param urlPath - The URL path to normalize.
+ * @returns The normalized path without leading or trailing slashes.
+ */
+function normalizeServiceUrlPath(urlPath) {
+    return urlPath.replaceAll(/(?:^\/)|(?:\/$)/g, '');
+}
+/**
+ * Checks whether a given URL path matches one of the supported service prefix patterns
+ * and ends with the expected service suffix path.
+ *
+ * Currently method validates against DwC service patterns, supported patterns:
+ * - `/ui/<inbound-service-name>/v<version>/<suffix>`
+ * - `/<string>.<string>/external-ui/<inbound-service-name>/v<version>/<suffix>`
+ *
+ * The `<suffix>` (e.g. `odata/v4/myService`) must match exactly.
+ *
+ * @param path - The full request path to validate.
+ * @param expectedSuffixPath - The expected service path (e.g. `odata/v4/myService`).
+ * @returns `true` if the path matches one of the supported patterns and ends with the expected suffix.
+ */
+function isMatchingServiceUri(path, expectedSuffixPath) {
+    const normalizedPath = path.startsWith('/') ? path : `/${path}`;
+    // Escapes special regex characters in a string so it can be embedded into regular expression
+    const escapedSuffix = expectedSuffixPath.replaceAll(/[.*+?^${}()|[\]\\]/g, String.raw `\$&`);
+    const patterns = [
+        // regex for pattern -> /ui/<inbound-service-name>/v<version>/...
+        String.raw `^/ui/[^/]+/v\d+/${escapedSuffix}$`,
+        // regex for pattern -> /<string>.<string>/external-ui/<inbound-service-name>/v<version>/...
+        String.raw `^/[^/]+\.[^/]+/external-ui/[^/]+/v\d+/${escapedSuffix}$`
+    ];
+    return patterns.some((pattern) => new RegExp(pattern).test(normalizedPath));
+}
 /**
  * Find a service in a list of services ignoring leading and trailing slashes.
  *
@@ -369,8 +408,15 @@ async function readCapServiceMetadataEdmx(root, uri, version = 'v4') {
  * @returns - name and uri of the service, undefined if service not found
  */
 function findServiceByUri(services, uri) {
-    const searchUri = uniformUrl(uri).replace(/(?:^\/)|(?:\/$)/g, '');
-    return services.find((srv) => srv.urlPath.replace(/(?:^\/)|(?:\/$)/g, '') === searchUri);
+    const searchUri = normalizeServiceUrlPath(uniformUrl(uri));
+    // Try to find a service by exact path match
+    let service = services.find((srv) => normalizeServiceUrlPath(srv.urlPath) === searchUri);
+    // If no exact match is found, try matching while ignoring the service prefix
+    service ??= services.find((srv) => {
+        const normalizedServiceUrlPath = normalizeServiceUrlPath(srv.urlPath);
+        return isMatchingServiceUri(searchUri, normalizedServiceUrlPath);
+    });
+    return service;
 }
 /**
  * Get CAP CDS project environment config for project root.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap-ux/project-access",
-  "version": "1.35.16",
+  "version": "1.35.18",
   "description": "Library to access SAP Fiori tools projects",
   "repository": {
     "type": "git",
@@ -39,7 +39,7 @@
     "@types/semver": "7.7.1",
     "@ui5/manifest": "1.84.0",
     "vscode-uri": "3.1.0",
-    "@sap-ux/logger": "0.8.3"
+    "@sap-ux/logger": "0.8.4"
   },
   "scripts": {
     "build": "tsc --build",