@sap/ux-specification 1.90.5 → 1.90.9

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

@@ -15,6 +15,17 @@ var FileName;
     FileName["App"] = "app.json";
 })(FileName = exports.FileName || (exports.FileName = {}));
 exports.FacetTitlePrefix = 'Facet ID: ';
+var SectionType;
+(function (SectionType) {
+    SectionType["Section"] = "Section";
+    SectionType["HeaderSection"] = "HeaderSection";
+})(SectionType = exports.SectionType || (exports.SectionType = {}));
+var ArtifactType;
+(function (ArtifactType) {
+    ArtifactType["Manifest"] = "Manifest";
+    ArtifactType["FlexChange"] = "FlexChange";
+    ArtifactType["Annotation"] = "Annotation";
+})(ArtifactType = exports.ArtifactType || (exports.ArtifactType = {}));
 var ControlType;
 (function (ControlType) {
     ControlType["Table"] = "sap.m.Table";
@@ -35,14 +46,17 @@ var ControlType;
 })(ControlType = exports.ControlType || (exports.ControlType = {}));
 var FacetBase;
 (function (FacetBase) {
-    FacetBase["LineItemFacet"] = "LineItemFacet";
+    FacetBase["LineItem"] = "LineItem";
     FacetBase["CollectionFacet"] = "CollectionFacet";
-    FacetBase["ChartFacet"] = "ChartFacet";
-    FacetBase["FormFacet"] = "FormFacet";
+    FacetBase["Chart"] = "Chart";
+    FacetBase["Form"] = "Form";
     FacetBase["Identification"] = "Identification";
+    FacetBase["DataPoint"] = "DataPoint";
+    FacetBase["Address"] = "Address";
+    FacetBase["Contact"] = "Contact";
     FacetBase["Unknown"] = "";
 })(FacetBase = exports.FacetBase || (exports.FacetBase = {}));
-exports.BindingPropertyRegexAsString = "^{[A-Za-z0-9{}&$@#!? _|,<>'()[\\]\\/:=.]+}$";
+exports.BindingPropertyRegexAsString = "^{[A-Za-z0-9{}&$!@#? _|,<>'()[\\]\\/:=.]+}$";
 var ViewTemplateType;
 (function (ViewTemplateType) {
     ViewTemplateType["ResponsiveTableColumnsExtension"] = "ResponsiveTableColumnsExtension";
@@ -51,4 +65,6 @@ var ViewTemplateType;
     ViewTemplateType["GridTableColumnsExtension"] = "GridTableColumnsExtension";
     ViewTemplateType["ResponsiveTableCellsExtension"] = "ResponsiveTableCellsExtension";
 })(ViewTemplateType = exports.ViewTemplateType || (exports.ViewTemplateType = {}));
+exports.METADATAPATH = 'webapp/localService/metadata.xml';
+exports.MANIFESTPATH = 'webapp/manifest.json';
 //# sourceMappingURL=types.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/sync/common/types.ts"],"names":[],"mappings":";;AAGA,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,WAgBX;AAhBD,WAAY,WAAW;IACnB,oCAAqB,CAAA;IACrB,2CAA4B,CAAA;IAC5B,+DAAgD,CAAA;IAChD,2EAA4D,CAAA;IAC5D,+DAAgD,CAAA;IAChD,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,EAhBW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAgBtB;AAyHD,IAAY,SAOX;AAPD,WAAY,SAAS;IACjB,4CAA+B,CAAA;IAC/B,gDAAmC,CAAA;IACnC,sCAAyB,CAAA;IACzB,oCAAuB,CAAA;IACvB,8CAAiC,CAAA;IACjC,yBAAY,CAAA;AAChB,CAAC,EAPW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAOpB;AA8CY,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"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/sync/common/types.ts"],"names":[],"mappings":";;AAGA,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,WAgBX;AAhBD,WAAY,WAAW;IACnB,oCAAqB,CAAA;IACrB,2CAA4B,CAAA;IAC5B,+DAAgD,CAAA;IAChD,2EAA4D,CAAA;IAC5D,+DAAgD,CAAA;IAChD,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,EAhBW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAgBtB;AA4HD,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"}

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

@@ -1,5 +1,5 @@
 import { FacetConfigs, FileData, FacetConfig, FacetSection, SchemaFilePath } from './types';
