@sap/ux-specification 1.96.11 → 1.96.14

package/dist/src/specification/v2/controls/Action.d.ts

@@ -1,4 +1,6 @@
-/// <reference types="@sapui5/ts-types" />
+/// <reference types="@sapui5/ts-types-esm" />
+import type { ButtonType } from 'sap/m/library';
+import type { URI } from 'sap/ui/core/library';
 /**
  * Actions
  * @isViewNode true
@@ -19,15 +21,15 @@ export interface Action {
     /**
      * Icon to be displayed as graphical element within the Button. Can be an image or icon from the icon font (https://sapui5.hana.ondemand.com/test-resources/sap/m/demokit/iconExplorer/webapp/index.html#/overview/SAP-icons), represented as RFC 3986 conformant URI.
      */
-    icon?: sap.ui.core.URI;
+    icon?: URI;
     /**
      * Alternative icon for the active (depressed) state of the button. Can be an image or icon from the icon font (https://sapui5.hana.ondemand.com/test-resources/sap/m/demokit/iconExplorer/webapp/index.html#/overview/SAP-icons), represented as RFC 3986 conformant URI.
      */
-    activeIcon?: sap.ui.core.URI;
+    activeIcon?: URI;
     /**
      * Defines the Button type.
      */
-    type?: sap.m.ButtonType;
+    type?: ButtonType;
 }
 /**
  * Form Action

package/dist/src/specification/v2/controls/Facets.d.ts

@@ -7,10 +7,11 @@ export declare type ObjectPageTableTypeV2 = ObjectPageResponsiveTable | ObjectPa
 export interface LineItemFacet {
     table: ObjectPageTableTypeV2;
 }
+export declare type FormFacetType = boolean | number | string | object;
 /**
  * Form Facet
  * @isViewNode true
  */
 export interface FormFacet {
-    [id: string]: boolean | number | string | object;
+    [id: string]: FormFacetType;
 }

package/dist/src/specification/v2/controls/ObjectPageHeader.d.ts

@@ -1,5 +1,6 @@
-/// <reference types="@sapui5/ts-types" />
+/// <reference types="@sapui5/ts-types-esm" />
 import type { HeaderAction } from '.';
+import type AvatarShape from 'sap/m/AvatarShape';
 export interface GenericActions {
     [id: string]: HeaderAction;
 }
