@sap-ux/fe-fpm-writer 0.27.1 → 0.27.3

package/dist/building-block/index.js

@@ -31,12 +31,13 @@ const mem_fs_1 = require("mem-fs");
 const mem_fs_editor_1 = require("mem-fs-editor");
 const ejs_1 = require("ejs");
 const path_1 = require("path");
+const types_1 = require("./types");
 const xmldom_1 = require("@xmldom/xmldom");
 const xpath = __importStar(require("xpath"));
 const xml_formatter_1 = __importDefault(require("xml-formatter"));
 const validate_1 = require("../common/validate");
 const templates_1 = require("../templates");
-const types_1 = require("../prompts/types");
+const types_2 = require("../prompts/types");
 const PLACEHOLDERS = {
     'id': 'REPLACE_WITH_BUILDING_BLOCK_ID',
     'entitySet': 'REPLACE_WITH_ENTITY',
@@ -111,22 +112,53 @@ function getOrAddMacrosNamespace(ui5XmlDocument) {
     return macrosNamespaceEntry ? macrosNamespaceEntry[0] : 'macros';
 }
 /**
- * Method converts object based metaPath to string.
+ * Method returns default values for metadata path.
  *
+ * @param {BuildingBlockType} type - building vlock type.
+ * @param {boolean} usePlaceholders - apply placeholder values if value for attribute/property is not provided
+ * @returns {MetadataPath} Default values for metadata path.
+ */
+function getDefaultMetaPath(type, usePlaceholders) {
+    if (type === types_1.BuildingBlockType.Chart) {
+        return {
+            metaPath: usePlaceholders ? `/${PLACEHOLDERS.qualifier}` : '',
+            contextPath: usePlaceholders ? PLACEHOLDERS.entitySet : ''
+        };
+    }
+    return {
+        metaPath: usePlaceholders ? `/${PLACEHOLDERS.entitySet}/${PLACEHOLDERS.qualifier}` : ''
+    };
+}
+/**
+ * Method converts object based metaPath to metadata path.
+ *
+ * @param {BuildingBlockType} type - building vlock type.
  * @param {BuildingBlockMetaPath} metaPath - object based metaPath.
  * @param {boolean} usePlaceholders - apply placeholder values if value for attribute/property is not provided
- * @returns {string} Resolved string metaPath.
+ * @returns {MetadataPath} Resolved metadata path information.
  */
-function getMetaPath(metaPath, usePlaceholders) {
+function getMetaPath(type, metaPath, usePlaceholders) {
     if (!metaPath) {
-        return usePlaceholders ? `/${PLACEHOLDERS.entitySet}/${PLACEHOLDERS.qualifier}` : '';
+        return getDefaultMetaPath(type, usePlaceholders);
     }
-    const { entitySet, qualifier, bindingContextType = 'absolute' } = metaPath;
+    const { entitySet, bindingContextType = 'absolute' } = metaPath;
+    let { qualifier } = metaPath;
     let entityPath = entitySet || (usePlaceholders ? PLACEHOLDERS.entitySet : '');
     const lastIndex = entityPath.lastIndexOf('.');
     entityPath = lastIndex >= 0 ? entityPath.substring?.(lastIndex + 1) : entityPath;
     const qualifierOrPlaceholder = qualifier || (usePlaceholders ? PLACEHOLDERS.qualifier : '');
-    return bindingContextType === 'absolute' ? `/${entityPath}/${qualifierOrPlaceholder}` : qualifierOrPlaceholder;
+    if (type === types_1.BuildingBlockType.Chart) {
+        // Special handling for chart - while runtime does not support approach without contextPath
+        const qualifierParts = qualifierOrPlaceholder.split('/');
+        qualifier = qualifierParts.pop();
+        return {
+            metaPath: qualifier,
+            contextPath: qualifierParts.length ? `/${entityPath}/${qualifierParts.join('/')}` : `/${entityPath}`
+        };
+    }
+    return {
+        metaPath: bindingContextType === 'absolute' ? `/${entityPath}/${qualifierOrPlaceholder}` : qualifierOrPlaceholder
+    };
 }
 /**
  * Returns the content of the xml file document.
@@ -142,8 +174,11 @@ function getTemplateContent(buildingBlockData, viewDocument, fs, usePlaceholders
     const templateFilePath = (0, templates_1.getTemplatePath)(`/building-block/${templateFolderName}/View.xml`);
     if (typeof buildingBlockData.metaPath === 'object' || buildingBlockData.metaPath === undefined) {
         // Convert object based metapath to string
-        const metaPath = getMetaPath(buildingBlockData.metaPath, usePlaceholders);
-        buildingBlockData = { ...buildingBlockData, metaPath };
+        const metadataPath = getMetaPath(buildingBlockData.buildingBlockType, buildingBlockData.metaPath, usePlaceholders);
+        buildingBlockData = { ...buildingBlockData, metaPath: metadataPath.metaPath };
+        if (!buildingBlockData.contextPath && metadataPath.contextPath) {
+            buildingBlockData.contextPath = metadataPath.contextPath;
+        }
     }
     // Apply placeholders
     if (!buildingBlockData.id) {
@@ -247,7 +282,7 @@ function getSerializedFileContent(basePath, config, fs) {
     return {
         viewOrFragmentPath: {
             content,
-            language: types_1.CodeSnippetLanguage.XML,
+            language: types_2.CodeSnippetLanguage.XML,
             filePathProps
         }
     };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/fe-fpm-writer",
   "description": "SAP Fiori elements flexible programming model writer",
-  "version": "0.27.1",
+  "version": "0.27.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -31,8 +31,8 @@
     "semver": "7.5.4",
     "xml-formatter": "2.6.1",
     "xpath": "0.0.33",
-    "@sap-ux/fiori-annotation-api": "0.1.35",
-    "@sap-ux/project-access": "1.26.6"
+    "@sap-ux/fiori-annotation-api": "0.1.36",
+    "@sap-ux/project-access": "1.26.7"
   },
   "devDependencies": {
     "@types/inquirer": "8.2.6",