-import { AnnotationTerm, CollectionFacet, ConverterOutput, DataFieldAbstractTypes, EntityType, ReferenceFacet, ReferenceURLFacet } from '@sap-ux/vocabularies-types';
+import { AnnotationTerm, CollectionFacet, ConverterOutput, LineItem, 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';
@@ -13,7 +13,14 @@ export declare enum TemplateType {
     AnalyticalListPageV4 = "AnalyticalListPageV4"
 }
 export declare const DEFINITION_LINK_PREFIX = "#/definitions/";
-export declare function readFile(path: string): Promise<string>;
+/**
+ * Function returns annotation path for schema based on received params.
+ * @param entityTypeName - Entity type name.
+ * @param term - Annotation term.
+ * @param qualifier - Annotation qualifier.
+ * @returns Annotation path based on received params
+ */
+export declare const createAnnotationPath: (entityTypeName: string, term: string, qualifier?: string) => string;
 /**
  * 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
@@ -21,12 +28,33 @@ export declare function readFile(path: string): Promise<string>;
  */
 export declare function parseAndMergeAndConvert(annotationFiles: FileData[], logger: ExtensionLogger): ConverterOutput;
 export declare const getAnnotationPropertyValue: (annotationProperty: any) => string;
+/**
+ * Checks for Common.Label and overwrites the label from it if present
+ * @param {PropertyAnnotations} annotations - property annotations
+ * @param {EntityType} entityType - entity type
+ * @param {string} label - label, to be actualized
+ */
+export declare function evaluateCommonLabel(annotations: PropertyAnnotations, entityType: EntityType, label: string): string;
+/**
+ * Determines the label for a property path
+ * @param {PropertyPath} propertyPath - property path
+ * @param {EntityType} entityType - entity type
+ * @returns label, derived from Common.Label or from property value
+ */
+export declare function getLabelForPropertyPath(propertyPath: PropertyPath, entityType: EntityType): string;
+/**
+ * Determines the label for a LineItem record
+ * @param {DataFieldAbstractType} field - Line item record
+ * @param {EntityType} entityType - entity type
+ * @returns label, derived from Common.Label or from property value
+ */
+export declare function getLabelForDataField(field: DataFieldAbstractTypes, entityType: EntityType): string;
 /**
  * Determines the description of a data field, e.g. for the column header
- * @param dataField - the given record of the line item annotation
+ * @param dataFieldAbstract - the given record of the line item annotation
  * @param entityType - the entity type as part of the AVT ConverterOutput
  */
-export declare function getDatafieldDescription(dataField: DataFieldAbstractTypes, entityType: EntityType): string;
+export declare function getDatafieldDescription(dataFieldAbstract: DataFieldAbstractTypes, entityType: EntityType): string;
 /**
  * Return the page type for a given V2 page in manifest
  * @param name - page component name
@@ -37,24 +65,41 @@ export declare function getPageTypeV2(name: string): PageType;
  * @param name - page component name
  */
 export declare function getPageTypeV4(name: string): PageTypeV4;
+/**
+ * Finds the alias for a given namespace in the references' section of the converted service metadata
+ * @param {string} namespace - complete namespace, e.g. 'com.sap.vocabularies.UI.v1'
+ * @param {ConverterOutput} oDataServiceAVT - combined service metadata, as returned by annotation vocabularies tools
+ * @returns alias for the given namespace
+ */
+export declare function findAlias(namespace: string, oDataServiceAVT: ConverterOutput): string;
 /**
  * Resolve page section(get key and label->description).
  * @param facetDefinition - the actual annotation record
  * @param keyForRelatedFacetKeys - construct key for 'keyForRelatedFacetKeys' property(used to define custom sections) - we should not add '@' symbol there.
  * @param {FioriElementsVersion} oDataVersion - OData version
+ * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
  * @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, alias: string, logger?: ExtensionLogger): FacetSection | undefined;
-export declare const getManifestSectionByPathV4: (exportResultManifest: object, path: string, targetAnnotation?: string, targetAnnotationEncoded?: string) => object;
+export declare function getSectionFacet(facetDefinition: AnnotationTerm<CollectionFacet> | AnnotationTerm<ReferenceFacet> | AnnotationTerm<ReferenceURLFacet>, keyForRelatedFacetKeys: boolean, oDataVersion: FioriElementsVersion, sourceEntityType: EntityType, oDataServiceAVT: ConverterOutput, logger?: ExtensionLogger): FacetSection | undefined;
 /**
  * Finds the alias for a given namespace in the references' section of the converted service metadata
- * @param {string} namespace - complete namespace, e.g. 'com.sap.vocabularies.UI.v1'
- * @param {ConverterOutput} oDataServiceAVT - combined service metadata, as returned by annotation vocabularies tools
- * @returns alias for the given namespace
+ * @param {object} exportResultManifest - manifest that is being modified during export
+ * @param {string} path - path of the property in the manifest
+ * @param {string} targetAnnotation
+ * @param {string} targetAnnotationEncoded
+ * @returns returns section of the manifest based on path, generates an empty object in case it does not exists
  */
-export declare function findAlias(namespace: string, oDataServiceAVT: ConverterOutput): string;
+export declare const getManifestSectionByPathV4: (exportResultManifest: object, path: string, targetAnnotation?: string, targetAnnotationEncoded?: string) => object;
 export declare function getSchemaKeyOfLineItemRecord(lineItemRecord: DataFieldAbstractTypes): string;
+/**
+ * Retrieve header facet configurations that can be used to generate ObjectPage schemas
+ * @param {QualifiedName} entityTypeName - the name of the actual entity type
+ * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
+ * @param {FioriElementsVersion} oDataVersion - OData version
+ * @param {ExtensionLogger} logger - Logger class for logging messages
+ */
+export declare function getObjectPageHeaderFacets(entityType: EntityType, oDataServiceAVT: ConverterOutput, oDataVersion?: FioriElementsVersion, logger?: ExtensionLogger): FacetConfigs;
 /**
  * Retrieve facet configurations that can be used to generate ObjectPage schemas
  * @param {QualifiedName} entityTypeName - the name of the actual entity type
@@ -81,9 +126,10 @@ export declare function createSectionWithoutProperties(facet?: FacetConfig): obj
  * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
  * @param {ExtensionLogger} logger - Logger class for logging messages
  * @param {FioriElementsVersion} oDataVersion - OData version
+ * @param {boolean} [checkUnresolvableFacets=false] - Check and avoid facets and sections without ID and Target.
  * @returns {FacetSection[]} - Array of facets or sections
  */
-export declare function getObjectPageFacetSection(entityType: EntityType, oDataServiceAVT: ConverterOutput, logger?: ExtensionLogger, oDataVersion?: FioriElementsVersion): FacetSection[];
+export declare function getObjectPageFacetSection(entityType: EntityType, oDataServiceAVT: ConverterOutput, logger?: ExtensionLogger, oDataVersion?: FioriElementsVersion, checkUnresolvableFacets?: boolean): FacetSection[];
 /**
  * Cleans empty sub-structures from the export result for manifest
  * @param manifest - manifest.json part of the export result
@@ -121,14 +167,28 @@ export declare type NextDefinition = {
  * @param currentConfigObject - current part of the configuration that gets traversed
  * @param propertyDefinition - definition of a given property in the app schema
  * @param key - actual key
+ * @param factory - factory for creating metadata instances
+ * @param pageType - page type
  */
-export declare function getNextTargetDefinition(appSchema: object, title: string, currentConfigObject: object, propertyDefinition: object, key: string, factory: MetadataInstanceInterface, pageType: PageType): NextDefinition;
+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
@@ -147,11 +207,3 @@ export declare function addDefinitionForRelatedFacetKeys(schema: object, section
  * @returns
  */
 export declare const arrayCombineMerge: (target: any, source: any, options: any) => any;
-/**
- * Function returns annotation path for schema based on received params.
- * @param entityTypeName - Entity type name.
- * @param term - Annotation term.
- * @param qualifier - Annotation qualifier.
- * @returns Annotation path based on received params
- */
-export declare const createAnnotationPath: (entityTypeName: string, term: string, qualifier?: string) => string;

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

@@ -1,11 +1,4 @@
 "use strict";
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -15,8 +8,8 @@ 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 fs = __importStar(require("fs"));
 const i18next_1 = __importDefault(require("i18next"));
+const v4_1 = require("../../specification/v4");
 const extensionLogger_1 = require("../../extensionLogger");
 const deepmerge_1 = __importDefault(require("deepmerge"));
 var TemplateType;
@@ -29,19 +22,20 @@ var TemplateType;
     TemplateType["AnalyticalListPageV4"] = "AnalyticalListPageV4";
 })(TemplateType = exports.TemplateType || (exports.TemplateType = {}));
 exports.DEFINITION_LINK_PREFIX = '#/definitions/';
