@sap-ux/adp-tooling 0.18.110 → 0.18.112

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

@@ -16,19 +16,6 @@ export declare function getAppHostIds(serviceKeys: ServiceKeys[]): string[];
  * @returns {string[]} Array of backend URLs (including full paths) or empty array if none found.
  */
 export declare function getBackendUrlsFromServiceKeys(serviceKeys: ServiceKeys[]): string[];
-/**
- * Maps backend URLs to their corresponding OAuth paths based on destination matching
- * between xs-app.json routes and credentials.json endpoints.
- *
- * @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[]; 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

@@ -2,12 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAppHostIds = getAppHostIds;
 exports.getBackendUrlsFromServiceKeys = getBackendUrlsFromServiceKeys;
-exports.getBackendUrlsWithPaths = getBackendUrlsWithPaths;
 exports.getServiceKeyDestinations = getServiceKeyDestinations;
 exports.getOAuthPathsFromXsApp = getOAuthPathsFromXsApp;
 exports.getCfApps = getCfApps;
-const node_fs_1 = require("node:fs");
-const node_path_1 = require("node:path");
 const i18n_1 = require("../../i18n");
 const utils_1 = require("../utils");
 const api_1 = require("../services/api");
@@ -52,25 +49,6 @@ function getBackendUrlsFromServiceKeys(serviceKeys) {
     }
     return urls;
 }
-/**
- * Extract destination to URL mapping from service key endpoints.
- *
- * @param {ServiceKeys[]} serviceKeys - The service keys containing endpoints.
- * @returns {Map<string, string>} Map of destination names to URLs.
- */
-function extractDestinationToUrlMap(serviceKeys) {
-    const destinationToUrl = new Map();
-    const endpoints = serviceKeys[0]?.credentials?.endpoints;
-    if (endpoints && typeof endpoints === 'object') {
-        for (const key in endpoints) {
-            const endpoint = endpoints[key];
-            if (endpoint?.url && endpoint.destination) {
-                destinationToUrl.set(endpoint.destination, endpoint.url);
-            }
-        }
-    }
-    return destinationToUrl;
-}
 /**
  * Clean regex pattern from route source.
  *
@@ -95,95 +73,6 @@ function cleanRoutePath(source) {
     path = path.replace(/\/$/, '');
     return path;
 }
-/**
- * Process a route and extract path and pathRewrite from source and target.
- *
- * @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;
-    const service = route.service;
-    if (!destination || service === 'html5-apps-repo-rt' || !route.source) {
-        return;
-    }
-    const path = cleanRoutePath(route.source);
-    if (path) {
-        if (!destinationToPaths.has(destination)) {
-            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;
-            }
-        }
-    }
-}
-/**
- * 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, { paths: Set<string>; pathRewrite?: string }>} Map of destination names to path info.
- */
-function extractDestinationToPathsMap(xsAppPath) {
-    const destinationToPaths = new Map();
-    try {
-        const xsAppContent = (0, node_fs_1.readFileSync)(xsAppPath, 'utf8');
-        const xsApp = JSON.parse(xsAppContent);
-        if (xsApp?.routes) {
-            for (const route of xsApp.routes) {
-                processRouteForDestination(route, destinationToPaths);
-            }
-        }
-    }
-    catch (e) {
-        throw new Error((0, i18n_1.t)('error.invalidXsAppJson', { error: e.message }));
-    }
-    return destinationToPaths;
-}
-/**
- * Maps backend URLs to their corresponding OAuth paths based on destination matching
- * between xs-app.json routes and credentials.json endpoints.
- *
- * @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[]; pathRewrite?: string }>} Array of URL-to-paths mappings with optional pathRewrite.
- */
-function getBackendUrlsWithPaths(serviceKeys, basePath) {
-    const destinationToUrl = extractDestinationToUrlMap(serviceKeys);
-    const reuseXsAppPath = (0, node_path_1.join)(basePath, '.adp', 'reuse', 'xs-app.json');
-    const distXsAppPath = (0, node_path_1.join)(basePath, 'dist', 'xs-app.json');
-    let xsAppPath;
-    if ((0, node_fs_1.existsSync)(reuseXsAppPath)) {
-        xsAppPath = reuseXsAppPath;
-    }
-    else if ((0, node_fs_1.existsSync)(distXsAppPath)) {
-        xsAppPath = distXsAppPath;
-    }
-    else {
-        throw new Error((0, i18n_1.t)('error.xsAppJsonNotFound', { paths: `${reuseXsAppPath}, ${distXsAppPath}` }));
-    }
-    const destinationToPaths = extractDestinationToPathsMap(xsAppPath);
-    const result = [];
-    for (const [destination, pathInfo] of destinationToPaths.entries()) {
-        const url = destinationToUrl.get(destination);
-        if (url) {
-            const entry = {
-                url,
-                paths: Array.from(pathInfo.paths)
-            };
-            if (pathInfo.pathRewrite) {
-                entry.pathRewrite = pathInfo.pathRewrite;
-            }
-            result.push(entry);
-        }
-    }
-    return result;
-}
 /**
  * Extract endpoint destinations from service keys.
  *

package/dist/cf/project/yaml.d.ts

@@ -1,6 +1,5 @@
 import type { Editor } from 'mem-fs-editor';
 import type { ToolsLogger } from '@sap-ux/logger';
-import type { UI5Config } from '@sap-ux/ui5-config';
 import type { AppParamsExtended, MtaYaml, ServiceKeys } from '../../types';
 import { AppRouterType } from '../../types';
 interface AdjustMtaYamlParams {
@@ -51,22 +50,5 @@ export declare function getAppParamsFromUI5Yaml(projectPath: string): AppParamsE
  * @returns {Promise<void>} The promise.
  */
 export declare function adjustMtaYaml({ projectPath, adpProjectName, appRouterType, businessSolutionName, businessService, serviceKeys, spaceGuid }: AdjustMtaYamlParams, memFs: Editor, timestamp: string, templatePathOverwrite?: string, logger?: ToolsLogger): Promise<MtaYaml>;
