@sap/ux-specification 1.96.20 → 1.96.24

package/dist/src/sync/v4/utils/StableIdHelper.js.map

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

package/dist/{types → src}/sync/v4/utils/utils.d.ts

@@ -1,8 +1,8 @@
-import type { GenerateAppSchemaParameters, SapUiAppPageV4 } from '../../../v4';
-import type { ExtensionLogger } from '../../..';
-import type { LineItem, DataFieldForActionAbstractTypes } from '@sap-ux/vocabularies-types/vocabularies/UI';
+import type { ExtensionLogger, GenerateAppSchemaParameters } from '../../..';
+import type { LineItem } from '@sap-ux/vocabularies-types/vocabularies/UI';
 import type { AnnotationTerm, ConvertedMetadata, EntitySet, EntityType } from '@sap-ux/vocabularies-types';
-import { DefinitionName } from '../../../v4';
+import { DefinitionName } from '../../common';
+import { v4 } from '@sap/ux-specification-types';
 import type { Definition } from 'typescript-json-schema';
 /**
  * Common function for enhancing the LineItems definition of app schema by custom columns
@@ -13,29 +13,27 @@ import type { Definition } from 'typescript-json-schema';
  * @param sectionId - identifier of the current object page section in schema
  * @param sectionIdInManifest - identifier of the current object page section in manifest
  */
-export declare function addCustomColumnDefinition(appSchema: Definition, v4Page: SapUiAppPageV4, logger: ExtensionLogger, customColumnDefinitionName?: string, sectionId?: string, sectionIdInManifest?: string): void;
-/**
- * Processes a LineItem record of type DataFieldForAction during app schema generation
- * @param appSchema - the app specific schema that shall get enhanced
- * @param entityType - the entity type as part of the AVT ConvertedMetadata
- * @param actions - actions definition in schema, parent object
- * @param lineItemPath - annotation path to the line item
- * @param lineItemRecord - actual record of the line item collection
- * @param recordIndex - record index in the collection
- */
-export declare function handleActionRecord(appSchema: Definition, entityType: EntityType, actionsDefinition: Definition, lineItemPath: string, lineItemRecord: DataFieldForActionAbstractTypes, lineItemId: string, recordIndex: number): void;
+export declare function addCustomColumnDefinition(appSchema: Definition, v4Page: v4.SapUiAppPageV4, logger: ExtensionLogger, customColumnDefinitionName?: string, sectionId?: string, sectionIdInManifest?: string): void;
+export declare type LineItemDataForSchema = {
+    appSchema: Definition;
+    lineItemAnnotation: AnnotationTerm<LineItem>;
+    entityType: EntityType;
+    oDataServiceAVT: ConvertedMetadata;
+    lineItemId: string;
+};
 /**
  * Adds the line item definition, columns and actions to the app schema (for the list report or an object page section comprising a table)
- * @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 ConvertedMetadata
- * @param {ConvertedMetadata} oDataServiceAVT - complete service information, as returned by Annotation Vocabularies Tool
- * @param lineItemId - in case of OP the parameter must be passed to distinguish the OP tables;
- *                     in case of LR or ALP 'LineItems' is passed.
+ * @param {LineItemDataForSchema} data: structure comprising
+ * - appSchema - the app specific schema that shall get enhanced
+ * - lineItemAnnotation - the UI.LineItem annotation, comprising all records
+ * - entityType - the entity type as part of the AVT ConvertedMetadata
+ * - oDataServiceAVT - complete service information, as returned by Annotation Vocabularies Tool
+ * - lineItemId - in case of OP the parameter must be passed to distinguish the OP tables;
+ *                in case of LR or ALP 'LineItems' is passed.
  * @param columnDefinitionName - name of the column definition, i.e. TableColumn or ObjectPageTableColumn
  * @param customColumnDefinitionName - name of the custom column definition
  */
-export declare function addLineItemsType(appSchema: Definition, lineItemAnnotation: AnnotationTerm<LineItem>, entityType: EntityType, oDataServiceAVT: ConvertedMetadata, lineItemId: string, columnDefinitionName?: string, customColumnDefinitionName?: string, customActionDefinitionName?: string): void;
+export declare function addLineItemsTypeToSchema(data: LineItemDataForSchema, columnDefinitionName?: string, customColumnDefinitionName?: string, customActionDefinitionName?: string): void;
 /**
  * Adds an enum or value help to position > anchor of custom column
  * @param appSchema - app specific JSON schema
@@ -44,7 +42,7 @@ export declare function addLineItemsType(appSchema: Definition, lineItemAnnotati
  * @param positionName - ID of the definition of custom column position in schema
  * @param sectionIdInManifest - identifier of the current object page section in manifest
  */
