@sap-ux/odata-service-writer 0.31.13 → 0.32.0

package/dist/data/manifest.js

@@ -8,16 +8,31 @@ exports.updateManifest = updateManifest;
 const node_path_1 = require("node:path");
 const i18n_1 = require("../i18n");
 const project_access_1 = require("@sap-ux/project-access");
+const types_1 = require("../types");
 const semver_1 = __importDefault(require("semver"));
+/**
+ * Extracts the OData version string to write to manifest.json from raw EDMX metadata.
+ * Only returns a value when the EDMX declares Version="4.01".
+ * All other version distinctions (v2 vs v4) remain the caller's responsibility.
+ *
+ * @param metadata - raw EDMX XML string
+ * @returns '4.01' when applicable, undefined otherwise
+ */
+function getOdataVersionFromMetadata(metadata) {
+    // Scan only the first 500 chars to avoid processing large metadata strings.
+    // The XML declaration (<?xml ...?>) may precede the root <edmx:Edmx Version="..."> tag,
+    // so we cannot stop at the first '>'.
+    const match = /Version="([^"]+)"/.exec(metadata.slice(0, 500));
+    return match?.[1] === '4.01' ? '4.01' : undefined;
+}
 /**
  * Updates service data in manifest.json.
  *
  * @param {Editor} fs - the memfs editor instance
  * @param {string} webappPath - the webapp path of an existing UI5 application
  * @param {DataSourceUpdateSettings} dataSourceUpdateSettings - dataSource settings for update
- * @param {string} minimumUi5Version - minimum UI5 version of the application
  */
-function enhanceManifestDatasources(fs, webappPath, dataSourceUpdateSettings, minimumUi5Version) {
+function enhanceManifestDatasources(fs, webappPath, dataSourceUpdateSettings) {
     const { serviceName, servicePath, serviceVersion, manifest, forceServiceUpdate, serviceMetadata, serviceRemoteAnnotations, serviceLocalAnnotations } = dataSourceUpdateSettings;
     const dataSources = manifest?.['sap.app'].dataSources ?? {};
     const createdRemoteAnnotationDataSources = addRemoteAnnotationDataSources(fs, webappPath, dataSources, serviceName, serviceRemoteAnnotations, forceServiceUpdate);
@@ -28,11 +43,17 @@ function enhanceManifestDatasources(fs, webappPath, dataSourceUpdateSettings, mi
     if (serviceMetadata) {
         settings['localUri'] = `localService/${serviceName}/metadata.xml`;
     }
-    if (serviceVersion === '4') {
-        settings['odataVersion'] = minimumUi5Version && semver_1.default.satisfies(minimumUi5Version, '>=1.144') ? '4.01' : '4.0';
+    // Derive the manifest odataVersion: for v4 services, check EDMX metadata first (to detect 4.01),
+    // then fall back to the passed service version enum.
+    let odataVersionToWrite;
+    if (serviceVersion === types_1.OdataVersion.v4) {
+        odataVersionToWrite = (serviceMetadata && getOdataVersionFromMetadata(serviceMetadata)) || '4.0';
+    }
+    else if (serviceVersion === types_1.OdataVersion.v2) {
+        odataVersionToWrite = '2.0';
     }
-    else if (serviceVersion === '2') {
-        settings['odataVersion'] = '2.0';
+    if (odataVersionToWrite) {
+        settings['odataVersion'] = odataVersionToWrite;
     }
     // Create or update service dataSource in manifest.json for service
     dataSources[serviceName] = {
@@ -55,7 +76,7 @@ function enhanceManifestDatasources(fs, webappPath, dataSourceUpdateSettings, mi
 function enhanceManifestModels(serviceName, serviceVersion, serviceModel, includeSynchronizationMode, manifest) {
     const models = manifest?.['sap.ui5']?.models ?? {};
     let modelSettings = {};
-    if (serviceVersion === '4') {
+    if (serviceVersion === types_1.OdataVersion.v4) {
         if (includeSynchronizationMode) {
             modelSettings['synchronizationMode'] = 'None';
         }
@@ -246,7 +267,7 @@ function enhanceManifest(service, manifest, webappPath, fs, forceServiceUpdate)
             serviceMetadata: serviceSettings.metadata,
             serviceRemoteAnnotations: serviceSettings.annotations,
             serviceLocalAnnotations: serviceSettings.localAnnotationsName
-        }, minimumUi5Version);
+        });
         // Add or update existing service model settings for manifest.json
         enhanceManifestModels(serviceSettings.name, serviceSettings.version, serviceSettings.model, serviceSettings.includeSynchronizationMode, manifest);
     }

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.31.13",
+  "version": "0.32.0",
   "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.77",
-    "@sap-ux/project-access": "1.36.4",
-    "@sap-ux/ui5-config": "0.30.4"
+    "@sap-ux/mockserver-config-writer": "0.10.0",
+    "@sap-ux/project-access": "1.37.0",
+    "@sap-ux/ui5-config": "0.31.0"
   },
   "devDependencies": {
     "@sap-ux/vocabularies-types": "0.15.0",
@@ -42,10 +42,10 @@
     "@types/semver": "7.7.1",
     "fs-extra": "11.3.4",
     "lodash": "4.18.1",
-    "@sap-ux/axios-extension": "1.25.36"
+    "@sap-ux/axios-extension": "1.26.0"
   },
   "engines": {
-    "node": ">=20.x"
+    "node": ">=22.x"
   },
   "scripts": {
     "build": "tsc --build",