@@ -23,7 +24,7 @@ export interface ObjectPageHeader<ACT = GenericActions> {
     /**
      * With displayShape you can define the shape of the avatar.
      */
-    displayShape?: sap.m.AvatarShape;
+    displayShape?: AvatarShape;
     /**
      * Set properties of actions on Object Page Header
      */

package/dist/src/specification/v2/controls/ObjectPageSection.d.ts

@@ -4,7 +4,7 @@ import type { ViewTypes, SAPUI5_FRAGMENT_CLASS, SAPUI5_VIEW_CLASS } from '../../
  * Section
  * @isViewNode true
  */
-export interface ObjectPageSection {
+export interface ObjectPageSectionV2 {
     /**
      * Whether the section should be visible on the screen.
      */
@@ -14,39 +14,74 @@ export interface ObjectPageSection {
  * Form
  * @isViewNode true
  */
-export interface ObjectPageSectionFormV2 extends ObjectPageSection {
+export interface ObjectPageSectionFormV2 extends ObjectPageSectionV2 {
     form?: ObjectPageForm;
 }
+export declare type AnyObjectPageTableType = ObjectPageResponsiveTableWithMultiSelect | ObjectPageResponsiveTableWithInlineDelete | ObjectPageAnalyticalTable | ObjectPageGridTable | ObjectPageTreeTable;
 /**
  * Table
  * @isViewNode true
  */
-export interface ObjectPageSectionTableV2 extends ObjectPageSection {
-    table?: ObjectPageResponsiveTableWithMultiSelect | ObjectPageResponsiveTableWithInlineDelete | ObjectPageAnalyticalTable | ObjectPageGridTable | ObjectPageTreeTable;
+export interface ObjectPageSectionTableV2 extends ObjectPageSectionV2 {
+    table?: AnyObjectPageTableType;
 }
 /**
  * Chart
  * @isViewNode true
  */
-export interface ObjectPageSectionChartV2 extends ObjectPageSection {
+export interface ObjectPageSectionChartV2 extends ObjectPageSectionV2 {
     chart?: ObjectPageChart;
 }
+export interface ObjectPageSectionContactV2 extends ObjectPageSectionV2 {
+    /**
+     * Contact
+     *  @isViewNode true
+     */
+    contact?: object;
+}
+export interface ObjectPageSectionAddressV2 extends ObjectPageSectionV2 {
+    /**
+     * Address
+     *  @isViewNode true
+     */
+    address?: object;
+}
+export interface ObjectPageSubSectionContactV2 extends ObjectPageSectionV2 {
+    /**
+     * Contact
+     *  @isViewNode true
+     */
+    contact?: object;
+}
+export interface ObjectPageSubSectionAddressV2 extends ObjectPageSectionV2 {
+    /**
+     * Address
+     *  @isViewNode true
+     */
+    address?: object;
+}
+export declare type AnySubSectionType = ObjectPageSectionTableV2 | ObjectPageSectionChartV2 | ObjectPageSectionFormV2 | ObjectPageSubSectionContactV2 | ObjectPageSubSectionAddressV2;
+export interface GenericSubSections {
+    [key: string]: AnySubSectionType;
+}
 /**
  * Subsection
  * @isViewNode true
  */
-export interface ObjectPageSubSectionV2 extends ObjectPageSection {
-    subsections?: object;
+export interface ObjectPageSubSectionV2 extends ObjectPageSectionV2 {
+    subsections?: GenericSubSections;
 }
+export declare type AnySectionType = ObjectPageSectionTableV2 | ObjectPageSectionChartV2 | ObjectPageSectionFormV2 | ObjectPageSectionContactV2 | ObjectPageSectionAddressV2 | ObjectPageSectionV2 | ObjectPageSubSectionV2;
 export interface GenericSections {
-    [key: string]: ObjectPageSectionTableV2 | ObjectPageSectionChartV2 | ObjectPageSectionFormV2 | ObjectPageSubSectionV2;
+    [key: string]: AnySectionType;
 }
+export declare type CustomSectionTypeV2 = ObjectPageCustomSectionView | ObjectPageCustomSectionFragment;
 /**
  * Custom Sections
  * @isViewNode true
  */
 export interface CustomSections {
-    custom?: (ObjectPageCustomSectionView | ObjectPageCustomSectionFragment)[];
+    custom?: CustomSectionTypeV2[];
 }
 export interface ObjectPageCustomSectionBase {
     relatedFacet: string;

package/dist/src/specification/v2/controls/ObjectPageTable.d.ts

@@ -1,6 +1,8 @@
-/// <reference types="@sapui5/ts-types" />
+/// <reference types="@sapui5/ts-types-esm" />
 import type { GenericColumns, TableTypeV2, QuickVariant } from './Table';
 import type { ObjectPageToolBar } from './ObjectPageToolBar';
+import type { PopinLayout } from 'sap/m/library';
+import type { smarttable } from 'sap/ui/comp/library';
 export interface QuickVariantSelectionOP {
     /**
      * To show the number of records available, set showCounts to true.
@@ -53,7 +55,7 @@ export interface ObjectPageCommonTableSettings<COLS = GenericColumns> {
     /**
      * Specifies the type of export to be used in the SmartTable control. UI5Client is the default option.
      */
-    exportType?: sap.ui.comp.smarttable.ExportType;
+    exportType?: smarttable.ExportType;
     /**
      * Use createMode 'inline' to enable inline creation of table entries for draft enabled applications.
      */
@@ -90,7 +92,7 @@ export interface ObjectPageResponsiveTableCommonSettings extends ObjectPageCommo
     /**
      * popinLayout defines the layout in which the table pop-in rows shall be rendered.
      */
-    popinLayout?: sap.m.PopinLayout;
+    popinLayout?: PopinLayout;
     /**
      * growingThreshold defines the number of items to be requested from the model for each grow. This property can only be used if the growing property is set to true.
      */

package/dist/src/specification/v2/controls/Table.d.ts

@@ -1,7 +1,10 @@
-/// <reference types="@sapui5/ts-types" />
+/// <reference types="@sapui5/ts-types-esm" />
 import type { SAPUI5_FRAGMENT_CLASS } from '../../common/webapp/manifest/sapUi5';
 import type { ToolBar } from './ToolBar';
 import type { Action } from './Action';
+import type { PopinLayout } from 'sap/m/library';
+import type { smarttable } from 'sap/ui/comp/library';
+import type { TextAlign } from 'sap/ui/core/library';
 /**
  * Column
  * @isViewNode true
@@ -14,7 +17,7 @@ export interface TableColumn {
     /**
      * The hAlign property defines the horizontal alignment of the column content.
      */
-    hAlign?: sap.ui.core.TextAlign;
+    hAlign?: TextAlign;
 }
 /**
  * Column Action
@@ -219,7 +222,7 @@ export interface CommonTableSettings<COLS = GenericColumns> {
     /**
      * Specifies the type of export to be used in the SmartTable control. UI5Client is the default option.
      */
-    exportType?: sap.ui.comp.smarttable.ExportType;
+    exportType?: smarttable.ExportType;
     /**
      * Set to false if the table does not occupy the entire space available in the container.
      */
@@ -267,7 +270,7 @@ export interface ResponsiveTableCommonSettings extends CommonTableSettings {
     /**
      * popinLayout defines the layout in which the table pop-in rows are rendered.
      */
-    popinLayout?: sap.m.PopinLayout;
+    popinLayout?: PopinLayout;
     /**
      * createWithFilters adds a new create action that uses the filter settings as input.
      */

package/dist/src/specification/v4/controls/Table.d.ts

@@ -36,7 +36,7 @@ export interface TableCreationMode {
      */
     name?: TableCreationModeType;
     /**
-     * In case of inline creation mode you can decide if the new row will be created at the end of the table, or direcly after the currently selected table. The default value is "true"
+     * In case of inline creation mode you can decide if the new row will be created at the end of the table, or directly after the currently selected table. The default value is "true"
      */
     createAtEnd?: boolean;
 }
@@ -50,7 +50,7 @@ export interface ViewTableCreationMode {
      */
     name?: TableCreationModeType;
     /**
-     * In case of inline creation mode you can decide if the new row will be created at the end of the table, or direcly after the currently selected table. The default value is "true"
+     * In case of inline creation mode you can decide if the new row will be created at the end of the table, or directly after the currently selected table. The default value is "true"
      */
     createAtEnd?: boolean;
 }

package/dist/src/specification/v4/pages/ListReportConfig.d.ts

@@ -13,7 +13,7 @@ export interface ListReportConfig extends PageConfig {
      */
     variantManagement?: VariantManagementTypeListReport;
     /**
-     * Filter bar
+     * Filter Bar
      */
     filterBar?: FilterBar;
     /**

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

@@ -17,7 +17,7 @@ export declare abstract class AppProvider {
      * Create config files for app (app.json) and pages (pages/{name}.json).
      * This is basically a copy of createFiles optimized to be used in FTFS:
      * it always uses posix path notation with forward slash (/)
-     * @param {ConverterOutput} oDataServiceAVT - Complete service information, as returned by annotation vocabularies tool
+     * @param {ConvertedMetadata} oDataServiceAVT - Complete service information, as returned by annotation vocabularies tool
      * @returns app and page files as separate objects
      */
     createConfigFiles(): {

package/dist/src/sync/common/decoration/control.d.ts

@@ -35,7 +35,7 @@ export declare enum BindingValue {
  * @param controlType - controlType function of ecorators, not used here
  * @param title - title from JSON schema, comprising the facet ID
  */
-export declare const buildColumnControlId: (baseId: string, idBreadcrumbs: string[], breadcrumbs: string[], controlType: ControlTypeFunction, title: string) => string;
+export declare const buildColumnControlId: (baseId: string, idBreadcrumbs: string[], breadcrumbs: string[], _controlType: ControlTypeFunction, title: string) => string;
 /**
  * Split up action breadcrumb and return different parts from it
  * @param breadcrumbs - array of breadcrumbs

package/dist/src/sync/common/decoration/decorators.d.ts

@@ -2,11 +2,11 @@ import 'reflect-metadata';
 import type { SyncRule, PageLayoutInformation, ValidityInformation } from '../types';
 export declare const reflectMetadataKey: unique symbol;
 export declare const syncRule: (propSpec: SyncRule) => any;
-export declare function getReflectMetadata(target: any, propertyName: string): SyncRule;
+export declare function getReflectMetadata(target: object, propertyName: string): SyncRule | undefined;
 export declare const pageLayoutInformation: (pageInfo: PageLayoutInformation) => (constructor: Function) => void;
 export declare const childId: (id: string) => any;
 export declare const getChildId: (target: any, propertyName: string) => string;
 export declare const getPageLayoutInformation: (target: any) => PageLayoutInformation;
 export declare const validityMetadataKey: unique symbol;
 export declare const validity: (propSpec: ValidityInformation) => any;
-export declare function getTextForDeprecated(key: string, validity?: ValidityInformation): string;
+export declare function getTextForDeprecated(key: string, validityInformation?: ValidityInformation): string;

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

@@ -1,8 +1,7 @@
-import type { ConverterOutput, EntityType } from '@sap-ux/vocabularies-types';
+import type { ConvertedMetadata, EntitySet, EntityType } from '@sap-ux/vocabularies-types';
 import { FioriElementsVersion } from '../../../specification/common';
 import type { FacetConfig } from '..';
 import { SectionType } from '..';
-import type { EntitySet } from '@sap-ux/annotation-converter';
 import type { Definition } from 'typescript-json-schema';
 /**
  * Adds definitions for forms in object page sections to the app schema
@@ -16,10 +15,10 @@ export declare function handleForm(sectionType: SectionType, section: FacetConfi
 /**
  * Replaces an alias in an annotation ID or reference, based on the AVT references' list
  * @param annotationIdentifier - annotation ID or reference
- * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
+ * @param {ConvertedMetadata} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
  * @returns the converted string
  */
-export declare function replaceAlias(annotationIdentifier: string, oDataServiceAVT: ConverterOutput): string;
+export declare function replaceAlias(annotationIdentifier: string, oDataServiceAVT: ConvertedMetadata): string;
 /**
  * Common routine to determine the name and the ID of a header action
  * @param action - action as given by AVT
@@ -35,16 +34,16 @@ export declare function getActionNameAndId(action: string, entityType: EntityTyp
  *
  * @param {object} appSchema Schema of the app
  * @param {EntityType} entityType - current entity type
- * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
+ * @param {ConvertedMetadata} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
  */
-export declare function addFooterActions(appSchema: Definition, entityType: EntityType, oDataServiceAVT: ConverterOutput): void;
+export declare function addFooterActions(appSchema: Definition, entityType: EntityType, oDataServiceAVT: ConvertedMetadata): void;
 /**
  * Add Object Page Header Action Buttons to app-specific schema
  * @param {object} appSchema Schema of the app
  * @param {EntityType} entityType - current entity type
- * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
+ * @param {ConvertedMetadata} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
  */
-export declare function addHeaderActions(appSchema: Definition, entityType: EntityType, oDataServiceAVT: ConverterOutput, addHeaderActionCallBack: any): void;
+export declare function addHeaderActions(appSchema: Definition, entityType: EntityType, oDataServiceAVT: ConvertedMetadata, addHeaderActionCallBack: any): void;
 /**
  * Adds common Object Page Header definitions to the app schema
  * @param appSchema - app-specific JSOn schema
@@ -57,4 +56,4 @@ export declare function addCommonHeaderSchema(appSchema: Definition, entityType:
  * @param serviceAVT - AVT converter output, comprising all annotation information
  * @returns the entity set as defined in AVT, if found
  */
-export declare function determineEntitySetOfFacet(facet: FacetConfig, serviceAVT: ConverterOutput): EntitySet | undefined;
+export declare function determineEntitySetOfFacet(facet: FacetConfig, serviceAVT: ConvertedMetadata): EntitySet | undefined;

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

@@ -1,10 +1,10 @@
-import type { EntitySet, EntityType } from '@sap-ux/annotation-converter';
-import type { AnnotationTerm, ConverterOutput, LineItem } from '@sap-ux/vocabularies-types';
+import type { AnnotationTerm, ConvertedMetadata, EntitySet, EntityType } from '@sap-ux/vocabularies-types';
+import type { LineItem } from '@sap-ux/vocabularies-types/vocabularies/UI';
 import type { Definition } from 'typescript-json-schema';
-import type { FacetConfig, FacetSection } from '..';
+import type { FacetConfig, FacetSection, SectionType } from '..';
 import type { SectionTypeV2 } from '../../v2/types';
 import type { PresentationVariantV4 } from '../../v4/types';
-import { UIAnnotationTerms } from '@sap-ux/vocabularies-types';
+import { UIAnnotationTerms } from '@sap-ux/vocabularies-types/vocabularies/UI';
 import { DefinitionName } from '..';
 /**
  * Adds an enum filled with existing UI annotations of the given list (validAnnotations)
@@ -29,11 +29,11 @@ export declare function addEnumForSingleTabVariant(entityType: EntityType, appSc
 export declare function addEnumForMultiTabVariant(appSchema: Definition, definitionName: string, entitySet: EntitySet): void;
 /**
  * Adds the enum values for entitySet as part of the multiple view scenario
- * @param {ConverterOutput} oDataServiceAVT - combined service metadata, as returned by annotation vocabularies tools
+ * @param {ConvertedMetadata} 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: Definition, definitionName: string): void;
+export declare function addEnumForVariantEntitySet(oDataServiceAVT: ConvertedMetadata, appSchema: Definition, definitionName: string): void;
 /**
  * Adds an enum filled with existing UI annotations for annotationPath property in FilterBar
  * @param {EntityType} entityType
@@ -54,7 +54,7 @@ export declare function addDefinitionForRelatedFacetKeys(appSchema: Definition,
  * 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 entityType - the entity type as part of the AVT ConvertedMetadata
  * @param lineItemId - line item ID, as comprise in stable ID
  * @param customColumnDefinitionName - (optional) definition name of custom column.
  *        Passed in the V4 case, then additional properties of this type will be allowed.
@@ -116,19 +116,37 @@ export declare function getFacetKeyInSchema(facetKey: string): string;
  * @param facetKey - key of the facet, as used in annotation
  * @param {Definition} appSchema App schema in general
  * @param {boolean} useDefinitionAsKey If set to false, facet key will solely be used as key, else encapsulated within definition key `definition<facetKey>`
+ * @param subDefinitionName - sub definition, if different from the definition (e.g. subsection vs. section)
  * @returns {Definition} part of app schema that has been added and filled
  */
-export declare function parseSchemaDefinition(definition: DefinitionName | SectionTypeV2, facetKey: string, appSchema: Definition, useDefinitionAsKey?: boolean): Definition;
+export declare function parseSchemaDefinition(definition: DefinitionName | SectionTypeV2, facetKey: string, appSchema: Definition, useDefinitionAsKey?: boolean, subDefinitionName?: DefinitionName): Definition;
 /**
  * Creates a definition link for a facet and definition name
- * @param definition name of definition, as used in schema
- * @param facetKey - key of the facet, as used in annotation
+ * @param {DefinitionName} definition - name of definition, as used in schema
+ * @param {string} facetKey - key of the facet, as used in annotation
  * @returns definition link of facet, as used in definition
  */
 export declare function getFacetDefinitionLink(definition: DefinitionName | SectionTypeV2, facetKey: string): string;
+/**
+ * Creates and adds a reference link to a definition
+ * @param {Definition} schemaPart - part of schema to add $ref to
+ * @param {string} schemaRef - reference to be added
+ * @param {string} schemaKey - key to be encapsulated within reference as `schemaRef<schemaKey>`
+ * @returns reference link of facet, as used in definition
+ */
+export declare function addDefinitionRef(schemaPart: Definition, schemaRef: string, schemaKey?: string): void;
 /**
  * Extracts annotationPath from facet or Chart/LineItem fullyQualifiedName
  * @param facet facet or Chart/LineItem
  * @returns {string} annotationPath
  */
 export declare function getFacetAnnotationPath(facet: FacetConfig | PresentationVariantV4 | object): string | undefined;
+/**
+ * Adds definitions for Address and Contact items in object page sections to the app schema
+ * @param {FacetConfig} facet - current facet.
+ * @param {string} facetKey - facet key.
+ * @param {object} sections - schema of current sections definition.
+ * @param {object} appSchema - app specific schema that potentially gets enhanced.
+ * @param {SectionType} sectionPrefix - prefix to distinguish Section and HeaderSection
+ */
+export declare function handleAddressContact(facet: FacetConfig, facetKey: string, sections: Definition, appSchema: Definition, sectionPrefix: SectionType, subSectionPrefix?: SectionType, versionPostfix?: string): void;

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

@@ -1,5 +1,6 @@
 import type { DeprecatedProperties, SyncRule } from '../';
 import type { ExtensionLogger } from '../../../apiTypes';
+import type { Definition } from 'typescript-json-schema';
 /**
  * Transfers the value of a single manifest setting to the config
  * @param syncRule - Metadata rule
@@ -22,11 +23,11 @@ export declare function importProperty(syncRule: SyncRule, manifestSection: {},
  */
 export declare function checkDeprecatedProperties(deprecatedProperties: DeprecatedProperties | undefined, manifestSection: {}, path: string, logger?: ExtensionLogger): void;
 /**
- * get title of the section (Facet ID)
+ * Determines the title of a section representation in the app schema, main aspect is checking the facet ID
  * @param schemaSection - Section in manifest.json
  * @param jsonSchema - app specific schema
  */
-export declare function getSectionTitle(schemaSection: object, jsonSchema: object): string;
+export declare function getSectionTitle(schemaSection: Definition, jsonSchema: Definition): string | undefined;
 /**
  * Method returns target by resolving custom column reference name.
  * For example - 'TableCustomColumns<dummyTarget>' is resolved as 'dummyTarget'.
@@ -34,3 +35,9 @@ export declare function getSectionTitle(schemaSection: object, jsonSchema: objec
  * @returns {string | undefined} Resolved target.
  */
 export declare function getTargetFromCustomColumnRef(ref: string): string | undefined;
+/**
+ * Removes part of a given config, if empty
+ * @param {object} config - config part
+ * @param {string} structure - part of config to be removed
+ */
+export declare function removeEmptyStructure(config: object, structure: string): void;

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

@@ -1,8 +1,7 @@
-import type { ConverterOutput } from '@sap-ux/vocabularies-types';
-import type { EntitySet } from '@sap-ux/vocabularies-types/dist/Converter';
+import type { ConvertedMetadata, EntitySet } from '@sap-ux/vocabularies-types';
 import type { ImportProjectParameters } from '../../apiTypes';
 import type { File } from './types';
-export declare function getEntitySetByEntitySetName(entitySetName: string, oDataServiceAVT: ConverterOutput): EntitySet;
+export declare function getEntitySetByEntitySetName(entitySetName: string, oDataServiceAVT: ConvertedMetadata): EntitySet;
 /**
  * Import the schema and config files for a given project
  * @param {ImportProjectParameters} importParameters - files of the project: manifest, flex changes, odata files

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

@@ -1,5 +1,6 @@
 import type { Manifest } from '../../specification/common/webapp/manifest';
-import type { AnnotationTerm, CollectionFacet, EntityType, ReferenceFacet, ReferenceURLFacet } from '@sap-ux/vocabularies-types';
+import type { AnnotationTerm, EntityType } from '@sap-ux/vocabularies-types';
+import type { CollectionFacet, ReferenceFacet, ReferenceURLFacet } from '@sap-ux/vocabularies-types/vocabularies/UI';
 import type { ManifestSettingsType } from '../../specification/common/types';
 export declare type anyFacetType = AnnotationTerm<CollectionFacet> | AnnotationTerm<ReferenceFacet> | AnnotationTerm<ReferenceURLFacet>;
 export declare enum ExportArtifacts {
@@ -36,6 +37,7 @@ export interface ExportResults {
 }
 export declare enum SectionType {
     Section = "Section",
+    SubSection = "SubSection",
     HeaderSection = "HeaderSection"
 }
 export declare enum ArtifactType {
@@ -181,6 +183,7 @@ export interface FacetConfig {
     entityType?: EntityType;
     annotationPath?: string;
     target?: object;
+    facets?: FacetConfigs;
 }
 export interface SubSectionConfig {
     base: FacetBase;
@@ -239,8 +242,10 @@ export declare enum DefinitionName {
     CustomColumns = "TableCustomColumns",
     CustomSections = "CustomSections",
     FieldPath = "FieldPath",
+    Field = "Field",
     Fields = "Fields",
     Fields4Dialog = "Fields4Dialog",
+    FilterBar = "FilterBar",
     Footer = "Footer",
     FooterActions = "FooterActions",
     Form = "Form",
@@ -299,7 +304,8 @@ export declare enum DefinitionName {
     ViewTableColumn = "ViewTableColumn",
     ViewCustomColumn = "ViewTableCustomColumn",
     ViewChartToolBar = "ViewChartToolBar",
-    ViewToolBarAction = "ViewToolBarAction"
+    ViewToolBarAction = "ViewToolBarAction",
+    ViewPosition = "ViewPosition"
 }
 export declare enum PropertyName {
     actions = "actions",
@@ -315,6 +321,7 @@ export declare enum SchemaTag {
     annotationPath = "annotationPath",
     annotationType = "annotationType",
     artifactType = "artifactType",
+    controlType = "controlType",
     dataType = "dataType",
     fullyQualifiedName = "fullyQualifiedName",
     hidden = "hidden",

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

@@ -3,9 +3,11 @@ import type { ExtensionLogger } from '../../apiTypes';
 import type { FacetConfigs, FileData, FacetConfig, FacetSection, SchemaFilePath, anyFacetType } from './types';
 import type { Manifest } from '../../specification/common';
 import type { MetadataInstanceInterface } from './decoration/factory';
-import type { ConverterOutput, DataFieldAbstractTypes, EntityType, PropertyAnnotations, PropertyPath } from '@sap-ux/vocabularies-types';
+import type { DataFieldAbstractTypes } from '@sap-ux/vocabularies-types/vocabularies/UI';
+import type { ConvertedMetadata, EntityType, PropertyPath } from '@sap-ux/vocabularies-types';
 import { FioriElementsVersion, PageType, PageTypeV4 } from '../../specification/common';
 import { SchemaType } from '../../specification/schemaAccess';
+import type { PropertyAnnotations } from '@sap-ux/vocabularies-types/vocabularies/Edm_Types';
 export declare enum TemplateType {
     ListReportObjectPageV2 = "ListReportObjectPageV2",
     ListReportObjectPageV4 = "ListReportObjectPageV4",
@@ -27,7 +29,7 @@ export declare const createAnnotationPath: (entityTypeName: string, term: string
  * @param annotationFiles - The list of all annotation files, in JSON format
  * @returns the complete service information
  */
-export declare function parseAndMergeAndConvert(annotationFiles: FileData[], logger: ExtensionLogger): ConverterOutput;
+export declare function parseAndMergeAndConvert(annotationFiles: FileData[], logger: ExtensionLogger): ConvertedMetadata;
 export declare const getAnnotationPropertyValue: (annotationProperty: any) => string;
 /**
  * Checks for Common.Label and overwrites the label from it if present
@@ -53,7 +55,7 @@ export declare function getLabelForDataField(field: DataFieldAbstractTypes, enti
 /**
  * Determines the description of a data field, e.g. for the column header
  * @param dataFieldAbstract - the given record of the line item annotation
- * @param entityType - the entity type as part of the AVT ConverterOutput
+ * @param entityType - the entity type as part of the AVT ConvertedMetadata
  */
 export declare function getDataFieldDescription(dataFieldAbstract: DataFieldAbstractTypes, entityType: EntityType): string;
 /**
@@ -75,24 +77,24 @@ export declare function getPageTypeV4(name: string): PageTypeV4 | 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
+ * @param {ConvertedMetadata} 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;
+export declare function findAlias(namespace: string, oDataServiceAVT: ConvertedMetadata): 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 {ConvertedMetadata} 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: anyFacetType, sourceEntityType: EntityType, oDataServiceAVT: ConverterOutput, logger?: ExtensionLogger, oDataVersion?: FioriElementsVersion, keyForRelatedFacetKeys?: boolean): FacetSection | undefined;
+export declare function getSectionFacet(facetDefinition: anyFacetType, sourceEntityType: EntityType, oDataServiceAVT: ConvertedMetadata, logger?: ExtensionLogger, oDataVersion?: FioriElementsVersion, keyForRelatedFacetKeys?: boolean): FacetSection | undefined;
 /**
  * Finds the alias for a given namespace in the references' section of the converted service metadata.
  * An empty object is created if the path element does not exist yet.
- * Exception: if an empty array is the next element  of the 'path' definition, an empty array is created instaed of an empty object.
+ * Exception: if an empty array is the next element  of the 'path' definition, an empty array is created instead of an empty object.
  * @param {object} manifest - manifest that is being modified during export
  * @param {string} path - path of the property in the manifest
  * @param {string} targetAnnotation - target annotation (optional)
@@ -105,19 +107,19 @@ export declare function getSchemaKeyOfLineItemRecord(lineItemRecord: DataFieldAb
 /**
  * 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 {ConvertedMetadata} 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 | undefined;
+export declare function getObjectPageHeaderFacets(entityType: EntityType, oDataServiceAVT: ConvertedMetadata, oDataVersion?: FioriElementsVersion, logger?: ExtensionLogger): FacetConfigs | undefined;
 /**
  * Retrieve 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 {ConvertedMetadata} 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 getObjectPageFacets(entityType: EntityType, oDataServiceAVT: ConverterOutput, oDataVersion?: FioriElementsVersion, logger?: ExtensionLogger): FacetConfigs | undefined;
+export declare function getObjectPageFacets(entityType: EntityType, oDataServiceAVT: ConvertedMetadata, oDataVersion?: FioriElementsVersion, logger?: ExtensionLogger): FacetConfigs | undefined;
 /**
  * Returns the version of Fiori elements (v2/v4) from a given manifest
  * @param manifest - the manifest.json file
@@ -158,23 +160,23 @@ export declare function addSectionTitleAndDescription(facet: FacetConfig, sectio
  * @param section - section in the app schema
  * @param facetKey - key of the facet
  */
-export declare function addTargetTitleAndSectionDescription(facet: FacetConfig, section: object, facetKey: string): void;
+export declare function addTargetTitleAndSectionDescription(facet: FacetConfig, section: Definition, facetKey: string): void;
 /**
  * Creates a default object for a new section or subsection, and adds the ID as title if present.
  * @param facet Facet configuration, to be analyzed
  * @returns the new section object
  */
-export declare function createSectionWithoutProperties(facet: FacetConfig, facetKey: string): Definition;
+export declare function createDefaultSection(appSchema: Definition, facet: FacetConfig, facetKey: string): Definition;
 /**
  * Retrieve page section data(so far id/key and label/description).
  * @param {EntityType} entityType The actual entityType
- * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
+ * @param {ConvertedMetadata} 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, checkUnresolvableFacets?: boolean): FacetSection[];
+export declare function getObjectPageFacetSection(entityType: EntityType, oDataServiceAVT: ConvertedMetadata, 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
@@ -206,7 +208,7 @@ export declare type NextDefinition = {
 };
 /**
  * Recursive function to determine the next config part, next definition in the app schema and the title
- * @param appSchema - app-spcific JSON schema
+ * @param appSchema - app-specific JSON schema
  * @param title - default title
  * @param currentConfigObject - current part of the configuration that gets traversed
  * @param propertyDefinition - definition of a given property in the app schema