@sap-ux/fe-fpm-writer 1.3.0 → 1.3.1

package/dist/building-block/index.js

@@ -13,7 +13,7 @@ import { getTemplatePath } from '../templates.js';
 import { CodeSnippetLanguage } from '../prompts/types.js';
 import { CONFIG, createIdGenerator, detectTabSpacing, extendJSON, getRelativeTemplateComponentPath } from '../common/file.js';
 import { getManifest, getManifestPath } from '../common/utils.js';
-import { getOrAddNamespace } from './prompts/utils/xml.js';
+import { getDOMParserOptions, getOrAddNamespace, TEMPLATE_NAMESPACES } from './prompts/utils/xml.js';
 import { i18nNamespaces, translate } from '../i18n.js';
 import { processBuildingBlock, resolveAggregationPath } from './processor.js';
 import { appendPageAggregations, ensureMissingAggregation, getPageAggregationNames, getUI5XmlDocument, validateFullPageTemplateVersion } from './processAggregation.js';
@@ -225,13 +225,10 @@ export async function getManifestContent(fs, library = 'sap.fe.macros') {
  */
 function getTemplateDocument(buildingBlockData, viewDocument, fs, manifest, templateConfig) {
     const templateContent = getTemplateContent(buildingBlockData, viewDocument, manifest, fs, undefined, templateConfig);
-    const errorHandler = (level, message) => {
-        throw new Error(`Unable to parse template file with building block data. Details: [${level}] - ${message}`);
-    };
     // Parse the rendered template content
     let templateDocument;
     try {
-        templateDocument = new DOMParser({ errorHandler }).parseFromString(templateContent, 'text/xml');
+        templateDocument = new DOMParser(getDOMParserOptions(TEMPLATE_NAMESPACES)).parseFromString(templateContent, 'text/xml');
     }
     catch (error) {
         throw new Error(`Unable to parse template file with building block data. Details: ${getErrorMessage(error)}`);
@@ -331,12 +328,11 @@ export async function getSerializedFileContent(basePath, config, fs) {
             new DOMParser().parseFromString('<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 snippetErrorHandler = (level, message) => {
-            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(snippetContent, 'text/xml');
+        const snippetDoc = new DOMParser(getDOMParserOptions(TEMPLATE_NAMESPACES, (level, message) => {
+            throw new Error(`Unable to parse Page building block snippet. Details: [${level}] - ${message}`);
+        })).parseFromString(snippetContent, 'text/xml');
         appendPageAggregations(fs, nsDoc, snippetDoc, fnGenerateId, pageAggNames, isFullPageTemplate(buildingBlockData));
         const resultNode = snippetDoc.documentElement;
         viewOrFragmentContent = resultNode ? format(new XMLSerializer().serializeToString(resultNode)) : content;

package/dist/building-block/processAggregation.js

@@ -12,7 +12,7 @@ import { getTemplatePath } from '../templates.js';
 import { createIdGenerator } from '../common/file.js';
 import { getErrorMessage } from '../common/validate.js';
 import { i18nNamespaces, translate } from '../i18n.js';
-import { getOrAddNamespace } from './prompts/utils/xml.js';
+import { getDOMParserOptions, getOrAddNamespace, TEMPLATE_NAMESPACES } from './prompts/utils/xml.js';
 import { resolveAggregationPath } from './processor.js';
 /**
  * Returns the UI5 xml file document (view/fragment).
@@ -30,12 +30,9 @@ export function getUI5XmlDocument(basePath, viewPath, fs) {
     catch (error) {
         throw new Error(`Unable to read xml view file. Details: ${getErrorMessage(error)}`);
     }
-    const errorHandler = (level, message) => {
-        throw new Error(`Unable to parse xml view file. Details: [${level}] - ${message}`);
-    };
     let viewDocument;
     try {
-        viewDocument = new DOMParser({ errorHandler }).parseFromString(viewContent, 'text/xml');
+        viewDocument = new DOMParser(getDOMParserOptions()).parseFromString(viewContent, 'text/xml');
     }
     catch (error) {
         throw new Error(`Unable to parse xml view file. Details: ${getErrorMessage(error)}`);
@@ -152,10 +149,9 @@ function buildPageAggregationFragment(fs, aggName, aggContext, fragMacrosNS, xml
         .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, message) => {
+    return new DOMParser(getDOMParserOptions(TEMPLATE_NAMESPACES, (level, message) => {
         throw new Error(`Unable to parse page aggregation fragment '${aggName}'. Details: [${level}] - ${message}`);
-    };
-    return new DOMParser({ errorHandler }).parseFromString(wrapped, 'text/xml');
+    })).parseFromString(wrapped, 'text/xml');
 }
 /**
  *

package/dist/building-block/prompts/utils/xml.d.ts

@@ -1,4 +1,19 @@
+import { type Options } from '@xmldom/xmldom';
 import type { Editor } from 'mem-fs-editor';
+/** Namespace map for `@xmldom/xmldom`: maps unprefixed elements to XHTML and `macros:*` to `sap.fe.macros`. */
+export declare const TEMPLATE_NAMESPACES: Record<string, string>;
+/** `Options` extended with `xmlns` and `onError` */
+type DOMParserOptions = Options & {
+    xmlns?: Record<string, string | null | undefined>;
+    onError?: (level: string, message: string) => void;
+};
+/**
+ * Builds a `DOMParser` options object.
+ *
+ * @param xmlns - Fallback prefix→URI map (use `TEMPLATE_NAMESPACES` for templates and UI5 view/fragment files).
+ * @param onError - Parse error handler. Defaults to throwing. Pass `() => {}` for a silent partial DOM.
+ */
+export declare function getDOMParserOptions(xmlns?: Record<string, string | null | undefined>, onError?: (level: string, message: string) => void): DOMParserOptions;
 /**
  * Converts the provided xpath string from `/mvc:View/Page/content` to
  * `/mvc:View/*[local-name()='Page']/*[local-name()='content']`.
@@ -45,4 +60,5 @@ export declare function getExistingButtonGroups(xmlFilePath: string, aggregation
  * @returns The prefix bound to the namespace URI ('' for default, or the prefix)
  */
 export declare function getOrAddNamespace(ui5XmlDocument: Document, namespaceUri?: string, prefix?: string): string;
+export {};
 //# sourceMappingURL=xml.d.ts.map

package/dist/building-block/prompts/utils/xml.js

@@ -1,6 +1,28 @@
 import { DOMParser } from '@xmldom/xmldom';
 import * as xpath from 'xpath';
 import { MACROS_NAMESPACE_URI } from '../../types.js';
+/** Namespace map for `@xmldom/xmldom`: maps unprefixed elements to XHTML and `macros:*` to `sap.fe.macros`. */
+export const TEMPLATE_NAMESPACES = {
+    '': 'http://www.w3.org/1999/xhtml',
+    'macros': 'sap.fe.macros'
+};
+/**
+ * Builds a `DOMParser` options object.
+ *
+ * @param xmlns - Fallback prefix→URI map (use `TEMPLATE_NAMESPACES` for templates and UI5 view/fragment files).
+ * @param onError - Parse error handler. Defaults to throwing. Pass `() => {}` for a silent partial DOM.
+ */
+export function getDOMParserOptions(xmlns, onError) {
+    const handler = onError ??
+        ((level, message) => {
+            throw new Error(`Unable to parse template file with building block data. Details: [${level}] - ${message}`);
+        });
+    return {
+        onError: handler,
+        errorHandler: handler,
+        xmlns
+    };
+}
 /**
  * Converts the provided xpath string from `/mvc:View/Page/content` to
  * `/mvc:View/*[local-name()='Page']/*[local-name()='content']`.
@@ -50,10 +72,7 @@ export function getXPathStringsForXmlFile(xmlFilePath, fs) {
     let pageMacroDefinition;
     try {
         const xmlContent = fs.read(xmlFilePath);
-        const errorHandler = (level, message) => {
-            throw new Error(`Unable to parse the xml view file. Details: [${level}] - ${message}`);
-        };
-        const xmlDocument = new DOMParser({ errorHandler }).parseFromString(xmlContent, 'text/xml');
+        const xmlDocument = new DOMParser(getDOMParserOptions()).parseFromString(xmlContent, 'text/xml');
         const nodes = [{ parentNode: '', node: xmlDocument.firstChild }];
         // check macros namespace and page macro definition
         const macrosNamespace = getOrAddNamespace(xmlDocument);
@@ -109,10 +128,7 @@ export async function getFilterBarIdsInFile(viewOrFragmentPath, fs) {
     const ids = [];
     const buildingBlockSelector = 'macros:FilterBar';
     const xmlContent = fs.read(viewOrFragmentPath);
-    const errorHandler = (level, message) => {
-        throw new Error(`Unable to parse the xml view file. Details: [${level}] - ${message}`);
-    };
-    const xmlDocument = new DOMParser({ errorHandler }).parseFromString(xmlContent, 'text/xml');
+    const xmlDocument = new DOMParser(getDOMParserOptions()).parseFromString(xmlContent, 'text/xml');
     const elements = Array.from(xmlDocument.getElementsByTagName(buildingBlockSelector));
     for (const element of elements) {
         const id = element.getAttributeNode('id')?.value;
@@ -134,10 +150,7 @@ export async function getExistingButtonGroups(xmlFilePath, aggregationPath, fs)
     const existingButtonGroups = new Set();
     try {
         const xmlContent = fs.read(xmlFilePath);
-        const errorHandler = (level, message) => {
-            throw new Error(`Unable to parse the xml view file. Details: [${level}] - ${message}`);
-        };
-        const xmlDocument = new DOMParser({ errorHandler }).parseFromString(xmlContent, 'text/xml');
+        const xmlDocument = new DOMParser(getDOMParserOptions()).parseFromString(xmlContent, 'text/xml');
         // Get namespace map and create xpath selector
         const nsMap = xmlDocument.firstChild?._nsMap || {};
         const xpathSelect = xpath.useNamespaces(nsMap);

package/dist/common/utils.js

@@ -5,6 +5,7 @@ import { getWebappPath } from '@sap-ux/project-access';
 import { getTemplatePath } from '../templates.js';
 import { copyTpl } from './file.js';
 import { DOMParser } from '@xmldom/xmldom';
+import { getDOMParserOptions } from '../building-block/prompts/utils/xml.js';
 /**
  * Method inserts passed text into content by char index position.
  * In case if position is out of range, then whitespaces would be created.
@@ -104,7 +105,7 @@ export async function getManifest(basePath, fs, validate = true) {
  */
 export function isElementIdAvailable(fs, viewOrFragmentPath, id) {
     const xmlContent = fs.read(viewOrFragmentPath).toString();
-    const xmlDocument = new DOMParser({ errorHandler: () => { } }).parseFromString(xmlContent, 'text/xml');
+    const xmlDocument = new DOMParser(getDOMParserOptions(undefined, () => { })).parseFromString(xmlContent, 'text/xml');
     return xmlDocument.documentElement ? !xmlDocument.getElementById(id) : true;
 }
 //# sourceMappingURL=utils.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/fe-fpm-writer",
   "description": "SAP Fiori elements flexible programming model writer",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -44,7 +44,7 @@
     "@types/mem-fs-editor": "7.0.1",
     "@types/semver": "7.7.1",
     "@types/vinyl": "2.0.12",
-    "@sap-ux/ui-prompting": "1.0.7"
+    "@sap-ux/ui-prompting": "1.0.8"
   },
   "engines": {
     "node": ">=22.x"