@sap-ux/project-access 1.11.2 → 1.12.1

package/dist/project/cap.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toReferenceUri = exports.toAbsoluteUri = exports.getCapEnvironment = exports.readCapServiceMetadataEdmx = exports.getCapModelAndServices = exports.getCapCustomPaths = exports.getCapProjectType = exports.isCapJavaProject = exports.isCapNodeJsProject = void 0;
+const child_process_1 = require("child_process");
 const path_1 = require("path");
 const constants_1 = require("../constants");
 const file_1 = require("../file");
@@ -183,14 +184,37 @@ function getCapEnvironment(capProjectPath) {
 }
 exports.getCapEnvironment = getCapEnvironment;
 /**
- * Load CAP CDS module for a project based on its root.
+ * Load CAP CDS module. First attempt loads @sap/cds for a project based on its root.
+ * Second attempt loads @sap/cds from global installed @sap/cds-dk.
+ * Throws error if module could not be loaded.
  *
  * @param capProjectPath - project root of a CAP project
  * @returns - CAP CDS module for a CAP project
  */
 function loadCdsModuleFromProject(capProjectPath) {
     return __awaiter(this, void 0, void 0, function* () {
-        const module = yield (0, module_loader_1.loadModuleFromProject)(capProjectPath, '@sap/cds');
+        let module;
+        let loadProjectError;
+        let loadError;
+        try {
+            // First approach, load @sap/cds from project
+            module = yield (0, module_loader_1.loadModuleFromProject)(capProjectPath, '@sap/cds');
+        }
+        catch (error) {
+            loadProjectError = error;
+        }
+        if (!module) {
+            try {
+                // Second approach, load @sap/cds from @sap/cds-dk
+                module = yield loadGlobalCdsModule();
+            }
+            catch (error) {
+                loadError = error;
+            }
+        }
+        if (!module) {
+            throw Error(`Could not load cds module. Attempt to load module @sap/cds from project threw error '${loadProjectError}', attempt to load module @sap/cds from @sap/cds-dk threw error '${loadError}'`);
+        }
         return 'default' in module ? module.default : module;
     });
 }
@@ -293,4 +317,55 @@ function readPackageNameForFolder(baseUri, relativeUri) {
         return packageName;
     });
 }
+let globalCdsPathCache;
+/**
+ * Try to load global installation of @sap/cds, usually child of @sap/cds-dk.
+ *
+ * @returns - module @sap/cds from global installed @sap/cds-dk
+ */
+function loadGlobalCdsModule() {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!globalCdsPathCache) {
+            const versions = yield getCdsVersionInfo();
+            if (!versions.home) {
+                throw Error('Can not find global installation of module @sap/cds, which should be part of @sap/cds-dk');
+            }
+            globalCdsPathCache = versions.home;
+        }
+        return (0, module_loader_1.loadModuleFromProject)(globalCdsPathCache, '@sap/cds');
+    });
+}
+/**
+ * Get cds information, which includes versions and also the home path of cds module.
+ *
+ * @param [cwd] - optional folder in which cds --version should be executed
+ * @returns - result of call 'cds --version'
+ */
+function getCdsVersionInfo(cwd) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise((resolve, reject) => {
+            let out = '';
+            const cdsVersionInfo = (0, child_process_1.spawn)('cds', ['--version'], { 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;
+                    }
+                    resolve(versions);
+                }
+                else {
+                    reject(new Error('Module path not found'));
+                }
+            });
+            cdsVersionInfo.on('error', (error) => {
+                reject(error);
+            });
+        });
+    });
+}
 //# sourceMappingURL=cap.js.map

package/package.json

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