@sap/ux-specification 1.71.72 → 1.71.74

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

@@ -5,12 +5,14 @@ import type { Definition } from 'typescript-json-schema';
 /**
  * Adds definitions for forms in object page sections to the app schema
  * @param {SectionType} sectionType - prefix to distinguish Section and HeaderSection
- * @param {FacetConfig} section - facet or section in the FE core model
+ * @param {FacetConfig} section - section definition, as prepared from the annotations
  * @param {object} appSchemaSection - current definition of facet or section in the JSON schema
  * @param {object} appSchema - app specific schema that gets enhanced
  * @param {FioriElementsVersion} version - Fiori Elements version
+ * @param {string} facetKey - facet key
+ * @returns {string | undefined} target id of form
  */
-export declare function handleForm(sectionType: SectionType, section: FacetConfig, appSchemaSection: Definition, appSchema: Definition, version: FioriElementsVersion, withActions?: boolean): void;
+export declare function handleForm(sectionType: SectionType, section: FacetConfig, appSchemaSection: Definition, appSchema: Definition, version: FioriElementsVersion, facetKey: string): string | undefined;
 /**
  * Replaces an alias in an annotation ID or reference, based on the AVT references' list
  * @param annotationIdentifier - annotation ID or reference
@@ -21,12 +23,12 @@ export declare function replaceAlias(annotationIdentifier: string, oDataServiceA
 /**
  * Common routine to determine the name and the ID of a header action
  * @param action - action as given by AVT
- * @param entityType - entity type by AVT
  * @returns an object comprising action name and action id
  */
