@sap-ux/generator-adp 0.9.31 → 0.9.32

package/generators/add-annotations-to-odata/index.js

@@ -55,8 +55,10 @@ class AddAnnotationsToDataGenerator extends sub_gen_auth_base_1.default {
             }
         };
         if (!this.answers.filePath) {
-            const metadata = await this.manifestService.getDataSourceMetadata(this.answers.id);
-            changeData.annotation.namespaces = (0, odata_service_writer_1.getAnnotationNamespaces)({ metadata });
+            if (!this.isCFProject) {
+                const metadata = await this.manifestService.getDataSourceMetadata(this.answers.id);
+                changeData.annotation.namespaces = (0, odata_service_writer_1.getAnnotationNamespaces)({ metadata });
+            }
         }
         await (0, adp_tooling_1.generateChange)(this.projectPath, "appdescr_app_addAnnotationsToOData" /* ChangeType.ADD_ANNOTATIONS_TO_ODATA */, changeData, this.fs, (0, templates_1.getTemplatesOverwritePath)());
         this.logger.log('Change written to changes folder');

package/generators/base/sub-gen-auth-base.d.ts

@@ -1,7 +1,7 @@
 import type { Manifest } from '@sap-ux/project-access';
 import { type AbapTarget } from '@sap-ux/system-access';
-import type { DescriptorVariant } from '@sap-ux/adp-tooling';
-import { ManifestService, SystemLookup } from '@sap-ux/adp-tooling';
+import type { DescriptorVariant, IManifestService } from '@sap-ux/adp-tooling';
+import { SystemLookup } from '@sap-ux/adp-tooling';
 import SubGeneratorBase from './sub-gen-base';
 import type { GeneratorOpts } from '../utils/opts';
 import type { GeneratorTypes } from '../types';
