@sap-ux/odata-service-writer 0.29.33 → 0.30.0

package/dist/data/defaults.js

@@ -137,36 +137,79 @@ function setDefaultAnnotationsName(service) {
         setDefaultAnnotationName(annotation, service.name);
     }
 }
+/**
+ * Sets client and destination defaults for preview settings.
+ *
+ * @param {OdataService} service - the OData service instance
+ */
+function setClientAndDestinationDefaults(service) {
+    if (service.client && !service.previewSettings?.client) {
+        service.previewSettings.client = service.client;
+    }
+    if (service.destination && !service.previewSettings?.destination) {
+        service.previewSettings.destination = service.destination.name;
+        if (service.destination.instance) {
+            service.previewSettings.destinationInstance = service.destination.instance;
+        }
+    }
+}
+/**
+ * Preserves existing backend configuration when updating a service.
+ *
+ * @param {OdataService} service - the OData service instance
+ * @param {FioriToolsProxyConfigBackend[]} backends - existing backend configurations
+ * @param {string | undefined} explicitPreviewPath - explicitly set preview path
+ */
+function preserveExistingBackendConfig(service, backends, explicitPreviewPath) {
+    const existingBackend = backends.find((backend) => backend.path === service.previewSettings?.path);
+    if (!existingBackend) {
+        return;
+    }
+    if (existingBackend.pathPrefix) {
+        service.previewSettings.pathPrefix = existingBackend.pathPrefix;
+    }
+    if (!explicitPreviewPath) {
+        service.previewSettings.path = service.path;
+    }
+}
+/**
+ * Adjusts preview path for new services if /sap backend exists.
+ *
+ * @param {OdataService} service - the OData service instance
+ * @param {FioriToolsProxyConfigBackend[]} backends - existing backend configurations
+ */
+function adjustPreviewPathForNewService(service, backends) {
+    if (backends.find((existingBackend) => existingBackend.path === '/sap')) {
+        service.previewSettings.path = service.path;
+    }
+}
 /**
  * Sets default preview settings of a given service.
  *
  * @param {string} basePath - the root path of an existing UI5 application
  * @param {OdataService} service - The service object whose preview settings needs to be set or modified.
  * @param {Editor} fs - the memfs editor instance
+ * @param {boolean} update - whether the service update is running (if true, preserves explicitly set previewSettings.path)
  */
-async function setDefaultPreviewSettings(basePath, service, fs) {
+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';
-    if (service.client && !service.previewSettings.client) {
-        service.previewSettings.client = service.client;
+    setClientAndDestinationDefaults(service);
+    const ui5Yamlpath = (0, node_path_1.join)(basePath, project_access_1.FileName.Ui5Yaml);
+    if (!fs.exists(ui5Yamlpath)) {
+        return;
     }
-    if (service.destination && !service.previewSettings.destination) {
-        service.previewSettings.destination = service.destination.name;
-        if (service.destination.instance) {
-            service.previewSettings.destinationInstance = service.destination.instance;
-        }
+    const yamlContents = fs.read(ui5Yamlpath);
+    const ui5Config = await ui5_config_1.UI5Config.newInstance(yamlContents);
+    const backends = ui5Config.getBackendConfigsFromFioriToolsProxyMiddleware();
+    if (update) {
+        preserveExistingBackendConfig(service, backends, explicitPreviewPath);
     }
-    const ui5Yamlpath = (0, node_path_1.join)(basePath, project_access_1.FileName.Ui5Yaml);
-    if (fs.exists(ui5Yamlpath)) {
-        const yamlContents = fs.read(ui5Yamlpath);
-        const ui5Config = await ui5_config_1.UI5Config.newInstance(yamlContents);
-        const backends = ui5Config.getBackendConfigsFromFioriToolsProxyMiddleware();
-        // There should be only one /sap entry
-        if (backends.find((existingBackend) => existingBackend.path === '/sap')) {
-            service.previewSettings.path = service.path;
-        }
+    else if (backends.find((existingBackend) => existingBackend.path === '/sap')) {
+        adjustPreviewPathForNewService(service, backends);
     }
 }
 /**
@@ -195,6 +238,6 @@ async function enhanceData(basePath, service, fs, update = false) {
         setDefaultAnnotationsName(service);
     }
     // enhance preview settings with service configuration
-    await setDefaultPreviewSettings(basePath, service, fs);
+    await setDefaultPreviewSettings(basePath, service, fs, update);
 }
 //# sourceMappingURL=defaults.js.map

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.29.33",
+  "version": "0.30.0",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "files": [
@@ -29,8 +29,8 @@
     "mem-fs-editor": "9.4.0",
     "prettify-xml": "1.2.0",
     "semver": "7.7.4",
-    "@sap-ux/mockserver-config-writer": "0.9.61",
-    "@sap-ux/project-access": "1.35.12",
+    "@sap-ux/mockserver-config-writer": "0.9.62",
+    "@sap-ux/project-access": "1.35.13",
     "@sap-ux/ui5-config": "0.29.21"
   },
   "devDependencies": {
@@ -42,7 +42,7 @@
     "@types/semver": "7.7.1",
     "fs-extra": "11.3.4",
     "lodash": "4.17.23",
-    "@sap-ux/axios-extension": "1.25.21"
+    "@sap-ux/axios-extension": "1.25.22"
   },
   "engines": {
     "node": ">=20.x"