@sap/ux-specification 1.71.41 → 1.71.45

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

@@ -0,0 +1,319 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const StableIdHelper_1 = require("../../v4/utils/StableIdHelper");
+const common_1 = require("../../../specification/common");
+const __1 = require("..");
+/**
+ * Adds a field definition to the app specific schema
+ * @param {string} sectionType - prefix to distinguish Section and HeaderSection
+ * @param {object} appSchema - App schema in general
+ * @param {DataFieldAbstractTypes} field - field definition in parser output (AVT)
+ * @param {string} targetID - unique ID, identifies the parent object (form)
+ * @param {string} key - current field key
+ * @param {SectionType} section - current section of the object page
+ */
+function addField(sectionType, appSchema, field, targetID, key, section, version, withActions = true) {
+    var _a, _b, _c, _d, _e;
+    const fieldReferenceId = StableIdHelper_1.getStableIdPartFromDataField(field);
+    const fieldReference = version === common_1.FioriElementsVersion.v2 && fieldReferenceId && fieldReferenceId.includes('::')
+        ? fieldReferenceId
+            .split('::')
+            .splice(1)
+            .join('::')
+        : fieldReferenceId;
+    const fieldReferenceType = version === common_1.FioriElementsVersion.v2 && fieldReferenceId && fieldReferenceId.includes('::')
+        ? fieldReferenceId.split('::')[0].replace('DataField', 'Field')
+        : undefined;
+    const fieldDefinition = version === common_1.FioriElementsVersion.v2
+        ? `${fieldReferenceType}<${targetID}::${fieldReference}>`
+        : `${targetID}::${fieldReference}`;
+    const fieldsDefinition = `${sectionType}Fields<${targetID}>`;
+    const actionsDefinition = `${sectionType}Actions<${targetID}>`;
+    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 === __1.SectionType.Section) {
+            appSchema['definitions'][actionsDefinition]['properties'][fieldReference] = {
+                $ref: __1.DEFINITION_LINK_PREFIX + fieldDefinition,
+                propertyIndex: parseInt(key)
+            };
+        }
+    }
+    else {
+        appSchema['definitions'][fieldsDefinition]['properties'][fieldReference] = {
+            $ref: __1.DEFINITION_LINK_PREFIX + fieldDefinition,
+            propertyIndex: parseInt(key)
+        };
+    }
+    appSchema['definitions'][fieldDefinition] = {
+        type: 'object',
+        isViewNode: true,
+        properties: {},
+        description: __1.getDatafieldDescription(field, section.entityType),
+        additionalProperties: false
+    };
+    if (version === common_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 */ && ((_a = appSchema['definitions']) === null || _a === void 0 ? void 0 : _a['FormAction'])) {
+        appSchema['definitions'][fieldDefinition]['properties'] = appSchema['definitions']['FormAction']['properties'];
+    }
+    if ((_c = (_b = field['Value']) === null || _b === void 0 ? void 0 : _b.$target) === null || _c === void 0 ? void 0 : _c.type) {
+        appSchema['definitions'][fieldDefinition].dataType = (_e = (_d = field['Value']) === null || _d === void 0 ? void 0 : _d.$target) === null || _e === void 0 ? void 0 : _e.type;
+    }
+    appSchema['definitions'][fieldDefinition].annotationPath = `/${section.entityType.fullyQualifiedName}/${field.fullyQualifiedName.split(section.entityType.fullyQualifiedName)[1]}`;
+}
+function determineTargetIdOfForm(section) {
+    let targetID;
+    if (section.target && section.target['qualifier'] && section.entityType) {
+        targetID = `${section.entityType.name}::${section.base}::${section.target['qualifier']}`;
+    }
+    else if (section.entityType) {
+        targetID = `${section.entityType.name}::${section.base}`;
+    }
+    else {
+        targetID = section.ID;
+    }
+    return targetID;
+}
+/**
+ * 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 {object} appSchemaSection - current definition of facet or section in the JSON schema
+ * @param {object} appSchema - app specific schema that gets enhanced
+ */
+function handleForm(sectionType, section, appSchemaSection, appSchema, version, withActions = true) {
+    var _a;
+    if (!section.target) {
+        return;
+    }
+    const targetID = determineTargetIdOfForm(section);
+    const formDefinition = `${sectionType}Form<${targetID}>`;
+    const fieldsDefinition = `${sectionType}Fields<${targetID}>`;
+    const actionsDefinition = `${sectionType}Actions<${targetID}>`;
+    // Form definition
+    appSchemaSection['properties']['form'] = { $ref: __1.DEFINITION_LINK_PREFIX + formDefinition };
+    if (sectionType === __1.SectionType.Section && withActions) {
+        appSchema['definitions'][formDefinition] = {
+            type: 'object',
+            properties: {
+                actions: {
+                    $ref: __1.DEFINITION_LINK_PREFIX + actionsDefinition
+                },
+                fields: { $ref: __1.DEFINITION_LINK_PREFIX + fieldsDefinition }
+            },
+            isViewNode: true,
+            description: 'Form',
+            additionalProperties: false
+        };
+        appSchema['definitions'][actionsDefinition] = {
+            type: 'object',
+            properties: {},
+            isViewNode: true,
+            description: 'Actions',
+            additionalProperties: false
+        };
+    }
+    else {
+        appSchema['definitions'][formDefinition] = {
+            type: 'object',
+            properties: {
+                fields: { $ref: __1.DEFINITION_LINK_PREFIX + fieldsDefinition }
+            },
+            isViewNode: true,
+            description: 'Form',
+            additionalProperties: false
+        };
+    }
+    if ((_a = section.entityType) === null || _a === void 0 ? void 0 : _a.name) {
+        appSchema['definitions'][formDefinition].annotationPath = __1.createAnnotationPath(section.entityType.fullyQualifiedName, section.target['term'], section.target['qualifier']);
+    }
+    // Fields definition
+    appSchema['definitions'][fieldsDefinition] = {
+        type: 'object',
+        properties: {},
+        isViewNode: true,
+        description: 'Fields',
+        additionalProperties: false
+    };
+    // Add fields
+    if (section.base === __1.FacetBase.Identification) {
+        for (const key in section.target) {
+            const field = section.target[key];
+            if (field) {
+                addField(sectionType, appSchema, field, targetID, key, section, version, withActions);
+            }
+        }
+    }
+    else {
+        for (const key in section.target['Data']) {
+            const field = section.target['Data'][key];
+            addField(sectionType, appSchema, field, targetID, key, section, version);
+        }
+    }
+}
+exports.handleForm = handleForm;
+/**
+ * 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
+ * @returns the converted string
+ */
+function replaceAlias(annotationIdentifier, oDataServiceAVT) {
+    const potentialAlias = annotationIdentifier.indexOf('.') > -1 ? annotationIdentifier.split('.')[0] : undefined;
+    let result = annotationIdentifier;
+    if (potentialAlias) {
+        const reference = oDataServiceAVT.references.find((ref) => {
+            return ref.alias === potentialAlias;
+        });
+        if (reference) {
+            result = annotationIdentifier.replace(potentialAlias, reference.namespace);
+        }
+    }
+    return result;
+}
+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('/');
+    if (separatorIndex === -1) {
+        separatorIndex = action.lastIndexOf('.');
+    }
+    let actionName, actionId;
+    if (separatorIndex > -1) {
+        actionName = action.substr(separatorIndex + 1);
+        actionId = action.substr(0, separatorIndex) + '::' + actionName;
+    }
+    else {
+        actionName = action;
+        const namespace = entityType.fullyQualifiedName.split(entityType.name)[0];
+        actionId = namespace.substr(0, namespace.length - 1) + '::' + actionName;
+    }
+    return { actionName, actionId };
+}
+exports.getActionNameAndId = getActionNameAndId;
+/**
+ * Add Object Page Footer 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
+ */
+function addFooterActions(appSchema, entityType, oDataServiceAVT) {
+    appSchema['definitions']['ObjectPageFooter'] = JSON.parse(JSON.stringify(appSchema['definitions']['ObjectPageFooter<GenericFooterActions>']));
+    // Change reference of footer
+    appSchema['properties']['footer'] = {
+        $ref: __1.DEFINITION_LINK_PREFIX + 'ObjectPageFooter'
+    };
+    // Add action to configuration
+    appSchema['definitions']['ObjectPageFooter'].properties['actions'] = {
+        $ref: `${__1.DEFINITION_LINK_PREFIX}FooterActions`
+    };
+    const footerActions = (appSchema['definitions']['FooterActions'] = {
+        type: 'object',
+        properties: {},
+        description: 'Actions',
+        additionalProperties: false,
+        isViewNode: true
+    });
+    const alias = __1.findAlias(__1.UIVOCABULARY, oDataServiceAVT);
+    const actionAnnotation = alias &&
+        entityType.annotations &&
+        entityType.annotations[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['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 description = item.Label || actionName;
+                const actionDefinitionKey = `FooterAction<${actionId}>`;
+                appSchema['definitions'][actionDefinitionKey] = {
+                    isViewNode: true,
+                    type: 'object',
+                    properties: {},
+                    description: description,
+                    annotationPath: `/${convertedIdentification}/${index}`
+                };
+                footerActions.properties[actionId] = {
+                    $ref: `${__1.DEFINITION_LINK_PREFIX}${actionDefinitionKey}`
+                };
+            }
+        });
+    }
+    else {
+        footerActions['annotationPath'] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`;
+    }
+    delete appSchema['definitions']['GenericFooterActions'];
+    delete appSchema['definitions']['FooterAction'];
+    delete appSchema['definitions']['ObjectPageFooter<GenericFooterActions>'];
+}
+exports.addFooterActions = addFooterActions;
+/**
+ * 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
+ */
+function addHeaderActions(appSchema, entityType, oDataServiceAVT, 
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+addHeaderActionCallBack) {
+    appSchema['definitions']['ObjectPageHeader'].properties['actions'] = {
+        $ref: `${__1.DEFINITION_LINK_PREFIX}HeaderActions`
+    };
+    const headerActions = (appSchema['definitions']['HeaderActions'] = {
+        type: 'object',
+        properties: {},
+        description: 'Actions',
+        additionalProperties: false,
+        isViewNode: true
+    });
+    const alias = __1.findAlias(__1.UIVOCABULARY, oDataServiceAVT);
+    const identification = alias &&
+        entityType.annotations &&
+        entityType.annotations[alias] &&
+        entityType.annotations[alias].Identification;
+    if (identification) {
+        headerActions['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['annotationPath'] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`;
+    }
+    delete appSchema['definitions']['GenericActions'];
+    delete appSchema['definitions']['ObjectPageHeader<GenericActions>'];
+}
+exports.addHeaderActions = addHeaderActions;
+/**
+ * Adds common Object Page Header definitions to the app schema
+ * @param appSchema - app-specific JSOn schema
+ * @param entityType - current entity Type
+ */
+function addCommonHeaderSchema(appSchema, entityType) {
+    appSchema['properties']['header'] = {
+        $ref: __1.DEFINITION_LINK_PREFIX + 'ObjectPageHeader'
+    };
+    appSchema['definitions']['ObjectPageHeader'] = JSON.parse(JSON.stringify(appSchema['definitions']['ObjectPageHeader<GenericActions>']));
+    appSchema['definitions']['ObjectPageHeader'].annotationPath = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.HeaderInfo" /* HeaderInfo */}`;
+}
+exports.addCommonHeaderSchema = addCommonHeaderSchema;
+//# sourceMappingURL=objectPage.js.map

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

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

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