-/**
- * Add fiori-tools-servestatic configuration to ui5.yaml and removes previously added configuration.
- *
- * @param basePath - path to application root
- * @param ui5Config - UI5 configuration object
- * @param logger - logger instance
- */
-export declare function addServeStaticMiddleware(basePath: string, ui5Config: UI5Config, logger?: ToolsLogger): Promise<void>;
-/**
- * Add backend-proxy-middleware-cf configuration to ui5.yaml.
- *
- * @param basePath - path to application root
- * @param ui5Config - UI5 configuration object
- * @param serviceKeys - service keys from Cloud Foundry
- * @param logger - logger instance
- */
-export declare function addBackendProxyMiddleware(basePath: string, ui5Config: UI5Config, serviceKeys: ServiceKeys[], logger?: ToolsLogger): void;
 export {};
 //# sourceMappingURL=yaml.d.ts.map

package/dist/cf/project/yaml.js

@@ -41,8 +41,6 @@ exports.getSAPCloudService = getSAPCloudService;
 exports.getRouterType = getRouterType;
 exports.getAppParamsFromUI5Yaml = getAppParamsFromUI5Yaml;
 exports.adjustMtaYaml = adjustMtaYaml;
-exports.addServeStaticMiddleware = addServeStaticMiddleware;
-exports.addBackendProxyMiddleware = addBackendProxyMiddleware;
 const node_fs_1 = __importDefault(require("node:fs"));
 const path = __importStar(require("node:path"));
 const js_yaml_1 = __importDefault(require("js-yaml"));
@@ -50,8 +48,6 @@ const types_1 = require("../../types");
 const api_1 = require("../services/api");
 const yaml_loader_1 = require("./yaml-loader");
 const discovery_1 = require("../app/discovery");
-const helper_1 = require("../../base/helper");
-const ui5_app_info_1 = require("./ui5-app-info");
 const CF_MANAGED_SERVICE = 'org.cloudfoundry.managed-service';
 const HTML5_APPS_REPO = 'html5-apps-repo';
 const SAP_APPLICATION_CONTENT = 'com.sap.application.content';
