From c67e8e93235af6cb7832dab1ce61d9dd79bff261 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Tue, 19 May 2026 11:26:04 +0100
Subject: [PATCH 01/51] feat add other aggregations to page building block

---
 .../fe-fpm-writer/src/building-block/index.ts | 152 +++++++++++++++
 .../building-block/prompts/questions/page.ts  |  11 ++
 .../fe-fpm-writer/src/building-block/types.ts |   7 +
 packages/fe-fpm-writer/src/index.ts           |   8 +-
 .../src/prompts/translations/i18n.ts          |   5 +
 .../building-block/page/Controller.js         |  17 ++
 .../building-block/page/Controller.ts         |  14 ++
 .../templates/building-block/page/View.xml    |   3 +-
 .../templates/building-block/page/actions.xml |   5 +
 .../building-block/page/breadcrumbs.xml       |   8 +
 .../templates/building-block/page/footer.xml  |   4 +
 .../building-block/page/headerContent.xml     |   6 +
 .../templates/building-block/page/items.xml   |   1 +
 .../building-block/page/navigationActions.xml |   4 +
 .../building-block/page/titleContent.xml      |   4 +
 .../test/unit/building-block.test.ts          | 175 +++++++++++++++++-
 .../__snapshots__/prompts.test.ts.snap        |  38 ++++
 17 files changed, 459 insertions(+), 3 deletions(-)
 create mode 100644 packages/fe-fpm-writer/templates/building-block/page/Controller.js
 create mode 100644 packages/fe-fpm-writer/templates/building-block/page/Controller.ts
 create mode 100644 packages/fe-fpm-writer/templates/building-block/page/actions.xml
 create mode 100644 packages/fe-fpm-writer/templates/building-block/page/breadcrumbs.xml
 create mode 100644 packages/fe-fpm-writer/templates/building-block/page/footer.xml
 create mode 100644 packages/fe-fpm-writer/templates/building-block/page/headerContent.xml
 create mode 100644 packages/fe-fpm-writer/templates/building-block/page/items.xml
 create mode 100644 packages/fe-fpm-writer/templates/building-block/page/navigationActions.xml
 create mode 100644 packages/fe-fpm-writer/templates/building-block/page/titleContent.xml

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 9e7769c3bdf..6b4475386a8 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -14,6 +14,7 @@ import {
     type BuildingBlock,
     type BuildingBlockConfig,
     type BuildingBlockMetaPath,
+    type Page,
     bindingContextAbsolute,
     type TemplateConfig
 } from './types';
@@ -23,10 +24,12 @@ import { getTemplatePath } from '../templates';
 import { CodeSnippetLanguage, type FilePathProps, type CodeSnippet } from '../prompts/types';
 import {
     CONFIG,
+    copyTpl,
     createIdGenerator,
     detectTabSpacing,
     extendJSON,
     getRelativeTemplateComponentPath,
+    type IdGeneratorFunction,
     type TemplateContext
 } from '../common/file';
 import { getManifest, getManifestPath } from '../common/utils';
@@ -94,6 +97,13 @@ export async function generateBuildingBlock<T extends BuildingBlock>(
         templateConfig
     );
 
