WIP feat(project-access): add path-mappings for ui5 project type 'component'

package.json

@@ -41,7 +41,8 @@
         "typescript-eslint": "8.49.0",
         "update-ts-references": "3.6.2",
         "yargs-parser": "21.1.1",
-        "yaml":  "2.8.2"
+        "yaml": "2.8.2",
+        "@sap-ux/ui5-config": "workspace:*"
     },
     "scripts": {
         "update-ts-references": "update-ts-references",

packages/adp-tooling/src/base/helper.ts

@@ -1,13 +1,15 @@
 import type { Editor } from 'mem-fs-editor';
 import type { ReaderCollection } from '@ui5/fs'; // eslint-disable-line sonarjs/no-implicit-dependencies
 import { existsSync, readdirSync, readFileSync } from 'node:fs';
-import { join, isAbsolute, relative, basename, dirname } from 'node:path';
+import { join, isAbsolute, relative, basename, dirname, posix } from 'node:path';
 
 import type { UI5Config } from '@sap-ux/ui5-config';
 import type { InboundContent, Inbound } from '@sap-ux/axios-extension';
 import { getWebappPath, FileName, readUi5Yaml, type ManifestNamespace, type Manifest } from '@sap-ux/project-access';
 
 import type { DescriptorVariant, AdpPreviewConfig, UI5YamlCustomTaskConfiguration } from '../types';
+// eslint-disable-next-line sonarjs/no-implicit-dependencies
+import type { MiddlewareUtils } from '@ui5/server';
 
 /**
  * Get the app descriptor variant.
@@ -120,10 +122,18 @@ export function readManifestFromBuildPath(cfBuildPath: string): Manifest {
  * Load and parse the app variant descriptor.
  *
  * @param {ReaderCollection} rootProject - The root project.
+ * @param {MiddlewareUtils} utils - The middleware utils.
  * @returns {Promise<DescriptorVariant>} The parsed descriptor variant.
  */
-export async function loadAppVariant(rootProject: ReaderCollection): Promise<DescriptorVariant> {
-    const appVariant = await rootProject.byPath('/manifest.appdescr_variant');
+export async function loadAppVariant(
+    rootProject: ReaderCollection,
+    utils: MiddlewareUtils
+): Promise<DescriptorVariant> {
+    const pathPrefix =
+        utils.getProject?.()?.getType?.() === 'component'
+            ? posix.join('/resources', utils.getProject().getNamespace())
+            : '';
+    const appVariant = await rootProject.byPath(`${pathPrefix}/manifest.appdescr_variant`);
     if (!appVariant) {
         throw new Error('ADP configured but no manifest.appdescr_variant found.');
     }

packages/adp-tooling/test/unit/base/helper.test.ts

@@ -22,6 +22,9 @@ import {
     loadAppVariant
 } from '../../../src/base/helper';
 import { readUi5Yaml } from '@sap-ux/project-access';
+import { tmpdir } from 'node:os';
+//eslint-disable-next-line sonarjs/no-implicit-dependencies
+import type { MiddlewareUtils } from '@ui5/server';
 
 jest.mock('fs', () => {
     return {
@@ -421,6 +424,14 @@ describe('helper', () => {
             namespace: 'apps/base.app/appVariants/my.adaptation/',
             content: []
         };
+        const mockUtils = {
+            getProject() {
+                return {
+                    getSourcePath: () => tmpdir(),
+                    getType: () => 'application'
+                };
+            }
+        } as unknown as MiddlewareUtils;
 
         beforeEach(() => {
             jest.clearAllMocks();
@@ -435,7 +446,7 @@ describe('helper', () => {
                 byPath: jest.fn().mockResolvedValue(mockResource)
             } as unknown as ReaderCollection;
 
-            const result = await loadAppVariant(mockRootProject);
+            const result = await loadAppVariant(mockRootProject, mockUtils);
 
             expect(mockRootProject.byPath).toHaveBeenCalledWith('/manifest.appdescr_variant');
             expect(mockResource.getString).toHaveBeenCalled();
@@ -447,7 +458,7 @@ describe('helper', () => {
                 byPath: jest.fn().mockResolvedValue(null)
             } as unknown as ReaderCollection;
 
-            await expect(loadAppVariant(mockRootProject)).rejects.toThrow(
+            await expect(loadAppVariant(mockRootProject, mockUtils)).rejects.toThrow(
                 'ADP configured but no manifest.appdescr_variant found.'
             );
             expect(mockRootProject.byPath).toHaveBeenCalledWith('/manifest.appdescr_variant');
@@ -462,7 +473,7 @@ describe('helper', () => {
                 byPath: jest.fn().mockResolvedValue(mockResource)
             } as unknown as ReaderCollection;
 
-            await expect(loadAppVariant(mockRootProject)).rejects.toThrow(
+            await expect(loadAppVariant(mockRootProject, mockUtils)).rejects.toThrow(
                 'ADP configured but manifest.appdescr_variant file is empty.'
             );
             expect(mockRootProject.byPath).toHaveBeenCalledWith('/manifest.appdescr_variant');
@@ -479,7 +490,7 @@ describe('helper', () => {
                 byPath: jest.fn().mockResolvedValue(mockResource)
             } as unknown as ReaderCollection;
 
-            await expect(loadAppVariant(mockRootProject)).rejects.toThrow(
+            await expect(loadAppVariant(mockRootProject, mockUtils)).rejects.toThrow(
                 'Failed to parse manifest.appdescr_variant: File read error'
             );
             expect(mockRootProject.byPath).toHaveBeenCalledWith('/manifest.appdescr_variant');

packages/adp-tooling/test/unit/preview/adp-preview.test.ts

@@ -20,6 +20,8 @@ import * as manifestService from '../../../src/base/abap/manifest-service';
 import type { AddXMLChange, AdpPreviewConfig, CommonChangeProperties } from '../../../src';
 import { addXmlFragment, tryFixChange, addControllerExtension } from '../../../src/preview/change-handler';
 import { addCustomSectionFragment } from '../../../src/preview/descriptor-change-handler';
+// eslint-disable-next-line sonarjs/no-implicit-dependencies
+import type { MiddlewareUtils } from '@ui5/server';
 
 interface GetFragmentsResponse {
     fragments: { fragmentName: string }[];
@@ -142,10 +144,13 @@ describe('AdaptationProject', () => {
                 },
                 getNamespace() {
                     return 'adp/project';
+                },
+                getType() {
+                    return 'application';
                 }
             };
         }
-    };
+    } as unknown as MiddlewareUtils;
 
     const logger = new ToolsLogger();
     describe('init', () => {

packages/app-config-writer/src/preview-config/preview-files.ts

@@ -1,5 +1,5 @@
-import { join } from 'node:path';
-import { getWebappPath } from '@sap-ux/project-access';
+import { join, basename } from 'node:path';
+import { getWebappTestPath } from '@sap-ux/project-access';
 import type { Editor } from 'mem-fs-editor';
 import type { ToolsLogger } from '@sap-ux/logger';
 import { TEST_CONFIG_DEFAULTS } from '../common/ui5-yaml';
@@ -22,7 +22,9 @@ const renameMessage = (filePath: string): string =>
  * @param logger logger to report info to the user
  */
 export async function renameSandbox(fs: Editor, basePath: string, path: string, logger?: ToolsLogger): Promise<void> {
-    const filePath = join(await getWebappPath(basePath), path);
+    const webappTestPath = await getWebappTestPath(basePath);
+    const fileName = basename(path);
+    const filePath = join(webappTestPath, fileName);
     if (fs.exists(filePath)) {
         fs.move(filePath, filePath.replace('.html', '_old.html'));
         logger?.info(renameMessage(path));
@@ -86,7 +88,7 @@ export async function deleteNoLongerUsedFiles(
     convertTests: boolean,
     logger?: ToolsLogger
 ): Promise<void> {
-    const webappTestPath = join(await getWebappPath(basePath, fs), 'test');
+    const webappTestPath = await getWebappTestPath(basePath, fs);
     const files = [
         join(webappTestPath, 'locate-reuse-libs.js'),
         join(webappTestPath, 'changes_loader.js'),