-export declare function getActionNameAndId(action: string, entityType: EntityType): {
+export declare function getActionNameAndId(item: any, oDataServiceAVT: ConvertedMetadata): {
     actionName: string;
     actionId: string;
+    namespace: string;
 };
 /**
  * Add Object Page Footer Action Buttons to app-specific schema

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

@@ -1 +1 @@
-{"version":3,"file":"objectPage.d.ts","sourceRoot":"","sources":["../../../../../src/sync/common/generate/objectPage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAI3F,OAAO,KAAK,EAAE,WAAW,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAC5F,OAAO,EAGH,oBAAoB,EAGpB,WAAW,EAEd,MAAM,6BAA6B,CAAC;AASrC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAgIzD;;;;;;;GAOG;AACH,wBAAgB,UAAU,CACtB,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,WAAW,EACpB,gBAAgB,EAAE,UAAU,EAC5B,SAAS,EAAE,UAAU,EACrB,OAAO,EAAE,oBAAoB,EAC7B,WAAW,UAAO,GACnB,IAAI,CAyEN;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,oBAAoB,EAAE,MAAM,EAAE,eAAe,EAAE,iBAAiB,GAAG,MAAM,CAarG;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,GAAG;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAenH;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,UAAU,EAAE,kBAAkB,EAAE,2BAA2B,GAAG,IAAI,CA+D7G;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC5B,SAAS,EAAE,UAAU,EACrB,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,iBAAiB,EAClC,uBAAuB,KAAA,GACxB,IAAI,CAoCN;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI,CAUzF;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,GAAG,SAAS,GAAG,SAAS,CAMlH"}
+{"version":3,"file":"objectPage.d.ts","sourceRoot":"","sources":["../../../../../src/sync/common/generate/objectPage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAI3F,OAAO,KAAK,EAAE,WAAW,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAE5F,OAAO,EAGH,oBAAoB,EAGpB,WAAW,EAEd,MAAM,6BAA6B,CAAC;AASrC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA2WzD;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CACtB,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,WAAW,EACpB,gBAAgB,EAAE,UAAU,EAC5B,SAAS,EAAE,UAAU,EACrB,OAAO,EAAE,oBAAoB,EAC7B,QAAQ,EAAE,MAAM,GACjB,MAAM,GAAG,SAAS,CAwDpB;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,oBAAoB,EAAE,MAAM,EAAE,eAAe,EAAE,iBAAiB,GAAG,MAAM,CAarG;AAED;;;;GAIG;AAEH,wBAAgB,kBAAkB,CAC9B,IAAI,EAAE,GAAG,EACT,eAAe,EAAE,iBAAiB,GACnC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CA0B7D;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,UAAU,EAAE,kBAAkB,EAAE,2BAA2B,GAAG,IAAI,CA+D7G;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC5B,SAAS,EAAE,UAAU,EACrB,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,iBAAiB,EAClC,uBAAuB,KAAA,GACxB,IAAI,CAoCN;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI,CAUzF;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,GAAG,SAAS,GAAG,SAAS,CAMlH"}

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

@@ -3,7 +3,40 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.determineEntitySetOfFacet = exports.addCommonHeaderSchema = exports.addHeaderActions = exports.addFooterActions = exports.getActionNameAndId = exports.replaceAlias = exports.handleForm = void 0;
 const StableIdHelper_1 = require("../../v4/utils/StableIdHelper");
 const ux_specification_types_1 = require("@sap/ux-specification-types");
+const ux_specification_types_2 = require("@sap/ux-specification-types");
 const __1 = require("..");
+/**
+ * Copies the field properties from the generic definition to the specific field definition
+ * @param {FioriElementsVersion} version - Fiori Elements version
+ * @param {object} appSchema - App schema in general
+ * @param {DataFieldAbstractTypes} field - field definition in parser output (AVT)
+ * @param {string} fieldDefinition - the unique ID for the given field definition
+ */
+function copyFieldProperties(version, appSchema, field, fieldDefinition) {
+    if (version === ux_specification_types_2.FioriElementsVersion.v4 && appSchema['definitions']['Field']) {
+        switch (field.$Type) {
+            case "com.sap.vocabularies.UI.v1.DataField" /* DataField */:
+            case "com.sap.vocabularies.UI.v1.DataFieldForAnnotation" /* DataFieldForAnnotation */:
+            case "com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath" /* DataFieldWithNavigationPath */:
+            case "com.sap.vocabularies.UI.v1.DataFieldWithUrl" /* DataFieldWithUrl */: {
+                appSchema.definitions[fieldDefinition].properties =
+                    appSchema.definitions.Field['properties'];
+                break;
+            }
+        }
+    }
+    else if (version === ux_specification_types_2.FioriElementsVersion.v2 && appSchema['definitions']['Field']) {
+        switch (field.$Type) {
+            case "com.sap.vocabularies.UI.v1.DataField" /* DataField */:
+            case "com.sap.vocabularies.UI.v1.DataFieldForAnnotation" /* DataFieldForAnnotation */:
+            case "com.sap.vocabularies.UI.v1.DataFieldWithUrl" /* DataFieldWithUrl */: {
+                appSchema.definitions[fieldDefinition].properties =
+                    appSchema.definitions.Field['properties'];
+                break;
+            }
+        }
+    }
+}
 /**
  * Determines the name for a field definition in app schema
  * @param {FioriElementsVersion} version - Fiori Elements version
@@ -13,16 +46,102 @@ const __1 = require("..");
  * @returns the field definition name in schema
  */
 function determineFieldDefinitionName(version, fieldReferenceId, targetID, fieldReference) {
-    const fieldReferenceType = version === ux_specification_types_1.FioriElementsVersion.v2 && fieldReferenceId && fieldReferenceId.includes('::')
+    const fieldReferenceType = version === ux_specification_types_2.FioriElementsVersion.v2 && fieldReferenceId && fieldReferenceId.includes('::')
         ? fieldReferenceId.split('::')[0].replace('DataField', 'Field')
         : undefined;
-    if (version === ux_specification_types_1.FioriElementsVersion.v2) {
+    if (version === ux_specification_types_2.FioriElementsVersion.v2) {
         return `${fieldReferenceType}<${targetID}::${fieldReference}>`;
     }
     else {
         return `${targetID}::${fieldReference}`;
     }
 }
+/**
+ * Add th keys and targt tag for Datafield*
+ * @param field - the given field definition
+ * @param appSchema - the app schema to be updated
+ * @param schemaKeyOfField - key for the given field in the app schema
+ */
+function addKeysTagForDataField(field, appSchema, schemaKeyOfField) {
+    if (typeof field.Value !== 'string' && field.Value.type === 'Path') {
+        appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.keys] = [
+            {
+                name: 'Value',
+                value: field.Value.path
+            }
+        ];
+        appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.target] = field.Value.$target
+            ? field.Value.$target.fullyQualifiedName.split('/')[0]
+            : field.Value.targetString.split('/')[0];
+    }
+    else if (typeof field.Value === 'string' && field.Value) {
+        appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.keys] = [
+            {
+                name: 'Value',
+                value: field.Value
+            }
+        ];
+        appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.target] = field.fullyQualifiedName.split('@')[0];
+    }
+}
+/**
+ * Adds the "keys" tag to a field definition in schema
+ * @param field - the given field definition
+ * @param appSchema - the app schema to be updated
+ * @param schemaKeyOfField - key for the given field in the app schema
+ */
+function addKeysTagToField(field, appSchema, schemaKeyOfField) {
+    if (field.$Type === "com.sap.vocabularies.UI.v1.DataField" /* DataField */ ||
+        field.$Type === "com.sap.vocabularies.UI.v1.DataFieldWithUrl" /* DataFieldWithUrl */ ||
+        field.$Type === "com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath" /* DataFieldWithNavigationPath */) {
+        addKeysTagForDataField(field, appSchema, schemaKeyOfField);
+    }
+    else if (field.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAnnotation" /* DataFieldForAnnotation */) {
+        appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.keys] = [
+            {
+                name: 'Target',
+                value: field.Target.value
+            }
+        ];
+        appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.target] =
+            field.Target.$target.fullyQualifiedName.split('@')[0];
+    }
+    else if (field.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* DataFieldForAction */) {
+        const separator = field.Action.lastIndexOf('.');
+        if (separator === -1) {
+            appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.keys] = [
+                {
+                    name: 'Action',
+                    value: field.Action
+                }
+            ];
+        }
+        else {
+            appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.keys] = [
+                {
+                    name: 'Action',
+                    value: field.Action.substring(separator + 1, field.Action.length)
+                }
+            ];
+            appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.target] = field.Action.substring(0, separator);
+        }
+    }
+    else if (field.$Type === "com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation" /* DataFieldForIntentBasedNavigation */) {
+        appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.keys] = [
+            {
+                name: 'SemanticObject',
+                value: field.SemanticObject
+            }
+        ];
+        if (field.Action) {
+            appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.keys].push({
+                name: 'Action',
+                value: field.Action
+            });
+        }
+        appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.target] = field.fullyQualifiedName.split('@')[0];
+    }
+}
 /**
  * Adds a field definition to the app specific schema
  * @param {string} sectionType - prefix to distinguish Section and HeaderSection
@@ -36,58 +155,50 @@ function determineFieldDefinitionName(version, fieldReferenceId, targetID, field
 function addField(sectionType, appSchema, field, targetID, key, section, version, withActions = true) {
     // Calculate field reference
     const fieldReferenceId = StableIdHelper_1.getStableIdPartFromDataField(field);
-    const fieldReference = version === ux_specification_types_1.FioriElementsVersion.v2 && fieldReferenceId && fieldReferenceId.includes('::')
+    const fieldReference = version === ux_specification_types_2.FioriElementsVersion.v2 && fieldReferenceId && fieldReferenceId.includes('::')
         ? fieldReferenceId.split('::').splice(1).join('::')
         : fieldReferenceId;
     // Determine field definition name
-    const fieldDefinition = determineFieldDefinitionName(version, fieldReferenceId, targetID, fieldReference);
+    const schemaKeyOfField = determineFieldDefinitionName(version, fieldReferenceId, targetID, fieldReference);
     // Evaluate field type, set field reference of properties of fields' or actions' definition
     if (!field || !field.$Type) {
         return;
     }
     else if (field.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* DataFieldForAction */ ||
         field.$Type === "com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation" /* DataFieldForIntentBasedNavigation */) {
-        if (withActions && sectionType === ux_specification_types_1.SectionType.Section) {
-            const actionsDefinition = __1.prepareRef(`${sectionType}${ux_specification_types_1.DefinitionName.Actions}<${targetID}>`);
+        if (withActions && sectionType === ux_specification_types_2.SectionType.Section) {
+            const actionsDefinition = __1.prepareRef(`${sectionType}${ux_specification_types_2.DefinitionName.Actions}<${targetID}>`);
             const fieldInSchema = (appSchema.definitions[actionsDefinition].properties[fieldReference] =
                 {
-                    $ref: `${__1.DEFINITION_LINK_PREFIX}${fieldDefinition}`
+                    $ref: `${__1.DEFINITION_LINK_PREFIX}${schemaKeyOfField}`
                 });
-            fieldInSchema[ux_specification_types_1.SchemaTag.propertyIndex] = parseInt(key);
+            fieldInSchema[ux_specification_types_2.SchemaTag.propertyIndex] = parseInt(key);
         }
     }
     else {
-        const fieldsDefinition = __1.prepareRef(`${sectionType}${ux_specification_types_1.DefinitionName.Fields}<${targetID}>`);
+        const fieldsDefinition = __1.prepareRef(`${sectionType}${ux_specification_types_2.DefinitionName.Fields}<${targetID}>`);
         appSchema.definitions[fieldsDefinition]['properties'][fieldReference] = {
-            $ref: `${__1.DEFINITION_LINK_PREFIX}${fieldDefinition}`,
+            $ref: `${__1.DEFINITION_LINK_PREFIX}${schemaKeyOfField}`,
             propertyIndex: parseInt(key)
         };
     }
     // Now set up the field definition
-    appSchema.definitions[fieldDefinition] = {
+    appSchema.definitions[schemaKeyOfField] = {
         type: 'object',
         properties: {},
         description: __1.getDatafieldDescription(field, section.entityType),
         additionalProperties: false
     };
     //Add tags
-    appSchema.definitions[fieldDefinition][ux_specification_types_1.SchemaTag.annotationPath] = `/${section.entityType.fullyQualifiedName}/${field.fullyQualifiedName.split(section.entityType.fullyQualifiedName)[1]}`;
-    appSchema.definitions[fieldDefinition][ux_specification_types_1.SchemaTag.annotationType] = field.$Type;
-    appSchema.definitions[fieldDefinition][ux_specification_types_1.SchemaTag.isViewNode] = true;
-    __1.addDataTypeToDefinition(appSchema.definitions[fieldDefinition], field);
-    if (version === ux_specification_types_1.FioriElementsVersion.v2 && appSchema['definitions']['Field']) {
-        switch (field.$Type) {
-            case "com.sap.vocabularies.UI.v1.DataField" /* DataField */:
-            case "com.sap.vocabularies.UI.v1.DataFieldForAnnotation" /* DataFieldForAnnotation */:
-            case "com.sap.vocabularies.UI.v1.DataFieldWithUrl" /* DataFieldWithUrl */: {
-                appSchema['definitions'][fieldDefinition]['properties'] =
-                    appSchema['definitions']['Field']['properties'];
-                break;
-            }
-        }
-    }
-    if (field.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* DataFieldForAction */ && appSchema['definitions']?.['FormAction']) {
-        appSchema['definitions'][fieldDefinition]['properties'] = appSchema['definitions']['FormAction']['properties'];
+    addKeysTagToField(field, appSchema, schemaKeyOfField);
+    appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.annotationPath] = `/${section.entityType.fullyQualifiedName}/${field.fullyQualifiedName.split(section.entityType.fullyQualifiedName)[1]}`;
+    appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.annotationType] = field.$Type;
+    appSchema.definitions[schemaKeyOfField][ux_specification_types_2.SchemaTag.isViewNode] = true;
+    __1.addDataTypeToDefinition(appSchema.definitions[schemaKeyOfField], field);
+    // Copy the generic definition of field properties to the specific one
+    copyFieldProperties(version, appSchema, field, schemaKeyOfField);
+    if (field.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* DataFieldForAction */ && appSchema.definitions?.['FormAction']) {
+        appSchema.definitions[schemaKeyOfField].properties = appSchema.definitions[ux_specification_types_2.DefinitionName.FormAction].properties;
     }
 }
 /**
@@ -109,24 +220,23 @@ function determineTargetIdOfForm(section) {
     return targetID;
 }
 /**
- * Adds definitions for forms in object page sections to the app schema
+ * Adds the specific definitions of the form fields to a schema
+ * @param {FacetConfig} section - section definition, as prepared from the annotations
  * @param {SectionType} sectionType - prefix to distinguish Section and HeaderSection
- * @param {FacetConfig} section - facet or section in the FE core model
- * @param {object} appSchemaSection - current definition of facet or section in the JSON schema
  * @param {object} appSchema - app specific schema that gets enhanced
+ * @param {string } targetID - target id of form
  * @param {FioriElementsVersion} version - Fiori Elements version
  */
