@sap-ux/adp-tooling 1.0.55 → 1.0.58

package/dist/base/project-builder.d.ts

@@ -1,3 +1,5 @@
+import type { ReaderCollection } from '@ui5/fs';
+import type { MergedAppDescriptor } from '@sap-ux/axios-extension';
 /**
  * Executes a build command in the specified project directory.
  *
@@ -9,4 +11,16 @@
  * @throws {Error} If the build process fails or if an error occurs during cleanup.
  */
 export declare function runBuild(projectPath: string, env?: NodeJS.ProcessEnv): Promise<void>;
+/**
+ * Produces the merged manifest.json for a CF ADP project using the workspace
+ * and cached base app files from the last full build.
+ *
+ * Precondition: a full build must have run at least once so the base app files are
+ * in the local cache. Throws if the cache is empty.
+ *
+ * @param {string} projectPath - Absolute path to the project root (where ui5.yaml lives).
+ * @param {ReaderCollection} workspace - The UI5 project workspace (this.project in AdpPreview).
+ * @returns {Promise<MergedAppDescriptor['manifest']>} The merged manifest.
+ */
+export declare function getPreviewManifest(projectPath: string, workspace: ReaderCollection): Promise<MergedAppDescriptor['manifest']>;
 //# sourceMappingURL=project-builder.d.ts.map

package/dist/base/project-builder.js

@@ -1,4 +1,5 @@
 import { CommandRunner } from '@sap-ux/nodejs-utils';
+import { readUi5Config, extractCfBuildTask } from './helper.js';
 /**
  * Executes a build command in the specified project directory.
  *
@@ -23,4 +24,33 @@ export async function runBuild(projectPath, env) {
         throw e;
     }
 }
+/**
+ * Produces the merged manifest.json for a CF ADP project using the workspace
+ * and cached base app files from the last full build.
+ *
+ * Precondition: a full build must have run at least once so the base app files are
+ * in the local cache. Throws if the cache is empty.
+ *
+ * @param {string} projectPath - Absolute path to the project root (where ui5.yaml lives).
+ * @param {ReaderCollection} workspace - The UI5 project workspace (this.project in AdpPreview).
+ * @returns {Promise<MergedAppDescriptor['manifest']>} The merged manifest.
+ */
+export async function getPreviewManifest(projectPath, workspace) {
+    const ui5Config = await readUi5Config(projectPath, 'ui5.yaml');
+    const buildTask = extractCfBuildTask(ui5Config);
+    const { module: projectNamespace, ...configuration } = buildTask;
+    // Dynamic import keeps @ui5/task-adaptation out of the static module graph of adp-tooling.
+    // A static import would leak task-adaptation's node:child_process imports into every
+    // consumer's Jest test environment, breaking mocks in packages like @sap-ux/create
+    // that mock node:child_process without spreading the real module.
+    const { previewManifest } = await import('@ui5/task-adaptation');
+    const manifest = await previewManifest({
+        workspace,
+        options: {
+            configuration,
+            projectNamespace
+        }
+    });
+    return manifest;
+}
 //# sourceMappingURL=project-builder.js.map

package/dist/preview/adp-preview.d.ts

