@sap-ux/project-access 1.16.1 → 1.16.3

package/dist/project/cap.d.ts

@@ -1,4 +1,5 @@
 import type { CapCustomPaths, CapProjectType, CdsEnvironment, csn, Package, ServiceDefinitions } from '../types';
+import type { Logger } from '@sap-ux/logger';
 interface ServiceInfo {
     name: string;
     urlPath: string;
@@ -34,12 +35,15 @@ export declare function getCapProjectType(projectRoot: string): Promise<CapProje
  */
 export declare function getCapCustomPaths(capProjectPath: string): Promise<CapCustomPaths>;
 /**
- * Return the CAP model and all services.
+ * Return the CAP model and all services. The cds.root will be set to the provided project root path.
  *
- * @param projectRoot - CAP project root where package.json resides
+ * @param projectRoot - CAP project root where package.json resides or object specifying project root and optional logger to log additonal info
  * @returns {*}  {Promise<{ model: csn; services: ServiceInfo[] }>} - CAP Model and Services
  */
-export declare function getCapModelAndServices(projectRoot: string): Promise<{
+export declare function getCapModelAndServices(projectRoot: string | {
+    projectRoot: string;
+    logger?: Logger;
+}): Promise<{
     model: csn;
     services: ServiceInfo[];
 }>;

package/dist/project/cap.js

@@ -99,23 +99,35 @@ function getCapCustomPaths(capProjectPath) {
 }
 exports.getCapCustomPaths = getCapCustomPaths;
 /**
- * Return the CAP model and all services.
+ * Return the CAP model and all services. The cds.root will be set to the provided project root path.
  *
- * @param projectRoot - CAP project root where package.json resides
+ * @param projectRoot - CAP project root where package.json resides or object specifying project root and optional logger to log additonal info
  * @returns {*}  {Promise<{ model: csn; services: ServiceInfo[] }>} - CAP Model and Services
  */
 function getCapModelAndServices(projectRoot) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const cds = yield loadCdsModuleFromProject(projectRoot);
-        const capProjectPaths = yield getCapCustomPaths(projectRoot);
+        let _projectRoot;
+        let _logger;
+        if (typeof projectRoot === 'object') {
+            _projectRoot = projectRoot.projectRoot;
+            _logger = projectRoot.logger;
+        }
+        else {
+            _projectRoot = projectRoot;
+        }
+        const cds = yield loadCdsModuleFromProject(_projectRoot);
+        _logger === null || _logger === void 0 ? void 0 : _logger.info(`@sap-ux/project-access:getCapModelAndServices - Using 'cds.home': ${cds.home}`);
+        _logger === null || _logger === void 0 ? void 0 : _logger.info(`@sap-ux/project-access:getCapModelAndServices - Using 'cds.version': ${cds.version}`);
+        _logger === null || _logger === void 0 ? void 0 : _logger.info(`@sap-ux/project-access:getCapModelAndServices - Using 'cds.root': ${cds.root}`);
+        const capProjectPaths = yield getCapCustomPaths(_projectRoot);
         const modelPaths = [
-            (0, path_1.join)(projectRoot, capProjectPaths.app),
-            (0, path_1.join)(projectRoot, capProjectPaths.srv),
-            (0, path_1.join)(projectRoot, capProjectPaths.db)
+            (0, path_1.join)(_projectRoot, capProjectPaths.app),
+            (0, path_1.join)(_projectRoot, capProjectPaths.srv),
+            (0, path_1.join)(_projectRoot, capProjectPaths.db)
         ];
         const model = yield cds.load(modelPaths);
-        let services = (_a = cds.compile.to.serviceinfo(model, { root: projectRoot })) !== null && _a !== void 0 ? _a : [];
+        let services = (_a = cds.compile.to.serviceinfo(model, { root: _projectRoot })) !== null && _a !== void 0 ? _a : [];
         if (services.map) {
             services = services.map((value) => {
                 return {
@@ -359,6 +371,8 @@ function loadCdsModuleFromProject(capProjectPath) {
         if (global) {
             global.cds = cds;
         }
+        // Ensure we use a known root path, otherwise `cwd` is used which varies between invocations.
+        cds.root = capProjectPath;
         return cds;
     });
 }

package/dist/project/search.js

@@ -176,20 +176,22 @@ function findRootsForPath(path) {
                 // in root -> not supported
                 return null;
             }
-            // Now we have the app root folder. Check for freestyle non CAP
-            if ((yield (0, file_1.fileExists)((0, path_1.join)(appRoot, constants_1.FileName.Ui5LocalYaml))) &&
-                (0, dependencies_1.hasDependency)(appPckJson, '@sap/ux-ui5-tooling')) {
+            // Check if app is included in CAP project
+            const projectRoot = yield findCapProjectRoot(appRoot);
+            if (projectRoot) {
+                // App included in CAP
                 return {
                     appRoot,
-                    projectRoot: appRoot
+                    projectRoot
                 };
             }
-            // Project must be CAP, find project root
-            const projectRoot = yield findCapProjectRoot(appRoot);
-            if (projectRoot) {
+            else if (
+            // Check for freestyle non CAP
+            (yield (0, file_1.fileExists)((0, path_1.join)(appRoot, constants_1.FileName.Ui5LocalYaml))) &&
+                (0, dependencies_1.hasDependency)(appPckJson, '@sap/ux-ui5-tooling')) {
                 return {
                     appRoot,
-                    projectRoot
+                    projectRoot: appRoot
                 };
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap-ux/project-access",
-  "version": "1.16.1",
+  "version": "1.16.3",
   "description": "Library to access SAP Fiori tools projects",
   "repository": {
     "type": "git",
@@ -33,7 +33,8 @@
     "@types/mem-fs": "1.1.2",
     "@types/mem-fs-editor": "7.0.1",
     "@ui5/manifest": "1.61.0",
-    "vscode-uri": "3.0.7"
+    "vscode-uri": "3.0.7",
+    "@sap-ux/logger": "0.4.0"
   },
   "scripts": {
     "build": "tsc --build",