-async function readFile(path) {
-    return new Promise((resolve, reject) => {
-        fs.readFile(path, { encoding: 'utf8' }, (err, data) => {
-            if (err) {
-                reject(err);
-            }
-            else {
-                resolve(data);
-            }
-        });
-    });
-}
-exports.readFile = readFile;
+/**
+ * Function returns annotation path for schema based on received params.
+ * @param entityTypeName - Entity type name.
+ * @param term - Annotation term.
+ * @param qualifier - Annotation qualifier.
+ * @returns Annotation path based on received params
+ */
+exports.createAnnotationPath = (entityTypeName, term, qualifier) => {
+    let annotationPath = `/${entityTypeName}/@${term}`;
+    if (qualifier) {
+        annotationPath += `#${qualifier}`;
+    }
+    return annotationPath;
+};
 /**
  * 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
@@ -55,9 +49,6 @@ function parseAndMergeAndConvert(annotationFiles, logger) {
                 parseResult.push(edmx_parser_1.parseEDMX(annotationData.fileContent, annotationData.dataSourceUri));
             });
         }
-        if (parseResult.length === 0) {
-            return;
-        }
         const converterOutput = annotation_converter_1.convertTypes(edmx_parser_1.merge(parseResult));
         if (logger && converterOutput.diagnostics) {
             for (let index = 0; index < converterOutput.diagnostics.length; index++) {
@@ -80,11 +71,51 @@ function parseAndMergeAndConvert(annotationFiles, logger) {
 exports.parseAndMergeAndConvert = parseAndMergeAndConvert;
 exports.getAnnotationPropertyValue = (annotationProperty) => (annotationProperty === null || annotationProperty === void 0 ? void 0 : annotationProperty.value) || (annotationProperty === null || annotationProperty === void 0 ? void 0 : annotationProperty.path);
 /**
- * Common function determining the label for a LineItem record
+ * Checks for Common.Label and overwrites the label from it if present
+ * @param {PropertyAnnotations} annotations - property annotations
+ * @param {EntityType} entityType - entity type
+ * @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 (typeof annotations.Common.Label === 'string') {
+            label = annotations.Common.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;
+        }
+        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();
+        }
+    }
+    return label;
+}
+exports.evaluateCommonLabel = evaluateCommonLabel;
+/**
+ * Determines the label for a property path
+ * @param {PropertyPath} propertyPath - property path
+ * @param {EntityType} entityType - entity type
+ * @returns label, derived from Common.Label or from property value
+ */
+function getLabelForPropertyPath(propertyPath, entityType) {
+    let label = propertyPath.value;
+    label = evaluateCommonLabel(propertyPath.$target.annotations, entityType, label);
+    return label;
+}
+exports.getLabelForPropertyPath = getLabelForPropertyPath;
+/**
+ * Determines the label for a LineItem record
  * @param {DataFieldAbstractType} field - Line item record
- * @param {EntityType} entityType - Entity type
+ * @param {EntityType} entityType - entity type
+ * @returns label, derived from Common.Label or from property value
  */