-export declare function addFragmentEnumForAnchor(appSchema: Definition, lineItemId: string, v4Page: SapUiAppPageV4, positionName?: string, sectionIdInManifest?: string): void;
+export declare function addFragmentEnumForAnchor(appSchema: Definition, lineItemId: string, v4Page: v4.SapUiAppPageV4, positionName?: string, sectionIdInManifest?: string): void;
 /**
  * Adds an enum or value help to position > anchor of custom column
  * @param appSchema - app specific JSON schema
@@ -60,7 +58,7 @@ export declare function addEnumForActionAnchor(appSchema: Definition, definition
  * @param logger - logger for messages
  * @returns the page definition in manifest (if found)
  */
-export declare function findPageV4(pages: SapUiAppPageV4[], pageName: string, entitySet: EntitySet, logger: ExtensionLogger): SapUiAppPageV4 | undefined;
+export declare function findPageV4(pages: v4.SapUiAppPageV4[], pageName: string, entitySet: EntitySet, logger: ExtensionLogger): v4.SapUiAppPageV4 | undefined;
 /**
  * Depending on the template type, strip down the app schema so that only the relevant views are part of it
  * @param {Definition} appSchema - app specific JSON schema, to be adjusted
@@ -77,5 +75,5 @@ export declare function alignSchemaWithTemplateType(appSchema: Definition, gener
  * @param sectionId - identifier of the current object page section in schema
  * @param sectionIdInManifest - identifier of the current object page section in manifest
  */
-export declare function addCustomActionDefinition(appSchema: Definition, v4Page: SapUiAppPageV4, logger: ExtensionLogger, customColumnDefinitionName?: string, sectionId?: string, sectionIdInManifest?: string): void;
+export declare function addCustomActionDefinition(appSchema: Definition, v4Page: v4.SapUiAppPageV4, logger: ExtensionLogger, customColumnDefinitionName?: string, sectionId?: string, sectionIdInManifest?: string): void;
 //# sourceMappingURL=utils.d.ts.map

package/dist/src/sync/v4/utils/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/sync/v4/utils/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAC7E,OAAO,KAAK,EACR,QAAQ,EAGX,MAAM,4CAA4C,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAI3G,OAAO,EASH,cAAc,EAEjB,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,EAAE,EAAiC,MAAM,6BAA6B,CAAC;AAChF,OAAO,KAAK,EAAE,UAAU,EAAuB,MAAM,wBAAwB,CAAC;AAwL9E;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CACrC,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,EAAE,CAAC,cAAc,EACzB,MAAM,EAAE,eAAe,EACvB,0BAA0B,GAAE,MAAoC,EAChE,SAAS,CAAC,EAAE,MAAM,EAClB,mBAAmB,CAAC,EAAE,MAAM,GAC7B,IAAI,CA8BN;AA8ED,oBAAY,qBAAqB,GAAG;IAChC,SAAS,EAAE,UAAU,CAAC;IACtB,kBAAkB,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IAC7C,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,iBAAiB,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,wBAAgB,wBAAwB,CACpC,IAAI,EAAE,qBAAqB,EAC3B,oBAAoB,GAAE,MAAmC,EACzD,0BAA0B,GAAE,MAAoC,EAChE,0BAA0B,GAAE,MAAoC,GACjE,IAAI,CA+BN;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CACpC,SAAS,EAAE,UAAU,EACrB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,EAAE,CAAC,cAAc,EACzB,YAAY,GAAE,MAAgC,EAC9C,mBAAmB,CAAC,EAAE,MAAM,GAC7B,IAAI,CAsBN;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAClC,SAAS,EAAE,UAAU,EACrB,YAAY,EAAE,MAAM,EACpB,YAAY,GAAE,MAA4C,GAC3D,IAAI,CAKN;AAED;;;;;;;GAOG;AACH,wBAAgB,UAAU,CACtB,KAAK,EAAE,EAAE,CAAC,cAAc,EAAE,EAC1B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,eAAe,GACxB,EAAE,CAAC,cAAc,GAAG,SAAS,CAyB/B;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACvC,SAAS,EAAE,UAAU,EACrB,kBAAkB,EAAE,2BAA2B,GAChD,cAAc,CAAC,KAAK,GAAG,cAAc,CAAC,YAAY,CAwBpD;AAED;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CACrC,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,EAAE,CAAC,cAAc,EACzB,MAAM,EAAE,eAAe,EACvB,0BAA0B,GAAE,MAAoC,EAChE,SAAS,SAAK,EACd,mBAAmB,SAAK,GACzB,IAAI,CA6BN"}

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

