@sap-ux/odata-service-writer 0.14.28 → 0.14.30

package/dist/data/defaults.js

@@ -2,6 +2,50 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enhanceData = void 0;
 const constants_1 = require("./constants");
+/**
+ * Sets the default path for a given service.
+ * If the service path is not defined, it sets the path to '/'.
+ * If the service path does not end with '/', it appends '/' to the end.
+ *
+ * @param {OdataService} service - The service object whose path needs to be set or modified.
+ */
+function setDefaultServicePath(service) {
+    var _a, _b;
+    service.path = ((_a = service.path) === null || _a === void 0 ? void 0 : _a.endsWith('/')) ? service.path : ((_b = service.path) !== null && _b !== void 0 ? _b : '') + '/';
+}
+/**
+ * Sets the default name for a given service.
+ * If the service name is not defined, it sets the name to `DEFAULT_DATASOURCE_NAME`.
+ *
+ * @param {OdataService} service - The service object whose name needs to be set or modified.
+ */
+function setDefaultServiceName(service) {
+    var _a;
+    service.name = (_a = service.name) !== null && _a !== void 0 ? _a : constants_1.DEFAULT_DATASOURCE_NAME;
+}
+/**
+ * Sets the default model for a given service.
+ * If the service model is not defined, it sets the model to an empty string (Default UI5 model).
+ *
+ * @param {OdataService} service - The service object whose model needs to be set or modified.
+ */
+function setDefaultServiceModel(service) {
+    var _a;
+    service.model = (_a = service.model) !== null && _a !== void 0 ? _a : ''; // Default UI5 model
+}
+/**
+ * Sets the default annotations name for a given service.
+ * If the service annotations name is not defined or empty, it creates a default annotations name
+ * from the technicalName by replacing all '/' characters with '_' and removing the leading '_'.
+ *
+ * @param {OdataService} service - The service object whose annotations name needs to be set or modified.
+ */
+function setDefaultAnnotationsName(service) {
+    var _a, _b, _c, _d;
+    if (((_a = service.annotations) === null || _a === void 0 ? void 0 : _a.technicalName) && !service.annotations.name) {
+        service.annotations.name = (_d = (_c = (_b = service.annotations) === null || _b === void 0 ? void 0 : _b.technicalName) === null || _c === void 0 ? void 0 : _c.replace(/\//g, '_')) === null || _d === void 0 ? void 0 : _d.replace(/^_/, '');
+    }
+}
 /**
  * Enhances the provided OData service object with path, name and model information.
  * Directly modifies the passed object reference.
@@ -9,24 +53,15 @@ const constants_1 = require("./constants");
  * @param {OdataService} service - the OData service object
  */
 function enhanceData(service) {
-    var _a;
-    // Set default path
-    if (service.path === undefined) {
-        service.path = '/';
-    }
-    else if (service.path.substring(service.path.length - 1) !== '/') {
-        service.path = service.path + '/';
-    }
-    if (service.name === undefined) {
-        service.name = constants_1.DEFAULT_DATASOURCE_NAME;
-    }
-    if (service.model === undefined) {
-        service.model = ''; // Default UI5 model
-    }
+    var _a, _b;
+    setDefaultServicePath(service);
+    setDefaultServiceName(service);
+    setDefaultServiceModel(service);
+    setDefaultAnnotationsName(service);
     // enhance preview settings with service configuration
     service.previewSettings = service.previewSettings || {};
     service.previewSettings.path =
-        service.previewSettings.path || `/${((_a = service.path) === null || _a === void 0 ? void 0 : _a.split('/').filter((s) => s !== '')[0]) || ''}`;
+        service.previewSettings.path || `/${(_b = (_a = service.path) === null || _a === void 0 ? void 0 : _a.split('/').filter((s) => s !== '')[0]) !== null && _b !== void 0 ? _b : ''}`;
     service.previewSettings.url = service.previewSettings.url || service.url || 'http://localhost';
     if (service.client && !service.previewSettings.client) {
         service.previewSettings.client = service.client;

package/dist/types.d.ts

@@ -20,6 +20,7 @@ export interface OdataService {
     model?: string;
     metadata?: string;
     annotations?: {
+        name?: string;
         technicalName: string;
         xml: string;
     };

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.14.28",
+  "version": "0.14.30",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "files": [

package/templates/extend/manifest.json

@@ -6,7 +6,7 @@
                 "type": "OData",
                 "settings": {
                     "annotations": [<%if (locals.annotations && annotations.technicalName) {%>
-                        "<%- annotations.technicalName %>"<% if (locals.localAnnotationsName) {%>,<%}%><% } %><% if (locals.localAnnotationsName) { %>
+                        "<%- annotations.name %>"<% if (locals.localAnnotationsName) {%>,<%}%><% } %><% if (locals.localAnnotationsName) { %>
                         "<%- localAnnotationsName %>"<% } %>
                     ],
                     "localUri": "localService/metadata.xml"<%if (version === '4') {%>,
@@ -14,7 +14,7 @@
                     "odataVersion": "2.0"<% } %>
                 }
             }<%if (locals.annotations && annotations.technicalName) {%>,
-            "<%- annotations.technicalName %>": {
+            "<%- annotations.name %>": {
                 "uri": "/sap/opu/odata/IWFND/CATALOGSERVICE;v=2/Annotations(TechnicalName='<%- encodeURIComponent(annotations.technicalName) %>',Version='0001')/$value/",
                 "type": "ODataAnnotation",
                 "settings": {