@sap/ux-specification 1.90.24 → 1.90.27

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

@@ -4,15 +4,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("./types");
+const i18next_1 = __importDefault(require("i18next"));
+const deepmerge_1 = __importDefault(require("deepmerge"));
+const v4_1 = require("../../specification/v4");
+const v2_1 = require("../../specification/v2");
+const types_2 = require("./types");
 const annotation_converter_1 = require("@sap-ux/annotation-converter");
 const edmx_parser_1 = require("@sap-ux/edmx-parser");
 const common_1 = require("../../specification/common");
 const schemaAccess_1 = require("../../specification/schemaAccess");
-const i18next_1 = __importDefault(require("i18next"));
-const v2_1 = require("../../specification/v2");
-const v4_1 = require("../../specification/v4");
 const extensionLogger_1 = require("../../extensionLogger");
-const deepmerge_1 = __importDefault(require("deepmerge"));
 var TemplateType;
 (function (TemplateType) {
     TemplateType["ListReportObjectPageV2"] = "ListReportObjectPageV2";
@@ -182,7 +183,7 @@ function getTitleForDataField(dataField, entityType, dataFieldLabel) {
  * @param dataFieldAbstract - the given record of the line item annotation
  * @param entityType - the entity type as part of the AVT ConverterOutput
  */
-function getDatafieldDescription(dataFieldAbstract, entityType) {
+function getDataFieldDescription(dataFieldAbstract, entityType) {
     let title = '', propertyCommonLabel, dataField;
     const dataFieldLabel = getLabel(dataFieldAbstract.Label, entityType);
     switch (dataFieldAbstract.$Type) {
@@ -227,7 +228,16 @@ function getDatafieldDescription(dataFieldAbstract, entityType) {
     }
     return title;
 }
-exports.getDatafieldDescription = getDatafieldDescription;
+exports.getDataFieldDescription = getDataFieldDescription;
+/**
+ * Prepare string for reference use in schema
+ * @param refInput string to be character checked and replaced
+ * @returns string with replaced characters
+ */
+function prepareRef(refInput) {
+    return refInput.replace('#', '::').replace(/\//g, ':2f');
+}
+exports.prepareRef = prepareRef;
 /**
  * Return the page type for a given V2 page in manifest
  * @param name - page component name
@@ -298,8 +308,7 @@ function determineTargetAnnotation(navigationParts, entityType, oDataServiceAVT)
  * @param navigationParts - parts of the target annotation path
  */
 function adjustKey(key, navigationParts, keyForRelatedFacetKeys) {
-    const uiParts = (navigationParts[1] || navigationParts[0]).split('#');
-    const uiClass = uiParts[0];
+    const uiClass = navigationParts[navigationParts.length - 1].split('#')[0];
     if (uiClass.includes('.LineItem')) {
         const pathParts = key.split('::');
         pathParts[pathParts.length - 1] = `${!keyForRelatedFacetKeys ? '@' : ''}${"com.sap.vocabularies.UI.v1.LineItem" /* LineItem */}`;
@@ -308,6 +317,33 @@ function adjustKey(key, navigationParts, keyForRelatedFacetKeys) {
     else {
         key = uiClass.replace('@UI', `${!keyForRelatedFacetKeys ? '@' : ''}com.sap.vocabularies.UI.v1`);
     }
+    return key;
+}
+function getKeyAndEntityTypeOfReferenceFacet(oDataServiceAVT, key, entityType, propertyValue, oDataVersion = common_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;
+    }
+    key = adjustKey(key, navigationParts, keyForRelatedFacetKeys);
+    const targetAnnotation = determineTargetAnnotation(navigationParts, entityType, oDataServiceAVT);
+    if (targetAnnotation) {
+        const separator = oDataVersion === common_1.FioriElementsVersion.v2 ? '::' : '#';
+        key = getTargetAnnotationName(targetAnnotation, keyForRelatedFacetKeys).replace('#', separator);
+    }
+    else {
+        stopProcessing = true;
+        return { key, entityType, stopProcessing };
+    }
+    if (navigation) {
+        const navSeparator = oDataVersion === common_1.FioriElementsVersion.v2 ? '::' : '/';
+        navigationParts.pop();
+        const navigationIDs = [...navigationParts].join(navSeparator);
+        key = `${navigationIDs}${navSeparator}${key}`;
+    }
+    return { key, entityType, stopProcessing };
 }
 /**
  * Resolve page section(get key and label->description).
@@ -319,9 +355,8 @@ function adjustKey(key, navigationParts, keyForRelatedFacetKeys) {
  * @returns {FacetSection} - object comprising the relevant facet information
  */
 function getSectionFacet(facetDefinition, sourceEntityType, oDataServiceAVT, logger, oDataVersion = common_1.FioriElementsVersion.v2, keyForRelatedFacetKeys = false) {
-    var _a;
     //Take facet ID as fallback
-    const facetName = facetDefinition.fullyQualifiedName.substr(facetDefinition.fullyQualifiedName.lastIndexOf('@'));
+    const facetName = facetDefinition.fullyQualifiedName.substring(facetDefinition.fullyQualifiedName.lastIndexOf('@'));
     let key = facetDefinition.ID ? facetDefinition.ID.toString() : facetName;
     let entityType = sourceEntityType; //default
     //If reference facet: overwrite with target annotation if present
@@ -334,24 +369,12 @@ function getSectionFacet(facetDefinition, sourceEntityType, oDataServiceAVT, log
             });
             return;
         }
-        const navigationParts = propertyValue.split('/');
-        const navigation = navigationParts.length > 1 ? navigationParts[0] : '';
-        if (navigation) {
-            entityType = (_a = sourceEntityType.resolvePath(navigation)) === null || _a === void 0 ? void 0 : _a.targetType;
-        }
-        adjustKey(key, navigationParts, keyForRelatedFacetKeys);
-        const targetAnnotation = determineTargetAnnotation(navigationParts, entityType, oDataServiceAVT);
-        if (targetAnnotation) {
-            const separator = oDataVersion === common_1.FioriElementsVersion.v2 ? '::' : '#';
-            key = getTargetAnnotationName(targetAnnotation, keyForRelatedFacetKeys).replace('#', separator);
-        }
-        else {
-            return undefined;
-        }
-        if (navigation) {
-            const navSeparator = oDataVersion === common_1.FioriElementsVersion.v2 ? '::' : '/';
-            key = `${navigation}${navSeparator}${key}`;
+        const { key: newKey, entityType: newEntityType, stopProcessing } = getKeyAndEntityTypeOfReferenceFacet(oDataServiceAVT, key, entityType, propertyValue, oDataVersion, keyForRelatedFacetKeys);
+        if (stopProcessing) {
+            return;
         }
+        key = newKey;
+        entityType = newEntityType;
     }
     key = key.replace(/\//gi, '::');
     return key
@@ -370,6 +393,9 @@ exports.getSectionFacet = getSectionFacet;
  * @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, importScenario = false) => {
+    if (!path) {
+        return undefined;
+    }
     let manifestSection = manifest;
     const pathElements = path.split('/');
     for (let index = 0; index < pathElements.length; index++) {
@@ -474,6 +500,9 @@ function getUIAnnotationTerm(path, alias, entityType) {
     else if (path.includes("com.sap.vocabularies.UI.v1.DataPoint" /* DataPoint */) || path.includes(alias + '.DataPoint')) {
         return "com.sap.vocabularies.UI.v1.DataPoint" /* DataPoint */;
     }
+    else if (path.includes("com.sap.vocabularies.UI.v1.PresentationVariant" /* PresentationVariant */) || path.includes(alias + '.PresentationVariant')) {
+        return "com.sap.vocabularies.UI.v1.PresentationVariant" /* PresentationVariant */;
+    }
     else {
         return undefined;
     }
@@ -516,15 +545,15 @@ function getAnnotationTerm(path, alias, entityType) {
  * @param {ExtensionLogger} logger - Logger class for logging messages
  */
 function evaluateTargetAnnotation(section, annotationRecord, facets, entityType, oDataServiceAVT, oDataVersion = common_1.FioriElementsVersion.v2, logger) {
-    var _a, _b, _c, _d, _e, _f, _g;
-    const alias = findAlias(types_1.UIVOCABULARY, oDataServiceAVT);
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    const alias = findAlias(types_2.UIVOCABULARY, oDataServiceAVT);
     let path = section ? section.key : '';
     const targetEntityType = section.entityType;
     const annotationTerm = getAnnotationTerm(path, alias, entityType);
     let annotation, targetAnnotation;
     switch (annotationTerm) {
         case "com.sap.vocabularies.UI.v1.Chart" /* Chart */: {
-            facets[path] = { base: types_1.FacetBase.Chart };
+            facets[path] = { base: types_2.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].entityType = targetEntityType;
             break;
@@ -532,7 +561,7 @@ function evaluateTargetAnnotation(section, annotationRecord, facets, entityType,
         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] = { base: types_2.FacetBase.Identification };
             facets[path].entityType = targetEntityType;
             facets[path].target = targetAnnotation;
             break;
@@ -543,42 +572,48 @@ function evaluateTargetAnnotation(section, annotationRecord, facets, entityType,
                 pathParts[pathParts.length - 1] = `@${"com.sap.vocabularies.UI.v1.LineItem" /* LineItem */}`;
                 path = pathParts.join('::');
             }
-            facets[path] = { base: types_1.FacetBase.LineItem };
+            facets[path] = { base: types_2.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].entityType = targetEntityType;
             break;
         }
         case "com.sap.vocabularies.UI.v1.FieldGroup" /* FieldGroup */: {
-            facets[path] = { base: types_1.FacetBase.Form };
+            facets[path] = { base: types_2.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].entityType = targetEntityType;
             break;
         }
         case "com.sap.vocabularies.UI.v1.DataPoint" /* DataPoint */: {
-            facets[path] = { base: types_1.FacetBase.DataPoint };
+            facets[path] = { base: types_2.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].entityType = targetEntityType;
             facets[path].Label = (_e = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _e === void 0 ? void 0 : _e.$target['Title'];
             break;
         }
-        case "com.sap.vocabularies.Communication.v1.Contact" /* Contact */: {
-            facets[path] = { base: types_1.FacetBase.Contact };
+        case "com.sap.vocabularies.UI.v1.PresentationVariant" /* PresentationVariant */: {
+            facets[path] = { base: types_2.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].entityType = targetEntityType;
             break;
         }
-        case "com.sap.vocabularies.Communication.v1.Address" /* Address */: {
-            facets[path] = { base: types_1.FacetBase.Address };
+        case "com.sap.vocabularies.Communication.v1.Contact" /* Contact */: {
+            facets[path] = { base: types_2.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].entityType = targetEntityType;
             break;
         }
+        case "com.sap.vocabularies.Communication.v1.Address" /* Address */: {
+            facets[path] = { base: types_2.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].entityType = targetEntityType;
+            break;
+        }
         default: {
-            facets[path] = { base: types_1.FacetBase.Unknown };
+            facets[path] = { base: types_2.FacetBase.Unknown };
         }
     }
     if (facets[path]) {
-        facets[path].annotationPath = `/${annotationRecord.fullyQualifiedName.replace('@com.sap.vocabularies', types_1.VOCWITHSLASH)}`;
+        facets[path].annotationPath = `/${annotationRecord.fullyQualifiedName.replace('@com.sap.vocabularies', types_2.VOCWITHSLASH)}`;
         if (annotationRecord.Label) {
             facets[path].Label = annotationRecord.Label;
         }
@@ -619,7 +654,7 @@ function addFacetToConfig(annotationRecord, oDataServiceAVT, serviceName, entity
             case "com.sap.vocabularies.UI.v1.CollectionFacet" /* CollectionFacet */: {
                 const annotationPath = `/${entityType.fullyQualifiedName}/${annotationRecord.fullyQualifiedName.split(entityType.fullyQualifiedName)[1]}`;
                 const facet = (facets[section.key] = {
-                    base: types_1.FacetBase.CollectionFacet,
+                    base: types_2.FacetBase.CollectionFacet,
                     facets: {},
                     ID: section.ID,
                     annotationPath: annotationPath,
@@ -645,7 +680,7 @@ function getObjectPageHeaderFacets(entityType, oDataServiceAVT, oDataVersion = c
     if (!entityType || !entityType.annotations) {
         return;
     }
-    const alias = findAlias(types_1.UIVOCABULARY, oDataServiceAVT);
+    const alias = findAlias(types_2.UIVOCABULARY, oDataServiceAVT);
     const facetAnnotation = alias && entityType.annotations[alias] && entityType.annotations[alias].HeaderFacets;
     if (facetAnnotation) {
         const lastDot = entityType.fullyQualifiedName.lastIndexOf('.');
@@ -670,7 +705,7 @@ function getObjectPageFacets(entityType, oDataServiceAVT, oDataVersion = common_
     if (!entityType || !entityType.annotations) {
         return;
     }
-    const alias = findAlias(types_1.UIVOCABULARY, oDataServiceAVT);
+    const alias = findAlias(types_2.UIVOCABULARY, oDataServiceAVT);
     const facetAnnotation = alias && entityType.annotations[alias] && entityType.annotations[alias].Facets;
     if (facetAnnotation) {
         const lastDot = entityType.fullyQualifiedName.lastIndexOf('.');
@@ -711,7 +746,7 @@ function determineV2Template(manifest, logger) {
                 severity: "error" /* Error */,
                 message: i18next_1.default.t('NOPAGES', { appId: manifest['sap.app']['id'] }),
                 location: {
-                    path: types_1.MANIFESTPATH,
+                    path: types_2.MANIFESTPATH,
                     range: [v4_1.ManifestSection.generic]
                 }
             });
@@ -735,7 +770,7 @@ function determineV2Template(manifest, logger) {
                 severity: "error" /* Error */,
                 message: i18next_1.default.t('NOTEMPLATE', { section: v4_1.ManifestSection.generic }),
                 location: {
-                    path: types_1.MANIFESTPATH,
+                    path: types_2.MANIFESTPATH,
                     range: [v4_1.ManifestSection.generic]
                 }
             });
@@ -760,7 +795,7 @@ function determineV4Template(manifest, logger) {
             severity: "error" /* Error */,
             message: i18next_1.default.t('NOPAGES', { appId: manifest['sap.app']['id'] }),
             location: {
-                path: types_1.MANIFESTPATH,
+                path: types_2.MANIFESTPATH,
                 range: [v4_1.ManifestSection.ui5, 'routing']
             }
         });
@@ -775,7 +810,7 @@ function determineV4Template(manifest, logger) {
         }
         else if (pageType === common_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];
-            if (viewPath && (viewPath[types_1.ALPViewType.Primary] || viewPath[types_1.ALPViewType.Secondary])) {
+            if (viewPath && (viewPath[types_2.ALPViewType.Primary] || viewPath[types_2.ALPViewType.Secondary])) {
                 templateType = TemplateType.AnalyticalListPageV4;
             }
             else {
@@ -793,7 +828,7 @@ function determineV4Template(manifest, logger) {
             severity: "error" /* Error */,
             message: i18next_1.default.t('NOTEMPLATE', { section: v4_1.ManifestSection.ui5 }),
             location: {
-                path: types_1.MANIFESTPATH,
+                path: types_2.MANIFESTPATH,
                 range: [v4_1.ManifestSection.ui5, 'routing', 'targets']
             }
         });
@@ -825,7 +860,7 @@ function getTemplateTypeFromManifest(manifest, fioriElementsVersion, logger) {
                 severity: "error" /* Error */,
                 message: i18next_1.default.t('NOFE'),
                 location: {
-                    path: types_1.MANIFESTPATH
+                    path: types_2.MANIFESTPATH
                 }
             });
         }
@@ -841,20 +876,20 @@ exports.getTemplateTypeFromManifest = getTemplateTypeFromManifest;
  */
 function addSectionTitleAndDescription(facet, section, facetKey) {
     if (facet === null || facet === void 0 ? void 0 : facet.ID) {
-        section['title'] = types_1.FacetTitlePrefix + facet.ID;
+        section.title = types_2.FacetTitlePrefix + facet.ID;
     }
     else {
-        section['title'] = facetKey.replace(/@com.sap/g, 'com.sap');
+        section.title = facetKey.replace(/@com.sap/g, 'com.sap');
     }
     // Description
     if (facet === null || facet === void 0 ? void 0 : facet.Label) {
-        section['description'] = facet.Label;
+        section.description = facet.Label;
     }
     else if (facet === null || facet === void 0 ? void 0 : facet.ID) {
-        section['description'] = facet.ID;
+        section.description = facet.ID;
     }
     else {
-        section['description'] = facetKey.substr(facetKey.lastIndexOf('.') + 1);
+        section.description = facetKey.substr(facetKey.lastIndexOf('.') + 1);
     }
 }
 exports.addSectionTitleAndDescription = addSectionTitleAndDescription;
@@ -868,10 +903,10 @@ function addTargetTitleAndSectionDescription(facet, section, facetKey) {
     var _a, _b, _c, _d;
     addSectionTitleAndDescription(facet, section, facetKey);
     if ((_a = facet === null || facet === void 0 ? void 0 : facet.target) === null || _a === void 0 ? void 0 : _a['Title']) {
-        section['description'] = (_b = facet === null || facet === void 0 ? void 0 : facet.target) === null || _b === void 0 ? void 0 : _b['Title'];
+        section.description = (_b = facet === null || facet === void 0 ? void 0 : facet.target) === null || _b === void 0 ? void 0 : _b['Title'];
     }
     else if ((_c = facet === null || facet === void 0 ? void 0 : facet.target) === null || _c === void 0 ? void 0 : _c['Description']) {
-        section['description'] = (_d = facet === null || facet === void 0 ? void 0 : facet.target) === null || _d === void 0 ? void 0 : _d['Description'];
+        section.description = (_d = facet === null || facet === void 0 ? void 0 : facet.target) === null || _d === void 0 ? void 0 : _d['Description'];
     }
 }
 exports.addTargetTitleAndSectionDescription = addTargetTitleAndSectionDescription;
@@ -880,21 +915,28 @@ exports.addTargetTitleAndSectionDescription = addTargetTitleAndSectionDescriptio
  * @param facet Facet configuration, to be analyzed
  * @returns the new section object
  */
-function createSectionWithoutProperties(facet, facetKey) {
+function createDefaultSection(appSchema, facet, facetKey) {
     if (!facet) {
         return undefined;
     }
-    const section = {
-        type: 'object',
-        properties: {},
-        additionalProperties: false,
-        annotationPath: facet.annotationPath,
-        isViewNode: true
-    };
+    let section;
+    if (appSchema.definitions.ObjectPageSection) {
+        //base type in V2, with properties
+        section = JSON.parse(JSON.stringify(appSchema.definitions.ObjectPageSection));
+    }
+    else {
+        section = {
+            type: 'object',
+            properties: {},
+            additionalProperties: false
+        };
+        section[types_1.SchemaTag.isViewNode] = true;
+    }
+    section[types_1.SchemaTag.annotationPath] = facet.annotationPath;
     addSectionTitleAndDescription(facet, section, facetKey);
     return section;
 }
-exports.createSectionWithoutProperties = createSectionWithoutProperties;
+exports.createDefaultSection = createDefaultSection;
 /**
  * Retrieve page section data(so far id/key and label/description).
  * @param {EntityType} entityType The actual entityType
@@ -905,7 +947,7 @@ exports.createSectionWithoutProperties = createSectionWithoutProperties;
  * @returns {FacetSection[]} - Array of facets or sections
  */
 function getObjectPageFacetSection(entityType, oDataServiceAVT, logger, oDataVersion = common_1.FioriElementsVersion.v2, checkUnresolvableFacets = false) {
-    const alias = findAlias(types_1.UIVOCABULARY, oDataServiceAVT);
+    const alias = findAlias(types_2.UIVOCABULARY, oDataServiceAVT);
     let sections = [];
     if (entityType) {
         const facetAnnotation = alias && entityType.annotations && entityType.annotations[alias] && entityType.annotations[alias].Facets;
@@ -933,6 +975,9 @@ exports.getObjectPageFacetSection = getObjectPageFacetSection;
  * @param targetAnnotationEncoded - encoded version of the target annotation, as represented in the manifest
  */
 exports.deleteEmptyStructure = (manifest, path, targetAnnotation, targetAnnotationEncoded) => {
+    if (!path) {
+        return;
+    }
     let manifestSection = manifest;
     const pathArray = path.split('/');
     pathArray.forEach(function (element) {
@@ -981,7 +1026,7 @@ exports.getSchemaFilePath = (schemaType, entitySet) => {
             // File name
             schemaFile.filename = `App`;
             // Full path
-            schemaFile.path = `./${types_1.DirName.Schemas}/${schemaFile.filename}`;
+            schemaFile.path = `./${types_2.DirName.Schemas}/${schemaFile.filename}`;
             break;
         }
         // List report and object page
@@ -990,7 +1035,7 @@ exports.getSchemaFilePath = (schemaType, entitySet) => {
             // File name
             schemaFile.filename = entitySet ? `${schemaType}_${entitySet}` : getGenericSchemaFileName(schemaType);
             // Full path
-            schemaFile.path = `../${types_1.DirName.Schemas}/${schemaFile.filename}`;
+            schemaFile.path = `../${types_2.DirName.Schemas}/${schemaFile.filename}`;
             break;
         }
         // Other page configs
@@ -998,7 +1043,7 @@ exports.getSchemaFilePath = (schemaType, entitySet) => {
             // File name
             schemaFile.filename = getGenericSchemaFileName(schemaType);
             // Full path
-            schemaFile.path = `../${types_1.DirName.Schemas}/${schemaFile.filename}`;
+            schemaFile.path = `../${types_2.DirName.Schemas}/${schemaFile.filename}`;
             break;
         }
     }
@@ -1010,11 +1055,10 @@ exports.getSchemaFilePath = (schemaType, entitySet) => {
  * @param appVersion - Fiori Elements version - V2 or V4.
  * @param pageType - Page type.
  * @param entitySet - Entity Set.
- * @param navigationProperty - Navigation property (optional).
  * @param viewId - Custom page's viewId (optional).
  * @returns {string} Generated page id
  */
-function generatePageId(pageType, entitySet, navigationProperty, viewId) {
+function generatePageId(pageType, entitySet, viewId) {
     if (pageType === common_1.PageType.CustomPage) {
         const names = viewId && viewId.split('.');
         return names && names[names.length - 1] + 'Page';
@@ -1027,6 +1071,18 @@ function generatePageId(pageType, entitySet, navigationProperty, viewId) {
     return parts.join('_');
 }
 exports.generatePageId = generatePageId;
+function fillArrayFromAnyOfReference(element, appSchema, currentConfigObject, definitionArray) {
+    const $ref = element.$ref;
+    if ($ref) {
+        const definitionKey = $ref.split(exports.DEFINITION_LINK_PREFIX)[1];
+        if (appSchema.definitions[definitionKey]) {
+            const controlProperty = appSchema.definitions[definitionKey]['controlProperty'];
+            if ($ref.includes(currentConfigObject[controlProperty])) {
+                definitionArray.push(definitionKey);
+            }
+        }
+    }
+}
 /**
  * Fills an array of next definitions from given references in the JSON schema
  * @param propertyDefinition - Definition of the current property in schema
@@ -1037,21 +1093,13 @@ exports.generatePageId = generatePageId;
  */
 function fillArrayFromPropertyDefinition(propertyDefinition, currentConfigObject, appSchema) {
     const definitionArray = [];
-    if (propertyDefinition['$ref']) {
-        definitionArray.push(propertyDefinition['$ref'].split(exports.DEFINITION_LINK_PREFIX)[1]);
+    if (propertyDefinition.$ref) {
+        definitionArray.push(propertyDefinition.$ref.split(exports.DEFINITION_LINK_PREFIX)[1]);
     }
-    else if (propertyDefinition['anyOf']) {
+    else if (propertyDefinition.anyOf) {
         if (currentConfigObject) {
-            propertyDefinition['anyOf'].forEach((element) => {
-                if (element.$ref) {
-                    const definitionKey = element.$ref.split(exports.DEFINITION_LINK_PREFIX)[1];
-                    if (appSchema['definitions'][definitionKey]) {
-                        const controlProperty = appSchema['definitions'][definitionKey]['controlProperty'];
-                        if (element.$ref.includes(currentConfigObject[controlProperty])) {
-                            definitionArray.push(definitionKey);
-                        }
-                    }
-                }
+            propertyDefinition.anyOf.forEach((element) => {
+                fillArrayFromAnyOfReference(element, appSchema, currentConfigObject, definitionArray);
             });
         }
         if (definitionArray.length === 0) {
@@ -1135,10 +1183,6 @@ function getNextTargetDefinition(appSchema, title, currentConfigObject, property
     return nextDefinition;
 }
 exports.getNextTargetDefinition = getNextTargetDefinition;
-function prepareRef(refInput) {
-    return refInput.replace('#', '::').replace(/\//g, ':2f');
-}
-exports.prepareRef = prepareRef;
 /**
  * Custom array merge function called by deepmerge's merge function
  *