@@ -454,77 +450,4 @@ async function adjustMtaYaml({ projectPath, adpProjectName, appRouterType, busin
     logger?.debug(`Adjusted MTA YAML for project ${projectPath}`);
     return yamlContent;
 }
-/**
- * Add fiori-tools-servestatic configuration to ui5.yaml and removes previously added configuration.
- *
- * @param basePath - path to application root
- * @param ui5Config - UI5 configuration object
- * @param logger - logger instance
- */
-async function addServeStaticMiddleware(basePath, ui5Config, logger) {
-    try {
-        if (ui5Config.findCustomMiddleware('fiori-tools-servestatic')) {
-            ui5Config.removeCustomMiddleware('fiori-tools-servestatic');
-        }
-        const paths = [];
-        // Add reusable library paths from ui5AppInfo.json if it exists
-        paths.push(...(0, ui5_app_info_1.getReusableLibraryPaths)(basePath, logger));
-        const variant = await (0, helper_1.getVariant)(basePath);
-        const builtVariantId = variant.id.replaceAll('.', '_');
-        paths.push({
-            path: `/changes/${builtVariantId}`,
-            src: './webapp/changes',
-            fallthrough: true
-        }, {
-            path: `/${builtVariantId}/i18n`,
-            src: './webapp/i18n',
-            fallthrough: true
-        });
-        ui5Config.addCustomMiddleware([
-            {
-                name: 'fiori-tools-servestatic',
-                beforeMiddleware: 'compression',
-                configuration: {
-                    paths
-                }
-            }
-        ]);
-    }
-    catch (error) {
-        logger?.warn(`Could not add fiori-tools-servestatic configuration: ${error.message}`);
-        throw error;
-    }
-}
-/**
- * Add backend-proxy-middleware-cf configuration to ui5.yaml.
- *
- * @param basePath - path to application root
- * @param ui5Config - UI5 configuration object
- * @param serviceKeys - service keys from Cloud Foundry
- * @param logger - logger instance
- */
-function addBackendProxyMiddleware(basePath, ui5Config, serviceKeys, logger) {
-    try {
-        if (ui5Config.findCustomMiddleware('backend-proxy-middleware-cf')) {
-            ui5Config.removeCustomMiddleware('backend-proxy-middleware-cf');
-        }
-        const urlsWithPaths = (0, discovery_1.getBackendUrlsWithPaths)(serviceKeys, basePath);
-        if (urlsWithPaths.length === 0) {
-            logger?.info('No backend URLs with paths found. Skipping backend-proxy-middleware-cf configuration.');
-            return;
-        }
-        ui5Config.addCustomMiddleware([
-            {
-                name: 'backend-proxy-middleware-cf',
-                afterMiddleware: 'compression',
-                configuration: {
-                    backends: urlsWithPaths
-                }
-            }
-        ]);
-    }
-    catch (error) {
-        logger?.warn(`Could not add backend-proxy-middleware-cf configuration: ${error.message}`);
-    }
-}
 //# sourceMappingURL=yaml.js.map

package/dist/writer/cf.d.ts

@@ -20,14 +20,13 @@ export declare function generateCf(basePath: string, config: CfAdpWriterConfig,
  */
 export declare function writeUi5AppInfo(basePath: string, ui5AppInfo: CfUi5AppInfo, logger?: ToolsLogger): Promise<void>;
 /**
- * Generate CF configuration for an adaptation project.
+ * Setup CF adaptation project for local preview.
+ * Fetches ui5AppInfo.json and builds the project.
  *
  * @param basePath - path to project root
  * @param yamlPath - path to the project configuration file in YAML format
  * @param cfConfig - CF configuration
  * @param logger - logger instance
- * @param fs - mem-fs editor instance
- * @returns updated mem-fs editor instance
  */
-export declare function generateCfConfig(basePath: string, yamlPath: string, cfConfig: CfConfig, logger?: ToolsLogger, fs?: Editor): Promise<Editor>;
+export declare function setupCfPreview(basePath: string, yamlPath: string, cfConfig: CfConfig, logger?: ToolsLogger): Promise<void>;
 //# sourceMappingURL=cf.d.ts.map

package/dist/writer/cf.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateCf = generateCf;
 exports.writeUi5AppInfo = writeUi5AppInfo;
-exports.generateCfConfig = generateCfConfig;
+exports.setupCfPreview = setupCfPreview;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = require("node:path");
 const mem_fs_1 = require("mem-fs");
@@ -95,17 +95,15 @@ async function writeUi5AppInfo(basePath, ui5AppInfo, logger) {
     }
 }
 /**
- * Generate CF configuration for an adaptation project.
+ * Setup CF adaptation project for local preview.
+ * Fetches ui5AppInfo.json and builds the project.
  *
  * @param basePath - path to project root
  * @param yamlPath - path to the project configuration file in YAML format
  * @param cfConfig - CF configuration
  * @param logger - logger instance
- * @param fs - mem-fs editor instance
- * @returns updated mem-fs editor instance
  */
-async function generateCfConfig(basePath, yamlPath, cfConfig, logger, fs) {
-    fs ??= (0, mem_fs_editor_1.create)((0, mem_fs_1.create)());
+async function setupCfPreview(basePath, yamlPath, cfConfig, logger) {
     const ui5Config = await (0, project_access_1.readUi5Yaml)(basePath, yamlPath);
     const bundlerTask = ui5Config.findCustomTask('app-variant-bundler-build');
     const serviceInstanceName = bundlerTask?.configuration?.serviceInstanceName;
@@ -126,10 +124,6 @@ async function generateCfConfig(basePath, yamlPath, cfConfig, logger, fs) {
         throw new Error('No app host IDs found in service keys.');
     }
     await writeUi5AppInfo(basePath, ui5AppInfo, logger);
-    await (0, cf_1.addServeStaticMiddleware)(basePath, ui5Config, logger);
     await (0, project_builder_1.runBuild)(basePath, { ADP_BUILDER_MODE: 'preview' });
-    (0, cf_1.addBackendProxyMiddleware)(basePath, ui5Config, serviceInfo.serviceKeys, logger);
-    fs.write((0, node_path_1.join)(basePath, yamlPath), ui5Config.toString());
-    return fs;
 }
 //# sourceMappingURL=cf.js.map

package/dist/writer/options.d.ts

@@ -69,13 +69,7 @@ export declare function enhanceManifestChangeContentWithFlpConfig(flpConfigurati
  */
 export declare function enhanceUI5YamlWithCfCustomTask(ui5Config: UI5Config, config: CfAdpWriterConfig): void;
 /**
- * Generate custom configuration required for the ui5.yaml.
- *
- * @param {UI5Config} ui5Config - Configuration representing the ui5.yaml.
- * @param {CfAdpWriterConfig} config - Full project configuration.
- */
-/**
- * Generate custom middleware configuration (fiori-tools-proxy and fiori-tools-preview only).
+ * Generate custom middleware configuration for CF adaptation projects.
  *
  * @param {UI5Config} ui5Config - Configuration representing the ui5.yaml.
  */

package/dist/writer/options.js

@@ -332,13 +332,7 @@ function enhanceUI5YamlWithCfCustomTask(ui5Config, config) {
     ]);
 }
 /**
- * Generate custom configuration required for the ui5.yaml.
- *
- * @param {UI5Config} ui5Config - Configuration representing the ui5.yaml.
- * @param {CfAdpWriterConfig} config - Full project configuration.
- */
-/**
- * Generate custom middleware configuration (fiori-tools-proxy and fiori-tools-preview only).
+ * Generate custom middleware configuration for CF adaptation projects.
  *
  * @param {UI5Config} ui5Config - Configuration representing the ui5.yaml.
  */
@@ -346,8 +340,34 @@ function enhanceUI5YamlWithFioriToolsMiddleware(ui5Config) {
     const ui5ConfigOptions = {
         url: constants_1.UI5_CDN_URL
     };
-    // Add fiori-tools-appreload for live reload during development
-    ui5Config.addFioriToolsAppReloadMiddleware();
+    // Add backend-proxy-middleware-cf as the first middleware (after compression)
+    ui5Config.addCustomMiddleware([
+        {
+            name: 'backend-proxy-middleware-cf',
+            afterMiddleware: 'compression',
+            configuration: {
+                authenticationMethod: 'route',
+                allowServices: true,
+                appendAuthRoute: true,
+                debug: true,
+                xsappJsonPath: '.adp/reuse/xs-app.json',
+                allowLocalDir: true,
+                rewriteContent: false
+            }
+        }
+    ]);
+    // Add fiori-tools-appreload for live reload during development (after backend-proxy-middleware-cf)
+    ui5Config.addCustomMiddleware([
+        {
+            name: 'fiori-tools-appreload',
+            afterMiddleware: 'backend-proxy-middleware-cf',
+            configuration: {
+                port: 35729,
+                path: 'webapp',
+                delay: 300
+            }
+        }
+    ]);
     // Add fiori-tools-preview (for local preview)
     ui5Config.addCustomMiddleware([
         {

package/dist/writer/project-utils.js

@@ -157,7 +157,6 @@ async function writeCfUI5Yaml(projectPath, data, fs) {
         /** Builder task */
         (0, options_1.enhanceUI5YamlWithCfCustomTask)(ui5Config, data);
         /** Middlewares */
-        // Add fiori-tools-proxy and fiori-tools-preview for local development
         (0, options_1.enhanceUI5YamlWithFioriToolsMiddleware)(ui5Config);
         fs.write(ui5ConfigPath, ui5Config.toString());
     }

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.110",
+  "version": "0.18.112",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -36,19 +36,19 @@
     "prompts": "2.4.2",
     "sanitize-filename": "1.6.4",
     "uuid": "11.1.0",
-    "@sap-ux/axios-extension": "1.25.28",
+    "@sap-ux/axios-extension": "1.25.29",
     "@sap-ux/btp-utils": "1.1.12",
     "@sap-ux/i18n": "0.3.10",
-    "@sap-ux/inquirer-common": "0.11.33",
-    "@sap-ux/logger": "0.8.4",
+    "@sap-ux/inquirer-common": "0.11.34",
+    "@sap-ux/logger": "0.8.5",
     "@sap-ux/nodejs-utils": "0.2.19",
-    "@sap-ux/odata-service-writer": "0.31.5",
-    "@sap-ux/project-access": "1.35.18",
-    "@sap-ux/project-input-validator": "0.6.74",
-    "@sap-ux/store": "1.5.12",
-    "@sap-ux/system-access": "0.7.4",
-    "@sap-ux/ui5-config": "0.30.1",
-    "@sap-ux/ui5-info": "0.13.17"
+    "@sap-ux/odata-service-writer": "0.31.6",
+    "@sap-ux/project-access": "1.35.19",
+    "@sap-ux/project-input-validator": "0.6.75",
+    "@sap-ux/store": "1.5.13",
+    "@sap-ux/system-access": "0.7.5",
+    "@sap-ux/ui5-config": "0.30.2",
+    "@sap-ux/ui5-info": "0.13.18"
   },
   "devDependencies": {
     "@types/adm-zip": "0.5.8",
@@ -68,7 +68,7 @@
     "nock": "14.0.11",
     "rimraf": "6.1.3",
     "supertest": "7.2.2",
-    "@sap-ux/store": "1.5.12"
+    "@sap-ux/store": "1.5.13"
   },
   "engines": {
     "node": ">=20.x"

package/templates/cf/package.json

@@ -23,11 +23,11 @@
 	"devDependencies": {
 		"@sap-ux/create": "^0.15.9",
 		"@sap/ui5-builder-webide-extension": "^1.1.9",
-		"@sap-ux/backend-proxy-middleware-cf": "~0.0.0",
+		"@sap-ux/backend-proxy-middleware-cf": "^0.1.0",
 		"@sapui5/ts-types": "^1.141.2",
 		"@sap/ux-ui5-tooling": "1",
 		"@ui5/cli": "^4.0.33",
-		"@ui5/task-adaptation": "1.6.0-rc.4",
+		"@ui5/task-adaptation": "^1.6.3",
 		"bestzip": "^2.2.1",
 		"rimraf": "^6.1.2",
 		"mbt": "^1.2.34"

package/dist/cf/project/ui5-app-info.d.ts

@@ -1,14 +0,0 @@
-import type { ToolsLogger } from '@sap-ux/logger';
-/**
- * Extracts reusable library paths from ui5AppInfo.json if it exists.
- *
- * @param basePath - path to application root
- * @param logger - logger instance
- * @returns Array of path configurations for reusable libraries
- */
-export declare function getReusableLibraryPaths(basePath: string, logger?: ToolsLogger): Array<{
-    path: string;
-    src: string;
-    fallthrough: boolean;
-}>;
-//# sourceMappingURL=ui5-app-info.d.ts.map

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

@@ -1,36 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getReusableLibraryPaths = getReusableLibraryPaths;
-const node_fs_1 = __importDefault(require("node:fs"));
-const node_path_1 = __importDefault(require("node:path"));
-/**
- * Extracts reusable library paths from ui5AppInfo.json if it exists.
- *
- * @param basePath - path to application root
- * @param logger - logger instance
- * @returns Array of path configurations for reusable libraries
- */
-function getReusableLibraryPaths(basePath, logger) {
-    const ui5AppInfoPath = node_path_1.default.join(basePath, 'ui5AppInfo.json');
-    if (!node_fs_1.default.existsSync(ui5AppInfoPath)) {
-        logger?.warn('ui5AppInfo.json not found in project root');
-        return [];
-    }
-    const ui5AppInfoData = JSON.parse(node_fs_1.default.readFileSync(ui5AppInfoPath, 'utf-8'));
-    const ui5AppInfo = ui5AppInfoData[Object.keys(ui5AppInfoData)[0]];
-    const reusableLibs = ui5AppInfo.asyncHints?.libs?.filter((lib) => lib.html5AppName && lib.url && typeof lib.url === 'object' && lib.url.url !== undefined) ?? [];
-    return reusableLibs.map((lib) => {
-        const libName = String(lib.name);
-        const html5AppName = String(lib.html5AppName);
-        const resourcePath = '/resources/' + libName.replaceAll('.', '/');
-        return {
-            path: resourcePath,
-            src: `./.adp/reuse/${html5AppName}`,
-            fallthrough: true
-        };
-    });
-}
-//# sourceMappingURL=ui5-app-info.js.map