@sap/ux-specification 1.96.21 → 1.96.25

package/dist/src/sync/common/utils.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDefinitionKey = exports.convertActionKeyToStableId = exports.convertEnumToCSV = exports.arrayCombineMerge = exports.getNextTargetDefinition = exports.generatePageId = exports.getSchemaFilePath = exports.deleteEmptyStructure = exports.getObjectPageFacetSection = exports.createDefaultSection = exports.addTargetTitleAndSectionDescription = exports.addSectionTitleAndDescription = exports.getTemplateTypeFromManifest = exports.determineV4Template = exports.determineV2Template = exports.getVersionFromManifest = exports.getObjectPageFacets = exports.getObjectPageHeaderFacets = exports.getSchemaKeyOfLineItemRecord = exports.getManifestSectionByPathV4 = exports.getSectionFacet = exports.findAlias = exports.getPageTypeV4 = exports.getPageTypeV2 = exports.prepareRef = exports.getDataFieldDescription = exports.getLabelForDataField = exports.getLabelForPropertyPath = exports.evaluateCommonLabel = exports.getAnnotationPropertyValue = exports.parseAndMergeAndConvert = exports.createAnnotationPath = exports.DEFINITION_LINK_PREFIX = exports.TemplateType = void 0;
 const ux_specification_types_1 = require("@sap/ux-specification-types");
 const i18next_1 = __importDefault(require("i18next"));
 const deepmerge_1 = __importDefault(require("deepmerge"));
@@ -27,13 +28,14 @@ exports.DEFINITION_LINK_PREFIX = '#/definitions/';
  * @param qualifier - Annotation qualifier.
  * @returns Annotation path based on received params
  */
