@sap-ux/project-access 1.24.0 → 1.25.0

package/dist/project/info.js

@@ -17,10 +17,12 @@ const semver_1 = require("semver");
  * @returns - project structure with project info like project type, apps, root folder
  */
 async function getProject(root) {
-    const checkCapType = await (0, cap_1.getCapProjectType)(root);
-    const projectType = checkCapType ?? 'EDMXBackend';
-    const packageJson = await (0, file_1.readJSON)((0, path_1.join)(root, constants_1.FileName.Package));
-    const appFolders = getAppFolders(packageJson);
+    if (!(await (0, file_1.fileExists)((0, path_1.join)(root, constants_1.FileName.Package)))) {
+        throw new Error(`The project root folder '${root}' is not a Fiori project. No 'package.json' found.`);
+    }
+    const capProjectType = await (0, cap_1.getCapProjectType)(root);
+    const projectType = capProjectType ?? 'EDMXBackend';
+    const appFolders = await getAppFolders(root);
     const apps = await getApps(root, appFolders);
     return {
         root,
@@ -30,17 +32,16 @@ async function getProject(root) {
 }
 exports.getProject = getProject;
 /**
- * Returns the application folders from sapux flag of the package.json. For single app
+ * Returns the applications for the project. For single app
  * projects, this is just an array with one empty string. For CAP projects, this is an
  * array of operating system specific relative paths to the apps.
  *
- * @param packageJson - parsed package.json
+ * @param root - project root folder
  * @returns - array of operating specific application folders
  */
-function getAppFolders(packageJson) {
-    return Array.isArray(packageJson.sapux)
-        ? packageJson.sapux.map((appFolder) => (0, path_1.join)(...appFolder.split(/[/\\]/)))
-        : [''];
+async function getAppFolders(root) {
+    const apps = await (0, search_1.findAllApps)([root]);
+    return apps.length > 0 ? apps.map((app) => (0, path_1.relative)(root, app.appRoot)) : [''];
 }
 /**
  * Get the application structure for each application in the project.
@@ -69,6 +70,7 @@ async function getApps(root, appFolders) {
 async function getApplicationStructure(root, appFolder) {
     const appRoot = (0, path_1.join)(root, appFolder);
     const absoluteWebappPath = await (0, ui5_config_1.getWebappPath)(appRoot);
+    const appType = (await getAppType(appRoot));
     const manifest = (0, path_1.join)(absoluteWebappPath, constants_1.FileName.Manifest);
     if (!(await (0, file_1.fileExists)(manifest))) {
         return undefined;
@@ -80,6 +82,7 @@ async function getApplicationStructure(root, appFolder) {
     const services = await (0, service_1.getServicesAndAnnotations)(manifest, manifestObject);
     return {
         appRoot,
+        appType,
         manifest,
         changes,
         i18n,

package/dist/project/search.js

@@ -194,6 +194,9 @@ async function findRootsForPath(path) {
  */
 async function findCapProjectRoot(path) {
     try {
+        if (!(0, path_1.isAbsolute)(path)) {
+            return null;
+        }
         const { root } = (0, path_1.parse)(path);
         let projectRoot = (0, path_1.dirname)(path);
         while (projectRoot !== root) {

package/dist/types/info/index.d.ts

@@ -45,6 +45,10 @@ export interface ApplicationStructure {
     services: {
         [index: string]: ServiceSpecification;
     };
+    /**
+     * Application type.
+     */
+    appType: AppType;
 }
 export interface I18nPropertiesPaths {
     /**

package/package.json

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