@sap-ux/adp-tooling 0.18.49 → 0.18.51

package/dist/base/helper.d.ts

@@ -82,7 +82,7 @@ export declare function loadAppVariant(rootProject: ReaderCollection): Promise<D
  * @param yamlPath  Relative or absolute path to the ui5.yaml file
  * @returns The `AdpPreviewConfig` object if found, otherwise throws an error.
  */
-export declare function getAdpConfig(basePath: string, yamlPath: string): Promise<AdpPreviewConfig>;
+export declare function getAdpConfig<T = AdpPreviewConfig>(basePath: string, yamlPath: string): Promise<T>;
 /**
  * Get all files in the webapp folder.
  *

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

@@ -4,7 +4,7 @@ import type { AppParamsExtended, MtaYaml } from '../../types';
 import { AppRouterType } from '../../types';
 interface AdjustMtaYamlParams {
     projectPath: string;
-    moduleName: string;
+    adpProjectName: string;
     appRouterType: AppRouterType;
     businessSolutionName: string;
     businessService: string;
@@ -46,6 +46,6 @@ export declare function getAppParamsFromUI5Yaml(projectPath: string): AppParamsE
  * @param {ToolsLogger} logger - The logger.
  * @returns {Promise<void>} The promise.
  */
-export declare function adjustMtaYaml({ projectPath, moduleName, appRouterType, businessSolutionName, businessService }: AdjustMtaYamlParams, memFs: Editor, templatePathOverwrite?: string, logger?: ToolsLogger): Promise<void>;
+export declare function adjustMtaYaml({ projectPath, adpProjectName, appRouterType, businessSolutionName, businessService }: AdjustMtaYamlParams, memFs: Editor, templatePathOverwrite?: string, logger?: ToolsLogger): Promise<void>;
 export {};
 //# sourceMappingURL=yaml.d.ts.map

package/dist/cf/project/yaml.js

