@sap-ux/adp-tooling 0.18.66 → 0.18.68

package/dist/cf/app/discovery.d.ts

@@ -22,11 +22,12 @@ export declare function getBackendUrlsFromServiceKeys(serviceKeys: ServiceKeys[]
  *
  * @param {ServiceKeys[]} serviceKeys - The service keys containing endpoints with destinations.
  * @param {string} basePath - Path to the .adp/reuse folder containing xs-app.json files.
- * @returns {Array<{ url: string; paths: string[] }>} Array of URL-to-paths mappings.
+ * @returns {Array<{ url: string; paths: string[]; pathRewrite?: string }>} Array of URL-to-paths mappings with optional pathRewrite.
  */
 export declare function getBackendUrlsWithPaths(serviceKeys: ServiceKeys[], basePath: string): Array<{
     url: string;
     paths: string[];
+    pathRewrite?: string;
 }>;
 /**
  * Extract endpoint destinations from service keys.

package/dist/cf/app/discovery.js

@@ -91,13 +91,15 @@ function cleanRoutePath(source) {
     while (path.includes('//')) {
         path = path.replaceAll('//', '/');
     }
+    // Remove trailing slash to ensure proper path matching
+    path = path.replace(/\/$/, '');
     return path;
 }
 /**
- * Process a route and add its cleaned path to the destination mapping.
+ * Process a route and extract path and pathRewrite from source and target.
  *
- * @param {XsApp['routes'][number]} route - The route object from xs-app.json.
- * @param {Map<string, Set<string>>} destinationToPaths - Map to store destination to paths mapping.
+ * @param {XsAppRoute} route - The route object from xs-app.json.
+ * @param {Map<string, { paths: Set<string>; pathRewrite?: string }>} destinationToPaths - Map to store destination info.
  */
 function processRouteForDestination(route, destinationToPaths) {
     const destination = route.destination;
@@ -108,16 +110,24 @@ function processRouteForDestination(route, destinationToPaths) {
     const path = cleanRoutePath(route.source);
     if (path) {
         if (!destinationToPaths.has(destination)) {
-            destinationToPaths.set(destination, new Set());
+            destinationToPaths.set(destination, { paths: new Set() });
+        }
+        const destInfo = destinationToPaths.get(destination);
+        destInfo.paths.add(path);
+        // Extract pathRewrite from target if available
+        if (route.target && typeof route.target === 'string') {
+            const pathRewrite = cleanRoutePath(route.target);
+            if (pathRewrite && !destInfo.pathRewrite) {
+                destInfo.pathRewrite = pathRewrite;
+            }
         }
-        destinationToPaths.get(destination).add(path);
     }
 }
 /**
- * Extract destination to paths mapping from xs-app.json routes.
+ * Extract destination to paths mapping from xs-app.json routes with pathRewrite info.
  *
  * @param {string} xsAppPath - Path to xs-app.json file.
- * @returns {Map<string, Set<string>>} Map of destination names to path sets.
+ * @returns {Map<string, { paths: Set<string>; pathRewrite?: string }>} Map of destination names to path info.
  */
 function extractDestinationToPathsMap(xsAppPath) {
     const destinationToPaths = new Map();
@@ -141,7 +151,7 @@ function extractDestinationToPathsMap(xsAppPath) {
  *
  * @param {ServiceKeys[]} serviceKeys - The service keys containing endpoints with destinations.
  * @param {string} basePath - Path to the .adp/reuse folder containing xs-app.json files.
- * @returns {Array<{ url: string; paths: string[] }>} Array of URL-to-paths mappings.
+ * @returns {Array<{ url: string; paths: string[]; pathRewrite?: string }>} Array of URL-to-paths mappings with optional pathRewrite.
  */
 function getBackendUrlsWithPaths(serviceKeys, basePath) {
     const destinationToUrl = extractDestinationToUrlMap(serviceKeys);
@@ -159,13 +169,17 @@ function getBackendUrlsWithPaths(serviceKeys, basePath) {
     }
     const destinationToPaths = extractDestinationToPathsMap(xsAppPath);
     const result = [];
-    for (const [destination, paths] of destinationToPaths.entries()) {
+    for (const [destination, pathInfo] of destinationToPaths.entries()) {
         const url = destinationToUrl.get(destination);
         if (url) {
-            result.push({
+            const entry = {
                 url,
-                paths: Array.from(paths)
-            });
+                paths: Array.from(pathInfo.paths)
+            };
+            if (pathInfo.pathRewrite) {
+                entry.pathRewrite = pathInfo.pathRewrite;
+            }
+            result.push(entry);
         }
     }
     return result;

package/dist/cf/project/ui5-app-info.js

@@ -29,7 +29,7 @@ function getReusableLibraryPaths(basePath, logger) {
         return {
             path: resourcePath,
             src: `./.adp/reuse/${html5AppName}`,
-            fallthrough: false
+            fallthrough: true
         };
     });
 }

package/dist/types.d.ts

@@ -751,7 +751,10 @@ export interface InboundChange {
  */
 export interface XsAppRoute {
     source: string;
+    target?: string;
+    destination?: string;
     endpoint?: string;
+    service?: string;
     [key: string]: unknown;
 }
 export interface XsApp {

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Aadp-tooling"
   },
-  "version": "0.18.66",
+  "version": "0.18.68",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -39,16 +39,16 @@
     "@sap-ux/axios-extension": "1.25.14",
     "@sap-ux/btp-utils": "1.1.9",
     "@sap-ux/i18n": "0.3.7",
-    "@sap-ux/inquirer-common": "0.11.8",
+    "@sap-ux/inquirer-common": "0.11.9",
     "@sap-ux/logger": "0.8.1",
-    "@sap-ux/nodejs-utils": "0.2.15",
-    "@sap-ux/odata-service-writer": "0.29.20",
-    "@sap-ux/project-access": "1.35.5",
-    "@sap-ux/project-input-validator": "0.6.57",
+    "@sap-ux/nodejs-utils": "0.2.16",
+    "@sap-ux/odata-service-writer": "0.29.21",
+    "@sap-ux/project-access": "1.35.6",
+    "@sap-ux/project-input-validator": "0.6.58",
     "@sap-ux/store": "1.5.6",
     "@sap-ux/system-access": "0.6.54",
-    "@sap-ux/ui5-config": "0.29.17",
-    "@sap-ux/ui5-info": "0.13.12"
+    "@sap-ux/ui5-config": "0.29.18",
+    "@sap-ux/ui5-info": "0.13.13"
   },
   "devDependencies": {
     "@types/adm-zip": "0.5.5",