@sap-ux/odata-service-writer 0.16.5 → 0.17.1

package/dist/index.js

@@ -24,6 +24,8 @@ const i18n_1 = require("./i18n");
 const types_1 = require("./types");
 Object.defineProperty(exports, "OdataVersion", { enumerable: true, get: function () { return types_1.OdataVersion; } });
 Object.defineProperty(exports, "ServiceType", { enumerable: true, get: function () { return types_1.ServiceType; } });
+const project_access_1 = require("@sap-ux/project-access");
+const mockserver_config_writer_1 = require("@sap-ux/mockserver-config-writer");
 /**
  * Ensures the existence of the given files in the provided base path. If a file in the provided list does not exit, an error would be thrown.
  *
@@ -63,34 +65,6 @@ function findProjectFiles(basePath, fs) {
     });
 }
 exports.findProjectFiles = findProjectFiles;
-/**
- * Generate annotations config, using `dataSources` read manifest.json.
- *
- * @param {string} basePath - the root path of an existing UI5 application
- * @param {Editor} [fs] - the memfs editor instance
- * @returns {Promise<Array<{ localPath: string, urlPath: string }>>} An array with annotations config
- */
-function generateODataAnnotationConfig(basePath, fs) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        const manifest = fs.readJSON((0, path_1.join)(basePath, 'webapp', 'manifest.json'));
-        const result = {};
-        const dataSources = (_b = (_a = manifest === null || manifest === void 0 ? void 0 : manifest['sap.app']) === null || _a === void 0 ? void 0 : _a.dataSources) !== null && _b !== void 0 ? _b : {};
-        for (const dataSource in dataSources) {
-            if (dataSources[dataSource].uri && dataSources[dataSource].type === 'ODataAnnotation') {
-                result[dataSource] = dataSources[dataSource];
-            }
-        }
-        const annotationSource = Object.values(result);
-        return annotationSource.map((annotation) => {
-            var _a;
-            return ({
-                localPath: `./webapp/${(_a = annotation.settings) === null || _a === void 0 ? void 0 : _a.localUri}`,
-                urlPath: annotation.uri
-            });
-        });
-    });
-}
 /**
  * Writes the odata service related file updates to an existing UI5 project specified by the base path.
  *
@@ -142,10 +116,13 @@ function generate(basePath, service, fs) {
         if (service.metadata) {
             // copy existing `ui5.yaml` as starting point for ui5-mock.yaml
             if (paths.ui5Yaml && ui5Config) {
-                const ui5MockConfig = yield ui5_config_1.UI5Config.newInstance(ui5Config.toString());
-                ui5MockConfig.addMockServerMiddleware(service.path, yield generateODataAnnotationConfig(basePath, fs));
-                fs.write((0, path_1.join)((0, path_1.dirname)(paths.ui5Yaml), 'ui5-mock.yaml'), ui5MockConfig.toString());
-                // also add mockserver middleware to ui5-local.yaml
+                const webappPath = yield (0, project_access_1.getWebappPath)(basePath);
+                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);
                 }

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.16.5",
+  "version": "0.17.1",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "files": [
@@ -27,7 +27,8 @@
     "mem-fs-editor": "9.4.0",
     "prettify-xml": "1.2.0",
     "semver": "7.5.4",
-    "@sap-ux/ui5-config": "0.22.2"
+    "@sap-ux/mockserver-config-writer": "0.5.1",
+    "@sap-ux/ui5-config": "0.22.3"
   },
   "devDependencies": {
     "@types/ejs": "3.1.2",
@@ -37,7 +38,7 @@
     "@types/semver": "7.5.2",
     "fs-extra": "10.0.0",
     "lodash": "4.17.21",
-    "@sap-ux/project-access": "1.19.12"
+    "@sap-ux/project-access": "1.19.14"
   },
   "engines": {
     "node": ">=18.x"

package/templates/add/ui5-mock.yaml

@@ -1,6 +0,0 @@
-# yaml-language-server: $schema=https://sap.github.io/ui5-tooling/schema/ui5.yaml.json
-
-specVersion: "2.5"
-metadata:
-  name: <%- appid %>
-type: application