@sap-ux/project-access 1.29.1 → 1.29.3

package/dist/project/cap.js

@@ -169,6 +169,12 @@ async function getCapModelAndServices(projectRoot) {
     _logger?.info(`@sap-ux/project-access:getCapModelAndServices - Using 'cds.root': ${cds.root}`);
     _logger?.info(`@sap-ux/project-access:getCapModelAndServices - Using 'projectRoot': ${_projectRoot}`);
     let services = cds.compile.to.serviceinfo(model, { root: _projectRoot }) ?? [];
+    // filter services that have ( urlPath defined AND no endpoints) OR have endpoints with kind 'odata'
+    // i.e. ignore services for websockets and other unsupported protocols
+    if (services.filter) {
+        services = services.filter((service) => (service.urlPath && service.endpoints === undefined) ||
+            service.endpoints?.find((endpoint) => endpoint.kind === 'odata'));
+    }
     if (services.map) {
         services = services.map((value) => {
             const { endpoints, urlPath } = value;

package/dist/project/ui5-config.d.ts

@@ -3,11 +3,11 @@ import { UI5Config } from '@sap-ux/ui5-config';
 /**
  * Get path to webapp.
  *
- * @param projectRoot - root path, where package.json or ui5.yaml is
+ * @param appRoot - root to the application
  * @param [memFs] - optional mem-fs editor instance
  * @returns - path to webapp folder
  */
-export declare function getWebappPath(projectRoot: string, memFs?: Editor): Promise<string>;
+export declare function getWebappPath(appRoot: string, memFs?: Editor): Promise<string>;
 /**
  * Checks if UI5 config yaml file exists and returns its content.
  *

package/dist/project/ui5-config.js

@@ -10,19 +10,24 @@ const file_1 = require("../file");
 /**
  * Get path to webapp.
  *
- * @param projectRoot - root path, where package.json or ui5.yaml is
+ * @param appRoot - root to the application
  * @param [memFs] - optional mem-fs editor instance
  * @returns - path to webapp folder
  */
-async function getWebappPath(projectRoot, memFs) {
-    let webappPath = (0, path_1.join)(projectRoot, 'webapp');
-    const ui5YamlPath = (0, path_1.join)(projectRoot, constants_1.FileName.Ui5Yaml);
+async function getWebappPath(appRoot, memFs) {
+    const ui5YamlPath = (0, path_1.join)(appRoot, constants_1.FileName.Ui5Yaml);
+    let webappPath = (0, path_1.join)(appRoot, constants_1.DirName.Webapp);
     if (await (0, file_1.fileExists)(ui5YamlPath, memFs)) {
         const yamlString = await (0, file_1.readFile)(ui5YamlPath, memFs);
         const ui5Config = await ui5_config_1.UI5Config.newInstance(yamlString);
         const relativeWebappPath = ui5Config.getConfiguration()?.paths?.webapp;
         if (relativeWebappPath) {
-            webappPath = (0, path_1.join)(projectRoot, relativeWebappPath);
+            // Search for folder with package.json inside
+            const packageJsonPath = await (0, file_1.findFileUp)(constants_1.FileName.Package, appRoot, memFs);
+            if (packageJsonPath) {
+                const packageJsonDirPath = (0, path_1.dirname)(packageJsonPath);
+                webappPath = (0, path_1.join)(packageJsonDirPath, relativeWebappPath);
+            }
         }
     }
     return webappPath;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap-ux/project-access",
-  "version": "1.29.1",
+  "version": "1.29.3",
   "description": "Library to access SAP Fiori tools projects",
   "repository": {
     "type": "git",