@@ -0,0 +1,432 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addCustomActionDefinition = exports.alignSchemaWithTemplateType = exports.findPageV4 = exports.addEnumForActionAnchor = exports.addFragmentEnumForAnchor = exports.addLineItemsTypeToSchema = exports.addCustomColumnDefinition = void 0;
+const utils_1 = require("../../common/utils");
+const StableIdHelper_1 = require("./StableIdHelper");
+const common_1 = require("../../common");
+const i18next_1 = __importDefault(require("i18next"));
+const __1 = require("../../..");
+const ux_specification_types_1 = require("@sap/ux-specification-types");
+function addArtifactTypeManifest(appSchema, customColumnDefinitionName) {
+    const columnDefinition = appSchema.definitions[customColumnDefinitionName];
+    if (columnDefinition) {
+        for (const propertyId in columnDefinition.properties) {
+            columnDefinition.properties[propertyId][common_1.SchemaTag.artifactType] = ux_specification_types_1.ArtifactType.Manifest;
+        }
+    }
+}
+/**
+ * Sort function for properties in schema definitions.
+ * @param definition - definition which contains list of properties, unsorted
+ * @returns - list of properties, sorted by property index
+ */
+function sortPropertiesRecords(definition) {
+    definition = typeof definition === 'object' ? definition : {};
+    function sortByPropertyIndex() {
+        return ([_key1, value1], [_key2, value2]) => value1[common_1.SchemaTag.propertyIndex] - value2[common_1.SchemaTag.propertyIndex];
+    }
+    const unsortedObjArr = [...Object.entries(definition.properties)];
+    return unsortedObjArr.sort(sortByPropertyIndex());
+}
+/**
+ * Method receives extension object and returns title/text.
+ * @param extension - custom extension object from manifest.
+ * @returns Title/text of custom extension.
+ */
+function getExtensionText(extension) {
+    return 'header' in extension ? extension.header : extension.text;
+}
+/**
+ * Adds a custom extension to the right position of a sorted array
+ * @param extension - custom extension
+ * @param sortedExtensionsArray - array of all entries(annotation entries and extensions), to be enhanced
+ * @param targetIndex - index of the anchor entry
+ * @param extId - ID of the new custom extension
+ * @param newExtensionReference - schema reference of the new extension
+ */
+function addExtensionToSortedArray(extension, sortedExtensionsArray, targetIndex, extId, newExtensionReference) {
+    const placement = extension.position?.placement || ux_specification_types_1.v4.Placement.After;
+    if (placement === ux_specification_types_1.v4.Placement.Before) {
+        sortedExtensionsArray.splice(targetIndex, 0, [extId, newExtensionReference]);
+    }
+    else {
+        sortedExtensionsArray.splice(targetIndex + 1, 0, [extId, newExtensionReference]);
+    }
+}
+/**
+ * Post-processing of custom extensions that are left after the first loop of adding extensions, i.e. custom extensions referring to other custom extensions
+ * @param remainingExtensions - list of custom extensions that are left for post-processing
+ * @param customColumnDefinitionName - custom extension definition name, different in LR and OP
+ * @param sortedColumnsArray - sorted array of annotation-based extensions, to be updated
+ * @param logger - logger for error messages
+ */
+function adjustCustomExtReferringToCustomExt(remainingExtensions, extensionDefinitionName, sortedExtArray, logger) {
+    for (const extId in remainingExtensions) {
+        const extension = remainingExtensions[extId];
+        // Detect description based on extension in manifest
+        const description = getExtensionText(extension);
+        const newCustomExt = {
+            $ref: `${utils_1.DEFINITION_LINK_PREFIX}${extensionDefinitionName}`,
+            description
+        };
+        if (extension.position?.anchor && extension.position?.placement) {
+            const targetIndex = sortedExtArray.findIndex((element) => element[0] === extension.position.anchor);
+            if (targetIndex > -1) {
+                addExtensionToSortedArray(extension, sortedExtArray, targetIndex, extId, newCustomExt);
+                delete remainingExtensions[extId];
+            }
+            else if (extId === extension.position.anchor ||
+                Object.keys(remainingExtensions).indexOf(extension.position.anchor) === -1) {
+                __1.log(logger, {
+                    severity: "error" /* Error */,
+                    message: i18next_1.default.t('INVALIDANCHOR', { id: extId, anchor: extension.position.anchor }),
+                    location: {
+                        path: common_1.MANIFESTPATH,
+                        range: [ux_specification_types_1.ManifestSection.generic]
+                    }
+                });
+                sortedExtArray.splice(sortedExtArray.length, 0, [extId, newCustomExt]);
+                delete remainingExtensions[extId];
+            }
+        }
+    }
+    if (Object.keys(remainingExtensions).length > 0) {
+        adjustCustomExtReferringToCustomExt(remainingExtensions, extensionDefinitionName, sortedExtArray, logger);
+    }
+}
+/**
+ * Returns anchor for extension. Priority:
+ * 1. 'anchor' property in extension;
+ * 2. When 'anchor' is not defined in extension and does calculation based placement and current list of extension and annotation entries.
+ * @param extension - extension in manifest
+ * @param sortedExtensionsArray - sorted array of annotation-based nodes, to be enhanced by extensions
+ */
+function getExtensionAnchor(extension, sortedExtensionsArray) {
+    // Default placement is After
+    const placement = extension.position?.placement || ux_specification_types_1.v4.Placement.After;
+    let anchor = extension.position?.anchor;
+    if (!anchor) {
+        // Simulate runtime behavior - if there no anchor, then logic uses first or last annotation node
+        // In some cases last extension can be previously inserted extension - in such case we still need use annotation node
+        const index = placement === ux_specification_types_1.v4.Placement.Before ? 0 : sortedExtensionsArray.length - 1;
+        anchor = sortedExtensionsArray[index] ? sortedExtensionsArray[index][0] : undefined;
+    }
+    return anchor;
+}
+/**
+ * Adds extension at the right position of the sorted array of annotation-based nodes
+ * @param extensions - list of extensions in manifest
+ * @param sortedExtensionsArray - sorted array of annotation-based nodes, to be enhanced by extensions
+ * @param extensionDefinitionName - extension definition name, different in LR and OP
+ * @param loggeloggerr - logger for error messages
+ */
+function addExtensionToArray(extensions, sortedExtensionsArray, extensionDefinitionName, templatePropertyName = 'template', logger) {
+    const annotationEntries = [...sortedExtensionsArray];
+    const localExtensions = { ...extensions };
+    for (const extensionId in localExtensions) {
+        const extension = localExtensions[extensionId];
+        if (!(templatePropertyName in extension)) {
+            // Skip regular entries(columns, actions, etc.)
+            delete localExtensions[extensionId];
+            continue;
+        }
+        const newExtensionReference = {
+            $ref: `${utils_1.DEFINITION_LINK_PREFIX}${extensionDefinitionName}`,
+            description: getExtensionText(extension) || extensionId
+        };
+        const anchor = getExtensionAnchor(extension, annotationEntries);
+        if (anchor) {
+            const targetIndex = sortedExtensionsArray.findIndex((element) => element[0] === anchor);
+            if (targetIndex > -1) {
+                addExtensionToSortedArray(extension, sortedExtensionsArray, targetIndex, extensionId, newExtensionReference);
+                delete localExtensions[extensionId];
+            }
+        }
+        else {
+            // Empty array - no any anchor to reference to
+            sortedExtensionsArray.push([extensionId, newExtensionReference]);
+            delete localExtensions[extensionId];
+        }
+    }
+    if (Object.keys(localExtensions).length > 0) {
+        //Second loop is necessary for custom columns that refer to custom columns
+        adjustCustomExtReferringToCustomExt(localExtensions, extensionDefinitionName, sortedExtensionsArray, logger);
+    }
+    return sortedExtensionsArray;
+}
+/**
+ * Common function for enhancing the LineItems definition of app schema by custom columns
+ * @param appSchema - app-specific JSON schema
+ * @param v4Page - actual page in the manifest
+ * @param logger - logger for error messages
+ * @param customColumnDefinitionName - custom column definition name
+ * @param sectionId - identifier of the current object page section in schema
+ * @param sectionIdInManifest - identifier of the current object page section in manifest
+ */
+function addCustomColumnDefinition(appSchema, v4Page, logger, customColumnDefinitionName = common_1.DefinitionName.CustomColumn, sectionId, sectionIdInManifest) {
+    const lineItemId = sectionId || common_1.DefinitionName.LineItems;
+    const lineItems = appSchema.definitions[lineItemId];
+    if (!lineItems) {
+        return;
+    }
+    //sort line items
+    let sortedColumnsArray = sortPropertiesRecords(lineItems);
+    const id = sectionIdInManifest ? sectionIdInManifest.replace(/::/g, '/') : `@${"com.sap.vocabularies.UI.v1.LineItem" /* LineItem */}`;
+    const columns = v4Page.options?.settings?.controlConfiguration?.[id]?.['columns'];
+    if (columns) {
+        sortedColumnsArray = addExtensionToArray(columns, sortedColumnsArray, customColumnDefinitionName, undefined, logger);
+    }
+    //Adjust propertyIndex
+    for (let index = 0; index < sortedColumnsArray.length; index++) {
+        sortedColumnsArray[index][1][common_1.SchemaTag.propertyIndex] = index;
+    }
+    const sortedColumnsAsObject = {};
+    sortedColumnsArray.forEach(([key, value]) => (sortedColumnsAsObject[key] = value));
+    appSchema.definitions[lineItemId].properties = sortedColumnsAsObject;
+    //Add artifact type 'Manifest' to TableCustomColumn properties
+    addArtifactTypeManifest(appSchema, customColumnDefinitionName);
+}
+exports.addCustomColumnDefinition = addCustomColumnDefinition;
+/**
+ * Processes a LineItem record of type DataFieldForAction during app schema generation
+ * @param {LineItemDataForSchema} data: structure of input data
+ * @param actions - actions definition in schema, parent object
+ * @param lineItemPath - annotation path to the line item
+ * @param lineItemRecord - actual record of the line item collection
+ * @param recordIndex - record index in the collection
+ */
+function addActionRecordToSchema(data, actionsDefinition, lineItemPath, lineItemRecord, recordIndex) {
+    // Action but not inline action
+    if (lineItemRecord.Determining !== true) {
+        //no footer bar -> toolbar action
+        let actionDefinitionName;
+        if (data.lineItemId.startsWith(common_1.DefinitionName.LineItemsOfView)) {
+            actionDefinitionName = common_1.DefinitionName.ViewToolBarAction;
+        }
+        else if (data.lineItemId.startsWith(common_1.DefinitionName.LineItems)) {
+            actionDefinitionName = common_1.DefinitionName.ToolBarAction;
+        }
+        else {
+            actionDefinitionName = common_1.DefinitionName.ObjectPageToolBarAction;
+        }
+        const actionId = lineItemRecord.Action.replace('/', '??');
+        const description = utils_1.getDataFieldDescription(lineItemRecord, data.entityType);
+        const prefix = lineItemRecord.$Type.split(`${common_1.UIVOCABULARY}.`)[1];
+        const actions = (actionsDefinition.properties[`${prefix}::${lineItemRecord.Action}`] = {
+            $ref: common_1.getFacetDefinitionLink(actionDefinitionName, common_1.prepareRef(actionId)),
+            description
+        });
+        actions[common_1.SchemaTag.propertyIndex] = recordIndex;
+        actions[common_1.SchemaTag.annotationType] = lineItemRecord.$Type;
+        const action = common_1.parseSchemaDefinition(actionDefinitionName, common_1.prepareRef(actionId), data.appSchema);
+        action[common_1.SchemaTag.annotationPath] = `${lineItemPath}/${recordIndex}`;
+    }
+}
+/**
+ * Processes a LineItem record of type DataField during app schema generation
+ * @param {LineItemDataForSchema} data: structure of input data
+ * @param lineItem - object comprising the line item information:
+ * { lineItemRecord, lineItemId, lineItemPath }
+ * @param columnDefinitionName - Schema definition name for the column
+ * @param recordIndex - record index in the collection
+ */
+function addLineItemRecordToSchema(data, lineItem, columnDefinitionName, recordIndex) {
+    const lineItemId = lineItem['lineItemId'];
+    const lineItemRecord = lineItem['lineItemRecord'];
+    if (lineItemRecord['Target']?.['value']) {
+        const regex = `@${utils_1.findAlias(common_1.UIVOCABULARY, data.oDataServiceAVT)}.`;
+        lineItemRecord['Target']['value'] = lineItemRecord['Target']['value'].replace(regex, '@');
+    }
+    const schemaKey = StableIdHelper_1.getStableIdPartFromDataField(lineItemRecord);
+    if (schemaKey) {
+        const properties = data.appSchema.definitions[lineItemId].properties;
+        properties[schemaKey] = {
+            $ref: utils_1.DEFINITION_LINK_PREFIX + columnDefinitionName,
+            description: utils_1.getDataFieldDescription(lineItemRecord, data.entityType)
+        };
+        properties[schemaKey][common_1.SchemaTag.annotationType] = lineItemRecord?.$Type;
+        properties[schemaKey][common_1.SchemaTag.annotationPath] = `${lineItem['lineItemPath']}/${recordIndex}`;
+        properties[schemaKey][common_1.SchemaTag.propertyIndex] = recordIndex;
+        if (lineItemRecord['Value']?.$target?.type) {
+            properties[schemaKey][common_1.SchemaTag.dataType] = lineItemRecord['Value']?.$target?.type.replace('Edm.', '');
+        }
+    }
+}
+/**
+ * Adds the line item definition, columns and actions to the app schema (for the list report or an object page section comprising a table)
+ * @param {LineItemDataForSchema} data: structure comprising
+ * - appSchema - the app specific schema that shall get enhanced
+ * - lineItemAnnotation - the UI.LineItem annotation, comprising all records
+ * - entityType - the entity type as part of the AVT ConvertedMetadata
+ * - oDataServiceAVT - complete service information, as returned by Annotation Vocabularies Tool
+ * - lineItemId - in case of OP the parameter must be passed to distinguish the OP tables;
+ *                in case of LR or ALP 'LineItems' is passed.
+ * @param columnDefinitionName - name of the column definition, i.e. TableColumn or ObjectPageTableColumn
+ * @param customColumnDefinitionName - name of the custom column definition
+ */
+function addLineItemsTypeToSchema(data, columnDefinitionName = common_1.DefinitionName.TableColumn, customColumnDefinitionName = common_1.DefinitionName.CustomColumn, customActionDefinitionName = common_1.DefinitionName.CustomAction) {
+    const { actions, lineItemPath } = common_1.addCommonLineItemDefinitions(data.appSchema, data.lineItemAnnotation, data.entityType, data.lineItemId, customColumnDefinitionName, customActionDefinitionName);
+    if (!data.lineItemAnnotation) {
+        return;
+    }
+    let i = 0;
+    data.lineItemAnnotation.forEach((lineItemRecord) => {
+        if ((lineItemRecord.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* DataFieldForAction */ ||
+            lineItemRecord.$Type === "com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation" /* DataFieldForIntentBasedNavigation */) &&
+            (lineItemRecord.Inline !== true || lineItemRecord.Determining === true)) {
+            addActionRecordToSchema(data, actions, lineItemPath, lineItemRecord, i);
+        }
+        else {
+            const lineItem = { lineItemRecord, lineItemId: data.lineItemId, lineItemPath };
+            const columnDefinition = lineItemRecord.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* DataFieldForAction */
+                ? `${columnDefinitionName}Action`
+                : columnDefinitionName;
+            addLineItemRecordToSchema(data, lineItem, columnDefinition, i);
+        }
+        i++;
+    });
+}
+exports.addLineItemsTypeToSchema = addLineItemsTypeToSchema;
+/**
+ * Adds an enum or value help to position > anchor of custom column
+ * @param appSchema - app specific JSON schema
+ * @param lineItemId - ID of the current line item in schema
+ * @param v4Page - current page in manifest
+ * @param positionName - ID of the definition of custom column position in schema
+ * @param sectionIdInManifest - identifier of the current object page section in manifest
+ */
+function addFragmentEnumForAnchor(appSchema, lineItemId, v4Page, positionName = common_1.DefinitionName.Position, sectionIdInManifest) {
+    const columns = appSchema.definitions[lineItemId]?.properties;
+    const enumEntries = [];
+    if (columns) {
+        for (const key in columns) {
+            if (key !== 'custom') {
+                enumEntries.push(key);
+            }
+        }
+    }
+    const id = lineItemId !== common_1.DefinitionName.LineItems ? sectionIdInManifest : `@${"com.sap.vocabularies.UI.v1.LineItem" /* LineItem */}`;
+    const columnsInManifest = v4Page.options?.settings?.controlConfiguration?.[id]?.['columns'];
+    if (columnsInManifest) {
+        for (const key in columnsInManifest) {
+            if (enumEntries.indexOf(key) === -1) {
+                enumEntries.push(key);
+            }
+        }
+    }
+    if (enumEntries.length > 0) {
+        appSchema.definitions[positionName].properties['anchor']['enum'] = enumEntries;
+    }
+}
+exports.addFragmentEnumForAnchor = addFragmentEnumForAnchor;
+/**
+ * Adds an enum or value help to position > anchor of custom column
+ * @param appSchema - app specific JSON schema
+ * @param definitionId - definition key of actions
+ * @param positionName - target definition to update
+ */
+function addEnumForActionAnchor(appSchema, definitionId, positionName = common_1.DefinitionName.CustomActionPosition) {
+    common_1.addDescriptiveEnumDefinition(appSchema, appSchema.definitions[definitionId], {
+        definition: positionName,
+        property: 'anchor'
+    });
+}
+exports.addEnumForActionAnchor = addEnumForActionAnchor;
+/**
+ * Find the relevant V4 page under the routing targets of manifest,json
+ * @param pages - list of all pages in manifest
+ * @param pageName - search criterion: page name
+ * @param entitySet - search criterion: entity set
+ * @param logger - logger for messages
+ * @returns the page definition in manifest (if found)
+ */
+function findPageV4(pages, pageName, entitySet, logger) {
+    let v4Page;
+    if (entitySet) {
+        for (const i in pages) {
+            if (pages[i].options?.settings?.entitySet === entitySet.name &&
+                (pages[i].name === pageName ||
+                    (pageName === ux_specification_types_1.v4.FE_TEMPLATE_V4_ALP && pages[i].name === ux_specification_types_1.v4.FE_TEMPLATE_V4_LIST_REPORT))) {
+                v4Page = pages[i];
+                break;
+            }
+        }
+    }
+    if (!v4Page) {
+        __1.log(logger, {
+            severity: "error" /* Error */,
+            message: i18next_1.default.t('NOENTITYSET', { entitySet }),
+            location: {
+                path: common_1.MANIFESTPATH,
+                range: [ux_specification_types_1.ManifestSection.generic]
+            }
+        });
+    }
+    return v4Page;
+}
+exports.findPageV4 = findPageV4;
+/**
+ * Depending on the template type, strip down the app schema so that only the relevant views are part of it
+ * @param {Definition} appSchema - app specific JSON schema, to be adjusted
+ * @param {GenerateAppSchemaParameters} generateParameters - object comprising all input parameters
+ * @returns the right definition name for the table in the schema
+ */
+function alignSchemaWithTemplateType(appSchema, generateParameters) {
+    let tableDefinitionName;
+    const tableDefinition = appSchema.properties[common_1.PropertyName.table];
+    if (generateParameters.templateType === utils_1.TemplateType.AnalyticalListPageV4) {
+        tableDefinitionName = common_1.DefinitionName.ALPTableView;
+        delete tableDefinition.anyOf;
+        tableDefinition.$ref = `${utils_1.DEFINITION_LINK_PREFIX}${common_1.DefinitionName.ALPTableView}`;
+        delete appSchema.definitions[common_1.DefinitionName.Table];
+        delete appSchema.definitions[common_1.DefinitionName.LRChartView];
+        delete appSchema.definitions[common_1.DefinitionName.LRTableView];
+        delete appSchema.definitions[common_1.DefinitionName.MultiTableModeV4];
+    }
+    else if (generateParameters.templateType === utils_1.TemplateType.ListReportObjectPageV4) {
+        tableDefinitionName = common_1.DefinitionName.Table;
+        delete tableDefinition.anyOf;
+        tableDefinition.$ref = `${utils_1.DEFINITION_LINK_PREFIX}${common_1.DefinitionName.Table}`;
+        appSchema.definitions[tableDefinitionName].properties[common_1.PropertyName.annotationPath][common_1.SchemaTag.hidden] = true;
+        delete appSchema.definitions[common_1.DefinitionName.ALPTableView];
+        appSchema.properties[common_1.PropertyName.defaultPath][common_1.SchemaTag.hidden] = true;
+    }
+    return tableDefinitionName;
+}
+exports.alignSchemaWithTemplateType = alignSchemaWithTemplateType;
+/**
+ * Common function for enhancing the LineItems definition of app schema by custom columns
+ * @param appSchema - app-specific JSON schema
+ * @param v4Page - actual page in the manifest
+ * @param logger - logger for error messages
+ * @param customColumnDefinitionName - custom column definition name
+ * @param sectionId - identifier of the current object page section in schema
+ * @param sectionIdInManifest - identifier of the current object page section in manifest
+ */
+function addCustomActionDefinition(appSchema, v4Page, logger, customColumnDefinitionName = common_1.DefinitionName.CustomAction, sectionId = '', sectionIdInManifest = '') {
+    const definition = appSchema.definitions[sectionId];
+    if (!definition) {
+        return;
+    }
+    // Sort existing actions
+    let sortedActionsArray = sortPropertiesRecords(definition);
+    const id = sectionIdInManifest ? sectionIdInManifest.replace(/::/g, '/') : `@${"com.sap.vocabularies.UI.v1.LineItem" /* LineItem */}`;
+    const actions = v4Page.options?.settings?.controlConfiguration?.[id]?.['actions'];
+    if (actions) {
+        sortedActionsArray = addExtensionToArray(actions, sortedActionsArray, customColumnDefinitionName, 'press', logger);
+    }
+    // Adjust propertyIndex
+    for (let index = 0; index < sortedActionsArray.length; index++) {
+        sortedActionsArray[index][1][common_1.SchemaTag.propertyIndex] = index;
+    }
+    const sortedActionsAsObject = {};
+    sortedActionsArray.forEach(([key, value]) => (sortedActionsAsObject[key] = value));
+    appSchema.definitions[sectionId].properties = sortedActionsAsObject;
+    // Add artifact type 'Manifest' to TableCustomColumn properties
+    addArtifactTypeManifest(appSchema, customColumnDefinitionName);
+}
+exports.addCustomActionDefinition = addCustomActionDefinition;
+//# sourceMappingURL=utils.js.map