+    if (
+        buildingBlockData.buildingBlockType === BuildingBlockType.Page &&
+        (buildingBlockData as Page).templateType === 'full'
+    ) {
+        appendPageAggregations(fs, xmlDocument, templateDocument, fnGenerateId);
+    }
+
     if (
         buildingBlockData.buildingBlockType === BuildingBlockType.RichTextEditor ||
         buildingBlockData.buildingBlockType === BuildingBlockType.RichTextEditorButtonGroups
@@ -116,6 +126,13 @@ export async function generateBuildingBlock<T extends BuildingBlock>(
         config.replace
     );
 
+    if (
+        buildingBlockData.buildingBlockType === BuildingBlockType.Page &&
+        (buildingBlockData as Page).templateType === 'full'
+    ) {
+        applyPageControllerTemplate(fs, basePath, viewOrFragmentPath);
+    }
+
     if (allowAutoAddDependencyLib && manifest && !validateDependenciesLibs(manifest, ['sap.fe.macros'])) {
         // "sap.fe.macros" is missing - enhance manifest.json for missing "sap.fe.macros"
         const manifestPath = await getManifestPath(basePath, fs);
@@ -132,6 +149,141 @@ export async function generateBuildingBlock<T extends BuildingBlock>(
     return fs;
 }
 
+export const PAGE_AGGREGATIONS = [
+    'breadcrumbs',
+    'navigationActions',
+    'titleContent',
+    'actions',
+    'headerContent',
+    'items',
+    'footer'
+] as const;
+
+export type PageAggregationName = (typeof PAGE_AGGREGATIONS)[number];
+
+/**
+ * Appends the 7 Page building block aggregation fragments as child elements of the templateDocument root.
+ *
+ * @param {Editor} fs - the memfs editor instance
+ * @param {Document} xmlDocument - the view XML document (used to resolve namespace prefixes)
+ * @param {Document} templateDocument - the template document whose root element receives the children
+ * @param {IdGeneratorFunction} generateId - function to generate unique IDs
+ */
+function appendPageAggregations(
+    fs: Editor,
+    xmlDocument: Document,
+    templateDocument: Document,
+    generateId: IdGeneratorFunction
+): void {
+    const macrosNS = getOrAddNamespace(xmlDocument, 'sap.fe.macros', 'macros');
+    const mNS = getOrAddNamespace(xmlDocument, 'sap.m', 'm');
+    // getOrAddNamespace returns '' when the namespace is the document's default (xmlns="...").
+    // For macros:Page aggregations, macros always has an explicit prefix.
+    // For sap.m, honour the default namespace by keeping mPrefix empty so elements render
+    // as bare names (e.g. <Button>) instead of <m:Button xmlns:m="sap.m">.
+    const fragMacrosNS = macrosNS || 'macros';
+    const fragMNS = mNS;
+    const macrosPrefix = `${fragMacrosNS}:`;
+    const mPrefix = fragMNS ? `${fragMNS}:` : '';
+    const aggContext = { macrosNamespace: fragMacrosNS, mNamespace: fragMNS, macrosPrefix, mPrefix };
+    const pageElement = templateDocument.documentElement;
+    const aggErrorHandler = (level: string, message: string): never => {
+        throw new Error(`Unable to parse page aggregation fragment. Details: [${level}] - ${message}`);
+    };
+    for (const aggName of PAGE_AGGREGATIONS) {
+        const aggPath = getTemplatePath(`/building-block/page/${aggName}.xml`);
+        const aggContent = render(fs.read(aggPath), aggContext, {});
+        // Wrap with namespace declarations so elements parse correctly.
+        // When sap.m is the default namespace (fragMNS=''), declare it as xmlns= to keep
+        // bare element names; otherwise declare it as xmlns:m=.
+        const mNsDecl = fragMNS ? `xmlns:${fragMNS}="sap.m"` : `xmlns="sap.m"`;
+        const wrapped = `<root xmlns:${fragMacrosNS}="sap.fe.macros" ${mNsDecl}>${aggContent}</root>`;
+        const aggDoc = new DOMParser({ errorHandler: aggErrorHandler }).parseFromString(wrapped, 'text/xml');
+        for (const node of Array.from(aggDoc.documentElement.childNodes)) {
+            if (node.nodeType === 1 /* Element */) {
+                (node as Element).setAttribute('id', generateId(aggName));
+                pageElement.appendChild(templateDocument.importNode(node, true));
+            }
+        }
+    }
+}
+
+/**
+ * Appends a single Page building block aggregation template to an existing `<macros:Page>` element in a view XML file.
+ *
+ * @param {Editor} fs - the memfs editor instance
+ * @param {string} basePath - the base path of the application
+ * @param {string} viewPath - the path of the xml view relative to the base path
+ * @param {PageAggregationName} aggName - the name of the Page BB aggregation to append
+ * @returns {Editor} the updated memfs editor instance
+ */
+export async function appendPageBBAggregation(
+    fs: Editor,
+    basePath: string,
+    viewPath: string,
+    aggName: PageAggregationName
+): Promise<Editor> {
+    const xmlDocument = getUI5XmlDocument(basePath, viewPath, fs);
+
+    const generateId = await createIdGenerator({ basePath, fsEditor: fs });
+    const uniqueId = generateId(aggName);
+
+    const macrosNS = getOrAddNamespace(xmlDocument, 'sap.fe.macros', 'macros');
+    const mNS = getOrAddNamespace(xmlDocument, 'sap.m', 'm');
+    const fragMacrosNS = macrosNS || 'macros';
+    const fragMNS = mNS;
+    const macrosPrefix = `${fragMacrosNS}:`;
+    const mPrefix = fragMNS ? `${fragMNS}:` : '';
+    const aggContext = { macrosNamespace: fragMacrosNS, mNamespace: fragMNS, macrosPrefix, mPrefix };
+
+    const aggPath = getTemplatePath(`/building-block/page/${aggName}.xml`);
+    const aggContent = render(fs.read(aggPath), aggContext, {});
+    const mNsDecl = fragMNS ? `xmlns:${fragMNS}="sap.m"` : `xmlns="sap.m"`;
+    const wrapped = `<root xmlns:${fragMacrosNS}="sap.fe.macros" ${mNsDecl}>${aggContent}</root>`;
+
+    const errorHandler = (level: string, message: string): never => {
+        throw new Error(`Unable to parse page aggregation fragment. Details: [${level}] - ${message}`);
+    };
+    const aggDoc = new DOMParser({ errorHandler }).parseFromString(wrapped, 'text/xml');
+
+    const xpathSelect = xpath.useNamespaces((xmlDocument.firstChild as any)._nsMap);
+    const pageNodes = xpathSelect(`//${fragMacrosNS}:Page`, xmlDocument);
+    if (!pageNodes || !Array.isArray(pageNodes) || pageNodes.length === 0) {
+        throw new Error(`macros:Page element not found in view ${viewPath}.`);
+    }
+
+    const pageElement = pageNodes[0] as Node;
+    for (const node of Array.from(aggDoc.documentElement.childNodes)) {
+        if (node.nodeType === 1 /* Element */) {
+            (node as Element).setAttribute('id', uniqueId);
+            pageElement.appendChild(xmlDocument.importNode(node, true));
+        }
+    }
+
+    const newXmlContent = new XMLSerializer().serializeToString(xmlDocument);
+    fs.write(join(basePath, viewPath), format(newXmlContent));
+
+    return fs;
+}
+
+/**
+ * Copies the Page controller template (JS or TS) into the view directory if no controller file exists yet.
+ *
+ * @param {Editor} fs - the memfs editor instance
+ * @param {string} basePath - the base path of the application
+ * @param {string} viewOrFragmentPath - the relative path of the view/fragment file
+ */
+function applyPageControllerTemplate(fs: Editor, basePath: string, viewOrFragmentPath: string): void {
+    const viewDir = parse(viewOrFragmentPath).dir;
+    const viewBaseName = parse(viewOrFragmentPath).name.replace(/\.view$/, '');
+    const isTypeScript = fs.exists(join(basePath, viewDir, `${viewBaseName}.controller.ts`));
+    const controllerExt = isTypeScript ? 'ts' : 'js';
+    const controllerPath = join(basePath, viewDir, `${viewBaseName}.controller.${controllerExt}`);
+    if (!fs.exists(controllerPath)) {
+        copyTpl(fs, getTemplatePath(`/building-block/page/Controller.${controllerExt}`), controllerPath);
+    }
+}
+
 /**
  * Returns the UI5 xml file document (view/fragment).
  *
diff --git a/packages/fe-fpm-writer/src/building-block/prompts/questions/page.ts b/packages/fe-fpm-writer/src/building-block/prompts/questions/page.ts
index ff7e86f11f0..596d11faa3a 100644
--- a/packages/fe-fpm-writer/src/building-block/prompts/questions/page.ts
+++ b/packages/fe-fpm-writer/src/building-block/prompts/questions/page.ts
@@ -19,6 +19,17 @@ export async function getPageBuildingBlockPrompts(context: PromptContext): Promi
 
     return {
         questions: [
+            {
+                type: 'list',
+                name: 'buildingBlockData.templateType',
+                message: t('templateType.message') as string,
+                default: 'full',
+                choices: [
+                    { value: 'full', name: t('templateType.full') as string },
+                    { value: 'blank', name: t('templateType.blank') as string }
+                ],
+                guiOptions: { mandatory: true }
+            },
             getViewOrFragmentPathPrompt(context, t('viewOrFragmentPath.validate') as string, {
                 message: t('viewOrFragmentPath.message') as string,
                 guiOptions: {
diff --git a/packages/fe-fpm-writer/src/building-block/types.ts b/packages/fe-fpm-writer/src/building-block/types.ts
index 538db7dd4c9..35a5348e0a4 100644
--- a/packages/fe-fpm-writer/src/building-block/types.ts
+++ b/packages/fe-fpm-writer/src/building-block/types.ts
@@ -397,6 +397,13 @@ export interface Page extends BuildingBlock {
      * The description of the page.
      */
     description?: string;
+
+    /**
+     * The template type for the page building block.
+     * 'full' generates a full page template with all aggregations and controller stubs.
+     * 'blank' generates a minimal self-closing tag (default behavior).
+     */
+    templateType?: 'full' | 'blank';
 }
 
 /**
diff --git a/packages/fe-fpm-writer/src/index.ts b/packages/fe-fpm-writer/src/index.ts
index 38e561eed23..03992efba90 100644
--- a/packages/fe-fpm-writer/src/index.ts
+++ b/packages/fe-fpm-writer/src/index.ts
@@ -41,7 +41,13 @@ export {
     ButtonGroupConfig,
     Action
 } from './building-block/types';
-export { generateBuildingBlock, getSerializedFileContent } from './building-block';
+export {
+    generateBuildingBlock,
+    getSerializedFileContent,
+    appendPageBBAggregation,
+    PAGE_AGGREGATIONS
+} from './building-block';
+export type { PageAggregationName } from './building-block';
 export {
     ChartPromptsAnswer,
     FilterBarPromptsAnswer,
diff --git a/packages/fe-fpm-writer/src/prompts/translations/i18n.ts b/packages/fe-fpm-writer/src/prompts/translations/i18n.ts
index cd6cd89c815..9b1722d1681 100644
--- a/packages/fe-fpm-writer/src/prompts/translations/i18n.ts
+++ b/packages/fe-fpm-writer/src/prompts/translations/i18n.ts
@@ -280,6 +280,11 @@ const ns1 = {
                 'Adding button groups replaces the default button groups in the Rich Text Editor with your chosen configuration.'
         },
         'page': {
+            'templateType': {
+                'message': 'Page template',
+                'full': 'Default content',
+                'blank': 'Blank'
+            },
             'id': {
                 'message': 'Building Block ID',
                 'validation': 'An ID is required to generate the page building block.'
diff --git a/packages/fe-fpm-writer/templates/building-block/page/Controller.js b/packages/fe-fpm-writer/templates/building-block/page/Controller.js
new file mode 100644
index 00000000000..4bc38a0dbce
--- /dev/null
+++ b/packages/fe-fpm-writer/templates/building-block/page/Controller.js
@@ -0,0 +1,17 @@
+sap.ui.define([], function () {
+    'use strict';
+
+    return {
+        onPressHome: function (_event) {},
+
+        onPressPage1: function (_event) {},
+
+        onPressPage2: function (_event) {},
+
+        onFullScreen: function (_event) {},
+
+        onClickAction1: function (_event) {},
+
+        onClickAction2: function (_event) {}
+    };
+});
diff --git a/packages/fe-fpm-writer/templates/building-block/page/Controller.ts b/packages/fe-fpm-writer/templates/building-block/page/Controller.ts
new file mode 100644
index 00000000000..498f0c2cf4a
--- /dev/null
+++ b/packages/fe-fpm-writer/templates/building-block/page/Controller.ts
@@ -0,0 +1,14 @@
+import ExtensionAPI from 'sap/fe/core/ExtensionAPI';
+import Event from 'sap/ui/base/Event';
+
+export function onPressHome(this: ExtensionAPI, _event: Event): void {}
+
+export function onPressPage1(this: ExtensionAPI, _event: Event): void {}
+
+export function onPressPage2(this: ExtensionAPI, _event: Event): void {}
+
+export function onFullScreen(this: ExtensionAPI, _event: Event): void {}
+
+export function onClickAction1(this: ExtensionAPI, _event: Event): void {}
+
+export function onClickAction2(this: ExtensionAPI, _event: Event): void {}
diff --git a/packages/fe-fpm-writer/templates/building-block/page/View.xml b/packages/fe-fpm-writer/templates/building-block/page/View.xml
index 0dbd3f1339a..e9ebfd16fd1 100644
--- a/packages/fe-fpm-writer/templates/building-block/page/View.xml
+++ b/packages/fe-fpm-writer/templates/building-block/page/View.xml
@@ -1,5 +1,6 @@
 <<%- macrosNamespace %>:Page
     id="<%- data.id %>"<% if (data.title) { %>
     title="<%- data.title %>"<% } %><% if (data.description) { %>
-    description="<%- data.description %>"<% } %>
+    description="<%- data.description %>"<% } %><% if (data.templateType === 'full') { %>
+    showFooter="true"<% } %>
 />
\ No newline at end of file
diff --git a/packages/fe-fpm-writer/templates/building-block/page/actions.xml b/packages/fe-fpm-writer/templates/building-block/page/actions.xml
new file mode 100644
index 00000000000..b2a72fb0fad
--- /dev/null
+++ b/packages/fe-fpm-writer/templates/building-block/page/actions.xml
@@ -0,0 +1,5 @@
+<!-- Actions aggregation -->
+<<%- macrosPrefix %>actions>
+    <<%- mPrefix %>Button text="Action 1" press=".onClickAction1" type="Ghost" />
+    <<%- mPrefix %>Button text="Action 2" press=".onClickAction2" type="Ghost" />
+</<%- macrosPrefix %>actions>
diff --git a/packages/fe-fpm-writer/templates/building-block/page/breadcrumbs.xml b/packages/fe-fpm-writer/templates/building-block/page/breadcrumbs.xml
new file mode 100644
index 00000000000..b4169848294
--- /dev/null
+++ b/packages/fe-fpm-writer/templates/building-block/page/breadcrumbs.xml
@@ -0,0 +1,8 @@
+<!-- Breadcrumbs aggregation -->
+<<%- macrosPrefix %>breadcrumbs>
+    <<%- mPrefix %>Breadcrumbs>
+        <<%- mPrefix %>Link text="Home" press=".onPressHome" />
+        <<%- mPrefix %>Link text="Page 1" press=".onPressPage1" />
+        <<%- mPrefix %>Link text="Page 2" press=".onPressPage2" />
+    </<%- mPrefix %>Breadcrumbs>
+</<%- macrosPrefix %>breadcrumbs>
diff --git a/packages/fe-fpm-writer/templates/building-block/page/footer.xml b/packages/fe-fpm-writer/templates/building-block/page/footer.xml
new file mode 100644
index 00000000000..61d440ec4c5
--- /dev/null
+++ b/packages/fe-fpm-writer/templates/building-block/page/footer.xml
@@ -0,0 +1,4 @@
+<!-- Footer aggregation -->
+<<%- macrosPrefix %>footer>
+    <<%- mPrefix %>OverflowToolbar />
+</<%- macrosPrefix %>footer>
diff --git a/packages/fe-fpm-writer/templates/building-block/page/headerContent.xml b/packages/fe-fpm-writer/templates/building-block/page/headerContent.xml
new file mode 100644
index 00000000000..652dd4c4421
--- /dev/null
+++ b/packages/fe-fpm-writer/templates/building-block/page/headerContent.xml
@@ -0,0 +1,6 @@
+<!-- Header content aggregation (content after avatar) -->
+<<%- macrosPrefix %>headerContent>
+    <<%- mPrefix %>VBox>
+        <<%- mPrefix %>Title text="Page Title" />
+    </<%- mPrefix %>VBox>
+</<%- macrosPrefix %>headerContent>
diff --git a/packages/fe-fpm-writer/templates/building-block/page/items.xml b/packages/fe-fpm-writer/templates/building-block/page/items.xml
new file mode 100644
index 00000000000..b3c4a0e3a9e
--- /dev/null
+++ b/packages/fe-fpm-writer/templates/building-block/page/items.xml
@@ -0,0 +1 @@
+<<%- macrosPrefix %>items></<%- macrosPrefix %>items>
diff --git a/packages/fe-fpm-writer/templates/building-block/page/navigationActions.xml b/packages/fe-fpm-writer/templates/building-block/page/navigationActions.xml
new file mode 100644
index 00000000000..a40c3e983ee
--- /dev/null
+++ b/packages/fe-fpm-writer/templates/building-block/page/navigationActions.xml
@@ -0,0 +1,4 @@
+<!-- Navigation actions aggregation -->
+<<%- macrosPrefix %>navigationActions>
+    <<%- mPrefix %>Button icon="sap-icon://full-screen" press=".onFullScreen" type="Transparent" />
+</<%- macrosPrefix %>navigationActions>
diff --git a/packages/fe-fpm-writer/templates/building-block/page/titleContent.xml b/packages/fe-fpm-writer/templates/building-block/page/titleContent.xml
new file mode 100644
index 00000000000..ffebf183110
--- /dev/null
+++ b/packages/fe-fpm-writer/templates/building-block/page/titleContent.xml
@@ -0,0 +1,4 @@
+<!-- Title content aggregation (content next to title) -->
+<<%- macrosPrefix %>titleContent>
+    <<%- mPrefix %>GenericTag text="Status" design="StatusIconHidden" status="Information" />
+</<%- macrosPrefix %>titleContent>
diff --git a/packages/fe-fpm-writer/test/unit/building-block.test.ts b/packages/fe-fpm-writer/test/unit/building-block.test.ts
index 97e59144436..fb15a792961 100644
--- a/packages/fe-fpm-writer/test/unit/building-block.test.ts
+++ b/packages/fe-fpm-writer/test/unit/building-block.test.ts
@@ -9,6 +9,7 @@ import type {
     Field,
     FilterBar,
     Form,
+    Page,
     Table,
     CustomColumn,
     CustomFilterField,
@@ -16,7 +17,7 @@ import type {
     Action
 } from '../../src';
 
-import { BuildingBlockType, generateBuildingBlock, getSerializedFileContent } from '../../src';
+import { BuildingBlockType, generateBuildingBlock, getSerializedFileContent, appendPageBBAggregation } from '../../src';
 import { BUILDING_BLOCK_CONFIG } from '../../src/building-block/processor';
 import * as testManifestContent from './sample/building-block/webapp/manifest.json';
 import { clearTestOutput, writeFilesForDebugging } from '../common';
@@ -1091,6 +1092,143 @@ describe('Building Blocks', () => {
         await writeFilesForDebugging(fs);
     });
 
+    test('generate Page building block with full template inserts all 7 aggregations', async () => {
+        const aggregationPath = `/mvc:View/*[local-name()='Page']`;
+        const basePath = join(testAppPath, 'generate-page-block-full');
+        fs.write(join(basePath, manifestFilePath), JSON.stringify(testManifestContent));
+        fs.write(join(basePath, xmlViewFilePath), testXmlViewContent);
+
+        await generateBuildingBlock(
+            basePath,
+            {
+                viewOrFragmentPath: xmlViewFilePath,
+                aggregationPath,
+                buildingBlockData: {
+                    id: 'testPage',
+                    buildingBlockType: BuildingBlockType.Page,
+                    title: 'Test Page',
+                    templateType: 'full',
+                    generateId
+                },
+                replace: true
+            },
+            fs
+        );
+
+        const viewContent = fs.read(join(basePath, xmlViewFilePath));
+        expect(viewContent).toContain('showFooter="true"');
+        expect(viewContent).toContain('macros:breadcrumbs');
+        expect(viewContent).toContain('macros:navigationActions');
+        expect(viewContent).toContain('macros:titleContent');
+        expect(viewContent).toContain('macros:actions');
+        expect(viewContent).toContain('macros:headerContent');
+        expect(viewContent).toContain('macros:items');
+        expect(viewContent).toContain('macros:footer');
+        expect(viewContent).toMatch(/<macros:breadcrumbs[^>]*id="breadcrumbs"/);
+        expect(viewContent).toMatch(/<macros:navigationActions[^>]*id="navigationActions"/);
+        expect(viewContent).toMatch(/<macros:titleContent[^>]*id="titleContent"/);
+        expect(viewContent).toMatch(/<macros:actions[^>]*id="actions"/);
+        expect(viewContent).toMatch(/<macros:headerContent[^>]*id="headerContent"/);
+        expect(viewContent).toMatch(/<macros:items[^>]*id="items"/);
+        expect(viewContent).toMatch(/<macros:footer[^>]*id="footer"/);
+        expect(viewContent).toContain('press=".onPressHome"');
+        expect(viewContent).toContain('press=".onPressPage1"');
+        expect(viewContent).toContain('press=".onPressPage2"');
+        expect(viewContent).toContain('press=".onFullScreen"');
+        expect(viewContent).toContain('press=".onClickAction1"');
+        expect(viewContent).toContain('press=".onClickAction2"');
+    });
+
+    test('generate Page building block with full template creates JS controller', async () => {
+        const aggregationPath = `/mvc:View/*[local-name()='Page']`;
+        const basePath = join(testAppPath, 'generate-page-block-full-controller');
+        fs.write(join(basePath, manifestFilePath), JSON.stringify(testManifestContent));
+        fs.write(join(basePath, xmlViewFilePath), testXmlViewContent);
+
+        await generateBuildingBlock(
+            basePath,
+            {
+                viewOrFragmentPath: xmlViewFilePath,
+                aggregationPath,
+                buildingBlockData: {
+                    id: 'testPage',
+                    buildingBlockType: BuildingBlockType.Page,
+                    templateType: 'full',
+                    generateId
+                },
+                replace: true
+            },
+            fs
+        );
+
+        const controllerPath = join(basePath, 'webapp/ext/main/Main.controller.js');
+        expect(fs.exists(controllerPath)).toBe(true);
+        const controllerContent = fs.read(controllerPath);
+        expect(controllerContent).toContain('onPressHome');
+        expect(controllerContent).toContain('onPressPage1');
+        expect(controllerContent).toContain('onPressPage2');
+        expect(controllerContent).toContain('onFullScreen');
+        expect(controllerContent).toContain('onClickAction1');
+        expect(controllerContent).toContain('onClickAction2');
+    });
+
+    test('generate Page building block with full template creates TS controller when .controller.ts exists', async () => {
+        const aggregationPath = `/mvc:View/*[local-name()='Page']`;
+        const basePath = join(testAppPath, 'generate-page-block-full-ts-controller');
+        fs.write(join(basePath, manifestFilePath), JSON.stringify(testManifestContent));
+        fs.write(join(basePath, xmlViewFilePath), testXmlViewContent);
+        fs.write(join(basePath, 'webapp/ext/main/Main.controller.ts'), '// existing ts controller');
+
+        await generateBuildingBlock(
+            basePath,
+            {
+                viewOrFragmentPath: xmlViewFilePath,
+                aggregationPath,
+                buildingBlockData: {
+                    id: 'testPage',
+                    buildingBlockType: BuildingBlockType.Page,
+                    templateType: 'full',
+                    generateId
+                },
+                replace: true
+            },
+            fs
+        );
+
+        expect(fs.read(join(basePath, 'webapp/ext/main/Main.controller.ts'))).toBe('// existing ts controller');
+        expect(fs.exists(join(basePath, 'webapp/ext/main/Main.controller.js'))).toBe(false);
+    });
+
+    test('generate Page building block with blank template does not insert aggregations or controller', async () => {
+        const aggregationPath = `/mvc:View/*[local-name()='Page']`;
+        const basePath = join(testAppPath, 'generate-page-block-blank');
+        fs.write(join(basePath, manifestFilePath), JSON.stringify(testManifestContent));
+        fs.write(join(basePath, xmlViewFilePath), testXmlViewContent);
+
+        await generateBuildingBlock(
+            basePath,
+            {
+                viewOrFragmentPath: xmlViewFilePath,
+                aggregationPath,
+                buildingBlockData: {
+                    id: 'testPage',
+                    buildingBlockType: BuildingBlockType.Page,
+                    templateType: 'blank',
+                    generateId
+                },
+                replace: true
+            },
+            fs
+        );
+
+        const viewContent = fs.read(join(basePath, xmlViewFilePath));
+        expect(viewContent).not.toContain('showFooter');
+        expect(viewContent).not.toContain('macros:breadcrumbs');
+        expect(viewContent).not.toContain('macros:footer');
+        expect(fs.exists(join(basePath, 'webapp/ext/main/Main.controller.js'))).toBe(false);
+        expect(fs.exists(join(basePath, 'webapp/ext/main/Main.controller.ts'))).toBe(false);
+    });
+
     test('throws error if aggregationPath not found', async () => {
         const aggregationPath = `/mvc:Test`;
         const basePath = join(testAppPath, 'generate-page-block-error');
@@ -3708,4 +3846,39 @@ describe('Building Blocks', () => {
             await writeFilesForDebugging(fs);
         });
     });
+
+    describe('appendPageBBAggregation', () => {
+        const pageViewContent = `<mvc:View xmlns:core="sap.ui.core" xmlns:mvc="sap.ui.core.mvc" xmlns="sap.m"
+    xmlns:macros="sap.fe.macros" controllerName="com.test.myApp.ext.main.Main">
+    <macros:Page id="Page" title="pageTitle">
+    </macros:Page>
+</mvc:View>`;
+
+        it('appends aggregation with unique id attribute on wrapper element', async () => {
+            const basePath = join(testAppPath, 'page-bb-agg');
+            fs.write(join(basePath, xmlViewFilePath), pageViewContent);
+
+            const result = await appendPageBBAggregation(fs, basePath, xmlViewFilePath, 'footer');
+
+            const output = result.read(join(basePath, xmlViewFilePath));
+            expect(output).toContain('id="footer"');
+        });
+
+        it('generates suffixed id when base id already exists in view', async () => {
+            const basePath = join(testAppPath, 'page-bb-agg-dup');
+            const viewWithExistingId = `<mvc:View xmlns:core="sap.ui.core" xmlns:mvc="sap.ui.core.mvc" xmlns="sap.m"
+    xmlns:macros="sap.fe.macros" controllerName="com.test.myApp.ext.main.Main">
+    <macros:Page id="Page" title="pageTitle">
+        <macros:footer id="footer"><OverflowToolbar /></macros:footer>
+    </macros:Page>
+</mvc:View>`;
+            fs.write(join(basePath, xmlViewFilePath), viewWithExistingId);
+            jest.spyOn(fileAccess, 'findFilesByExtension').mockResolvedValue([join(basePath, xmlViewFilePath)]);
+
+            const result = await appendPageBBAggregation(fs, basePath, xmlViewFilePath, 'footer');
+
+            const output = result.read(join(basePath, xmlViewFilePath));
+            expect(output).toContain('id="footer1"');
+        });
+    });
 });
diff --git a/packages/fe-fpm-writer/test/unit/prompts/__snapshots__/prompts.test.ts.snap b/packages/fe-fpm-writer/test/unit/prompts/__snapshots__/prompts.test.ts.snap
index 83ff082e277..78765f40f8b 100644
--- a/packages/fe-fpm-writer/test/unit/prompts/__snapshots__/prompts.test.ts.snap
+++ b/packages/fe-fpm-writer/test/unit/prompts/__snapshots__/prompts.test.ts.snap
@@ -427,6 +427,25 @@ Object {
     },
   },
   "questions": Array [
+    Object {
+      "choices": Array [
+        Object {
+          "name": "Default content",
+          "value": "full",
+        },
+        Object {
+          "name": "Blank",
+          "value": "blank",
+        },
+      ],
+      "default": "full",
+      "guiOptions": Object {
+        "mandatory": true,
+      },
+      "message": "Page template",
+      "name": "buildingBlockData.templateType",
+      "type": "list",
+    },
     Object {
       "choices": Array [],
       "guiOptions": Object {
@@ -1808,6 +1827,25 @@ Object {
     },
   },
   "questions": Array [
+    Object {
+      "choices": Array [
+        Object {
+          "name": "Default content",
+          "value": "full",
+        },
+        Object {
+          "name": "Blank",
+          "value": "blank",
+        },
+      ],
+      "default": "full",
+      "guiOptions": Object {
+        "mandatory": true,
+      },
+      "message": "Page template",
+      "name": "buildingBlockData.templateType",
+      "type": "list",
+    },
     Object {
       "choices": [Function],
       "guiOptions": Object {

From f3fcdd929ed3066636d157281f7ced1c0596bb78 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Tue, 26 May 2026 18:45:09 +0100
Subject: [PATCH 02/51] feat add others aggregations to page building block

---
 .../fe-fpm-writer/src/building-block/index.ts | 25 +++++++++++++++++++
 .../templates/building-block/page/items.xml   |  9 ++++++-
 .../test/unit/building-block.test.ts          | 23 +++++++++++++++++
 3 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 6b4475386a8..dbe0556b891 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -208,6 +208,30 @@ function appendPageAggregations(
     }
 }
 
+/**
+ * Reorders the child elements of a macros:Page node to match the canonical PAGE_AGGREGATIONS order.
+ * Preserves relative order of siblings with the same local name. Text/comment nodes are dropped
+ * because the xml-formatter call that follows will regenerate proper indentation.
+ *
+ * @param pageElement - the macros:Page DOM node whose children should be sorted
+ */
+function sortPageAggregationChildren(pageElement: Node): void {
+    const elementChildren = Array.from(pageElement.childNodes).filter(
+        (n) => n.nodeType === 1 /* Element */
+    ) as Element[];
+    const sorted = [...elementChildren].sort((a, b) => {
+        const aIdx = PAGE_AGGREGATIONS.indexOf(a.localName as PageAggregationName);
+        const bIdx = PAGE_AGGREGATIONS.indexOf(b.localName as PageAggregationName);
+        return (aIdx === -1 ? PAGE_AGGREGATIONS.length : aIdx) - (bIdx === -1 ? PAGE_AGGREGATIONS.length : bIdx);
+    });
+    while (pageElement.firstChild) {
+        pageElement.removeChild(pageElement.firstChild);
+    }
+    for (const el of sorted) {
+        pageElement.appendChild(el);
+    }
+}
+
 /**
  * Appends a single Page building block aggregation template to an existing `<macros:Page>` element in a view XML file.
  *
@@ -259,6 +283,7 @@ export async function appendPageBBAggregation(
             pageElement.appendChild(xmlDocument.importNode(node, true));
         }
     }
+    sortPageAggregationChildren(pageElement);
 
     const newXmlContent = new XMLSerializer().serializeToString(xmlDocument);
     fs.write(join(basePath, viewPath), format(newXmlContent));
diff --git a/packages/fe-fpm-writer/templates/building-block/page/items.xml b/packages/fe-fpm-writer/templates/building-block/page/items.xml
index b3c4a0e3a9e..41f5ad116ba 100644
--- a/packages/fe-fpm-writer/templates/building-block/page/items.xml
+++ b/packages/fe-fpm-writer/templates/building-block/page/items.xml
@@ -1 +1,8 @@
-<<%- macrosPrefix %>items></<%- macrosPrefix %>items>
+<<%- macrosPrefix %>items>
+	<IconTabBar id="stickySubheaderBar" class="sapUiResponsiveContentPadding">
+		<items>
+			<IconTabFilter text="Tab 1">
+			</IconTabFilter>
+		</items>
+	</IconTabBar>
+</<%- macrosPrefix %>items>
diff --git a/packages/fe-fpm-writer/test/unit/building-block.test.ts b/packages/fe-fpm-writer/test/unit/building-block.test.ts
index fb15a792961..773b93b218f 100644
--- a/packages/fe-fpm-writer/test/unit/building-block.test.ts
+++ b/packages/fe-fpm-writer/test/unit/building-block.test.ts
@@ -3880,5 +3880,28 @@ describe('Building Blocks', () => {
             const output = result.read(join(basePath, xmlViewFilePath));
             expect(output).toContain('id="footer1"');
         });
+
+        it('reorders existing aggregations into canonical PAGE_AGGREGATIONS order', async () => {
+            // Start with aggregations in wrong order: footer, actions, navigationActions
+            const basePath = join(testAppPath, 'page-bb-agg-sort');
+            const viewOutOfOrder = `<mvc:View xmlns:core="sap.ui.core" xmlns:mvc="sap.ui.core.mvc" xmlns="sap.m"
+    xmlns:macros="sap.fe.macros" controllerName="com.test.myApp.ext.main.Main">
+    <macros:Page id="Page" title="pageTitle">
+        <macros:footer id="footer"><OverflowToolbar /></macros:footer>
+        <macros:actions id="actions"><Button text="Act" /></macros:actions>
+    </macros:Page>
+</mvc:View>`;
+            fs.write(join(basePath, xmlViewFilePath), viewOutOfOrder);
+
+            // Adding navigationActions (index 1) should trigger a full sort
+            const result = await appendPageBBAggregation(fs, basePath, xmlViewFilePath, 'navigationActions');
+
+            const output = result.read(join(basePath, xmlViewFilePath));
+            const navPos = output.indexOf('macros:navigationActions');
+            const actPos = output.indexOf('macros:actions');
+            const footPos = output.indexOf('macros:footer');
+            expect(navPos).toBeLessThan(actPos);
+            expect(actPos).toBeLessThan(footPos);
+        });
     });
 });

From 8ad208575bd2eaab7f5a3d4e9507fb29534842c6 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Thu, 28 May 2026 18:19:59 +0100
Subject: [PATCH 03/51] feat add others aggregations to page building block

---
 .../fe-fpm-writer/src/building-block/index.ts | 22 +++++++++----------
 .../fe-fpm-writer/src/building-block/types.ts |  6 +++++
 .../templates/building-block/page/actions.xml |  4 +---
 .../building-block/page/breadcrumbs.xml       |  7 +-----
 .../templates/building-block/page/footer.xml  |  3 +--
 .../building-block/page/headerContent.xml     |  5 +----
 .../building-block/page/navigationActions.xml |  3 +--
 .../building-block/page/titleContent.xml      |  3 +--
 8 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index dbe0556b891..9cee6d8d6cb 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -101,7 +101,7 @@ export async function generateBuildingBlock<T extends BuildingBlock>(
         buildingBlockData.buildingBlockType === BuildingBlockType.Page &&
         (buildingBlockData as Page).templateType === 'full'
     ) {
-        appendPageAggregations(fs, xmlDocument, templateDocument, fnGenerateId);
+        appendPageAggregations(fs, xmlDocument, templateDocument, fnGenerateId, buildingBlockData as Page);
     }
 
     if (
@@ -168,29 +168,27 @@ export type PageAggregationName = (typeof PAGE_AGGREGATIONS)[number];
  * @param {Document} xmlDocument - the view XML document (used to resolve namespace prefixes)
  * @param {Document} templateDocument - the template document whose root element receives the children
  * @param {IdGeneratorFunction} generateId - function to generate unique IDs
+ * @param {Page} pageData - the Page building block data containing optional aggregation mContent
  */
 function appendPageAggregations(
     fs: Editor,
     xmlDocument: Document,
     templateDocument: Document,
-    generateId: IdGeneratorFunction
+    generateId: IdGeneratorFunction,
+    pageData: Page
 ): void {
     const macrosNS = getOrAddNamespace(xmlDocument, 'sap.fe.macros', 'macros');
     const mNS = getOrAddNamespace(xmlDocument, 'sap.m', 'm');
-    // getOrAddNamespace returns '' when the namespace is the document's default (xmlns="...").
-    // For macros:Page aggregations, macros always has an explicit prefix.
-    // For sap.m, honour the default namespace by keeping mPrefix empty so elements render
-    // as bare names (e.g. <Button>) instead of <m:Button xmlns:m="sap.m">.
     const fragMacrosNS = macrosNS || 'macros';
     const fragMNS = mNS;
     const macrosPrefix = `${fragMacrosNS}:`;
-    const mPrefix = fragMNS ? `${fragMNS}:` : '';
-    const aggContext = { macrosNamespace: fragMacrosNS, mNamespace: fragMNS, macrosPrefix, mPrefix };
     const pageElement = templateDocument.documentElement;
     const aggErrorHandler = (level: string, message: string): never => {
         throw new Error(`Unable to parse page aggregation fragment. Details: [${level}] - ${message}`);
     };
     for (const aggName of PAGE_AGGREGATIONS) {
+        const mContent = pageData.aggregations?.[aggName] ?? '';
+        const aggContext = { macrosNamespace: fragMacrosNS, macrosPrefix, mContent };
         const aggPath = getTemplatePath(`/building-block/page/${aggName}.xml`);
         const aggContent = render(fs.read(aggPath), aggContext, {});
         // Wrap with namespace declarations so elements parse correctly.
@@ -238,15 +236,16 @@ function sortPageAggregationChildren(pageElement: Node): void {
  * @param {Editor} fs - the memfs editor instance
  * @param {string} basePath - the base path of the application
  * @param {string} viewPath - the path of the xml view relative to the base path
- * @param {PageAggregationName} aggName - the name of the Page BB aggregation to append
+ * @param {{ aggregationName: PageAggregationName; mContent: string }} data - aggregation name and inner XML content
  * @returns {Editor} the updated memfs editor instance
  */
 export async function appendPageBBAggregation(
     fs: Editor,
     basePath: string,
     viewPath: string,
-    aggName: PageAggregationName
+    data: { aggregationName: PageAggregationName; mContent: string }
 ): Promise<Editor> {
+    const { aggregationName: aggName, mContent } = data;
     const xmlDocument = getUI5XmlDocument(basePath, viewPath, fs);
 
     const generateId = await createIdGenerator({ basePath, fsEditor: fs });
@@ -257,8 +256,7 @@ export async function appendPageBBAggregation(
     const fragMacrosNS = macrosNS || 'macros';
     const fragMNS = mNS;
     const macrosPrefix = `${fragMacrosNS}:`;
-    const mPrefix = fragMNS ? `${fragMNS}:` : '';
-    const aggContext = { macrosNamespace: fragMacrosNS, mNamespace: fragMNS, macrosPrefix, mPrefix };
+    const aggContext = { macrosNamespace: fragMacrosNS, macrosPrefix, mContent };
 
     const aggPath = getTemplatePath(`/building-block/page/${aggName}.xml`);
     const aggContent = render(fs.read(aggPath), aggContext, {});
diff --git a/packages/fe-fpm-writer/src/building-block/types.ts b/packages/fe-fpm-writer/src/building-block/types.ts
index 35a5348e0a4..6e1ac9792eb 100644
--- a/packages/fe-fpm-writer/src/building-block/types.ts
+++ b/packages/fe-fpm-writer/src/building-block/types.ts
@@ -404,6 +404,12 @@ export interface Page extends BuildingBlock {
      * 'blank' generates a minimal self-closing tag (default behavior).
      */
     templateType?: 'full' | 'blank';
+
+    /**
+     * Optional mContent strings keyed by aggregation name.
+     * When templateType is 'full', each entry is written as the inner XML of the corresponding aggregation.
+     */
+    aggregations?: Record<string, string>;
 }
 
 /**
diff --git a/packages/fe-fpm-writer/templates/building-block/page/actions.xml b/packages/fe-fpm-writer/templates/building-block/page/actions.xml
index b2a72fb0fad..921b306232a 100644
--- a/packages/fe-fpm-writer/templates/building-block/page/actions.xml
+++ b/packages/fe-fpm-writer/templates/building-block/page/actions.xml
@@ -1,5 +1,3 @@
-<!-- Actions aggregation -->
 <<%- macrosPrefix %>actions>
-    <<%- mPrefix %>Button text="Action 1" press=".onClickAction1" type="Ghost" />
-    <<%- mPrefix %>Button text="Action 2" press=".onClickAction2" type="Ghost" />
+    <%- mContent %>
 </<%- macrosPrefix %>actions>
diff --git a/packages/fe-fpm-writer/templates/building-block/page/breadcrumbs.xml b/packages/fe-fpm-writer/templates/building-block/page/breadcrumbs.xml
index b4169848294..c33c323201a 100644
--- a/packages/fe-fpm-writer/templates/building-block/page/breadcrumbs.xml
+++ b/packages/fe-fpm-writer/templates/building-block/page/breadcrumbs.xml
@@ -1,8 +1,3 @@
-<!-- Breadcrumbs aggregation -->
 <<%- macrosPrefix %>breadcrumbs>
-    <<%- mPrefix %>Breadcrumbs>
-        <<%- mPrefix %>Link text="Home" press=".onPressHome" />
-        <<%- mPrefix %>Link text="Page 1" press=".onPressPage1" />
-        <<%- mPrefix %>Link text="Page 2" press=".onPressPage2" />
-    </<%- mPrefix %>Breadcrumbs>
+    <%- mContent %>
 </<%- macrosPrefix %>breadcrumbs>
diff --git a/packages/fe-fpm-writer/templates/building-block/page/footer.xml b/packages/fe-fpm-writer/templates/building-block/page/footer.xml
index 61d440ec4c5..107da0af442 100644
--- a/packages/fe-fpm-writer/templates/building-block/page/footer.xml
+++ b/packages/fe-fpm-writer/templates/building-block/page/footer.xml
@@ -1,4 +1,3 @@
-<!-- Footer aggregation -->
 <<%- macrosPrefix %>footer>
-    <<%- mPrefix %>OverflowToolbar />
+    <%- mContent %>
 </<%- macrosPrefix %>footer>
diff --git a/packages/fe-fpm-writer/templates/building-block/page/headerContent.xml b/packages/fe-fpm-writer/templates/building-block/page/headerContent.xml
index 652dd4c4421..e43a2b15978 100644
--- a/packages/fe-fpm-writer/templates/building-block/page/headerContent.xml
+++ b/packages/fe-fpm-writer/templates/building-block/page/headerContent.xml
@@ -1,6 +1,3 @@
-<!-- Header content aggregation (content after avatar) -->
 <<%- macrosPrefix %>headerContent>
-    <<%- mPrefix %>VBox>
-        <<%- mPrefix %>Title text="Page Title" />
-    </<%- mPrefix %>VBox>
+    <%- mContent %>
 </<%- macrosPrefix %>headerContent>
diff --git a/packages/fe-fpm-writer/templates/building-block/page/navigationActions.xml b/packages/fe-fpm-writer/templates/building-block/page/navigationActions.xml
index a40c3e983ee..816effd5a9c 100644
--- a/packages/fe-fpm-writer/templates/building-block/page/navigationActions.xml
+++ b/packages/fe-fpm-writer/templates/building-block/page/navigationActions.xml
@@ -1,4 +1,3 @@
-<!-- Navigation actions aggregation -->
 <<%- macrosPrefix %>navigationActions>
-    <<%- mPrefix %>Button icon="sap-icon://full-screen" press=".onFullScreen" type="Transparent" />
+    <%- mContent %>
 </<%- macrosPrefix %>navigationActions>
diff --git a/packages/fe-fpm-writer/templates/building-block/page/titleContent.xml b/packages/fe-fpm-writer/templates/building-block/page/titleContent.xml
index ffebf183110..dcc32ef0669 100644
--- a/packages/fe-fpm-writer/templates/building-block/page/titleContent.xml
+++ b/packages/fe-fpm-writer/templates/building-block/page/titleContent.xml
@@ -1,4 +1,3 @@
-<!-- Title content aggregation (content next to title) -->
 <<%- macrosPrefix %>titleContent>
-    <<%- mPrefix %>GenericTag text="Status" design="StatusIconHidden" status="Information" />
+    <%- mContent %>
 </<%- macrosPrefix %>titleContent>

From e0694a6359fad25feedfdef568abf13fc9f26d7b Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Tue, 2 Jun 2026 10:17:37 +0100
Subject: [PATCH 04/51] feat add other aggregations to page building block

---
 .../fe-fpm-writer/src/building-block/index.ts     |  4 ++--
 .../test/unit/building-block.test.ts              | 15 +++++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 9cee6d8d6cb..196e520b34d 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -188,7 +188,7 @@ function appendPageAggregations(
     };
     for (const aggName of PAGE_AGGREGATIONS) {
         const mContent = pageData.aggregations?.[aggName] ?? '';
-        const aggContext = { macrosNamespace: fragMacrosNS, macrosPrefix, mContent };
+        const aggContext = { macrosPrefix, mContent };
         const aggPath = getTemplatePath(`/building-block/page/${aggName}.xml`);
         const aggContent = render(fs.read(aggPath), aggContext, {});
         // Wrap with namespace declarations so elements parse correctly.
@@ -256,7 +256,7 @@ export async function appendPageBBAggregation(
     const fragMacrosNS = macrosNS || 'macros';
     const fragMNS = mNS;
     const macrosPrefix = `${fragMacrosNS}:`;
-    const aggContext = { macrosNamespace: fragMacrosNS, macrosPrefix, mContent };
+    const aggContext = { macrosPrefix, mContent };
 
     const aggPath = getTemplatePath(`/building-block/page/${aggName}.xml`);
     const aggContent = render(fs.read(aggPath), aggContext, {});
diff --git a/packages/fe-fpm-writer/test/unit/building-block.test.ts b/packages/fe-fpm-writer/test/unit/building-block.test.ts
index 773b93b218f..05b7e2b157d 100644
--- a/packages/fe-fpm-writer/test/unit/building-block.test.ts
+++ b/packages/fe-fpm-writer/test/unit/building-block.test.ts
@@ -1108,7 +1108,14 @@ describe('Building Blocks', () => {
                     buildingBlockType: BuildingBlockType.Page,
                     title: 'Test Page',
                     templateType: 'full',
-                    generateId
+                    generateId,
+                    aggregations: {
+                        breadcrumbs:
+                            '<m:Breadcrumbs>\n    <m:Link text="Home" press=".onPressHome" />\n    <m:Link text="Page 1" press=".onPressPage1" />\n    <m:Link text="Page 2" press=".onPressPage2" />\n</m:Breadcrumbs>',
+                        navigationActions:
+                            '<m:Button icon="sap-icon://full-screen" press=".onFullScreen" type="Transparent" />',
+                        actions: '<m:Button text="Action 1" press=".onClickAction1" type="Ghost" />\n    <m:Button text="Action 2" press=".onClickAction2" type="Ghost" />'
+                    }
                 },
                 replace: true
             },
@@ -3858,7 +3865,7 @@ describe('Building Blocks', () => {
             const basePath = join(testAppPath, 'page-bb-agg');
             fs.write(join(basePath, xmlViewFilePath), pageViewContent);
 
-            const result = await appendPageBBAggregation(fs, basePath, xmlViewFilePath, 'footer');
+            const result = await appendPageBBAggregation(fs, basePath, xmlViewFilePath, { aggregationName: 'footer', mContent: '' });
 
             const output = result.read(join(basePath, xmlViewFilePath));
             expect(output).toContain('id="footer"');
@@ -3875,7 +3882,7 @@ describe('Building Blocks', () => {
             fs.write(join(basePath, xmlViewFilePath), viewWithExistingId);
             jest.spyOn(fileAccess, 'findFilesByExtension').mockResolvedValue([join(basePath, xmlViewFilePath)]);
 
-            const result = await appendPageBBAggregation(fs, basePath, xmlViewFilePath, 'footer');
+            const result = await appendPageBBAggregation(fs, basePath, xmlViewFilePath, { aggregationName: 'footer', mContent: '' });
 
             const output = result.read(join(basePath, xmlViewFilePath));
             expect(output).toContain('id="footer1"');
@@ -3894,7 +3901,7 @@ describe('Building Blocks', () => {
             fs.write(join(basePath, xmlViewFilePath), viewOutOfOrder);
 
             // Adding navigationActions (index 1) should trigger a full sort
-            const result = await appendPageBBAggregation(fs, basePath, xmlViewFilePath, 'navigationActions');
+            const result = await appendPageBBAggregation(fs, basePath, xmlViewFilePath, { aggregationName: 'navigationActions', mContent: '' });
 
             const output = result.read(join(basePath, xmlViewFilePath));
             const navPos = output.indexOf('macros:navigationActions');

From 455dbeea59ef8fec1ad0413b797a8b1044213831 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Thu, 4 Jun 2026 15:09:30 +0100
Subject: [PATCH 05/51] feat add other aggregations to page building block

---
 .../fe-fpm-writer/src/building-block/index.ts | 24 ++++--
 .../building-block/prompts/questions/page.ts  |  8 +-
 .../fe-fpm-writer/src/building-block/types.ts |  8 +-
 packages/fe-fpm-writer/src/index.ts           |  4 +-
 .../src/prompts/translations/i18n.ts          |  6 +-
 .../templates/building-block/page/actions.xml |  1 +
 .../building-block/page/breadcrumbs.xml       |  1 +
 .../templates/building-block/page/footer.xml  |  1 +
 .../building-block/page/headerContent.xml     |  1 +
 .../templates/building-block/page/items.xml   |  1 +
 .../building-block/page/navigationActions.xml |  1 +
 .../building-block/page/titleContent.xml      |  1 +
 .../test/unit/building-block.test.ts          | 85 +++++++++++++++++--
 .../__snapshots__/prompts.test.ts.snap        | 24 +++---
 14 files changed, 133 insertions(+), 33 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 382e928f16e..834f53eee70 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -11,6 +11,7 @@ import type { Editor } from 'mem-fs-editor';
 import { getMinimumUI5Version } from '@sap-ux/project-access';
 import {
     BuildingBlockType,
+    PAGE_TEMPLATE_TYPE_FULL,
     type BuildingBlock,
     type BuildingBlockConfig,
     type BuildingBlockMetaPath,
@@ -99,7 +100,7 @@ export async function generateBuildingBlock<T extends BuildingBlock>(
 
     if (
         buildingBlockData.buildingBlockType === BuildingBlockType.Page &&
-        (buildingBlockData as Page).templateType === 'full'
+        (buildingBlockData as Page).templateType === PAGE_TEMPLATE_TYPE_FULL
     ) {
         appendPageAggregations(fs, xmlDocument, templateDocument, fnGenerateId, buildingBlockData as Page);
     }
@@ -128,7 +129,7 @@ export async function generateBuildingBlock<T extends BuildingBlock>(
 
     if (
         buildingBlockData.buildingBlockType === BuildingBlockType.Page &&
-        (buildingBlockData as Page).templateType === 'full'
+        (buildingBlockData as Page).templateType === PAGE_TEMPLATE_TYPE_FULL
     ) {
         applyPageControllerTemplate(fs, basePath, viewOrFragmentPath);
     }
@@ -161,6 +162,8 @@ export const PAGE_AGGREGATIONS = [
 
 export type PageAggregationName = (typeof PAGE_AGGREGATIONS)[number];
 
+const PAGE_TEMPLATE_COMMENT = 'This is a sample template, event handlers should be added for implementation';
+
 /**
  * Appends the 7 Page building block aggregation fragments as child elements of the templateDocument root.
  *
@@ -186,6 +189,7 @@ function appendPageAggregations(
     const aggErrorHandler = (level: string, message: string): never => {
         throw new Error(`Unable to parse page aggregation fragment. Details: [${level}] - ${message}`);
     };
+    pageElement.appendChild(templateDocument.createComment(PAGE_TEMPLATE_COMMENT));
     for (const aggName of PAGE_AGGREGATIONS) {
         const mContent = pageData.aggregations?.[aggName] ?? '';
         const aggContext = { macrosPrefix, mContent };
@@ -214,9 +218,10 @@ function appendPageAggregations(
  * @param pageElement - the macros:Page DOM node whose children should be sorted
  */
 function sortPageAggregationChildren(pageElement: Node): void {
-    const elementChildren = Array.from(pageElement.childNodes).filter(
-        (n) => n.nodeType === 1 /* Element */
-    ) as Element[];
+    const allChildren = Array.from(pageElement.childNodes);
+    // Separate leading template comment (first comment node) from element children
+    const leadingComment = allChildren.find((n) => n.nodeType === 8 /* Comment */);
+    const elementChildren = allChildren.filter((n) => n.nodeType === 1 /* Element */) as Element[];
     const sorted = [...elementChildren].sort((a, b) => {
         const aIdx = PAGE_AGGREGATIONS.indexOf(a.localName as PageAggregationName);
         const bIdx = PAGE_AGGREGATIONS.indexOf(b.localName as PageAggregationName);
@@ -225,6 +230,9 @@ function sortPageAggregationChildren(pageElement: Node): void {
     while (pageElement.firstChild) {
         pageElement.removeChild(pageElement.firstChild);
     }
+    if (leadingComment) {
+        pageElement.appendChild(leadingComment);
+    }
     for (const el of sorted) {
         pageElement.appendChild(el);
     }
@@ -237,6 +245,8 @@ function sortPageAggregationChildren(pageElement: Node): void {
  * @param {string} basePath - the base path of the application
  * @param {string} viewPath - the path of the xml view relative to the base path
  * @param {{ aggregationName: PageAggregationName; mContent: string }} data - aggregation name and inner XML content
+ * @param data.aggregationName
+ * @param data.mContent
  * @returns {Editor} the updated memfs editor instance
  */
 export async function appendPageBBAggregation(
@@ -275,6 +285,10 @@ export async function appendPageBBAggregation(
     }
 
     const pageElement = pageNodes[0] as Node;
+    const hasExistingChildren = Array.from(pageElement.childNodes).some((n) => n.nodeType === 1 /* Element */);
+    if (!hasExistingChildren) {
+        pageElement.appendChild(xmlDocument.createComment(PAGE_TEMPLATE_COMMENT));
+    }
     for (const node of Array.from(aggDoc.documentElement.childNodes)) {
         if (node.nodeType === 1 /* Element */) {
             (node as Element).setAttribute('id', uniqueId);
diff --git a/packages/fe-fpm-writer/src/building-block/prompts/questions/page.ts b/packages/fe-fpm-writer/src/building-block/prompts/questions/page.ts
index 74a94e90cb6..b5a9fa1b106 100644
--- a/packages/fe-fpm-writer/src/building-block/prompts/questions/page.ts
+++ b/packages/fe-fpm-writer/src/building-block/prompts/questions/page.ts
@@ -2,7 +2,7 @@ import type { Answers } from 'inquirer';
 import { i18nNamespaces, translate } from '../../../i18n.js';
 import { getBuildingBlockIdPrompt, getViewOrFragmentPathPrompt, getAggregationPathPrompt } from '../utils/index.js';
 import type { PromptContext, Prompts } from '../../../prompts/types.js';
-import { BuildingBlockType } from '../../types.js';
+import { BuildingBlockType, PAGE_TEMPLATE_TYPE_BASIC, PAGE_TEMPLATE_TYPE_FULL } from '../../types.js';
 import type { BuildingBlockConfig, Page } from '../../types.js';
 import { SapShortTextType, SapLongTextType } from '@sap-ux/i18n';
 
@@ -23,10 +23,10 @@ export async function getPageBuildingBlockPrompts(context: PromptContext): Promi
                 type: 'list',
                 name: 'buildingBlockData.templateType',
                 message: t('templateType.message') as string,
-                default: 'full',
+                default: PAGE_TEMPLATE_TYPE_BASIC,
                 choices: [
-                    { value: 'full', name: t('templateType.full') as string },
-                    { value: 'blank', name: t('templateType.blank') as string }
+                    { value: PAGE_TEMPLATE_TYPE_BASIC, name: t('templateType.basic') as string },
+                    { value: PAGE_TEMPLATE_TYPE_FULL, name: t('templateType.full') as string }
                 ],
                 guiOptions: { mandatory: true }
             },
diff --git a/packages/fe-fpm-writer/src/building-block/types.ts b/packages/fe-fpm-writer/src/building-block/types.ts
index 5a439125f53..a3566cd469e 100644
--- a/packages/fe-fpm-writer/src/building-block/types.ts
+++ b/packages/fe-fpm-writer/src/building-block/types.ts
@@ -401,9 +401,9 @@ export interface Page extends BuildingBlock {
     /**
      * The template type for the page building block.
      * 'full' generates a full page template with all aggregations and controller stubs.
-     * 'blank' generates a minimal self-closing tag (default behavior).
+     * 'basic' generates a minimal self-closing tag (default behavior).
      */
-    templateType?: 'full' | 'blank';
+    templateType?: PageTemplateType;
 
     /**
      * Optional mContent strings keyed by aggregation name.
@@ -412,6 +412,10 @@ export interface Page extends BuildingBlock {
     aggregations?: Record<string, string>;
 }
 
+export const PAGE_TEMPLATE_TYPE_FULL = 'full' as const;
+export const PAGE_TEMPLATE_TYPE_BASIC = 'basic' as const;
+export type PageTemplateType = typeof PAGE_TEMPLATE_TYPE_FULL | typeof PAGE_TEMPLATE_TYPE_BASIC;
+
 /**
  * Represents a custom filter to be used inside the FilterBar.
  * The template for the FilterField has to be provided as the default aggregation.
diff --git a/packages/fe-fpm-writer/src/index.ts b/packages/fe-fpm-writer/src/index.ts
index dd73762f28a..9e1a95dd6ad 100644
--- a/packages/fe-fpm-writer/src/index.ts
+++ b/packages/fe-fpm-writer/src/index.ts
@@ -43,8 +43,10 @@ export type {
     CustomFormField,
     RichTextEditor,
     ButtonGroupConfig,
-    Action
+    Action,
+    PageTemplateType
 } from './building-block/types.js';
+export { PAGE_TEMPLATE_TYPE_FULL, PAGE_TEMPLATE_TYPE_BASIC } from './building-block/types.js';
 export {
     generateBuildingBlock,
     getSerializedFileContent,
diff --git a/packages/fe-fpm-writer/src/prompts/translations/i18n.ts b/packages/fe-fpm-writer/src/prompts/translations/i18n.ts
index 9b1722d1681..8fbd03337da 100644
--- a/packages/fe-fpm-writer/src/prompts/translations/i18n.ts
+++ b/packages/fe-fpm-writer/src/prompts/translations/i18n.ts
@@ -281,9 +281,9 @@ const ns1 = {
         },
         'page': {
             'templateType': {
-                'message': 'Page template',
-                'full': 'Default content',
-                'blank': 'Blank'
+                'message': 'Page Layout',
+                'full': 'Full',
+                'basic': 'Basic'
             },
             'id': {
                 'message': 'Building Block ID',
diff --git a/packages/fe-fpm-writer/templates/building-block/page/actions.xml b/packages/fe-fpm-writer/templates/building-block/page/actions.xml
index 921b306232a..c4a35ba2727 100644
--- a/packages/fe-fpm-writer/templates/building-block/page/actions.xml
+++ b/packages/fe-fpm-writer/templates/building-block/page/actions.xml
@@ -1,3 +1,4 @@
 <<%- macrosPrefix %>actions>
+    <!-- Actions aggregation -->
     <%- mContent %>
 </<%- macrosPrefix %>actions>
diff --git a/packages/fe-fpm-writer/templates/building-block/page/breadcrumbs.xml b/packages/fe-fpm-writer/templates/building-block/page/breadcrumbs.xml
index c33c323201a..84daa8b3e09 100644
--- a/packages/fe-fpm-writer/templates/building-block/page/breadcrumbs.xml
+++ b/packages/fe-fpm-writer/templates/building-block/page/breadcrumbs.xml
@@ -1,3 +1,4 @@
 <<%- macrosPrefix %>breadcrumbs>
+    <!-- Breadcrumbs aggregation -->
     <%- mContent %>
 </<%- macrosPrefix %>breadcrumbs>
diff --git a/packages/fe-fpm-writer/templates/building-block/page/footer.xml b/packages/fe-fpm-writer/templates/building-block/page/footer.xml
index 107da0af442..4e1063d6213 100644
--- a/packages/fe-fpm-writer/templates/building-block/page/footer.xml
+++ b/packages/fe-fpm-writer/templates/building-block/page/footer.xml
@@ -1,3 +1,4 @@
 <<%- macrosPrefix %>footer>
+    <!-- Footer aggregation -->
     <%- mContent %>
 </<%- macrosPrefix %>footer>
diff --git a/packages/fe-fpm-writer/templates/building-block/page/headerContent.xml b/packages/fe-fpm-writer/templates/building-block/page/headerContent.xml
index e43a2b15978..c74f353119d 100644
--- a/packages/fe-fpm-writer/templates/building-block/page/headerContent.xml
+++ b/packages/fe-fpm-writer/templates/building-block/page/headerContent.xml
@@ -1,3 +1,4 @@
 <<%- macrosPrefix %>headerContent>
+    <!-- Header content aggregation (content after avatar) -->
     <%- mContent %>
 </<%- macrosPrefix %>headerContent>
diff --git a/packages/fe-fpm-writer/templates/building-block/page/items.xml b/packages/fe-fpm-writer/templates/building-block/page/items.xml
index 41f5ad116ba..0bb5cf4c161 100644
--- a/packages/fe-fpm-writer/templates/building-block/page/items.xml
+++ b/packages/fe-fpm-writer/templates/building-block/page/items.xml
@@ -1,4 +1,5 @@
 <<%- macrosPrefix %>items>
+    <!-- Main content -->
 	<IconTabBar id="stickySubheaderBar" class="sapUiResponsiveContentPadding">
 		<items>
 			<IconTabFilter text="Tab 1">
diff --git a/packages/fe-fpm-writer/templates/building-block/page/navigationActions.xml b/packages/fe-fpm-writer/templates/building-block/page/navigationActions.xml
index 816effd5a9c..519cad9b13a 100644
--- a/packages/fe-fpm-writer/templates/building-block/page/navigationActions.xml
+++ b/packages/fe-fpm-writer/templates/building-block/page/navigationActions.xml
@@ -1,3 +1,4 @@
 <<%- macrosPrefix %>navigationActions>
+    <!-- Navigation actions aggregation -->
     <%- mContent %>
 </<%- macrosPrefix %>navigationActions>
diff --git a/packages/fe-fpm-writer/templates/building-block/page/titleContent.xml b/packages/fe-fpm-writer/templates/building-block/page/titleContent.xml
index dcc32ef0669..db1da1ea76f 100644
--- a/packages/fe-fpm-writer/templates/building-block/page/titleContent.xml
+++ b/packages/fe-fpm-writer/templates/building-block/page/titleContent.xml
@@ -1,3 +1,4 @@
 <<%- macrosPrefix %>titleContent>
+    <!-- Title content aggregation (content next to title) -->
     <%- mContent %>
 </<%- macrosPrefix %>titleContent>
diff --git a/packages/fe-fpm-writer/test/unit/building-block.test.ts b/packages/fe-fpm-writer/test/unit/building-block.test.ts
index 76912a073e4..29afcbb4ac0 100644
--- a/packages/fe-fpm-writer/test/unit/building-block.test.ts
+++ b/packages/fe-fpm-writer/test/unit/building-block.test.ts
@@ -1117,7 +1117,8 @@ describe('Building Blocks', () => {
                             '<m:Breadcrumbs>\n    <m:Link text="Home" press=".onPressHome" />\n    <m:Link text="Page 1" press=".onPressPage1" />\n    <m:Link text="Page 2" press=".onPressPage2" />\n</m:Breadcrumbs>',
                         navigationActions:
                             '<m:Button icon="sap-icon://full-screen" press=".onFullScreen" type="Transparent" />',
-                        actions: '<m:Button text="Action 1" press=".onClickAction1" type="Ghost" />\n    <m:Button text="Action 2" press=".onClickAction2" type="Ghost" />'
+                        actions:
+                            '<m:Button text="Action 1" press=".onClickAction1" type="Ghost" />\n    <m:Button text="Action 2" press=".onClickAction2" type="Ghost" />'
                     }
                 },
                 replace: true
@@ -1147,6 +1148,7 @@ describe('Building Blocks', () => {
         expect(viewContent).toContain('press=".onFullScreen"');
         expect(viewContent).toContain('press=".onClickAction1"');
         expect(viewContent).toContain('press=".onClickAction2"');
+        expect(viewContent).toContain('This is a sample template, event handlers should be added for implementation');
     });
 
     test('generate Page building block with full template creates JS controller', async () => {
@@ -1223,7 +1225,7 @@ describe('Building Blocks', () => {
                 buildingBlockData: {
                     id: 'testPage',
                     buildingBlockType: BuildingBlockType.Page,
-                    templateType: 'blank',
+                    templateType: 'basic',
                     generateId
                 },
                 replace: true
@@ -3868,7 +3870,10 @@ describe('Building Blocks', () => {
             const basePath = join(testAppPath, 'page-bb-agg');
             fs.write(join(basePath, xmlViewFilePath), pageViewContent);
 
-            const result = await appendPageBBAggregation(fs, basePath, xmlViewFilePath, { aggregationName: 'footer', mContent: '' });
+            const result = await appendPageBBAggregation(fs, basePath, xmlViewFilePath, {
+                aggregationName: 'footer',
+                mContent: ''
+            });
 
             const output = result.read(join(basePath, xmlViewFilePath));
             expect(output).toContain('id="footer"');
@@ -3883,9 +3888,12 @@ describe('Building Blocks', () => {
     </macros:Page>
 </mvc:View>`;
             fs.write(join(basePath, xmlViewFilePath), viewWithExistingId);
-            jest.spyOn(fileAccess, 'findFilesByExtension').mockResolvedValue([join(basePath, xmlViewFilePath)]);
+            findFilesByExtensionMock.mockResolvedValue([join(basePath, xmlViewFilePath)]);
 
-            const result = await appendPageBBAggregation(fs, basePath, xmlViewFilePath, { aggregationName: 'footer', mContent: '' });
+            const result = await appendPageBBAggregation(fs, basePath, xmlViewFilePath, {
+                aggregationName: 'footer',
+                mContent: ''
+            });
 
             const output = result.read(join(basePath, xmlViewFilePath));
             expect(output).toContain('id="footer1"');
@@ -3904,7 +3912,10 @@ describe('Building Blocks', () => {
             fs.write(join(basePath, xmlViewFilePath), viewOutOfOrder);
 
             // Adding navigationActions (index 1) should trigger a full sort
-            const result = await appendPageBBAggregation(fs, basePath, xmlViewFilePath, { aggregationName: 'navigationActions', mContent: '' });
+            const result = await appendPageBBAggregation(fs, basePath, xmlViewFilePath, {
+                aggregationName: 'navigationActions',
+                mContent: ''
+            });
 
             const output = result.read(join(basePath, xmlViewFilePath));
             const navPos = output.indexOf('macros:navigationActions');
@@ -3913,5 +3924,67 @@ describe('Building Blocks', () => {
             expect(navPos).toBeLessThan(actPos);
             expect(actPos).toBeLessThan(footPos);
         });
+
+        it('adds template comment as first child when Page has no existing aggregations', async () => {
+            const basePath = join(testAppPath, 'page-bb-agg-comment');
+            fs.write(join(basePath, xmlViewFilePath), pageViewContent);
+
+            const result = await appendPageBBAggregation(fs, basePath, xmlViewFilePath, {
+                aggregationName: 'items',
+                mContent: ''
+            });
+
+            const output = result.read(join(basePath, xmlViewFilePath));
+            expect(output).toContain('This is a sample template, event handlers should be added for implementation');
+            // Comment should appear before the aggregation element
+            const commentPos = output.indexOf('This is a sample template');
+            const itemsPos = output.indexOf('macros:items');
+            expect(commentPos).toBeLessThan(itemsPos);
+        });
+
+        it('does not add template comment when Page already has aggregation children', async () => {
+            const basePath = join(testAppPath, 'page-bb-agg-no-comment');
+            const viewWithExisting = `<mvc:View xmlns:core="sap.ui.core" xmlns:mvc="sap.ui.core.mvc" xmlns="sap.m"
+    xmlns:macros="sap.fe.macros" controllerName="com.test.myApp.ext.main.Main">
+    <macros:Page id="Page" title="pageTitle">
+        <macros:footer id="footer"><OverflowToolbar /></macros:footer>
+    </macros:Page>
+</mvc:View>`;
+            fs.write(join(basePath, xmlViewFilePath), viewWithExisting);
+
+            const result = await appendPageBBAggregation(fs, basePath, xmlViewFilePath, {
+                aggregationName: 'items',
+                mContent: ''
+            });
+
+            const output = result.read(join(basePath, xmlViewFilePath));
+            // Comment should not be added again if children already exist
+            expect(output.split('This is a sample template').length - 1).toBeLessThanOrEqual(1);
+        });
+
+        it('preserves template comment when reordering aggregations', async () => {
+            const basePath = join(testAppPath, 'page-bb-agg-sort-comment');
+            const viewWithComment = `<mvc:View xmlns:core="sap.ui.core" xmlns:mvc="sap.ui.core.mvc" xmlns="sap.m"
+    xmlns:macros="sap.fe.macros" controllerName="com.test.myApp.ext.main.Main">
+    <macros:Page id="Page" title="pageTitle">
+        <!--This is a sample template, event handlers should be added for implementation-->
+        <macros:footer id="footer"><OverflowToolbar /></macros:footer>
+        <macros:actions id="actions"><Button text="Act" /></macros:actions>
+    </macros:Page>
+</mvc:View>`;
+            fs.write(join(basePath, xmlViewFilePath), viewWithComment);
+
+            const result = await appendPageBBAggregation(fs, basePath, xmlViewFilePath, {
+                aggregationName: 'navigationActions',
+                mContent: ''
+            });
+
+            const output = result.read(join(basePath, xmlViewFilePath));
+            expect(output).toContain('This is a sample template, event handlers should be added for implementation');
+            // Comment should remain before all aggregation elements
+            const commentPos = output.indexOf('This is a sample template');
+            const navPos = output.indexOf('macros:navigationActions');
+            expect(commentPos).toBeLessThan(navPos);
+        });
     });
 });
diff --git a/packages/fe-fpm-writer/test/unit/prompts/__snapshots__/prompts.test.ts.snap b/packages/fe-fpm-writer/test/unit/prompts/__snapshots__/prompts.test.ts.snap
index 78765f40f8b..8a63cda477b 100644
--- a/packages/fe-fpm-writer/test/unit/prompts/__snapshots__/prompts.test.ts.snap
+++ b/packages/fe-fpm-writer/test/unit/prompts/__snapshots__/prompts.test.ts.snap
@@ -430,19 +430,19 @@ Object {
     Object {
       "choices": Array [
         Object {
-          "name": "Default content",
-          "value": "full",
+          "name": "Basic",
+          "value": "basic",
         },
         Object {
-          "name": "Blank",
-          "value": "blank",
+          "name": "Full",
+          "value": "full",
         },
       ],
-      "default": "full",
+      "default": "basic",
       "guiOptions": Object {
         "mandatory": true,
       },
-      "message": "Page template",
+      "message": "Page Layout",
       "name": "buildingBlockData.templateType",
       "type": "list",
     },
@@ -1830,19 +1830,19 @@ Object {
     Object {
       "choices": Array [
         Object {
-          "name": "Default content",
-          "value": "full",
+          "name": "Basic",
+          "value": "basic",
         },
         Object {
-          "name": "Blank",
-          "value": "blank",
+          "name": "Full",
+          "value": "full",
         },
       ],
-      "default": "full",
+      "default": "basic",
       "guiOptions": Object {
         "mandatory": true,
       },
-      "message": "Page template",
+      "message": "Page Layout",
       "name": "buildingBlockData.templateType",
       "type": "list",
     },

From 1f1a9162e8e98ab03f2ccb6b52a6607a461b8708 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Fri, 5 Jun 2026 15:24:30 +0100
Subject: [PATCH 06/51] merge from main

---
 packages/fe-fpm-writer/test/unit/building-block.test.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/fe-fpm-writer/test/unit/building-block.test.ts b/packages/fe-fpm-writer/test/unit/building-block.test.ts
index edbcf428ed9..95eab252d55 100644
--- a/packages/fe-fpm-writer/test/unit/building-block.test.ts
+++ b/packages/fe-fpm-writer/test/unit/building-block.test.ts
@@ -18,7 +18,12 @@ import type {
     Action
 } from '../../src/index.js';
 
-import { BuildingBlockType, generateBuildingBlock, getSerializedFileContent, appendPageBBAggregation } from '../../src/index.js';
+import {
+    BuildingBlockType,
+    generateBuildingBlock,
+    getSerializedFileContent,
+    appendPageBBAggregation
+} from '../../src/index.js';
 import { BUILDING_BLOCK_CONFIG } from '../../src/building-block/processor.js';
 import testManifestContent from './sample/building-block/webapp/manifest.json';
 import { clearTestOutput, writeFilesForDebugging } from '../common/index.js';

From 957fc838caa80c17660112db6e7688f6d2a64e8f Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Fri, 5 Jun 2026 15:59:00 +0100
Subject: [PATCH 07/51] fix after comments

---
 .../fe-fpm-writer/src/building-block/index.ts | 34 +++++++++----------
 .../fe-fpm-writer/src/building-block/types.ts | 14 +++++++-
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 834f53eee70..f887e1aaa90 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -11,11 +11,13 @@ import type { Editor } from 'mem-fs-editor';
 import { getMinimumUI5Version } from '@sap-ux/project-access';
 import {
     BuildingBlockType,
+    PAGE_AGGREGATIONS,
     PAGE_TEMPLATE_TYPE_FULL,
     type BuildingBlock,
     type BuildingBlockConfig,
     type BuildingBlockMetaPath,
     type Page,
+    type PageAggregationName,
     bindingContextAbsolute,
     type TemplateConfig
 } from './types.js';
@@ -150,17 +152,8 @@ export async function generateBuildingBlock<T extends BuildingBlock>(
     return fs;
 }
 
-export const PAGE_AGGREGATIONS = [
-    'breadcrumbs',
-    'navigationActions',
-    'titleContent',
-    'actions',
-    'headerContent',
-    'items',
-    'footer'
-] as const;
-
-export type PageAggregationName = (typeof PAGE_AGGREGATIONS)[number];
+export { PAGE_AGGREGATIONS } from './types.js';
+export type { PageAggregationName } from './types.js';
 
 const PAGE_TEMPLATE_COMMENT = 'This is a sample template, event handlers should be added for implementation';
 
@@ -259,7 +252,6 @@ export async function appendPageBBAggregation(
     const xmlDocument = getUI5XmlDocument(basePath, viewPath, fs);
 
     const generateId = await createIdGenerator({ basePath, fsEditor: fs });
-    const uniqueId = generateId(aggName);
 
     const macrosNS = getOrAddNamespace(xmlDocument, 'sap.fe.macros', 'macros');
     const mNS = getOrAddNamespace(xmlDocument, 'sap.m', 'm');
@@ -278,7 +270,11 @@ export async function appendPageBBAggregation(
     };
     const aggDoc = new DOMParser({ errorHandler }).parseFromString(wrapped, 'text/xml');
 
-    const xpathSelect = xpath.useNamespaces((xmlDocument.firstChild as any)._nsMap);
+    const firstChildView = xmlDocument.firstChild;
+    if (!firstChildView) {
+        throw new Error(`Unable to read namespace map from view ${viewPath}.`);
+    }
+    const xpathSelect = xpath.useNamespaces((firstChildView as any)._nsMap);
     const pageNodes = xpathSelect(`//${fragMacrosNS}:Page`, xmlDocument);
     if (!pageNodes || !Array.isArray(pageNodes) || pageNodes.length === 0) {
         throw new Error(`macros:Page element not found in view ${viewPath}.`);
@@ -291,7 +287,7 @@ export async function appendPageBBAggregation(
     }
     for (const node of Array.from(aggDoc.documentElement.childNodes)) {
         if (node.nodeType === 1 /* Element */) {
-            (node as Element).setAttribute('id', uniqueId);
+            (node as Element).setAttribute('id', generateId(aggName));
             pageElement.appendChild(xmlDocument.importNode(node, true));
         }
     }
@@ -311,8 +307,8 @@ export async function appendPageBBAggregation(
  * @param {string} viewOrFragmentPath - the relative path of the view/fragment file
  */
 function applyPageControllerTemplate(fs: Editor, basePath: string, viewOrFragmentPath: string): void {
-    const viewDir = parse(viewOrFragmentPath).dir;
-    const viewBaseName = parse(viewOrFragmentPath).name.replace(/\.view$/, '');
+    const { dir: viewDir, name: viewName } = parse(viewOrFragmentPath);
+    const viewBaseName = viewName.replace(/\.view$/, '');
     const isTypeScript = fs.exists(join(basePath, viewDir, `${viewBaseName}.controller.ts`));
     const controllerExt = isTypeScript ? 'ts' : 'js';
     const controllerPath = join(basePath, viewDir, `${viewBaseName}.controller.${controllerExt}`);
@@ -560,7 +556,11 @@ function updateViewFile(
     fs: Editor,
     replace: boolean = false
 ): Editor {
-    const xpathSelect = xpath.useNamespaces((viewDocument.firstChild as any)._nsMap);
+    const firstChild = viewDocument.firstChild;
+    if (!firstChild) {
+        throw new Error(`Unable to read namespace map from view ${viewPath}.`);
+    }
+    const xpathSelect = xpath.useNamespaces((firstChild as any)._nsMap);
 
     // Find target aggregated element and append template as child
     const targetNodes = xpathSelect(aggregationPath, viewDocument);
diff --git a/packages/fe-fpm-writer/src/building-block/types.ts b/packages/fe-fpm-writer/src/building-block/types.ts
index a3566cd469e..b506c497228 100644
--- a/packages/fe-fpm-writer/src/building-block/types.ts
+++ b/packages/fe-fpm-writer/src/building-block/types.ts
@@ -387,6 +387,18 @@ export interface Table extends BuildingBlock {
  * <macro:Page title="My Page Title" description="My Page Description" />
  * @extends {BuildingBlock}
  */
+export const PAGE_AGGREGATIONS = [
+    'breadcrumbs',
+    'navigationActions',
+    'titleContent',
+    'actions',
+    'headerContent',
+    'items',
+    'footer'
+] as const;
+
+export type PageAggregationName = (typeof PAGE_AGGREGATIONS)[number];
+
 export interface Page extends BuildingBlock {
     /**
      * The title of the page.
@@ -409,7 +421,7 @@ export interface Page extends BuildingBlock {
      * Optional mContent strings keyed by aggregation name.
      * When templateType is 'full', each entry is written as the inner XML of the corresponding aggregation.
      */
-    aggregations?: Record<string, string>;
+    aggregations?: Partial<Record<PageAggregationName, string>>;
 }
 
 export const PAGE_TEMPLATE_TYPE_FULL = 'full' as const;

From a8dc4e1205621fbfa8b21ebfaa25d824810a1961 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Fri, 5 Jun 2026 16:58:41 +0100
Subject: [PATCH 08/51] fix after comments

---
 .../fe-fpm-writer/src/building-block/index.ts   | 17 +++++++++++------
 .../src/prompts/translations/i18n.ts            |  4 ++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index f887e1aaa90..62981cd70d0 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -104,7 +104,8 @@ export async function generateBuildingBlock<T extends BuildingBlock>(
         buildingBlockData.buildingBlockType === BuildingBlockType.Page &&
         (buildingBlockData as Page).templateType === PAGE_TEMPLATE_TYPE_FULL
     ) {
-        appendPageAggregations(fs, xmlDocument, templateDocument, fnGenerateId, buildingBlockData as Page);
+        const pageData = buildingBlockData as Page;
+        appendPageAggregations(fs, xmlDocument, templateDocument, fnGenerateId, pageData);
     }
 
     if (
@@ -187,7 +188,7 @@ function appendPageAggregations(
         const mContent = pageData.aggregations?.[aggName] ?? '';
         const aggContext = { macrosPrefix, mContent };
         const aggPath = getTemplatePath(`/building-block/page/${aggName}.xml`);
-        const aggContent = render(fs.read(aggPath), aggContext, {});
+        const aggContent = render(fs.read(aggPath), aggContext, {}); // NOSONAR - template is a controlled file on disk, not user input
         // Wrap with namespace declarations so elements parse correctly.
         // When sap.m is the default namespace (fragMNS=''), declare it as xmlns= to keep
         // bare element names; otherwise declare it as xmlns:m=.
@@ -216,12 +217,16 @@ function sortPageAggregationChildren(pageElement: Node): void {
     const leadingComment = allChildren.find((n) => n.nodeType === 8 /* Comment */);
     const elementChildren = allChildren.filter((n) => n.nodeType === 1 /* Element */) as Element[];
     const sorted = [...elementChildren].sort((a, b) => {
-        const aIdx = PAGE_AGGREGATIONS.indexOf(a.localName as PageAggregationName);
-        const bIdx = PAGE_AGGREGATIONS.indexOf(b.localName as PageAggregationName);
-        return (aIdx === -1 ? PAGE_AGGREGATIONS.length : aIdx) - (bIdx === -1 ? PAGE_AGGREGATIONS.length : bIdx);
+        const aLocalName = a.localName as string;
+        const bLocalName = b.localName as string;
+        const aIdx = PAGE_AGGREGATIONS.indexOf(aLocalName as PageAggregationName);
+        const bIdx = PAGE_AGGREGATIONS.indexOf(bLocalName as PageAggregationName);
+        const aPosition = aIdx === -1 ? PAGE_AGGREGATIONS.length : aIdx;
+        const bPosition = bIdx === -1 ? PAGE_AGGREGATIONS.length : bIdx;
+        return aPosition - bPosition;
     });
     while (pageElement.firstChild) {
-        pageElement.removeChild(pageElement.firstChild);
+        pageElement.removeChild(pageElement.firstChild); // NOSONAR - xmldom nodes do not implement Node.remove()
     }
     if (leadingComment) {
         pageElement.appendChild(leadingComment);
diff --git a/packages/fe-fpm-writer/src/prompts/translations/i18n.ts b/packages/fe-fpm-writer/src/prompts/translations/i18n.ts
index 8fbd03337da..1f74e0a9e9f 100644
--- a/packages/fe-fpm-writer/src/prompts/translations/i18n.ts
+++ b/packages/fe-fpm-writer/src/prompts/translations/i18n.ts
@@ -282,8 +282,8 @@ const ns1 = {
         'page': {
             'templateType': {
                 'message': 'Page Layout',
-                'full': 'Full',
-                'basic': 'Basic'
+                'basic': 'Basic',
+                'full': 'Full'
             },
             'id': {
                 'message': 'Building Block ID',

From 8bbabb3c8bd85cd0be6eb8ebd0fc612c5437d960 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Fri, 5 Jun 2026 18:23:30 +0100
Subject: [PATCH 09/51] fix after comments

---
 .../fe-fpm-writer/src/building-block/index.ts     | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 62981cd70d0..1386481aee7 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -216,13 +216,14 @@ function sortPageAggregationChildren(pageElement: Node): void {
     // Separate leading template comment (first comment node) from element children
     const leadingComment = allChildren.find((n) => n.nodeType === 8 /* Comment */);
     const elementChildren = allChildren.filter((n) => n.nodeType === 1 /* Element */) as Element[];
+    const aggNames = PAGE_AGGREGATIONS as readonly string[];
     const sorted = [...elementChildren].sort((a, b) => {
-        const aLocalName = a.localName as string;
-        const bLocalName = b.localName as string;
-        const aIdx = PAGE_AGGREGATIONS.indexOf(aLocalName as PageAggregationName);
-        const bIdx = PAGE_AGGREGATIONS.indexOf(bLocalName as PageAggregationName);
-        const aPosition = aIdx === -1 ? PAGE_AGGREGATIONS.length : aIdx;
-        const bPosition = bIdx === -1 ? PAGE_AGGREGATIONS.length : bIdx;
+        const aName = typeof a.localName === 'string' ? a.localName : '';
+        const bName = typeof b.localName === 'string' ? b.localName : '';
+        const aIdx = aggNames.indexOf(aName);
+        const bIdx = aggNames.indexOf(bName);
+        const aPosition = aIdx === -1 ? aggNames.length : aIdx;
+        const bPosition = bIdx === -1 ? aggNames.length : bIdx;
         return aPosition - bPosition;
     });
     while (pageElement.firstChild) {
@@ -266,7 +267,7 @@ export async function appendPageBBAggregation(
     const aggContext = { macrosPrefix, mContent };
 
     const aggPath = getTemplatePath(`/building-block/page/${aggName}.xml`);
-    const aggContent = render(fs.read(aggPath), aggContext, {});
+    const aggContent = render(fs.read(aggPath), aggContext, {}); // NOSONAR - template is a controlled file on disk, not user input
     const mNsDecl = fragMNS ? `xmlns:${fragMNS}="sap.m"` : `xmlns="sap.m"`;
     const wrapped = `<root xmlns:${fragMacrosNS}="sap.fe.macros" ${mNsDecl}>${aggContent}</root>`;
 

From 7d83a6f6f6b0b0c545d799de9e35392800ffae9d Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Mon, 8 Jun 2026 11:07:57 +0100
Subject: [PATCH 10/51] fix after comments

---
 .../templates/building-block/page/items.xml          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/fe-fpm-writer/templates/building-block/page/items.xml b/packages/fe-fpm-writer/templates/building-block/page/items.xml
index 0bb5cf4c161..dbd395bb71f 100644
--- a/packages/fe-fpm-writer/templates/building-block/page/items.xml
+++ b/packages/fe-fpm-writer/templates/building-block/page/items.xml
@@ -1,9 +1,9 @@
 <<%- macrosPrefix %>items>
     <!-- Main content -->
-	<IconTabBar id="stickySubheaderBar" class="sapUiResponsiveContentPadding">
-		<items>
-			<IconTabFilter text="Tab 1">
-			</IconTabFilter>
-		</items>
-	</IconTabBar>
+    <IconTabBar id="stickySubheaderBar" class="sapUiResponsiveContentPadding">
+        <items>
+            <IconTabFilter text="Tab 1">
+            </IconTabFilter>
+       </items>
+    </IconTabBar>
 </<%- macrosPrefix %>items>

From f773ca2de7f199a9ff837faf861d41103c5ead46 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Mon, 8 Jun 2026 11:42:51 +0100
Subject: [PATCH 11/51] fix after comments

---
 packages/fe-fpm-writer/test/unit/building-block.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/fe-fpm-writer/test/unit/building-block.test.ts b/packages/fe-fpm-writer/test/unit/building-block.test.ts
index 95eab252d55..f1c9e8980ef 100644
--- a/packages/fe-fpm-writer/test/unit/building-block.test.ts
+++ b/packages/fe-fpm-writer/test/unit/building-block.test.ts
@@ -1216,7 +1216,7 @@ describe('Building Blocks', () => {
         expect(fs.exists(join(basePath, 'webapp/ext/main/Main.controller.js'))).toBe(false);
     });
 
-    test('generate Page building block with blank template does not insert aggregations or controller', async () => {
+    test('generate Page building block with basic template does not insert aggregations or controller', async () => {
         const aggregationPath = `/mvc:View/*[local-name()='Page']`;
         const basePath = join(testAppPath, 'generate-page-block-blank');
         fs.write(join(basePath, manifestFilePath), JSON.stringify(testManifestContent));

From 3ee5a20831bb29e290474d9382f569eca70018e9 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 8 Jun 2026 11:15:39 +0000
Subject: [PATCH 12/51] Fix duplicate Page aggregation append behavior

---
 packages/fe-fpm-writer/src/building-block/index.ts  | 13 +++++++++++++
 .../fe-fpm-writer/test/unit/building-block.test.ts  |  5 +++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 1386481aee7..5d1aa588355 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -287,6 +287,19 @@ export async function appendPageBBAggregation(
     }
 
     const pageElement = pageNodes[0] as Node;
+    const hasExistingAggregation = Array.from(pageElement.childNodes).some(
+        (node) =>
+            node.nodeType === 1 /* Element */ &&
+            (node as Element).localName === aggName &&
+            (node as Element).namespaceURI === 'sap.fe.macros'
+    );
+    if (hasExistingAggregation) {
+        sortPageAggregationChildren(pageElement);
+        const existingXmlContent = new XMLSerializer().serializeToString(xmlDocument);
+        fs.write(join(basePath, viewPath), format(existingXmlContent));
+        return fs;
+    }
+
     const hasExistingChildren = Array.from(pageElement.childNodes).some((n) => n.nodeType === 1 /* Element */);
     if (!hasExistingChildren) {
         pageElement.appendChild(xmlDocument.createComment(PAGE_TEMPLATE_COMMENT));
diff --git a/packages/fe-fpm-writer/test/unit/building-block.test.ts b/packages/fe-fpm-writer/test/unit/building-block.test.ts
index f1c9e8980ef..751068097bc 100644
--- a/packages/fe-fpm-writer/test/unit/building-block.test.ts
+++ b/packages/fe-fpm-writer/test/unit/building-block.test.ts
@@ -3884,7 +3884,7 @@ describe('Building Blocks', () => {
             expect(output).toContain('id="footer"');
         });
 
-        it('generates suffixed id when base id already exists in view', async () => {
+        it('does not append duplicate aggregation when it already exists in view', async () => {
             const basePath = join(testAppPath, 'page-bb-agg-dup');
             const viewWithExistingId = `<mvc:View xmlns:core="sap.ui.core" xmlns:mvc="sap.ui.core.mvc" xmlns="sap.m"
     xmlns:macros="sap.fe.macros" controllerName="com.test.myApp.ext.main.Main">
@@ -3901,7 +3901,8 @@ describe('Building Blocks', () => {
             });
 
             const output = result.read(join(basePath, xmlViewFilePath));
-            expect(output).toContain('id="footer1"');
+            expect((output.match(/<macros:footer\b/g) ?? []).length).toBe(1);
+            expect(output).not.toContain('id="footer1"');
         });
 
         it('reorders existing aggregations into canonical PAGE_AGGREGATIONS order', async () => {

From d44df03180816ca87d6afdf895d720dfd39d83f0 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Mon, 8 Jun 2026 12:23:13 +0100
Subject: [PATCH 13/51] fix after comments

---
 packages/fe-fpm-writer/src/building-block/index.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 1386481aee7..2b42b71f01e 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -287,8 +287,11 @@ export async function appendPageBBAggregation(
     }
 
     const pageElement = pageNodes[0] as Node;
-    const hasExistingChildren = Array.from(pageElement.childNodes).some((n) => n.nodeType === 1 /* Element */);
-    if (!hasExistingChildren) {
+    const hasExistingElementChildren = Array.from(pageElement.childNodes).some((n) => n.nodeType === 1 /* Element */);
+    const hasTemplateComment = Array.from(pageElement.childNodes).some(
+        (n) => n.nodeType === 8 /* Comment */ && (n as Comment).data?.includes(PAGE_TEMPLATE_COMMENT)
+    );
+    if (!hasExistingElementChildren && !hasTemplateComment) {
         pageElement.appendChild(xmlDocument.createComment(PAGE_TEMPLATE_COMMENT));
     }
     for (const node of Array.from(aggDoc.documentElement.childNodes)) {

From 1ed2a66931b2d7d8f0ff8740bf1e7d5c337c9cb3 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Tue, 9 Jun 2026 10:49:53 +0100
Subject: [PATCH 14/51] fix after comments

---
 .../fe-fpm-writer/src/building-block/index.ts | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 06af960feb9..476dad4e4b9 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -8,7 +8,7 @@ import format from 'xml-formatter';
 import * as xpath from 'xpath';
 import type { Editor } from 'mem-fs-editor';
 
-import { getMinimumUI5Version } from '@sap-ux/project-access';
+import { getMinimumUI5Version, getAppProgrammingLanguage } from '@sap-ux/project-access';
 import {
     BuildingBlockType,
     PAGE_AGGREGATIONS,
@@ -100,10 +100,11 @@ export async function generateBuildingBlock<T extends BuildingBlock>(
         templateConfig
     );
 
-    if (
+    const isFullPageTemplate =
         buildingBlockData.buildingBlockType === BuildingBlockType.Page &&
-        (buildingBlockData as Page).templateType === PAGE_TEMPLATE_TYPE_FULL
-    ) {
+        (buildingBlockData as Page).templateType === PAGE_TEMPLATE_TYPE_FULL;
+
+    if (isFullPageTemplate) {
         const pageData = buildingBlockData as Page;
         appendPageAggregations(fs, xmlDocument, templateDocument, fnGenerateId, pageData);
     }
@@ -130,11 +131,8 @@ export async function generateBuildingBlock<T extends BuildingBlock>(
         config.replace
     );
 
-    if (
-        buildingBlockData.buildingBlockType === BuildingBlockType.Page &&
-        (buildingBlockData as Page).templateType === PAGE_TEMPLATE_TYPE_FULL
-    ) {
-        applyPageControllerTemplate(fs, basePath, viewOrFragmentPath);
+    if (isFullPageTemplate) {
+        await applyPageControllerTemplate(fs, basePath, viewOrFragmentPath);
     }
 
     if (allowAutoAddDependencyLib && manifest && !validateDependenciesLibs(manifest, ['sap.fe.macros'])) {
@@ -323,15 +321,20 @@ export async function appendPageBBAggregation(
 
 /**
  * Copies the Page controller template (JS or TS) into the view directory if no controller file exists yet.
+ * Uses getAppProgrammingLanguage for reliable detection, with a fallback to checking for an existing
+ * .controller.ts sibling file for edge cases where language detection returns blank.
  *
  * @param {Editor} fs - the memfs editor instance
  * @param {string} basePath - the base path of the application
  * @param {string} viewOrFragmentPath - the relative path of the view/fragment file
  */
-function applyPageControllerTemplate(fs: Editor, basePath: string, viewOrFragmentPath: string): void {
+async function applyPageControllerTemplate(fs: Editor, basePath: string, viewOrFragmentPath: string): Promise<void> {
     const { dir: viewDir, name: viewName } = parse(viewOrFragmentPath);
     const viewBaseName = viewName.replace(/\.view$/, '');
-    const isTypeScript = fs.exists(join(basePath, viewDir, `${viewBaseName}.controller.ts`));
+    const detectedLanguage = await getAppProgrammingLanguage(basePath, fs);
+    const isTypeScript =
+        detectedLanguage === 'TypeScript' ||
+        (!detectedLanguage && fs.exists(join(basePath, viewDir, `${viewBaseName}.controller.ts`)));
     const controllerExt = isTypeScript ? 'ts' : 'js';
     const controllerPath = join(basePath, viewDir, `${viewBaseName}.controller.${controllerExt}`);
     if (!fs.exists(controllerPath)) {

From 131d1e793f3aacc1ad5f325776e621a988827c4a Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Tue, 9 Jun 2026 11:34:01 +0100
Subject: [PATCH 15/51] fix after comments

---
 .../ui-prompting-examples/src/Page.story.tsx  | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/examples/ui-prompting-examples/src/Page.story.tsx b/examples/ui-prompting-examples/src/Page.story.tsx
index 84805b7eaf8..8227f1b9cd5 100644
--- a/examples/ui-prompting-examples/src/Page.story.tsx
+++ b/examples/ui-prompting-examples/src/Page.story.tsx
@@ -8,6 +8,40 @@ export const Default = (): JSX.Element => {
     return <BuildingBlockQuestions type={PromptsType.Page} />;
 };
 
+export const BasicTemplate = (): JSX.Element => {
+    return (
+        <BuildingBlockQuestions
+            type={PromptsType.Page}
+            externalAnswers={{
+                buildingBlockData: {
+                    buildingBlockType: 'page',
+                    id: 'customer-overview-page-id',
+                    title: 'Customer Overview',
+                    description: 'Shows customer details',
+                    templateType: 'basic'
+                }
+            }}
+        />
+    );
+};
+
+export const FullTemplate = (): JSX.Element => {
+    return (
+        <BuildingBlockQuestions
+            type={PromptsType.Page}
+            externalAnswers={{
+                buildingBlockData: {
+                    buildingBlockType: 'page',
+                    id: 'customer-overview-page-full-id',
+                    title: 'Customer Overview',
+                    description: 'Shows customer details and statistics',
+                    templateType: 'full'
+                }
+            }}
+        />
+    );
+};
+
 export const ExternalValues = (): JSX.Element => {
     return (
         <BuildingBlockQuestions

From 836cd0183843894224e4302d5efb6b36a63fccfd Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Tue, 9 Jun 2026 11:47:33 +0100
Subject: [PATCH 16/51] fix after comments

---
 packages/fe-fpm-writer/src/building-block/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 476dad4e4b9..176dba0893c 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -204,7 +204,7 @@ function appendPageAggregations(
 
 /**
  * Reorders the child elements of a macros:Page node to match the canonical PAGE_AGGREGATIONS order.
- * Preserves relative order of siblings with the same local name. Text/comment nodes are dropped
+ * Preserves relative order of siblings with the same local name. Whitespace text nodes are dropped
  * because the xml-formatter call that follows will regenerate proper indentation.
  *
  * @param pageElement - the macros:Page DOM node whose children should be sorted

From 71ac14464b99343f368caec93b68404a20989196 Mon Sep 17 00:00:00 2001
From: Edouard Ouin <edouard.ouin@sap.com>
Date: Tue, 9 Jun 2026 12:58:46 +0100
Subject: [PATCH 17/51] Create short-planets-prove.md

---
 .changeset/short-planets-prove.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .changeset/short-planets-prove.md

diff --git a/.changeset/short-planets-prove.md b/.changeset/short-planets-prove.md
new file mode 100644
index 00000000000..e354c7acc17
--- /dev/null
+++ b/.changeset/short-planets-prove.md
@@ -0,0 +1,16 @@
+---
+"@sap-ux/fe-fpm-writer": patch
+"@sap-ux-private/ui-prompting-examples": minor
+---
+
+feat(fe-fpm-writer): add Page building block full and basic template support
+
+- Add `appendPageAggregations` to generate all 7 Page BB aggregations (`breadcrumbs`, `navigationActions`, `titleContent`, `actions`, `headerContent`, `items`, `footer`) with EJS templates and per-aggregation IDs
+- Add `appendPageBBAggregation` API to append a single named aggregation to an existing `<macros:Page>` element in a view XML file
+- Add `sortPageAggregationChildren` to reorder aggregation elements into the canonical `PAGE_AGGREGATIONS` order after insertion
+- Add `PAGE_AGGREGATIONS` constant and `PageAggregationName` type (moved to `types.ts` for compile-time safety in `aggregations?: Partial<Record<PageAggregationName, string>>`)
+- Add `PAGE_TEMPLATE_TYPE_FULL` / `PAGE_TEMPLATE_TYPE_BASIC` constants and `PageTemplateType` type
+- Rename template type value `blank` → `basic`; rename prompt label "Page template" → "Page Layout", "Default content" → "Full", "Blank" → "Basic"
+- Generate a JS or TS controller stub alongside the view (detected via `getAppProgrammingLanguage` with `.controller.ts` fallback)
+- Insert a sample template comment as first child of `<macros:Page>` on first aggregation; guard against duplicate comment insertion
+- Add null guards on `_nsMap` access; fix duplicate-ID issue in multi-element fragments

From 1b37b1c11ffbbb490722a1eba9f8976d745b8892 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Tue, 9 Jun 2026 17:18:10 +0100
Subject: [PATCH 18/51] fix after comments

---
 .../__snapshots__/building-block.test.ts.snap | 43 +++++++++++++++++++
 .../test/unit/building-block.test.ts          | 24 +----------
 2 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/packages/fe-fpm-writer/test/unit/__snapshots__/building-block.test.ts.snap b/packages/fe-fpm-writer/test/unit/__snapshots__/building-block.test.ts.snap
index 602e6054276..0f2a83d89b5 100644
--- a/packages/fe-fpm-writer/test/unit/__snapshots__/building-block.test.ts.snap
+++ b/packages/fe-fpm-writer/test/unit/__snapshots__/building-block.test.ts.snap
@@ -1872,6 +1872,49 @@ exports[`Building Blocks RichTextEditorButtonGroups building block multiple Rich
 </core:FragmentDefinition>"
 `;
 
+exports[`Building Blocks generate Page building block with full template inserts all 7 aggregations: generate-page-block-full 1`] = `
+"<mvc:View xmlns:core=\\"sap.ui.core\\" xmlns:mvc=\\"sap.ui.core.mvc\\" xmlns=\\"sap.m\\" xmlns:html=\\"http://www.w3.org/1999/xhtml\\" controllerName=\\"com.test.myApp.ext.main.Main\\" xmlns:macros=\\"sap.fe.macros\\">
+    <macros:Page id=\\"testPage\\" title=\\"Test Page\\" showFooter=\\"true\\">
+        <!--This is a sample template, event handlers should be added for implementation-->
+        <macros:breadcrumbs id=\\"breadcrumbs\\">
+            <!-- Breadcrumbs aggregation -->
+            <m:Breadcrumbs>
+                <m:Link text=\\"Home\\" press=\\".onPressHome\\"/>
+                <m:Link text=\\"Page 1\\" press=\\".onPressPage1\\"/>
+                <m:Link text=\\"Page 2\\" press=\\".onPressPage2\\"/>
+            </m:Breadcrumbs>
+        </macros:breadcrumbs>
+        <macros:navigationActions id=\\"navigationActions\\">
+            <!-- Navigation actions aggregation -->
+            <m:Button icon=\\"sap-icon://full-screen\\" press=\\".onFullScreen\\" type=\\"Transparent\\"/>
+        </macros:navigationActions>
+        <macros:titleContent id=\\"titleContent\\">
+            <!-- Title content aggregation (content next to title) -->
+        </macros:titleContent>
+        <macros:actions id=\\"actions\\">
+            <!-- Actions aggregation -->
+            <m:Button text=\\"Action 1\\" press=\\".onClickAction1\\" type=\\"Ghost\\"/>
+            <m:Button text=\\"Action 2\\" press=\\".onClickAction2\\" type=\\"Ghost\\"/>
+        </macros:actions>
+        <macros:headerContent id=\\"headerContent\\">
+            <!-- Header content aggregation (content after avatar) -->
+        </macros:headerContent>
+        <macros:items id=\\"items\\">
+            <!-- Main content -->
+            <IconTabBar id=\\"stickySubheaderBar\\" class=\\"sapUiResponsiveContentPadding\\">
+                <items>
+                    <IconTabFilter text=\\"Tab 1\\">
+                    </IconTabFilter>
+                </items>
+            </IconTabBar>
+        </macros:items>
+        <macros:footer id=\\"footer\\">
+            <!-- Footer aggregation -->
+        </macros:footer>
+    </macros:Page>
+</mvc:View>"
+`;
+
 exports[`Building Blocks generate Page building block with replace target locator set: generate-page-block 1`] = `
 "<mvc:View xmlns:core=\\"sap.ui.core\\" xmlns:mvc=\\"sap.ui.core.mvc\\" xmlns=\\"sap.m\\" xmlns:html=\\"http://www.w3.org/1999/xhtml\\" controllerName=\\"com.test.myApp.ext.main.Main\\" xmlns:macros=\\"sap.fe.macros\\">
     <macros:Page id=\\"testPage\\" title=\\"Test Page Title\\" description=\\"Test Page Description\\"/>
diff --git a/packages/fe-fpm-writer/test/unit/building-block.test.ts b/packages/fe-fpm-writer/test/unit/building-block.test.ts
index 751068097bc..43fb21fb56a 100644
--- a/packages/fe-fpm-writer/test/unit/building-block.test.ts
+++ b/packages/fe-fpm-writer/test/unit/building-block.test.ts
@@ -1131,29 +1131,7 @@ describe('Building Blocks', () => {
             fs
         );
 
-        const viewContent = fs.read(join(basePath, xmlViewFilePath));
-        expect(viewContent).toContain('showFooter="true"');
-        expect(viewContent).toContain('macros:breadcrumbs');
-        expect(viewContent).toContain('macros:navigationActions');
-        expect(viewContent).toContain('macros:titleContent');
-        expect(viewContent).toContain('macros:actions');
-        expect(viewContent).toContain('macros:headerContent');
-        expect(viewContent).toContain('macros:items');
-        expect(viewContent).toContain('macros:footer');
-        expect(viewContent).toMatch(/<macros:breadcrumbs[^>]*id="breadcrumbs"/);
-        expect(viewContent).toMatch(/<macros:navigationActions[^>]*id="navigationActions"/);
-        expect(viewContent).toMatch(/<macros:titleContent[^>]*id="titleContent"/);
-        expect(viewContent).toMatch(/<macros:actions[^>]*id="actions"/);
-        expect(viewContent).toMatch(/<macros:headerContent[^>]*id="headerContent"/);
-        expect(viewContent).toMatch(/<macros:items[^>]*id="items"/);
-        expect(viewContent).toMatch(/<macros:footer[^>]*id="footer"/);
-        expect(viewContent).toContain('press=".onPressHome"');
-        expect(viewContent).toContain('press=".onPressPage1"');
-        expect(viewContent).toContain('press=".onPressPage2"');
-        expect(viewContent).toContain('press=".onFullScreen"');
-        expect(viewContent).toContain('press=".onClickAction1"');
-        expect(viewContent).toContain('press=".onClickAction2"');
-        expect(viewContent).toContain('This is a sample template, event handlers should be added for implementation');
+        expect(fs.read(join(basePath, xmlViewFilePath))).toMatchSnapshot('generate-page-block-full');
     });
 
     test('generate Page building block with full template creates JS controller', async () => {

From 3359cd9cf888fa5049840dcb4738a6ba02ac8108 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Wed, 10 Jun 2026 14:48:37 +0100
Subject: [PATCH 19/51] fix after comments

---
 .../fe-fpm-writer/src/building-block/index.ts | 64 +++++++++++++------
 packages/fe-fpm-writer/src/index.ts           |  7 +-
 .../templates/building-block/page/items.xml   |  6 +-
 .../__snapshots__/building-block.test.ts.snap |  4 +-
 4 files changed, 53 insertions(+), 28 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 176dba0893c..d50f2f04a41 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -46,6 +46,8 @@ const PLACEHOLDERS = {
     'qualifier': 'REPLACE_WITH_A_QUALIFIER'
 };
 
+const PAGE_TEMPLATE_COMMENT = 'This is a sample template, event handlers should be added for implementation';
+
 interface MetadataPath {
     contextPath?: string;
     metaPath: string;
@@ -151,11 +153,6 @@ export async function generateBuildingBlock<T extends BuildingBlock>(
     return fs;
 }
 
-export { PAGE_AGGREGATIONS } from './types.js';
-export type { PageAggregationName } from './types.js';
-
-const PAGE_TEMPLATE_COMMENT = 'This is a sample template, event handlers should be added for implementation';
-
 /**
  * Appends the 7 Page building block aggregation fragments as child elements of the templateDocument root.
  *
@@ -175,7 +172,6 @@ function appendPageAggregations(
     const macrosNS = getOrAddNamespace(xmlDocument, 'sap.fe.macros', 'macros');
     const mNS = getOrAddNamespace(xmlDocument, 'sap.m', 'm');
     const fragMacrosNS = macrosNS || 'macros';
-    const fragMNS = mNS;
     const macrosPrefix = `${fragMacrosNS}:`;
     const pageElement = templateDocument.documentElement;
     const aggErrorHandler = (level: string, message: string): never => {
@@ -184,18 +180,19 @@ function appendPageAggregations(
     pageElement.appendChild(templateDocument.createComment(PAGE_TEMPLATE_COMMENT));
     for (const aggName of PAGE_AGGREGATIONS) {
         const mContent = pageData.aggregations?.[aggName] ?? '';
-        const aggContext = { macrosPrefix, mContent };
+        const aggId = generateId(aggName);
+        const aggContext = { macrosPrefix, mContent, aggId };
         const aggPath = getTemplatePath(`/building-block/page/${aggName}.xml`);
         const aggContent = render(fs.read(aggPath), aggContext, {}); // NOSONAR - template is a controlled file on disk, not user input
         // Wrap with namespace declarations so elements parse correctly.
-        // When sap.m is the default namespace (fragMNS=''), declare it as xmlns= to keep
+        // When sap.m is the default namespace (mNS=''), declare it as xmlns= to keep
         // bare element names; otherwise declare it as xmlns:m=.
-        const mNsDecl = fragMNS ? `xmlns:${fragMNS}="sap.m"` : `xmlns="sap.m"`;
+        const mNsDecl = mNS ? `xmlns:${mNS}="sap.m"` : `xmlns="sap.m"`;
         const wrapped = `<root xmlns:${fragMacrosNS}="sap.fe.macros" ${mNsDecl}>${aggContent}</root>`;
         const aggDoc = new DOMParser({ errorHandler: aggErrorHandler }).parseFromString(wrapped, 'text/xml');
         for (const node of Array.from(aggDoc.documentElement.childNodes)) {
             if (node.nodeType === 1 /* Element */) {
-                (node as Element).setAttribute('id', generateId(aggName));
+                (node as Element).setAttribute('id', aggId);
                 pageElement.appendChild(templateDocument.importNode(node, true));
             }
         }
@@ -256,17 +253,17 @@ export async function appendPageBBAggregation(
     const xmlDocument = getUI5XmlDocument(basePath, viewPath, fs);
 
     const generateId = await createIdGenerator({ basePath, fsEditor: fs });
+    const aggId = generateId(aggName);
 
     const macrosNS = getOrAddNamespace(xmlDocument, 'sap.fe.macros', 'macros');
     const mNS = getOrAddNamespace(xmlDocument, 'sap.m', 'm');
     const fragMacrosNS = macrosNS || 'macros';
-    const fragMNS = mNS;
     const macrosPrefix = `${fragMacrosNS}:`;
-    const aggContext = { macrosPrefix, mContent };
+    const aggContext = { macrosPrefix, mContent, aggId };
 
     const aggPath = getTemplatePath(`/building-block/page/${aggName}.xml`);
     const aggContent = render(fs.read(aggPath), aggContext, {}); // NOSONAR - template is a controlled file on disk, not user input
-    const mNsDecl = fragMNS ? `xmlns:${fragMNS}="sap.m"` : `xmlns="sap.m"`;
+    const mNsDecl = mNS ? `xmlns:${mNS}="sap.m"` : `xmlns="sap.m"`;
     const wrapped = `<root xmlns:${fragMacrosNS}="sap.fe.macros" ${mNsDecl}>${aggContent}</root>`;
 
     const errorHandler = (level: string, message: string): never => {
@@ -285,7 +282,8 @@ export async function appendPageBBAggregation(
     }
 
     const pageElement = pageNodes[0] as Node;
-    const hasExistingAggregation = Array.from(pageElement.childNodes).some(
+    const childNodes = Array.from(pageElement.childNodes);
+    const hasExistingAggregation = childNodes.some(
         (node) =>
             node.nodeType === 1 /* Element */ &&
             (node as Element).localName === aggName &&
@@ -298,8 +296,8 @@ export async function appendPageBBAggregation(
         return fs;
     }
 
-    const hasExistingElementChildren = Array.from(pageElement.childNodes).some((n) => n.nodeType === 1 /* Element */);
-    const hasTemplateComment = Array.from(pageElement.childNodes).some(
+    const hasExistingElementChildren = childNodes.some((n) => n.nodeType === 1 /* Element */);
+    const hasTemplateComment = childNodes.some(
         (n) => n.nodeType === 8 /* Comment */ && (n as Comment).data?.includes(PAGE_TEMPLATE_COMMENT)
     );
     if (!hasExistingElementChildren && !hasTemplateComment) {
@@ -307,7 +305,7 @@ export async function appendPageBBAggregation(
     }
     for (const node of Array.from(aggDoc.documentElement.childNodes)) {
         if (node.nodeType === 1 /* Element */) {
-            (node as Element).setAttribute('id', generateId(aggName));
+            (node as Element).setAttribute('id', aggId);
             pageElement.appendChild(xmlDocument.importNode(node, true));
         }
     }
@@ -647,11 +645,39 @@ export async function getSerializedFileContent<T extends BuildingBlock>(
     // Read the view xml and template files and get content of the view xml file
     const xmlDocument = viewOrFragmentPath ? getUI5XmlDocument(basePath, viewOrFragmentPath, fs) : undefined;
     const { content: manifest, path: manifestPath } = await getManifest(basePath, fs, false);
-    const content = getTemplateContent(buildingBlockData, xmlDocument, manifest, fs, true);
+    const fnGenerateId = buildingBlockData.generateId ?? (await createIdGenerator({ basePath, fsEditor: fs }));
+    const content = getTemplateContent(
+        { ...buildingBlockData, generateId: fnGenerateId },
+        xmlDocument,
+        manifest,
+        fs,
+        true
+    );
+
+    // For the full Page template, augment the snippet with all 7 aggregations
+    let viewOrFragmentContent = content;
+    const isFullPage =
+        buildingBlockData.buildingBlockType === BuildingBlockType.Page &&
+        (buildingBlockData as Page).templateType === PAGE_TEMPLATE_TYPE_FULL;
+    if (isFullPage) {
+        // Use the real view document for namespace resolution if available, otherwise create a minimal fallback
+        const nsDoc =
+            xmlDocument ??
+            new DOMParser().parseFromString(
+                '<mvc:View xmlns:mvc="sap.ui.core.mvc" xmlns:macros="sap.fe.macros" xmlns="sap.m"/>',
+                'text/xml'
+            );
+        const snippetDoc = new DOMParser().parseFromString(
+            `<root xmlns:macros="sap.fe.macros">${content}</root>`,
+            'text/xml'
+        );
+        appendPageAggregations(fs, nsDoc, snippetDoc, fnGenerateId, buildingBlockData as Page);
+        viewOrFragmentContent = format(new XMLSerializer().serializeToString(snippetDoc.documentElement.firstChild!));
+    }
     const filePathProps = getFilePathProps(basePath, viewOrFragmentPath);
     // Snippet for fragment xml
     snippets['viewOrFragmentPath'] = {
-        content,
+        content: viewOrFragmentContent,
         language: CodeSnippetLanguage.XML,
         filePathProps
     };
diff --git a/packages/fe-fpm-writer/src/index.ts b/packages/fe-fpm-writer/src/index.ts
index 9e1a95dd6ad..bf21b416895 100644
--- a/packages/fe-fpm-writer/src/index.ts
+++ b/packages/fe-fpm-writer/src/index.ts
@@ -46,14 +46,13 @@ export type {
     Action,
     PageTemplateType
 } from './building-block/types.js';
-export { PAGE_TEMPLATE_TYPE_FULL, PAGE_TEMPLATE_TYPE_BASIC } from './building-block/types.js';
+export { PAGE_TEMPLATE_TYPE_FULL, PAGE_TEMPLATE_TYPE_BASIC, PAGE_AGGREGATIONS } from './building-block/types.js';
+export type { PageAggregationName } from './building-block/types.js';
 export {
     generateBuildingBlock,
     getSerializedFileContent,
-    appendPageBBAggregation,
-    PAGE_AGGREGATIONS
+    appendPageBBAggregation
 } from './building-block/index.js';
-export type { PageAggregationName } from './building-block/index.js';
 export type {
     ChartPromptsAnswer,
     FilterBarPromptsAnswer,
diff --git a/packages/fe-fpm-writer/templates/building-block/page/items.xml b/packages/fe-fpm-writer/templates/building-block/page/items.xml
index dbd395bb71f..f254f137bd3 100644
--- a/packages/fe-fpm-writer/templates/building-block/page/items.xml
+++ b/packages/fe-fpm-writer/templates/building-block/page/items.xml
@@ -1,9 +1,9 @@
 <<%- macrosPrefix %>items>
     <!-- Main content -->
-    <IconTabBar id="stickySubheaderBar" class="sapUiResponsiveContentPadding">
+    <IconTabBar id="iconTabBar<%- aggId %>" class="sapUiResponsiveContentPadding">
         <items>
-            <IconTabFilter text="Tab 1">
+            <IconTabFilter id="iconTabFilter<%- aggId %>" text="Tab 1">
             </IconTabFilter>
-       </items>
+        </items>
     </IconTabBar>
 </<%- macrosPrefix %>items>
diff --git a/packages/fe-fpm-writer/test/unit/__snapshots__/building-block.test.ts.snap b/packages/fe-fpm-writer/test/unit/__snapshots__/building-block.test.ts.snap
index 0f2a83d89b5..07fdd0df5e8 100644
--- a/packages/fe-fpm-writer/test/unit/__snapshots__/building-block.test.ts.snap
+++ b/packages/fe-fpm-writer/test/unit/__snapshots__/building-block.test.ts.snap
@@ -1901,9 +1901,9 @@ exports[`Building Blocks generate Page building block with full template inserts
         </macros:headerContent>
         <macros:items id=\\"items\\">
             <!-- Main content -->
-            <IconTabBar id=\\"stickySubheaderBar\\" class=\\"sapUiResponsiveContentPadding\\">
+            <IconTabBar id=\\"iconTabBaritems\\" class=\\"sapUiResponsiveContentPadding\\">
                 <items>
-                    <IconTabFilter text=\\"Tab 1\\">
+                    <IconTabFilter id=\\"iconTabFilteritems\\" text=\\"Tab 1\\">
                     </IconTabFilter>
                 </items>
             </IconTabBar>

From 2452d7b6d810ba4e80a3d3ec67ce377588c037db Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 10 Jun 2026 13:58:22 +0000
Subject: [PATCH 20/51] Linting auto fix commit

---
 packages/fe-fpm-writer/src/index.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/fe-fpm-writer/src/index.ts b/packages/fe-fpm-writer/src/index.ts
index bf21b416895..4b1c8f429d7 100644
--- a/packages/fe-fpm-writer/src/index.ts
+++ b/packages/fe-fpm-writer/src/index.ts
@@ -48,11 +48,7 @@ export type {
 } from './building-block/types.js';
 export { PAGE_TEMPLATE_TYPE_FULL, PAGE_TEMPLATE_TYPE_BASIC, PAGE_AGGREGATIONS } from './building-block/types.js';
 export type { PageAggregationName } from './building-block/types.js';
-export {
-    generateBuildingBlock,
-    getSerializedFileContent,
-    appendPageBBAggregation
-} from './building-block/index.js';
+export { generateBuildingBlock, getSerializedFileContent, appendPageBBAggregation } from './building-block/index.js';
 export type {
     ChartPromptsAnswer,
     FilterBarPromptsAnswer,

From a5926a5a12799de841aab8faeddf76ffcd5d7376 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Wed, 10 Jun 2026 19:36:18 +0100
Subject: [PATCH 21/51] fix after comments

---
 packages/fe-fpm-writer/src/building-block/index.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index d50f2f04a41..a8ed6f283df 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -656,9 +656,10 @@ export async function getSerializedFileContent<T extends BuildingBlock>(
 
     // For the full Page template, augment the snippet with all 7 aggregations
     let viewOrFragmentContent = content;
+    const pageData = buildingBlockData as Page;
     const isFullPage =
         buildingBlockData.buildingBlockType === BuildingBlockType.Page &&
-        (buildingBlockData as Page).templateType === PAGE_TEMPLATE_TYPE_FULL;
+        pageData.templateType === PAGE_TEMPLATE_TYPE_FULL;
     if (isFullPage) {
         // Use the real view document for namespace resolution if available, otherwise create a minimal fallback
         const nsDoc =
@@ -671,7 +672,7 @@ export async function getSerializedFileContent<T extends BuildingBlock>(
             `<root xmlns:macros="sap.fe.macros">${content}</root>`,
             'text/xml'
         );
-        appendPageAggregations(fs, nsDoc, snippetDoc, fnGenerateId, buildingBlockData as Page);
+        appendPageAggregations(fs, nsDoc, snippetDoc, fnGenerateId, pageData);
         viewOrFragmentContent = format(new XMLSerializer().serializeToString(snippetDoc.documentElement.firstChild!));
     }
     const filePathProps = getFilePathProps(basePath, viewOrFragmentPath);

From 5aa276605a4d7d6e2b12720c959bea95e83ca52e Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Thu, 11 Jun 2026 00:09:46 +0100
Subject: [PATCH 22/51] fix after comments

---
 .../fe-fpm-writer/src/building-block/index.ts | 19 +++++++++----------
 .../__snapshots__/building-block.test.ts.snap |  8 ++++----
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index a8ed6f283df..3c2880d999e 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -170,7 +170,6 @@ function appendPageAggregations(
     pageData: Page
 ): void {
     const macrosNS = getOrAddNamespace(xmlDocument, 'sap.fe.macros', 'macros');
-    const mNS = getOrAddNamespace(xmlDocument, 'sap.m', 'm');
     const fragMacrosNS = macrosNS || 'macros';
     const macrosPrefix = `${fragMacrosNS}:`;
     const pageElement = templateDocument.documentElement;
@@ -184,11 +183,9 @@ function appendPageAggregations(
         const aggContext = { macrosPrefix, mContent, aggId };
         const aggPath = getTemplatePath(`/building-block/page/${aggName}.xml`);
         const aggContent = render(fs.read(aggPath), aggContext, {}); // NOSONAR - template is a controlled file on disk, not user input
-        // Wrap with namespace declarations so elements parse correctly.
-        // When sap.m is the default namespace (mNS=''), declare it as xmlns= to keep
-        // bare element names; otherwise declare it as xmlns:m=.
-        const mNsDecl = mNS ? `xmlns:${mNS}="sap.m"` : `xmlns="sap.m"`;
-        const wrapped = `<root xmlns:${fragMacrosNS}="sap.fe.macros" ${mNsDecl}>${aggContent}</root>`;
+        // Always declare both default and prefixed sap.m namespaces so bare element names (e.g. IconTabBar)
+        // and prefixed names (e.g. m:Button) both parse correctly regardless of the view's namespace config.
+        const wrapped = `<root xmlns:${fragMacrosNS}="sap.fe.macros" xmlns="sap.m" xmlns:m="sap.m">${aggContent}</root>`;
         const aggDoc = new DOMParser({ errorHandler: aggErrorHandler }).parseFromString(wrapped, 'text/xml');
         for (const node of Array.from(aggDoc.documentElement.childNodes)) {
             if (node.nodeType === 1 /* Element */) {
@@ -256,15 +253,15 @@ export async function appendPageBBAggregation(
     const aggId = generateId(aggName);
 
     const macrosNS = getOrAddNamespace(xmlDocument, 'sap.fe.macros', 'macros');
-    const mNS = getOrAddNamespace(xmlDocument, 'sap.m', 'm');
     const fragMacrosNS = macrosNS || 'macros';
     const macrosPrefix = `${fragMacrosNS}:`;
     const aggContext = { macrosPrefix, mContent, aggId };
 
     const aggPath = getTemplatePath(`/building-block/page/${aggName}.xml`);
     const aggContent = render(fs.read(aggPath), aggContext, {}); // NOSONAR - template is a controlled file on disk, not user input
-    const mNsDecl = mNS ? `xmlns:${mNS}="sap.m"` : `xmlns="sap.m"`;
-    const wrapped = `<root xmlns:${fragMacrosNS}="sap.fe.macros" ${mNsDecl}>${aggContent}</root>`;
+    // Always declare both default and prefixed sap.m namespaces so bare element names (e.g. IconTabBar)
+    // and prefixed names (e.g. m:Button) both parse correctly regardless of the view's namespace config.
+    const wrapped = `<root xmlns:${fragMacrosNS}="sap.fe.macros" xmlns="sap.m" xmlns:m="sap.m">${aggContent}</root>`;
 
     const errorHandler = (level: string, message: string): never => {
         throw new Error(`Unable to parse page aggregation fragment. Details: [${level}] - ${message}`);
@@ -275,7 +272,9 @@ export async function appendPageBBAggregation(
     if (!firstChildView) {
         throw new Error(`Unable to read namespace map from view ${viewPath}.`);
     }
-    const xpathSelect = xpath.useNamespaces((firstChildView as any)._nsMap);
+    // Merge the view's namespace map with the macros prefix so the XPath query works even when
+    // _nsMap does not include the macros prefix under the same key.
+    const xpathSelect = xpath.useNamespaces({ ...(firstChildView as any)._nsMap, [fragMacrosNS]: 'sap.fe.macros' });
     const pageNodes = xpathSelect(`//${fragMacrosNS}:Page`, xmlDocument);
     if (!pageNodes || !Array.isArray(pageNodes) || pageNodes.length === 0) {
         throw new Error(`macros:Page element not found in view ${viewPath}.`);
diff --git a/packages/fe-fpm-writer/test/unit/__snapshots__/building-block.test.ts.snap b/packages/fe-fpm-writer/test/unit/__snapshots__/building-block.test.ts.snap
index 07fdd0df5e8..8b2aeecc92d 100644
--- a/packages/fe-fpm-writer/test/unit/__snapshots__/building-block.test.ts.snap
+++ b/packages/fe-fpm-writer/test/unit/__snapshots__/building-block.test.ts.snap
@@ -1878,7 +1878,7 @@ exports[`Building Blocks generate Page building block with full template inserts
         <!--This is a sample template, event handlers should be added for implementation-->
         <macros:breadcrumbs id=\\"breadcrumbs\\">
             <!-- Breadcrumbs aggregation -->
-            <m:Breadcrumbs>
+            <m:Breadcrumbs xmlns:m=\\"sap.m\\">
                 <m:Link text=\\"Home\\" press=\\".onPressHome\\"/>
                 <m:Link text=\\"Page 1\\" press=\\".onPressPage1\\"/>
                 <m:Link text=\\"Page 2\\" press=\\".onPressPage2\\"/>
@@ -1886,15 +1886,15 @@ exports[`Building Blocks generate Page building block with full template inserts
         </macros:breadcrumbs>
         <macros:navigationActions id=\\"navigationActions\\">
             <!-- Navigation actions aggregation -->
-            <m:Button icon=\\"sap-icon://full-screen\\" press=\\".onFullScreen\\" type=\\"Transparent\\"/>
+            <m:Button icon=\\"sap-icon://full-screen\\" press=\\".onFullScreen\\" type=\\"Transparent\\" xmlns:m=\\"sap.m\\"/>
         </macros:navigationActions>
         <macros:titleContent id=\\"titleContent\\">
             <!-- Title content aggregation (content next to title) -->
         </macros:titleContent>
         <macros:actions id=\\"actions\\">
             <!-- Actions aggregation -->
-            <m:Button text=\\"Action 1\\" press=\\".onClickAction1\\" type=\\"Ghost\\"/>
-            <m:Button text=\\"Action 2\\" press=\\".onClickAction2\\" type=\\"Ghost\\"/>
+            <m:Button text=\\"Action 1\\" press=\\".onClickAction1\\" type=\\"Ghost\\" xmlns:m=\\"sap.m\\"/>
+            <m:Button text=\\"Action 2\\" press=\\".onClickAction2\\" type=\\"Ghost\\" xmlns:m=\\"sap.m\\"/>
         </macros:actions>
         <macros:headerContent id=\\"headerContent\\">
             <!-- Header content aggregation (content after avatar) -->

From 52b6163b8225ac56feb5dfbaef55a26f823c5973 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Thu, 11 Jun 2026 00:42:44 +0100
Subject: [PATCH 23/51] fix after comments

---
 packages/fe-fpm-writer/src/building-block/index.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 3c2880d999e..8a91c027c33 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -672,7 +672,10 @@ export async function getSerializedFileContent<T extends BuildingBlock>(
             'text/xml'
         );
         appendPageAggregations(fs, nsDoc, snippetDoc, fnGenerateId, pageData);
-        viewOrFragmentContent = format(new XMLSerializer().serializeToString(snippetDoc.documentElement.firstChild!));
+        const pageNode = snippetDoc.documentElement.firstChild;
+        viewOrFragmentContent = pageNode
+            ? format(new XMLSerializer().serializeToString(pageNode))
+            : content;
     }
     const filePathProps = getFilePathProps(basePath, viewOrFragmentPath);
     // Snippet for fragment xml

From 04448aee36825940d0111266f1efa2383f4cf8d3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 10 Jun 2026 23:51:52 +0000
Subject: [PATCH 24/51] Linting auto fix commit

---
 packages/fe-fpm-writer/src/building-block/index.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 8a91c027c33..d1f552c4735 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -673,9 +673,7 @@ export async function getSerializedFileContent<T extends BuildingBlock>(
         );
         appendPageAggregations(fs, nsDoc, snippetDoc, fnGenerateId, pageData);
         const pageNode = snippetDoc.documentElement.firstChild;
-        viewOrFragmentContent = pageNode
-            ? format(new XMLSerializer().serializeToString(pageNode))
-            : content;
+        viewOrFragmentContent = pageNode ? format(new XMLSerializer().serializeToString(pageNode)) : content;
     }
     const filePathProps = getFilePathProps(basePath, viewOrFragmentPath);
     // Snippet for fragment xml

From 7d0e77abfe29838b00a962683f94063e744110f6 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Thu, 11 Jun 2026 01:06:59 +0100
Subject: [PATCH 25/51] fix after comments

---
 packages/fe-fpm-writer/src/building-block/index.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 8a91c027c33..b7acf74efff 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -326,6 +326,9 @@ export async function appendPageBBAggregation(
  * @param {string} viewOrFragmentPath - the relative path of the view/fragment file
  */
 async function applyPageControllerTemplate(fs: Editor, basePath: string, viewOrFragmentPath: string): Promise<void> {
+    if (!viewOrFragmentPath.endsWith('.view.xml')) {
+        return;
+    }
     const { dir: viewDir, name: viewName } = parse(viewOrFragmentPath);
     const viewBaseName = viewName.replace(/\.view$/, '');
     const detectedLanguage = await getAppProgrammingLanguage(basePath, fs);

From fc347e153247e255266b9b33c2a78845994dcc07 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Thu, 11 Jun 2026 01:17:38 +0100
Subject: [PATCH 26/51] fix after comments

---
 packages/fe-fpm-writer/test/unit/building-block.test.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/fe-fpm-writer/test/unit/building-block.test.ts b/packages/fe-fpm-writer/test/unit/building-block.test.ts
index 43fb21fb56a..53dfdfe86c1 100644
--- a/packages/fe-fpm-writer/test/unit/building-block.test.ts
+++ b/packages/fe-fpm-writer/test/unit/building-block.test.ts
@@ -10,7 +10,6 @@ import type {
     Field,
     FilterBar,
     Form,
-    Page,
     Table,
     CustomColumn,
     CustomFilterField,

From 2e9349bf12f871b3fdc33ad464cd5f9250eb190b Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Thu, 11 Jun 2026 01:45:58 +0100
Subject: [PATCH 27/51] fix after comments

---
 packages/fe-fpm-writer/src/building-block/index.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 26621a86f32..b2ee2d2f5e9 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -670,13 +670,15 @@ export async function getSerializedFileContent<T extends BuildingBlock>(
                 '<mvc:View xmlns:mvc="sap.ui.core.mvc" xmlns:macros="sap.fe.macros" xmlns="sap.m"/>',
                 'text/xml'
             );
+        // Parse content directly so documentElement IS the <macros:Page> element,
+        // matching what appendPageAggregations expects as templateDocument.documentElement.
         const snippetDoc = new DOMParser().parseFromString(
-            `<root xmlns:macros="sap.fe.macros">${content}</root>`,
+            `${content}`,
             'text/xml'
         );
         appendPageAggregations(fs, nsDoc, snippetDoc, fnGenerateId, pageData);
-        const pageNode = snippetDoc.documentElement.firstChild;
-        viewOrFragmentContent = pageNode ? format(new XMLSerializer().serializeToString(pageNode)) : content;
+        const resultNode = snippetDoc.documentElement;
+        viewOrFragmentContent = resultNode ? format(new XMLSerializer().serializeToString(resultNode)) : content;
     }
     const filePathProps = getFilePathProps(basePath, viewOrFragmentPath);
     // Snippet for fragment xml

From 2318acadb02a36d968f1eee85d13f597dbe18aea Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 11 Jun 2026 00:53:02 +0000
Subject: [PATCH 28/51] Linting auto fix commit

---
 packages/fe-fpm-writer/src/building-block/index.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index b2ee2d2f5e9..be7f9af1e9e 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -672,10 +672,7 @@ export async function getSerializedFileContent<T extends BuildingBlock>(
             );
         // Parse content directly so documentElement IS the <macros:Page> element,
         // matching what appendPageAggregations expects as templateDocument.documentElement.
-        const snippetDoc = new DOMParser().parseFromString(
-            `${content}`,
-            'text/xml'
-        );
+        const snippetDoc = new DOMParser().parseFromString(`${content}`, 'text/xml');
         appendPageAggregations(fs, nsDoc, snippetDoc, fnGenerateId, pageData);
         const resultNode = snippetDoc.documentElement;
         viewOrFragmentContent = resultNode ? format(new XMLSerializer().serializeToString(resultNode)) : content;

From cc0f680ec3ca2f03650e7aea3b9e03819f0896b8 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Thu, 11 Jun 2026 02:47:43 +0100
Subject: [PATCH 29/51] fix after comments

---
 .../fe-fpm-writer/src/building-block/index.ts | 58 ++++++++++++++-----
 1 file changed, 45 insertions(+), 13 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index b2ee2d2f5e9..cd499da3840 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -205,27 +205,59 @@ function appendPageAggregations(
  */
 function sortPageAggregationChildren(pageElement: Node): void {
     const allChildren = Array.from(pageElement.childNodes);
-    // Separate leading template comment (first comment node) from element children
-    const leadingComment = allChildren.find((n) => n.nodeType === 8 /* Comment */);
-    const elementChildren = allChildren.filter((n) => n.nodeType === 1 /* Element */) as Element[];
     const aggNames = PAGE_AGGREGATIONS as readonly string[];
-    const sorted = [...elementChildren].sort((a, b) => {
-        const aName = typeof a.localName === 'string' ? a.localName : '';
-        const bName = typeof b.localName === 'string' ? b.localName : '';
+
+    // Build pairs of [preceding comments, element] to preserve all user comments.
+    // The PAGE_TEMPLATE_COMMENT is a special leading comment that always stays first.
+    type NodeGroup = { comments: Node[]; element: Element };
+    const groups: NodeGroup[] = [];
+    const leadingComments: Node[] = [];
+    let pendingComments: Node[] = [];
+    let firstElementSeen = false;
+
+    for (const node of allChildren) {
+        if (node.nodeType === 8 /* Comment */) {
+            if (!firstElementSeen) {
+                // Comments before the first element are always leading comments
+                leadingComments.push(node);
+            } else {
+                pendingComments.push(node);
+            }
+        } else if (node.nodeType === 1 /* Element */) {
+            firstElementSeen = true;
+            groups.push({ comments: pendingComments, element: node as Element });
+            pendingComments = [];
+        }
+        // whitespace text nodes are intentionally dropped (xml-formatter regenerates indentation)
+    }
+
+    groups.sort((a, b) => {
+        const aName = typeof a.element.localName === 'string' ? a.element.localName : '';
+        const bName = typeof b.element.localName === 'string' ? b.element.localName : '';
         const aIdx = aggNames.indexOf(aName);
         const bIdx = aggNames.indexOf(bName);
-        const aPosition = aIdx === -1 ? aggNames.length : aIdx;
-        const bPosition = bIdx === -1 ? aggNames.length : bIdx;
-        return aPosition - bPosition;
+        return (aIdx === -1 ? aggNames.length : aIdx) - (bIdx === -1 ? aggNames.length : bIdx);
     });
+
     while (pageElement.firstChild) {
         pageElement.removeChild(pageElement.firstChild); // NOSONAR - xmldom nodes do not implement Node.remove()
     }
-    if (leadingComment) {
-        pageElement.appendChild(leadingComment);
+
+    // Re-insert leading comments first (always before any element)
+    for (const comment of leadingComments) {
+        pageElement.appendChild(comment);
     }
-    for (const el of sorted) {
-        pageElement.appendChild(el);
+
+    for (const { comments, element } of groups) {
+        for (const comment of comments) {
+            pageElement.appendChild(comment);
+        }
+        pageElement.appendChild(element);
+    }
+
+    // Trailing orphan comments (after the last element)
+    for (const comment of pendingComments) {
+        pageElement.appendChild(comment);
     }
 }
 

From 5968d7231dbf2c1d029690b9a3ef76fffc566649 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Thu, 11 Jun 2026 03:13:48 +0100
Subject: [PATCH 30/51] fix after comments

---
 .../fe-fpm-writer/src/building-block/index.ts | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 8514d26c4e5..e2e6da8c17e 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -208,7 +208,7 @@ function sortPageAggregationChildren(pageElement: Node): void {
     const aggNames = PAGE_AGGREGATIONS as readonly string[];
 
     // Build pairs of [preceding comments, element] to preserve all user comments.
-    // The PAGE_TEMPLATE_COMMENT is a special leading comment that always stays first.
+    // The PAGE_TEMPLATE_COMMENT is treated as a leading comment and will remain before all aggregation elements.
     type NodeGroup = { comments: Node[]; element: Element };
     const groups: NodeGroup[] = [];
     const leadingComments: Node[] = [];
@@ -309,7 +309,7 @@ export async function appendPageBBAggregation(
     const xpathSelect = xpath.useNamespaces({ ...(firstChildView as any)._nsMap, [fragMacrosNS]: 'sap.fe.macros' });
     const pageNodes = xpathSelect(`//${fragMacrosNS}:Page`, xmlDocument);
     if (!pageNodes || !Array.isArray(pageNodes) || pageNodes.length === 0) {
-        throw new Error(`macros:Page element not found in view ${viewPath}.`);
+        throw new Error(`${fragMacrosNS}:Page element not found in view ${viewPath}.`);
     }
 
     const pageElement = pageNodes[0] as Node;
@@ -363,15 +363,17 @@ async function applyPageControllerTemplate(fs: Editor, basePath: string, viewOrF
     }
     const { dir: viewDir, name: viewName } = parse(viewOrFragmentPath);
     const viewBaseName = viewName.replace(/\.view$/, '');
+    const tsControllerPath = join(basePath, viewDir, `${viewBaseName}.controller.ts`);
+    const jsControllerPath = join(basePath, viewDir, `${viewBaseName}.controller.js`);
+    // Skip if a controller already exists in either language to avoid duplicate stubs
+    if (fs.exists(tsControllerPath) || fs.exists(jsControllerPath)) {
+        return;
+    }
     const detectedLanguage = await getAppProgrammingLanguage(basePath, fs);
-    const isTypeScript =
-        detectedLanguage === 'TypeScript' ||
-        (!detectedLanguage && fs.exists(join(basePath, viewDir, `${viewBaseName}.controller.ts`)));
+    const isTypeScript = detectedLanguage === 'TypeScript';
     const controllerExt = isTypeScript ? 'ts' : 'js';
-    const controllerPath = join(basePath, viewDir, `${viewBaseName}.controller.${controllerExt}`);
-    if (!fs.exists(controllerPath)) {
-        copyTpl(fs, getTemplatePath(`/building-block/page/Controller.${controllerExt}`), controllerPath);
-    }
+    const controllerPath = isTypeScript ? tsControllerPath : jsControllerPath;
+    copyTpl(fs, getTemplatePath(`/building-block/page/Controller.${controllerExt}`), controllerPath);
 }
 
 /**

From 7b1a2d16c119dff7d9d81afe8939f8062cb50d78 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Thu, 11 Jun 2026 03:41:32 +0100
Subject: [PATCH 31/51] fix after comments

---
 packages/fe-fpm-writer/src/building-block/index.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index e2e6da8c17e..90594f11806 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -217,11 +217,11 @@ function sortPageAggregationChildren(pageElement: Node): void {
 
     for (const node of allChildren) {
         if (node.nodeType === 8 /* Comment */) {
-            if (!firstElementSeen) {
+            if (firstElementSeen) {
+                pendingComments.push(node);
+            } else {
                 // Comments before the first element are always leading comments
                 leadingComments.push(node);
-            } else {
-                pendingComments.push(node);
             }
         } else if (node.nodeType === 1 /* Element */) {
             firstElementSeen = true;

From fc92f019d4f76913edb5869f9f08438e87db1002 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Thu, 11 Jun 2026 03:51:47 +0100
Subject: [PATCH 32/51] fix after comments

---
 packages/fe-fpm-writer/src/building-block/index.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 90594f11806..6c223efc078 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -198,7 +198,7 @@ function appendPageAggregations(
 
 /**
  * Reorders the child elements of a macros:Page node to match the canonical PAGE_AGGREGATIONS order.
- * Preserves relative order of siblings with the same local name. Whitespace text nodes are dropped
+ * Preserves relative order of siblings with the same local name. Pure whitespace text nodes are dropped
  * because the xml-formatter call that follows will regenerate proper indentation.
  *
  * @param pageElement - the macros:Page DOM node whose children should be sorted
@@ -227,8 +227,11 @@ function sortPageAggregationChildren(pageElement: Node): void {
             firstElementSeen = true;
             groups.push({ comments: pendingComments, element: node as Element });
             pendingComments = [];
+        } else if (node.nodeType === 3 /* Text */ && (node as Text).data?.trim()) {
+            // Preserve non-whitespace text nodes with their surrounding group
+            pendingComments.push(node);
         }
-        // whitespace text nodes are intentionally dropped (xml-formatter regenerates indentation)
+        // Pure whitespace text nodes are intentionally dropped (xml-formatter regenerates indentation)
     }
 
     groups.sort((a, b) => {
@@ -350,8 +353,7 @@ export async function appendPageBBAggregation(
 
 /**
  * Copies the Page controller template (JS or TS) into the view directory if no controller file exists yet.
- * Uses getAppProgrammingLanguage for reliable detection, with a fallback to checking for an existing
- * .controller.ts sibling file for edge cases where language detection returns blank.
+ * Uses getAppProgrammingLanguage to decide whether to generate a JS or TS controller stub.
  *
  * @param {Editor} fs - the memfs editor instance
  * @param {string} basePath - the base path of the application

From 8e7c123135facece0b1870df8c057ad6d047374a Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Mon, 15 Jun 2026 12:02:29 +0100
Subject: [PATCH 33/51] fix after comments

---
 packages/fe-fpm-writer/src/building-block/index.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 6c223efc078..cccb33f0a88 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -288,7 +288,11 @@ export async function appendPageBBAggregation(
     const aggId = generateId(aggName);
 
     const macrosNS = getOrAddNamespace(xmlDocument, 'sap.fe.macros', 'macros');
-    const fragMacrosNS = macrosNS || 'macros';
+    let fragMacrosNS = macrosNS;
+    if (fragMacrosNS === '') {
+        xmlDocument.documentElement.setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:macros', 'sap.fe.macros');
+        fragMacrosNS = 'macros';
+    }
     const macrosPrefix = `${fragMacrosNS}:`;
     const aggContext = { macrosPrefix, mContent, aggId };
 
@@ -621,7 +625,8 @@ function updateViewFile(
     if (!firstChild) {
         throw new Error(`Unable to read namespace map from view ${viewPath}.`);
     }
-    const xpathSelect = xpath.useNamespaces((firstChild as any)._nsMap);
+    const nsMap = (firstChild as any)?._nsMap ?? {};
+    const xpathSelect = xpath.useNamespaces(nsMap);
 
     // Find target aggregated element and append template as child
     const targetNodes = xpathSelect(aggregationPath, viewDocument);

From 144812188133b5cf45d29a79a03e9c229d8d8964 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Mon, 15 Jun 2026 12:31:54 +0100
Subject: [PATCH 34/51] fix after comments

---
 packages/fe-fpm-writer/src/building-block/index.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index cccb33f0a88..369db308eaa 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -217,12 +217,8 @@ function sortPageAggregationChildren(pageElement: Node): void {
 
     for (const node of allChildren) {
         if (node.nodeType === 8 /* Comment */) {
-            if (firstElementSeen) {
-                pendingComments.push(node);
-            } else {
-                // Comments before the first element are always leading comments
-                leadingComments.push(node);
-            }
+            // Comments before the first element are leading; after, they are pending
+            (firstElementSeen ? pendingComments : leadingComments).push(node);
         } else if (node.nodeType === 1 /* Element */) {
             firstElementSeen = true;
             groups.push({ comments: pendingComments, element: node as Element });

From 538364cee5dbb77fa7aa6a51df528fdcd625e469 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Mon, 15 Jun 2026 13:21:19 +0100
Subject: [PATCH 35/51] fix after comments

---
 .../fe-fpm-writer/src/building-block/index.ts | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 369db308eaa..94e337c8ecc 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -183,9 +183,12 @@ function appendPageAggregations(
         const aggContext = { macrosPrefix, mContent, aggId };
         const aggPath = getTemplatePath(`/building-block/page/${aggName}.xml`);
         const aggContent = render(fs.read(aggPath), aggContext, {}); // NOSONAR - template is a controlled file on disk, not user input
-        // Always declare both default and prefixed sap.m namespaces so bare element names (e.g. IconTabBar)
-        // and prefixed names (e.g. m:Button) both parse correctly regardless of the view's namespace config.
-        const wrapped = `<root xmlns:${fragMacrosNS}="sap.fe.macros" xmlns="sap.m" xmlns:m="sap.m">${aggContent}</root>`;
+        // Inherit all xmlns:* declarations from the view root so mContent can use any view-declared prefix.
+        const extraNamespaces = Array.from(xmlDocument.documentElement.attributes)
+            .filter((a) => a.name.startsWith('xmlns:') && a.name !== `xmlns:${fragMacrosNS}` && a.name !== 'xmlns:m')
+            .map((a) => `${a.name}="${a.value}"`)
+            .join(' ');
+        const wrapped = `<root xmlns:${fragMacrosNS}="sap.fe.macros" xmlns="sap.m" xmlns:m="sap.m" ${extraNamespaces}>${aggContent}</root>`;
         const aggDoc = new DOMParser({ errorHandler: aggErrorHandler }).parseFromString(wrapped, 'text/xml');
         for (const node of Array.from(aggDoc.documentElement.childNodes)) {
             if (node.nodeType === 1 /* Element */) {
@@ -294,9 +297,12 @@ export async function appendPageBBAggregation(
 
     const aggPath = getTemplatePath(`/building-block/page/${aggName}.xml`);
     const aggContent = render(fs.read(aggPath), aggContext, {}); // NOSONAR - template is a controlled file on disk, not user input
-    // Always declare both default and prefixed sap.m namespaces so bare element names (e.g. IconTabBar)
-    // and prefixed names (e.g. m:Button) both parse correctly regardless of the view's namespace config.
-    const wrapped = `<root xmlns:${fragMacrosNS}="sap.fe.macros" xmlns="sap.m" xmlns:m="sap.m">${aggContent}</root>`;
+    // Inherit all xmlns:* declarations from the view root so mContent can use any view-declared prefix.
+    const extraNamespaces = Array.from(xmlDocument.documentElement.attributes)
+        .filter((a) => a.name.startsWith('xmlns:') && a.name !== `xmlns:${fragMacrosNS}` && a.name !== 'xmlns:m')
+        .map((a) => `${a.name}="${a.value}"`)
+        .join(' ');
+    const wrapped = `<root xmlns:${fragMacrosNS}="sap.fe.macros" xmlns="sap.m" xmlns:m="sap.m" ${extraNamespaces}>${aggContent}</root>`;
 
     const errorHandler = (level: string, message: string): never => {
         throw new Error(`Unable to parse page aggregation fragment. Details: [${level}] - ${message}`);
@@ -307,12 +313,11 @@ export async function appendPageBBAggregation(
     if (!firstChildView) {
         throw new Error(`Unable to read namespace map from view ${viewPath}.`);
     }
-    // Merge the view's namespace map with the macros prefix so the XPath query works even when
-    // _nsMap does not include the macros prefix under the same key.
-    const xpathSelect = xpath.useNamespaces({ ...(firstChildView as any)._nsMap, [fragMacrosNS]: 'sap.fe.macros' });
-    const pageNodes = xpathSelect(`//${fragMacrosNS}:Page`, xmlDocument);
+    // Prefix-agnostic XPath — works regardless of the alias used in the view for sap.fe.macros.
+    const xpathSelect = xpath.useNamespaces({ ...((firstChildView as any)?._nsMap ?? {}) });
+    const pageNodes = xpathSelect(`//*[local-name()='Page' and namespace-uri()='sap.fe.macros']`, xmlDocument);
     if (!pageNodes || !Array.isArray(pageNodes) || pageNodes.length === 0) {
-        throw new Error(`${fragMacrosNS}:Page element not found in view ${viewPath}.`);
+        throw new Error(`Page element (sap.fe.macros) not found in view ${viewPath}.`);
     }
 
     const pageElement = pageNodes[0] as Node;
@@ -709,7 +714,10 @@ export async function getSerializedFileContent<T extends BuildingBlock>(
             );
         // Parse content directly so documentElement IS the <macros:Page> element,
         // matching what appendPageAggregations expects as templateDocument.documentElement.
-        const snippetDoc = new DOMParser().parseFromString(`${content}`, 'text/xml');
+        const snippetErrorHandler = (level: string, message: string): never => {
+            throw new Error(`Unable to parse Page building block snippet. Details: [${level}] - ${message}`);
+        };
+        const snippetDoc = new DOMParser({ errorHandler: snippetErrorHandler }).parseFromString(`${content}`, 'text/xml');
         appendPageAggregations(fs, nsDoc, snippetDoc, fnGenerateId, pageData);
         const resultNode = snippetDoc.documentElement;
         viewOrFragmentContent = resultNode ? format(new XMLSerializer().serializeToString(resultNode)) : content;

From 1ca3afbaa605a49113bc2f2a8b21f954b1522bbe Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 15 Jun 2026 12:29:51 +0000
Subject: [PATCH 36/51] Linting auto fix commit

---
 packages/fe-fpm-writer/src/building-block/index.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 94e337c8ecc..1c1bc53d854 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -717,7 +717,10 @@ export async function getSerializedFileContent<T extends BuildingBlock>(
         const snippetErrorHandler = (level: string, message: string): never => {
             throw new Error(`Unable to parse Page building block snippet. Details: [${level}] - ${message}`);
         };
-        const snippetDoc = new DOMParser({ errorHandler: snippetErrorHandler }).parseFromString(`${content}`, 'text/xml');
+        const snippetDoc = new DOMParser({ errorHandler: snippetErrorHandler }).parseFromString(
+            `${content}`,
+            'text/xml'
+        );
         appendPageAggregations(fs, nsDoc, snippetDoc, fnGenerateId, pageData);
         const resultNode = snippetDoc.documentElement;
         viewOrFragmentContent = resultNode ? format(new XMLSerializer().serializeToString(resultNode)) : content;

From afbd4752e012816bd445ef974ceccc2de1c99c05 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Mon, 15 Jun 2026 13:53:01 +0100
Subject: [PATCH 37/51] fix after comments

---
 packages/fe-fpm-writer/src/building-block/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 94e337c8ecc..9c180f8a4b9 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -314,7 +314,7 @@ export async function appendPageBBAggregation(
         throw new Error(`Unable to read namespace map from view ${viewPath}.`);
     }
     // Prefix-agnostic XPath — works regardless of the alias used in the view for sap.fe.macros.
-    const xpathSelect = xpath.useNamespaces({ ...((firstChildView as any)?._nsMap ?? {}) });
+    const xpathSelect = xpath.useNamespaces({ ...(firstChildView as any)?._nsMap });
     const pageNodes = xpathSelect(`//*[local-name()='Page' and namespace-uri()='sap.fe.macros']`, xmlDocument);
     if (!pageNodes || !Array.isArray(pageNodes) || pageNodes.length === 0) {
         throw new Error(`Page element (sap.fe.macros) not found in view ${viewPath}.`);

From 9a2c7f3b0b9a8f8debfd9094e25e47fa8b09af46 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Mon, 15 Jun 2026 14:41:45 +0100
Subject: [PATCH 38/51] fix after comments

---
 packages/fe-fpm-writer/src/building-block/index.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 54bbc82592f..4068df72f88 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -233,12 +233,16 @@ function sortPageAggregationChildren(pageElement: Node): void {
         // Pure whitespace text nodes are intentionally dropped (xml-formatter regenerates indentation)
     }
 
+    const itemsIdx = aggNames.indexOf('items');
+    const fallbackIdx = itemsIdx === -1 ? aggNames.length : itemsIdx;
     groups.sort((a, b) => {
         const aName = typeof a.element.localName === 'string' ? a.element.localName : '';
         const bName = typeof b.element.localName === 'string' ? b.element.localName : '';
         const aIdx = aggNames.indexOf(aName);
         const bIdx = aggNames.indexOf(bName);
-        return (aIdx === -1 ? aggNames.length : aIdx) - (bIdx === -1 ? aggNames.length : bIdx);
+        const aOrder = aIdx === -1 ? fallbackIdx : aIdx;
+        const bOrder = bIdx === -1 ? fallbackIdx : bIdx;
+        return aOrder - bOrder;
     });
 
     while (pageElement.firstChild) {

From e6b76fc4f4464ad53e77d4e26223defc1be0e2af Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Mon, 15 Jun 2026 16:17:17 +0100
Subject: [PATCH 39/51] fix after comments

---
 packages/fe-fpm-writer/src/building-block/index.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 4068df72f88..55df2332851 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -212,7 +212,7 @@ function sortPageAggregationChildren(pageElement: Node): void {
 
     // Build pairs of [preceding comments, element] to preserve all user comments.
     // The PAGE_TEMPLATE_COMMENT is treated as a leading comment and will remain before all aggregation elements.
-    type NodeGroup = { comments: Node[]; element: Element };
+    type NodeGroup = { comments: Node[]; element: Element; originalIndex: number };
     const groups: NodeGroup[] = [];
     const leadingComments: Node[] = [];
     let pendingComments: Node[] = [];
@@ -224,7 +224,7 @@ function sortPageAggregationChildren(pageElement: Node): void {
             (firstElementSeen ? pendingComments : leadingComments).push(node);
         } else if (node.nodeType === 1 /* Element */) {
             firstElementSeen = true;
-            groups.push({ comments: pendingComments, element: node as Element });
+            groups.push({ comments: pendingComments, element: node as Element, originalIndex: groups.length });
             pendingComments = [];
         } else if (node.nodeType === 3 /* Text */ && (node as Text).data?.trim()) {
             // Preserve non-whitespace text nodes with their surrounding group
@@ -242,7 +242,7 @@ function sortPageAggregationChildren(pageElement: Node): void {
         const bIdx = aggNames.indexOf(bName);
         const aOrder = aIdx === -1 ? fallbackIdx : aIdx;
         const bOrder = bIdx === -1 ? fallbackIdx : bIdx;
-        return aOrder - bOrder;
+        return aOrder !== bOrder ? aOrder - bOrder : a.originalIndex - b.originalIndex;
     });
 
     while (pageElement.firstChild) {

From 4ebd57865c27937a76e91e27be994255bcf9eabc Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Tue, 16 Jun 2026 15:41:38 +0100
Subject: [PATCH 40/51] fix after comments

---
 packages/fe-fpm-writer/src/building-block/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 55df2332851..9d1ad592eb7 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -210,8 +210,8 @@ function sortPageAggregationChildren(pageElement: Node): void {
     const allChildren = Array.from(pageElement.childNodes);
     const aggNames = PAGE_AGGREGATIONS as readonly string[];
 
-    // Build pairs of [preceding comments, element] to preserve all user comments.
-    // The PAGE_TEMPLATE_COMMENT is treated as a leading comment and will remain before all aggregation elements.
+    // Build pairs of [preceding comments, element] to preserve user comments.
+    // Comments that appear before the first element are treated as leading and will remain before all aggregation elements.
     type NodeGroup = { comments: Node[]; element: Element; originalIndex: number };
     const groups: NodeGroup[] = [];
     const leadingComments: Node[] = [];

From 7afa3f4b9913c3d383c7b9d3884faa16aea809a1 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Tue, 16 Jun 2026 18:27:55 +0100
Subject: [PATCH 41/51] fix after comments

---
 .changeset/short-planets-prove.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/short-planets-prove.md b/.changeset/short-planets-prove.md
index e354c7acc17..eb38a9e6e4f 100644
--- a/.changeset/short-planets-prove.md
+++ b/.changeset/short-planets-prove.md
@@ -3,7 +3,7 @@
 "@sap-ux-private/ui-prompting-examples": minor
 ---
 
-feat(fe-fpm-writer): add Page building block full and basic template support
+FEAT(fe-fpm-writer): add Page building block full and basic template support
 
 - Add `appendPageAggregations` to generate all 7 Page BB aggregations (`breadcrumbs`, `navigationActions`, `titleContent`, `actions`, `headerContent`, `items`, `footer`) with EJS templates and per-aggregation IDs
 - Add `appendPageBBAggregation` API to append a single named aggregation to an existing `<macros:Page>` element in a view XML file

From 9b1a9f90f6a695c87091111793d9cadb3334dc17 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Tue, 16 Jun 2026 18:32:57 +0100
Subject: [PATCH 42/51] fix after comments

---
 .changeset/short-planets-prove.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/short-planets-prove.md b/.changeset/short-planets-prove.md
index eb38a9e6e4f..e12d8415d21 100644
--- a/.changeset/short-planets-prove.md
+++ b/.changeset/short-planets-prove.md
@@ -3,7 +3,7 @@
 "@sap-ux-private/ui-prompting-examples": minor
 ---
 
-FEAT(fe-fpm-writer): add Page building block full and basic template support
+FEAT: (fe-fpm-writer) add Page building block full and basic template support
 
 - Add `appendPageAggregations` to generate all 7 Page BB aggregations (`breadcrumbs`, `navigationActions`, `titleContent`, `actions`, `headerContent`, `items`, `footer`) with EJS templates and per-aggregation IDs
 - Add `appendPageBBAggregation` API to append a single named aggregation to an existing `<macros:Page>` element in a view XML file

From b10094c7fef78dc3b8f13595cf703f15289e7cac Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Wed, 17 Jun 2026 12:18:55 +0100
Subject: [PATCH 43/51] fix after comments

---
 packages/fe-fpm-writer/src/building-block/index.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 9d1ad592eb7..db17e418b50 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -209,6 +209,7 @@ function appendPageAggregations(
 function sortPageAggregationChildren(pageElement: Node): void {
     const allChildren = Array.from(pageElement.childNodes);
     const aggNames = PAGE_AGGREGATIONS as readonly string[];
+    const getLocalName = (el: Element): string => (typeof el.localName === 'string' ? el.localName : '');
 
     // Build pairs of [preceding comments, element] to preserve user comments.
     // Comments that appear before the first element are treated as leading and will remain before all aggregation elements.
@@ -236,13 +237,11 @@ function sortPageAggregationChildren(pageElement: Node): void {
     const itemsIdx = aggNames.indexOf('items');
     const fallbackIdx = itemsIdx === -1 ? aggNames.length : itemsIdx;
     groups.sort((a, b) => {
-        const aName = typeof a.element.localName === 'string' ? a.element.localName : '';
-        const bName = typeof b.element.localName === 'string' ? b.element.localName : '';
-        const aIdx = aggNames.indexOf(aName);
-        const bIdx = aggNames.indexOf(bName);
+        const aIdx = aggNames.indexOf(getLocalName(a.element));
+        const bIdx = aggNames.indexOf(getLocalName(b.element));
         const aOrder = aIdx === -1 ? fallbackIdx : aIdx;
         const bOrder = bIdx === -1 ? fallbackIdx : bIdx;
-        return aOrder !== bOrder ? aOrder - bOrder : a.originalIndex - b.originalIndex;
+        return aOrder === bOrder ? a.originalIndex - b.originalIndex : aOrder - bOrder;
     });
 
     while (pageElement.firstChild) {

From 6fdd9de2174b6805739b7f36611a52dcf80672dc Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Wed, 17 Jun 2026 12:54:23 +0100
Subject: [PATCH 44/51] fix after comments

---
 .../fe-fpm-writer/src/building-block/index.ts | 46 ++++++++++++++-----
 .../fe-fpm-writer/src/building-block/types.ts |  6 +++
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index db17e418b50..978abba9cc9 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -18,6 +18,7 @@ import {
     type BuildingBlockMetaPath,
     type Page,
     type PageAggregationName,
+    type XmlAggregationGroup,
     bindingContextAbsolute,
     type TemplateConfig
 } from './types.js';
@@ -199,6 +200,37 @@ function appendPageAggregations(
     }
 }
 
+/**
+ * Returns the local name of an Element, or an empty string if localName is not a string.
+ *
+ * @param el - the DOM Element
+ * @returns the local name string
+ */
+function getElementLocalName(el: Element): string {
+    return typeof el.localName === 'string' ? el.localName : '';
+}
+
+/**
+ * Builds a comparator for sorting XmlAggregationGroups by their position in aggNames.
+ * Unknown elements fall back to the position of 'items'. Ties are broken by original index.
+ *
+ * @param aggNames - ordered list of aggregation names
+ * @returns comparator function for Array.prototype.sort
+ */
+function buildAggregationComparator(
+    aggNames: readonly string[]
+): (a: XmlAggregationGroup, b: XmlAggregationGroup) => number {
+    const itemsIdx = aggNames.indexOf('items');
+    const fallbackIdx = itemsIdx === -1 ? aggNames.length : itemsIdx;
+    return (a, b) => {
+        const aIdx = aggNames.indexOf(getElementLocalName(a.element));
+        const bIdx = aggNames.indexOf(getElementLocalName(b.element));
+        const aOrder = aIdx === -1 ? fallbackIdx : aIdx;
+        const bOrder = bIdx === -1 ? fallbackIdx : bIdx;
+        return aOrder === bOrder ? a.originalIndex - b.originalIndex : aOrder - bOrder;
+    };
+}
+
 /**
  * Reorders the child elements of a macros:Page node to match the canonical PAGE_AGGREGATIONS order.
  * Preserves relative order of siblings with the same local name. Pure whitespace text nodes are dropped
@@ -209,12 +241,10 @@ function appendPageAggregations(
 function sortPageAggregationChildren(pageElement: Node): void {
     const allChildren = Array.from(pageElement.childNodes);
     const aggNames = PAGE_AGGREGATIONS as readonly string[];
-    const getLocalName = (el: Element): string => (typeof el.localName === 'string' ? el.localName : '');
 
     // Build pairs of [preceding comments, element] to preserve user comments.
     // Comments that appear before the first element are treated as leading and will remain before all aggregation elements.
-    type NodeGroup = { comments: Node[]; element: Element; originalIndex: number };
-    const groups: NodeGroup[] = [];
+    const groups: XmlAggregationGroup[] = [];
     const leadingComments: Node[] = [];
     let pendingComments: Node[] = [];
     let firstElementSeen = false;
@@ -234,15 +264,7 @@ function sortPageAggregationChildren(pageElement: Node): void {
         // Pure whitespace text nodes are intentionally dropped (xml-formatter regenerates indentation)
     }
 
-    const itemsIdx = aggNames.indexOf('items');
-    const fallbackIdx = itemsIdx === -1 ? aggNames.length : itemsIdx;
-    groups.sort((a, b) => {
-        const aIdx = aggNames.indexOf(getLocalName(a.element));
-        const bIdx = aggNames.indexOf(getLocalName(b.element));
-        const aOrder = aIdx === -1 ? fallbackIdx : aIdx;
-        const bOrder = bIdx === -1 ? fallbackIdx : bIdx;
-        return aOrder === bOrder ? a.originalIndex - b.originalIndex : aOrder - bOrder;
-    });
+    groups.sort(buildAggregationComparator(aggNames));
 
     while (pageElement.firstChild) {
         pageElement.removeChild(pageElement.firstChild); // NOSONAR - xmldom nodes do not implement Node.remove()
diff --git a/packages/fe-fpm-writer/src/building-block/types.ts b/packages/fe-fpm-writer/src/building-block/types.ts
index b506c497228..fc4f0596913 100644
--- a/packages/fe-fpm-writer/src/building-block/types.ts
+++ b/packages/fe-fpm-writer/src/building-block/types.ts
@@ -428,6 +428,12 @@ export const PAGE_TEMPLATE_TYPE_FULL = 'full' as const;
 export const PAGE_TEMPLATE_TYPE_BASIC = 'basic' as const;
 export type PageTemplateType = typeof PAGE_TEMPLATE_TYPE_FULL | typeof PAGE_TEMPLATE_TYPE_BASIC;
 
+/**
+ * A group of XML nodes representing one Page aggregation element and its preceding sibling comments.
+ * Used when re-ordering aggregation children under a macros:Page element.
+ */
+export type XmlAggregationGroup = { comments: Node[]; element: Element; originalIndex: number };
+
 /**
  * Represents a custom filter to be used inside the FilterBar.
  * The template for the FilterField has to be provided as the default aggregation.

From e850e58716be0c99a4a74e7cf103c6bd039f0678 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Wed, 17 Jun 2026 13:40:25 +0100
Subject: [PATCH 45/51] fix after comments

---
 .changeset/short-planets-prove.md                  |  2 +-
 packages/fe-fpm-writer/src/building-block/index.ts | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.changeset/short-planets-prove.md b/.changeset/short-planets-prove.md
index e12d8415d21..93e4ee8c02f 100644
--- a/.changeset/short-planets-prove.md
+++ b/.changeset/short-planets-prove.md
@@ -3,7 +3,7 @@
 "@sap-ux-private/ui-prompting-examples": minor
 ---
 
-FEAT: (fe-fpm-writer) add Page building block full and basic template support
+FEAT: Add Page building block full and basic template support
 
 - Add `appendPageAggregations` to generate all 7 Page BB aggregations (`breadcrumbs`, `navigationActions`, `titleContent`, `actions`, `headerContent`, `items`, `footer`) with EJS templates and per-aggregation IDs
 - Add `appendPageBBAggregation` API to append a single named aggregation to an existing `<macros:Page>` element in a view XML file
diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 978abba9cc9..b1478ab240a 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -171,7 +171,11 @@ function appendPageAggregations(
     pageData: Page
 ): void {
     const macrosNS = getOrAddNamespace(xmlDocument, 'sap.fe.macros', 'macros');
-    const fragMacrosNS = macrosNS || 'macros';
+    let fragMacrosNS = macrosNS;
+    if (fragMacrosNS === '') {
+        xmlDocument.documentElement.setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:macros', 'sap.fe.macros');
+        fragMacrosNS = 'macros';
+    }
     const macrosPrefix = `${fragMacrosNS}:`;
     const pageElement = templateDocument.documentElement;
     const aggErrorHandler = (level: string, message: string): never => {
@@ -742,8 +746,13 @@ export async function getSerializedFileContent<T extends BuildingBlock>(
         const snippetErrorHandler = (level: string, message: string): never => {
             throw new Error(`Unable to parse Page building block snippet. Details: [${level}] - ${message}`);
         };
+        const snippetMacrosNS = getOrAddNamespace(nsDoc, 'sap.fe.macros', 'macros') || 'macros';
+        const snippetContent = `${content}`.replace(
+            new RegExp(`^<(${snippetMacrosNS}:Page)`),
+            `<$1 xmlns:${snippetMacrosNS}="sap.fe.macros"`
+        );
         const snippetDoc = new DOMParser({ errorHandler: snippetErrorHandler }).parseFromString(
-            `${content}`,
+            snippetContent,
             'text/xml'
         );
         appendPageAggregations(fs, nsDoc, snippetDoc, fnGenerateId, pageData);

From 15cc34a88320c9712740a7ac3620e7e73199f62b Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Thu, 18 Jun 2026 12:35:57 +0100
Subject: [PATCH 46/51] fix after comments

---
 .../fe-fpm-writer/src/building-block/index.ts | 24 ++---
 .../fe-fpm-writer/src/building-block/types.ts | 14 +++
 packages/fe-fpm-writer/src/index.ts           |  8 +-
 .../test/unit/building-block.test.ts          | 88 +++++++++++++------
 4 files changed, 95 insertions(+), 39 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index b1478ab240a..bb47871c9b1 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -17,8 +17,8 @@ import {
     type BuildingBlockConfig,
     type BuildingBlockMetaPath,
     type Page,
-    type PageAggregationName,
     type XmlAggregationGroup,
+    type AppendBuildingBlockAggregationConfig,
     bindingContextAbsolute,
     type TemplateConfig
 } from './types.js';
@@ -295,21 +295,23 @@ function sortPageAggregationChildren(pageElement: Node): void {
 /**
  * Appends a single Page building block aggregation template to an existing `<macros:Page>` element in a view XML file.
  *
- * @param {Editor} fs - the memfs editor instance
  * @param {string} basePath - the base path of the application
- * @param {string} viewPath - the path of the xml view relative to the base path
- * @param {{ aggregationName: PageAggregationName; mContent: string }} data - aggregation name and inner XML content
- * @param data.aggregationName
- * @param data.mContent
+ * @param {AppendBuildingBlockAggregationConfig} config - the aggregation configuration containing aggregationName and mContent
+ * @param {Editor} [fs] - the memfs editor instance
  * @returns {Editor} the updated memfs editor instance
  */
-export async function appendPageBBAggregation(
-    fs: Editor,
+export async function appendBuildingBlockAggregation(
     basePath: string,
-    viewPath: string,
-    data: { aggregationName: PageAggregationName; mContent: string }
+    config: AppendBuildingBlockAggregationConfig,
+    fs?: Editor
 ): Promise<Editor> {
-    const { aggregationName: aggName, mContent } = data;
+    const { viewPath, buildingBlockType, aggregationName: aggName, mContent = '' } = config;
+    fs ??= create(createStorage());
+    if (buildingBlockType !== BuildingBlockType.Page) {
+        throw new Error(
+            `appendBuildingBlockAggregation: unsupported building block type '${buildingBlockType}'. Only 'Page' is currently supported.`
+        );
+    }
     const xmlDocument = getUI5XmlDocument(basePath, viewPath, fs);
 
     const generateId = await createIdGenerator({ basePath, fsEditor: fs });
diff --git a/packages/fe-fpm-writer/src/building-block/types.ts b/packages/fe-fpm-writer/src/building-block/types.ts
index fc4f0596913..0f4560bdab8 100644
--- a/packages/fe-fpm-writer/src/building-block/types.ts
+++ b/packages/fe-fpm-writer/src/building-block/types.ts
@@ -434,6 +434,20 @@ export type PageTemplateType = typeof PAGE_TEMPLATE_TYPE_FULL | typeof PAGE_TEMP
  */
 export type XmlAggregationGroup = { comments: Node[]; element: Element; originalIndex: number };
 
+/**
+ * Configuration for appending a named aggregation to an existing building block element in a view XML file.
+ */
+export interface AppendBuildingBlockAggregationConfig {
+    /** Path to the view XML file, relative to basePath. */
+    viewPath: string;
+    /** Type of the building block whose aggregation should be appended. Currently only 'Page' is supported. */
+    buildingBlockType: BuildingBlockType;
+    /** Name of the aggregation to append. */
+    aggregationName: PageAggregationName;
+    /** Optional inner XML content for the aggregation. */
+    mContent?: string;
+}
+
 /**
  * Represents a custom filter to be used inside the FilterBar.
  * The template for the FilterField has to be provided as the default aggregation.
diff --git a/packages/fe-fpm-writer/src/index.ts b/packages/fe-fpm-writer/src/index.ts
index 4b1c8f429d7..a812ff55d59 100644
--- a/packages/fe-fpm-writer/src/index.ts
+++ b/packages/fe-fpm-writer/src/index.ts
@@ -47,8 +47,12 @@ export type {
     PageTemplateType
 } from './building-block/types.js';
 export { PAGE_TEMPLATE_TYPE_FULL, PAGE_TEMPLATE_TYPE_BASIC, PAGE_AGGREGATIONS } from './building-block/types.js';
-export type { PageAggregationName } from './building-block/types.js';
-export { generateBuildingBlock, getSerializedFileContent, appendPageBBAggregation } from './building-block/index.js';
+export type { PageAggregationName, AppendBuildingBlockAggregationConfig } from './building-block/types.js';
+export {
+    generateBuildingBlock,
+    getSerializedFileContent,
+    appendBuildingBlockAggregation
+} from './building-block/index.js';
 export type {
     ChartPromptsAnswer,
     FilterBarPromptsAnswer,
diff --git a/packages/fe-fpm-writer/test/unit/building-block.test.ts b/packages/fe-fpm-writer/test/unit/building-block.test.ts
index 53dfdfe86c1..25926fd473d 100644
--- a/packages/fe-fpm-writer/test/unit/building-block.test.ts
+++ b/packages/fe-fpm-writer/test/unit/building-block.test.ts
@@ -21,7 +21,7 @@ import {
     BuildingBlockType,
     generateBuildingBlock,
     getSerializedFileContent,
-    appendPageBBAggregation
+    appendBuildingBlockAggregation
 } from '../../src/index.js';
 import { BUILDING_BLOCK_CONFIG } from '../../src/building-block/processor.js';
 import testManifestContent from './sample/building-block/webapp/manifest.json';
@@ -3841,7 +3841,7 @@ describe('Building Blocks', () => {
         });
     });
 
-    describe('appendPageBBAggregation', () => {
+    describe('appendBuildingBlockAggregation', () => {
         const pageViewContent = `<mvc:View xmlns:core="sap.ui.core" xmlns:mvc="sap.ui.core.mvc" xmlns="sap.m"
     xmlns:macros="sap.fe.macros" controllerName="com.test.myApp.ext.main.Main">
     <macros:Page id="Page" title="pageTitle">
@@ -3852,10 +3852,16 @@ describe('Building Blocks', () => {
             const basePath = join(testAppPath, 'page-bb-agg');
             fs.write(join(basePath, xmlViewFilePath), pageViewContent);
 
-            const result = await appendPageBBAggregation(fs, basePath, xmlViewFilePath, {
-                aggregationName: 'footer',
-                mContent: ''
-            });
+            const result = await appendBuildingBlockAggregation(
+                basePath,
+                {
+                    viewPath: xmlViewFilePath,
+                    buildingBlockType: BuildingBlockType.Page,
+                    aggregationName: 'footer',
+                    mContent: ''
+                },
+                fs
+            );
 
             const output = result.read(join(basePath, xmlViewFilePath));
             expect(output).toContain('id="footer"');
@@ -3872,10 +3878,16 @@ describe('Building Blocks', () => {
             fs.write(join(basePath, xmlViewFilePath), viewWithExistingId);
             findFilesByExtensionMock.mockResolvedValue([join(basePath, xmlViewFilePath)]);
 
-            const result = await appendPageBBAggregation(fs, basePath, xmlViewFilePath, {
-                aggregationName: 'footer',
-                mContent: ''
-            });
+            const result = await appendBuildingBlockAggregation(
+                basePath,
+                {
+                    viewPath: xmlViewFilePath,
+                    buildingBlockType: BuildingBlockType.Page,
+                    aggregationName: 'footer',
+                    mContent: ''
+                },
+                fs
+            );
 
             const output = result.read(join(basePath, xmlViewFilePath));
             expect((output.match(/<macros:footer\b/g) ?? []).length).toBe(1);
@@ -3895,10 +3907,16 @@ describe('Building Blocks', () => {
             fs.write(join(basePath, xmlViewFilePath), viewOutOfOrder);
 
             // Adding navigationActions (index 1) should trigger a full sort
-            const result = await appendPageBBAggregation(fs, basePath, xmlViewFilePath, {
-                aggregationName: 'navigationActions',
-                mContent: ''
-            });
+            const result = await appendBuildingBlockAggregation(
+                basePath,
+                {
+                    viewPath: xmlViewFilePath,
+                    buildingBlockType: BuildingBlockType.Page,
+                    aggregationName: 'navigationActions',
+                    mContent: ''
+                },
+                fs
+            );
 
             const output = result.read(join(basePath, xmlViewFilePath));
             const navPos = output.indexOf('macros:navigationActions');
@@ -3912,10 +3930,16 @@ describe('Building Blocks', () => {
             const basePath = join(testAppPath, 'page-bb-agg-comment');
             fs.write(join(basePath, xmlViewFilePath), pageViewContent);
 
-            const result = await appendPageBBAggregation(fs, basePath, xmlViewFilePath, {
-                aggregationName: 'items',
-                mContent: ''
-            });
+            const result = await appendBuildingBlockAggregation(
+                basePath,
+                {
+                    viewPath: xmlViewFilePath,
+                    buildingBlockType: BuildingBlockType.Page,
+                    aggregationName: 'items',
+                    mContent: ''
+                },
+                fs
+            );
 
             const output = result.read(join(basePath, xmlViewFilePath));
             expect(output).toContain('This is a sample template, event handlers should be added for implementation');
@@ -3935,10 +3959,16 @@ describe('Building Blocks', () => {
 </mvc:View>`;
             fs.write(join(basePath, xmlViewFilePath), viewWithExisting);
 
-            const result = await appendPageBBAggregation(fs, basePath, xmlViewFilePath, {
-                aggregationName: 'items',
-                mContent: ''
-            });
+            const result = await appendBuildingBlockAggregation(
+                basePath,
+                {
+                    viewPath: xmlViewFilePath,
+                    buildingBlockType: BuildingBlockType.Page,
+                    aggregationName: 'items',
+                    mContent: ''
+                },
+                fs
+            );
 
             const output = result.read(join(basePath, xmlViewFilePath));
             // Comment should not be added again if children already exist
@@ -3957,10 +3987,16 @@ describe('Building Blocks', () => {
 </mvc:View>`;
             fs.write(join(basePath, xmlViewFilePath), viewWithComment);
 
-            const result = await appendPageBBAggregation(fs, basePath, xmlViewFilePath, {
-                aggregationName: 'navigationActions',
-                mContent: ''
-            });
+            const result = await appendBuildingBlockAggregation(
+                basePath,
+                {
+                    viewPath: xmlViewFilePath,
+                    buildingBlockType: BuildingBlockType.Page,
+                    aggregationName: 'navigationActions',
+                    mContent: ''
+                },
+                fs
+            );
 
             const output = result.read(join(basePath, xmlViewFilePath));
             expect(output).toContain('This is a sample template, event handlers should be added for implementation');

From e1012710ea7c40b8df0f08fbdd22dde41c84f2a7 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Thu, 18 Jun 2026 13:02:12 +0100
Subject: [PATCH 47/51] fix after comments

---
 .changeset/short-planets-prove.md                  |  2 +-
 packages/fe-fpm-writer/src/building-block/index.ts | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.changeset/short-planets-prove.md b/.changeset/short-planets-prove.md
index 93e4ee8c02f..ab74e1ae081 100644
--- a/.changeset/short-planets-prove.md
+++ b/.changeset/short-planets-prove.md
@@ -6,7 +6,7 @@
 FEAT: Add Page building block full and basic template support
 
 - Add `appendPageAggregations` to generate all 7 Page BB aggregations (`breadcrumbs`, `navigationActions`, `titleContent`, `actions`, `headerContent`, `items`, `footer`) with EJS templates and per-aggregation IDs
-- Add `appendPageBBAggregation` API to append a single named aggregation to an existing `<macros:Page>` element in a view XML file
+- Add `appendBuildingBlockAggregation` API to append a single named aggregation to an existing `<macros:Page>` element in a view XML file
 - Add `sortPageAggregationChildren` to reorder aggregation elements into the canonical `PAGE_AGGREGATIONS` order after insertion
 - Add `PAGE_AGGREGATIONS` constant and `PageAggregationName` type (moved to `types.ts` for compile-time safety in `aggregations?: Partial<Record<PageAggregationName, string>>`)
 - Add `PAGE_TEMPLATE_TYPE_FULL` / `PAGE_TEMPLATE_TYPE_BASIC` constants and `PageTemplateType` type
diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index bb47871c9b1..301a22c239e 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -340,18 +340,18 @@ export async function appendBuildingBlockAggregation(
     };
     const aggDoc = new DOMParser({ errorHandler }).parseFromString(wrapped, 'text/xml');
 
-    const firstChildView = xmlDocument.firstChild;
-    if (!firstChildView) {
-        throw new Error(`Unable to read namespace map from view ${viewPath}.`);
-    }
+    const nsMap = (xmlDocument.documentElement as any)?._nsMap ?? {};
     // Prefix-agnostic XPath — works regardless of the alias used in the view for sap.fe.macros.
-    const xpathSelect = xpath.useNamespaces({ ...(firstChildView as any)?._nsMap });
+    const xpathSelect = xpath.useNamespaces(nsMap);
     const pageNodes = xpathSelect(`//*[local-name()='Page' and namespace-uri()='sap.fe.macros']`, xmlDocument);
     if (!pageNodes || !Array.isArray(pageNodes) || pageNodes.length === 0) {
         throw new Error(`Page element (sap.fe.macros) not found in view ${viewPath}.`);
     }
 
     const pageElement = pageNodes[0] as Node;
+    if (aggName === 'footer' && pageElement.nodeType === 1 /* Element */) {
+        (pageElement as Element).setAttribute('showFooter', 'true');
+    }
     const childNodes = Array.from(pageElement.childNodes);
     const hasExistingAggregation = childNodes.some(
         (node) =>

From 0abc48c13ff4e2cc484fe6fad2754ec3a07543f3 Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Thu, 18 Jun 2026 13:53:40 +0100
Subject: [PATCH 48/51] fix after comments

---
 .../fe-fpm-writer/src/building-block/index.ts | 115 +++++++++++-------
 1 file changed, 69 insertions(+), 46 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 301a22c239e..58d77234bd5 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -54,6 +54,16 @@ interface MetadataPath {
     metaPath: string;
 }
 
+/**
+ * Returns true if the building block data represents a Page building block with the full template type.
+ *
+ * @param data - the building block data
+ * @returns true if full Page template
+ */
+function isFullPageTemplate(data: BuildingBlock): boolean {
+    return data.buildingBlockType === BuildingBlockType.Page && (data as Page).templateType === PAGE_TEMPLATE_TYPE_FULL;
+}
+
 /**
  * Generates a building block into the provided xml view file.
  *
@@ -103,11 +113,9 @@ export async function generateBuildingBlock<T extends BuildingBlock>(
         templateConfig
     );
 
-    const isFullPageTemplate =
-        buildingBlockData.buildingBlockType === BuildingBlockType.Page &&
-        (buildingBlockData as Page).templateType === PAGE_TEMPLATE_TYPE_FULL;
+    const fullPageTemplate = isFullPageTemplate(buildingBlockData);
 
-    if (isFullPageTemplate) {
+    if (fullPageTemplate) {
         const pageData = buildingBlockData as Page;
         appendPageAggregations(fs, xmlDocument, templateDocument, fnGenerateId, pageData);
     }
@@ -134,7 +142,7 @@ export async function generateBuildingBlock<T extends BuildingBlock>(
         config.replace
     );
 
-    if (isFullPageTemplate) {
+    if (fullPageTemplate) {
         await applyPageControllerTemplate(fs, basePath, viewOrFragmentPath);
     }
 
@@ -154,6 +162,57 @@ export async function generateBuildingBlock<T extends BuildingBlock>(
     return fs;
 }
 
+/**
+ * Resolves the sap.fe.macros namespace prefix from the view document.
+ * If sap.fe.macros is the default namespace (no prefix), declares xmlns:macros on the document element
+ * so that generated prefixed elements like <macros:items> remain valid.
+ *
+ * @param xmlDocument - the view XML document
+ * @returns the resolved namespace prefix string (e.g. 'macros')
+ */
+function resolveMacrosPrefix(xmlDocument: Document): string {
+    const prefix = getOrAddNamespace(xmlDocument, 'sap.fe.macros', 'macros');
+    if (prefix === '') {
+        xmlDocument.documentElement.setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:macros', 'sap.fe.macros');
+        return 'macros';
+    }
+    return prefix;
+}
+
+/**
+ * Renders a Page aggregation EJS template and parses it as an XML fragment document.
+ * Inherits all xmlns:* declarations from the view root so inner content can use any view-declared prefix.
+ *
+ * @param fs - the memfs editor instance
+ * @param aggName - the aggregation name (e.g. 'footer', 'items')
+ * @param aggContext - the EJS template context
+ * @param aggContext.macrosPrefix - the namespace prefix string (e.g. 'macros:')
+ * @param aggContext.mContent - optional inner XML content for the aggregation
+ * @param aggContext.aggId - the generated unique ID for the aggregation element
+ * @param fragMacrosNS - the namespace prefix resolved for sap.fe.macros
+ * @param xmlDocument - the view XML document (used to inherit namespace declarations)
+ * @returns parsed XML document whose documentElement contains the aggregation child nodes
+ */
+function buildPageAggregationFragment(
+    fs: Editor,
+    aggName: string,
+    aggContext: { macrosPrefix: string; mContent: string; aggId: string },
+    fragMacrosNS: string,
+    xmlDocument: Document
+): Document {
+    const aggPath = getTemplatePath(`/building-block/page/${aggName}.xml`);
+    const aggContent = render(fs.read(aggPath), aggContext, {}); // NOSONAR - template is a controlled file on disk, not user input
+    const extraNamespaces = Array.from(xmlDocument.documentElement.attributes)
+        .filter((a) => a.name.startsWith('xmlns:') && a.name !== `xmlns:${fragMacrosNS}` && a.name !== 'xmlns:m')
+        .map((a) => `${a.name}="${a.value}"`)
+        .join(' ');
+    const wrapped = `<root xmlns:${fragMacrosNS}="sap.fe.macros" xmlns="sap.m" xmlns:m="sap.m" ${extraNamespaces}>${aggContent}</root>`;
+    const errorHandler = (level: string, message: string): never => {
+        throw new Error(`Unable to parse page aggregation fragment. Details: [${level}] - ${message}`);
+    };
+    return new DOMParser({ errorHandler }).parseFromString(wrapped, 'text/xml');
+}
+
 /**
  * Appends the 7 Page building block aggregation fragments as child elements of the templateDocument root.
  *
@@ -170,31 +229,15 @@ function appendPageAggregations(
     generateId: IdGeneratorFunction,
     pageData: Page
 ): void {
-    const macrosNS = getOrAddNamespace(xmlDocument, 'sap.fe.macros', 'macros');
-    let fragMacrosNS = macrosNS;
-    if (fragMacrosNS === '') {
-        xmlDocument.documentElement.setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:macros', 'sap.fe.macros');
-        fragMacrosNS = 'macros';
-    }
+    const fragMacrosNS = resolveMacrosPrefix(xmlDocument);
     const macrosPrefix = `${fragMacrosNS}:`;
     const pageElement = templateDocument.documentElement;
-    const aggErrorHandler = (level: string, message: string): never => {
-        throw new Error(`Unable to parse page aggregation fragment. Details: [${level}] - ${message}`);
-    };
     pageElement.appendChild(templateDocument.createComment(PAGE_TEMPLATE_COMMENT));
     for (const aggName of PAGE_AGGREGATIONS) {
         const mContent = pageData.aggregations?.[aggName] ?? '';
         const aggId = generateId(aggName);
         const aggContext = { macrosPrefix, mContent, aggId };
-        const aggPath = getTemplatePath(`/building-block/page/${aggName}.xml`);
-        const aggContent = render(fs.read(aggPath), aggContext, {}); // NOSONAR - template is a controlled file on disk, not user input
-        // Inherit all xmlns:* declarations from the view root so mContent can use any view-declared prefix.
-        const extraNamespaces = Array.from(xmlDocument.documentElement.attributes)
-            .filter((a) => a.name.startsWith('xmlns:') && a.name !== `xmlns:${fragMacrosNS}` && a.name !== 'xmlns:m')
-            .map((a) => `${a.name}="${a.value}"`)
-            .join(' ');
-        const wrapped = `<root xmlns:${fragMacrosNS}="sap.fe.macros" xmlns="sap.m" xmlns:m="sap.m" ${extraNamespaces}>${aggContent}</root>`;
-        const aggDoc = new DOMParser({ errorHandler: aggErrorHandler }).parseFromString(wrapped, 'text/xml');
+        const aggDoc = buildPageAggregationFragment(fs, aggName, aggContext, fragMacrosNS, xmlDocument);
         for (const node of Array.from(aggDoc.documentElement.childNodes)) {
             if (node.nodeType === 1 /* Element */) {
                 (node as Element).setAttribute('id', aggId);
@@ -317,28 +360,10 @@ export async function appendBuildingBlockAggregation(
     const generateId = await createIdGenerator({ basePath, fsEditor: fs });
     const aggId = generateId(aggName);
 
-    const macrosNS = getOrAddNamespace(xmlDocument, 'sap.fe.macros', 'macros');
-    let fragMacrosNS = macrosNS;
-    if (fragMacrosNS === '') {
-        xmlDocument.documentElement.setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:macros', 'sap.fe.macros');
-        fragMacrosNS = 'macros';
-    }
+    const fragMacrosNS = resolveMacrosPrefix(xmlDocument);
     const macrosPrefix = `${fragMacrosNS}:`;
     const aggContext = { macrosPrefix, mContent, aggId };
-
-    const aggPath = getTemplatePath(`/building-block/page/${aggName}.xml`);
-    const aggContent = render(fs.read(aggPath), aggContext, {}); // NOSONAR - template is a controlled file on disk, not user input
-    // Inherit all xmlns:* declarations from the view root so mContent can use any view-declared prefix.
-    const extraNamespaces = Array.from(xmlDocument.documentElement.attributes)
-        .filter((a) => a.name.startsWith('xmlns:') && a.name !== `xmlns:${fragMacrosNS}` && a.name !== 'xmlns:m')
-        .map((a) => `${a.name}="${a.value}"`)
-        .join(' ');
-    const wrapped = `<root xmlns:${fragMacrosNS}="sap.fe.macros" xmlns="sap.m" xmlns:m="sap.m" ${extraNamespaces}>${aggContent}</root>`;
-
-    const errorHandler = (level: string, message: string): never => {
-        throw new Error(`Unable to parse page aggregation fragment. Details: [${level}] - ${message}`);
-    };
-    const aggDoc = new DOMParser({ errorHandler }).parseFromString(wrapped, 'text/xml');
+    const aggDoc = buildPageAggregationFragment(fs, aggName, aggContext, fragMacrosNS, xmlDocument);
 
     const nsMap = (xmlDocument.documentElement as any)?._nsMap ?? {};
     // Prefix-agnostic XPath — works regardless of the alias used in the view for sap.fe.macros.
@@ -732,9 +757,7 @@ export async function getSerializedFileContent<T extends BuildingBlock>(
     // For the full Page template, augment the snippet with all 7 aggregations
     let viewOrFragmentContent = content;
     const pageData = buildingBlockData as Page;
-    const isFullPage =
-        buildingBlockData.buildingBlockType === BuildingBlockType.Page &&
-        pageData.templateType === PAGE_TEMPLATE_TYPE_FULL;
+    const isFullPage = isFullPageTemplate(buildingBlockData);
     if (isFullPage) {
         // Use the real view document for namespace resolution if available, otherwise create a minimal fallback
         const nsDoc =

From 75c903c4e15c3ca60ce9a9b45e22d4ec619749aa Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Thu, 18 Jun 2026 14:27:10 +0100
Subject: [PATCH 49/51] fix after comments

---
 .changeset/short-planets-prove.md                  | 14 ++------------
 packages/fe-fpm-writer/src/building-block/index.ts | 10 +++++++---
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/.changeset/short-planets-prove.md b/.changeset/short-planets-prove.md
index ab74e1ae081..3bac8a2c38f 100644
--- a/.changeset/short-planets-prove.md
+++ b/.changeset/short-planets-prove.md
@@ -1,16 +1,6 @@
 ---
-"@sap-ux/fe-fpm-writer": patch
+"@sap-ux/fe-fpm-writer": minor
 "@sap-ux-private/ui-prompting-examples": minor
 ---
 
-FEAT: Add Page building block full and basic template support
-
-- Add `appendPageAggregations` to generate all 7 Page BB aggregations (`breadcrumbs`, `navigationActions`, `titleContent`, `actions`, `headerContent`, `items`, `footer`) with EJS templates and per-aggregation IDs
-- Add `appendBuildingBlockAggregation` API to append a single named aggregation to an existing `<macros:Page>` element in a view XML file
-- Add `sortPageAggregationChildren` to reorder aggregation elements into the canonical `PAGE_AGGREGATIONS` order after insertion
-- Add `PAGE_AGGREGATIONS` constant and `PageAggregationName` type (moved to `types.ts` for compile-time safety in `aggregations?: Partial<Record<PageAggregationName, string>>`)
-- Add `PAGE_TEMPLATE_TYPE_FULL` / `PAGE_TEMPLATE_TYPE_BASIC` constants and `PageTemplateType` type
-- Rename template type value `blank` → `basic`; rename prompt label "Page template" → "Page Layout", "Default content" → "Full", "Blank" → "Basic"
-- Generate a JS or TS controller stub alongside the view (detected via `getAppProgrammingLanguage` with `.controller.ts` fallback)
-- Insert a sample template comment as first child of `<macros:Page>` on first aggregation; guard against duplicate comment insertion
-- Add null guards on `_nsMap` access; fix duplicate-ID issue in multi-element fragments
+FEAT: Add full template support for the Page building block with all 7 aggregations and controller stub generation
diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index 58d77234bd5..e34e1ebb4fc 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -208,7 +208,7 @@ function buildPageAggregationFragment(
         .join(' ');
     const wrapped = `<root xmlns:${fragMacrosNS}="sap.fe.macros" xmlns="sap.m" xmlns:m="sap.m" ${extraNamespaces}>${aggContent}</root>`;
     const errorHandler = (level: string, message: string): never => {
-        throw new Error(`Unable to parse page aggregation fragment. Details: [${level}] - ${message}`);
+        throw new Error(`Unable to parse page aggregation fragment '${aggName}'. Details: [${level}] - ${message}`);
     };
     return new DOMParser({ errorHandler }).parseFromString(wrapped, 'text/xml');
 }
@@ -248,12 +248,16 @@ function appendPageAggregations(
 }
 
 /**
- * Returns the local name of an Element, or an empty string if localName is not a string.
+ * Returns the local name of an Element if it belongs to the sap.fe.macros namespace, otherwise an empty string.
+ * This ensures only Page aggregation elements are sorted by position; non-macros elements fall back to the items slot.
  *
  * @param el - the DOM Element
- * @returns the local name string
+ * @returns the local name string, or '' if not a sap.fe.macros element
  */
 function getElementLocalName(el: Element): string {
+    if (el.namespaceURI !== 'sap.fe.macros') {
+        return '';
+    }
     return typeof el.localName === 'string' ? el.localName : '';
 }
 

From 94384ed74624c509b31c84848f7ae225d3266d7b Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Thu, 18 Jun 2026 14:30:52 +0100
Subject: [PATCH 50/51] fix after comments

---
 examples/ui-prompting-examples/src/Page.story.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/examples/ui-prompting-examples/src/Page.story.tsx b/examples/ui-prompting-examples/src/Page.story.tsx
index 8227f1b9cd5..3b697a3c7d5 100644
--- a/examples/ui-prompting-examples/src/Page.story.tsx
+++ b/examples/ui-prompting-examples/src/Page.story.tsx
@@ -5,10 +5,6 @@ import { BuildingBlockQuestions } from './BuildingBlock.js';
 export default { title: 'Building Blocks/Page' };
 
 export const Default = (): JSX.Element => {
-    return <BuildingBlockQuestions type={PromptsType.Page} />;
-};
-
-export const BasicTemplate = (): JSX.Element => {
     return (
         <BuildingBlockQuestions
             type={PromptsType.Page}

From 604cd0cf6dc574821ba105c349f7902fd51ec56c Mon Sep 17 00:00:00 2001
From: "Ouin, Edouard" <edouard.ouin@sap.com>
Date: Fri, 19 Jun 2026 09:26:38 +0100
Subject: [PATCH 51/51] fix after comments

---
 .../fe-fpm-writer/src/building-block/index.ts    | 10 +++++-----
 .../fe-fpm-writer/src/building-block/types.ts    |  2 +-
 packages/fe-fpm-writer/src/index.ts              |  4 ++--
 .../test/unit/building-block.test.ts             | 16 ++++++++--------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/fe-fpm-writer/src/building-block/index.ts b/packages/fe-fpm-writer/src/building-block/index.ts
index e34e1ebb4fc..642ae9f89fa 100644
--- a/packages/fe-fpm-writer/src/building-block/index.ts
+++ b/packages/fe-fpm-writer/src/building-block/index.ts
@@ -18,7 +18,7 @@ import {
     type BuildingBlockMetaPath,
     type Page,
     type XmlAggregationGroup,
-    type AppendBuildingBlockAggregationConfig,
+    type GenerateBuildingBlockAggregationConfig,
     bindingContextAbsolute,
     type TemplateConfig
 } from './types.js';
@@ -343,20 +343,20 @@ function sortPageAggregationChildren(pageElement: Node): void {
  * Appends a single Page building block aggregation template to an existing `<macros:Page>` element in a view XML file.
  *
  * @param {string} basePath - the base path of the application
- * @param {AppendBuildingBlockAggregationConfig} config - the aggregation configuration containing aggregationName and mContent
+ * @param {GenerateBuildingBlockAggregationConfig} config - the aggregation configuration containing aggregationName and mContent
  * @param {Editor} [fs] - the memfs editor instance
  * @returns {Editor} the updated memfs editor instance
  */
-export async function appendBuildingBlockAggregation(
+export async function generateBuildingBlockAggregation(
     basePath: string,
-    config: AppendBuildingBlockAggregationConfig,
+    config: GenerateBuildingBlockAggregationConfig,
     fs?: Editor
 ): Promise<Editor> {
     const { viewPath, buildingBlockType, aggregationName: aggName, mContent = '' } = config;
     fs ??= create(createStorage());
     if (buildingBlockType !== BuildingBlockType.Page) {
         throw new Error(
-            `appendBuildingBlockAggregation: unsupported building block type '${buildingBlockType}'. Only 'Page' is currently supported.`
+            `generateBuildingBlockAggregation: unsupported building block type '${buildingBlockType}'. Only 'Page' is currently supported.`
         );
     }
     const xmlDocument = getUI5XmlDocument(basePath, viewPath, fs);
diff --git a/packages/fe-fpm-writer/src/building-block/types.ts b/packages/fe-fpm-writer/src/building-block/types.ts
index 0f4560bdab8..3973c93bf5d 100644
--- a/packages/fe-fpm-writer/src/building-block/types.ts
+++ b/packages/fe-fpm-writer/src/building-block/types.ts
@@ -437,7 +437,7 @@ export type XmlAggregationGroup = { comments: Node[]; element: Element; original
 /**
  * Configuration for appending a named aggregation to an existing building block element in a view XML file.
  */
-export interface AppendBuildingBlockAggregationConfig {
+export interface GenerateBuildingBlockAggregationConfig {
     /** Path to the view XML file, relative to basePath. */
     viewPath: string;
     /** Type of the building block whose aggregation should be appended. Currently only 'Page' is supported. */
diff --git a/packages/fe-fpm-writer/src/index.ts b/packages/fe-fpm-writer/src/index.ts
index a812ff55d59..a0de68157b1 100644
--- a/packages/fe-fpm-writer/src/index.ts
+++ b/packages/fe-fpm-writer/src/index.ts
@@ -47,11 +47,11 @@ export type {
     PageTemplateType
 } from './building-block/types.js';
 export { PAGE_TEMPLATE_TYPE_FULL, PAGE_TEMPLATE_TYPE_BASIC, PAGE_AGGREGATIONS } from './building-block/types.js';
-export type { PageAggregationName, AppendBuildingBlockAggregationConfig } from './building-block/types.js';
+export type { PageAggregationName, GenerateBuildingBlockAggregationConfig } from './building-block/types.js';
 export {
     generateBuildingBlock,
     getSerializedFileContent,
-    appendBuildingBlockAggregation
+    generateBuildingBlockAggregation
 } from './building-block/index.js';
 export type {
     ChartPromptsAnswer,
diff --git a/packages/fe-fpm-writer/test/unit/building-block.test.ts b/packages/fe-fpm-writer/test/unit/building-block.test.ts
index 25926fd473d..fae252701ef 100644
--- a/packages/fe-fpm-writer/test/unit/building-block.test.ts
+++ b/packages/fe-fpm-writer/test/unit/building-block.test.ts
@@ -21,7 +21,7 @@ import {
     BuildingBlockType,
     generateBuildingBlock,
     getSerializedFileContent,
-    appendBuildingBlockAggregation
+    generateBuildingBlockAggregation
 } from '../../src/index.js';
 import { BUILDING_BLOCK_CONFIG } from '../../src/building-block/processor.js';
 import testManifestContent from './sample/building-block/webapp/manifest.json';
@@ -3841,7 +3841,7 @@ describe('Building Blocks', () => {
         });
     });
 
-    describe('appendBuildingBlockAggregation', () => {
+    describe('generateBuildingBlockAggregation', () => {
         const pageViewContent = `<mvc:View xmlns:core="sap.ui.core" xmlns:mvc="sap.ui.core.mvc" xmlns="sap.m"
     xmlns:macros="sap.fe.macros" controllerName="com.test.myApp.ext.main.Main">
     <macros:Page id="Page" title="pageTitle">
@@ -3852,7 +3852,7 @@ describe('Building Blocks', () => {
             const basePath = join(testAppPath, 'page-bb-agg');
             fs.write(join(basePath, xmlViewFilePath), pageViewContent);
 
-            const result = await appendBuildingBlockAggregation(
+            const result = await generateBuildingBlockAggregation(
                 basePath,
                 {
                     viewPath: xmlViewFilePath,
@@ -3878,7 +3878,7 @@ describe('Building Blocks', () => {
             fs.write(join(basePath, xmlViewFilePath), viewWithExistingId);
             findFilesByExtensionMock.mockResolvedValue([join(basePath, xmlViewFilePath)]);
 
-            const result = await appendBuildingBlockAggregation(
+            const result = await generateBuildingBlockAggregation(
                 basePath,
                 {
                     viewPath: xmlViewFilePath,
@@ -3907,7 +3907,7 @@ describe('Building Blocks', () => {
             fs.write(join(basePath, xmlViewFilePath), viewOutOfOrder);
 
             // Adding navigationActions (index 1) should trigger a full sort
-            const result = await appendBuildingBlockAggregation(
+            const result = await generateBuildingBlockAggregation(
                 basePath,
                 {
                     viewPath: xmlViewFilePath,
@@ -3930,7 +3930,7 @@ describe('Building Blocks', () => {
             const basePath = join(testAppPath, 'page-bb-agg-comment');
             fs.write(join(basePath, xmlViewFilePath), pageViewContent);
 
-            const result = await appendBuildingBlockAggregation(
+            const result = await generateBuildingBlockAggregation(
                 basePath,
                 {
                     viewPath: xmlViewFilePath,
@@ -3959,7 +3959,7 @@ describe('Building Blocks', () => {
 </mvc:View>`;
             fs.write(join(basePath, xmlViewFilePath), viewWithExisting);
 
-            const result = await appendBuildingBlockAggregation(
+            const result = await generateBuildingBlockAggregation(
                 basePath,
                 {
                     viewPath: xmlViewFilePath,
@@ -3987,7 +3987,7 @@ describe('Building Blocks', () => {
 </mvc:View>`;
             fs.write(join(basePath, xmlViewFilePath), viewWithComment);
 
-            const result = await appendBuildingBlockAggregation(
+            const result = await generateBuildingBlockAggregation(
                 basePath,
                 {
                     viewPath: xmlViewFilePath,