@sap/ux-specification 1.90.12 → 1.90.16

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

@@ -41,9 +41,12 @@ var ControlType;
     ControlType["ObjectPageGridProperties"] = "sap.ui.layout.GridData";
     ControlType["ObjectPageHeader"] = "sap.uxap.ObjectPageHeader";
     ControlType["ObjectPageLayout"] = "sap.uxap.ObjectPageLayout";
+    ControlType["HeaderAction"] = "sap.uxap.ObjectPageHeaderActionButton";
     ControlType["DynamicPage"] = "sap.f.DynamicPage";
     ControlType["Form"] = "sap.ui.layout.form";
     ControlType["Chart"] = "sap.suite.ui.microchart";
+    ControlType["Section"] = "sap.uxap.ObjectPageSection";
+    ControlType["SubSection"] = "sap.uxap.ObjectPageSubSection";
 })(ControlType = exports.ControlType || (exports.ControlType = {}));
 var FacetBase;
 (function (FacetBase) {
@@ -72,6 +75,7 @@ exports.VOCWITHSLASH = '/@com.sap.vocabularies';
 exports.VOCWITHCOLONS = '::@com.sap.vocabularies';
 exports.UIVOCABULARY = 'com.sap.vocabularies.UI.v1';
 exports.QUICKVARPATH = '/quickVariantSelection';
+exports.QUICKVARPATHX = '/quickVariantSelectionX';
 exports.DATESETTINGSPATH = '/filterSettings/dateSettings';
 exports.TOOLBAR = 'ToolBar<LineItems>';
 exports.FRAGMENTNAMEPART = '.fragment.';

package/dist/src/sync/common/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/sync/common/types.ts"],"names":[],"mappings":";;AAIA,IAAY,eAGX;AAHD,WAAY,eAAe;IACvB,gCAAa,CAAA;IACb,wCAAqB,CAAA;AACzB,CAAC,EAHW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAG1B;AACD,IAAY,OAGX;AAHD,WAAY,OAAO;IACf,+BAAoB,CAAA;IACpB,0BAAe,CAAA;AACnB,CAAC,EAHW,OAAO,GAAP,eAAO,KAAP,eAAO,QAGlB;AACD,IAAY,QAEX;AAFD,WAAY,QAAQ;IAChB,4BAAgB,CAAA;AACpB,CAAC,EAFW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAEnB;AACY,QAAA,gBAAgB,GAAG,YAAY,CAAC;AAQ7C,IAAY,WAGX;AAHD,WAAY,WAAW;IACnB,kCAAmB,CAAA;IACnB,8CAA+B,CAAA;AACnC,CAAC,EAHW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAGtB;AAED,IAAY,YAIX;AAJD,WAAY,YAAY;IACpB,qCAAqB,CAAA;IACrB,yCAAyB,CAAA;IACzB,yCAAyB,CAAA;AAC7B,CAAC,EAJW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAIvB;AAED,IAAY,WAiBX;AAjBD,WAAY,WAAW;IACnB,oCAAqB,CAAA;IACrB,2CAA4B,CAAA;IAC5B,+DAAgD,CAAA;IAChD,2EAA4D,CAAA;IAC5D,+DAAgD,CAAA;IAChD,8DAA+C,CAAA;IAC/C,sCAAuB,CAAA;IACvB,4DAA6C,CAAA;IAC7C,sCAAuB,CAAA;IACvB,qFAAsE,CAAA;IACtE,kEAAmD,CAAA;IACnD,6DAA8C,CAAA;IAC9C,6DAA8C,CAAA;IAC9C,gDAAiC,CAAA;IACjC,0CAA2B,CAAA;IAC3B,gDAAiC,CAAA;AACrC,CAAC,EAjBW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAiBtB;AA2HD,IAAY,SAUX;AAVD,WAAY,SAAS;IACjB,kCAAqB,CAAA;IACrB,gDAAmC,CAAA;IACnC,4BAAe,CAAA;IACf,0BAAa,CAAA;IACb,8CAAiC,CAAA;IACjC,oCAAuB,CAAA;IACvB,gCAAmB,CAAA;IACnB,gCAAmB,CAAA;IACnB,yBAAY,CAAA;AAChB,CAAC,EAVW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAUpB;AAgDY,QAAA,4BAA4B,GAAG,6CAA6C,CAAC;AAE1F,IAAY,gBAMX;AAND,WAAY,gBAAgB;IACxB,uFAAmE,CAAA;IACnE,uFAAmE,CAAA;IACnE,2EAAuD,CAAA;IACvD,2EAAuD,CAAA;IACvD,mFAA+D,CAAA;AACnE,CAAC,EANW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAM3B;AAEY,QAAA,YAAY,GAAG,kCAAkC,CAAC;AAClD,QAAA,YAAY,GAAG,sBAAsB,CAAC;AACtC,QAAA,YAAY,GAAG,wBAAwB,CAAC;AACxC,QAAA,aAAa,GAAG,yBAAyB,CAAC;AAC1C,QAAA,YAAY,GAAG,4BAA4B,CAAC;AAC5C,QAAA,YAAY,GAAG,wBAAwB,CAAC;AACxC,QAAA,gBAAgB,GAAG,8BAA8B,CAAC;AAClD,QAAA,OAAO,GAAG,oBAAoB,CAAC;AAC/B,QAAA,gBAAgB,GAAG,YAAY,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/sync/common/types.ts"],"names":[],"mappings":";;AAIA,IAAY,eAGX;AAHD,WAAY,eAAe;IACvB,gCAAa,CAAA;IACb,wCAAqB,CAAA;AACzB,CAAC,EAHW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAG1B;AACD,IAAY,OAGX;AAHD,WAAY,OAAO;IACf,+BAAoB,CAAA;IACpB,0BAAe,CAAA;AACnB,CAAC,EAHW,OAAO,GAAP,eAAO,KAAP,eAAO,QAGlB;AACD,IAAY,QAEX;AAFD,WAAY,QAAQ;IAChB,4BAAgB,CAAA;AACpB,CAAC,EAFW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAEnB;AACY,QAAA,gBAAgB,GAAG,YAAY,CAAC;AAQ7C,IAAY,WAGX;AAHD,WAAY,WAAW;IACnB,kCAAmB,CAAA;IACnB,8CAA+B,CAAA;AACnC,CAAC,EAHW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAGtB;AAED,IAAY,YAIX;AAJD,WAAY,YAAY;IACpB,qCAAqB,CAAA;IACrB,yCAAyB,CAAA;IACzB,yCAAyB,CAAA;AAC7B,CAAC,EAJW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAIvB;AAED,IAAY,WAoBX;AApBD,WAAY,WAAW;IACnB,oCAAqB,CAAA;IACrB,2CAA4B,CAAA;IAC5B,+DAAgD,CAAA;IAChD,2EAA4D,CAAA;IAC5D,+DAAgD,CAAA;IAChD,8DAA+C,CAAA;IAC/C,sCAAuB,CAAA;IACvB,4DAA6C,CAAA;IAC7C,sCAAuB,CAAA;IACvB,qFAAsE,CAAA;IACtE,kEAAmD,CAAA;IACnD,6DAA8C,CAAA;IAC9C,6DAA8C,CAAA;IAC9C,qEAAsD,CAAA;IACtD,gDAAiC,CAAA;IACjC,0CAA2B,CAAA;IAC3B,gDAAiC,CAAA;IACjC,qDAAsC,CAAA;IACtC,2DAA4C,CAAA;AAChD,CAAC,EApBW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAoBtB;AA0HD,IAAY,SAUX;AAVD,WAAY,SAAS;IACjB,kCAAqB,CAAA;IACrB,gDAAmC,CAAA;IACnC,4BAAe,CAAA;IACf,0BAAa,CAAA;IACb,8CAAiC,CAAA;IACjC,oCAAuB,CAAA;IACvB,gCAAmB,CAAA;IACnB,gCAAmB,CAAA;IACnB,yBAAY,CAAA;AAChB,CAAC,EAVW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAUpB;AAgDY,QAAA,4BAA4B,GAAG,6CAA6C,CAAC;AAE1F,IAAY,gBAMX;AAND,WAAY,gBAAgB;IACxB,uFAAmE,CAAA;IACnE,uFAAmE,CAAA;IACnE,2EAAuD,CAAA;IACvD,2EAAuD,CAAA;IACvD,mFAA+D,CAAA;AACnE,CAAC,EANW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAM3B;AAEY,QAAA,YAAY,GAAG,kCAAkC,CAAC;AAClD,QAAA,YAAY,GAAG,sBAAsB,CAAC;AACtC,QAAA,YAAY,GAAG,wBAAwB,CAAC;AACxC,QAAA,aAAa,GAAG,yBAAyB,CAAC;AAC1C,QAAA,YAAY,GAAG,4BAA4B,CAAC;AAC5C,QAAA,YAAY,GAAG,wBAAwB,CAAC;AACxC,QAAA,aAAa,GAAG,yBAAyB,CAAC;AAC1C,QAAA,gBAAgB,GAAG,8BAA8B,CAAC;AAClD,QAAA,OAAO,GAAG,oBAAoB,CAAC;AAC/B,QAAA,gBAAgB,GAAG,YAAY,CAAC"}

package/dist/src/sync/common/utils.d.ts

@@ -1,5 +1,5 @@
 import { FacetConfigs, FileData, FacetConfig, FacetSection, SchemaFilePath } from './types';
-import { AnnotationTerm, CollectionFacet, ConverterOutput, LineItem, DataFieldAbstractTypes, EntityType, PropertyAnnotations, PropertyPath, ReferenceFacet, ReferenceURLFacet } from '@sap-ux/vocabularies-types';
+import { AnnotationTerm, CollectionFacet, ConverterOutput, DataFieldAbstractTypes, EntityType, PropertyAnnotations, PropertyPath, ReferenceFacet, ReferenceURLFacet } from '@sap-ux/vocabularies-types';
 import { FioriElementsVersion, Manifest, PageType, PageTypeV4 } from '../../specification/common';
 import { SchemaType } from '../../specification/schemaAccess';
 import { ExtensionLogger } from '../../apiTypes';
@@ -80,7 +80,7 @@ export declare function findAlias(namespace: string, oDataServiceAVT: ConverterO
  * @param {ExtensionLogger} logger - Logger class for logging messages
  * @returns {FacetSection} - object comprising the relevant facet information
  */
-export declare function getSectionFacet(facetDefinition: AnnotationTerm<CollectionFacet> | AnnotationTerm<ReferenceFacet> | AnnotationTerm<ReferenceURLFacet>, keyForRelatedFacetKeys: boolean, oDataVersion: FioriElementsVersion, sourceEntityType: EntityType, oDataServiceAVT: ConverterOutput, logger?: ExtensionLogger): FacetSection | undefined;
+export declare function getSectionFacet(facetDefinition: AnnotationTerm<CollectionFacet> | AnnotationTerm<ReferenceFacet> | AnnotationTerm<ReferenceURLFacet>, sourceEntityType: EntityType, oDataServiceAVT: ConverterOutput, logger?: ExtensionLogger, oDataVersion?: FioriElementsVersion, keyForRelatedFacetKeys?: boolean): FacetSection | undefined;
 /**
  * Finds the alias for a given namespace in the references' section of the converted service metadata
  * @param {object} exportResultManifest - manifest that is being modified during export
@@ -198,33 +198,7 @@ export declare type NextDefinition = {
  * @param pageType - page type
  */
 export declare function getNextTargetDefinition(appSchema: object, title: string, currentConfigObject: object, propertyDefinition: object, key: string, factory: MetadataInstanceInterface, pageType: PageType | PageTypeV4): NextDefinition;
-/**
- * Add schema definitions for fields of createWithParameterDialog
- * @param {object} appSchema - Application-specific schema, to be enhanced
- * @param {EntityType} entityType - Given entity type for which entries shall get generated.
- */
-export declare function addFieldsType(appSchema: object, entityType: EntityType): void;
-/**
- * Functions used both by V2 and V4 to add the common definitions for a line item to the app schema
- * @param appSchema - the app specific schema that shall get enhanced
- * @param lineItemAnnotation - the UI.LineItem annotation, comprising all records
- * @param entityType - the entity type as part of the AVT ConverterOutput
- * @param lineItemId - line item ID, as comprise in stable ID
- * @returns the actions definition plus the annotation path to the given line item
- */
-export declare function addCommonLineItemDefinitions(appSchema: object, lineItemAnnotation: AnnotationTerm<LineItem>, entityType: EntityType, lineItemId: string): {
-    actions: object;
-    lineItemPath: string;
-};
-/**
- * Method adds definition for 'RelatedFacetKeys' as enum with describtion and adds references to 'RelatedFacetKeys' for custom section definitions.
- * @param {object} schema App specific schema that potentially gets enhanced
- * @param {string[]>} sectionDefinitions array of section definitions which should be updated with new reference to 'RelatedFacetKeys' enum.
- * @param {FacetSection[]} facetSections Array of facet section objects which is used to generate enum values.
- * @param {Array<keyof Omit<FacetSection, 'custom'>>} idProperties Array of property names which should be looked up in 'FacetSection' object.
- *  Please note that method depends on order and takes first non empty value associated to passed properties.
- */
-export declare function addDefinitionForRelatedFacetKeys(schema: object, sectionDefinitions: string[], facetSections: FacetSection[], idProperties: Array<keyof Omit<FacetSection, 'custom'>>): void;
+export declare function prepareRef(refInput: string): string;
 /**
  * Custom array merge function called by deepmerge's merge function
  *

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

@@ -43,16 +43,18 @@ exports.createAnnotationPath = (entityTypeName, term, qualifier) => {
  */
 function parseAndMergeAndConvert(annotationFiles, logger) {
     const parseResult = [];
+    let converterOutput;
     try {
         if (annotationFiles) {
             annotationFiles.forEach(function (annotationData) {
                 parseResult.push(edmx_parser_1.parseEDMX(annotationData.fileContent, annotationData.dataSourceUri));
             });
         }
-        const converterOutput = annotation_converter_1.convertTypes(edmx_parser_1.merge(parseResult));
-        if (logger && converterOutput.diagnostics) {
-            for (let index = 0; index < converterOutput.diagnostics.length; index++) {
-                const converterMessage = converterOutput.diagnostics[index];
+        if (parseResult.length > 0) {
+            converterOutput = annotation_converter_1.convertTypes(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
@@ -84,11 +86,12 @@ function evaluateCommonLabel(annotations, entityType, label) {
         }
         else if (annotations.Common.Label['type'] === 'Path') {
             const targetProperty = entityType.resolvePath(annotations.Common.Label['path']);
-            label = targetProperty.value
-                ? targetProperty.value
-                : typeof ((_b = targetProperty.Common) === null || _b === void 0 ? void 0 : _b.Label) === 'string'
-                    ? targetProperty.annotations.Common.Label
-                    : label;
+            if (targetProperty.value) {
+                label = targetProperty.value;
+            }
+            else if (typeof ((_b = targetProperty.Common) === null || _b === void 0 ? void 0 : _b.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') {
             label = annotations.Common.Label.toString();
@@ -105,7 +108,9 @@ exports.evaluateCommonLabel = evaluateCommonLabel;
  */
 function getLabelForPropertyPath(propertyPath, entityType) {
     let label = propertyPath.value;
-    label = evaluateCommonLabel(propertyPath.$target.annotations, entityType, label);
+    if (propertyPath.$target) {
+        label = evaluateCommonLabel(propertyPath.$target.annotations, entityType, label);
+    }
     return label;
 }
 exports.getLabelForPropertyPath = getLabelForPropertyPath;
@@ -168,10 +173,9 @@ function getLabel(dataFieldLabel, entityType) {
 }
 function getTitleForDataField(dataField, entityType, dataFieldLabel) {
     const propertyCommonLabel = getLabelForDataField(dataField, entityType);
-    const title = dataFieldLabel ||
+    return (dataFieldLabel ||
         propertyCommonLabel ||
-        (dataField.Value.$target ? dataField.Value.$target.name : dataField.Value.value || dataField.Value.path);
-    return { title, propertyCommonLabel };
+        (dataField.Value.$target ? dataField.Value.$target.name : dataField.Value.value || dataField.Value.path));
 }
 /**
  * Determines the description of a data field, e.g. for the column header
@@ -184,7 +188,7 @@ function getDatafieldDescription(dataFieldAbstract, entityType) {
     switch (dataFieldAbstract.$Type) {
         case "com.sap.vocabularies.UI.v1.DataField" /* DataField */:
             dataField = dataFieldAbstract;
-            ({ title, propertyCommonLabel } = getTitleForDataField(dataField, entityType, dataFieldLabel));
+            title = getTitleForDataField(dataField, entityType, dataFieldLabel);
             break;
         case "com.sap.vocabularies.UI.v1.DataFieldWithUrl" /* DataFieldWithUrl */:
             dataField = dataFieldAbstract;
@@ -216,7 +220,7 @@ function getDatafieldDescription(dataFieldAbstract, entityType) {
             break;
         case "com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath" /* DataFieldWithNavigationPath */:
             dataField = dataFieldAbstract;
-            ({ title, propertyCommonLabel } = getTitleForDataField(dataField, entityType, dataFieldLabel));
+            title = getTitleForDataField(dataField, entityType, dataFieldLabel);
             break;
         default:
             break;
@@ -273,6 +277,38 @@ function findAlias(namespace, oDataServiceAVT) {
     return aliasReference === null || aliasReference === void 0 ? void 0 : aliasReference.alias;
 }
 exports.findAlias = findAlias;
+/**
+ * Determines the target annotation
+ * @param navigationParts - parts of the target annotation path
+ * @param entityType - entity type
+ * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
+ * @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];
+}
+/**
+ * Adjust key by considering navigation
+ * @param key - given key
+ * @param keyForRelatedFacetKeys - construct key for 'keyForRelatedFacetKeys' property(used to define custom sections) - we should not add '@' symbol there.
+ * @param navigationParts - parts of the target annotation path
+ */
+function adjustKey(key, navigationParts, keyForRelatedFacetKeys) {
+    const uiParts = (navigationParts[1] || navigationParts[0]).split('#');
+    const uiClass = uiParts[0];
+    if (uiClass.includes('.LineItem')) {
+        const pathParts = key.split('::');
+        pathParts[pathParts.length - 1] = `${!keyForRelatedFacetKeys ? '@' : ''}${"com.sap.vocabularies.UI.v1.LineItem" /* LineItem */}`;
+        key = pathParts.join('::');
+    }
+    else {
+        key = uiClass.replace('@UI', `${!keyForRelatedFacetKeys ? '@' : ''}com.sap.vocabularies.UI.v1`);
+    }
+}
 /**
  * Resolve page section(get key and label->description).
  * @param facetDefinition - the actual annotation record
@@ -282,46 +318,14 @@ exports.findAlias = findAlias;
  * @param {ExtensionLogger} logger - Logger class for logging messages
  * @returns {FacetSection} - object comprising the relevant facet information
  */
-function getSectionFacet(facetDefinition, keyForRelatedFacetKeys = false, oDataVersion = common_1.FioriElementsVersion.v2, sourceEntityType, oDataServiceAVT, logger) {
+function getSectionFacet(facetDefinition, sourceEntityType, oDataServiceAVT, logger, oDataVersion = common_1.FioriElementsVersion.v2, keyForRelatedFacetKeys = false) {
     var _a;
-    /**
-     * Determines the target annotation
-     * @param navigationParts - parts of the target annotation path
-     * @param entityType - entity type
-     * @returns the target annotation
-     */
-    function determineTargetAnnotation(navigationParts, entityType) {
-        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);
-        const targetAnnotation = (_a = entityType === null || entityType === void 0 ? void 0 : entityType.annotations[alias]) === null || _a === void 0 ? void 0 : _a[annotation];
-        return targetAnnotation;
-    }
-    /**
-     * Adjust key by considering navigation
-     * @param key - given key
-     * @param navigationParts - parts of the target annotation path
-     */
-    function adjustKey(key, navigationParts) {
-        const uiParts = (navigationParts[1] || navigationParts[0]).split('#');
-        const uiClass = uiParts[0];
-        if (uiClass.includes('.LineItem')) {
-            const pathParts = key.split('::');
-            pathParts[pathParts.length - 1] = `${!keyForRelatedFacetKeys ? '@' : ''}com.sap.vocabularies.UI.v1.LineItem`;
-            key = pathParts.join('::');
-        }
-        else {
-            key = uiClass.replace('@UI', `${!keyForRelatedFacetKeys ? '@' : ''}com.sap.vocabularies.UI.v1`);
-        }
-    }
-    //---------Main-------------------------------------------------------------------------------------------
     //Take facet ID as fallback
     const facetName = facetDefinition.fullyQualifiedName.substr(facetDefinition.fullyQualifiedName.lastIndexOf('@'));
     let key = facetDefinition.ID ? facetDefinition.ID.toString() : facetName;
     let entityType = sourceEntityType; //default
     //If reference facet: overwrite with target annotation if present
-    if (facetDefinition.$Type !== 'com.sap.vocabularies.UI.v1.CollectionFacet' && 'Target' in facetDefinition) {
+    if (facetDefinition.$Type !== "com.sap.vocabularies.UI.v1.CollectionFacet" /* CollectionFacet */ && 'Target' in facetDefinition) {
         const propertyValue = exports.getAnnotationPropertyValue(facetDefinition.Target);
         if (!propertyValue) {
             extensionLogger_1.log(logger, {
@@ -335,8 +339,8 @@ function getSectionFacet(facetDefinition, keyForRelatedFacetKeys = false, oDataV
         if (navigation) {
             entityType = (_a = sourceEntityType.resolvePath(navigation)) === null || _a === void 0 ? void 0 : _a.targetType;
         }
-        adjustKey(key, navigationParts);
-        const targetAnnotation = determineTargetAnnotation(navigationParts, entityType);
+        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);
@@ -443,58 +447,52 @@ exports.getSchemaKeyOfLineItemRecord = getSchemaKeyOfLineItemRecord;
  * @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;
+    var _a, _b, _c, _d, _e, _f;
     const alias = findAlias(types_1.UIVOCABULARY, oDataServiceAVT);
     let path = section ? section.key : '';
     const targetEntityType = section.entityType;
     let annotation, targetAnnotation;
-    let scope = alias;
-    if (path.includes('com.sap.vocabularies.UI.v1.Chart') || path.includes(alias + '.Chart')) {
+    if (path.includes("com.sap.vocabularies.UI.v1.Chart" /* Chart */) || path.includes(alias + '.Chart')) {
         facets[path] = { base: types_1.FacetBase.Chart };
-        facets[path]['entityType'] = targetEntityType;
+        facets[path].entityType = targetEntityType;
     }
-    else if (path.includes('com.sap.vocabularies.UI.v1.Identification') || path.includes(alias + '.Identification')) {
+    else if (path.includes("com.sap.vocabularies.UI.v1.Identification" /* Identification */) || path.includes(alias + '.Identification')) {
         annotation = path.split('.')[path.split('.').length - 1];
-        targetAnnotation = targetEntityType.annotations[scope][annotation];
+        targetAnnotation = targetEntityType.annotations[alias][annotation];
         facets[path] = { base: types_1.FacetBase.Identification };
-        facets[path]['entityType'] = targetEntityType;
-        facets[path]['target'] = targetAnnotation;
+        facets[path].entityType = targetEntityType;
+        facets[path].target = targetAnnotation;
     }
-    else if (entityType &&
-        (path.includes('com.sap.vocabularies.UI.v1.LineItem') || path.includes(alias + '.LineItem'))) {
-        if (path.includes('com.sap.vocabularies.UI.v1.LineItem')) {
-            scope = path.split('com.sap.vocabularies.')[1].split('.')[0];
-            annotation = path.split('com.sap.vocabularies.')[1].split('.')[2];
-        }
-        else if (path.includes('.LineItem')) {
-            annotation = 'LineItem';
+    else if (entityType && (path.includes("com.sap.vocabularies.UI.v1.LineItem" /* LineItem */) || path.includes(alias + '.LineItem'))) {
+        if (!path.includes("com.sap.vocabularies.UI.v1.LineItem" /* LineItem */) && path.includes('.LineItem')) {
             const pathParts = path.split('::');
-            pathParts[pathParts.length - 1] = '@com.sap.vocabularies.UI.v1.LineItem';
+            pathParts[pathParts.length - 1] = `@${"com.sap.vocabularies.UI.v1.LineItem" /* LineItem */}`;
             path = pathParts.join('::');
         }
         facets[path] = { base: types_1.FacetBase.LineItem };
-        facets[path]['lineItem'] = (_a = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _a === void 0 ? void 0 : _a.$target;
-        facets[path]['entityType'] = targetEntityType;
+        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;
     }
-    else if (path.includes('com.sap.vocabularies.UI.v1.FieldGroup') || path.includes(alias + '.FieldGroup')) {
+    else if (path.includes("com.sap.vocabularies.UI.v1.FieldGroup" /* FieldGroup */) || path.includes(alias + '.FieldGroup')) {
         facets[path] = { base: types_1.FacetBase.Form };
-        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;
+        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;
     }
-    else if (path.includes('com.sap.vocabularies.UI.v1.DataPoint') || path.includes(alias + '.DataPoint')) {
+    else if (path.includes("com.sap.vocabularies.UI.v1.DataPoint" /* DataPoint */) || path.includes(alias + '.DataPoint')) {
         facets[path] = { base: types_1.FacetBase.DataPoint };
         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;
+        facets[path].entityType = targetEntityType;
+        facets[path].Label = (_d = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _d === void 0 ? void 0 : _d.$target['Title'];
     }
     else if (path.includes('com.sap.vocabularies.Communication.v1.Contact') || path.includes(alias + '.Contact')) {
         facets[path] = { base: types_1.FacetBase.Contact };
-        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].target = (_e = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _e === void 0 ? void 0 : _e.$target;
+        facets[path].entityType = targetEntityType;
     }
     else if (path.includes('com.sap.vocabularies.Communication.v1.Address') || path.includes(alias + '.Address')) {
         facets[path] = { base: types_1.FacetBase.Address };
-        facets[path].target = (_e = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _e === void 0 ? void 0 : _e.$target;
-        facets[path]['entityType'] = targetEntityType;
+        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;
     }
     else {
         facets[path] = { base: types_1.FacetBase.Unknown };
@@ -531,7 +529,7 @@ function evaluateTargetAnnotation(section, annotationRecord, facets, entityType,
  */
 function addFacetToConfig(annotationRecord, oDataServiceAVT, serviceName, entityType, facets, oDataVersion = common_1.FioriElementsVersion.v2, logger) {
     var _a;
-    const section = getSectionFacet(annotationRecord, false, oDataVersion, entityType, oDataServiceAVT, logger);
+    const section = getSectionFacet(annotationRecord, entityType, oDataServiceAVT, logger, oDataVersion, false);
     if (section) {
         switch (annotationRecord.$Type) {
             case "com.sap.vocabularies.UI.v1.ReferenceFacet" /* ReferenceFacet */: {
@@ -808,7 +806,7 @@ function getObjectPageFacetSection(entityType, oDataServiceAVT, logger, oDataVer
                 if (checkUnresolvableFacets && !item['ID'] && !('Target' in item && item['Target'])) {
                     return result;
                 }
-                const section = getSectionFacet(item, true, oDataVersion, entityType, oDataServiceAVT, logger);
+                const section = getSectionFacet(item, entityType, oDataServiceAVT, logger, oDataVersion, true);
                 if (section) {
                     result.push(section);
                 }
@@ -967,6 +965,7 @@ 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;
     let nextDefinition = {
         configObject: undefined,
         targetDefinition: {},
@@ -975,7 +974,8 @@ function determineNextDefinitionFromDefinitionArray(definitionArray, appSchema,
     if (definitionArray.length) {
         const lastDefinition = definitionArray[definitionArray.length - 1];
         nextDefinition.targetDefinition = appSchema['definitions'][lastDefinition];
-        if (nextDefinition.targetDefinition['$ref'] || nextDefinition.targetDefinition['type'] === 'array') {
+        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') {
+            // eslint-disable-next-line @typescript-eslint/no-use-before-define
             nextDefinition = getNextTargetDefinition(appSchema, title, currentConfigObject, nextDefinition.targetDefinition, key, factory, pageType);
             return nextDefinition;
         }
@@ -986,12 +986,11 @@ function determineNextDefinitionFromDefinitionArray(definitionArray, appSchema,
                 }
             });
         }
-        nextDefinition.title =
-            nextDefinition.targetDefinition && nextDefinition.targetDefinition['title']
-                ? nextDefinition.targetDefinition['title']
-                : title;
-        const factoryKey = lastDefinition.split('<')[0];
-        nextDefinition.configObject = factory.createInstance(pageType, factoryKey, currentConfigObject, nextDefinition.targetDefinition['controlProperty']);
+        nextDefinition.title = ((_c = nextDefinition === null || nextDefinition === void 0 ? void 0 : nextDefinition.targetDefinition) === null || _c === void 0 ? void 0 : _c['title']) ? nextDefinition.targetDefinition['title']
+            : title;
+        const factoryKey = lastDefinition === null || lastDefinition === void 0 ? void 0 : lastDefinition.split('<')[0];
+        const targetObject = currentConfigObject ? currentConfigObject : {};
+        nextDefinition.configObject = factory.createInstance(pageType, factoryKey, targetObject, nextDefinition.targetDefinition['controlProperty']);
     }
     else {
         //e.g. sections ==> loop over all properties = subsections or other
@@ -1027,112 +1026,10 @@ function getNextTargetDefinition(appSchema, title, currentConfigObject, property
     return nextDefinition;
 }
 exports.getNextTargetDefinition = getNextTargetDefinition;
-/**
- * Add schema definitions for fields of createWithParameterDialog
- * @param {object} appSchema - Application-specific schema, to be enhanced
- * @param {EntityType} entityType - Given entity type for which entries shall get generated.
- */
-function addFieldsType(appSchema, entityType) {
-    const propertyNameArray = [], propertyObject = {};
-    for (let key = 0; key < entityType.entityProperties.length; key++) {
-        const propertyName = entityType.entityProperties[key].name;
-        propertyNameArray.push(propertyName);
-        propertyObject[propertyName] = {
-            $ref: exports.DEFINITION_LINK_PREFIX + 'FieldPath'
-        };
-    }
-    appSchema['definitions'][entityType.name] = {
-        enum: propertyNameArray
-    };
-    appSchema['definitions']['FieldPath'].properties.path = {
-        $ref: exports.DEFINITION_LINK_PREFIX + entityType.name
-    };
-    appSchema['definitions']['CreationFieldKeys'] = {
-        type: 'object',
-        properties: propertyObject,
-        additionalProperties: false
-    };
-    const fields4Dialog = appSchema['definitions']['Fields4Dialog'] || appSchema['definitions']['Fields4DialogOP'];
-    fields4Dialog.properties.fields = {
-        $ref: exports.DEFINITION_LINK_PREFIX + 'CreationFieldKeys'
-    };
-}
-exports.addFieldsType = addFieldsType;
-/**
- * Functions used both by V2 and V4 to add the common definitions for a line item to the app schema
- * @param appSchema - the app specific schema that shall get enhanced
- * @param lineItemAnnotation - the UI.LineItem annotation, comprising all records
- * @param entityType - the entity type as part of the AVT ConverterOutput
- * @param lineItemId - line item ID, as comprise in stable ID
- * @returns the actions definition plus the annotation path to the given line item
- */
-function addCommonLineItemDefinitions(appSchema, lineItemAnnotation, entityType, lineItemId) {
-    let lineItemPath;
-    appSchema['definitions'][lineItemId] = {
-        type: 'object',
-        properties: {},
-        additionalProperties: false,
-        isViewNode: true,
-        description: 'Columns'
-    };
-    //Copy toolbar
-    const toolBar = lineItemId === 'LineItems' ? 'ToolBar' : 'ObjectPageToolBar';
-    const schemaIdForToolBar = `${toolBar}<${lineItemId}>`;
-    appSchema['definitions'][schemaIdForToolBar] = JSON.parse(JSON.stringify(appSchema['definitions'][`${toolBar}`]));
-    appSchema['definitions'][schemaIdForToolBar].properties.actions.$ref =
-        exports.DEFINITION_LINK_PREFIX + 'Actions<' + lineItemId + '>';
-    const schemaIdForActions = `Actions<${lineItemId}>`;
-    const actionId = lineItemId === 'LineItems' ? 'Actions' : 'ObjectPageToolBarActions';
-    const actions = (appSchema['definitions'][schemaIdForActions] = JSON.parse(JSON.stringify(appSchema['definitions'][actionId])));
-    actions.properties = {};
-    actions.additionalProperties = false;
-    //Determine annotation path
-    if (lineItemAnnotation) {
-        lineItemPath = exports.createAnnotationPath(entityType.fullyQualifiedName, lineItemAnnotation.term, lineItemAnnotation.qualifier);
-        appSchema['definitions'][lineItemId].annotationPath = appSchema['definitions'][schemaIdForToolBar].annotationPath = lineItemPath;
-    }
-    return { actions, lineItemPath };
-}
-exports.addCommonLineItemDefinitions = addCommonLineItemDefinitions;
-/**
- * Method adds definition for 'RelatedFacetKeys' as enum with describtion and adds references to 'RelatedFacetKeys' for custom section definitions.
- * @param {object} schema App specific schema that potentially gets enhanced
- * @param {string[]>} sectionDefinitions array of section definitions which should be updated with new reference to 'RelatedFacetKeys' enum.
- * @param {FacetSection[]} facetSections Array of facet section objects which is used to generate enum values.
- * @param {Array<keyof Omit<FacetSection, 'custom'>>} idProperties Array of property names which should be looked up in 'FacetSection' object.
- *  Please note that method depends on order and takes first non empty value associated to passed properties.
- */
-function addDefinitionForRelatedFacetKeys(schema, sectionDefinitions, facetSections, idProperties) {
-    const oneOfSections = facetSections.map((section) => {
-        // Loop accaptable properties in received order and find first entry with value
-        const propertyName = idProperties.find((property) => !!section[property]);
-        const schemaIdForSection = section[propertyName];
-        return Object.assign(Object.assign({ const: schemaIdForSection }, (section.label && { description: section.label })), (section.custom && { custom: section.custom }));
-    });
-    // Change 'relatedFacet' only when we have entries for sections - otherwise use generic.
-    if (oneOfSections.length) {
-        // Create new definition in schema as 'oneOf'.
-        // Simpler way would be to use 'enum', but then there no option to pass description.
-        schema['definitions']['RelatedFacetKeys'] = {
-            type: 'string',
-            oneOf: oneOfSections
-        };
-        // Add enum definition
-        for (const name of sectionDefinitions) {
-            const definition = schema['definitions'][name];
-            const property = definition['properties']['relatedFacet'];
-            definition['properties']['relatedFacet'] = {
-                anyOf: [
-                    {
-                        $ref: exports.DEFINITION_LINK_PREFIX + 'RelatedFacetKeys'
-                    },
-                    property
-                ]
-            };
-        }
-    }
+function prepareRef(refInput) {
+    return refInput.replace('#', '::').replace(/\//g, '::');
 }
-exports.addDefinitionForRelatedFacetKeys = addDefinitionForRelatedFacetKeys;
+exports.prepareRef = prepareRef;
 /**
  * Custom array merge function called by deepmerge's merge function
  *