-function getCommonLabel(field, entityType) {
+function getLabelForDataField(field, entityType) {
     var _a, _b;
     let label, property;
     if (field['Value']) {
@@ -102,10 +133,11 @@ function getCommonLabel(field, entityType) {
         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) {
-        label = property.annotations.Common.Label.toString();
+        label = evaluateCommonLabel(property.annotations, entityType, label);
     }
     return label;
 }
+exports.getLabelForDataField = getLabelForDataField;
 /**
  * Function to resolve the dataField label
  * @param dataFieldLabel - Given dataField label; might be of type string, or an object in case of a path reference
@@ -125,7 +157,8 @@ 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) {
-                return singleProperty.annotations.Common.Label.toString();
+                const label = dataFieldLabel;
+                return evaluateCommonLabel(singleProperty.annotations, entityType, label);
             }
         }
     }
@@ -135,15 +168,16 @@ function getLabel(dataFieldLabel, entityType) {
 }
 /**
  * Determines the description of a data field, e.g. for the column header
- * @param dataField - the given record of the line item annotation
+ * @param dataFieldAbstract - the given record of the line item annotation
  * @param entityType - the entity type as part of the AVT ConverterOutput
  */
-function getDatafieldDescription(dataField, entityType) {
-    let title = '', propertyCommonLabel;
-    const dataFieldLabel = getLabel(dataField.Label, entityType);
-    switch (dataField.$Type) {
+function getDatafieldDescription(dataFieldAbstract, entityType) {
+    let title = '', propertyCommonLabel, dataField;
+    const dataFieldLabel = getLabel(dataFieldAbstract.Label, entityType);
+    switch (dataFieldAbstract.$Type) {
         case "com.sap.vocabularies.UI.v1.DataField" /* DataField */:
-            propertyCommonLabel = getCommonLabel(dataField, entityType);
+            dataField = dataFieldAbstract;
+            propertyCommonLabel = getLabelForDataField(dataFieldAbstract, entityType);
             title =
                 dataFieldLabel ||
                     propertyCommonLabel ||
@@ -152,31 +186,36 @@ function getDatafieldDescription(dataField, entityType) {
                         : dataField.Value.value || dataField.Value.path);
             break;
         case "com.sap.vocabularies.UI.v1.DataFieldWithUrl" /* DataFieldWithUrl */:
-            propertyCommonLabel = getCommonLabel(dataField, entityType);
+            dataField = dataFieldAbstract;
+            propertyCommonLabel = getLabelForDataField(dataFieldAbstract, entityType);
             title =
                 dataFieldLabel ||
                     propertyCommonLabel ||
                     (typeof dataField.Value === 'string' ? dataField.Value : dataField.Value.path);
             break;
         case "com.sap.vocabularies.UI.v1.DataFieldForAnnotation" /* DataFieldForAnnotation */:
-            propertyCommonLabel = getCommonLabel(dataField, entityType);
+            dataField = dataFieldAbstract;
+            propertyCommonLabel = getLabelForDataField(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.DataFieldForIntentBasedNavigation" /* DataFieldForIntentBasedNavigation */:
+            dataField = dataFieldAbstract;
             if (dataFieldLabel) {
                 title = typeof dataFieldLabel === 'string' ? dataFieldLabel : dataField.Action;
             }
             else {
-                title = dataField.Action;
+                title = dataFieldAbstract.Action;
             }
             break;
         case "com.sap.vocabularies.UI.v1.DataFieldWithIntentBasedNavigation" /* DataFieldWithIntentBasedNavigation */:
-            propertyCommonLabel = getCommonLabel(dataField, entityType);
+            dataField = dataFieldAbstract;
+            propertyCommonLabel = getLabelForDataField(dataFieldAbstract, entityType);
             title = propertyCommonLabel || dataField.Value.path;
             break;
         case "com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath" /* DataFieldWithNavigationPath */:
-            propertyCommonLabel = getCommonLabel(dataField, entityType);
+            dataField = dataFieldAbstract;
+            propertyCommonLabel = getLabelForDataField(dataFieldAbstract, entityType);
             title =
                 dataFieldLabel ||
                     propertyCommonLabel ||
@@ -213,15 +252,40 @@ exports.getPageTypeV4 = getPageTypeV4;
 function getTargetAnnotationName(targetAnnotation, keyForRelatedFacetKeys = false) {
     return `${!keyForRelatedFacetKeys ? '@' : ''}${targetAnnotation.qualifier ? targetAnnotation.term + '#' + targetAnnotation.qualifier : targetAnnotation.term}`;
 }
+/**
+ * Finds the alias for a given namespace in the references' section of the converted service metadata
+ * @param {string} namespace - complete namespace, e.g. 'com.sap.vocabularies.UI.v1'
+ * @param {ConverterOutput} oDataServiceAVT - combined service metadata, as returned by annotation vocabularies tools
+ * @returns alias for the given namespace
+ */
+function findAlias(namespace, oDataServiceAVT) {
+    let aliasReference = oDataServiceAVT.references.find((reference) => {
+        return reference.namespace === namespace;
+    });
+    if (!aliasReference) {
+        aliasReference = oDataServiceAVT.references.find((reference) => {
+            return reference.alias === namespace;
+        });
+    }
+    if (!aliasReference) {
+        aliasReference = oDataServiceAVT.references.find((reference) => {
+            return (reference.alias.toUpperCase() ===
+                namespace.split('SAP__')[namespace.split('SAP__').length - 1].toUpperCase());
+        });
+    }
+    return aliasReference === null || aliasReference === void 0 ? void 0 : aliasReference.alias;
+}
+exports.findAlias = findAlias;
 /**
  * Resolve page section(get key and label->description).
  * @param facetDefinition - the actual annotation record
  * @param keyForRelatedFacetKeys - construct key for 'keyForRelatedFacetKeys' property(used to define custom sections) - we should not add '@' symbol there.
  * @param {FioriElementsVersion} oDataVersion - OData version
+ * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
  * @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, alias, logger) {
+function getSectionFacet(facetDefinition, keyForRelatedFacetKeys = false, oDataVersion = common_1.FioriElementsVersion.v2, sourceEntityType, oDataServiceAVT, logger) {
     var _a, _b;
     let entityType = sourceEntityType; //default
     const facetName = facetDefinition.fullyQualifiedName.substr(facetDefinition.fullyQualifiedName.lastIndexOf('@'));
@@ -254,7 +318,9 @@ function getSectionFacet(facetDefinition, keyForRelatedFacetKeys = false, oDataV
         else {
             key = uiClass.replace('@UI', `${!keyForRelatedFacetKeys ? '@' : ''}com.sap.vocabularies.UI.v1`);
         }
-        const annotation = propertyValue.split('.')[propertyValue.split('.').length - 1];
+        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 = (_b = entityType === null || entityType === void 0 ? void 0 : entityType.annotations[alias]) === null || _b === void 0 ? void 0 : _b[annotation];
         if (targetAnnotation) {
             key = getTargetAnnotationName(targetAnnotation, keyForRelatedFacetKeys).replace('#', separator);
@@ -271,6 +337,14 @@ function getSectionFacet(facetDefinition, keyForRelatedFacetKeys = false, oDataV
         ? Object.assign(Object.assign(Object.assign({ key }, (facetDefinition.Label && { label: facetDefinition.Label.toString() })), (facetDefinition.ID && { ID: facetDefinition.ID.toString() })), { entityType }) : undefined;
 }
 exports.getSectionFacet = getSectionFacet;
+/**
+ * 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
+ * @param {string} path - path of the property in the manifest
+ * @param {string} targetAnnotation
+ * @param {string} targetAnnotationEncoded
+ * @returns returns section of the manifest based on path, generates an empty object in case it does not exists
+ */
 exports.getManifestSectionByPathV4 = (exportResultManifest, path, targetAnnotation, targetAnnotationEncoded) => {
     let exportResultSection = exportResultManifest;
     path.split('/').forEach(function (element) {
@@ -284,19 +358,6 @@ exports.getManifestSectionByPathV4 = (exportResultManifest, path, targetAnnotati
     });
     return exportResultSection;
 };
-/**
- * Finds the alias for a given namespace in the references' section of the converted service metadata
- * @param {string} namespace - complete namespace, e.g. 'com.sap.vocabularies.UI.v1'
- * @param {ConverterOutput} oDataServiceAVT - combined service metadata, as returned by annotation vocabularies tools
- * @returns alias for the given namespace
- */
-function findAlias(namespace, oDataServiceAVT) {
-    const aliasReference = oDataServiceAVT.references.find((reference) => {
-        return reference.namespace === namespace;
-    });
-    return aliasReference && aliasReference.alias;
-}
-exports.findAlias = findAlias;
 function getSchemaKeyOfLineItemRecord(lineItemRecord) {
     let schemaKey, target, value;
     switch (lineItemRecord.$Type) {
@@ -365,9 +426,9 @@ exports.getSchemaKeyOfLineItemRecord = getSchemaKeyOfLineItemRecord;
  * @param {ExtensionLogger} logger - Logger class for logging messages
  */
 function evaluateTargetAnnotation(annotationRecord, facets, entityType, oDataServiceAVT, oDataVersion = common_1.FioriElementsVersion.v2, logger) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e;
     const alias = findAlias('com.sap.vocabularies.UI.v1', oDataServiceAVT);
-    const section = getSectionFacet(annotationRecord, false, oDataVersion, entityType, alias, logger);
+    const section = getSectionFacet(annotationRecord, false, oDataVersion, entityType, oDataServiceAVT, logger);
     if (!section) {
         return;
     }
@@ -376,7 +437,7 @@ function evaluateTargetAnnotation(annotationRecord, facets, entityType, oDataSer
     let version, annotation, targetAnnotation;
     let scope = alias;
     if (path.includes('com.sap.vocabularies.UI.v1.Chart') || path.includes(alias + '.Chart')) {
-        facets[path] = { base: types_1.FacetBase.ChartFacet };
+        facets[path] = { base: types_1.FacetBase.Chart };
         facets[path]['entityType'] = targetEntityType;
     }
     else if (path.includes('com.sap.vocabularies.UI.v1.Identification') || path.includes(alias + '.Identification')) {
@@ -384,7 +445,7 @@ function evaluateTargetAnnotation(annotationRecord, facets, entityType, oDataSer
         targetAnnotation = targetEntityType.annotations[scope][annotation];
         facets[path] = { base: types_1.FacetBase.Identification };
         facets[path]['entityType'] = targetEntityType;
-        facets[path]['form'] = targetAnnotation;
+        facets[path]['target'] = targetAnnotation;
     }
     else if (path.includes('com.sap.vocabularies.UI.v1.LineItem') || path.includes(alias + '.LineItem')) {
         if (entityType) {
@@ -397,14 +458,29 @@ function evaluateTargetAnnotation(annotationRecord, facets, entityType, oDataSer
                 pathParts[pathParts.length - 1] = '@com.sap.vocabularies.UI.v1.LineItem';
                 path = pathParts.join('::');
             }
-            facets[path] = { base: types_1.FacetBase.LineItemFacet };
+            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;
         }
     }
     else if (path.includes('com.sap.vocabularies.UI.v1.FieldGroup') || path.includes(alias + '.FieldGroup')) {
-        facets[path] = { base: types_1.FacetBase.FormFacet };
-        facets[path]['form'] = (_b = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _b === void 0 ? void 0 : _b.$target;
+        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;
+    }
+    else if (path.includes('com.sap.vocabularies.UI.v1.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;
+    }
+    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;
+    }
+    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;
     }
     else {
@@ -419,6 +495,12 @@ function evaluateTargetAnnotation(annotationRecord, facets, entityType, oDataSer
         if (annotationRecord.ID) {
             facets[path]['ID'] = annotationRecord.ID;
         }
+        else if (oDataVersion === common_1.FioriElementsVersion.v4) {
+            extensionLogger_1.log(logger, {
+                severity: "error" /* Error */,
+                message: i18next_1.default.t('NOID4SECTION', { facet: annotationRecord.fullyQualifiedName })
+            });
+        }
         if (section && section.entityType) {
             facets[path].entityType = section.entityType;
         }
@@ -435,14 +517,14 @@ function evaluateTargetAnnotation(annotationRecord, facets, entityType, oDataSer
  * @param {ExtensionLogger} logger - Logger class for logging messages
  */
 function addFacetToConfig(annotationRecord, oDataServiceAVT, serviceName, entityType, facets, oDataVersion = common_1.FioriElementsVersion.v2, logger) {
+    var _a;
     switch (annotationRecord.$Type) {
         case "com.sap.vocabularies.UI.v1.ReferenceFacet" /* ReferenceFacet */: {
             evaluateTargetAnnotation(annotationRecord, facets, entityType, oDataServiceAVT, oDataVersion, logger);
             break;
         }
         case "com.sap.vocabularies.UI.v1.CollectionFacet" /* CollectionFacet */: {
-            const alias = findAlias('com.sap.vocabularies.UI.v1', oDataServiceAVT);
-            const section = getSectionFacet(annotationRecord, false, oDataVersion, entityType, alias, logger);
+            const section = getSectionFacet(annotationRecord, false, oDataVersion, entityType, oDataServiceAVT, logger);
             if (section) {
                 const annotationPath = `/${entityType.fullyQualifiedName}/${annotationRecord.fullyQualifiedName.split(entityType.fullyQualifiedName)[1]}`;
                 const facet = (facets[section.key] = {
@@ -452,7 +534,7 @@ function addFacetToConfig(annotationRecord, oDataServiceAVT, serviceName, entity
                     annotationPath: annotationPath,
                     Label: section.label
                 });
-                annotationRecord.Facets.forEach((collectionItem) => {
+                (_a = annotationRecord.Facets) === null || _a === void 0 ? void 0 : _a.forEach((collectionItem) => {
                     addFacetToConfig(collectionItem, oDataServiceAVT, serviceName, entityType, facet.facets, oDataVersion, logger);
                 });
             }
@@ -460,6 +542,31 @@ function addFacetToConfig(annotationRecord, oDataServiceAVT, serviceName, entity
         }
     }
 }
+/**
+ * Retrieve header facet configurations that can be used to generate ObjectPage schemas
+ * @param {QualifiedName} entityTypeName - the name of the actual entity type
+ * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
+ * @param {FioriElementsVersion} oDataVersion - OData version
+ * @param {ExtensionLogger} logger - Logger class for logging messages
+ */
+function getObjectPageHeaderFacets(entityType, oDataServiceAVT, oDataVersion = common_1.FioriElementsVersion.v2, logger) {
+    const facets = {};
+    if (!entityType || !entityType.annotations) {
+        return;
+    }
+    const alias = findAlias('com.sap.vocabularies.UI.v1', oDataServiceAVT);
+    const facetAnnotation = alias && entityType.annotations[alias] && entityType.annotations[alias].HeaderFacets;
+    if (facetAnnotation) {
+        const lastDot = entityType.fullyQualifiedName.lastIndexOf('.');
+        const serviceName = entityType.fullyQualifiedName.substr(0, lastDot);
+        // Add facets to configuration
+        facetAnnotation.forEach((item) => {
+            addFacetToConfig(item, oDataServiceAVT, serviceName, entityType, facets, oDataVersion, logger);
+        });
+    }
+    return facets;
+}
+exports.getObjectPageHeaderFacets = getObjectPageHeaderFacets;
 /**
  * Retrieve facet configurations that can be used to generate ObjectPage schemas
  * @param {QualifiedName} entityTypeName - the name of the actual entity type
@@ -490,7 +597,7 @@ exports.getObjectPageFacets = getObjectPageFacets;
  * @param manifest - the manifest.json file
  */
 function getVersionFromManifest(manifest) {
-    if (manifest['sap.ui.generic.app'] || manifest['sap.ovp']) {
+    if (manifest[v4_1.ManifestSection.generic] || manifest[v4_1.ManifestSection.ovp]) {
         return common_1.FioriElementsVersion.v2;
     }
     else {
@@ -500,19 +607,19 @@ function getVersionFromManifest(manifest) {
 exports.getVersionFromManifest = getVersionFromManifest;
 function getTemplateTypeFromManifest(manifest, fioriElementsVersion, logger) {
     let templateType;
-    if (manifest['sap.ovp']) {
+    if (manifest[v4_1.ManifestSection.ovp]) {
         templateType = TemplateType.OverviewPageV2;
     }
     else if (fioriElementsVersion === common_1.FioriElementsVersion.v2) {
-        if (manifest['sap.ui.generic.app']) {
-            const v2Pages = manifest['sap.ui.generic.app'].pages;
+        if (manifest[v4_1.ManifestSection.generic]) {
+            const v2Pages = manifest[v4_1.ManifestSection.generic].pages;
             if (!v2Pages) {
                 extensionLogger_1.log(logger, {
                     severity: "error" /* Error */,
                     message: i18next_1.default.t('NOPAGES', { appId: manifest['sap.app']['id'] }),
                     location: {
-                        path: 'webapp/manifest.json',
-                        range: ['sap.ui.generic.app']
+                        path: types_1.MANIFESTPATH,
+                        range: [v4_1.ManifestSection.generic]
                     }
                 });
                 return;
@@ -533,24 +640,25 @@ function getTemplateTypeFromManifest(manifest, fioriElementsVersion, logger) {
             if (!templateType) {
                 extensionLogger_1.log(logger, {
                     severity: "error" /* Error */,
-                    message: i18next_1.default.t('NOTEMPLATE', { section: 'sap.ui.generic.app' }),
+                    message: i18next_1.default.t('NOTEMPLATE', { section: v4_1.ManifestSection.generic }),
                     location: {
-                        path: 'webapp/manifest.json',
-                        range: ['sap.ui.generic.app']
+                        path: types_1.MANIFESTPATH,
+                        range: [v4_1.ManifestSection.generic]
                     }
                 });
             }
         }
     }
     else if (fioriElementsVersion === common_1.FioriElementsVersion.v4) {
-        const v4Pages = manifest['sap.ui5'].routing && manifest['sap.ui5'].routing.targets;
+        const v4Pages = manifest[v4_1.ManifestSection.ui5].routing &&
+            manifest[v4_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: 'webapp/manifest.json',
-                    range: ['sap.ui5', 'routing']
+                    path: types_1.MANIFESTPATH,
+                    range: [v4_1.ManifestSection.ui5, 'routing']
                 }
             });
             return;
@@ -573,10 +681,10 @@ function getTemplateTypeFromManifest(manifest, fioriElementsVersion, logger) {
         if (!templateType) {
             extensionLogger_1.log(logger, {
                 severity: "error" /* Error */,
-                message: i18next_1.default.t('NOTEMPLATE', { section: 'sap.ui5' }),
+                message: i18next_1.default.t('NOTEMPLATE', { section: v4_1.ManifestSection.ui5 }),
                 location: {
-                    path: 'webapp/manifest.json',
-                    range: ['sap.ui5', 'routing', 'targets']
+                    path: types_1.MANIFESTPATH,
+                    range: [v4_1.ManifestSection.ui5, 'routing', 'targets']
                 }
             });
         }
@@ -587,7 +695,7 @@ function getTemplateTypeFromManifest(manifest, fioriElementsVersion, logger) {
                 severity: "error" /* Error */,
                 message: i18next_1.default.t('NOFE'),
                 location: {
-                    path: 'webapp/manifest.json'
+                    path: types_1.MANIFESTPATH
                 }
             });
         }
@@ -623,9 +731,10 @@ exports.createSectionWithoutProperties = createSectionWithoutProperties;
  * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
  * @param {ExtensionLogger} logger - Logger class for logging messages
  * @param {FioriElementsVersion} oDataVersion - OData version
+ * @param {boolean} [checkUnresolvableFacets=false] - Check and avoid facets and sections without ID and Target.
  * @returns {FacetSection[]} - Array of facets or sections
  */
-function getObjectPageFacetSection(entityType, oDataServiceAVT, logger, oDataVersion = common_1.FioriElementsVersion.v2) {
+function getObjectPageFacetSection(entityType, oDataServiceAVT, logger, oDataVersion = common_1.FioriElementsVersion.v2, checkUnresolvableFacets = false) {
     const alias = findAlias('com.sap.vocabularies.UI.v1', oDataServiceAVT);
     if (entityType) {
         const facetAnnotation = alias && entityType.annotations && entityType.annotations[alias] && entityType.annotations[alias].Facets;
@@ -633,7 +742,10 @@ function getObjectPageFacetSection(entityType, oDataServiceAVT, logger, oDataVer
             return [];
         }
         return facetAnnotation.reduce(function (result, item) {
-            const section = getSectionFacet(item, true, oDataVersion, entityType, alias, logger);
+            if (checkUnresolvableFacets && !item['ID'] && !('Target' in item && item['Target'])) {
+                return result;
+            }
+            const section = getSectionFacet(item, true, oDataVersion, entityType, oDataServiceAVT, logger);
             if (section) {
                 result.push(section);
             }
@@ -750,6 +862,8 @@ exports.generatePageId = generatePageId;
  * @param currentConfigObject - current part of the configuration that gets traversed
  * @param propertyDefinition - definition of a given property in the app schema
  * @param key - actual key
+ * @param factory - factory for creating metadata instances
+ * @param pageType - page type
  */
 function getNextTargetDefinition(appSchema, title, currentConfigObject, propertyDefinition, key, factory, pageType) {
     let nextDefinition = {
@@ -846,6 +960,42 @@ function addFieldsType(appSchema, entityType) {
     };
 }
 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
@@ -908,18 +1058,4 @@ exports.arrayCombineMerge = (target, source, options) => {
     });
     return destination;
 };
-/**
- * Function returns annotation path for schema based on received params.
- * @param entityTypeName - Entity type name.
- * @param term - Annotation term.
- * @param qualifier - Annotation qualifier.
- * @returns Annotation path based on received params
- */
-exports.createAnnotationPath = (entityTypeName, term, qualifier) => {
-    let annotationPath = `/${entityTypeName}/@${term}`;
-    if (qualifier) {
-        annotationPath += `#${qualifier}`;
-    }
-    return annotationPath;
-};
 //# sourceMappingURL=utils.js.map