@@ -27,9 +27,9 @@ export default class SubGeneratorWithAuthBase extends SubGeneratorBase {
      */
     protected readonly generatorType: GeneratorTypes;
     /**
-     * The manifest service.
+     * The manifest service (ABAP or CF).
      */
-    manifestService: ManifestService;
+    manifestService: IManifestService;
     /**
      * Whether the generator requires authentication.
      */
@@ -42,6 +42,10 @@ export default class SubGeneratorWithAuthBase extends SubGeneratorBase {
      * The system lookup instance.
      */
     protected systemLookup: SystemLookup;
+    /**
+     * Whether this is a CF project.
+     */
+    protected isCFProject: boolean;
     /**
      * The VSCode instance.
      */
@@ -61,7 +65,8 @@ export default class SubGeneratorWithAuthBase extends SubGeneratorBase {
     protected onInit(): Promise<void>;
     /**
      * Retrieves and parses the manifest (app descriptor) of the current project.
-     * Requests credentials when required by the destination system.
+     * For CF projects, builds the project and reads the manifest from the dist folder.
+     * For ABAP projects, fetches the merged manifest via the ABAP service provider.
      *
      * @returns {Promise<Manifest>} The manifest.
      */

package/generators/base/sub-gen-auth-base.js

@@ -34,7 +34,7 @@ class SubGeneratorWithAuthBase extends sub_gen_base_1.default {
      */
     generatorType;
     /**
-     * The manifest service.
+     * The manifest service (ABAP or CF).
      */
     manifestService;
     /**
@@ -49,6 +49,10 @@ class SubGeneratorWithAuthBase extends sub_gen_base_1.default {
      * The system lookup instance.
      */
     systemLookup;
+    /**
+     * Whether this is a CF project.
+     */
+    isCFProject = false;
     /**
      * The VSCode instance.
      */
@@ -75,6 +79,14 @@ class SubGeneratorWithAuthBase extends sub_gen_base_1.default {
     async onInit() {
         await (0, i18n_1.initI18n)();
         this.systemLookup = new adp_tooling_1.SystemLookup(this.logger);
+        this.isCFProject = await (0, adp_tooling_1.isCFEnvironment)(this.projectPath);
+        if (this.isCFProject) {
+            this.system = '';
+            this.logger.log('CF project detected, will use build output for manifest');
+            this._registerPrompts(new yeoman_ui_types_1.Prompts((0, steps_1.getSubGenAuthPages)(this.generatorType, this.system)));
+            this.prompts.splice(0, 1, []);
+            return;
+        }
         const adpConfig = await (0, adp_tooling_1.getAdpConfig)(this.projectPath, node_path_1.default.join(this.projectPath, 'ui5.yaml'));
         this.abapTarget = adpConfig.target;
         this.system = ((0, btp_utils_1.isAppStudio)() ? this.abapTarget.destination : this.abapTarget.url) ?? '';
@@ -94,21 +106,27 @@ class SubGeneratorWithAuthBase extends sub_gen_base_1.default {
     }
     /**
      * Retrieves and parses the manifest (app descriptor) of the current project.
-     * Requests credentials when required by the destination system.
+     * For CF projects, builds the project and reads the manifest from the dist folder.
+     * For ABAP projects, fetches the merged manifest via the ABAP service provider.
      *
      * @returns {Promise<Manifest>} The manifest.
      */
     async getManifest() {
-        let requestOptions;
-        if (this.requiresAuth) {
-            const credentials = (await this.prompt((0, credentials_1.getCredentialsPrompts)(this.abapTarget, this.logger)));
-            requestOptions = { auth: { username: credentials.username, password: credentials.password } };
-        }
         this.variant = await (0, adp_tooling_1.getVariant)(this.projectPath);
-        const yamlPath = node_path_1.default.join(this.projectPath, 'ui5.yaml');
-        const { target, ignoreCertErrors = false } = await (0, adp_tooling_1.getAdpConfig)(this.projectPath, yamlPath);
-        const provider = await (0, system_access_1.createAbapServiceProvider)(target, { ...requestOptions, ignoreCertErrors }, true, this.logger);
-        this.manifestService = await adp_tooling_1.ManifestService.initMergedManifest(provider, this.projectPath, this.variant, this.logger);
+        if (this.isCFProject) {
+            this.manifestService = await adp_tooling_1.ManifestServiceCF.init(this.projectPath, this.logger);
+        }
+        else {
+            let requestOptions;
+            if (this.requiresAuth) {
+                const credentials = (await this.prompt((0, credentials_1.getCredentialsPrompts)(this.abapTarget, this.logger)));
+                requestOptions = { auth: { username: credentials.username, password: credentials.password } };
+            }
+            const yamlPath = node_path_1.default.join(this.projectPath, 'ui5.yaml');
+            const { target, ignoreCertErrors = false } = await (0, adp_tooling_1.getAdpConfig)(this.projectPath, yamlPath);
+            const provider = await (0, system_access_1.createAbapServiceProvider)(target, { ...requestOptions, ignoreCertErrors }, true, this.logger);
+            this.manifestService = await adp_tooling_1.ManifestService.initMergedManifest(provider, this.projectPath, this.variant, this.logger);
+        }
         const manifest = this.manifestService.getManifest();
         const oDataSources = this.manifestService.getManifestDataSources();
         this.logger.log(`OData sources from manifest\n${JSON.stringify(oDataSources, null, 2)}`);

package/package.json

@@ -3,7 +3,7 @@
   "displayName": "SAPUI5 Adaptation Project",
   "homepage": "https://help.sap.com/viewer/584e0bcbfd4a4aff91c815cefa0bce2d/Cloud/en-US/ada9567b767941aba8d49fdb4fdedea7.html",
   "description": "Adaptation project allows you to create an app variant for an existing SAP Fiori elements-based or SAPUI5 freestyle application, without changing the original application.",
-  "version": "0.9.31",
+  "version": "0.9.32",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,7 +30,7 @@
     "i18next": "25.8.18",
     "yeoman-generator": "5.10.0",
     "uuid": "11.1.0",
-    "@sap-ux/adp-tooling": "0.18.94",
+    "@sap-ux/adp-tooling": "0.18.95",
     "@sap-ux/axios-extension": "1.25.24",
     "@sap-ux/btp-utils": "1.1.10",
     "@sap-ux/feature-toggle": "0.3.7",
@@ -57,7 +57,7 @@
     "fs-extra": "11.3.4",
     "rimraf": "6.1.3",
     "yeoman-test": "6.3.0",
-    "@sap-ux/deploy-config-sub-generator": "0.5.113"
+    "@sap-ux/deploy-config-sub-generator": "0.5.114"
   },
   "engines": {
     "node": ">=20.x"