@sap-ux/odata-service-writer 0.20.5 → 0.21.0

package/dist/data/annotations.js

@@ -15,7 +15,7 @@ function getAnnotationNamespaces({ metadata, annotations }) {
     // Enhance service with annotations namespaces
     const schemaNamespaces = metadata ? getNamespaces(metadata) : [];
     const edmxAnnotations = annotations;
-    if (edmxAnnotations === null || edmxAnnotations === void 0 ? void 0 : edmxAnnotations.xml) {
+    if (edmxAnnotations?.xml) {
         // Parse once
         const annotationsJson = xmlToJson(edmxAnnotations.xml);
         return schemaNamespaces.map((schema) => {
@@ -60,9 +60,8 @@ function xmlToJson(xml) {
  * @returns Array of namespaces and their aliases
  */
 function getNamespaces(metadata) {
-    var _a, _b;
     const jsonMetadata = xmlToJson(metadata);
-    let schema = (_b = (_a = jsonMetadata['edmx:Edmx']) === null || _a === void 0 ? void 0 : _a['edmx:DataServices']) === null || _b === void 0 ? void 0 : _b['Schema'];
+    let schema = jsonMetadata['edmx:Edmx']?.['edmx:DataServices']?.['Schema'];
     if (!schema) {
         return [];
     }
@@ -85,13 +84,12 @@ function getNamespaces(metadata) {
  * @returns An alias for the specified namespace or empty string
  */
 function getAliasFromAnnotation(annotations, namespace) {
-    var _a, _b;
-    let references = (_a = annotations['edmx:Edmx']) === null || _a === void 0 ? void 0 : _a['edmx:Reference'];
+    let references = annotations['edmx:Edmx']?.['edmx:Reference'];
     // Can be array or single item
     if (!Array.isArray(references)) {
         references = [references];
     }
-    const annoNamespace = references.find((ref) => { var _a, _b; return ((_a = ref['edmx:Include']) === null || _a === void 0 ? void 0 : _a['Namespace']) === namespace && ((_b = ref['edmx:Include']) === null || _b === void 0 ? void 0 : _b['Alias']); });
-    return annoNamespace ? (_b = annoNamespace['edmx:Include']) === null || _b === void 0 ? void 0 : _b['Alias'] : '';
+    const annoNamespace = references.find((ref) => ref['edmx:Include']?.['Namespace'] === namespace && ref['edmx:Include']?.['Alias']);
+    return annoNamespace ? annoNamespace['edmx:Include']?.['Alias'] : '';
 }
 //# sourceMappingURL=annotations.js.map

package/dist/data/defaults.js

@@ -11,8 +11,7 @@ const constants_1 = require("./constants");
  * @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 : '') + '/';
+    service.path = service.path?.endsWith('/') ? service.path : (service.path ?? '') + '/';
 }
 /**
  * Sets the default name for a given service.
@@ -21,8 +20,7 @@ function setDefaultServicePath(service) {
  * @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;
+    service.name = service.name ?? constants_1.DEFAULT_DATASOURCE_NAME;
 }
 /**
  * Sets the default model for a given service.
@@ -31,8 +29,7 @@ function setDefaultServiceName(service) {
  * @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
+    service.model = service.model ?? ''; // Default UI5 model
 }
 /**
  * Sets the default annotations name for a given service.
@@ -42,7 +39,6 @@ function setDefaultServiceModel(service) {
  * @param {OdataService} service - The service object whose annotations name needs to be set or modified.
  */
 function setDefaultAnnotationsName(service) {
-    var _a, _b;
     /**
      * In the manifest EJS template, annotation names are referred to for adding annotations to the manifest.json.
      * For CAP projects, annotations are added to the annotations.cds file and not to the manifest.json.
@@ -51,8 +47,8 @@ function setDefaultAnnotationsName(service) {
         return;
     }
     const annotations = service.annotations;
-    if ((annotations === null || annotations === void 0 ? void 0 : annotations.technicalName) && !annotations.name) {
-        annotations.name = (_b = (_a = annotations === null || annotations === void 0 ? void 0 : annotations.technicalName) === null || _a === void 0 ? void 0 : _a.replace(/\//g, '_')) === null || _b === void 0 ? void 0 : _b.replace(/^_/, '');
+    if (annotations?.technicalName && !annotations.name) {
+        annotations.name = annotations?.technicalName?.replace(/\//g, '_')?.replace(/^_/, '');
     }
 }
 /**
@@ -62,7 +58,6 @@ function setDefaultAnnotationsName(service) {
  * @param {OdataService} service - the OData service object
  */
 function enhanceData(service) {
-    var _a, _b;
     setDefaultServicePath(service);
     setDefaultServiceName(service);
     setDefaultServiceModel(service);
@@ -70,7 +65,7 @@ function enhanceData(service) {
     // enhance preview settings with service configuration
     service.previewSettings = service.previewSettings || {};
     service.previewSettings.path =
-        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.path || `/${service.path?.split('/').filter((s) => s !== '')[0] ?? ''}`;
     service.previewSettings.url = service.previewSettings.url || service.url || 'http://localhost';
     if (service.client && !service.previewSettings.client) {
         service.previewSettings.client = service.client;

package/dist/i18n.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -19,19 +10,17 @@ const NS = 'odata-service-writer';
 /**
  * Initialize i18next with the translations for this module.
  */
-function initI18n() {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield i18next_1.default.init({
-            resources: {
-                en: {
-                    [NS]: odata_service_writer_i18n_json_1.default
-                }
-            },
-            lng: 'en',
-            fallbackLng: 'en',
-            defaultNS: NS,
-            ns: [NS]
-        });
+async function initI18n() {
+    await i18next_1.default.init({
+        resources: {
+            en: {
+                [NS]: odata_service_writer_i18n_json_1.default
+            }
+        },
+        lng: 'en',
+        fallbackLng: 'en',
+        defaultNS: NS,
+        ns: [NS]
     });
 }
 exports.initI18n = initI18n;

package/dist/index.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -47,22 +38,20 @@ function ensureExists(basePath, files, fs) {
  * @param {Editor} [fs] - the memfs editor instance
  * @returns an object with the optional locations of the package.json and ui5.yaml
  */
-function findProjectFiles(basePath, fs) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const files = {};
-        const parts = basePath.split(path_1.sep);
-        while (parts.length > 0 && (!files.packageJson || !files.ui5Yaml)) {
-            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');
-            }
-            if (!files.ui5Yaml && fs.exists((0, path_1.join)(path, 'ui5.yaml'))) {
-                files.ui5Yaml = (0, path_1.join)(path, 'ui5.yaml');
-            }
-            parts.pop();
+async function findProjectFiles(basePath, fs) {
+    const files = {};
+    const parts = basePath.split(path_1.sep);
+    while (parts.length > 0 && (!files.packageJson || !files.ui5Yaml)) {
+        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');
         }
-        return files;
-    });
+        if (!files.ui5Yaml && fs.exists((0, path_1.join)(path, 'ui5.yaml'))) {
+            files.ui5Yaml = (0, path_1.join)(path, 'ui5.yaml');
+        }
+        parts.pop();
+    }
+    return files;
 }
 exports.findProjectFiles = findProjectFiles;
 /**
@@ -74,83 +63,81 @@ exports.findProjectFiles = findProjectFiles;
  * @throws {Error} - if required UI5 project files are not found
  * @returns {Promise<Editor>} the updated memfs editor instance
  */
-function generate(basePath, service, fs) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!fs) {
-            fs = (0, mem_fs_editor_1.create)((0, mem_fs_1.create)());
+async function generate(basePath, service, fs) {
+    if (!fs) {
+        fs = (0, mem_fs_editor_1.create)((0, mem_fs_1.create)());
+    }
+    const paths = await findProjectFiles(basePath, fs);
+    ensureExists(basePath, ['webapp/manifest.json'], fs);
+    (0, data_1.enhanceData)(service);
+    // merge content into existing files
+    const templateRoot = (0, path_1.join)(__dirname, '../templates');
+    // update cds files with annotations only if service type is CDS and annotations are provided
+    if ((0, updates_1.serviceIsCds)(service) && service.annotations) {
+        await (0, updates_1.updateCdsFilesWithAnnotations)(service.annotations, fs);
+    }
+    // manifest.json
+    (0, updates_1.updateManifest)(basePath, service, fs, templateRoot);
+    // update ui5.yaml if it exists
+    let ui5Config;
+    let ui5LocalConfig;
+    let ui5LocalConfigPath;
+    if (!(0, updates_1.serviceIsCds)(service) && paths.ui5Yaml) {
+        // Dont extend backend middlewares if service type is CDS
+        ui5Config = await ui5_config_1.UI5Config.newInstance(fs.read(paths.ui5Yaml));
+        try {
+            ui5Config.addBackendToFioriToolsProxydMiddleware(service.previewSettings);
         }
-        const paths = yield findProjectFiles(basePath, fs);
-        ensureExists(basePath, ['webapp/manifest.json'], fs);
-        (0, data_1.enhanceData)(service);
-        // merge content into existing files
-        const templateRoot = (0, path_1.join)(__dirname, '../templates');
-        // update cds files with annotations only if service type is CDS and annotations are provided
-        if ((0, updates_1.serviceIsCds)(service) && service.annotations) {
-            yield (0, updates_1.updateCdsFilesWithAnnotations)(service.annotations, fs);
-        }
-        // manifest.json
-        (0, updates_1.updateManifest)(basePath, service, fs, templateRoot);
-        // update ui5.yaml if it exists
-        let ui5Config;
-        let ui5LocalConfig;
-        let ui5LocalConfigPath;
-        if (!(0, updates_1.serviceIsCds)(service) && paths.ui5Yaml) {
-            // Dont extend backend middlewares if service type is CDS 
-            ui5Config = yield ui5_config_1.UI5Config.newInstance(fs.read(paths.ui5Yaml));
-            try {
-                ui5Config.addBackendToFioriToolsProxydMiddleware(service.previewSettings);
-            }
-            catch (error) {
-                if (error instanceof ui5_config_1.YAMLError && error.code === ui5_config_1.yamlErrorCode.nodeNotFound) {
-                    ui5Config.addFioriToolsProxydMiddleware({ backend: [service.previewSettings] });
-                }
-                else {
-                    throw error;
-                }
+        catch (error) {
+            if (error instanceof ui5_config_1.YAMLError && error.code === ui5_config_1.yamlErrorCode.nodeNotFound) {
+                ui5Config.addFioriToolsProxydMiddleware({ backend: [service.previewSettings] });
             }
-            fs.write(paths.ui5Yaml, ui5Config.toString());
-            // ui5-local.yaml
-            ui5LocalConfigPath = (0, path_1.join)((0, path_1.dirname)(paths.ui5Yaml), 'ui5-local.yaml');
-            if (fs.exists(ui5LocalConfigPath)) {
-                ui5LocalConfig = yield ui5_config_1.UI5Config.newInstance(fs.read(ui5LocalConfigPath));
-                ui5LocalConfig.addFioriToolsProxydMiddleware({ backend: [service.previewSettings] });
+            else {
+                throw error;
             }
         }
-        // Add mockserver entries
-        if (!(0, updates_1.serviceIsCds)(service) && service.metadata) {
-            // mockserver entries are not required if service type is CDS 
-            // copy existing `ui5.yaml` as starting point for ui5-mock.yaml
-            if (paths.ui5Yaml && ui5Config) {
-                const webappPath = yield (0, project_access_1.getWebappPath)(basePath, fs);
-                const config = {
-                    webappPath: webappPath,
-                    ui5MockYamlConfig: { path: service.path }
-                };
-                yield (0, mockserver_config_writer_1.generateMockserverConfig)(basePath, config, fs);
-                // add mockserver middleware to ui5-local.yaml
-                if (ui5LocalConfig) {
-                    ui5LocalConfig.addMockServerMiddleware(service.path);
-                }
-            }
-            // create local copy of metadata and annotations
-            fs.write((0, path_1.join)(basePath, 'webapp', 'localService', 'metadata.xml'), (0, prettify_xml_1.default)(service.metadata, { indent: 4 }));
-            // Adds local annotations to datasources section of manifest.json and writes the annotations file
-            if (service.localAnnotationsName) {
-                const namespaces = (0, data_1.getAnnotationNamespaces)(service);
-                fs.copyTpl((0, path_1.join)(templateRoot, 'add', 'annotation.xml'), (0, path_1.join)(basePath, 'webapp', 'annotations', `${service.localAnnotationsName}.xml`), Object.assign(Object.assign({}, service), { namespaces }));
-            }
+        fs.write(paths.ui5Yaml, ui5Config.toString());
+        // ui5-local.yaml
+        ui5LocalConfigPath = (0, path_1.join)((0, path_1.dirname)(paths.ui5Yaml), 'ui5-local.yaml');
+        if (fs.exists(ui5LocalConfigPath)) {
+            ui5LocalConfig = await ui5_config_1.UI5Config.newInstance(fs.read(ui5LocalConfigPath));
+            ui5LocalConfig.addFioriToolsProxydMiddleware({ backend: [service.previewSettings] });
         }
-        // update package.json if required
-        if (paths.packageJson && paths.ui5Yaml) {
-            (0, updates_1.updatePackageJson)(paths.packageJson, fs, !!service.metadata);
+    }
+    // Add mockserver entries
+    if (!(0, updates_1.serviceIsCds)(service) && service.metadata) {
+        // mockserver entries are not required if service type is CDS
+        // copy existing `ui5.yaml` as starting point for ui5-mock.yaml
+        if (paths.ui5Yaml && ui5Config) {
+            const webappPath = await (0, project_access_1.getWebappPath)(basePath, fs);
+            const config = {
+                webappPath: webappPath,
+                ui5MockYamlConfig: { path: service.path }
+            };
+            await (0, mockserver_config_writer_1.generateMockserverConfig)(basePath, config, fs);
+            // add mockserver middleware to ui5-local.yaml
+            if (ui5LocalConfig) {
+                ui5LocalConfig.addMockServerMiddleware(service.path);
+            }
         }
-        if (ui5LocalConfigPath && ui5LocalConfig) {
-            fs.write(ui5LocalConfigPath, ui5LocalConfig.toString());
+        // create local copy of metadata and annotations
+        fs.write((0, path_1.join)(basePath, 'webapp', 'localService', 'metadata.xml'), (0, prettify_xml_1.default)(service.metadata, { indent: 4 }));
+        // Adds local annotations to datasources section of manifest.json and writes the annotations file
+        if (service.localAnnotationsName) {
+            const namespaces = (0, data_1.getAnnotationNamespaces)(service);
+            fs.copyTpl((0, path_1.join)(templateRoot, 'add', 'annotation.xml'), (0, path_1.join)(basePath, 'webapp', 'annotations', `${service.localAnnotationsName}.xml`), { ...service, namespaces });
         }
-        // Write annotation xml if annotations are provided and service type is EDMX
-        (0, updates_1.writeAnnotationXmlFiles)(fs, basePath, service);
-        return fs;
-    });
+    }
+    // update package.json if required
+    if (paths.packageJson && paths.ui5Yaml) {
+        (0, updates_1.updatePackageJson)(paths.packageJson, fs, !!service.metadata);
+    }
+    if (ui5LocalConfigPath && ui5LocalConfig) {
+        fs.write(ui5LocalConfigPath, ui5LocalConfig.toString());
+    }
+    // Write annotation xml if annotations are provided and service type is EDMX
+    (0, updates_1.writeAnnotationXmlFiles)(fs, basePath, service);
+    return fs;
 }
 exports.generate = generate;
 //# sourceMappingURL=index.js.map

package/dist/updates.js

@@ -22,15 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -51,7 +42,7 @@ const prettify_xml_1 = __importDefault(require("prettify-xml"));
 function serviceIsCds(service) {
     // if service type is not defined, set EDMX as default
     let serviceType = service.type;
-    serviceType || (serviceType = types_1.ServiceType.EDMX);
+    serviceType ||= types_1.ServiceType.EDMX;
     if (serviceType === types_1.ServiceType.CDS) {
         return true;
     }
@@ -67,18 +58,17 @@ exports.serviceIsCds = serviceIsCds;
  * @param templateRoot - root folder contain the ejs templates
  */
 function updateManifest(basePath, service, fs, templateRoot) {
-    var _a, _b, _c;
     const manifestPath = (0, path_1.join)(basePath, 'webapp', 'manifest.json');
     // Get component app id
     const manifest = fs.readJSON(manifestPath);
     const appProp = 'sap.app';
-    const appid = (_a = manifest === null || manifest === void 0 ? void 0 : manifest[appProp]) === null || _a === void 0 ? void 0 : _a.id;
+    const appid = manifest?.[appProp]?.id;
     // 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 }));
     }
     const manifestJsonExt = fs.read((0, path_1.join)(templateRoot, 'extend', `manifest.json`));
-    const minUI5Version = (_c = (_b = manifest['sap.ui5']) === null || _b === void 0 ? void 0 : _b.dependencies) === null || _c === void 0 ? void 0 : _c.minUI5Version;
+    const minUI5Version = manifest['sap.ui5']?.dependencies?.minUI5Version;
     const manifestSettings = Object.assign(service, getModelSettings(minUI5Version));
     // If the service object includes ejs options, for example 'client' (see: https://ejs.co/#docs),
     // resulting in unexpected behaviour and problems when webpacking. Passing an empty options object prevents this.
@@ -94,26 +84,23 @@ exports.updateManifest = updateManifest;
  * @param {CdsAnnotationsInfo} annotations - The cds annotations info.
  * @returns {Promise<void>} A promise that resolves when the cds files have been updated.
  */
-function updateCdsIndexOrServiceFile(fs, annotations) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        const dirPath = (0, path_1.join)(annotations.projectName, 'annotations');
-        const annotationPath = path_1.default.normalize(dirPath).split(/[\\/]/g).join(path_1.default.posix.sep);
-        const annotationConfig = `\nusing from './${annotationPath}';`;
-        // get index and service file paths
-        const indexFilePath = (0, path_1.join)(annotations.projectPath, (_a = annotations.appPath) !== null && _a !== void 0 ? _a : '', 'index.cds');
-        const serviceFilePath = (0, path_1.join)(annotations.projectPath, (_b = annotations.appPath) !== null && _b !== void 0 ? _b : '', 'services.cds');
-        // extend index or service file with annotation config
-        if (indexFilePath && fs.exists(indexFilePath)) {
-            fs.append(indexFilePath, annotationConfig);
-        }
-        else if (fs.exists(serviceFilePath)) {
-            fs.append(serviceFilePath, annotationConfig);
-        }
-        else {
-            fs.write(serviceFilePath, annotationConfig);
-        }
-    });
+async function updateCdsIndexOrServiceFile(fs, annotations) {
+    const dirPath = (0, path_1.join)(annotations.projectName, 'annotations');
+    const annotationPath = path_1.default.normalize(dirPath).split(/[\\/]/g).join(path_1.default.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');
+    // extend index or service file with annotation config
+    if (indexFilePath && fs.exists(indexFilePath)) {
+        fs.append(indexFilePath, annotationConfig);
+    }
+    else if (fs.exists(serviceFilePath)) {
+        fs.append(serviceFilePath, annotationConfig);
+    }
+    else {
+        fs.write(serviceFilePath, annotationConfig);
+    }
 }
 /**
  * Writes annotation XML files.
@@ -128,7 +115,7 @@ function writeAnnotationXmlFiles(fs, basePath, service) {
     }
     // Write annotation xml if annotations are provided and service type is EDMX
     const annotations = service.annotations;
-    if (annotations === null || annotations === void 0 ? void 0 : annotations.xml) {
+    if (annotations?.xml) {
         fs.write((0, path_1.join)(basePath, 'webapp', 'localService', `${annotations.technicalName}.xml`), (0, prettify_xml_1.default)(annotations.xml, { indent: 4 }));
     }
 }
@@ -142,14 +129,11 @@ exports.writeAnnotationXmlFiles = writeAnnotationXmlFiles;
  * @param {Editor} fs - The memfs editor instance
  * @returns {Promise<void>} A promise that resolves when the cds files have been updated.
  */
-function updateCdsFilesWithAnnotations(annotations, fs) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const annotationCdsPath = (0, path_1.join)(annotations.projectPath, (_a = annotations.appPath) !== null && _a !== void 0 ? _a : '', annotations.projectName, 'annotations.cds');
-        // write into annotations.cds file
-        fs.write(annotationCdsPath, annotations.cdsFileContents);
-        yield updateCdsIndexOrServiceFile(fs, annotations);
-    });
+async function updateCdsFilesWithAnnotations(annotations, fs) {
+    const annotationCdsPath = (0, 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);
 }
 exports.updateCdsFilesWithAnnotations = updateCdsFilesWithAnnotations;
 /**
@@ -173,12 +157,11 @@ function getModelSettings(minUI5Version) {
  * @param addMockServer true if the mocksever middleware needs to be added as well
  */
 function updatePackageJson(path, fs, addMockServer) {
-    var _a, _b, _c;
     const packageJson = JSON.parse(fs.read(path));
-    packageJson.devDependencies = (_a = packageJson.devDependencies) !== null && _a !== void 0 ? _a : {};
+    packageJson.devDependencies = packageJson.devDependencies ?? {};
     if (!hasUI5CliV3(packageJson.devDependencies)) {
-        packageJson.ui5 = (_b = packageJson.ui5) !== null && _b !== void 0 ? _b : {};
-        packageJson.ui5.dependencies = (_c = packageJson.ui5.dependencies) !== null && _c !== void 0 ? _c : [];
+        packageJson.ui5 = packageJson.ui5 ?? {};
+        packageJson.ui5.dependencies = packageJson.ui5.dependencies ?? [];
         if (!packageJson.ui5.dependencies.includes('@sap/ux-ui5-tooling')) {
             packageJson.ui5.dependencies.push('@sap/ux-ui5-tooling');
         }

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.20.5",
+  "version": "0.21.0",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "files": [
@@ -27,8 +27,8 @@
     "mem-fs-editor": "9.4.0",
     "prettify-xml": "1.2.0",
     "semver": "7.5.4",
-    "@sap-ux/mockserver-config-writer": "0.5.8",
-    "@sap-ux/ui5-config": "0.22.10"
+    "@sap-ux/mockserver-config-writer": "0.6.0",
+    "@sap-ux/ui5-config": "0.23.0"
   },
   "devDependencies": {
     "@types/ejs": "3.1.2",
@@ -38,7 +38,7 @@
     "@types/semver": "7.5.2",
     "fs-extra": "10.0.0",
     "lodash": "4.17.21",
-    "@sap-ux/project-access": "1.22.3"
+    "@sap-ux/project-access": "1.23.0"
   },
   "engines": {
     "node": ">=18.x"