@@ -229,11 +229,11 @@ function adjustMtaYamlManagedApprouter(yamlContent, projectName, businessSolutio
  * Adjusts the MTA YAML for a UI deployer.
  *
  * @param {MtaYaml} yamlContent - The YAML content.
- * @param {string} projectName - The project name.
- * @param {string} moduleName - The module name.
+ * @param {string} mtaProjectName - The MTA project name.
+ * @param {string} adpProjectName - The ADP project name.
  */
-function adjustMtaYamlUDeployer(yamlContent, projectName, moduleName) {
-    const uiDeployerName = `${projectName}_ui_deployer`;
+function adjustMtaYamlUDeployer(yamlContent, mtaProjectName, adpProjectName) {
+    const uiDeployerName = `${mtaProjectName}_ui_deployer`;
     let uiDeployer = yamlContent.modules?.find((module) => module.name === uiDeployerName);
     if (uiDeployer == null) {
         uiDeployer = {
@@ -248,7 +248,7 @@ function adjustMtaYamlUDeployer(yamlContent, projectName, moduleName) {
         };
         yamlContent.modules?.push(uiDeployer);
     }
-    const htmlRepoHostName = `${projectName}_html_repo_host`;
+    const htmlRepoHostName = `${mtaProjectName}_html_repo_host`;
     if (uiDeployer.requires?.every((req) => req.name !== htmlRepoHostName)) {
         uiDeployer.requires?.push({
             name: htmlRepoHostName,
@@ -257,10 +257,10 @@ function adjustMtaYamlUDeployer(yamlContent, projectName, moduleName) {
             }
         });
     }
-    if (uiDeployer['build-parameters']?.requires?.every((require) => require.name !== moduleName)) {
+    if (uiDeployer['build-parameters']?.requires?.every((require) => require.name !== adpProjectName)) {
         uiDeployer['build-parameters']?.requires?.push({
-            artifacts: [`${moduleName}.zip`],
-            name: moduleName,
+            artifacts: [`${adpProjectName}.zip`],
+            name: adpProjectName,
             'target-path': 'resources/'
         });
     }
@@ -269,24 +269,24 @@ function adjustMtaYamlUDeployer(yamlContent, projectName, moduleName) {
  * Adjusts the MTA YAML for resources.
  *
  * @param {MtaYaml} yamlContent - The YAML content.
- * @param {string} projectName - The project name.
+ * @param {string} mtaProjectName - The project name.
  * @param {string} timestamp - The timestamp.
  * @param {boolean} isManagedAppRouter - Whether the approuter is managed.
  */
-function adjustMtaYamlResources(yamlContent, projectName, timestamp, isManagedAppRouter) {
+function adjustMtaYamlResources(yamlContent, mtaProjectName, timestamp, isManagedAppRouter) {
     const projectNameForXsSecurity = (0, yaml_loader_1.getProjectNameForXsSecurity)(yamlContent, timestamp);
     const resources = [
         {
-            name: `${projectName}_html_repo_host`,
+            name: `${mtaProjectName}_html_repo_host`,
             type: CF_MANAGED_SERVICE,
             parameters: {
                 service: HTML5_APPS_REPO,
                 'service-plan': 'app-host',
-                'service-name': `${projectName}-html5_app_host`
+                'service-name': `${mtaProjectName}-html5_app_host`
             }
         },
         {
-            name: `${projectName}_uaa`,
+            name: `${mtaProjectName}_uaa`,
             type: CF_MANAGED_SERVICE,
             parameters: {
                 service: 'xsuaa',
@@ -298,11 +298,11 @@ function adjustMtaYamlResources(yamlContent, projectName, timestamp, isManagedAp
     ];
     if (isManagedAppRouter) {
         resources.push({
-            name: `${projectName}-destination`,
+            name: `${mtaProjectName}-destination`,
             type: CF_MANAGED_SERVICE,
             parameters: {
                 service: 'destination',
-                'service-name': `${projectName}-destination`,
+                'service-name': `${mtaProjectName}-destination`,
                 'service-plan': 'lite',
                 config: {
                     HTML5Runtime_enabled: true,
@@ -313,14 +313,14 @@ function adjustMtaYamlResources(yamlContent, projectName, timestamp, isManagedAp
     }
     else {
         resources.push({
-            name: `portal_resources_${projectName}`,
+            name: `portal_resources_${mtaProjectName}`,
             type: CF_MANAGED_SERVICE,
             parameters: {
                 service: 'portal',
                 'service-plan': 'standard'
             }
         }, {
-            name: `${projectName}_html_repo_runtime`,
+            name: `${mtaProjectName}_html_repo_runtime`,
             type: CF_MANAGED_SERVICE,
             parameters: {
                 service: HTML5_APPS_REPO,
@@ -338,15 +338,15 @@ function adjustMtaYamlResources(yamlContent, projectName, timestamp, isManagedAp
  * Adjusts the MTA YAML for the own module.
  *
  * @param {MtaYaml} yamlContent - The YAML content.
- * @param {string} moduleName - The module name.
+ * @param {string} adpProjectName - The ADP project name.
  */
-function adjustMtaYamlOwnModule(yamlContent, moduleName) {
-    let module = yamlContent.modules?.find((module) => module.name === moduleName);
+function adjustMtaYamlOwnModule(yamlContent, adpProjectName) {
+    let module = yamlContent.modules?.find((module) => module.name === adpProjectName);
     if (module == null) {
         module = {
-            name: moduleName,
+            name: adpProjectName,
             type: 'html5',
-            path: moduleName,
+            path: adpProjectName,
             'build-parameters': {
                 builder: 'custom',
                 commands: ['npm install', 'npm run build'],
@@ -400,7 +400,7 @@ function adjustMtaYamlFlpModule(yamlContent, projectName, businessService) {
  * @param {ToolsLogger} logger - The logger.
  * @returns {Promise<void>} The promise.
  */
-async function adjustMtaYaml({ projectPath, moduleName, appRouterType, businessSolutionName, businessService }, memFs, templatePathOverwrite, logger) {
+async function adjustMtaYaml({ projectPath, adpProjectName, appRouterType, businessSolutionName, businessService }, memFs, templatePathOverwrite, logger) {
     const timestamp = Date.now().toString();
     const mtaYamlPath = path.join(projectPath, 'mta.yaml');
     const loadedYamlContent = (0, yaml_loader_1.getYamlContent)(mtaYamlPath);
@@ -415,20 +415,20 @@ async function adjustMtaYaml({ projectPath, moduleName, appRouterType, businessS
         appRouterType = getRouterType(loadedYamlContent);
     }
     const yamlContent = Object.assign(defaultYaml, loadedYamlContent);
-    const projectName = yamlContent.ID.toLowerCase();
+    const mtaProjectName = yamlContent.ID.toLowerCase();
     const initialServices = yamlContent.resources?.map((resource) => resource.parameters.service ?? '') ?? [];
     const isStandaloneApprouter = appRouterType === types_1.AppRouterType.STANDALONE;
     if (isStandaloneApprouter) {
-        adjustMtaYamlStandaloneApprouter(yamlContent, projectName, businessService);
+        adjustMtaYamlStandaloneApprouter(yamlContent, mtaProjectName, businessService);
     }
     else {
-        adjustMtaYamlManagedApprouter(yamlContent, projectName, businessSolutionName, businessService, timestamp);
+        adjustMtaYamlManagedApprouter(yamlContent, mtaProjectName, businessSolutionName, businessService, timestamp);
     }
-    adjustMtaYamlUDeployer(yamlContent, projectName, moduleName);
-    adjustMtaYamlResources(yamlContent, projectName, timestamp, !isStandaloneApprouter);
-    adjustMtaYamlOwnModule(yamlContent, moduleName);
+    adjustMtaYamlUDeployer(yamlContent, mtaProjectName, adpProjectName);
+    adjustMtaYamlResources(yamlContent, mtaProjectName, timestamp, !isStandaloneApprouter);
+    adjustMtaYamlOwnModule(yamlContent, adpProjectName);
     // should go last since it sorts the modules (workaround, should be removed after fixed in deployment module)
-    adjustMtaYamlFlpModule(yamlContent, projectName, businessService);
+    adjustMtaYamlFlpModule(yamlContent, mtaProjectName, businessService);
     await (0, api_1.createServices)(yamlContent, initialServices, timestamp, templatePathOverwrite, logger);
     const updatedYamlContent = js_yaml_1.default.dump(yamlContent);
     memFs.write(mtaYamlPath, updatedYamlContent);

package/dist/preview/adp-preview.js

@@ -99,7 +99,7 @@ class AdpPreview {
      * @returns {Promise<UI5FlexLayer>} The UI5 flex layer for which editing is enabled.
      */
     async init(descriptorVariant) {
-        if (this.config.cfBuildPath) {
+        if ('cfBuildPath' in this.config) {
             return this.initCfBuildMode(descriptorVariant);
         }
         this.descriptorVariantId = descriptorVariant.id;
@@ -130,7 +130,7 @@ class AdpPreview {
      * The descriptor is refreshed only if the global flag is set to true.
      */
     async sync() {
-        if (this.config.cfBuildPath) {
+        if ('cfBuildPath' in this.config) {
             return;
         }
         if (!global.__SAP_UX_MANIFEST_SYNC_REQUIRED__ && this.mergedDescriptor) {

package/dist/types.d.ts

@@ -29,17 +29,30 @@ export interface ToolsSupport {
  * Reduce the options exposed as target configuration.
  */
 type AbapTarget = DestinationAbapTarget | Pick<UrlAbapTarget, 'url' | 'client' | 'scp'>;
-export interface AdpPreviewConfig {
+/**
+ * Configuration for ADP preview using ABAP target connection.
+ */
+export interface AdpPreviewConfigWithTarget {
     target: AbapTarget;
     /**
      * If set to true then certification validation errors are ignored.
      */
     ignoreCertErrors?: boolean;
+}
+/**
+ * Configuration for ADP preview using CF build output path.
+ */
+export interface AdpPreviewConfigWithBuildPath {
     /**
      * For CF ADP projects: path to build output folder (e.g., 'dist') to serve resources directly.
      */
-    cfBuildPath?: string;
+    cfBuildPath: string;
+    /**
+     * If set to true then certification validation errors are ignored.
+     */
+    ignoreCertErrors?: boolean;
 }
+export type AdpPreviewConfig = AdpPreviewConfigWithTarget | AdpPreviewConfigWithBuildPath;
 export interface OnpremApp {
     /** Application variant id. */
     id: string;

package/dist/writer/cf.js

@@ -22,10 +22,10 @@ async function generateCf(basePath, config, logger, fs) {
         fs = (0, mem_fs_editor_1.create)((0, mem_fs_1.create)());
     }
     const fullConfig = setDefaults(config);
-    const { app, cf, ui5 } = fullConfig;
+    const { app, cf, ui5, project } = fullConfig;
     await (0, cf_1.adjustMtaYaml)({
         projectPath: basePath,
-        moduleName: app.id,
+        adpProjectName: project.name,
         appRouterType: cf.approuter,
         businessSolutionName: cf.businessSolutionName ?? '',
         businessService: cf.businessService

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.49",
+  "version": "0.18.51",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -24,7 +24,7 @@
   ],
   "dependencies": {
     "@sap-devx/yeoman-ui-types": "1.16.9",
-    "@sap/cf-tools": "3.2.2",
+    "@sap/cf-tools": "3.3.0",
     "adm-zip": "0.5.10",
     "axios": "1.12.2",
     "ejs": "3.1.10",
@@ -36,17 +36,17 @@
     "prompts": "2.4.2",
     "sanitize-filename": "1.6.3",
     "uuid": "10.0.0",
-    "@sap-ux/axios-extension": "1.25.9",
-    "@sap-ux/btp-utils": "1.1.6",
+    "@sap-ux/axios-extension": "1.25.10",
+    "@sap-ux/btp-utils": "1.1.7",
     "@sap-ux/i18n": "0.3.7",
-    "@sap-ux/inquirer-common": "0.10.21",
+    "@sap-ux/inquirer-common": "0.10.22",
     "@sap-ux/logger": "0.8.1",
-    "@sap-ux/nodejs-utils": "0.2.11",
+    "@sap-ux/nodejs-utils": "0.2.12",
     "@sap-ux/odata-service-writer": "0.29.12",
     "@sap-ux/project-access": "1.34.5",
     "@sap-ux/project-input-validator": "0.6.49",
     "@sap-ux/store": "1.5.3",
-    "@sap-ux/system-access": "0.6.46",
+    "@sap-ux/system-access": "0.6.47",
     "@sap-ux/ui5-config": "0.29.14",
     "@sap-ux/ui5-info": "0.13.10"
   },
@@ -66,7 +66,7 @@
     "dotenv": "16.6.1",
     "express": "4.22.1",
     "nock": "13.4.0",
-    "rimraf": "6.0.1",
+    "rimraf": "6.1.2",
     "supertest": "7.1.4",
     "@sap-ux/store": "1.5.3"
   },

package/templates/cf/package.json

@@ -18,7 +18,7 @@
 	},
 	"devDependencies": {
 		"@sap/ui5-builder-webide-extension": "^1.1.9",
-		"@sap-ux/backend-proxy-middleware-cf": "^0.0.1",
+		"@sap-ux/backend-proxy-middleware-cf": "0",
 		"@sapui5/ts-types": "^1.141.2",
 		"@sap/ux-ui5-tooling": "1",
 		"@ui5/cli": "^4.0.33",