-exports.createAnnotationPath = (entityTypeName, term, qualifier) => {
+const createAnnotationPath = (entityTypeName, term, qualifier) => {
     let annotationPath = `/${entityTypeName}/@${term}`;
     if (qualifier) {
         annotationPath += `#${qualifier}`;
     }
     return annotationPath;
 };
+exports.createAnnotationPath = createAnnotationPath;
 /**
  * Parses, merges, and converts a list of annotation files with aid of tools from annotation-vocabularies-tools
  * @param annotationFiles - The list of all annotation files, in JSON format
@@ -51,14 +53,6 @@ function parseAndMergeAndConvert(annotationFiles, logger) {
         if (parseResult.length > 0) {
             converterOutput = annotation_converter_1.convert(edmx_parser_1.merge(...parseResult));
         }
-        if (logger && (converterOutput === null || converterOutput === void 0 ? void 0 : converterOutput.diagnostics)) {
-            for (const converterMessage of converterOutput.diagnostics) {
-                extensionLogger_1.log(logger, {
-                    severity: "error" /* Error */,
-                    message: converterMessage.message
-                });
-            }
-        }
     }
     catch (error) {
         extensionLogger_1.log(logger, {
@@ -69,7 +63,8 @@ function parseAndMergeAndConvert(annotationFiles, logger) {
     return converterOutput;
 }
 exports.parseAndMergeAndConvert = parseAndMergeAndConvert;
-exports.getAnnotationPropertyValue = (annotationProperty) => (annotationProperty === null || annotationProperty === void 0 ? void 0 : annotationProperty.value) || (annotationProperty === null || annotationProperty === void 0 ? void 0 : annotationProperty.path);
+const getAnnotationPropertyValue = (annotationProperty) => annotationProperty?.value || annotationProperty?.path;
+exports.getAnnotationPropertyValue = getAnnotationPropertyValue;
 /**
  * Checks for Common.Label and overwrites the label from it if present
  * @param {PropertyAnnotations} annotations - property annotations
@@ -77,8 +72,7 @@ exports.getAnnotationPropertyValue = (annotationProperty) => (annotationProperty
  * @param {string} label - label, to be actualized
  */
 function evaluateCommonLabel(annotations, entityType, label) {
-    var _a, _b, _c, _d;
-    if ((_a = annotations === null || annotations === void 0 ? void 0 : annotations.Common) === null || _a === void 0 ? void 0 : _a.Label) {
+    if (annotations?.Common?.Label) {
         if (typeof annotations.Common.Label === 'string') {
             label = annotations.Common.Label;
         }
@@ -87,11 +81,11 @@ function evaluateCommonLabel(annotations, entityType, label) {
             if (targetProperty.value) {
                 label = targetProperty.value;
             }
-            else if (typeof ((_b = targetProperty.Common) === null || _b === void 0 ? void 0 : _b.Label) === 'string') {
+            else if (typeof targetProperty.Common?.Label === 'string') {
                 label = targetProperty.annotations.Common.Label;
             }
         }
-        else if (typeof ((_d = (_c = annotations.Common) === null || _c === void 0 ? void 0 : _c.Label) === null || _d === void 0 ? void 0 : _d.toString()) === 'string') {
+        else if (typeof annotations.Common?.Label?.toString() === 'string') {
             label = annotations.Common.Label.toString();
         }
     }
@@ -119,7 +113,6 @@ exports.getLabelForPropertyPath = getLabelForPropertyPath;
  * @returns label, derived from Common.Label or from property value
  */
 function getLabelForDataField(field, entityType) {
-    var _a, _b;
     let label, property;
     if (field['Value']) {
         if (typeof field['Value'] === 'string') {
@@ -135,7 +128,7 @@ function getLabelForDataField(field, entityType) {
     else if (field['Target'] && field['Target'].$target && field['Target'].$target.Value) {
         property = field['Target'].$target.Value.$target;
     }
-    if ((_b = (_a = property === null || property === void 0 ? void 0 : property.annotations) === null || _a === void 0 ? void 0 : _a.Common) === null || _b === void 0 ? void 0 : _b.Label) {
+    if (property?.annotations?.Common?.Label) {
         label = evaluateCommonLabel(property.annotations, entityType, label);
     }
     return label;
@@ -148,7 +141,6 @@ exports.getLabelForDataField = getLabelForDataField;
  * @returns undefined or the right string value
  */
 function getLabel(dataFieldLabel, entityType) {
-    var _a, _b;
     if (typeof dataFieldLabel === 'string') {
         return dataFieldLabel;
     }
@@ -159,7 +151,7 @@ function getLabel(dataFieldLabel, entityType) {
         }
         else {
             const singleProperty = property[0];
-            if ((_b = (_a = singleProperty === null || singleProperty === void 0 ? void 0 : singleProperty.annotations) === null || _a === void 0 ? void 0 : _a.Common) === null || _b === void 0 ? void 0 : _b.Label) {
+            if (singleProperty?.annotations?.Common?.Label) {
                 const label = dataFieldLabel;
                 return evaluateCommonLabel(singleProperty.annotations, entityType, label);
             }
@@ -202,6 +194,7 @@ function getDataFieldDescription(dataFieldAbstract, entityType) {
             title = dataFieldLabel || propertyCommonLabel || dataField.Target.$target.Title || dataField.Target.value;
             break;
         case "com.sap.vocabularies.UI.v1.DataFieldForAction" /* DataFieldForAction */:
+        case "com.sap.vocabularies.UI.v1.DataFieldWithAction" /* DataFieldWithAction */:
         case "com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation" /* DataFieldForIntentBasedNavigation */:
             dataField = dataFieldAbstract;
             if (dataFieldLabel) {
@@ -251,13 +244,14 @@ exports.getPageTypeV2 = getPageTypeV2;
  * @param name - page component name
  */
 function getPageTypeV4(v4App) {
-    var _a;
     if (v4App.name && v4App.name !== ux_specification_types_1.v4.FE_TEMPLATE_V4_CUSTOM_PAGE) {
         const templatePart = `${ux_specification_types_1.v4.FE_TEMPLATE_V4}.`;
         return v4App.name.split(templatePart)[1];
     }
-    else if (((_a = v4App) === null || _a === void 0 ? void 0 : _a.name) === ux_specification_types_1.v4.FE_TEMPLATE_V4_CUSTOM_PAGE ||
-        v4App.viewId ||
+    else if (v4App?.name === ux_specification_types_1.v4.FE_TEMPLATE_V4_CUSTOM_PAGE) {
+        return ux_specification_types_1.PageTypeV4.FPMCustomPage;
+    }
+    else if (v4App.viewId ||
         v4App.viewName) {
         return ux_specification_types_1.PageTypeV4.CustomPage;
     }
@@ -274,7 +268,10 @@ function getTargetAnnotationName(targetAnnotation, keyForRelatedFacetKeys = fals
  * @returns alias for the given namespace
  */
 function findAlias(namespace, oDataServiceAVT) {
-    let aliasReference = oDataServiceAVT === null || oDataServiceAVT === void 0 ? void 0 : oDataServiceAVT.references.find((reference) => {
+    if (!oDataServiceAVT) {
+        return;
+    }
+    let aliasReference = oDataServiceAVT.references.find((reference) => {
         return reference.namespace === namespace;
     });
     if (!aliasReference) {
@@ -288,7 +285,7 @@ function findAlias(namespace, oDataServiceAVT) {
                 namespace.split('SAP__')[namespace.split('SAP__').length - 1].toUpperCase());
         });
     }
-    return aliasReference === null || aliasReference === void 0 ? void 0 : aliasReference.alias;
+    return aliasReference?.alias;
 }
 exports.findAlias = findAlias;
 /**
@@ -299,11 +296,10 @@ exports.findAlias = findAlias;
  * @returns the target annotation
  */
 function determineTargetAnnotation(navigationParts, entityType, oDataServiceAVT) {
-    var _a;
     const lastNavigationPart = navigationParts[navigationParts.length - 1];
     const annotation = lastNavigationPart.substring(lastNavigationPart.lastIndexOf('.') + 1, lastNavigationPart.length);
     const alias = findAlias(lastNavigationPart.substring(0, lastNavigationPart.lastIndexOf('.')).replace('@', ''), oDataServiceAVT);
-    return (_a = entityType === null || entityType === void 0 ? void 0 : entityType.annotations[alias]) === null || _a === void 0 ? void 0 : _a[annotation];
+    return entityType?.annotations[alias]?.[annotation];
 }
 /**
  * Adjust key by considering navigation
@@ -324,12 +320,11 @@ function adjustKey(key, navigationParts, keyForRelatedFacetKeys) {
     return key;
 }
 function getKeyAndEntityTypeOfReferenceFacet(oDataServiceAVT, key, entityType, propertyValue, oDataVersion = ux_specification_types_1.FioriElementsVersion.v2, keyForRelatedFacetKeys = false) {
-    var _a;
     let stopProcessing = false;
     const navigationParts = propertyValue.split('/');
     const navigation = navigationParts.length > 1;
     if (navigation) {
-        entityType = (_a = entityType.resolvePath(propertyValue.substring(0, propertyValue.lastIndexOf('/')))) === null || _a === void 0 ? void 0 : _a.targetType;
+        entityType = entityType.resolvePath(propertyValue.substring(0, propertyValue.lastIndexOf('/')))?.targetType;
     }
     key = adjustKey(key, navigationParts, keyForRelatedFacetKeys);
     const targetAnnotation = determineTargetAnnotation(navigationParts, entityType, oDataServiceAVT);
@@ -382,7 +377,13 @@ function getSectionFacet(facetDefinition, sourceEntityType, oDataServiceAVT, log
     }
     key = key.replace(/\//gi, '::');
     return key
-        ? Object.assign(Object.assign(Object.assign({ key }, (facetDefinition.Label && { label: facetDefinition.Label.toString() })), (facetDefinition.ID && { ID: facetDefinition.ID.toString() })), { entityType }) : undefined;
+        ? {
+            key,
+            ...(facetDefinition.Label && { label: facetDefinition.Label.toString() }),
+            ...(facetDefinition.ID && { ID: facetDefinition.ID.toString() }),
+            entityType
+        }
+        : undefined;
 }
 exports.getSectionFacet = getSectionFacet;
 /**
@@ -396,7 +397,7 @@ exports.getSectionFacet = getSectionFacet;
  * @param {boolean} importScenario - indicates if the function is called for the import, else it is the export
  * @returns returns section of the manifest based on path, generates an empty object in case it does not exists
  */
-exports.getManifestSectionByPathV4 = (manifest, path, targetAnnotation, targetAnnotationEncoded) => {
+const getManifestSectionByPathV4 = (manifest, path, targetAnnotation, targetAnnotationEncoded) => {
     if (!path) {
         return undefined;
     }
@@ -423,6 +424,7 @@ exports.getManifestSectionByPathV4 = (manifest, path, targetAnnotation, targetAn
     }
     return manifestSection;
 };
+exports.getManifestSectionByPathV4 = getManifestSectionByPathV4;
 function getSchemaKeyOfLineItemRecord(lineItemRecord) {
     let schemaKey, target, value;
     switch (lineItemRecord.$Type) {
@@ -539,7 +541,6 @@ function getAnnotationTerm(path, alias, entityType) {
  * @param {ExtensionLogger} logger - Logger class for logging messages
  */
 function evaluateTargetAnnotation(section, annotationRecord, facets, entityType, oDataServiceAVT, oDataVersion = ux_specification_types_1.FioriElementsVersion.v2, logger) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
     const alias = findAlias(types_1.UIVOCABULARY, oDataServiceAVT);
     let path = section ? section.key : '';
     const targetEntityType = section.entityType;
@@ -548,16 +549,15 @@ function evaluateTargetAnnotation(section, annotationRecord, facets, entityType,
     switch (annotationTerm) {
         case "com.sap.vocabularies.UI.v1.Chart" /* Chart */: {
             facets[path] = { base: types_1.FacetBase.Chart };
-            facets[path].target = (_a = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _a === void 0 ? void 0 : _a.$target;
+            facets[path].target = annotationRecord?.Target?.$target;
             facets[path].entityType = targetEntityType;
             break;
         }
         case "com.sap.vocabularies.UI.v1.Identification" /* Identification */: {
             annotation = path.split('.')[path.split('.').length - 1];
-            targetAnnotation = targetEntityType.annotations[alias][annotation];
             facets[path] = { base: types_1.FacetBase.Identification };
             facets[path].entityType = targetEntityType;
-            facets[path].target = targetAnnotation;
+            facets[path].target = annotationRecord?.Target?.$target;
             break;
         }
         case "com.sap.vocabularies.UI.v1.LineItem" /* LineItem */: {
@@ -567,38 +567,38 @@ function evaluateTargetAnnotation(section, annotationRecord, facets, entityType,
                 path = pathParts.join('::');
             }
             facets[path] = { base: types_1.FacetBase.LineItem };
-            facets[path].target = (_b = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _b === void 0 ? void 0 : _b.$target;
+            facets[path].target = annotationRecord?.Target?.$target;
             facets[path].entityType = targetEntityType;
             break;
         }
         case "com.sap.vocabularies.UI.v1.FieldGroup" /* FieldGroup */: {
             facets[path] = { base: types_1.FacetBase.Form };
-            facets[path].target = (_c = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _c === void 0 ? void 0 : _c.$target;
+            facets[path].target = annotationRecord?.Target?.$target;
             facets[path].entityType = targetEntityType;
             break;
         }
         case "com.sap.vocabularies.UI.v1.DataPoint" /* DataPoint */: {
             facets[path] = { base: types_1.FacetBase.DataPoint };
-            facets[path].target = (_d = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _d === void 0 ? void 0 : _d.$target;
+            facets[path].target = annotationRecord?.Target?.$target;
             facets[path].entityType = targetEntityType;
-            facets[path].Label = (_e = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _e === void 0 ? void 0 : _e.$target['Title'];
+            facets[path].Label = annotationRecord?.Target?.$target['Title'];
             break;
         }
         case "com.sap.vocabularies.UI.v1.PresentationVariant" /* PresentationVariant */: {
             facets[path] = { base: types_1.FacetBase.PresentationVariant };
-            facets[path].target = (_f = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _f === void 0 ? void 0 : _f.$target;
+            facets[path].target = annotationRecord?.Target?.$target;
             facets[path].entityType = targetEntityType;
             break;
         }
         case "com.sap.vocabularies.Communication.v1.Contact" /* Contact */: {
             facets[path] = { base: types_1.FacetBase.Contact };
-            facets[path].target = (_g = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _g === void 0 ? void 0 : _g.$target;
+            facets[path].target = annotationRecord?.Target?.$target;
             facets[path].entityType = targetEntityType;
             break;
         }
         case "com.sap.vocabularies.Communication.v1.Address" /* Address */: {
             facets[path] = { base: types_1.FacetBase.Address };
-            facets[path].target = (_h = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _h === void 0 ? void 0 : _h.$target;
+            facets[path].target = annotationRecord?.Target?.$target;
             facets[path].entityType = targetEntityType;
             break;
         }
@@ -637,7 +637,6 @@ function evaluateTargetAnnotation(section, annotationRecord, facets, entityType,
  * @param {ExtensionLogger} logger - Logger class for logging messages
  */
 function addFacetToConfig(annotationRecord, oDataServiceAVT, serviceName, entityType, facets, oDataVersion = ux_specification_types_1.FioriElementsVersion.v2, logger) {
-    var _a;
     const section = getSectionFacet(annotationRecord, entityType, oDataServiceAVT, logger, oDataVersion, false);
     if (section) {
         switch (annotationRecord.$Type) {
@@ -654,7 +653,7 @@ function addFacetToConfig(annotationRecord, oDataServiceAVT, serviceName, entity
                     annotationPath: annotationPath,
                     Label: section.label
                 });
-                (_a = annotationRecord.Facets) === null || _a === void 0 ? void 0 : _a.forEach((collectionItem) => {
+                annotationRecord.Facets?.forEach((collectionItem) => {
                     addFacetToConfig(collectionItem, oDataServiceAVT, serviceName, entityType, facet.facets, oDataVersion, logger);
                 });
                 break;
@@ -774,27 +773,12 @@ function determineV2Template(manifest, logger) {
 }
 exports.determineV2Template = determineV2Template;
 /**
- * Determines the template type of a V4 app
- * @param manifest - the manifest.json file
- * @param {ExtensionLogger} logger - Logger class for logging messages
- * @returns {TemplateType} the template type
+ * Determines the template type, based on the given manifest routing target entries of the app
+ * @param v4Pages - pages from routing targets
+ * @returns {TemplateType | undefined} the template type
  */
-function determineV4Template(manifest, logger) {
-    var _a, _b, _c, _d;
+function determineV4TemplateFromPages(v4Pages) {
     let templateType;
-    const v4Pages = manifest[ux_specification_types_1.ManifestSection.ui5].routing &&
-        manifest[ux_specification_types_1.ManifestSection.ui5].routing.targets;
-    if (!v4Pages) {
-        extensionLogger_1.log(logger, {
-            severity: "error" /* Error */,
-            message: i18next_1.default.t('NOPAGES', { appId: manifest['sap.app']['id'] }),
-            location: {
-                path: types_1.MANIFESTPATH,
-                range: [ux_specification_types_1.ManifestSection.ui5, 'routing']
-            }
-        });
-        return;
-    }
     for (const pageKey in v4Pages) {
         const v4Page = v4Pages[pageKey];
         const pageType = getPageTypeV4(v4Page);
@@ -803,7 +787,7 @@ function determineV4Template(manifest, logger) {
             break;
         }
         else if (pageType === ux_specification_types_1.PageTypeV4.ListReport) {
-            const viewPath = (_d = (_c = (_b = (_a = v4Page.options) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.views) === null || _c === void 0 ? void 0 : _c.paths) === null || _d === void 0 ? void 0 : _d[0];
+            const viewPath = v4Page.options?.settings?.views?.paths?.[0];
             if (viewPath && (viewPath[ux_specification_types_1.ALPViewType.Primary] || viewPath[ux_specification_types_1.ALPViewType.Secondary])) {
                 templateType = TemplateType.AnalyticalListPageV4;
             }
@@ -816,11 +800,36 @@ function determineV4Template(manifest, logger) {
             templateType = TemplateType.ListReportObjectPageV4;
             //fixed now for FEOP scenario, bit continue to check if LR/ALP exists
         }
-        else if (pageType === ux_specification_types_1.PageTypeV4.CustomPage) {
+        else if ([ux_specification_types_1.PageTypeV4.CustomPage, ux_specification_types_1.PageTypeV4.FPMCustomPage].includes(pageType)) {
             templateType = TemplateType.FreestylePageV4;
             break;
         }
     }
+    return templateType;
+}
+/**
+ * Determines the template type of a V4 app
+ * @param manifest - the manifest.json file
+ * @param {ExtensionLogger} logger - Logger class for logging messages
+ * @returns {TemplateType} the template type
+ */
+function determineV4Template(manifest, logger) {
+    const v4Pages = manifest[ux_specification_types_1.ManifestSection.ui5].routing &&
+        manifest[ux_specification_types_1.ManifestSection.ui5].routing.targets;
+    // if there are no pages in routing targets, we use LROPV4 as default template type
+    if (!v4Pages || Object.keys(v4Pages).length === 0) {
+        extensionLogger_1.log(logger, {
+            severity: "info" /* Info */,
+            message: i18next_1.default.t('NOPAGES', { appId: manifest['sap.app']['id'] }),
+            location: {
+                path: types_1.MANIFESTPATH,
+                range: [ux_specification_types_1.ManifestSection.ui5, 'routing']
+            }
+        });
+        return TemplateType.ListReportObjectPageV4;
+    }
+    // else try to determine template type from routing targets
+    const templateType = determineV4TemplateFromPages(v4Pages);
     if (!templateType) {
         extensionLogger_1.log(logger, {
             severity: "error" /* Error */,
@@ -873,17 +882,17 @@ exports.getTemplateTypeFromManifest = getTemplateTypeFromManifest;
  * @param facetKey - key of the facet
  */
 function addSectionTitleAndDescription(facet, section, facetKey) {
-    if (facet === null || facet === void 0 ? void 0 : facet.ID) {
+    if (facet?.ID) {
         section.title = types_1.FacetTitlePrefix + facet.ID;
     }
     else {
         section.title = facetKey.replace(/@com.sap/g, 'com.sap');
     }
     // Description
-    if (facet === null || facet === void 0 ? void 0 : facet.Label) {
+    if (facet?.Label) {
         section.description = facet.Label;
     }
-    else if (facet === null || facet === void 0 ? void 0 : facet.ID) {
+    else if (facet?.ID) {
         section.description = facet.ID;
     }
     else {
@@ -898,15 +907,14 @@ exports.addSectionTitleAndDescription = addSectionTitleAndDescription;
  * @param facetKey - key of the facet
  */
 function addTargetTitleAndSectionDescription(facet, section, facetKey) {
-    var _a;
     addSectionTitleAndDescription(facet, section, facetKey);
-    if (facet === null || facet === void 0 ? void 0 : facet.Label) {
-        section.description = facet === null || facet === void 0 ? void 0 : facet.Label;
+    if (facet?.Label) {
+        section.description = facet?.Label;
     }
-    else if (facet === null || facet === void 0 ? void 0 : facet['Title']) {
+    else if (facet?.['Title']) {
         section.description = facet['Title'];
     }
-    else if ((_a = facet === null || facet === void 0 ? void 0 : facet.target) === null || _a === void 0 ? void 0 : _a['Title']) {
+    else if (facet?.target?.['Title']) {
         section.description = facet.target['Title'];
     }
 }
@@ -975,7 +983,7 @@ exports.getObjectPageFacetSection = getObjectPageFacetSection;
  * @param targetAnnotation - target annotation (optional, in case of sections, subsections)
  * @param targetAnnotationEncoded - encoded version of the target annotation, as represented in the manifest
  */
-exports.deleteEmptyStructure = (manifest, path, targetAnnotation, targetAnnotationEncoded) => {
+const deleteEmptyStructure = (manifest, path, targetAnnotation, targetAnnotationEncoded) => {
     if (!path) {
         return;
     }
@@ -1002,6 +1010,7 @@ exports.deleteEmptyStructure = (manifest, path, targetAnnotation, targetAnnotati
         manifestSection = manifestSection && manifestSection[decodedElement];
     });
 };
+exports.deleteEmptyStructure = deleteEmptyStructure;
 /**
  * Method which returns generic schema file name.
  * @param {SchemaType | PageType} schemaType Schema type or Page type.
@@ -1019,7 +1028,7 @@ const getGenericSchemaFileName = (schemaType) => {
  * @param {string} [entitySet] Entity set string.
  * @return {SchemaFilePath} File path info.
  */
-exports.getSchemaFilePath = (schemaType, entitySet) => {
+const getSchemaFilePath = (schemaType, entitySet) => {
     const schemaFile = {
         filename: '',
         path: ''
@@ -1042,6 +1051,13 @@ exports.getSchemaFilePath = (schemaType, entitySet) => {
             schemaFile.path = `../${types_1.DirName.Schemas}/${schemaFile.filename}`;
             break;
         }
+        case ux_specification_types_1.PageTypeV4.FPMCustomPage: {
+            // File name
+            schemaFile.filename = getGenericSchemaFileName(ux_specification_types_1.PageTypeV4.CustomPage);
+            // Full path
+            schemaFile.path = `../${types_1.DirName.Schemas}/${schemaFile.filename}`;
+            break;
+        }
         // Other page configs
         default: {
             // File name
@@ -1054,6 +1070,7 @@ exports.getSchemaFilePath = (schemaType, entitySet) => {
     schemaFile.path += '.json';
     return schemaFile;
 };
+exports.getSchemaFilePath = getSchemaFilePath;
 /**
  * Method which generates id of page according to passed parameters.
  * @param appVersion - Fiori Elements version - V2 or V4.
@@ -1126,7 +1143,6 @@ function fillArrayFromPropertyDefinition(propertyDefinition, currentConfigObject
  * @returns {NextDefinition} - Next target definition to process
  */
 function determineNextDefinitionFromDefinitionArray(definitionArray, appSchema, title, currentConfigObject, key, factory, pageType, propertyDefinition) {
-    var _a, _b, _c, _d;
     let nextDefinition = {
         configObject: undefined,
         targetDefinition: {},
@@ -1135,7 +1151,7 @@ function determineNextDefinitionFromDefinitionArray(definitionArray, appSchema,
     if (definitionArray.length) {
         const lastDefinition = definitionArray[definitionArray.length - 1];
         nextDefinition.targetDefinition = appSchema['definitions'][lastDefinition];
-        if (((_a = nextDefinition === null || nextDefinition === void 0 ? void 0 : nextDefinition.targetDefinition) === null || _a === void 0 ? void 0 : _a['$ref']) || ((_b = nextDefinition === null || nextDefinition === void 0 ? void 0 : nextDefinition.targetDefinition) === null || _b === void 0 ? void 0 : _b['type']) === 'array') {
+        if (nextDefinition?.targetDefinition?.['$ref'] || nextDefinition?.targetDefinition?.['type'] === 'array') {
             // eslint-disable-next-line @typescript-eslint/no-use-before-define
             nextDefinition = getNextTargetDefinition(appSchema, title, currentConfigObject, nextDefinition.targetDefinition, key, factory, pageType);
             return nextDefinition;
@@ -1143,15 +1159,19 @@ function determineNextDefinitionFromDefinitionArray(definitionArray, appSchema,
         if (definitionArray.length > 1) {
             definitionArray.forEach((element) => {
                 if (element !== '') {
-                    nextDefinition.targetDefinition['properties'] = Object.assign(Object.assign({}, nextDefinition.targetDefinition['properties']), appSchema['definitions'][element]['properties']);
+                    nextDefinition.targetDefinition['properties'] = {
+                        ...nextDefinition.targetDefinition['properties'],
+                        ...appSchema['definitions'][element]['properties']
+                    };
                 }
             });
         }
-        nextDefinition.title = ((_c = nextDefinition === null || nextDefinition === void 0 ? void 0 : nextDefinition.targetDefinition) === null || _c === void 0 ? void 0 : _c['title']) ? nextDefinition.targetDefinition['title']
+        nextDefinition.title = nextDefinition?.targetDefinition?.['title']
+            ? nextDefinition.targetDefinition['title']
             : title;
-        const factoryKey = lastDefinition === null || lastDefinition === void 0 ? void 0 : lastDefinition.split('<')[0];
+        const factoryKey = lastDefinition?.split('<')[0];
         const targetObject = currentConfigObject ? currentConfigObject : {};
-        nextDefinition.configObject = factory.createInstance(pageType, factoryKey, targetObject, (_d = nextDefinition === null || nextDefinition === void 0 ? void 0 : nextDefinition.targetDefinition) === null || _d === void 0 ? void 0 : _d['controlProperty']);
+        nextDefinition.configObject = factory.createInstance(pageType, factoryKey, targetObject, nextDefinition?.targetDefinition?.['controlProperty']);
     }
     else {
         //e.g. sections ==> loop over all properties = subsections or other
@@ -1195,7 +1215,7 @@ exports.getNextTargetDefinition = getNextTargetDefinition;
  * @param {*} options options object provided by deepmerge's merge function
  * @returns
  */
-exports.arrayCombineMerge = (target, source, options) => {
+const arrayCombineMerge = (target, source, options) => {
     const destination = target.slice();
     source.forEach((item, index) => {
         if (typeof destination[index] === 'undefined') {
@@ -1210,6 +1230,7 @@ exports.arrayCombineMerge = (target, source, options) => {
     });
     return destination;
 };
+exports.arrayCombineMerge = arrayCombineMerge;
 /**
  * Converts an enum into a CSV
  * @param {object} manifestSection - manifestSection where the key exists