@sap-ux/project-access 1.26.4 → 1.26.6

package/dist/project/cap.js

@@ -118,6 +118,7 @@ async function getCapModelAndServices(projectRoot) {
     _logger?.info(`@sap-ux/project-access:getCapModelAndServices - Using 'cds.home': ${cds.home}`);
     _logger?.info(`@sap-ux/project-access:getCapModelAndServices - Using 'cds.version': ${cds.version}`);
     _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 }) ?? [];
     if (services.map) {
         services = services.map((value) => {
@@ -370,6 +371,8 @@ async function loadCdsModuleFromProject(capProjectPath, strict = false) {
     if (global) {
         global.cds = cds;
     }
+    // correct cds.env for current project root. Especially needed CAP Java projects loading cds dependency from jar file
+    cds.env = cds.env.for('cds', capProjectPath);
     return cds;
 }
 /**

package/dist/project/search.js

@@ -236,26 +236,23 @@ exports.findAllApps = findAllApps;
  * @returns - results as path to apps plus files already parsed, e.g. manifest.json
  */
 async function filterApplications(pathMap) {
-    const result = [];
-    const manifestPaths = Object.keys(pathMap).filter((path) => (0, path_1.basename)(path) === constants_1.FileName.Manifest);
-    for (const manifestPath of manifestPaths) {
-        try {
-            // All UI5 apps have at least sap.app: { id: <ID>, type: "application" } in manifest.json
-            pathMap[manifestPath] ??= await (0, file_1.readJSON)(manifestPath);
-            const manifest = pathMap[manifestPath];
-            if (!manifest['sap.app']?.id || manifest['sap.app'].type !== 'application') {
-                continue;
-            }
-            const roots = await findRootsForPath(manifestPath);
+    const filterApplicationByManifest = async (manifestPath) => {
+        pathMap[manifestPath] ??= await (0, file_1.readJSON)(manifestPath);
+        const manifest = pathMap[manifestPath]; // cast needed as pathMap also allows strings and any other objects
+        // cast allowed, as this is the only place pathMap is filled for manifests
+        if (manifest['sap.app'].id && manifest['sap.app'].type === 'application') {
+            const roots = await findRootsForPath((0, path_1.dirname)(manifestPath));
             if (roots && !(await (0, file_1.fileExists)((0, path_1.join)(roots.appRoot, '.adp', constants_1.FileName.AdaptationConfig)))) {
-                result.push({ appRoot: roots.appRoot, projectRoot: roots.projectRoot, manifest, manifestPath });
+                return { appRoot: roots.appRoot, projectRoot: roots.projectRoot, manifest: manifest, manifestPath };
             }
         }
-        catch {
-            // ignore exceptions for invalid manifests
-        }
-    }
-    return result;
+        throw new Error('Not relevant');
+    };
+    const isFulFilled = (input) => input.status === 'fulfilled';
+    const manifestPaths = Object.keys(pathMap).filter((path) => (0, path_1.basename)(path) === constants_1.FileName.Manifest);
+    return (await Promise.allSettled(manifestPaths.map(filterApplicationByManifest)))
+        .filter(isFulFilled) // returning only valid applications
+        .map(({ value }) => value);
 }
 /**
  * Filter adaptation projects from a list of files.

package/package.json

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