@sap-ux/odata-service-writer 0.23.3 → 0.24.1

package/dist/data/annotations.js

@@ -4,25 +4,19 @@ exports.getAnnotationNamespaces = getAnnotationNamespaces;
 const fast_xml_parser_1 = require("fast-xml-parser");
 const i18n_1 = require("../i18n");
 /**
- * Returns the namespaces parsed from the specified metadata and annotations.
+ * Returns the namespaces parsed from the specified metadata and single annotation.
  *
- * @param {Partial<OdataService>} service - an odata service where at least metadata and annotations properties are defined
- * @param {string} service.metadata - OData service metadata xml
- * @param {string} service.annotations - OData service annotations xml
+ * @param {EdmxAnnotationsInfo} edmxAnnotation - OData service annotations xml
+ * @param {NamespaceAlias[]} schemaNamespaces - namespaces array from metadata
  * @returns A reference to the namspaces array
  */
-function getAnnotationNamespaces({ metadata, annotations }) {
-    // Enhance service with annotations namespaces
-    const schemaNamespaces = metadata ? getNamespaces(metadata) : [];
-    const edmxAnnotations = annotations;
-    if (edmxAnnotations?.xml) {
+function getAnnotationNamespacesForSingleAnnotation(edmxAnnotation, schemaNamespaces) {
+    if (edmxAnnotation?.xml) {
         // Parse once
-        const annotationsJson = xmlToJson(edmxAnnotations.xml);
+        const annotationsJson = xmlToJson(edmxAnnotation.xml);
         return schemaNamespaces.map((schema) => {
             // Check if alias exists in backend annotation file, if so use it
-            const annotationAlias = edmxAnnotations.xml && schema.namespace
-                ? getAliasFromAnnotation(annotationsJson, schema.namespace)
-                : '';
+            const annotationAlias = edmxAnnotation.xml && schema.namespace ? getAliasFromAnnotation(annotationsJson, schema.namespace) : '';
             if (annotationAlias) {
                 schema.alias = annotationAlias;
             }
@@ -31,6 +25,29 @@ function getAnnotationNamespaces({ metadata, annotations }) {
     }
     return schemaNamespaces;
 }
+/**
+ * Returns the namespaces parsed from the specified metadata and annotations.
+ *
+ * @param {Partial<OdataService>} service - an odata service where at least metadata and annotations properties are defined
+ * @param {string} service.metadata - OData service metadata xml
+ * @param {string} service.annotations - OData service annotations xml
+ * @returns A reference to the namspaces array
+ */
+function getAnnotationNamespaces({ metadata, annotations }) {
+    // Enhance service with annotations namespaces
+    let schemaNamespaces = metadata ? getNamespaces(metadata) : [];
+    if (Array.isArray(annotations)) {
+        for (const annotationName in annotations) {
+            const edmxAnnotation = annotations[annotationName];
+            schemaNamespaces = getAnnotationNamespacesForSingleAnnotation(edmxAnnotation, schemaNamespaces);
+        }
+    }
+    else {
+        const edmxAnnotation = annotations;
+        schemaNamespaces = getAnnotationNamespacesForSingleAnnotation(edmxAnnotation, schemaNamespaces);
+    }
+    return schemaNamespaces;
+}
 /**
  * Convert specified xml string to JSON.
  *

package/dist/data/defaults.d.ts

@@ -1,9 +1,12 @@
 import type { OdataService } from '../types';
+import type { Editor } from 'mem-fs-editor';
 /**
  * Enhances the provided OData service object with path, name and model information.
  * Directly modifies the passed object reference.
  *
- * @param {OdataService} service - the OData service object
+ * @param {string} basePath - the root path of an existing UI5 application
+ * @param {OdataService} service - the OData service instance
+ * @param {Editor} fs - the memfs editor instance
  */
-export declare function enhanceData(service: OdataService): void;
+export declare function enhanceData(basePath: string, service: OdataService, fs: Editor): Promise<void>;
 //# sourceMappingURL=defaults.d.ts.map

package/dist/data/defaults.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enhanceData = enhanceData;
+const path_1 = require("path");
 const types_1 = require("../types");
 const constants_1 = require("./constants");
+const project_access_1 = require("@sap-ux/project-access");
 /**
  * Sets the default path for a given service.
  * If the service path is not defined, it sets the path to '/'.
@@ -15,45 +17,99 @@ function setDefaultServicePath(service) {
 }
 /**
  * Sets the default name for a given service.
- * If the service name is not defined, it sets the name to `DEFAULT_DATASOURCE_NAME`.
+ * Default serivce name is used only for first service.
  *
+ * @param {string} basePath - the root path of an existing UI5 application
  * @param {OdataService} service - The service object whose name needs to be set or modified.
+ * @param fs - the memfs editor instance
  */
-function setDefaultServiceName(service) {
-    service.name = service.name ?? constants_1.DEFAULT_DATASOURCE_NAME;
+async function setDefaultServiceName(basePath, service, fs) {
+    const manifestPath = (0, path_1.join)(await (0, project_access_1.getWebappPath)(basePath, fs), project_access_1.FileName.Manifest);
+    const manifest = fs.readJSON(manifestPath);
+    // Check if manifest has already any dataSources defined, DEFAULT_DATASOURCE_NAME should be used for the first service
+    const dataSources = manifest?.['sap.app']?.dataSources;
+    if (dataSources) {
+        // Filter out ODataAnnotation dataSources and keep only OData ones
+        const oDataSources = Object.values(dataSources).filter((dataSource) => dataSource.type === 'OData');
+        if (oDataSources.length === 0) {
+            service.name = constants_1.DEFAULT_DATASOURCE_NAME;
+        }
+    }
+    else {
+        // No existing dataSources - no existing services, use default name
+        service.name = constants_1.DEFAULT_DATASOURCE_NAME;
+    }
 }
 /**
  * Sets the default model for a given service.
- * If the service model is not defined, it sets the model to an empty string (Default UI5 model).
+ * Default UI5 model is used for first service model.
+ * For next services service model or service name is used as model (if model is not defined).
  *
- * @param {OdataService} service - The service object whose model needs to be set or modified.
+ * @param {string} basePath - the root path of an existing UI5 application
+ * @param {OdataService} service - The service object whose model needs to be set or modified
+ * @param fs - the memfs editor instance
  */
-function setDefaultServiceModel(service) {
-    service.model = service.model ?? ''; // Default UI5 model
+async function setDefaultServiceModel(basePath, service, fs) {
+    const manifestPath = (0, path_1.join)(await (0, project_access_1.getWebappPath)(basePath, fs), 'manifest.json');
+    const manifest = fs.readJSON(manifestPath);
+    // Check if manifest has already any dataSource models defined, empty string '' should be used for the first service
+    const models = manifest?.['sap.ui5']?.models;
+    if (models) {
+        // Filter dataSource models by dataSource property
+        const servicesModels = Object.values(models).filter((model) => model.dataSource);
+        service.model = servicesModels.length === 0 ? '' : service.model ?? service.name;
+    }
+    // No models defined, that means first one is being added, set model to ''
+    service.model ??= '';
 }
 /**
- * Sets the default annotations name for a given service.
- * If the service annotations name is not defined or empty, it creates a default annotations name
+ * Sets default annotation name for a single annotation of a given service.
+ * If the service annotation name is not defined or empty, it creates a default annotations name
  * from the technicalName by replacing all '/' characters with '_' and removing the leading '_'.
+ * If the service and annotation names are the same, then '_Annotation' string is added at the end of annotation name.
+ *
+ * @param {EdmxAnnotationsInfo} annotation - annotation of a given service
+ * @param {string} serviceName - name of the service whose annotations are getting modified.
+ */
+function setDefaultAnnotationName(annotation, serviceName) {
+    if (annotation?.technicalName && !annotation.name) {
+        annotation.name = annotation?.technicalName?.replace(/\//g, '_')?.replace(/^_/, '');
+    }
+    if (annotation.name === serviceName) {
+        annotation.name += '_Annotation';
+    }
+}
+/**
+ * Sets default names for annotations of a given service.
+ * Handles single annotation in object or annotations array.
  *
  * @param {OdataService} service - The service object whose annotations name needs to be set or modified.
  */
 function setDefaultAnnotationsName(service) {
-    const annotations = service.annotations;
-    if (annotations?.technicalName && !annotations.name) {
-        annotations.name = annotations?.technicalName?.replace(/\//g, '_')?.replace(/^_/, '');
+    if (Array.isArray(service.annotations)) {
+        const annotations = service.annotations;
+        for (const annotationName in annotations) {
+            const annotation = annotations[annotationName];
+            setDefaultAnnotationName(annotation, service.name);
+        }
+    }
+    else if (service.annotations) {
+        const annotation = service.annotations;
+        setDefaultAnnotationName(annotation, service.name);
     }
 }
 /**
  * Enhances the provided OData service object with path, name and model information.
  * Directly modifies the passed object reference.
  *
- * @param {OdataService} service - the OData service object
+ * @param {string} basePath - the root path of an existing UI5 application
+ * @param {OdataService} service - the OData service instance
+ * @param {Editor} fs - the memfs editor instance
  */
-function enhanceData(service) {
+async function enhanceData(basePath, service, fs) {
     setDefaultServicePath(service);
-    setDefaultServiceName(service);
-    setDefaultServiceModel(service);
+    await setDefaultServiceName(basePath, service, fs);
+    await setDefaultServiceModel(basePath, service, fs);
     // set service type to EDMX if not defined
     service.type = service.type ?? types_1.ServiceType.EDMX;
     /**
@@ -65,10 +121,10 @@ function enhanceData(service) {
         setDefaultAnnotationsName(service);
     }
     // enhance preview settings with service configuration
-    service.previewSettings = service.previewSettings || {};
+    service.previewSettings = service.previewSettings ?? {};
     service.previewSettings.path =
-        service.previewSettings.path || `/${service.path?.split('/').filter((s) => s !== '')[0] ?? ''}`;
-    service.previewSettings.url = service.previewSettings.url || service.url || 'http://localhost';
+        service.previewSettings.path ?? `/${service.path?.split('/').filter((s) => s !== '')[0] ?? ''}`;
+    service.previewSettings.url = service.previewSettings.url ?? service.url ?? 'http://localhost';
     if (service.client && !service.previewSettings.client) {
         service.previewSettings.client = service.client;
     }

package/dist/delete.d.ts

@@ -0,0 +1,30 @@
+import type { Editor } from 'mem-fs-editor';
+import type { CdsAnnotationsInfo, EdmxAnnotationsInfo } from './types';
+/**
+ * Removes annotations from CDS files.
+ * This function takes cds annotations and an Editor instance,
+ * then updates the relevant cds files with the given annotations.
+ *
+ * @param {CdsAnnotationsInfo} annotations - The cds annotations info.
+ * @param {Editor} fs - The memfs editor instance
+ * @returns {Promise<void>} A promise that resolves when the cds files have been updated.
+ */
+export declare function removeAnnotationsFromCDSFiles(annotations: CdsAnnotationsInfo | CdsAnnotationsInfo[], fs: Editor): Promise<void>;
+/**
+ * Removes annotation XML files for EDMX annotations.
+ *
+ * @param {Editor} fs - The memfs editor instance.
+ * @param {string} basePath - The base path of the project.
+ * @param {string} serviceName - Name of The OData service.
+ * @param {OdataService} edmxAnnotations - The OData service annotations.
+ */
+export declare function removeAnnotationXmlFiles(fs: Editor, basePath: string, serviceName: string, edmxAnnotations: EdmxAnnotationsInfo | EdmxAnnotationsInfo[]): void;
+/**
+ * Internal function that deletes service from the manifest.json based on the given service name.
+ *
+ * @param basePath - the root path of an existing UI5 application
+ * @param serviceName - name of the OData service instance
+ * @param fs - the memfs editor instance
+ */
+export declare function deleteServiceFromManifest(basePath: string, serviceName: string, fs: Editor): void;
+//# sourceMappingURL=delete.d.ts.map

package/dist/delete.js

@@ -0,0 +1,183 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.removeAnnotationsFromCDSFiles = removeAnnotationsFromCDSFiles;
+exports.removeAnnotationXmlFiles = removeAnnotationXmlFiles;
+exports.deleteServiceFromManifest = deleteServiceFromManifest;
+const path_1 = require("path");
+const i18n_1 = require("./i18n");
+/**
+ * Removes the cds index or service file with the provided annotations.
+ * This function takes an Editor instance and cds annotations
+ * and deletes either from the index file or the service file with the given annotations.
+ *
+ * @param {Editor} fs - The memfs editor instance
+ * @param {CdsAnnotationsInfo} annotations - The cds annotations info.
+ * @returns {Promise<void>} A promise that resolves when the cds files have been updated.
+ */
+async function removeCdsIndexOrServiceFile(fs, annotations) {
+    const dirPath = (0, path_1.join)(annotations.projectName, 'annotations');
+    const annotationPath = (0, path_1.normalize)(dirPath).split(/[\\/]/g).join(path_1.posix.sep);
+    const annotationConfig = `\nusing from './${annotationPath}';`;
+    // Get index and service file paths
+    const indexFilePath = (0, path_1.join)(annotations.projectPath, annotations.appPath ?? '', 'index.cds');
+    const serviceFilePath = (0, path_1.join)(annotations.projectPath, annotations.appPath ?? '', 'services.cds');
+    // Remove annotation config from index or service file
+    if (indexFilePath && fs.exists(indexFilePath)) {
+        // Read old annotations content and replace it with empty string
+        const initialIndexContent = fs.read(indexFilePath);
+        const updatedContent = initialIndexContent.replace(annotationConfig, '');
+        fs.write(indexFilePath, updatedContent);
+    }
+    else if (fs.exists(serviceFilePath)) {
+        // Read old annotations content and replace it with empty string
+        const initialServiceFileContent = fs.read(serviceFilePath);
+        const updatedContent = initialServiceFileContent.replace(annotationConfig, '');
+        fs.write(serviceFilePath, updatedContent);
+    }
+}
+/**
+ * Removes annotations from CDS files.
+ * This function takes cds annotations and an Editor instance,
+ * then updates the relevant cds files with the given annotations.
+ *
+ * @param {CdsAnnotationsInfo} annotations - The cds annotations info.
+ * @param {Editor} fs - The memfs editor instance
+ * @returns {Promise<void>} A promise that resolves when the cds files have been updated.
+ */
+async function removeAnnotationsFromCDSFiles(annotations, fs) {
+    if (Array.isArray(annotations)) {
+        for (const annotationName in annotations) {
+            const annotation = annotations[annotationName];
+            const annotationCdsPath = (0, path_1.join)(annotation.projectPath, annotation.appPath ?? '', annotation.projectName, 'annotations.cds');
+            // Remove from annotations.cds file
+            if (fs.exists(annotationCdsPath)) {
+                // Read old annotations content and replace it with empty string
+                const initialCDSContent = fs.read(annotationCdsPath);
+                const updatedContent = initialCDSContent.replace(annotation.cdsFileContents, '');
+                fs.write(annotationCdsPath, updatedContent);
+            }
+            await removeCdsIndexOrServiceFile(fs, annotation);
+        }
+    }
+    else {
+        const annotationCdsPath = (0, path_1.join)(annotations.projectPath, annotations.appPath ?? '', annotations.projectName, 'annotations.cds');
+        // Write into annotations.cds file
+        if (fs.exists(annotationCdsPath)) {
+            // Read old annotations content and replace it with empty string
+            const initialCDSContent = fs.read(annotationCdsPath);
+            const updatedContent = initialCDSContent.replace(annotations.cdsFileContents, '');
+            fs.write(annotationCdsPath, updatedContent);
+        }
+        await removeCdsIndexOrServiceFile(fs, annotations);
+    }
+}
+/**
+ * Removes annotation XML files for EDMX annotations.
+ *
+ * @param {Editor} fs - The memfs editor instance.
+ * @param {string} basePath - The base path of the project.
+ * @param {string} serviceName - Name of The OData service.
+ * @param {OdataService} edmxAnnotations - The OData service annotations.
+ */
+function removeAnnotationXmlFiles(fs, basePath, serviceName, edmxAnnotations) {
+    // Write annotation xml if annotations are provided and service type is EDMX
+    if (Array.isArray(edmxAnnotations)) {
+        for (const annotationName in edmxAnnotations) {
+            const annotation = edmxAnnotations[annotationName];
+            const pathToAnnotationFile = (0, path_1.join)(basePath, 'webapp', 'localService', serviceName, `${annotation.technicalName}.xml`);
+            if (fs.exists(pathToAnnotationFile)) {
+                fs.delete(pathToAnnotationFile);
+            }
+        }
+    }
+    else if (edmxAnnotations?.xml) {
+        const pathToAnnotationFile = (0, path_1.join)(basePath, 'webapp', 'localService', serviceName, `${edmxAnnotations.technicalName}.xml`);
+        if (fs.exists(pathToAnnotationFile)) {
+            fs.delete(pathToAnnotationFile);
+        }
+    }
+}
+/**
+ * Internal function that removes files related to dataSource.
+ *
+ * @param fs - the memfs editor instance
+ * @param manifestPath - the root path of an existing UI5 application
+ * @param dataSource - name of the OData service instance
+ */
+function removeFileForDataSource(fs, manifestPath, dataSource) {
+    const serviceSettings = dataSource.settings || {};
+    if (serviceSettings?.localUri) {
+        const localUriPath = (0, path_1.join)((0, path_1.dirname)(manifestPath), serviceSettings?.localUri);
+        if (fs.exists(localUriPath)) {
+            // delete the local data source file
+            fs.delete(localUriPath);
+        }
+    }
+}
+/**
+ * Internal function that removes annotation files related to service.
+ *
+ * @param fs - the memfs editor instance
+ * @param manifestPath - the root path of an existing UI5 application
+ * @param annotations - annotations list
+ * @param dataSources - list of dataSources from manifest.json
+ */
+function removeAnnotations(fs, manifestPath, annotations, dataSources) {
+    for (const datasourceKey of annotations) {
+        const annotationDatasource = dataSources?.[datasourceKey];
+        if (annotationDatasource?.type === 'ODataAnnotation') {
+            if (annotationDatasource.uri === annotationDatasource?.settings?.localUri) {
+                // This is localAnnotaton file. Do not delete it.
+            }
+            else if (annotationDatasource) {
+                removeFileForDataSource(fs, manifestPath, annotationDatasource);
+                // delete dataSource from manifest
+                delete dataSources?.[datasourceKey];
+            }
+        }
+    }
+}
+/**
+ * Internal function that deletes service from the manifest.json based on the given service name.
+ *
+ * @param basePath - the root path of an existing UI5 application
+ * @param serviceName - name of the OData service instance
+ * @param fs - the memfs editor instance
+ */
+function deleteServiceFromManifest(basePath, serviceName, fs) {
+    const manifestPath = (0, path_1.join)(basePath, 'webapp', 'manifest.json');
+    // Get component app id
+    const manifest = fs.readJSON(manifestPath);
+    const appProp = 'sap.app';
+    const appid = manifest?.[appProp]?.id;
+    // Throw if required property is not found manifest.json
+    if (!appid) {
+        throw new Error((0, i18n_1.t)('error.requiredProjectPropertyNotFound', { property: `'${appProp}'.id`, path: manifestPath }));
+    }
+    const dataSources = manifest?.[appProp]?.dataSources;
+    if (dataSources?.[serviceName]) {
+        removeFileForDataSource(fs, manifestPath, dataSources?.[serviceName]);
+    }
+    const serviceSettings = dataSources?.[serviceName]?.settings;
+    // Check for linked backend annotations and delete if found.
+    if (serviceSettings?.annotations && serviceSettings.annotations.length > 0) {
+        removeAnnotations(fs, manifestPath, serviceSettings.annotations, dataSources);
+    }
+    // delete dataSource from manifest
+    if (dataSources?.[serviceName]) {
+        delete dataSources[serviceName];
+    }
+    const modelsProp = 'sap.ui5';
+    // delete models for this service
+    const models = manifest?.[modelsProp]?.models;
+    if (models) {
+        for (const modelKey of Object.keys(models)) {
+            const modelObj = models[modelKey];
+            if (modelObj?.dataSource === serviceName) {
+                delete models[modelKey];
+            }
+        }
+    }
+    fs.writeJSON(manifestPath, manifest);
+}
+//# sourceMappingURL=delete.js.map

package/dist/index.d.ts

@@ -1,17 +1,15 @@
 import type { Editor } from 'mem-fs-editor';
 import { getAnnotationNamespaces } from './data';
+import type { ProjectPaths } from './types';
 import { OdataService, OdataVersion, ServiceType, CdsAnnotationsInfo, EdmxAnnotationsInfo, NamespaceAlias } from './types';
 /**
  * Try finding a package.json and a ui5.yaml for the given project by looking upwards in the folder hierachy.
  *
  * @param {string} basePath - the root path of an existing UI5 application
  * @param {Editor} [fs] - the memfs editor instance
- * @returns an object with the optional locations of the package.json and ui5.yaml
+ * @returns an object with the optional locations of the package.json and ui5.yaml, ui5-local.yaml, ui5-mock.yaml
  */
-export declare function findProjectFiles(basePath: string, fs: Editor): Promise<{
-    packageJson?: string;
-    ui5Yaml?: string;
-}>;
+export declare function findProjectFiles(basePath: string, fs: Editor): Promise<ProjectPaths>;
 /**
  * Writes the odata service related file updates to an existing UI5 project specified by the base path.
  *
@@ -22,6 +20,33 @@ export declare function findProjectFiles(basePath: string, fs: Editor): Promise<
  * @returns {Promise<Editor>} the updated memfs editor instance
  */
 declare function generate(basePath: string, service: OdataService, fs?: Editor): Promise<Editor>;
-export { generate, OdataVersion, OdataService, ServiceType, EdmxAnnotationsInfo, CdsAnnotationsInfo };
+/**
+ * Removes service related data from project files for an existing UI5 project specified by the base path.
+ * Works as follow:
+ * 1. Service is removed from manifest.
+ * If service type is EDMX:
+ * 2. ui5.yaml
+ *  - backend data of the service is removed from fiori-tools-proxy middleware
+ * 3. ui5-local.yaml
+ *  - backend data of the service is removed from fiori-tools-proxy middleware
+ *  - service is removed from mockserver middleware
+ * 4. ui5-mock.yaml
+ *  - service is removed from mockserver middleware
+ * If service type is CDS:
+ * 2. annotations of the service are removed from CDS files.
+ *
+ * @param {string} basePath - the root path of an existing UI5 application
+ * @param {OdataService} service - the OData service instance
+ * @param {string} service.name - name of the OData service instance
+ * @param {string} service.path - path of the OData service instance
+ * @param {string} service.url - url of the OData service instance
+ * @param {ServiceType} service.type - type of the OData service instance
+ * @param {OdataService['annotations']} service.annotations - services annotations (EDMX or CDS)
+ * @param {Editor} [fs] - the memfs editor instance
+ * @throws {Error} - if required UI5 project files are not found
+ * @returns {Promise<Editor>} the updated memfs editor instance
+ */
+declare function remove(basePath: string, service: Required<Pick<OdataService, 'name' | 'path' | 'url' | 'type' | 'annotations'>>, fs?: Editor): Promise<Editor>;
+export { generate, remove, OdataVersion, OdataService, ServiceType, EdmxAnnotationsInfo, CdsAnnotationsInfo };
 export { getAnnotationNamespaces, NamespaceAlias };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAnnotationNamespaces = exports.ServiceType = exports.OdataVersion = void 0;
 exports.findProjectFiles = findProjectFiles;
 exports.generate = generate;
+exports.remove = remove;
 const path_1 = require("path");
 const mem_fs_1 = require("mem-fs");
 const mem_fs_editor_1 = require("mem-fs-editor");
@@ -20,6 +21,7 @@ Object.defineProperty(exports, "OdataVersion", { enumerable: true, get: function
 Object.defineProperty(exports, "ServiceType", { enumerable: true, get: function () { return types_1.ServiceType; } });
 const project_access_1 = require("@sap-ux/project-access");
 const mockserver_config_writer_1 = require("@sap-ux/mockserver-config-writer");
+const delete_1 = require("./delete");
 /**
  * Ensures the existence of the given files in the provided base path. If a file in the provided list does not exit, an error would be thrown.
  *
@@ -39,12 +41,12 @@ function ensureExists(basePath, files, fs) {
  *
  * @param {string} basePath - the root path of an existing UI5 application
  * @param {Editor} [fs] - the memfs editor instance
- * @returns an object with the optional locations of the package.json and ui5.yaml
+ * @returns an object with the optional locations of the package.json and ui5.yaml, ui5-local.yaml, ui5-mock.yaml
  */
 async function findProjectFiles(basePath, fs) {
     const files = {};
     const parts = basePath.split(path_1.sep);
-    while (parts.length > 0 && (!files.packageJson || !files.ui5Yaml)) {
+    while (parts.length > 0 && (!files.packageJson || !files.ui5Yaml || !files.ui5LocalYaml || !files.ui5MockYaml)) {
         const path = parts.join(path_1.sep);
         if (!files.packageJson && fs.exists((0, path_1.join)(path, 'package.json'))) {
             files.packageJson = (0, path_1.join)(path, 'package.json');
@@ -52,10 +54,150 @@ async function findProjectFiles(basePath, fs) {
         if (!files.ui5Yaml && fs.exists((0, path_1.join)(path, 'ui5.yaml'))) {
             files.ui5Yaml = (0, path_1.join)(path, 'ui5.yaml');
         }
+        if (!files.ui5LocalYaml && fs.exists((0, path_1.join)(path, 'ui5-local.yaml'))) {
+            files.ui5LocalYaml = (0, path_1.join)(path, 'ui5-local.yaml');
+        }
+        if (!files.ui5MockYaml && fs.exists((0, path_1.join)(path, 'ui5-mock.yaml'))) {
+            files.ui5MockYaml = (0, path_1.join)(path, 'ui5-mock.yaml');
+        }
         parts.pop();
     }
     return files;
 }
+/**
+ * Generates mockserver middleware config for ui5-local.yaml file based on ui5-mock.yaml.
+ *
+ * @param {Editor} fs - the memfs editor instance
+ * @param {OdataService} ui5YamlPath - path pointing to the ui5.yaml file
+ * @param {UI5Config} ui5LocalConfigPath - ui5-local.yaml configuration
+ * @param {string} ui5LocalConfig - path pointing to the ui5-local.yaml file
+ * @returns {Promise<Editor>} the updated memfs editor instance
+ */
+async function generateMockserverMiddlewareBasedOnUi5MockYaml(fs, ui5YamlPath, ui5LocalConfigPath, ui5LocalConfig) {
+    // Update ui5-local.yaml with mockserver middleware from ui5-mock.yaml
+    const ui5MockYamlPath = (0, path_1.join)((0, path_1.dirname)(ui5YamlPath), 'ui5-mock.yaml');
+    const ui5MockYamlConfig = await ui5_config_1.UI5Config.newInstance(fs.read(ui5MockYamlPath));
+    const mockserverMiddlewareFromUi5Mock = ui5MockYamlConfig.findCustomMiddleware('sap-fe-mockserver');
+    if (ui5LocalConfigPath && fs.exists(ui5LocalConfigPath) && ui5LocalConfig && mockserverMiddlewareFromUi5Mock) {
+        ui5LocalConfig.updateCustomMiddleware(mockserverMiddlewareFromUi5Mock);
+    }
+}
+/**
+ * Extends backend middleware for UI5Config with service data.
+ *
+ * @param {Editor} fs - the memfs editor instance
+ * @param {OdataService} service - the OData service instance data
+ * @param {UI5Config} ui5Config - UI5 configuration
+ * @param {string} ui5ConfigPath - path to the YAML config file
+ * @throws {Error} - if required UI5 project files are not found
+ */
+function extendBackendMiddleware(fs, service, ui5Config, ui5ConfigPath) {
+    try {
+        ui5Config.addBackendToFioriToolsProxydMiddleware(service.previewSettings);
+    }
+    catch (error) {
+        if ((error instanceof ui5_config_1.YAMLError && error.code === ui5_config_1.yamlErrorCode.nodeNotFound) ||
+            error.message === 'Could not find fiori-tools-proxy') {
+            ui5Config.addFioriToolsProxydMiddleware({
+                backend: [service.previewSettings],
+                ignoreCertError: service.ignoreCertError
+            });
+        }
+        else {
+            throw error;
+        }
+    }
+    fs.write(ui5ConfigPath, ui5Config.toString());
+}
+/**
+ * Returns all paths of the EDMX service annotations.
+ *
+ * @param {OdataService} edmxAnnotations - EDMX OData service annotations.
+ * @returns {string} annotation paths.
+ */
+function getEDMXAnnotationPaths(edmxAnnotations) {
+    const emdxAnnotationsPaths = [];
+    if (Array.isArray(edmxAnnotations)) {
+        edmxAnnotations.forEach((annotation) => {
+            const technicalName = encodeURIComponent(annotation.technicalName);
+            emdxAnnotationsPaths.push(`/sap/opu/odata/IWFND/CATALOGSERVICE;v=2/Annotations(TechnicalName='${technicalName}',Version='0001')/$value/` // This is how annotation paths are stored in manifest for ODataAnnotations
+            );
+        });
+    }
+    else {
+        const technicalName = encodeURIComponent(edmxAnnotations.technicalName);
+        emdxAnnotationsPaths.push(`/sap/opu/odata/IWFND/CATALOGSERVICE;v=2/Annotations(TechnicalName='${technicalName}',Version='0001')/$value/`);
+    }
+    return emdxAnnotationsPaths;
+}
+/**
+ * Writes local copies of metadata and annotations.
+ *
+ * @param {Editor} fs - the memfs editor instance
+ * @param {string} basePath - the root path of an existing UI5 application
+ * @param {string} webappPath - the webapp path of an existing UI5 application
+ * @param {string} templateRoot - path to the file templates
+ * @param {OdataService} service - the OData service instance with EDMX type
+ */
+async function writeLocalServiceFiles(fs, basePath, webappPath, templateRoot, service) {
+    // mainService should be used in case there is no name defined for service
+    fs.write((0, path_1.join)(webappPath, 'localService', service.name ?? 'mainService', 'metadata.xml'), (0, prettify_xml_1.default)(service.metadata, { indent: 4 }));
+    // Adds local annotations to datasources section of manifest.json and writes the annotations file
+    if (service.localAnnotationsName) {
+        const namespaces = (0, data_1.getAnnotationNamespaces)(service);
+        fs.copyTpl((0, path_1.join)(templateRoot, 'add', 'annotation.xml'), (0, path_1.join)(basePath, 'webapp', 'annotations', `${service.localAnnotationsName}.xml`), { ...service, namespaces });
+    }
+}
+/**
+ * Writes EDMX service data to ui5.yaml, ui5-mock.yaml, ui5-local.yaml, package.json and annotations xml files.
+ *
+ * @param {Editor} fs - the memfs editor instance
+ * @param {string} basePath - the root path of an existing UI5 application
+ * @param {ProjectPaths} paths - locations of the package.json and ui5.yaml, ui5-local.yaml, ui5-mock.yaml
+ * @param {string} templateRoot - path to the file templates
+ * @param {OdataService} service - the OData service instance with EDMX type
+ */
+async function writeEDMXServiceFiles(fs, basePath, paths, templateRoot, service) {
+    let ui5Config;
+    let ui5LocalConfig;
+    let ui5MockConfig;
+    if (paths.ui5Yaml) {
+        ui5Config = await ui5_config_1.UI5Config.newInstance(fs.read(paths.ui5Yaml));
+        // Update ui5.yaml with backend middleware
+        extendBackendMiddleware(fs, service, ui5Config, paths.ui5Yaml);
+        // Update ui5-local.yaml with backend middleware
+        if (paths.ui5LocalYaml) {
+            ui5LocalConfig = await ui5_config_1.UI5Config.newInstance(fs.read(paths.ui5LocalYaml));
+            extendBackendMiddleware(fs, service, ui5LocalConfig, paths.ui5LocalYaml);
+        }
+    }
+    if (service.metadata) {
+        const webappPath = await (0, project_access_1.getWebappPath)(basePath, fs);
+        if (paths.ui5Yaml && ui5Config) {
+            const config = {
+                webappPath: webappPath
+            };
+            // Generate mockserver middleware for ui5-mock.yaml
+            await (0, mockserver_config_writer_1.generateMockserverConfig)(basePath, config, fs);
+            // Update ui5-local.yaml with mockserver middleware from newly created/updated ui5-mock.yaml
+            await generateMockserverMiddlewareBasedOnUi5MockYaml(fs, paths.ui5Yaml, paths.ui5LocalYaml, ui5LocalConfig);
+            // Update ui5-mock.yaml with backend middleware
+            if (paths.ui5MockYaml) {
+                ui5MockConfig = await ui5_config_1.UI5Config.newInstance(fs.read(paths.ui5MockYaml));
+                extendBackendMiddleware(fs, service, ui5MockConfig, paths.ui5MockYaml);
+            }
+        }
+        await writeLocalServiceFiles(fs, basePath, webappPath, templateRoot, service);
+    }
+    if (paths.packageJson && paths.ui5Yaml) {
+        (0, updates_1.updatePackageJson)(paths.packageJson, fs, !!service.metadata);
+    }
+    if (paths.ui5LocalYaml && ui5LocalConfig) {
+        // write ui5 local yaml if service type is not CDS
+        fs.write(paths.ui5LocalYaml, ui5LocalConfig.toString());
+    }
+    (0, updates_1.writeAnnotationXmlFiles)(fs, basePath, service.name ?? 'mainService', service.annotations);
+}
 /**
  * Writes the odata service related file updates to an existing UI5 project specified by the base path.
  *
@@ -71,84 +213,91 @@ async function generate(basePath, service, fs) {
     }
     const paths = await findProjectFiles(basePath, fs);
     ensureExists(basePath, ['webapp/manifest.json'], fs);
-    (0, data_1.enhanceData)(service);
-    // set isServiceTypeEdmx true if service is EDMX
+    await (0, data_1.enhanceData)(basePath, service, fs);
+    // Set isServiceTypeEdmx true if service is EDMX
     const isServiceTypeEdmx = service.type === types_1.ServiceType.EDMX;
-    // merge content into existing files
+    // Prepare template folder for manifest and xml updates
     const templateRoot = (0, path_1.join)(__dirname, '../templates');
-    // update cds files with annotations only if service type is CDS and annotations are provided
-    if (!isServiceTypeEdmx && service.annotations) {
+    // Update manifest.json
+    await (0, updates_1.updateManifest)(basePath, service, fs, templateRoot);
+    // Dont extend backend and mockserver middlewares if service type is CDS
+    if (isServiceTypeEdmx) {
+        await writeEDMXServiceFiles(fs, basePath, paths, templateRoot, service);
+    }
+    else if (!isServiceTypeEdmx && service.annotations) {
+        // Update cds files with annotations only if service type is CDS and annotations are provided
         await (0, updates_1.updateCdsFilesWithAnnotations)(service.annotations, fs);
     }
-    // manifest.json
-    (0, updates_1.updateManifest)(basePath, service, fs, templateRoot);
-    // update ui5.yaml if it exists
+    return fs;
+}
+/**
+ * Removes service related data from project files for an existing UI5 project specified by the base path.
+ * Works as follow:
+ * 1. Service is removed from manifest.
+ * If service type is EDMX:
+ * 2. ui5.yaml
+ *  - backend data of the service is removed from fiori-tools-proxy middleware
+ * 3. ui5-local.yaml
+ *  - backend data of the service is removed from fiori-tools-proxy middleware
+ *  - service is removed from mockserver middleware
+ * 4. ui5-mock.yaml
+ *  - service is removed from mockserver middleware
+ * If service type is CDS:
+ * 2. annotations of the service are removed from CDS files.
+ *
+ * @param {string} basePath - the root path of an existing UI5 application
+ * @param {OdataService} service - the OData service instance
+ * @param {string} service.name - name of the OData service instance
+ * @param {string} service.path - path of the OData service instance
+ * @param {string} service.url - url of the OData service instance
+ * @param {ServiceType} service.type - type of the OData service instance
+ * @param {OdataService['annotations']} service.annotations - services annotations (EDMX or CDS)
+ * @param {Editor} [fs] - the memfs editor instance
+ * @throws {Error} - if required UI5 project files are not found
+ * @returns {Promise<Editor>} the updated memfs editor instance
+ */
+async function remove(basePath, service, fs) {
+    if (!fs) {
+        fs = (0, mem_fs_editor_1.create)((0, mem_fs_1.create)());
+    }
     let ui5Config;
     let ui5LocalConfig;
-    let ui5LocalConfigPath;
-    if (isServiceTypeEdmx && paths.ui5Yaml) {
-        // Dont extend backend middlewares if service type is CDS.
-        ui5Config = await ui5_config_1.UI5Config.newInstance(fs.read(paths.ui5Yaml));
-        try {
-            ui5Config.addBackendToFioriToolsProxydMiddleware(service.previewSettings);
-        }
-        catch (error) {
-            if (error instanceof ui5_config_1.YAMLError && error.code === ui5_config_1.yamlErrorCode.nodeNotFound) {
-                ui5Config.addFioriToolsProxydMiddleware({
-                    backend: [service.previewSettings],
-                    ignoreCertError: service.ignoreCertError
-                });
-            }
-            else {
-                throw error;
-            }
-        }
-        fs.write(paths.ui5Yaml, ui5Config.toString());
-        // ui5-local.yaml
-        ui5LocalConfigPath = (0, path_1.join)((0, path_1.dirname)(paths.ui5Yaml), 'ui5-local.yaml');
-        if (fs.exists(ui5LocalConfigPath)) {
-            ui5LocalConfig = await ui5_config_1.UI5Config.newInstance(fs.read(ui5LocalConfigPath));
-            ui5LocalConfig.addFioriToolsProxydMiddleware({
-                backend: [service.previewSettings],
-                ignoreCertError: service.ignoreCertError
-            });
+    let ui5MockConfig;
+    const paths = await findProjectFiles(basePath, fs);
+    // Delete service and it's annotations from manifest
+    (0, delete_1.deleteServiceFromManifest)(basePath, service.name, fs);
+    const isServiceTypeEdmx = service.type === types_1.ServiceType.EDMX;
+    // Remove service related data from middlewares for EDMX services
+    if (isServiceTypeEdmx) {
+        // Delete service data from manifest.json
+        if (paths.ui5Yaml) {
+            ui5Config = await ui5_config_1.UI5Config.newInstance(fs.read(paths.ui5Yaml));
+            // Delete service backend from fiori-tools-proxy middleware config
+            ui5Config.removeBackendFromFioriToolsProxydMiddleware(service.url);
+            fs.write(paths.ui5Yaml, ui5Config.toString());
         }
-    }
-    // Add mockserver entries
-    if (isServiceTypeEdmx && service.metadata) {
-        // mockserver entries are not required if service type is CDS
-        // copy existing `ui5.yaml` as starting point for ui5-mock.yaml
-        if (paths.ui5Yaml && ui5Config) {
-            const webappPath = await (0, project_access_1.getWebappPath)(basePath, fs);
-            const config = {
-                webappPath: webappPath,
-                ui5MockYamlConfig: { path: service.path }
-            };
-            await (0, mockserver_config_writer_1.generateMockserverConfig)(basePath, config, fs);
-            // add mockserver middleware to ui5-local.yaml
-            if (ui5LocalConfig) {
-                ui5LocalConfig.addMockServerMiddleware(service.path);
-            }
+        const serviceAnnotationPaths = getEDMXAnnotationPaths(service.annotations);
+        if (paths.ui5LocalYaml) {
+            ui5LocalConfig = await ui5_config_1.UI5Config.newInstance(fs.read(paths.ui5LocalYaml));
+            // Delete service backend from fiori-tools-proxy middleware config
+            ui5LocalConfig.removeBackendFromFioriToolsProxydMiddleware(service.url);
+            // Delete service from mockserver middleware config
+            ui5LocalConfig.removeServiceFromMockServerMiddleware(service.path, serviceAnnotationPaths);
+            fs.write(paths.ui5LocalYaml, ui5LocalConfig.toString());
         }
-        // create local copy of metadata and annotations
-        fs.write((0, path_1.join)(basePath, 'webapp', 'localService', 'metadata.xml'), (0, prettify_xml_1.default)(service.metadata, { indent: 4 }));
-        // Adds local annotations to datasources section of manifest.json and writes the annotations file
-        if (service.localAnnotationsName) {
-            const namespaces = (0, data_1.getAnnotationNamespaces)(service);
-            fs.copyTpl((0, path_1.join)(templateRoot, 'add', 'annotation.xml'), (0, path_1.join)(basePath, 'webapp', 'annotations', `${service.localAnnotationsName}.xml`), { ...service, namespaces });
+        if (paths.ui5MockYaml) {
+            ui5MockConfig = await ui5_config_1.UI5Config.newInstance(fs.read(paths.ui5MockYaml));
+            // Delete service backend from fiori-tools-proxy middleware config
+            ui5MockConfig.removeBackendFromFioriToolsProxydMiddleware(service.url);
+            // Delete service from mockserver config
+            ui5MockConfig.removeServiceFromMockServerMiddleware(service.path, serviceAnnotationPaths);
+            fs.write(paths.ui5MockYaml, ui5MockConfig.toString());
         }
+        (0, delete_1.removeAnnotationXmlFiles)(fs, basePath, service.name ?? 'mainService', service.annotations);
     }
-    // update package.json for non-cap applications
-    if (isServiceTypeEdmx && paths.packageJson && paths.ui5Yaml) {
-        (0, updates_1.updatePackageJson)(paths.packageJson, fs, !!service.metadata);
-    }
-    if (isServiceTypeEdmx && ui5LocalConfigPath && ui5LocalConfig) {
-        // write ui5 local yaml if service type is not CDS
-        fs.write(ui5LocalConfigPath, ui5LocalConfig.toString());
-    }
-    // Write annotation xml if annotations are provided and service type is EDMX
-    if (isServiceTypeEdmx) {
-        (0, updates_1.writeAnnotationXmlFiles)(fs, basePath, service);
+    else {
+        // Remove annotations from CDS files based on annotations info
+        await (0, delete_1.removeAnnotationsFromCDSFiles)(service.annotations, fs);
     }
     return fs;
 }

package/dist/types.d.ts

@@ -65,7 +65,7 @@ export interface OdataService {
     /**
      * Annotations can either be EDMX annotations or CDS annotations.
      */
-    annotations?: EdmxAnnotationsInfo | CdsAnnotationsInfo;
+    annotations?: EdmxAnnotationsInfo | EdmxAnnotationsInfo[] | CdsAnnotationsInfo | CdsAnnotationsInfo[];
     localAnnotationsName?: string;
     previewSettings?: Partial<ProxyBackend>;
     /**
@@ -73,4 +73,13 @@ export interface OdataService {
      */
     ignoreCertError?: boolean;
 }
+export type EdmxOdataService = Omit<OdataService, 'annotations'> & {
+    annotations: EdmxAnnotationsInfo | EdmxAnnotationsInfo[];
+};
+export interface ProjectPaths {
+    packageJson?: string;
+    ui5Yaml?: string;
+    ui5LocalYaml?: string;
+    ui5MockYaml?: string;
+}
 //# sourceMappingURL=types.d.ts.map

package/dist/updates.d.ts

@@ -1,5 +1,5 @@
 import type { Editor } from 'mem-fs-editor';
-import type { OdataService, CdsAnnotationsInfo } from './types';
+import type { OdataService, CdsAnnotationsInfo, EdmxAnnotationsInfo } from './types';
 /**
  * Internal function that updates the manifest.json based on the given service configuration.
  *
@@ -8,15 +8,16 @@ import type { OdataService, CdsAnnotationsInfo } from './types';
  * @param fs - the memfs editor instance
  * @param templateRoot - root folder contain the ejs templates
  */
-export declare function updateManifest(basePath: string, service: OdataService, fs: Editor, templateRoot: string): void;
+export declare function updateManifest(basePath: string, service: OdataService, fs: Editor, templateRoot: string): Promise<void>;
 /**
- * Writes annotation XML files.
+ * Writes annotation XML files for EDMX service annotations.
  *
  * @param {Editor} fs - The memfs editor instance.
  * @param {string} basePath - The base path of the project.
- * @param {OdataService} service - The OData service information.
+ * @param {string} serviceName - Name of The OData service.
+ * @param {OdataService} edmxAnnotations - The OData service annotations.
  */
-export declare function writeAnnotationXmlFiles(fs: Editor, basePath: string, service: OdataService): void;
+export declare function writeAnnotationXmlFiles(fs: Editor, basePath: string, serviceName: string, edmxAnnotations: EdmxAnnotationsInfo | EdmxAnnotationsInfo[]): void;
 /**
  * Updates cds files with the provided annotations.
  * This function takes cds annotations and an Editor instance,
@@ -26,7 +27,7 @@ export declare function writeAnnotationXmlFiles(fs: Editor, basePath: string, se
  * @param {Editor} fs - The memfs editor instance
  * @returns {Promise<void>} A promise that resolves when the cds files have been updated.
  */
-export declare function updateCdsFilesWithAnnotations(annotations: CdsAnnotationsInfo, fs: Editor): Promise<void>;
+export declare function updateCdsFilesWithAnnotations(annotations: CdsAnnotationsInfo | CdsAnnotationsInfo[], fs: Editor): Promise<void>;
 /**
  * Update the package.json with the required middlewares.
  *

package/dist/updates.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -31,11 +8,63 @@ exports.writeAnnotationXmlFiles = writeAnnotationXmlFiles;
 exports.updateCdsFilesWithAnnotations = updateCdsFilesWithAnnotations;
 exports.updatePackageJson = updatePackageJson;
 const ejs_1 = require("ejs");
-const path_1 = __importStar(require("path"));
+const path_1 = require("path");
 const i18n_1 = require("./i18n");
 const semver_1 = __importDefault(require("semver"));
 const prettify_xml_1 = __importDefault(require("prettify-xml"));
 const project_access_1 = require("@sap-ux/project-access");
+/**
+ * Modifies service in manifest.json and service files in a way that is supported by multiple services.
+ * If service files are defined in 'localService' folder then those files are moved to respective service folder and service configuration URI are modified in manifest.json.
+ *
+ * @param {string} webappPath - the webapp path of an existing UI5 application
+ * @param {string} dataSourceKey - dataSource key in manifest.json
+ * @param {Manifest} dataSource - dataSource configuration from manifest.json
+ * @param {Editor} fs - the memfs editor instance
+ */
+function updateExistingService(webappPath, dataSourceKey, dataSource, fs) {
+    const settings = dataSource.settings;
+    if (settings) {
+        // "localService/metadata.xml"
+        const localUri = settings.localUri;
+        // -> ["localService", "metadata.xml"]
+        const localUriParts = localUri ? localUri.split('/') : undefined;
+        if (localUriParts && localUriParts[0] === project_access_1.DirName.LocalService && localUriParts.length === 2) {
+            const localFileName = localUriParts[localUriParts.length - 1];
+            settings.localUri = `${project_access_1.DirName.LocalService}/${dataSourceKey}/${localFileName}`;
+            // move related files to service folder
+            const fromFilePath = (0, path_1.join)(webappPath, localUriParts.join(path_1.sep));
+            const toFilePath = (0, path_1.join)(webappPath, project_access_1.DirName.LocalService, dataSourceKey, localFileName);
+            if (fs.exists(fromFilePath)) {
+                fs.move(fromFilePath, toFilePath);
+            }
+        }
+    }
+}
+/**
+ * Modifies services in manifest.json and services files in a way that is supported by multiple services.
+ *
+ * @param {string} webappPath - the webapp path of an existing UI5 application
+ * @param {Manifest} manifest - the manifest.json of the application
+ * @param {Editor} fs - the memfs editor instance
+ */
+async function updateExistingServices(webappPath, manifest, fs) {
+    const dataSources = manifest?.['sap.app']?.dataSources;
+    for (const dataSourceKey in dataSources) {
+        const dataSource = dataSources[dataSourceKey];
+        if (dataSource.type === 'OData') {
+            updateExistingService(webappPath, dataSourceKey, dataSource, fs);
+            const annotations = dataSource.settings?.annotations;
+            if (annotations) {
+                annotations.forEach((annotationName) => {
+                    const annotationDataSource = dataSources[annotationName];
+                    updateExistingService(webappPath, dataSourceKey, annotationDataSource, fs);
+                });
+            }
+        }
+    }
+    fs.writeJSON((0, path_1.join)(webappPath, 'manifest.json'), manifest);
+}
 /**
  * Internal function that updates the manifest.json based on the given service configuration.
  *
@@ -44,18 +73,22 @@ const project_access_1 = require("@sap-ux/project-access");
  * @param fs - the memfs editor instance
  * @param templateRoot - root folder contain the ejs templates
  */
-function updateManifest(basePath, service, fs, templateRoot) {
-    const manifestPath = (0, path_1.join)(basePath, 'webapp', 'manifest.json');
+async function updateManifest(basePath, service, fs, templateRoot) {
+    const webappPath = await (0, project_access_1.getWebappPath)(basePath, fs);
+    const manifestPath = (0, path_1.join)(webappPath, 'manifest.json');
     // Get component app id
     const manifest = fs.readJSON(manifestPath);
     const appProp = 'sap.app';
     const appid = manifest?.[appProp]?.id;
+    // Check and update existing services
+    await updateExistingServices(webappPath, manifest, fs);
+    const modifiedManifest = fs.readJSON(manifestPath);
     // Throw if required property is not found manifest.json
     if (!appid) {
         throw new Error((0, i18n_1.t)('error.requiredProjectPropertyNotFound', { property: `'${appProp}'.id`, path: manifestPath }));
     }
     const manifestJsonExt = fs.read((0, path_1.join)(templateRoot, 'extend', `manifest.json`));
-    const manifestSettings = Object.assign(service, getModelSettings((0, project_access_1.getMinimumUI5Version)(manifest)));
+    const manifestSettings = Object.assign(service, getModelSettings((0, project_access_1.getMinimumUI5Version)(modifiedManifest)));
     // If the service object includes ejs options, for example 'client' (see: https://ejs.co/#docs),
     // resulting in unexpected behaviour and problems when webpacking. Passing an empty options object prevents this.
     fs.extendJSON(manifestPath, JSON.parse((0, ejs_1.render)(manifestJsonExt, manifestSettings, {})));
@@ -71,7 +104,7 @@ function updateManifest(basePath, service, fs, templateRoot) {
  */
 async function updateCdsIndexOrServiceFile(fs, annotations) {
     const dirPath = (0, path_1.join)(annotations.projectName, 'annotations');
-    const annotationPath = path_1.default.normalize(dirPath).split(/[\\/]/g).join(path_1.default.posix.sep);
+    const annotationPath = (0, path_1.normalize)(dirPath).split(/[\\/]/g).join(path_1.posix.sep);
     const annotationConfig = `\nusing from './${annotationPath}';`;
     // get index and service file paths
     const indexFilePath = (0, path_1.join)(annotations.projectPath, annotations.appPath ?? '', 'index.cds');
@@ -88,17 +121,25 @@ async function updateCdsIndexOrServiceFile(fs, annotations) {
     }
 }
 /**
- * Writes annotation XML files.
+ * Writes annotation XML files for EDMX service annotations.
  *
  * @param {Editor} fs - The memfs editor instance.
  * @param {string} basePath - The base path of the project.
- * @param {OdataService} service - The OData service information.
+ * @param {string} serviceName - Name of The OData service.
+ * @param {OdataService} edmxAnnotations - The OData service annotations.
  */
-function writeAnnotationXmlFiles(fs, basePath, service) {
+function writeAnnotationXmlFiles(fs, basePath, serviceName, edmxAnnotations) {
     // Write annotation xml if annotations are provided and service type is EDMX
-    const annotations = service.annotations;
-    if (annotations?.xml) {
-        fs.write((0, path_1.join)(basePath, 'webapp', 'localService', `${annotations.technicalName}.xml`), (0, prettify_xml_1.default)(annotations.xml, { indent: 4 }));
+    if (Array.isArray(edmxAnnotations)) {
+        for (const annotationName in edmxAnnotations) {
+            const annotation = edmxAnnotations[annotationName];
+            if (annotation?.xml) {
+                fs.write((0, path_1.join)(basePath, 'webapp', 'localService', serviceName, `${annotation.technicalName}.xml`), (0, prettify_xml_1.default)(annotation.xml, { indent: 4 }));
+            }
+        }
+    }
+    else if (edmxAnnotations?.xml) {
+        fs.write((0, path_1.join)(basePath, 'webapp', 'localService', serviceName, `${edmxAnnotations.technicalName}.xml`), (0, prettify_xml_1.default)(edmxAnnotations.xml, { indent: 4 }));
     }
 }
 /**
@@ -111,10 +152,26 @@ function writeAnnotationXmlFiles(fs, basePath, service) {
  * @returns {Promise<void>} A promise that resolves when the cds files have been updated.
  */
 async function updateCdsFilesWithAnnotations(annotations, fs) {
-    const annotationCdsPath = (0, path_1.join)(annotations.projectPath, annotations.appPath ?? '', annotations.projectName, 'annotations.cds');
-    // write into annotations.cds file
-    fs.write(annotationCdsPath, annotations.cdsFileContents);
-    await updateCdsIndexOrServiceFile(fs, annotations);
+    if (Array.isArray(annotations)) {
+        for (const annotationName in annotations) {
+            const annotation = annotations[annotationName];
+            const annotationCdsPath = (0, path_1.join)(annotation.projectPath, annotation.appPath ?? '', annotation.projectName, 'annotations.cds');
+            // write into annotations.cds file
+            if (fs.exists(annotationCdsPath)) {
+                fs.append(annotationCdsPath, annotation.cdsFileContents);
+            }
+            else {
+                fs.write(annotationCdsPath, annotation.cdsFileContents);
+            }
+            await updateCdsIndexOrServiceFile(fs, annotation);
+        }
+    }
+    else {
+        const annotationCdsPath = (0, path_1.join)(annotations.projectPath, annotations.appPath ?? '', annotations.projectName, 'annotations.cds');
+        // write into annotations.cds file
+        fs.write(annotationCdsPath, annotations.cdsFileContents);
+        await updateCdsIndexOrServiceFile(fs, annotations);
+    }
 }
 /**
  * Determines model settings based on the UI5 version.

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Aodata-service-writer"
   },
-  "version": "0.23.3",
+  "version": "0.24.1",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "files": [
@@ -27,8 +27,8 @@
     "mem-fs-editor": "9.4.0",
     "prettify-xml": "1.2.0",
     "semver": "7.5.4",
-    "@sap-ux/mockserver-config-writer": "0.6.7",
-    "@sap-ux/ui5-config": "0.25.2"
+    "@sap-ux/mockserver-config-writer": "0.7.0",
+    "@sap-ux/ui5-config": "0.26.0"
   },
   "devDependencies": {
     "@types/ejs": "3.1.2",
@@ -38,7 +38,7 @@
     "@types/semver": "7.5.2",
     "fs-extra": "10.0.0",
     "lodash": "4.17.21",
-    "@sap-ux/project-access": "1.28.7"
+    "@sap-ux/project-access": "1.28.8"
   },
   "engines": {
     "node": ">=18.x"

package/templates/extend/manifest.json

@@ -5,22 +5,52 @@
                 "uri": "<%=path%>",
                 "type": "OData",
                 "settings": {
-                    "annotations": [<%if (locals.annotations && annotations.technicalName) {%>
-                        "<%- annotations.name %>"<% if (locals.localAnnotationsName) {%>,<%}%><% } %><% if (locals.localAnnotationsName) { %>
-                        "<%- localAnnotationsName %>"<% } %>
-                    ]<% if (locals.metadata) { %>,
-                    "localUri": "localService/metadata.xml" <% } %><%if (version === '4') {%>,
+                    "annotations": [
+                    <% if (locals.annotations && typeof annotations !== 'undefined') { %>
+                        <% if (annotations.length) { %>
+                            <% annotations.forEach(function(annotation, index) { %>
+                                <% if (annotation.technicalName) { %>
+                                    "<%= annotation.name %>"<% if (index < annotations.length - 1) { %>,<% } %>
+                                <% } %>
+                            <% }); %>
+                        <% } else if (annotations.technicalName) { %>
+                            "<%= annotations.name %>"
+                        <% } %>
+                    <% if (locals.localAnnotationsName) {%>,<%}%><% } %>
+                    <% if (locals.localAnnotationsName) { %>
+                        "<%- localAnnotationsName %>"
+                    <% } %>
+                    ]
+                    <% if (locals.metadata) { %>,
+                    "localUri": "localService/<%- name %>/metadata.xml" <% } %><%if (version === '4') {%>,
                     "odataVersion": "4.0"<% } %><%if (version === '2') {%>,
                     "odataVersion": "2.0"<% } %>
                 }
-            }<%if (locals.annotations && annotations.technicalName) {%>,
-            "<%- annotations.name %>": {
-                "uri": "/sap/opu/odata/IWFND/CATALOGSERVICE;v=2/Annotations(TechnicalName='<%- encodeURIComponent(annotations.technicalName) %>',Version='0001')/$value/",
-                "type": "ODataAnnotation",
-                "settings": {
-                    "localUri": "localService/<%- annotations.technicalName %>.xml"
-                }
-            }<% } %><% if (locals.localAnnotationsName) { %>,
+            }
+            <% if (locals.annotations && typeof annotations !== 'undefined') { %>
+                <% if (annotations.length && annotations.length > 0) { %>
+                    <% annotations.forEach(function(annotation, index) { %>
+                        <% if (annotation.technicalName) { %>,
+                            "<%= annotation.name %>": {
+                                "uri": "/sap/opu/odata/IWFND/CATALOGSERVICE;v=2/Annotations(TechnicalName='<%- encodeURIComponent(annotation.technicalName) %>',Version='0001')/$value/",
+                                "type": "ODataAnnotation",
+                                "settings": {
+                                    "localUri": "localService/<%- name %>/<%- annotation.technicalName %>.xml"
+                                }
+                            }
+                        <% } %>
+                    <% }); %>
+                <% } else if (annotations.technicalName) { %>,
+                    "<%= annotations.name %>": {
+                        "uri": "/sap/opu/odata/IWFND/CATALOGSERVICE;v=2/Annotations(TechnicalName='<%- encodeURIComponent(annotations.technicalName) %>',Version='0001')/$value/",
+                        "type": "ODataAnnotation",
+                        "settings": {
+                            "localUri": "localService/<%- name %>/<%- annotations.technicalName %>.xml"
+                        }
+                    }
+                <% } %>
+            <% } %>
+            <% if (locals.localAnnotationsName) { %>,
             "<%- localAnnotationsName %>": {
                 "type": "ODataAnnotation",
                 "uri": "annotations/<%- localAnnotationsName %>.xml",