@sap-ux/odata-service-writer 0.27.22 → 0.27.24

package/dist/data/annotations.js

@@ -10,7 +10,7 @@ exports.writeMetadata = writeMetadata;
 exports.removeRemoteServiceAnnotationXmlFiles = removeRemoteServiceAnnotationXmlFiles;
 exports.writeRemoteServiceAnnotationXmlFiles = writeRemoteServiceAnnotationXmlFiles;
 exports.getAnnotationNamespaces = getAnnotationNamespaces;
-const path_1 = require("path");
+const node_path_1 = require("node:path");
 const fast_xml_parser_1 = require("fast-xml-parser");
 const i18n_1 = require("../i18n");
 const prettify_xml_1 = __importDefault(require("prettify-xml"));
@@ -25,12 +25,12 @@ const project_access_1 = require("@sap-ux/project-access");
  * @returns {Promise<void>} A promise that resolves when the cds files have been updated.
  */
 async function updateCdsIndexOrServiceFile(fs, annotations) {
-    const dirPath = (0, path_1.join)(annotations.projectName, project_access_1.DirName.Annotations);
-    const annotationPath = (0, path_1.normalize)(dirPath).split(/[\\/]/g).join(path_1.posix.sep);
+    const dirPath = (0, node_path_1.join)(annotations.projectName, project_access_1.DirName.Annotations);
+    const annotationPath = (0, node_path_1.normalize)(dirPath).split(/[\\/]/g).join(node_path_1.posix.sep);
     const annotationConfig = `\nusing from './${annotationPath}';`;
     // get index and service file paths
-    const indexFilePath = (0, path_1.join)(annotations.projectPath, annotations.appPath ?? '', 'index.cds');
-    const serviceFilePath = (0, path_1.join)(annotations.projectPath, annotations.appPath ?? '', 'services.cds');
+    const indexFilePath = (0, node_path_1.join)(annotations.projectPath, annotations.appPath ?? '', 'index.cds');
+    const serviceFilePath = (0, node_path_1.join)(annotations.projectPath, annotations.appPath ?? '', 'services.cds');
     // extend index or service file with annotation config
     if (indexFilePath && fs.exists(indexFilePath)) {
         fs.append(indexFilePath, annotationConfig);
@@ -55,7 +55,7 @@ async function updateCdsFilesWithAnnotations(annotations, fs) {
     if (Array.isArray(annotations)) {
         for (const annotationName in annotations) {
             const annotation = annotations[annotationName];
-            const annotationCdsPath = (0, path_1.join)(annotation.projectPath, annotation.appPath ?? '', annotation.projectName, 'annotations.cds');
+            const annotationCdsPath = (0, node_path_1.join)(annotation.projectPath, annotation.appPath ?? '', annotation.projectName, 'annotations.cds');
             // write into annotations.cds file
             if (fs.exists(annotationCdsPath)) {
                 fs.append(annotationCdsPath, annotation.cdsFileContents);
@@ -67,7 +67,7 @@ async function updateCdsFilesWithAnnotations(annotations, fs) {
         }
     }
     else {
-        const annotationCdsPath = (0, path_1.join)(annotations.projectPath, annotations.appPath ?? '', annotations.projectName, 'annotations.cds');
+        const annotationCdsPath = (0, node_path_1.join)(annotations.projectPath, annotations.appPath ?? '', annotations.projectName, 'annotations.cds');
         // write into annotations.cds file
         fs.write(annotationCdsPath, annotations.cdsFileContents);
         await updateCdsIndexOrServiceFile(fs, annotations);
@@ -83,12 +83,12 @@ async function updateCdsFilesWithAnnotations(annotations, fs) {
  * @returns {Promise<void>} A promise that resolves when the cds files have been updated.
  */
 async function removeCdsIndexOrServiceFile(fs, annotations) {
-    const dirPath = (0, path_1.join)(annotations.projectName, project_access_1.DirName.Annotations);
-    const annotationPath = (0, path_1.normalize)(dirPath).split(/[\\/]/g).join(path_1.posix.sep);
+    const dirPath = (0, node_path_1.join)(annotations.projectName, project_access_1.DirName.Annotations);
+    const annotationPath = (0, node_path_1.normalize)(dirPath).split(/[\\/]/g).join(node_path_1.posix.sep);
     const annotationConfig = `\nusing from './${annotationPath}';`;
     // Get index and service file paths
-    const indexFilePath = (0, path_1.join)(annotations.projectPath, annotations.appPath ?? '', 'index.cds');
-    const serviceFilePath = (0, path_1.join)(annotations.projectPath, annotations.appPath ?? '', 'services.cds');
+    const indexFilePath = (0, node_path_1.join)(annotations.projectPath, annotations.appPath ?? '', 'index.cds');
+    const serviceFilePath = (0, node_path_1.join)(annotations.projectPath, annotations.appPath ?? '', 'services.cds');
     // Remove annotation config from index or service file
     if (indexFilePath && fs.exists(indexFilePath)) {
         // Read old annotations content and replace it with empty string
@@ -116,7 +116,7 @@ async function removeAnnotationsFromCDSFiles(annotations, fs) {
     if (Array.isArray(annotations)) {
         for (const annotationName in annotations) {
             const annotation = annotations[annotationName];
-            const annotationCdsPath = (0, path_1.join)(annotation.projectPath, annotation.appPath ?? '', annotation.projectName, 'annotations.cds');
+            const annotationCdsPath = (0, node_path_1.join)(annotation.projectPath, annotation.appPath ?? '', annotation.projectName, 'annotations.cds');
             // Remove from annotations.cds file
             if (fs.exists(annotationCdsPath)) {
                 // Read old annotations content and replace it with empty string
@@ -128,7 +128,7 @@ async function removeAnnotationsFromCDSFiles(annotations, fs) {
         }
     }
     else {
-        const annotationCdsPath = (0, path_1.join)(annotations.projectPath, annotations.appPath ?? '', annotations.projectName, 'annotations.cds');
+        const annotationCdsPath = (0, node_path_1.join)(annotations.projectPath, annotations.appPath ?? '', annotations.projectName, 'annotations.cds');
         // Write into annotations.cds file
         if (fs.exists(annotationCdsPath)) {
             // Read old annotations content and replace it with empty string
@@ -153,7 +153,7 @@ async function writeLocalServiceAnnotationXMLFiles(fs, webappPath, templateRoot,
     // Adds local annotations to datasources section of manifest.json and writes the annotations file
     if (service.localAnnotationsName) {
         const namespaces = getAnnotationNamespaces(service);
-        fs.copyTpl((0, path_1.join)(templateRoot, 'add', 'annotation.xml'), (0, path_1.join)(webappPath, project_access_1.DirName.Annotations, `${service.localAnnotationsName}.xml`), { ...service, namespaces });
+        fs.copyTpl((0, node_path_1.join)(templateRoot, 'add', 'annotation.xml'), (0, node_path_1.join)(webappPath, project_access_1.DirName.Annotations, `${service.localAnnotationsName}.xml`), { ...service, namespaces });
     }
 }
 /**
@@ -166,7 +166,7 @@ async function writeLocalServiceAnnotationXMLFiles(fs, webappPath, templateRoot,
 async function writeMetadata(fs, webappPath, service) {
     if (service.metadata) {
         // mainService should be used in case there is no name defined for service
-        fs.write((0, path_1.join)(webappPath, project_access_1.DirName.LocalService, service.name ?? 'mainService', 'metadata.xml'), (0, prettify_xml_1.default)(service.metadata, { indent: 4 }));
+        fs.write((0, node_path_1.join)(webappPath, project_access_1.DirName.LocalService, service.name ?? 'mainService', 'metadata.xml'), (0, prettify_xml_1.default)(service.metadata, { indent: 4 }));
     }
 }
 /**
@@ -183,14 +183,14 @@ async function removeRemoteServiceAnnotationXmlFiles(fs, basePath, serviceName,
     if (Array.isArray(edmxAnnotations)) {
         for (const annotationName in edmxAnnotations) {
             const annotation = edmxAnnotations[annotationName];
-            const pathToAnnotationFile = (0, path_1.join)(webappPath, project_access_1.DirName.LocalService, serviceName, `${annotation.technicalName}.xml`);
+            const pathToAnnotationFile = (0, node_path_1.join)(webappPath, project_access_1.DirName.LocalService, serviceName, `${annotation.technicalName}.xml`);
             if (fs.exists(pathToAnnotationFile)) {
                 fs.delete(pathToAnnotationFile);
             }
         }
     }
     else if (edmxAnnotations?.xml) {
-        const pathToAnnotationFile = (0, path_1.join)(webappPath, project_access_1.DirName.LocalService, serviceName, `${edmxAnnotations.technicalName}.xml`);
+        const pathToAnnotationFile = (0, node_path_1.join)(webappPath, project_access_1.DirName.LocalService, serviceName, `${edmxAnnotations.technicalName}.xml`);
         if (fs.exists(pathToAnnotationFile)) {
             fs.delete(pathToAnnotationFile);
         }
@@ -211,12 +211,12 @@ async function writeRemoteServiceAnnotationXmlFiles(fs, basePath, serviceName, e
         for (const annotationName in edmxAnnotations) {
             const annotation = edmxAnnotations[annotationName];
             if (annotation?.xml) {
-                fs.write((0, path_1.join)(webappPath, project_access_1.DirName.LocalService, serviceName, `${annotation.name}.xml`), (0, prettify_xml_1.default)(annotation.xml, { indent: 4 }));
+                fs.write((0, node_path_1.join)(webappPath, project_access_1.DirName.LocalService, serviceName, `${annotation.name}.xml`), (0, prettify_xml_1.default)(annotation.xml, { indent: 4 }));
             }
         }
     }
     else if (edmxAnnotations?.xml) {
-        fs.write((0, path_1.join)(webappPath, project_access_1.DirName.LocalService, serviceName, `${edmxAnnotations.name}.xml`), (0, prettify_xml_1.default)(edmxAnnotations.xml, { indent: 4 }));
+        fs.write((0, node_path_1.join)(webappPath, project_access_1.DirName.LocalService, serviceName, `${edmxAnnotations.name}.xml`), (0, prettify_xml_1.default)(edmxAnnotations.xml, { indent: 4 }));
     }
 }
 /**

package/dist/data/defaults.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.enhanceData = enhanceData;
-const path_1 = require("path");
+const node_path_1 = require("node:path");
 const types_1 = require("../types");
 const constants_1 = require("./constants");
 const project_access_1 = require("@sap-ux/project-access");
@@ -47,7 +47,7 @@ function generateUniqueServiceName(dataSources, serviceName) {
  * @param {boolean} update - whether the service update is running
  */
 async function setDefaultServiceName(basePath, service, fs, update) {
-    const manifestPath = (0, path_1.join)(await (0, project_access_1.getWebappPath)(basePath, fs), project_access_1.FileName.Manifest);
+    const manifestPath = (0, node_path_1.join)(await (0, project_access_1.getWebappPath)(basePath, fs), project_access_1.FileName.Manifest);
     const manifest = fs.readJSON(manifestPath);
     // Check if manifest has already any dataSources defined, DEFAULT_DATASOURCE_NAME should be used for the first service
     const dataSources = manifest?.['sap.app']?.dataSources;
@@ -77,7 +77,7 @@ async function setDefaultServiceName(basePath, service, fs, update) {
  * @param {boolean} update - whether the service update is running (if true, makes sure that '' model is updated for the mainService)
  */
 async function setDefaultServiceModel(basePath, service, fs, update) {
-    const manifestPath = (0, path_1.join)(await (0, project_access_1.getWebappPath)(basePath, fs), 'manifest.json');
+    const manifestPath = (0, node_path_1.join)(await (0, project_access_1.getWebappPath)(basePath, fs), 'manifest.json');
     const manifest = fs.readJSON(manifestPath);
     if (!service.model) {
         // Check if manifest has already any dataSource models defined, empty string '' should be used for the first service
@@ -158,7 +158,7 @@ async function setDefaultPreviewSettings(basePath, service, fs) {
             service.previewSettings.destinationInstance = service.destination.instance;
         }
     }
-    const ui5Yamlpath = (0, path_1.join)(basePath, project_access_1.FileName.Ui5Yaml);
+    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);

package/dist/data/manifest.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteServiceFromManifest = deleteServiceFromManifest;
 exports.updateManifest = updateManifest;
-const path_1 = require("path");
+const node_path_1 = require("node:path");
 const i18n_1 = require("../i18n");
 const project_access_1 = require("@sap-ux/project-access");
 const semver_1 = __importDefault(require("semver"));
@@ -171,8 +171,8 @@ function removeUnusedAnnotations(fs, webappPath, dataSources, serviceName, creat
             !createdAnnotations.includes(name)) {
             const oldAnnotationPath = dataSource.settings?.localUri;
             // Delete old annotation files
-            if (oldAnnotationPath && fs.exists((0, path_1.join)(webappPath, oldAnnotationPath))) {
-                fs.delete((0, path_1.join)(webappPath, oldAnnotationPath));
+            if (oldAnnotationPath && fs.exists((0, node_path_1.join)(webappPath, oldAnnotationPath))) {
+                fs.delete((0, node_path_1.join)(webappPath, oldAnnotationPath));
             }
             // Delete old annotation dataSource netry
             delete dataSources[name];
@@ -270,8 +270,8 @@ function convertSingleService(webappPath, dataSourceKey, dataSource, fs) {
             const localFileName = localUriParts[localUriParts.length - 1];
             settings.localUri = `${project_access_1.DirName.LocalService}/${dataSourceKey}/${localFileName}`;
             // move related files to service folder
-            const fromFilePath = (0, path_1.join)(webappPath, localUriParts.join(path_1.sep));
-            const toFilePath = (0, path_1.join)(webappPath, project_access_1.DirName.LocalService, dataSourceKey, localFileName);
+            const fromFilePath = (0, node_path_1.join)(webappPath, localUriParts.join(node_path_1.sep));
+            const toFilePath = (0, node_path_1.join)(webappPath, project_access_1.DirName.LocalService, dataSourceKey, localFileName);
             if (fs.exists(fromFilePath)) {
                 fs.move(fromFilePath, toFilePath);
             }
@@ -315,7 +315,7 @@ async function addMultipleServiceSupportToManifest(webappPath, manifest, fs) {
 function removeFileForDataSource(fs, manifestPath, dataSource) {
     const serviceSettings = dataSource.settings ?? {};
     if (serviceSettings?.localUri) {
-        const localUriPath = (0, path_1.join)((0, path_1.dirname)(manifestPath), serviceSettings?.localUri);
+        const localUriPath = (0, node_path_1.join)((0, node_path_1.dirname)(manifestPath), serviceSettings?.localUri);
         if (fs.exists(localUriPath)) {
             // delete the local data source file
             fs.delete(localUriPath);
@@ -354,7 +354,7 @@ function removeAnnotations(fs, manifestPath, annotations, dataSources) {
  */
 function deleteServiceFromManifest(basePath, service, fs) {
     const serviceName = service.name ?? 'mainService';
-    const manifestPath = (0, path_1.join)(basePath, 'webapp', 'manifest.json');
+    const manifestPath = (0, node_path_1.join)(basePath, 'webapp', 'manifest.json');
     // Get component app id
     const manifest = fs.readJSON(manifestPath);
     const appProp = 'sap.app';
@@ -400,7 +400,7 @@ function deleteServiceFromManifest(basePath, service, fs) {
 async function updateManifest(basePath, service, fs, forceServiceUpdate = false) {
     // Update manifest.json
     const webappPath = await (0, project_access_1.getWebappPath)(basePath, fs);
-    const manifestPath = (0, path_1.join)(webappPath, 'manifest.json');
+    const manifestPath = (0, node_path_1.join)(webappPath, 'manifest.json');
     // Get component app id
     const manifest = fs.readJSON(manifestPath);
     const appProp = 'sap.app';

package/dist/index.js

@@ -4,7 +4,7 @@ exports.getAnnotationNamespaces = exports.ServiceType = exports.OdataVersion = v
 exports.generate = generate;
 exports.update = update;
 exports.remove = remove;
-const path_1 = require("path");
+const node_path_1 = require("node:path");
 const mem_fs_1 = require("mem-fs");
 const mem_fs_editor_1 = require("mem-fs-editor");
 const update_1 = require("./update");
@@ -26,7 +26,7 @@ const manifest_1 = require("./data/manifest");
  */
 function ensureExists(basePath, files, fs) {
     files.forEach((path) => {
-        if (!fs.exists((0, path_1.join)(basePath, path))) {
+        if (!fs.exists((0, node_path_1.join)(basePath, path))) {
             throw new Error((0, i18n_1.t)('error.requiredProjectFileNotFound', { path }));
         }
     });
@@ -40,20 +40,20 @@ function ensureExists(basePath, files, fs) {
  */
 async function findProjectFiles(basePath, fs) {
     const files = {};
-    const parts = basePath.split(path_1.sep);
+    const parts = basePath.split(node_path_1.sep);
     while (parts.length > 0 && (!files.packageJson || !files.ui5Yaml || !files.ui5LocalYaml || !files.ui5MockYaml)) {
-        const path = parts.join(path_1.sep);
-        if (!files.packageJson && fs.exists((0, path_1.join)(path, 'package.json'))) {
-            files.packageJson = (0, path_1.join)(path, 'package.json');
+        const path = parts.join(node_path_1.sep);
+        if (!files.packageJson && fs.exists((0, node_path_1.join)(path, 'package.json'))) {
+            files.packageJson = (0, node_path_1.join)(path, 'package.json');
         }
-        if (!files.ui5Yaml && fs.exists((0, path_1.join)(path, 'ui5.yaml'))) {
-            files.ui5Yaml = (0, path_1.join)(path, 'ui5.yaml');
+        if (!files.ui5Yaml && fs.exists((0, node_path_1.join)(path, 'ui5.yaml'))) {
+            files.ui5Yaml = (0, node_path_1.join)(path, 'ui5.yaml');
         }
-        if (!files.ui5LocalYaml && fs.exists((0, path_1.join)(path, 'ui5-local.yaml'))) {
-            files.ui5LocalYaml = (0, path_1.join)(path, 'ui5-local.yaml');
+        if (!files.ui5LocalYaml && fs.exists((0, node_path_1.join)(path, 'ui5-local.yaml'))) {
+            files.ui5LocalYaml = (0, node_path_1.join)(path, 'ui5-local.yaml');
         }
-        if (!files.ui5MockYaml && fs.exists((0, path_1.join)(path, 'ui5-mock.yaml'))) {
-            files.ui5MockYaml = (0, path_1.join)(path, 'ui5-mock.yaml');
+        if (!files.ui5MockYaml && fs.exists((0, node_path_1.join)(path, 'ui5-mock.yaml'))) {
+            files.ui5MockYaml = (0, node_path_1.join)(path, 'ui5-mock.yaml');
         }
         parts.pop();
     }
@@ -79,7 +79,7 @@ async function generate(basePath, service, fs) {
     // Set isServiceTypeEdmx true if service is EDMX
     const isServiceTypeEdmx = service.type === types_1.ServiceType.EDMX;
     // Prepare template folder for manifest and xml updates
-    const templateRoot = (0, path_1.join)(__dirname, '../templates');
+    const templateRoot = (0, node_path_1.join)(__dirname, '../templates');
     await (0, manifest_1.updateManifest)(basePath, service, fs);
     // Dont add backend and mockserver middlewares if service type is CDS
     if (isServiceTypeEdmx) {

package/dist/update.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addServicesData = addServicesData;
 exports.updateServicesData = updateServicesData;
-const path_1 = require("path");
+const node_path_1 = require("node:path");
 const project_access_1 = require("@sap-ux/project-access");
 const ui5_config_1 = require("@sap-ux/ui5-config");
 const mockserver_config_writer_1 = require("@sap-ux/mockserver-config-writer");
@@ -19,7 +19,7 @@ const package_1 = require("./data/package");
  */
 async function generateMockserverMiddlewareBasedOnUi5MockYaml(fs, ui5YamlPath, ui5LocalConfigPath, ui5LocalConfig) {
     // Update ui5-local.yaml with mockserver middleware from ui5-mock.yaml
-    const ui5MockYamlPath = (0, path_1.join)((0, path_1.dirname)(ui5YamlPath), project_access_1.FileName.Ui5MockYaml);
+    const ui5MockYamlPath = (0, node_path_1.join)((0, node_path_1.dirname)(ui5YamlPath), project_access_1.FileName.Ui5MockYaml);
     const ui5MockYamlConfig = await ui5_config_1.UI5Config.newInstance(fs.read(ui5MockYamlPath));
     const mockserverMiddlewareFromUi5Mock = ui5MockYamlConfig.findCustomMiddleware('sap-fe-mockserver');
     if (ui5LocalConfigPath && fs.exists(ui5LocalConfigPath) && ui5LocalConfig && mockserverMiddlewareFromUi5Mock) {

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.27.22",
+  "version": "0.27.24",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "files": [
@@ -27,9 +27,9 @@
     "mem-fs-editor": "9.4.0",
     "prettify-xml": "1.2.0",
     "semver": "7.5.4",
-    "@sap-ux/project-access": "1.32.1",
-    "@sap-ux/mockserver-config-writer": "0.9.18",
-    "@sap-ux/ui5-config": "0.29.5"
+    "@sap-ux/mockserver-config-writer": "0.9.20",
+    "@sap-ux/project-access": "1.32.3",
+    "@sap-ux/ui5-config": "0.29.7"
   },
   "devDependencies": {
     "@types/ejs": "3.1.2",