@sap-ux/mockserver-config-writer 0.5.7 → 0.6.0

package/dist/app-info.js

@@ -8,14 +8,13 @@ exports.getODataSources = exports.getMainServiceDataSource = void 0;
  * @returns - data source entry from manifest.json, parsed
  */
 function getMainServiceDataSource(manifest) {
-    var _a, _b, _c;
     let dataSource;
-    const model = ((_a = manifest['sap.ovp']) === null || _a === void 0 ? void 0 : _a.globalFilterModel) || '';
-    const dataSourceName = manifest['sap.ui5'] && ((_b = manifest['sap.ui5'].models) === null || _b === void 0 ? void 0 : _b[model])
+    const model = manifest['sap.ovp']?.globalFilterModel || '';
+    const dataSourceName = manifest['sap.ui5'] && manifest['sap.ui5'].models?.[model]
         ? manifest['sap.ui5'].models[model].dataSource
         : undefined;
     if (dataSourceName) {
-        dataSource = (_c = manifest['sap.app'].dataSources) === null || _c === void 0 ? void 0 : _c[dataSourceName];
+        dataSource = manifest['sap.app'].dataSources?.[dataSourceName];
     }
     return dataSource;
 }
@@ -28,9 +27,8 @@ exports.getMainServiceDataSource = getMainServiceDataSource;
  * @returns data sources of type 'OData'
  */
 function getODataSources(manifest, dataSourceType = 'OData') {
-    var _a;
     const result = {};
-    const dataSources = ((_a = manifest['sap.app']) === null || _a === void 0 ? void 0 : _a.dataSources) || {};
+    const dataSources = manifest['sap.app']?.dataSources || {};
     for (const dataSource in dataSources) {
         if (dataSources[dataSource].uri && dataSources[dataSource].type === dataSourceType) {
             result[dataSource] = dataSources[dataSource];

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]: mockserver_config_writer_i18n_json_1.default
-                }
-            },
-            lng: 'en',
-            fallbackLng: 'en',
-            defaultNS: NS,
-            ns: [NS]
-        });
+async function initI18n() {
+    await i18next_1.default.init({
+        resources: {
+            en: {
+                [NS]: mockserver_config_writer_i18n_json_1.default
+            }
+        },
+        lng: 'en',
+        fallbackLng: 'en',
+        defaultNS: NS,
+        ns: [NS]
     });
 }
 exports.initI18n = initI18n;

package/dist/mockserver-config/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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeMockserverConfig = exports.generateMockserverConfig = void 0;
 const mem_fs_1 = require("mem-fs");
@@ -22,15 +13,13 @@ const ui5_mock_yaml_1 = require("./ui5-mock-yaml");
  * @param fs - the memfs editor instance
  * @returns Promise<Editor> - memfs editor instance with updated files
  */
