@sap-ux/project-access 1.35.1 → 1.35.2

package/dist/project/cap.js

@@ -567,9 +567,12 @@ async function loadGlobalCdsModule() {
     globalCdsModulePromise =
         globalCdsModulePromise ??
             new Promise((resolve, reject) => {
-                return getCdsVersionInfo().then((versions) => {
-                    if (versions.home) {
-                        resolve((0, module_loader_1.loadModuleFromProject)(versions.home, '@sap/cds'));
+                return getCdsEnvData().then((data) => {
+                    // Handle output of `cds env --json`
+                    const home = data['_home_cds-dk'];
+                    if (home) {
+                        // "@sap/cds" module is inside node_modules of "@sap/cds-dk"
+                        resolve((0, module_loader_1.loadModuleFromProject)((0, node_path_1.join)(home, 'node_modules', '@sap', 'cds'), '@sap/cds'));
                     }
                     else {
                         reject(new Error('Can not find global installation of module @sap/cds, which should be part of @sap/cds-dk'));
@@ -585,26 +588,27 @@ function clearGlobalCdsModulePromiseCache() {
     globalCdsModulePromise = undefined;
 }
 /**
- * Get cds information, which includes versions and also the home path of cds module.
+ * Get cds environment information, which includes the home path of cds-dk module.
  *
- * @param [cwd] - optional folder in which cds --version should be executed
- * @returns - result of call 'cds --version'
+ * @param [cwd] - optional folder in which cds env --json should be executed
+ * @returns - result of call 'cds env --json'
  */
-async function getCdsVersionInfo(cwd) {
+async function getCdsEnvData(cwd) {
     return new Promise((resolve, reject) => {
         let out = '';
-        const cdsVersionInfo = (0, node_child_process_1.spawn)('cds', ['--version'], { cwd, shell: true });
+        // call 'cds env --json'
+        const cdsVersionInfo = (0, node_child_process_1.spawn)('cds', ['env', '--json'], { cwd, shell: true });
         cdsVersionInfo.stdout.on('data', (data) => {
             out += data.toString();
         });
         cdsVersionInfo.on('close', () => {
             if (out) {
-                const versions = {};
-                for (const line of out.split('\n').filter((v) => v)) {
-                    const [key, value] = line.split(': ');
-                    versions[key] = value;
+                try {
+                    resolve(JSON.parse(out));
+                }
+                catch (e) {
+                    reject(new Error(`Unexpected output of "cds env --json": ${e.message}`));
                 }
-                resolve(versions);
             }
             else {
                 reject(new Error('Module path not found'));

package/package.json

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