@@ -0,0 +1,28 @@
+import { DeprecatedProperties, SyncRule } from '../';
+import { ExtensionLogger } from '../../../apiTypes';
+/**
+ * Transfers the value of a single manifest setting to the config
+ * @param syncRule - Metadata rule
+ * @param manifestSection - Section in manifest.json
+ * @param propertyKey - Key of the property or setting
+ * @param configPart - Part of the config JSON
+ * @param sectionId - Section or facet ID
+ */
+export declare function importProperty(syncRule: SyncRule, manifestSection: {}, propertyKey: string, configPart: {
+    [key: string]: any;
+}, sectionId?: string): void;
+/**
+ * Validation during import: check if properties are marked as deprecated.
+ * If so, log them.
+ * @param deprecatedProperties - existing list, to be actualized
+ * @param manifestSection - Section in manifest.json
+ * @param path - path to the section in manifest
+ * @param {ExtensionLogger} logger - Logger class for logging messages
+ */
+export declare function checkDeprecatedProperties(deprecatedProperties: DeprecatedProperties[], manifestSection: {}, path: string, logger?: ExtensionLogger): void;
+/**
+ * get title of the section (Facet ID)
+ * @param schemaSection - Section in manifest.json
+ * @param jsonSchema - app specific schema
+ */
+export declare function getSectionTitle(schemaSection: object, jsonSchema: object): string;

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

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const __1 = require("../");
+const extensionLogger_1 = require("../../../extensionLogger");
+/**
+ * Transfers the value of a single manifest setting to the config
+ * @param syncRule - Metadata rule
+ * @param manifestSection - Section in manifest.json
+ * @param propertyKey - Key of the property or setting
+ * @param configPart - Part of the config JSON
+ * @param sectionId - Section or facet ID
+ */
+function importProperty(syncRule, manifestSection, propertyKey, configPart, sectionId) {
+    const manifestKey = syncRule.manifest.key || propertyKey;
+    const importHandler = syncRule.manifest.import;
+    if (importHandler && typeof importHandler === 'function') {
+        const value = importHandler(manifestSection, sectionId);
+        if (value !== undefined) {
+            configPart[propertyKey] = value;
+        }
+    }
+    else if (manifestSection[manifestKey] !== undefined) {
+        configPart[propertyKey] = manifestSection[manifestKey];
+    }
+}
+exports.importProperty = importProperty;
+/**
+ * Validation during import: check if properties are marked as deprecated.
+ * If so, log them.
+ * @param deprecatedProperties - existing list, to be actualized
+ * @param manifestSection - Section in manifest.json
+ * @param path - path to the section in manifest
+ * @param {ExtensionLogger} logger - Logger class for logging messages
+ */
+function checkDeprecatedProperties(deprecatedProperties, manifestSection, path, logger) {
+    if (manifestSection && deprecatedProperties) {
+        for (const key in manifestSection) {
+            const deprecated = deprecatedProperties[key];
+            if (deprecated) {
+                extensionLogger_1.log(logger, {
+                    severity: "warning" /* Warning */,
+                    message: __1.getTextForDeprecated(key, deprecated),
+                    location: {
+                        path: 'webapp/manifest.json/',
+                        range: path.split('/')
+                    }
+                });
+                delete deprecatedProperties[key];
+            }
+        }
+    }
+}
+exports.checkDeprecatedProperties = checkDeprecatedProperties;
+/**
+ * get title of the section (Facet ID)
+ * @param schemaSection - Section in manifest.json
+ * @param jsonSchema - app specific schema
+ */
+function getSectionTitle(schemaSection, jsonSchema) {
+    if (schemaSection['$ref'] && !schemaSection['title']) {
+        const refTitle = jsonSchema['definitions'][schemaSection['$ref'].split(__1.DEFINITION_LINK_PREFIX)[1]];
+        getSectionTitle(refTitle, jsonSchema);
+    }
+    else if (schemaSection['title'] && schemaSection['title'].startsWith(__1.FacetTitlePrefix)) {
+        return schemaSection['title'].split(__1.FacetTitlePrefix)[1];
+    }
+    else if (schemaSection['title']) {
+        return schemaSection['title'];
+    }
+    else {
+        return undefined;
+    }
+}
+exports.getSectionTitle = getSectionTitle;
+//# sourceMappingURL=utils.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/sync/common/import/utils.ts"],"names":[],"mappings":";;AAAA,2BAAqH;AACrH,8DAA4D;AAG5D;;;;;;;GAOG;AACH,SAAgB,cAAc,CAC1B,QAAkB,EAClB,eAAmB,EACnB,WAAmB,EACnB,UAAkC,EAClC,SAAkB;IAElB,MAAM,WAAW,GAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,IAAI,WAAW,CAAC;IAEzD,MAAM,aAAa,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC;IAC/C,IAAI,aAAa,IAAI,OAAO,aAAa,KAAK,UAAU,EAAE;QACtD,MAAM,KAAK,GAAG,aAAa,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;QACxD,IAAI,KAAK,KAAK,SAAS,EAAE;YACrB,UAAU,CAAC,WAAW,CAAC,GAAG,KAAK,CAAC;SACnC;KACJ;SAAM,IAAI,eAAe,CAAC,WAAW,CAAC,KAAK,SAAS,EAAE;QACnD,UAAU,CAAC,WAAW,CAAC,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC;KAC1D;AACL,CAAC;AAlBD,wCAkBC;AAED;;;;;;;GAOG;AACH,SAAgB,yBAAyB,CACrC,oBAA4C,EAC5C,eAAmB,EACnB,IAAY,EACZ,MAAwB;IAExB,IAAI,eAAe,IAAI,oBAAoB,EAAE;QACzC,KAAK,MAAM,GAAG,IAAI,eAAe,EAAE;YAC/B,MAAM,UAAU,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;YAC7C,IAAI,UAAU,EAAE;gBACZ,qBAAG,CAAC,MAAM,EAAE;oBACR,QAAQ,yBAAqB;oBAC7B,OAAO,EAAE,wBAAoB,CAAC,GAAG,EAAE,UAAU,CAAC;oBAC9C,QAAQ,EAAE;wBACN,IAAI,EAAE,uBAAuB;wBAC7B,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;qBACzB;iBACJ,CAAC,CAAC;gBACH,OAAO,oBAAoB,CAAC,GAAG,CAAC,CAAC;aACpC;SACJ;KACJ;AACL,CAAC;AAtBD,8DAsBC;AAED;;;;GAIG;AACH,SAAgB,eAAe,CAAC,aAAqB,EAAE,UAAkB;IACrE,IAAI,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE;QAClD,MAAM,QAAQ,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,0BAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACnG,eAAe,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;KACzC;SAAM,IAAI,aAAa,CAAC,OAAO,CAAC,IAAI,aAAa,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,oBAAgB,CAAC,EAAE;QACtF,OAAO,aAAa,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,oBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;KAC5D;SAAM,IAAI,aAAa,CAAC,OAAO,CAAC,EAAE;QAC/B,OAAO,aAAa,CAAC,OAAO,CAAC,CAAC;KACjC;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC;AAXD,0CAWC"}

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

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