@sap/ux-specification 1.71.46 → 1.71.47

package/dist/src/sync/common/generate/index.d.ts

@@ -1 +1,2 @@
 export * from './objectPage';
+export * from './utils';

package/dist/src/sync/common/generate/index.js

@@ -4,4 +4,5 @@ function __export(m) {
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./objectPage"));
+__export(require("./utils"));
 //# sourceMappingURL=index.js.map

package/dist/src/sync/common/generate/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/sync/common/generate/index.ts"],"names":[],"mappings":";;;;;AAAA,kCAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/sync/common/generate/index.ts"],"names":[],"mappings":";;;;;AAAA,kCAA6B;AAC7B,6BAAwB"}

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

@@ -0,0 +1,59 @@
+import { EntityType } from '@sap-ux/annotation-converter';
+import { AnnotationTerm, ConverterOutput, LineItem, UIAnnotationTerms } from '@sap-ux/vocabularies-types';
+import { FacetSection } from '..';
+/**
+ * Adds an enum filled with existing UI annotations of the given list (validAnnotations)
+ * @param {EntityType} entityType
+ * @param {UIAnnotationTerms[]} validAnnotations
+ * @param annoPath - the annotation path property in the app schema where the enum shall be added
+ */
+export declare function addEnumForValidAnnotations(entityType: EntityType, validAnnotations: UIAnnotationTerms[], annoPath: object): void;
+/**
+ * Adds an enum filled with existing UI annotations for single-tab variants of a table
+ * @param {EntityType} entityType
+ * @param appSchema - app specific JSOn schema
+ * @param definitionName - name of the definition in the app schema
+ */
+export declare function addEnumForSingleTabVariant(entityType: EntityType, appSchema: object, definitionName: string): void;
+/**
+ * Adds an enum filled with existing UI annotations for multi-tab variants of a table
+ * @param {ConverterOutput} oDataServiceAVT - combined service metadata, as returned by annotation vocabularies tools
+ * @param appSchema - app specific JSOn schema
+ * @param definitionName - name of the definition in the app schema
+ */
+export declare function addEnumForMultiTabVariant(oDataServiceAVT: ConverterOutput, appSchema: object, definitionName: string): void;
+/**
+ * Adds the enume values for entitySet as part of the multiple view scenario
+ * @param {ConverterOutput} oDataServiceAVT - combined service metadata, as returned by annotation vocabularies tools
+ * @param appSchema - app specific JSOn schema
+ * @param definitionName - name of the definition in the app schema
+ */
+export declare function addEnumForVariantEntitySet(oDataServiceAVT: ConverterOutput, appSchema: object, definitionName: string): void;
+/**
+ * Method adds definition for 'RelatedFacetKeys' as enum with describtion and adds references to 'RelatedFacetKeys' for custom section definitions.
+ * @param {object} schema App specific schema that potentially gets enhanced
+ * @param {string[]>} sectionDefinitions array of section definitions which should be updated with new reference to 'RelatedFacetKeys' enum.
+ * @param {FacetSection[]} facetSections Array of facet section objects which is used to generate enum values.
+ * @param {Array<keyof Omit<FacetSection, 'custom'>>} idProperties Array of property names which should be looked up in 'FacetSection' object.
+ *  Please note that method depends on order and takes first non empty value associated to passed properties.
+ */
+export declare function addDefinitionForRelatedFacetKeys(schema: object, sectionDefinitions: string[], facetSections: FacetSection[], idProperties: Array<keyof Omit<FacetSection, 'custom'>>): void;
+/**
+ * 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;
+};
+/**
+ * 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
+ * @param {string=} floorplanSuffix - floorplan specific suffix (optional)
+ */
+export declare function addFieldsType(appSchema: object, entityType: EntityType, floorplanSuffix?: string): void;

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

@@ -0,0 +1,192 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const __1 = require("..");
+/**
+ * Adds an enum filled with existing UI annotations of the given list (validAnnotations)
+ * @param {EntityType} entityType
+ * @param {UIAnnotationTerms[]} validAnnotations
+ * @param annoPath - the annotation path property in the app schema where the enum shall be added
+ */
+function addEnumForValidAnnotations(entityType, validAnnotations, annoPath) {
+    const UiAnnotations = entityType.annotations.UI;
+    if (!UiAnnotations) {
+        return;
+    }
+    const enumEntries = annoPath['enum'] ? annoPath['enum'] : [];
+    for (const key in UiAnnotations) {
+        const annotation = UiAnnotations[key];
+        if (validAnnotations.indexOf(annotation.term) > -1) {
+            const enumEntry = annotation.qualifier
+                ? `${annotation.term}#${annotation.qualifier}`
+                : `${annotation.term}`;
+            if (enumEntries.indexOf(enumEntry) === -1) {
+                enumEntries.push(enumEntry);
+            }
+        }
+    }
+    if (enumEntries.length > 0) {
+        annoPath['enum'] = enumEntries;
+    }
+}
+exports.addEnumForValidAnnotations = addEnumForValidAnnotations;
+/**
+ * Adds an enum filled with existing UI annotations for single-tab variants of a table
+ * @param {EntityType} entityType
+ * @param appSchema - app specific JSOn schema
+ * @param definitionName - name of the definition in the app schema
+ */
+function addEnumForSingleTabVariant(entityType, appSchema, definitionName) {
+    const quickVariant = appSchema['definitions'][definitionName];
+    const annoPath = quickVariant.properties.annotationPath;
+    const validAnnotations = ["com.sap.vocabularies.UI.v1.SelectionVariant" /* SelectionVariant */, "com.sap.vocabularies.UI.v1.SelectionPresentationVariant" /* SelectionPresentationVariant */];
+    addEnumForValidAnnotations(entityType, validAnnotations, annoPath);
+}
+exports.addEnumForSingleTabVariant = addEnumForSingleTabVariant;
+/**
+ * Adds an enum filled with existing UI annotations for multi-tab variants of a table
+ * @param {ConverterOutput} oDataServiceAVT - combined service metadata, as returned by annotation vocabularies tools
+ * @param appSchema - app specific JSOn schema
+ * @param definitionName - name of the definition in the app schema
+ */
+function addEnumForMultiTabVariant(oDataServiceAVT, appSchema, definitionName) {
+    const quickVariant = appSchema['definitions'][definitionName];
+    const annoPath = quickVariant.properties.annotationPath;
+    const validAnnotations = [
+        "com.sap.vocabularies.UI.v1.SelectionVariant" /* SelectionVariant */,
+        "com.sap.vocabularies.UI.v1.SelectionPresentationVariant" /* SelectionPresentationVariant */,
+        "com.sap.vocabularies.UI.v1.PresentationVariant" /* PresentationVariant */
+    ];
+    if (oDataServiceAVT.entitySets) {
+        oDataServiceAVT.entitySets.forEach((entitySet) => {
+            addEnumForValidAnnotations(entitySet.entityType, validAnnotations, annoPath);
+        });
+    }
+}
+exports.addEnumForMultiTabVariant = addEnumForMultiTabVariant;
+/**
+ * Adds the enume values for entitySet as part of the multiple view scenario
+ * @param {ConverterOutput} oDataServiceAVT - combined service metadata, as returned by annotation vocabularies tools
+ * @param appSchema - app specific JSOn schema
+ * @param definitionName - name of the definition in the app schema
+ */
+function addEnumForVariantEntitySet(oDataServiceAVT, appSchema, definitionName) {
+    const quickVariant = appSchema['definitions'][definitionName];
+    const entitySet = quickVariant.properties.entitySet;
+    if (oDataServiceAVT.entitySets) {
+        const enumEntries = [];
+        oDataServiceAVT.entitySets.forEach((es) => {
+            enumEntries.push(es.name);
+        });
+        if (enumEntries.length > 0) {
+            entitySet['enum'] = enumEntries;
+        }
+    }
+}
+exports.addEnumForVariantEntitySet = addEnumForVariantEntitySet;
+/**
+ * Method adds definition for 'RelatedFacetKeys' as enum with describtion and adds references to 'RelatedFacetKeys' for custom section definitions.
+ * @param {object} schema App specific schema that potentially gets enhanced
+ * @param {string[]>} sectionDefinitions array of section definitions which should be updated with new reference to 'RelatedFacetKeys' enum.
+ * @param {FacetSection[]} facetSections Array of facet section objects which is used to generate enum values.
+ * @param {Array<keyof Omit<FacetSection, 'custom'>>} idProperties Array of property names which should be looked up in 'FacetSection' object.
+ *  Please note that method depends on order and takes first non empty value associated to passed properties.
+ */
+function addDefinitionForRelatedFacetKeys(schema, sectionDefinitions, facetSections, idProperties) {
+    const oneOfSections = facetSections.map((section) => {
+        // Loop accaptable properties in received order and find first entry with value
+        const propertyName = idProperties.find((property) => !!section[property]);
+        const schemaIdForSection = section[propertyName];
+        return Object.assign(Object.assign({ const: schemaIdForSection }, (section.label && { description: section.label })), (section.custom && { custom: section.custom }));
+    });
+    // Change 'relatedFacet' only when we have entries for sections - otherwise use generic.
+    if (oneOfSections.length) {
+        // Create new definition in schema as 'oneOf'.
+        // Simpler way would be to use 'enum', but then there no option to pass description.
+        schema['definitions']['RelatedFacetKeys'] = {
+            type: 'string',
+            oneOf: oneOfSections
+        };
+        // Add enum definition
+        for (const name of sectionDefinitions) {
+            const definition = schema['definitions'][name];
+            const property = definition['properties']['relatedFacet'];
+            definition['properties']['relatedFacet'] = {
+                anyOf: [
+                    {
+                        $ref: __1.DEFINITION_LINK_PREFIX + 'RelatedFacetKeys'
+                    },
+                    property
+                ]
+            };
+        }
+    }
+}
+exports.addDefinitionForRelatedFacetKeys = addDefinitionForRelatedFacetKeys;
+/**
+ * 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}`]));
+    const schemaIdForActions = `Actions<${__1.prepareRef(lineItemId)}>`;
+    appSchema['definitions'][schemaIdForToolBar].properties.actions.$ref = __1.DEFINITION_LINK_PREFIX + schemaIdForActions;
+    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 = __1.createAnnotationPath(entityType.fullyQualifiedName, lineItemAnnotation.term, lineItemAnnotation.qualifier);
+        appSchema['definitions'][lineItemId].annotationPath = appSchema['definitions'][schemaIdForToolBar].annotationPath = lineItemPath;
+    }
+    return { actions, lineItemPath };
+}
+exports.addCommonLineItemDefinitions = addCommonLineItemDefinitions;
+/**
+ * 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
+ * @param {string=} floorplanSuffix - floorplan specific suffix (optional)
+ */
+function addFieldsType(appSchema, entityType, floorplanSuffix = '') {
+    const propertyNameArray = [], propertyObject = {};
+    const fieldPathRef = `FieldPath${__1.prepareRef(floorplanSuffix)}`;
+    for (const key of entityType.entityProperties) {
+        const propertyName = key.name;
+        propertyNameArray.push(propertyName);
+        propertyObject[propertyName] = {
+            $ref: __1.DEFINITION_LINK_PREFIX + fieldPathRef
+        };
+    }
+    appSchema['definitions'][entityType.name] = {
+        enum: propertyNameArray
+    };
+    appSchema['definitions'][fieldPathRef].properties.path = {
+        $ref: __1.DEFINITION_LINK_PREFIX + entityType.name
+    };
+    const creationFieldsRef = `CreationFieldKeys${__1.prepareRef(floorplanSuffix)}`;
+    appSchema['definitions'][creationFieldsRef] = {
+        type: 'object',
+        properties: propertyObject,
+        additionalProperties: false
+    };
+    const fields4Dialog = appSchema['definitions'][`Fields4Dialog${floorplanSuffix}`];
+    fields4Dialog.properties.fields.$ref = __1.DEFINITION_LINK_PREFIX + creationFieldsRef;
+}
+exports.addFieldsType = addFieldsType;
+//# sourceMappingURL=utils.js.map

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

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

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

@@ -90,7 +90,7 @@ function generateObjectPageSchemasV2(generateParameters, genericSchemas, appSche
     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, generateParameters.serviceAVT);
+        const entitySet = getEntitySetByEntitySetName(entitySetName, generateParameters === null || generateParameters === void 0 ? void 0 : 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);
@@ -112,7 +112,7 @@ function generateAppSchemasV2(generateParameters, genericSchemas, uiEntityTypes,
         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, generateParameters.serviceAVT);
+            const entitySet = getEntitySetByEntitySetName(entitySetName, generateParameters === null || generateParameters === void 0 ? void 0 : 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);
@@ -126,7 +126,7 @@ function generateAppSchemasV2(generateParameters, genericSchemas, uiEntityTypes,
         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, generateParameters.serviceAVT);
+            const entitySet = getEntitySetByEntitySetName(entitySetName, generateParameters === null || generateParameters === void 0 ? void 0 : 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);

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/utils.d.ts

@@ -1,5 +1,5 @@
 import { FacetConfigs, FileData, FacetConfig, FacetSection, SchemaFilePath } from './types';
-import { AnnotationTerm, CollectionFacet, ConverterOutput, LineItem, DataFieldAbstractTypes, EntityType, PropertyAnnotations, PropertyPath, ReferenceFacet, ReferenceURLFacet } from '@sap-ux/vocabularies-types';
+import { AnnotationTerm, CollectionFacet, ConverterOutput, DataFieldAbstractTypes, EntityType, PropertyAnnotations, PropertyPath, ReferenceFacet, ReferenceURLFacet } from '@sap-ux/vocabularies-types';
 import { FioriElementsVersion, Manifest, PageType } from '../../specification/common';
 import { SchemaType } from '../../specification/schemaAccess';
 import { ExtensionLogger } from '../../apiTypes';
@@ -178,27 +178,6 @@ export declare type NextDefinition = {
  */
 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
- * @param lineItemAnnotation - the UI.LineItem annotation, comprising all records
- * @param entityType - the entity type as part of the AVT ConverterOutput
- * @param lineItemId - line item ID, as comprise in stable ID
- * @returns the actions definition plus the annotation path to the given line item
- */
-export declare function addCommonLineItemDefinitions(appSchema: object, lineItemAnnotation: AnnotationTerm<LineItem>, entityType: EntityType, lineItemId: string): {
-    actions: object;
-    lineItemPath: string;
-};
-/**
- * Method adds definition for 'RelatedFacetKeys' as enum with describtion and adds references to 'RelatedFacetKeys' for custom section definitions.
- * @param {object} schema App specific schema that potentially gets enhanced
- * @param {string[]>} sectionDefinitions array of section definitions which should be updated with new reference to 'RelatedFacetKeys' enum.
- * @param {FacetSection[]} facetSections Array of facet section objects which is used to generate enum values.
- * @param {Array<keyof Omit<FacetSection, 'custom'>>} idProperties Array of property names which should be looked up in 'FacetSection' object.
- *  Please note that method depends on order and takes first non empty value associated to passed properties.
- */
-export declare function addDefinitionForRelatedFacetKeys(schema: object, sectionDefinitions: string[], facetSections: FacetSection[], idProperties: Array<keyof Omit<FacetSection, 'custom'>>): void;
 /**
  * Custom array merge function called by deepmerge's merge function
  *

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

@@ -41,14 +41,17 @@ exports.createAnnotationPath = (entityTypeName, term, qualifier) => {
  */
 function parseAndMergeAndConvert(annotationFiles, logger) {
     const parseResult = [];
+    let converterOutput;
     try {
         if (annotationFiles) {
             annotationFiles.forEach(function (annotationData) {
                 parseResult.push(edmx_parser_1.parseEDMX(annotationData.fileContent, annotationData.dataSourceUri));
             });
         }
-        const converterOutput = annotation_converter_1.convertTypes(edmx_parser_1.merge(parseResult));
-        if (logger && converterOutput.diagnostics) {
+        if (parseResult.length > 0) {
+            converterOutput = annotation_converter_1.convertTypes(edmx_parser_1.merge(parseResult));
+        }
+        if (logger && (converterOutput === null || converterOutput === void 0 ? void 0 : converterOutput.diagnostics)) {
             for (const converterMessage of converterOutput.diagnostics) {
                 extensionLogger_1.log(logger, {
                     severity: "error" /* Error */,
@@ -889,6 +892,7 @@ function fillArrayFromPropertyDefinition(propertyDefinition, currentConfigObject
  * @returns {NextDefinition} - Next target definition to process
  */
 function determineNextDefinitionFromDefinitionArray(definitionArray, appSchema, title, currentConfigObject, key, factory, pageType, propertyDefinition) {
+    var _a, _b, _c;
     let nextDefinition = {
         configObject: undefined,
         targetDefinition: {},
@@ -897,7 +901,7 @@ function determineNextDefinitionFromDefinitionArray(definitionArray, appSchema,
     if (definitionArray.length) {
         const lastDefinition = definitionArray[definitionArray.length - 1];
         nextDefinition.targetDefinition = appSchema['definitions'][lastDefinition];
-        if (nextDefinition.targetDefinition['$ref'] || nextDefinition.targetDefinition['type'] === 'array') {
+        if (((_a = nextDefinition === null || nextDefinition === void 0 ? void 0 : nextDefinition.targetDefinition) === null || _a === void 0 ? void 0 : _a['$ref']) || ((_b = nextDefinition === null || nextDefinition === void 0 ? void 0 : nextDefinition.targetDefinition) === null || _b === void 0 ? void 0 : _b['type']) === 'array') {
             // eslint-disable-next-line @typescript-eslint/no-use-before-define
             nextDefinition = getNextTargetDefinition(appSchema, title, currentConfigObject, nextDefinition.targetDefinition, key, factory, pageType);
             return nextDefinition;
@@ -909,12 +913,11 @@ function determineNextDefinitionFromDefinitionArray(definitionArray, appSchema,
                 }
             });
         }
-        nextDefinition.title =
-            nextDefinition.targetDefinition && nextDefinition.targetDefinition['title']
-                ? nextDefinition.targetDefinition['title']
-                : title;
-        const factoryKey = lastDefinition.split('<')[0];
-        nextDefinition.configObject = factory.createInstance(pageType, factoryKey, currentConfigObject, nextDefinition.targetDefinition['controlProperty']);
+        nextDefinition.title = ((_c = nextDefinition === null || nextDefinition === void 0 ? void 0 : nextDefinition.targetDefinition) === null || _c === void 0 ? void 0 : _c['title']) ? nextDefinition.targetDefinition['title']
+            : title;
+        const factoryKey = lastDefinition === null || lastDefinition === void 0 ? void 0 : lastDefinition.split('<')[0];
+        const targetObject = currentConfigObject ? currentConfigObject : {};
+        nextDefinition.configObject = factory.createInstance(pageType, factoryKey, targetObject, nextDefinition.targetDefinition['controlProperty']);
     }
     else {
         //e.g. sections ==> loop over all properties = subsections or other
@@ -954,80 +957,6 @@ 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
- * @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}`]));
-    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 = {};
-    actions.additionalProperties = false;
-    //Determine annotation path
-    if (lineItemAnnotation) {
-        lineItemPath = exports.createAnnotationPath(entityType.fullyQualifiedName, lineItemAnnotation.term, lineItemAnnotation.qualifier);
-        appSchema['definitions'][lineItemId].annotationPath = appSchema['definitions'][schemaIdForToolBar].annotationPath = lineItemPath;
-    }
-    return { actions, lineItemPath };
-}
-exports.addCommonLineItemDefinitions = addCommonLineItemDefinitions;
-/**
- * Method adds definition for 'RelatedFacetKeys' as enum with describtion and adds references to 'RelatedFacetKeys' for custom section definitions.
- * @param {object} schema App specific schema that potentially gets enhanced
- * @param {string[]>} sectionDefinitions array of section definitions which should be updated with new reference to 'RelatedFacetKeys' enum.
- * @param {FacetSection[]} facetSections Array of facet section objects which is used to generate enum values.
- * @param {Array<keyof Omit<FacetSection, 'custom'>>} idProperties Array of property names which should be looked up in 'FacetSection' object.
- *  Please note that method depends on order and takes first non empty value associated to passed properties.
- */
-function addDefinitionForRelatedFacetKeys(schema, sectionDefinitions, facetSections, idProperties) {
-    const oneOfSections = facetSections.map((section) => {
-        // Loop accaptable properties in received order and find first entry with value
-        const propertyName = idProperties.find((property) => !!section[property]);
-        const schemaIdForSection = section[propertyName];
-        return Object.assign(Object.assign({ const: schemaIdForSection }, (section.label && { description: section.label })), (section.custom && { custom: section.custom }));
-    });
-    // Change 'relatedFacet' only when we have entries for sections - otherwise use generic.
-    if (oneOfSections.length) {
-        // Create new definition in schema as 'oneOf'.
-        // Simpler way would be to use 'enum', but then there no option to pass description.
-        schema['definitions']['RelatedFacetKeys'] = {
-            type: 'string',
-            oneOf: oneOfSections
-        };
-        // Add enum definition
-        for (const name of sectionDefinitions) {
-            const definition = schema['definitions'][name];
-            const property = definition['properties']['relatedFacet'];
-            definition['properties']['relatedFacet'] = {
-                anyOf: [
-                    {
-                        $ref: exports.DEFINITION_LINK_PREFIX + 'RelatedFacetKeys'
-                    },
-                    property
-                ]
-            };
-        }
-    }
-}
-exports.addDefinitionForRelatedFacetKeys = addDefinitionForRelatedFacetKeys;
 /**
  * Custom array merge function called by deepmerge's merge function
  *