@sap-ux/odata-service-writer 0.27.2 → 0.27.4

package/dist/data/manifest.js

@@ -290,13 +290,15 @@ async function addMultipleServiceSupportToManifest(webappPath, manifest, fs) {
     const dataSources = manifest?.['sap.app']?.dataSources;
     for (const dataSourceKey in dataSources) {
         const dataSource = dataSources[dataSourceKey];
-        if (dataSource.type === 'OData') {
+        if (dataSource && dataSource.type === 'OData') {
             convertSingleService(webappPath, dataSourceKey, dataSource, fs);
             const annotations = dataSource.settings?.annotations;
             if (annotations) {
                 annotations.forEach((annotationName) => {
                     const annotationDataSource = dataSources[annotationName];
-                    convertSingleService(webappPath, dataSourceKey, annotationDataSource, fs);
+                    if (annotationDataSource) {
+                        convertSingleService(webappPath, dataSourceKey, annotationDataSource, fs);
+                    }
                 });
             }
         }

package/dist/index.js

@@ -113,8 +113,8 @@ async function update(basePath, service, fs, updateMiddlewares = true) {
     const isServiceTypeEdmx = service.type === types_1.ServiceType.EDMX;
     await (0, manifest_1.updateManifest)(basePath, service, fs, true);
     // Dont extend/update backend and mockserver middlewares if service type is CDS
-    if (isServiceTypeEdmx && updateMiddlewares) {
-        await (0, update_1.updateServicesData)(basePath, paths, service, fs);
+    if (isServiceTypeEdmx) {
+        await (0, update_1.updateServicesData)(basePath, paths, service, fs, updateMiddlewares);
     }
     return fs;
 }

package/dist/update.d.ts

@@ -20,6 +20,7 @@ export declare function addServicesData(basePath: string, paths: ProjectPaths, t
  * @param {ProjectPaths} paths - paths to the project files (package.json, ui5.yaml, ui5-local.yaml and ui5-mock.yaml)
  * @param {EdmxOdataService} service - the OData service instance
  * @param {Editor} fs - the memfs editor instance
+ * @param {boolean} updateMiddlewares - whether the YAML files for the service (mock-server and fiori-tools-proxy middlewares) should be updated
  */
-export declare function updateServicesData(basePath: string, paths: ProjectPaths, service: EdmxOdataService, fs: Editor): Promise<void>;
+export declare function updateServicesData(basePath: string, paths: ProjectPaths, service: EdmxOdataService, fs: Editor, updateMiddlewares: boolean): Promise<void>;
 //# sourceMappingURL=update.d.ts.map

package/dist/update.js

@@ -104,7 +104,7 @@ async function addServicesData(basePath, paths, templateRoot, service, fs) {
         }
         await (0, annotations_1.writeLocalServiceAnnotationXMLFiles)(fs, webappPath, templateRoot, service);
     }
-    // service update should not trigger the package.json update
+    // Service is being added - update the package.json update as well, service update should not run the updates of the package.json
     if (paths.packageJson && paths.ui5Yaml) {
         (0, package_1.updatePackageJson)(paths.packageJson, fs, !!service.metadata);
     }
@@ -121,26 +121,29 @@ async function addServicesData(basePath, paths, templateRoot, service, fs) {
  * @param {ProjectPaths} paths - paths to the project files (package.json, ui5.yaml, ui5-local.yaml and ui5-mock.yaml)
  * @param {EdmxOdataService} service - the OData service instance
  * @param {Editor} fs - the memfs editor instance
+ * @param {boolean} updateMiddlewares - whether the YAML files for the service (mock-server and fiori-tools-proxy middlewares) should be updated
  */
-async function updateServicesData(basePath, paths, service, fs) {
+async function updateServicesData(basePath, paths, service, fs, updateMiddlewares) {
     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, true);
-    }
-    // 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, true);
+    if (updateMiddlewares) {
+        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, true);
+        }
+        // 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, true);
+        }
     }
     // For update, updatable files should already exist
     if (service.metadata) {
         const webappPath = await (0, project_access_1.getWebappPath)(basePath, fs);
         // Generate mockserver only when ui5-mock.yaml already exists
-        if (paths.ui5MockYaml && paths.ui5Yaml && ui5Config) {
+        if (paths.ui5MockYaml && paths.ui5Yaml && ui5Config && updateMiddlewares) {
             const config = {
                 webappPath: webappPath,
                 // Since ui5-mock.yaml already exists, set 'skip' to skip package.json file updates
@@ -161,14 +164,14 @@ async function updateServicesData(basePath, paths, service, fs) {
                 ui5MockConfig = await ui5_config_1.UI5Config.newInstance(fs.read(paths.ui5MockYaml));
                 extendBackendMiddleware(fs, service, ui5MockConfig, paths.ui5MockYaml, true);
             }
-            if (paths.ui5LocalYaml && ui5LocalConfig) {
-                // write ui5 local yaml if service type is not CDS
-                fs.write(paths.ui5LocalYaml, ui5LocalConfig.toString());
-            }
         }
         // Write metadata.xml file
         await (0, annotations_1.writeMetadata)(fs, webappPath, service);
     }
+    if (paths.ui5LocalYaml && ui5LocalConfig) {
+        // write ui5 local yaml if service type is not CDS
+        fs.write(paths.ui5LocalYaml, ui5LocalConfig.toString());
+    }
     // Write new annotations files
     await (0, annotations_1.writeRemoteServiceAnnotationXmlFiles)(fs, basePath, service.name ?? 'mainService', service.annotations);
 }

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.27.2",
+  "version": "0.27.4",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "files": [