@sap-ux/odata-service-writer 0.30.1 → 0.31.1

package/dist/data/defaults.js

@@ -138,20 +138,26 @@ function setDefaultAnnotationsName(service) {
     }
 }
 /**
- * Sets client and destination defaults for preview settings.
+ * Returns the preview settings for the app configuration based on the service configuration.
  *
  * @param {OdataService} service - the OData service instance
+ * @returns {FioriToolsProxyConfigBackend} preview settings
  */
-function setClientAndDestinationDefaults(service) {
+function getPreviewSettings(service) {
+    const previewSettings = {
+        path: service.previewSettings?.path ?? `/${service.path?.split('/').find((s) => s !== '') ?? ''}`,
+        url: service.previewSettings?.url ?? service.url ?? 'http://localhost'
+    };
     if (service.client && !service.previewSettings?.client) {
-        service.previewSettings.client = service.client;
+        previewSettings.client = service.client;
     }
     if (service.destination && !service.previewSettings?.destination) {
-        service.previewSettings.destination = service.destination.name;
+        previewSettings.destination = service.destination.name;
         if (service.destination.instance) {
-            service.previewSettings.destinationInstance = service.destination.instance;
+            previewSettings.destinationInstance = service.destination.instance;
         }
     }
+    return previewSettings;
 }
 /**
  * Preserves existing backend configuration when updating a service.
@@ -192,12 +198,12 @@ function adjustPreviewPathForNewService(service, backends) {
  * @param {boolean} update - whether the service update is running (if true, preserves explicitly set previewSettings.path)
  */
 async function setDefaultPreviewSettings(basePath, service, fs, update = false) {
-    service.previewSettings = service.previewSettings ?? {};
-    const explicitPreviewPath = service.previewSettings.path;
-    service.previewSettings.path =
-        service.previewSettings.path ?? `/${service.path?.split('/').find((s) => s !== '') ?? ''}`;
-    service.previewSettings.url = service.previewSettings.url ?? service.url ?? 'http://localhost';
-    setClientAndDestinationDefaults(service);
+    const previewSettings = getPreviewSettings(service);
+    const explicitPreviewPath = service.previewSettings?.path;
+    service.previewSettings = {
+        ...previewSettings,
+        ...service.previewSettings
+    };
     const ui5Yamlpath = (0, node_path_1.join)(basePath, project_access_1.FileName.Ui5Yaml);
     if (!fs.exists(ui5Yamlpath)) {
         return;

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.30.1",
+  "version": "0.31.1",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "files": [
@@ -29,9 +29,9 @@
     "mem-fs-editor": "9.4.0",
     "prettify-xml": "1.2.0",
     "semver": "7.7.4",
-    "@sap-ux/mockserver-config-writer": "0.9.63",
-    "@sap-ux/project-access": "1.35.13",
-    "@sap-ux/ui5-config": "0.29.21"
+    "@sap-ux/mockserver-config-writer": "0.9.65",
+    "@sap-ux/project-access": "1.35.15",
+    "@sap-ux/ui5-config": "0.30.0"
   },
   "devDependencies": {
     "@sap-ux/vocabularies-types": "0.15.0",
@@ -42,7 +42,7 @@
     "@types/semver": "7.7.1",
     "fs-extra": "11.3.4",
     "lodash": "4.17.23",
-    "@sap-ux/axios-extension": "1.25.23"
+    "@sap-ux/axios-extension": "1.25.25"
   },
   "engines": {
     "node": ">=20.x"