@@ -96,6 +96,17 @@ export declare class AdpPreview {
      * The descriptor is refreshed only if the global flag is set to true.
      */
     sync(): Promise<void>;
+    /**
+     * Sync the merged descriptor and send its manifest.json as the response.
+     *
+     * Rewrites `ui5://<namespace>/` to absolute paths in the manifest so that
+     * FLP Sandbox 2.0's CDM does not map enhanceWith bundleUrls to the backend.
+     * Uses descriptorVariantId (from manifest.appdescr_variant) — the manifest's ui5:// URLs
+     * are built from the variant id, whereas mergedDescriptor.name is the base app reference.
+     *
+     * @param res outgoing response object
+     */
+    private sendManifest;
     /**
      * Proxy for the merged application manifest.json and blocking of preload files.
      *
@@ -104,6 +115,14 @@ export declare class AdpPreview {
      * @param next next middleware that is to be called if the request cannot be handled
      */
     proxy(req: Request, res: Response, next: NextFunction): Promise<void>;
+    /**
+     * CF build mode proxy that intercepts manifest.json requests and delegates everything else to the next middleware.
+     *
+     * @param req incoming request
+     * @param res outgoing response object
+     * @param next next middleware that is to be called if the request cannot be handled
+     */
+    cfProxy(req: Request, res: Response, next: NextFunction): Promise<void>;
     /**
      * Add additional APIs to the router that are required for adaptation projects only.
      *

package/dist/preview/adp-preview.js

@@ -4,7 +4,8 @@ import RoutesHandler from './routes-handler.js';
 import OvpRoutesHandler from './ovp-routes-handler.js';
 import { addAnnotationFile, addXmlFragment, isAddAnnotationChange, isAddXMLChange, isCodeExtChange, addControllerExtension, moduleNameContentMap, tryFixChange, isV4DescriptorChange } from './change-handler.js';
 import { addCustomFragment } from './descriptor-change-handler.js';
-import { getExistingAdpProjectType } from '../base/helper.js';
+import { getExistingAdpProjectType, readManifestFromBuildPath } from '../base/helper.js';
+import { getPreviewManifest } from '../base/project-builder.js';
 import path from 'node:path';
 export var ApiRoutes;
 (function (ApiRoutes) {
@@ -118,11 +119,12 @@ export class AdpPreview {
      * @returns {Promise<UI5FlexLayer>} The UI5 flex layer for which editing is enabled.
      */
     async init(descriptorVariant) {
-        if ('cfBuildPath' in this.config) {
+        if (this.isCloudFoundry) {
             return this.initCfBuildMode(descriptorVariant);
         }
+        const config = this.config;
         this.descriptorVariantId = descriptorVariant.id;
-        this.provider = await createAbapServiceProvider(this.config.target, { ignoreCertErrors: this.config.ignoreCertErrors }, true, this.logger);
+        this.provider = await createAbapServiceProvider(config.target, { ignoreCertErrors: config.ignoreCertErrors }, true, this.logger);
         this.routesHandler = new RoutesHandler(this.project, this.util, this.provider, this.logger);
         this.ovpRoutesHandler = new OvpRoutesHandler(this.provider, this.logger);
         this.lrep = this.provider.getLayeredRepository();
@@ -142,6 +144,14 @@ export class AdpPreview {
         this.descriptorVariantId = descriptorVariant.id;
         this.projectTypeValue = undefined;
         this.routesHandler = new RoutesHandler(this.project, this.util, {}, this.logger);
+        const config = this.config;
+        const manifest = readManifestFromBuildPath(config.cfBuildPath);
+        this.mergedDescriptor = {
+            name: descriptorVariant.id,
+            url: '/',
+            manifest,
+            asyncHints: { libs: [], components: [] }
+        };
         return descriptorVariant.layer;
     }
     /**
@@ -149,10 +159,12 @@ export class AdpPreview {
      * The descriptor is refreshed only if the global flag is set to true.
      */
     async sync() {
-        if ('cfBuildPath' in this.config) {
+        if (!global.__SAP_UX_MANIFEST_SYNC_REQUIRED__ && this.mergedDescriptor) {
             return;
         }
-        if (!global.__SAP_UX_MANIFEST_SYNC_REQUIRED__ && this.mergedDescriptor) {
+        if (this.isCloudFoundry) {
+            this.mergedDescriptor.manifest = await getPreviewManifest(this.util.getProject().getRootPath(), this.project);
+            global.__SAP_UX_MANIFEST_SYNC_REQUIRED__ = false;
             return;
         }
         if (!this.lrep || !this.descriptorVariantId) {
@@ -167,6 +179,23 @@ export class AdpPreview {
         this.mergedDescriptor = (await this.lrep.mergeAppDescriptorVariant(buffer, '//'))[this.descriptorVariantId];
         global.__SAP_UX_MANIFEST_SYNC_REQUIRED__ = false;
     }
+    /**
+     * Sync the merged descriptor and send its manifest.json as the response.
+     *
+     * Rewrites `ui5://<namespace>/` to absolute paths in the manifest so that
+     * FLP Sandbox 2.0's CDM does not map enhanceWith bundleUrls to the backend.
+     * Uses descriptorVariantId (from manifest.appdescr_variant) — the manifest's ui5:// URLs
+     * are built from the variant id, whereas mergedDescriptor.name is the base app reference.
+     *
+     * @param res outgoing response object
+     */
+    async sendManifest(res) {
+        await this.sync();
+        res.status(200);
+        const ui5Prefix = `ui5://${(this.descriptorVariantId ?? this.mergedDescriptor.name).replaceAll('.', '/')}/`;
+        const manifest = JSON.stringify(this.descriptor.manifest, undefined, 2).replaceAll(ui5Prefix, '/');
+        res.send(manifest);
+    }
     /**
      * Proxy for the merged application manifest.json and blocking of preload files.
      *
@@ -176,15 +205,7 @@ export class AdpPreview {
      */
     async proxy(req, res, next) {
         if (req.path === '/manifest.json') {
-            await this.sync();
-            res.status(200);
-            // Rewrite ui5://<namespace>/ to absolute paths in the manifest so that
-            // FLP Sandbox 2.0's CDM does not map enhanceWith bundleUrls to the backend.
-            // Use descriptorVariantId (from manifest.appdescr_variant) — the manifest's ui5:// URLs
-            // are built from the variant id, whereas mergedDescriptor.name is the base app reference.
-            const ui5Prefix = `ui5://${(this.descriptorVariantId ?? this.mergedDescriptor.name).replaceAll('.', '/')}/`;
-            const manifest = JSON.stringify(this.descriptor.manifest, undefined, 2).replaceAll(ui5Prefix, '/');
-            res.send(manifest);
+            await this.sendManifest(res);
         }
         else if (req.path === '/Component-preload.js') {
             res.status(404).send();
@@ -210,6 +231,21 @@ export class AdpPreview {
             }
         }
     }
+    /**
+     * CF build mode proxy that intercepts manifest.json requests and delegates everything else to the next middleware.
+     *
+     * @param req incoming request
+     * @param res outgoing response object
+     * @param next next middleware that is to be called if the request cannot be handled
+     */
+    async cfProxy(req, res, next) {
+        if (req.path === '/manifest.json') {
+            await this.sendManifest(res);
+        }
+        else {
+            next();
+        }
+    }
     /**
      * Add additional APIs to the router that are required for adaptation projects only.
      *

package/dist/types.d.ts

@@ -896,6 +896,7 @@ export interface UI5YamlCustomTaskConfiguration {
     appHostId: string;
     appName: string;
     appVersion: string;
+    module: string;
     moduleName: string;
     org: string;
     space: string;

package/package.json

@@ -10,7 +10,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Aadp-tooling"
   },
-  "version": "1.0.55",
+  "version": "1.0.58",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -37,15 +37,16 @@
     "prompts": "2.4.2",
     "sanitize-filename": "1.6.4",
     "uuid": "11.1.1",
+    "@ui5/task-adaptation": "1.6.8",
     "@sap-ux/axios-extension": "2.1.0",
     "@sap-ux/btp-utils": "2.0.6",
-    "@sap-ux/i18n": "1.0.3",
-    "@sap-ux/inquirer-common": "1.0.42",
+    "@sap-ux/i18n": "1.0.4",
+    "@sap-ux/inquirer-common": "1.0.44",
     "@sap-ux/logger": "1.0.3",
     "@sap-ux/nodejs-utils": "1.0.10",
-    "@sap-ux/odata-service-writer": "1.0.22",
-    "@sap-ux/project-access": "2.2.0",
-    "@sap-ux/project-input-validator": "1.0.19",
+    "@sap-ux/odata-service-writer": "1.0.23",
+    "@sap-ux/project-access": "2.2.1",
+    "@sap-ux/project-input-validator": "1.0.20",
     "@sap-ux/store": "2.0.7",
     "@sap-ux/system-access": "1.0.14",
     "@sap-ux/ui5-config": "1.0.9",