-function generateMockserverConfig(basePath, data, fs) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!fs) {
-            fs = (0, mem_fs_editor_1.create)((0, mem_fs_1.create)());
-        }
-        (0, package_json_1.enhancePackageJson)(fs, basePath, data.packageJsonConfig);
-        yield (0, ui5_mock_yaml_1.enhanceYaml)(fs, basePath, data.webappPath, data.ui5MockYamlConfig);
-        return fs;
-    });
+async function generateMockserverConfig(basePath, data, fs) {
+    if (!fs) {
+        fs = (0, mem_fs_editor_1.create)((0, mem_fs_1.create)());
+    }
+    (0, package_json_1.enhancePackageJson)(fs, basePath, data.packageJsonConfig);
+    await (0, ui5_mock_yaml_1.enhanceYaml)(fs, basePath, data.webappPath, data.ui5MockYamlConfig);
+    return fs;
 }
 exports.generateMockserverConfig = generateMockserverConfig;
 /**

package/dist/mockserver-config/package-json.js

@@ -12,7 +12,7 @@ const path_1 = require("path");
 function enhancePackageJson(fs, basePath, config) {
     const packageJsonPath = (0, path_1.join)(basePath, 'package.json');
     const packageJson = fs.readJSON(packageJsonPath);
-    enhanceDependencies(packageJson, config === null || config === void 0 ? void 0 : config.mockserverModule, config === null || config === void 0 ? void 0 : config.mockserverVersion);
+    enhanceDependencies(packageJson, config?.mockserverModule, config?.mockserverVersion);
     enhanceScripts(fs, packageJson);
     fs.writeJSON(packageJsonPath, packageJson);
 }
@@ -26,7 +26,6 @@ exports.enhancePackageJson = enhancePackageJson;
  * @param version - npm version string
  */
 function enhanceDependencies(packageJson, mockserverModule = '@sap-ux/ui5-middleware-fe-mockserver', version = '2') {
-    var _a;
     packageJson.devDependencies = packageJson.devDependencies || {};
     delete packageJson.devDependencies['@sap/ux-ui5-fe-mockserver-middleware'];
     packageJson.devDependencies[mockserverModule] = version;
@@ -34,8 +33,8 @@ function enhanceDependencies(packageJson, mockserverModule = '@sap-ux/ui5-middle
         removeMockserverUi5Dependencies(packageJson);
     }
     else {
-        packageJson.ui5 || (packageJson.ui5 = {});
-        (_a = packageJson.ui5).dependencies || (_a.dependencies = []);
+        packageJson.ui5 ||= {};
+        packageJson.ui5.dependencies ||= [];
         const ui5Dependencies = packageJson.ui5.dependencies.filter((dep) => dep !== '@sap/ux-ui5-fe-mockserver-middleware');
         if (!ui5Dependencies.includes(mockserverModule)) {
             ui5Dependencies.push(mockserverModule);
@@ -50,10 +49,11 @@ function enhanceDependencies(packageJson, mockserverModule = '@sap-ux/ui5-middle
  * @param packageJson - path to package.json
  */
 function enhanceScripts(fs, packageJson) {
-    var _a, _b;
-    packageJson.scripts || (packageJson.scripts = {});
+    packageJson.scripts ||= {};
     packageJson.scripts['start-mock'] =
-        (_b = (_a = copyStartScript(packageJson.scripts.start)) !== null && _a !== void 0 ? _a : packageJson.scripts['start-mock']) !== null && _b !== void 0 ? _b : `fiori run --config ./ui5-mock.yaml --open "/"`;
+        copyStartScript(packageJson.scripts.start) ??
+            packageJson.scripts['start-mock'] ??
+            `fiori run --config ./ui5-mock.yaml --open "/"`;
 }
 /**
  * Return a copy of package.json's 'start' script with added or replaced config pointing to ui5-mock.yaml.
@@ -84,16 +84,15 @@ function copyStartScript(startScript) {
  * @returns - true: @ui/cli higher version 2; false: @ui/cli
  */
 function isUi5CliHigherTwo(devDependencies) {
-    var _a;
     let isHigherTwo = false;
     try {
         const versionString = devDependencies['@ui5/cli'];
         if (typeof versionString === 'string') {
-            const majorVersion = parseInt(((_a = versionString.split('.')[0].match(/\d+/)) === null || _a === void 0 ? void 0 : _a[0]) || '0', 10);
+            const majorVersion = parseInt(versionString.split('.')[0].match(/\d+/)?.[0] || '0', 10);
             isHigherTwo = majorVersion > 2 ? true : false;
         }
     }
-    catch (_b) {
+    catch {
         // if something went wrong we don't have @ui/cli > version 2
     }
     return isHigherTwo;
@@ -126,9 +125,8 @@ function replaceConfig(startScript, configStartIndex) {
  * @param packageJson - parsed package.json content
  */
 function removeMockserverUi5Dependencies(packageJson) {
-    var _a;
     const removeModules = new Set(['@sap/ux-ui5-fe-mockserver-middleware', '@sap-ux/ui5-middleware-fe-mockserver']);
-    if (((_a = packageJson.ui5) === null || _a === void 0 ? void 0 : _a.dependencies) && Array.isArray(packageJson.ui5.dependencies)) {
+    if (packageJson.ui5?.dependencies && Array.isArray(packageJson.ui5.dependencies)) {
         packageJson.ui5.dependencies = packageJson.ui5.dependencies.filter((d) => !removeModules.has(d));
         if (packageJson.ui5.dependencies.length === 0) {
             delete packageJson.ui5.dependencies;
@@ -145,15 +143,14 @@ function removeMockserverUi5Dependencies(packageJson) {
  * @param basePath - path to application root, where package.json is
  */
 function removeFromPackageJson(fs, basePath) {
-    var _a, _b, _c;
     const packageJsonPath = (0, path_1.join)(basePath, 'package.json');
     const packageJson = fs.readJSON(packageJsonPath);
-    (_a = packageJson.scripts) === null || _a === void 0 ? true : delete _a['start-mock'];
+    delete packageJson.scripts?.['start-mock'];
     if (packageJson.scripts && Object.keys(packageJson.scripts).length === 0) {
         delete packageJson.scripts;
     }
-    (_b = packageJson.devDependencies) === null || _b === void 0 ? true : delete _b['@sap/ux-ui5-fe-mockserver-middleware'];
-    (_c = packageJson.devDependencies) === null || _c === void 0 ? true : delete _c['@sap-ux/ui5-middleware-fe-mockserver'];
+    delete packageJson.devDependencies?.['@sap/ux-ui5-fe-mockserver-middleware'];
+    delete packageJson.devDependencies?.['@sap-ux/ui5-middleware-fe-mockserver'];
     if (packageJson.devDependencies && Object.keys(packageJson.devDependencies).length === 0) {
         delete packageJson.devDependencies;
     }

package/dist/mockserver-config/ui5-mock-yaml.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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeUi5MockYaml = exports.enhanceYaml = void 0;
 const path_1 = require("path");
@@ -33,32 +24,26 @@ const app_info_1 = require("../app-info");
  * @param webappPath - path to webapp folder, where manifest.json is
  * @param config - optional config passed in by consumer
  */
-function enhanceYaml(fs, basePath, webappPath, config) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        const ui5MockYamlPath = (0, path_1.join)(basePath, 'ui5-mock.yaml');
-        let mockConfig;
-        const manifest = fs.readJSON((0, path_1.join)(webappPath, 'manifest.json'));
-        const mockserverPath = (config === null || config === void 0 ? void 0 : config.path) || ((_a = (0, app_info_1.getMainServiceDataSource)(manifest)) === null || _a === void 0 ? void 0 : _a.uri);
-        const annotationSource = Object.values((0, app_info_1.getODataSources)(manifest, 'ODataAnnotation'));
-        const annotationsConfig = annotationSource.map((annotation) => {
-            var _a;
-            return ({
-                localPath: `./webapp/${(_a = annotation.settings) === null || _a === void 0 ? void 0 : _a.localUri}`,
-                urlPath: annotation.uri
-            });
-        });
-        if (fs.exists(ui5MockYamlPath)) {
-            mockConfig = yield updateUi5MockYamlConfig(fs, ui5MockYamlPath, mockserverPath, annotationsConfig);
-        }
-        else {
-            mockConfig = fs.exists((0, path_1.join)(basePath, 'ui5.yaml'))
-                ? yield generateUi5MockYamlBasedOnUi5Yaml(fs, basePath, mockserverPath, annotationsConfig)
-                : yield generateNewUi5MockYamlConfig(((_b = manifest['sap.app']) === null || _b === void 0 ? void 0 : _b.id) || '', mockserverPath, annotationsConfig);
-        }
-        const yaml = mockConfig.toString();
-        fs.write(ui5MockYamlPath, yaml);
-    });
+async function enhanceYaml(fs, basePath, webappPath, config) {
+    const ui5MockYamlPath = (0, path_1.join)(basePath, 'ui5-mock.yaml');
+    let mockConfig;
+    const manifest = fs.readJSON((0, path_1.join)(webappPath, 'manifest.json'));
+    const mockserverPath = config?.path || (0, app_info_1.getMainServiceDataSource)(manifest)?.uri;
+    const annotationSource = Object.values((0, app_info_1.getODataSources)(manifest, 'ODataAnnotation'));
+    const annotationsConfig = annotationSource.map((annotation) => ({
+        localPath: `./webapp/${annotation.settings?.localUri}`,
+        urlPath: annotation.uri
+    }));
+    if (fs.exists(ui5MockYamlPath)) {
+        mockConfig = await updateUi5MockYamlConfig(fs, ui5MockYamlPath, mockserverPath, annotationsConfig);
+    }
+    else {
+        mockConfig = fs.exists((0, path_1.join)(basePath, 'ui5.yaml'))
+            ? await generateUi5MockYamlBasedOnUi5Yaml(fs, basePath, mockserverPath, annotationsConfig)
+            : await generateNewUi5MockYamlConfig(manifest['sap.app']?.id || '', mockserverPath, annotationsConfig);
+    }
+    const yaml = mockConfig.toString();
+    fs.write(ui5MockYamlPath, yaml);
 }
 exports.enhanceYaml = enhanceYaml;
 /**
@@ -71,12 +56,10 @@ exports.enhanceYaml = enhanceYaml;
  * @param annotationsConfig - optional annotations config to add to mockserver middleware
  * @returns {*}  {Promise<UI5Config>} - Update Yaml Doc
  */
-function updateUi5MockYamlConfig(fs, ui5MockYamlPath, path, annotationsConfig) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const existingUi5MockYamlConfig = yield ui5_config_1.UI5Config.newInstance(fs.read(ui5MockYamlPath));
-        existingUi5MockYamlConfig.updateCustomMiddleware(yield getNewMockserverMiddleware(path, annotationsConfig));
-        return existingUi5MockYamlConfig;
-    });
+async function updateUi5MockYamlConfig(fs, ui5MockYamlPath, path, annotationsConfig) {
+    const existingUi5MockYamlConfig = await ui5_config_1.UI5Config.newInstance(fs.read(ui5MockYamlPath));
+    existingUi5MockYamlConfig.updateCustomMiddleware(await getNewMockserverMiddleware(path, annotationsConfig));
+    return existingUi5MockYamlConfig;
 }
 /**
  * Create a new ui5-mock.yaml based on existing ui5.yaml.
@@ -87,12 +70,10 @@ function updateUi5MockYamlConfig(fs, ui5MockYamlPath, path, annotationsConfig) {
  * @param annotationsConfig - optional annotations config to add to mockserver middleware
  * @returns {*}  {Promise<UI5Config>} - Update Yaml Doc
  */
-function generateUi5MockYamlBasedOnUi5Yaml(fs, basePath, path, annotationsConfig) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const ui5MockYamlConfig = yield ui5_config_1.UI5Config.newInstance(fs.read((0, path_1.join)(basePath, 'ui5.yaml')));
-        ui5MockYamlConfig.updateCustomMiddleware(yield getNewMockserverMiddleware(path, annotationsConfig));
-        return ui5MockYamlConfig;
-    });
+async function generateUi5MockYamlBasedOnUi5Yaml(fs, basePath, path, annotationsConfig) {
+    const ui5MockYamlConfig = await ui5_config_1.UI5Config.newInstance(fs.read((0, path_1.join)(basePath, 'ui5.yaml')));
+    ui5MockYamlConfig.updateCustomMiddleware(await getNewMockserverMiddleware(path, annotationsConfig));
+    return ui5MockYamlConfig;
 }
 /**
  * Create fresh ui5-mock.yaml configuration which can be stringified and written.
@@ -102,16 +83,14 @@ function generateUi5MockYamlBasedOnUi5Yaml(fs, basePath, path, annotationsConfig
  * @param annotationsConfig - optional annotations config to add to mockserver middleware
  * @returns {*}  {Promise<UI5Config>} - Update Yaml Doc
  */
-function generateNewUi5MockYamlConfig(appId, path, annotationsConfig) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const ui5MockYaml = yield ui5_config_1.UI5Config.newInstance('# yaml-language-server: $schema=https://sap.github.io/ui5-tooling/schema/ui5.yaml.json\n\nspecVersion: "2.5"');
-        ui5MockYaml.setMetadata({ name: appId });
-        ui5MockYaml.setType('application');
-        ui5MockYaml.addFioriToolsProxydMiddleware({ ui5: {} });
-        ui5MockYaml.addFioriToolsAppReloadMiddleware();
-        ui5MockYaml.addMockServerMiddleware(path, annotationsConfig);
-        return ui5MockYaml;
-    });
+async function generateNewUi5MockYamlConfig(appId, path, annotationsConfig) {
+    const ui5MockYaml = await ui5_config_1.UI5Config.newInstance('# yaml-language-server: $schema=https://sap.github.io/ui5-tooling/schema/ui5.yaml.json\n\nspecVersion: "2.5"');
+    ui5MockYaml.setMetadata({ name: appId });
+    ui5MockYaml.setType('application');
+    ui5MockYaml.addFioriToolsProxydMiddleware({ ui5: {} });
+    ui5MockYaml.addFioriToolsAppReloadMiddleware();
+    ui5MockYaml.addMockServerMiddleware(path, annotationsConfig);
+    return ui5MockYaml;
 }
 /**
  * Return new mockserver middleware.
@@ -120,16 +99,14 @@ function generateNewUi5MockYamlConfig(appId, path, annotationsConfig) {
  * @param annotationsConfig - optional annotations config to add to mockserver middleware
  * @returns - mockserver middleware
  */
-function getNewMockserverMiddleware(path, annotationsConfig) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const ui5MockYaml = yield ui5_config_1.UI5Config.newInstance('');
-        ui5MockYaml.addMockServerMiddleware(path, annotationsConfig);
-        const mockserverMiddleware = ui5MockYaml.findCustomMiddleware('sap-fe-mockserver');
-        if (!mockserverMiddleware) {
-            throw Error('Could not create new mockserver config');
-        }
-        return mockserverMiddleware;
-    });
+async function getNewMockserverMiddleware(path, annotationsConfig) {
+    const ui5MockYaml = await ui5_config_1.UI5Config.newInstance('');
+    ui5MockYaml.addMockServerMiddleware(path, annotationsConfig);
+    const mockserverMiddleware = ui5MockYaml.findCustomMiddleware('sap-fe-mockserver');
+    if (!mockserverMiddleware) {
+        throw Error('Could not create new mockserver config');
+    }
+    return mockserverMiddleware;
 }
 /**
  * Delete ui5-mock.yaml file from mem-fs.

package/dist/prompt/index.js

@@ -15,22 +15,21 @@ const __1 = require("..");
  * @returns - array of questions that serves as input for prompt module
  */
 function getMockserverConfigQuestions(params) {
-    var _a, _b;
     const question = {
         name: 'path',
         message: (0, __1.t)('questions.pathToMock')
     };
-    if (params === null || params === void 0 ? void 0 : params.webappPath) {
+    if (params?.webappPath) {
         const fs = params.fs || (0, mem_fs_editor_1.create)((0, mem_fs_1.create)());
         const manifest = JSON.parse(fs.read((0, path_1.join)(params.webappPath, 'manifest.json')));
-        const mainDataSourceUri = ((_a = (0, app_info_1.getMainServiceDataSource)(manifest)) === null || _a === void 0 ? void 0 : _a.uri) || '';
+        const mainDataSourceUri = (0, app_info_1.getMainServiceDataSource)(manifest)?.uri || '';
         const oDataSources = (0, app_info_1.getODataSources)(manifest);
         const choices = [];
         for (const dsName in oDataSources) {
             choices.push({
                 title: `${dsName}: ${oDataSources[dsName].uri}`,
                 value: oDataSources[dsName].uri,
-                description: ((_b = oDataSources[dsName].settings) === null || _b === void 0 ? void 0 : _b.odataVersion) || undefined
+                description: oDataSources[dsName].settings?.odataVersion || undefined
             });
         }
         if (choices.length > 0) {
@@ -39,7 +38,7 @@ function getMockserverConfigQuestions(params) {
             question.initial = choices.findIndex((c) => c.value === mainDataSourceUri);
         }
     }
-    question.type || (question.type = 'text');
+    question.type ||= 'text';
     return [question];
 }
 exports.getMockserverConfigQuestions = getMockserverConfigQuestions;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/mockserver-config-writer",
   "description": "Add or update configuration for SAP Fiori tools mockserver",
-  "version": "0.5.7",
+  "version": "0.6.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -22,14 +22,14 @@
     "i18next": "20.6.1",
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
-    "@sap-ux/ui5-config": "0.22.9"
+    "@sap-ux/ui5-config": "0.23.0"
   },
   "devDependencies": {
     "@types/mem-fs": "1.1.2",
     "@types/mem-fs-editor": "7.0.1",
     "@types/prompts": "2.4.4",
     "prompts": "2.4.2",
-    "@sap-ux/project-access": "1.22.2"
+    "@sap-ux/project-access": "1.23.0"
   },
   "engines": {
     "node": ">=18.x"