package/dist/src/sync/v4/utils/utils.js.map

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

package/package.json

@@ -1,26 +1,25 @@
 {
   "name": "@sap/ux-specification",
-  "version": "1.96.20",
+  "version": "1.96.24",
   "displayName": "SAP Fiori tools - Specification",
   "description": "SAP Fiori tools - Specification",
   "files": [
-    "dist",
-    "types"
+    "dist"
   ],
   "main": "dist/index-min.js",
-  "typings": "dist/types",
   "engines": {
-    "node": ">=14.16.0",
-    "yarn": ">=1.22.19"
+    "node": ">= 14.16.0 < 15.0.0 || >= 16.1.0 < 17.0.0 || >= 18.0.0 < 19.0.0",
+    "yarn": ">=1.22.19 < 2"
   },
   "scripts": {
     "clean:before": "rimraf ./dist ./types ./schemas",
     "compile": "tsc --project ./tsconfig.build.json",
     "compile:watch": "tsc --build ./tsconfig.build.json --pretty --watch",
-    "bundle": "node esbuild.js",
+    "bundle": "node esbuild",
+    "bundle:dev": "node esbuild --minify=false",
     "bundle:watch": "node esbuild --watch --minify=false",
-    "build": "npm-run-all -l -s clean:before -p compile create-json-schemas copy-templates -p copy-json-schemas htmlV2 htmlV4 -s bundle",
-    "build:dev": "npm-run-all -l -s clean:before -p compile create-json-schemas copy-templates -s copy-json-schemas bundle",
+    "build": "npm-run-all -l -s clean:before -s compile -p create-json-schemas copy-templates -p copy-json-schemas htmlV2 htmlV4 -s bundle",
+    "build:dev": "npm-run-all -l -s clean:before -s compile -p create-json-schemas copy-templates -s copy-json-schemas bundle:dev",
     "watch": "npm-run-all -l -s clean:before -p compile create-json-schemas copy-templates -p copy-json-schemas -s bundle:watch",
     "create-json-schemas": "ts-node ./scripts/to-json-schema.ts ",
     "copy-json-schemas": "cpy ./schemas/** dist --parents",
@@ -44,12 +43,12 @@
   "publisher": "SAPSE",
   "license": "SEE LICENSE IN LICENSE",
   "dependencies": {
-    "@sap-ux/fe-fpm-writer": "0.13.4",
-    "@sap-ux/vocabularies-types": "0.5.7",
-    "typescript-json-schema": "0.53.0"
+    "@sap-ux/fe-fpm-writer": "0.17.2",
+    "@sap-ux/vocabularies-types": "0.5.7"
   },
   "devDependencies": {
     "@sap-ux/annotation-converter": "0.5.7",
+    "@sap/ux-specification-types": "1.96.24",
     "@sap-ux/edmx-parser": "0.5.4",
     "@sapui5/ts-types-esm": "1.96.8",
     "@types/d3": "7.1.0",
@@ -72,7 +71,7 @@
     "eslint-config-prettier": "8.3.0",
     "excel4node": "1.7.2",
     "i18next": "20.3.1",
-    "jest": "26.6.3",
+    "jest": "27.5.1",
     "jest-file-snapshot": "0.5.0",
     "jest-sonar-reporter": "2.0.0",
     "jquery": "3.6.0",
@@ -83,10 +82,11 @@
     "reflect-metadata": "0.1.13",
     "rimraf": "3.0.2",
     "sax": "1.2.4",
-    "ts-jest": "26.5.6",
+    "ts-jest": "27.1.3",
     "ts-json-schema-generator": "0.96.0",
     "ts-node": "9.1.1",
-    "typescript": "3.8.3",
+    "typescript": "4.3.5",
+    "typescript-json-schema": "0.53.0",
     "xml-js": "1.6.11"
   },
   "husky": {