@sap/ux-specification 1.71.42 → 1.71.46

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

@@ -65,8 +65,8 @@ function getAnnotationsForUi(oDataServiceAVT) {
             const { LineItem, Facets } = entity.annotations[alias];
             if (LineItem &&
                 !LineItem.qualifier &&
-                LineItem.find((li) => li.$Type === 'com.sap.vocabularies.UI.v1.DataField' ||
-                    li.$Type === 'com.sap.vocabularies.UI.v1.DataFieldForAnnotation')) {
+                LineItem.find((li) => li.$Type === "com.sap.vocabularies.UI.v1.DataField" /* DataField */ ||
+                    li.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAnnotation" /* DataFieldForAnnotation */)) {
                 filteredEntityTypes.LineItems.push(name);
             }
             if (Facets && !Facets.qualifier) {
@@ -82,84 +82,77 @@ function getEntitySetByEntitySetName(entitySetName, oDataServiceAVT) {
 exports.getEntitySetByEntitySetName = getEntitySetByEntitySetName;
 /**
  * The function generates one app schema per entitySet that is linked with an object page in V2
+ * @param {GenerateSchemaParameters} generateParameters - list of API input parameters
  * @param {Schema} genericSchemas - The generic schemas
- * @param {Manifest} manifest - manifest.json of the given app
- * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
  * @param {Schema} appSchemas - the list of app schemas that shall get extended
- * @param {FileData[]} [fragments] - array with XML fragments
- * @param {ExtensionLogger} logger - Logger class for logging messages
  */
-function generateObjectPageSchemasV2(genericSchemas, manifest, oDataServiceAVT, appSchemas, fragments, logger) {
-    const allPages = appProvider_1.getPages(manifest[common_1.ManifestSection.generic].pages, pageV2.FE_TEMPLATE_V2_OBJECT_PAGE);
+function generateObjectPageSchemasV2(generateParameters, genericSchemas, appSchemas) {
+    const allPages = appProvider_1.getPages(generateParameters.manifest[common_1.ManifestSection.generic].pages, pageV2.FE_TEMPLATE_V2_OBJECT_PAGE);
     for (const page in allPages) {
         const entitySetName = allPages[page].entitySet;
-        const entitySet = getEntitySetByEntitySetName(entitySetName, oDataServiceAVT);
+        const entitySet = getEntitySetByEntitySetName(entitySetName, generateParameters.serviceAVT);
         const entityTypeName = entitySet && entitySet.entityType && entitySet.entityType.name;
         const schemaFile = utils_1.getSchemaFilePath(common_1.SchemaType.ObjectPage, (entitySet === null || entitySet === void 0 ? void 0 : entitySet.name) || entitySetName);
         const genericSchemaFile = utils_1.getSchemaFilePath(common_1.SchemaType.ObjectPage);
-        appSchemas[schemaFile.filename] = generate_1.generateObjectPageSchemaV2(genericSchemas[genericSchemaFile.filename], entityTypeName, oDataServiceAVT, manifest, fragments, logger);
+        appSchemas[schemaFile.filename] = generate_1.generateObjectPageSchemaV2(generateParameters, genericSchemas[genericSchemaFile.filename], entityTypeName);
     }
 }
 /**
  * Generates all app specific schemas for a Fiori Elements V2 application
+ * @param {GenerateSchemaParameters} generateParameters - list of API input parameters
  * @param {Schemas} genericSchemas - The generic schemas
  * @param {UiEntityTypes} uiEntityTypes - list of all entity types, as comprised in oDataServiceAVT
- * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
- * @param {Manifest} manifest - manifest.json of the given app
  * @param {TemplateType} templateType - the given Fiori Elements' template type
- * @param {FileData[]} fragments - list of fragment files and their content
- * @param {ExtensionLogger} logger - Logger class for logging messages
  */
-function generateAppSchemasV2(genericSchemas, uiEntityTypes, oDataServiceAVT, manifest, templateType, fragments, logger) {
-    const appSchemas = {}, entityTypes = oDataServiceAVT && oDataServiceAVT.entityTypes;
+function generateAppSchemasV2(generateParameters, genericSchemas, uiEntityTypes, templateType) {
+    var _a;
+    const appSchemas = {};
     if (templateType === utils_1.TemplateType.ListReportObjectPageV2 && uiEntityTypes) {
         /*--- List Report ----*/
-        const allPages = appProvider_1.getPages(manifest[common_1.ManifestSection.generic].pages, pageV2.FE_TEMPLATE_V2_LIST_REPORT);
+        const allPages = appProvider_1.getPages(generateParameters.manifest[common_1.ManifestSection.generic].pages, pageV2.FE_TEMPLATE_V2_LIST_REPORT);
         for (const page in allPages) {
             const entitySetName = allPages[page].entitySet;
-            const entitySet = getEntitySetByEntitySetName(entitySetName, oDataServiceAVT);
+            const entitySet = getEntitySetByEntitySetName(entitySetName, generateParameters.serviceAVT);
             const entityTypeName = entitySet && entitySet.entityType && entitySet.entityType.name;
             const schemaFile = utils_1.getSchemaFilePath(common_1.SchemaType.ListReport, (entitySet === null || entitySet === void 0 ? void 0 : entitySet.name) || entitySetName);
             const genericSchemaFile = utils_1.getSchemaFilePath(common_1.SchemaType.ListReport);
-            appSchemas[schemaFile.filename] = generate_1.generateListReportSchemaV2(genericSchemas[genericSchemaFile.filename], entityTypeName, entityTypes, manifest, fragments, logger);
+            appSchemas[schemaFile.filename] = generate_1.generateListReportSchemaV2(generateParameters, genericSchemas[genericSchemaFile.filename], entityTypeName);
         }
         /*--- Object Pages ----*/
-        generateObjectPageSchemasV2(genericSchemas, manifest, oDataServiceAVT, appSchemas);
+        generateObjectPageSchemasV2(generateParameters, genericSchemas, appSchemas);
     }
     else if (templateType === utils_1.TemplateType.AnalyticalListPageV2 && uiEntityTypes) {
         /*--- Analytical List Page ----*/
-        const allPages = appProvider_1.getPages(manifest[common_1.ManifestSection.generic].pages, pageV2.FE_TEMPLATE_V2_ALP);
+        const allPages = appProvider_1.getPages(generateParameters.manifest[common_1.ManifestSection.generic].pages, pageV2.FE_TEMPLATE_V2_ALP);
         for (const page in allPages) {
             const entitySetName = allPages[page].entitySet;
-            const entitySet = getEntitySetByEntitySetName(entitySetName, oDataServiceAVT);
-            const entityTypeName = entitySet && entitySet.entityType && entitySet.entityType.name;
+            const entitySet = getEntitySetByEntitySetName(entitySetName, generateParameters.serviceAVT);
+            const entityTypeName = (_a = entitySet === null || entitySet === void 0 ? void 0 : entitySet.entityType) === null || _a === void 0 ? void 0 : _a.name;
             const schemaFile = utils_1.getSchemaFilePath(common_1.SchemaType.AnalyticalListPage, (entitySet === null || entitySet === void 0 ? void 0 : entitySet.name) || entitySetName);
             const genericSchemaFile = utils_1.getSchemaFilePath(common_1.SchemaType.AnalyticalListPage);
-            appSchemas[schemaFile.filename] = generate_1.generateAnalyticalListReportSchemaV2(genericSchemas[genericSchemaFile.filename], entityTypeName, entityTypes, manifest, fragments, logger);
+            appSchemas[schemaFile.filename] = generate_1.generateAnalyticalListReportSchemaV2(generateParameters, genericSchemas[genericSchemaFile.filename], entityTypeName);
         }
         /*--- Object Pages ----*/
-        generateObjectPageSchemasV2(genericSchemas, manifest, oDataServiceAVT, appSchemas);
+        generateObjectPageSchemasV2(generateParameters, genericSchemas, appSchemas);
     }
     else if (templateType === utils_1.TemplateType.OverviewPageV2) {
         /*--- Overview Page ----*/
         const schemaFile = utils_1.getSchemaFilePath(common_1.SchemaType.OverviewPage);
         const genericSchemaFile = utils_1.getSchemaFilePath(common_1.SchemaType.OverviewPage);
-        appSchemas[schemaFile.filename] = generate_1.generateOVPInterfaceV2(genericSchemas[genericSchemaFile.filename], manifest);
+        appSchemas[schemaFile.filename] = generate_1.generateOVPInterfaceV2(genericSchemas[genericSchemaFile.filename], generateParameters.manifest);
     }
     return Object.assign(Object.assign({}, genericSchemas), appSchemas);
 }
 /**
  * Generates app specific schemas by adding annotation information to copies of the generic schemas, thus replacing all generic definitions.
+ * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
  * @param {UiEntityTypes} uiEntityTypes - list of all entity types from the service metadata
- * @param {FioriElementsVersion} fioriElementsVersion - version of Fiori Element (V2 or V4)
- * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
- * @param manifest - manifest.json file content of the app in JSON format
  * @param templateType - type of the Fiori Elements' template
  */
-async function generateAppSchemas(uiEntityTypes, fioriElementsVersion, oDataServiceAVT, manifest, templateType, fragments) {
-    const genericSchemas = await getGenericSchemas(templateType, fioriElementsVersion);
-    if (fioriElementsVersion === common_1.FioriElementsVersion.v2) {
-        return generateAppSchemasV2(genericSchemas, uiEntityTypes, oDataServiceAVT, manifest, templateType, fragments);
+async function generateAppSchemas(generateParameters, uiEntityTypes, templateType) {
+    if (generateParameters.fioriElementsVersion === common_1.FioriElementsVersion.v2) {
+        const genericSchemas = await getGenericSchemas(templateType, generateParameters.fioriElementsVersion);
+        return generateAppSchemasV2(generateParameters, genericSchemas, uiEntityTypes, templateType);
     }
 }
 /**
@@ -220,13 +213,19 @@ async function importProjectSchema(importProjectParameters) {
     // Initialize i18next
     i18n_1.initI18n();
     let files = [];
-    const { manifest, annotations, fragments, logger } = importProjectParameters;
-    const fioriElementsVersion = utils_1.getVersionFromManifest(manifest);
-    const service = utils_1.parseAndMergeAndConvert(annotations, logger);
+    const fioriElementsVersion = utils_1.getVersionFromManifest(importProjectParameters.manifest);
+    const service = utils_1.parseAndMergeAndConvert(importProjectParameters.annotations, importProjectParameters.logger);
     const uiEntityTypes = getAnnotationsForUi(service);
-    const templateType = utils_1.getTemplateTypeFromManifest(manifest, fioriElementsVersion, logger);
+    const templateType = utils_1.getTemplateTypeFromManifest(importProjectParameters.manifest, fioriElementsVersion, importProjectParameters.logger);
+    const generateParameters = {
+        manifest: importProjectParameters.manifest,
+        serviceAVT: service,
+        fragments: importProjectParameters.fragments,
+        fioriElementsVersion,
+        logger: importProjectParameters.logger
+    };
     if (templateType) {
-        const appSchemas = await generateAppSchemas(uiEntityTypes, fioriElementsVersion, service, manifest, templateType, fragments);
+        const appSchemas = await generateAppSchemas(generateParameters, uiEntityTypes, templateType);
         files = getFileList(appSchemas);
     }
     return files;
@@ -244,10 +243,17 @@ async function importProjectSchemaAndConfig(importProjectParameters) {
     const { manifest, annotations, flex, fragments, logger } = importProjectParameters;
     const fioriElementsVersion = utils_1.getVersionFromManifest(manifest);
     const oDataServiceAVT = utils_1.parseAndMergeAndConvert(annotations, logger);
+    const generateParameters = {
+        manifest: importProjectParameters.manifest,
+        serviceAVT: oDataServiceAVT,
+        fragments: importProjectParameters.fragments,
+        fioriElementsVersion,
+        logger: importProjectParameters.logger
+    };
     const uiEntityTypes = getAnnotationsForUi(oDataServiceAVT);
     const templateType = utils_1.getTemplateTypeFromManifest(manifest, fioriElementsVersion, logger);
     if (templateType) {
-        const appSchemas = await generateAppSchemas(uiEntityTypes, fioriElementsVersion, oDataServiceAVT, manifest, templateType, fragments);
+        const appSchemas = await generateAppSchemas(generateParameters, uiEntityTypes, templateType);
         configFiles = importConfigs(manifest, flex, appSchemas, templateType, fragments);
         files = getFileList(appSchemas, configFiles);
     }

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

@@ -1 +1 @@
-{"version":3,"file":"importProject.js","sourceRoot":"","sources":["../../../../src/sync/common/importProject.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"importProject.js","sourceRoot":"","sources":["../../../../src/sync/common/importProject.ts"],"names":[],"mappings":"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"}

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

@@ -41,9 +41,12 @@ export declare enum ControlType {
     ObjectPageGridProperties = "sap.ui.layout.GridData",
     ObjectPageHeader = "sap.uxap.ObjectPageHeader",
     ObjectPageLayout = "sap.uxap.ObjectPageLayout",
+    HeaderAction = "sap.uxap.ObjectPageHeaderActionButton",
     DynamicPage = "sap.f.DynamicPage",
     Form = "sap.ui.layout.form",
-    Chart = "sap.suite.ui.microchart"
+    Chart = "sap.suite.ui.microchart",
+    Section = "sap.uxap.ObjectPageSection",
+    SubSection = "sap.uxap.ObjectPageSubSection"
 }
 export interface ChangeContent {
     property: string;
@@ -95,13 +98,13 @@ export interface ManifestConverter {
     path: ManifestPath;
     key?: string;
     import?: ((manifestSection: unknown, sectionId?: string) => unknown) | boolean;
-    export?: ((manifestSection: unknown, configObject: unknown, key: string) => unknown) | boolean;
+    export?: ((manifestSection: unknown, configObject: unknown, key: string, manifestKey: string) => unknown) | boolean;
+    delete?: (manifestSection: unknown, configObject: unknown, key: string, manifestKey: string) => unknown;
 }
 export interface SyncRule {
     flex?: FlexAdapter;
     manifest?: ManifestConverter;
     generate?: (schema: object, definition: object, propertyName: string) => unknown;
-    hasDistinctDefinition?: boolean;
 }
 export interface Content {
     property: string;
@@ -213,3 +216,8 @@ export declare const MANIFESTPATH = "webapp/manifest.json";
 export declare const VOCWITHSLASH = "/@com.sap.vocabularies";
 export declare const VOCWITHCOLONS = "::@com.sap.vocabularies";
 export declare const UIVOCABULARY = "com.sap.vocabularies.UI.v1";
+export declare const QUICKVARPATH = "/quickVariantSelection";
+export declare const QUICKVARPATHX = "/quickVariantSelectionX";
+export declare const DATESETTINGSPATH = "/filterSettings/dateSettings";
+export declare const TOOLBAR = "ToolBar<LineItems>";
+export declare const FRAGMENTNAMEPART = ".fragment.";

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) {
@@ -71,4 +74,9 @@ exports.MANIFESTPATH = 'webapp/manifest.json';
 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.';
 //# 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":";;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;AAwHD,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"}
+{"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;AAwHD,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

@@ -74,7 +74,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;
 export declare const getManifestSectionByPathV4: (exportResultManifest: object, path: string, targetAnnotation?: string, targetAnnotationEncoded?: string) => object;
 export declare function getSchemaKeyOfLineItemRecord(lineItemRecord: DataFieldAbstractTypes): string;
 /**
@@ -177,6 +177,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): NextDefinition;
+export declare function prepareRef(refInput: string): string;
 /**
  * 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

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

@@ -49,8 +49,7 @@ function parseAndMergeAndConvert(annotationFiles, logger) {
         }
         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];
+            for (const converterMessage of converterOutput.diagnostics) {
                 extensionLogger_1.log(logger, {
                     severity: "error" /* Error */,
                     message: converterMessage.message
@@ -82,11 +81,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();
@@ -103,7 +103,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;
@@ -166,10 +168,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
@@ -182,7 +183,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;
@@ -214,7 +215,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;
@@ -260,6 +261,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
@@ -269,46 +302,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, {
@@ -322,8 +323,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);
@@ -430,58 +431,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 };
@@ -518,7 +513,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 */: {
@@ -735,7 +730,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);
                 }
@@ -903,6 +898,7 @@ function determineNextDefinitionFromDefinitionArray(definitionArray, appSchema,
         const lastDefinition = definitionArray[definitionArray.length - 1];
         nextDefinition.targetDefinition = appSchema['definitions'][lastDefinition];
         if (nextDefinition.targetDefinition['$ref'] || nextDefinition.targetDefinition['type'] === 'array') {
+            // eslint-disable-next-line @typescript-eslint/no-use-before-define
             nextDefinition = getNextTargetDefinition(appSchema, title, currentConfigObject, nextDefinition.targetDefinition, key, factory, pageType);
             return nextDefinition;
         }
@@ -954,6 +950,10 @@ function getNextTargetDefinition(appSchema, title, currentConfigObject, property
     return nextDefinition;
 }
 exports.getNextTargetDefinition = getNextTargetDefinition;
+function prepareRef(refInput) {
+    return refInput.replace('#', '::').replace(/\//g, '::');
+}
+exports.prepareRef = prepareRef;
 /**
  * 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
@@ -975,9 +975,8 @@ function addCommonLineItemDefinitions(appSchema, lineItemAnnotation, entityType,
     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 schemaIdForActions = `Actions<${prepareRef(lineItemId)}>`;
+    appSchema['definitions'][schemaIdForToolBar].properties.actions.$ref = exports.DEFINITION_LINK_PREFIX + schemaIdForActions;
     const actionId = lineItemId === 'LineItems' ? 'Actions' : 'ObjectPageToolBarActions';
     const actions = (appSchema['definitions'][schemaIdForActions] = JSON.parse(JSON.stringify(appSchema['definitions'][actionId])));
     actions.properties = {};