-function handleForm(sectionType, section, appSchemaSection, appSchema, version, withActions = true) {
+function addFieldsToFormDefinition(section, sectionType, appSchema, targetID, version, withActions = true) {
     if (!section.target) {
         return;
     }
-    const targetID = determineTargetIdOfForm(section);
-    const formDefinition = __1.prepareRef(`${sectionType}${ux_specification_types_1.DefinitionName.Form}<${targetID}>`);
-    const fieldsDefinition = __1.prepareRef(`${sectionType}${ux_specification_types_1.DefinitionName.Fields}<${targetID}>`);
-    const actionsDefinition = __1.prepareRef(`${sectionType}${ux_specification_types_1.DefinitionName.Actions}<${targetID}>`);
+    const formDefinition = __1.prepareRef(`${sectionType}${ux_specification_types_2.DefinitionName.Form}<${targetID}>`);
+    const fieldsDefinition = __1.prepareRef(`${sectionType}${ux_specification_types_2.DefinitionName.Fields}<${targetID}>`);
+    const actionsDefinition = __1.prepareRef(`${sectionType}${ux_specification_types_2.DefinitionName.Actions}<${targetID}>`);
     // Form definition
-    appSchemaSection.properties['form'] = { $ref: `${__1.DEFINITION_LINK_PREFIX}${formDefinition}` };
-    if (sectionType === ux_specification_types_1.SectionType.Section && withActions) {
+    appSchema.properties['form'] = { $ref: `${__1.DEFINITION_LINK_PREFIX}${formDefinition}` };
+    if (sectionType === ux_specification_types_2.SectionType.Section && withActions) {
         appSchema['definitions'][formDefinition] = {
             type: 'object',
             properties: {
@@ -144,7 +254,7 @@ function handleForm(sectionType, section, appSchemaSection, appSchema, version,
             description: 'Actions',
             additionalProperties: false
         };
-        appSchema['definitions'][actionsDefinition][ux_specification_types_1.SchemaTag.isViewNode] = true;
+        appSchema['definitions'][actionsDefinition][ux_specification_types_2.SchemaTag.isViewNode] = true;
     }
     else {
         appSchema['definitions'][formDefinition] = {
@@ -156,9 +266,9 @@ function handleForm(sectionType, section, appSchemaSection, appSchema, version,
             additionalProperties: false
         };
     }
-    appSchema.definitions[formDefinition][ux_specification_types_1.SchemaTag.isViewNode] = true;
+    appSchema.definitions[formDefinition][ux_specification_types_2.SchemaTag.isViewNode] = true;
     if (section.entityType?.name) {
-        appSchema.definitions[formDefinition][ux_specification_types_1.SchemaTag.annotationPath] = __1.createAnnotationPath(section.entityType.fullyQualifiedName, section.target['term'], section.target['qualifier']);
+        appSchema.definitions[formDefinition][ux_specification_types_2.SchemaTag.annotationPath] = __1.createAnnotationPath(section.entityType.fullyQualifiedName, section.target['term'], section.target['qualifier']);
     }
     // Fields definition
     appSchema.definitions[fieldsDefinition] = {
@@ -167,9 +277,9 @@ function handleForm(sectionType, section, appSchemaSection, appSchema, version,
         description: 'Fields',
         additionalProperties: false
     };
-    appSchema.definitions[fieldsDefinition][ux_specification_types_1.SchemaTag.isViewNode] = true;
+    appSchema.definitions[fieldsDefinition][ux_specification_types_2.SchemaTag.isViewNode] = true;
     // Add fields
-    if (section.base === ux_specification_types_1.FacetBase.Identification) {
+    if (section.base === ux_specification_types_2.FacetBase.Identification) {
         for (const key in section.target) {
             const field = section.target[key];
             if (field) {
@@ -184,6 +294,95 @@ function handleForm(sectionType, section, appSchemaSection, appSchema, version,
         }
     }
 }
+/**
+ * Adds the schema tags for a form definition
+ * @param {FacetConfig} section - section definition, as prepared from the annotations
+ * @param {object} appSchema - app specific schema that gets enhanced
+ * @param {string} formDefinitionKey - key of the form definition in schema
+ */
+function addTagsToFormDefinition(section, appSchema, formDefinitionKey) {
+    if (section.target) {
+        const targetValue = section.target['qualifier']
+            ? `${section.target['term']}#${section.target['qualifier']}`
+            : `${section.target['term']}`;
+        appSchema.definitions[formDefinitionKey][ux_specification_types_2.SchemaTag.keys] = [
+            {
+                name: ux_specification_types_1.SchemaKeyName.target,
+                value: targetValue.replace(/com.sap.vocabularies.UI.v1./g, '')
+            }
+        ];
+        appSchema.definitions[formDefinitionKey][ux_specification_types_2.SchemaTag.target] = section.target['fullyQualifiedName'].split('@')[0];
+    }
+    appSchema.definitions[formDefinitionKey][ux_specification_types_2.SchemaTag.isViewNode] = true;
+    if (section.entityType?.name) {
+        appSchema.definitions[formDefinitionKey][ux_specification_types_2.SchemaTag.annotationPath] = __1.createAnnotationPath(section.entityType.fullyQualifiedName, section.target['term'], section.target['qualifier']);
+    }
+}
+/**
+ * Adds definitions for forms in object page sections to the app schema
+ * @param {SectionType} sectionType - prefix to distinguish Section and HeaderSection
+ * @param {FacetConfig} section - section definition, as prepared from the annotations
+ * @param {object} appSchemaSection - current definition of facet or section in the JSON schema
+ * @param {object} appSchema - app specific schema that gets enhanced
+ * @param {FioriElementsVersion} version - Fiori Elements version
+ * @param {string} facetKey - facet key
+ * @returns {string | undefined} target id of form
+ */
+function handleForm(sectionType, section, appSchemaSection, appSchema, version, facetKey) {
+    if (!section.target) {
+        return;
+    }
+    const targetID = determineTargetIdOfForm(section);
+    const formDefinitionKey = __1.prepareRef(`${sectionType}${ux_specification_types_2.DefinitionName.Form}<${targetID}>`);
+    const fieldsDefinitionKey = __1.prepareRef(`${sectionType}${ux_specification_types_2.DefinitionName.Fields}<${targetID}>`);
+    const actionsDefinitionKey = __1.prepareRef(`${sectionType}${ux_specification_types_2.DefinitionName.Actions}<${targetID}>`);
+    const withActions = section.base === ux_specification_types_2.FacetBase.Identification && facetKey.indexOf('#') < 0 ? false : true;
+    // Form definition
+    appSchemaSection.properties.form = { $ref: `${__1.DEFINITION_LINK_PREFIX}${formDefinitionKey}` };
+    if (sectionType === ux_specification_types_2.SectionType.Section && withActions) {
+        appSchema.definitions[formDefinitionKey] = {
+            type: 'object',
+            properties: {
+                actions: {
+                    $ref: `${__1.DEFINITION_LINK_PREFIX}${actionsDefinitionKey}`
+                },
+                fields: { $ref: `${__1.DEFINITION_LINK_PREFIX}${fieldsDefinitionKey}` }
+            },
+            description: 'Form',
+            additionalProperties: false
+        };
+        appSchema.definitions[actionsDefinitionKey] = {
+            type: 'object',
+            properties: {},
+            description: 'Actions',
+            additionalProperties: false
+        };
+        appSchema.definitions[actionsDefinitionKey][ux_specification_types_2.SchemaTag.isViewNode] = true;
+    }
+    else {
+        appSchema.definitions[formDefinitionKey] = {
+            type: 'object',
+            properties: {
+                fields: { $ref: `${__1.DEFINITION_LINK_PREFIX}${fieldsDefinitionKey}` }
+            },
+            description: 'Form',
+            additionalProperties: false
+        };
+    }
+    //Add schema tags
+    addTagsToFormDefinition(section, appSchema, formDefinitionKey);
+    // Fields definition
+    appSchema.definitions[fieldsDefinitionKey] = {
+        type: 'object',
+        properties: {},
+        description: 'Fields',
+        additionalProperties: false
+    };
+    appSchema.definitions[fieldsDefinitionKey][ux_specification_types_2.SchemaTag.isViewNode] = true;
+    // Add fields
+    addFieldsToFormDefinition(section, sectionType, appSchema, targetID, version, withActions);
+    return targetID;
+}
 exports.handleForm = handleForm;
 /**
  * Replaces an alias in an annotation ID or reference, based on the AVT references' list
@@ -209,25 +408,33 @@ exports.replaceAlias = replaceAlias;
 /**
  * Common routine to determine the name and the ID of a header action
  * @param action - action as given by AVT
- * @param entityType - entity type by AVT
  * @returns an object comprising action name and action id
  */
-function getActionNameAndId(action, entityType) {
-    let separatorIndex = action.lastIndexOf('/');
+function getActionNameAndId(item, oDataServiceAVT) {
+    const action = replaceAlias(item.Action, oDataServiceAVT);
+    let relevantAction = action;
+    let separatorIndex = action.indexOf('(');
+    if (separatorIndex > 0) {
+        relevantAction = action.substring(0, separatorIndex);
+    }
+    separatorIndex = relevantAction.lastIndexOf('/');
     if (separatorIndex === -1) {
-        separatorIndex = action.lastIndexOf('.');
+        separatorIndex = relevantAction.lastIndexOf('.');
     }
-    let actionName, actionId;
+    let actionName, actionId, namespace;
     if (separatorIndex > -1) {
-        actionName = action.substring(separatorIndex + 1);
-        actionId = `${action.substring(0, separatorIndex)}::${actionName}`;
+        actionName = relevantAction.substring(separatorIndex + 1);
+        namespace = relevantAction.substring(0, separatorIndex);
+        actionId = `${relevantAction.substring(0, separatorIndex)}::${actionName}`;
     }
     else {
-        actionName = action;
-        const namespace = entityType.fullyQualifiedName.split(entityType.name)[0];
-        actionId = `${namespace.substring(0, namespace.length - 1)}::${actionName}`;
+        actionName = relevantAction;
+        namespace = item.fullyQualifiedName.split('@')[0];
+        if (actionName && actionName !== '') {
+            actionId = `${namespace.substring(0, namespace.length - 1)}::${actionName}`;
+        }
     }
-    return { actionName, actionId };
+    return { actionName, actionId, namespace };
 }
 exports.getActionNameAndId = getActionNameAndId;
 /**
@@ -238,36 +445,36 @@ exports.getActionNameAndId = getActionNameAndId;
  * @param {ConvertedMetadata} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
  */
 function addFooterActions(appSchema, generateParameters) {
-    appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageFooter] = JSON.parse(JSON.stringify(appSchema.definitions[`${ux_specification_types_1.DefinitionName.ObjectPageFooter}<ObjectPageFooterActions>`]));
+    appSchema.definitions[ux_specification_types_2.DefinitionName.ObjectPageFooter] = JSON.parse(JSON.stringify(appSchema.definitions[`${ux_specification_types_2.DefinitionName.ObjectPageFooter}<ObjectPageFooterActions>`]));
     // Change reference of footer
     appSchema.properties['footer'] = {
-        $ref: `${__1.DEFINITION_LINK_PREFIX}${ux_specification_types_1.DefinitionName.ObjectPageFooter}`
+        $ref: `${__1.DEFINITION_LINK_PREFIX}${ux_specification_types_2.DefinitionName.ObjectPageFooter}`
     };
     // Add action to configuration
-    appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageFooter].properties[ux_specification_types_1.PropertyName.actions] = {
-        $ref: `${__1.DEFINITION_LINK_PREFIX}${ux_specification_types_1.DefinitionName.FooterActions}`
+    appSchema.definitions[ux_specification_types_2.DefinitionName.ObjectPageFooter].properties[ux_specification_types_2.PropertyName.actions] = {
+        $ref: `${__1.DEFINITION_LINK_PREFIX}${ux_specification_types_2.DefinitionName.FooterActions}`
     };
-    const footerActions = (appSchema.definitions[ux_specification_types_1.DefinitionName.FooterActions] = {
+    const footerActions = (appSchema.definitions[ux_specification_types_2.DefinitionName.FooterActions] = {
         type: 'object',
         properties: {},
         description: 'Actions',
         additionalProperties: false
     });
-    footerActions[ux_specification_types_1.SchemaTag.isViewNode] = true;
-    const alias = __1.findAlias(ux_specification_types_1.UIVOCABULARY, generateParameters.serviceAVT);
+    footerActions[ux_specification_types_2.SchemaTag.isViewNode] = true;
+    const alias = __1.findAlias(ux_specification_types_2.UIVOCABULARY, generateParameters.serviceAVT);
     const entityType = generateParameters.entitySet.entityType;
     const actionAnnotation = alias && entityType.annotations?.[alias]?.Identification;
     if (actionAnnotation) {
         const convertedIdentification = actionAnnotation.fullyQualifiedName.replace(`@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`, `/@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`);
-        footerActions[ux_specification_types_1.SchemaTag.annotationPath] = `/${convertedIdentification}`;
+        footerActions[ux_specification_types_2.SchemaTag.annotationPath] = `/${convertedIdentification}`;
         actionAnnotation.forEach((item, index) => {
             if (item['Determining'] && item.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* DataFieldForAction */) {
-                const { actionName, actionId } = getActionNameAndId(item.Action, entityType);
+                const { actionName, actionId } = getActionNameAndId(item, generateParameters.serviceAVT);
                 const description = item.Label || actionName;
-                const actionDefinitionKey = __1.prepareRef(`${ux_specification_types_1.DefinitionName.ObjectPageFooterAction}<${actionId}>`);
-                if (appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageFooterAction]) {
+                const actionDefinitionKey = __1.prepareRef(`${ux_specification_types_2.DefinitionName.ObjectPageFooterAction}<${actionId}>`);
+                if (appSchema.definitions[ux_specification_types_2.DefinitionName.ObjectPageFooterAction]) {
                     appSchema.definitions[actionDefinitionKey] = {
-                        ...JSON.parse(JSON.stringify(appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageFooterAction])),
+                        ...JSON.parse(JSON.stringify(appSchema.definitions[ux_specification_types_2.DefinitionName.ObjectPageFooterAction])),
                         description,
                         annotationPath: `/${convertedIdentification}/${index}`
                     };
@@ -278,8 +485,8 @@ function addFooterActions(appSchema, generateParameters) {
                         properties: {},
                         description: description
                     };
-                    appSchema.definitions[actionDefinitionKey][ux_specification_types_1.SchemaTag.isViewNode] = true;
-                    appSchema.definitions[actionDefinitionKey][ux_specification_types_1.SchemaTag.annotationPath] = `/${convertedIdentification}/${index}`;
+                    appSchema.definitions[actionDefinitionKey][ux_specification_types_2.SchemaTag.isViewNode] = true;
+                    appSchema.definitions[actionDefinitionKey][ux_specification_types_2.SchemaTag.annotationPath] = `/${convertedIdentification}/${index}`;
                 }
                 footerActions.properties[actionId] = {
                     $ref: `${__1.DEFINITION_LINK_PREFIX}${actionDefinitionKey}`
@@ -288,10 +495,10 @@ function addFooterActions(appSchema, generateParameters) {
         });
     }
     else {
-        footerActions[ux_specification_types_1.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`;
+        footerActions[ux_specification_types_2.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`;
     }
-    delete appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageFooterActions];
-    delete appSchema.definitions[`${ux_specification_types_1.DefinitionName.ObjectPageFooter}<${ux_specification_types_1.DefinitionName.ObjectPageFooterActions}>`];
+    delete appSchema.definitions[ux_specification_types_2.DefinitionName.ObjectPageFooterActions];
+    delete appSchema.definitions[`${ux_specification_types_2.DefinitionName.ObjectPageFooter}<${ux_specification_types_2.DefinitionName.ObjectPageFooterActions}>`];
 }
 exports.addFooterActions = addFooterActions;
 /**
@@ -301,32 +508,32 @@ exports.addFooterActions = addFooterActions;
  * @param {ConvertedMetadata} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
  */
 function addHeaderActions(appSchema, entityType, oDataServiceAVT, addHeaderActionCallBack) {
-    appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageHeader].properties[ux_specification_types_1.PropertyName.actions] = {
-        $ref: `${__1.DEFINITION_LINK_PREFIX}${ux_specification_types_1.DefinitionName.HeaderActions}`
+    appSchema.definitions[ux_specification_types_2.DefinitionName.ObjectPageHeader].properties[ux_specification_types_2.PropertyName.actions] = {
+        $ref: `${__1.DEFINITION_LINK_PREFIX}${ux_specification_types_2.DefinitionName.HeaderActions}`
     };
-    const headerActions = (appSchema.definitions[ux_specification_types_1.DefinitionName.HeaderActions] = {
+    const headerActions = (appSchema.definitions[ux_specification_types_2.DefinitionName.HeaderActions] = {
         type: 'object',
         properties: {},
         description: 'Actions',
         additionalProperties: false
     });
-    headerActions[ux_specification_types_1.SchemaTag.isViewNode] = true;
-    const alias = __1.findAlias(ux_specification_types_1.UIVOCABULARY, oDataServiceAVT);
+    headerActions[ux_specification_types_2.SchemaTag.isViewNode] = true;
+    const alias = __1.findAlias(ux_specification_types_2.UIVOCABULARY, oDataServiceAVT);
     const identification = alias &&
         entityType.annotations &&
         entityType.annotations[alias] &&
         entityType.annotations[alias].Identification;
     if (identification) {
-        headerActions[ux_specification_types_1.SchemaTag.annotationPath] =
+        headerActions[ux_specification_types_2.SchemaTag.annotationPath] =
             '/' +
                 identification.fullyQualifiedName.replace(`@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`, `/@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`);
         identification.forEach(addHeaderActionCallBack(entityType, appSchema, identification, headerActions, oDataServiceAVT));
     }
     else {
-        headerActions[ux_specification_types_1.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`;
+        headerActions[ux_specification_types_2.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`;
     }
-    delete appSchema.definitions[ux_specification_types_1.DefinitionName.GenericActions];
-    delete appSchema.definitions[`${ux_specification_types_1.DefinitionName.ObjectPageHeader}<${ux_specification_types_1.DefinitionName.GenericActions}>`];
+    delete appSchema.definitions[ux_specification_types_2.DefinitionName.GenericActions];
+    delete appSchema.definitions[`${ux_specification_types_2.DefinitionName.ObjectPageHeader}<${ux_specification_types_2.DefinitionName.GenericActions}>`];
 }
 exports.addHeaderActions = addHeaderActions;
 /**
@@ -336,10 +543,10 @@ exports.addHeaderActions = addHeaderActions;
  */
 function addCommonHeaderSchema(appSchema, entityType) {
     appSchema.properties['header'] = {
-        $ref: `${__1.DEFINITION_LINK_PREFIX}${ux_specification_types_1.DefinitionName.ObjectPageHeader}`
+        $ref: `${__1.DEFINITION_LINK_PREFIX}${ux_specification_types_2.DefinitionName.ObjectPageHeader}`
     };
-    appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageHeader] = JSON.parse(JSON.stringify(appSchema.definitions[`${ux_specification_types_1.DefinitionName.ObjectPageHeader}<${ux_specification_types_1.DefinitionName.GenericActions}>`]));
-    appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageHeader][ux_specification_types_1.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.HeaderInfo" /* HeaderInfo */}`;
+    appSchema.definitions[ux_specification_types_2.DefinitionName.ObjectPageHeader] = JSON.parse(JSON.stringify(appSchema.definitions[`${ux_specification_types_2.DefinitionName.ObjectPageHeader}<${ux_specification_types_2.DefinitionName.GenericActions}>`]));
+    appSchema.definitions[ux_specification_types_2.DefinitionName.ObjectPageHeader][ux_specification_types_2.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.HeaderInfo" /* HeaderInfo */}`;
 }
 exports.addCommonHeaderSchema = addCommonHeaderSchema;
 /**