@sap-ux/odata-service-writer 0.25.0 → 0.25.2

package/dist/data/defaults.js

@@ -57,7 +57,11 @@ async function setDefaultServiceModel(basePath, service, fs) {
     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;
+        service.model =
+            servicesModels.length === 0 ||
+                servicesModels.find((serviceModel) => serviceModel.dataSource === 'mainService') // model for mainService is ""
+                ? ''
+                : service.model ?? service.name;
     }
     // No models defined, that means first one is being added, set model to ''
     service.model ??= '';

package/dist/updates.js

@@ -203,6 +203,7 @@ function updateExistingService(webappPath, dataSourceKey, dataSource, fs) {
  * @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
+ * @returns modified manifest object.
  */
 async function updateExistingServices(webappPath, manifest, fs) {
     const dataSources = manifest?.['sap.app']?.dataSources;
@@ -219,7 +220,7 @@ async function updateExistingServices(webappPath, manifest, fs) {
             }
         }
     }
-    fs.writeJSON((0, path_1.join)(webappPath, 'manifest.json'), manifest);
+    return manifest;
 }
 /**
  * Internal function that updates the manifest.json based on the given service configuration.
@@ -235,13 +236,12 @@ async function updateManifest(basePath, service, fs) {
     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 }));
     }
+    // Check and update existing services
+    const modifiedManifest = await updateExistingServices(webappPath, manifest, fs);
     // Add or update manifest.json with service
     enhanceManifest(service, modifiedManifest);
     fs.writeJSON(manifestPath, modifiedManifest);

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.0",
+  "version": "0.25.2",
   "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.28.9"
+    "@sap-ux/project-access": "1.28.10"
   },
   "engines": {
     "node": ">=18.x"