@sap-ux/odata-service-writer 0.25.4 → 0.25.6

package/dist/data/defaults.js

@@ -52,19 +52,24 @@ async function setDefaultServiceName(basePath, service, fs) {
 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 ||
-                servicesModels.find((serviceModel) => serviceModel.dataSource === 'mainService') // model for mainService is ""
-                ? ''
-                : service.model ?? service.name;
+    if (!service.model) {
+        // 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 ||
+                    (servicesModels.find((serviceModel) => serviceModel.dataSource === constants_1.DEFAULT_DATASOURCE_NAME) &&
+                        service.name === constants_1.DEFAULT_DATASOURCE_NAME) // model for mainService is ""
+                    ? ''
+                    : service.name;
+        }
+        else {
+            // No models defined, that means first one is being added, set model to ''
+            service.model = '';
+        }
     }
-    // No models defined, that means first one is being added, set model to ''
-    service.model ??= '';
 }
 /**
  * Sets default annotation name for a single annotation of a given service.

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.25.4",
+  "version": "0.25.6",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "files": [
@@ -38,7 +38,7 @@
     "@types/semver": "7.5.2",
     "fs-extra": "10.0.0",
     "lodash": "4.17.21",
-    "@sap-ux/project-access": "1.29.1"
+    "@sap-ux/project-access": "1.29.4"
   },
   "engines": {
     "node": ">=18.x"