@sap-ux/project-access 1.12.0 → 1.13.0

package/dist/constants.d.ts

@@ -5,6 +5,7 @@ export declare const FileName: {
     readonly ManifestAppDescrVar: "manifest.appdescr_variant";
     readonly MtaYaml: "mta.yaml";
     readonly Package: "package.json";
+    readonly Pom: "pom.xml";
     readonly Tsconfig: "tsconfig.json";
     readonly Ui5Yaml: "ui5.yaml";
     readonly Ui5LocalYaml: "ui5-local.yaml";

package/dist/constants.js

@@ -8,6 +8,7 @@ exports.FileName = {
     ManifestAppDescrVar: 'manifest.appdescr_variant',
     MtaYaml: 'mta.yaml',
     Package: 'package.json',
+    Pom: 'pom.xml',
     Tsconfig: 'tsconfig.json',
     Ui5Yaml: 'ui5.yaml',
     Ui5LocalYaml: 'ui5-local.yaml',

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { FileName } from './constants';
-export { findAllApps, findFioriArtifacts, findProjectRoot, getAppRootFromWebappPath, getAppProgrammingLanguage, getCapCustomPaths, getCapEnvironment, getCapModelAndServices, getCapProjectType, getMtaPath, getNodeModulesPath, getWebappPath, isCapJavaProject, isCapNodeJsProject, loadModuleFromProject, readCapServiceMetadataEdmx, readUi5Yaml } from './project';
+export { findAllApps, findCapProjects, findFioriArtifacts, findProjectRoot, getAppRootFromWebappPath, getAppProgrammingLanguage, getCapCustomPaths, getCapEnvironment, getCapModelAndServices, getCapProjectType, getMtaPath, getNodeModulesPath, getWebappPath, isCapJavaProject, isCapNodeJsProject, loadModuleFromProject, readCapServiceMetadataEdmx, readUi5Yaml } from './project';
 export { getFilePaths } from './file';
 export * from './types';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -14,11 +14,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFilePaths = exports.readUi5Yaml = exports.readCapServiceMetadataEdmx = exports.loadModuleFromProject = exports.isCapNodeJsProject = exports.isCapJavaProject = exports.getWebappPath = exports.getNodeModulesPath = exports.getMtaPath = exports.getCapProjectType = exports.getCapModelAndServices = exports.getCapEnvironment = exports.getCapCustomPaths = exports.getAppProgrammingLanguage = exports.getAppRootFromWebappPath = exports.findProjectRoot = exports.findFioriArtifacts = exports.findAllApps = exports.FileName = void 0;
+exports.getFilePaths = exports.readUi5Yaml = exports.readCapServiceMetadataEdmx = exports.loadModuleFromProject = exports.isCapNodeJsProject = exports.isCapJavaProject = exports.getWebappPath = exports.getNodeModulesPath = exports.getMtaPath = exports.getCapProjectType = exports.getCapModelAndServices = exports.getCapEnvironment = exports.getCapCustomPaths = exports.getAppProgrammingLanguage = exports.getAppRootFromWebappPath = exports.findProjectRoot = exports.findFioriArtifacts = exports.findCapProjects = exports.findAllApps = exports.FileName = void 0;
 var constants_1 = require("./constants");
 Object.defineProperty(exports, "FileName", { enumerable: true, get: function () { return constants_1.FileName; } });
 var project_1 = require("./project");
 Object.defineProperty(exports, "findAllApps", { enumerable: true, get: function () { return project_1.findAllApps; } });
+Object.defineProperty(exports, "findCapProjects", { enumerable: true, get: function () { return project_1.findCapProjects; } });
 Object.defineProperty(exports, "findFioriArtifacts", { enumerable: true, get: function () { return project_1.findFioriArtifacts; } });
 Object.defineProperty(exports, "findProjectRoot", { enumerable: true, get: function () { return project_1.findProjectRoot; } });
 Object.defineProperty(exports, "getAppRootFromWebappPath", { enumerable: true, get: function () { return project_1.getAppRootFromWebappPath; } });

package/dist/project/cap.d.ts

@@ -14,9 +14,10 @@ export declare function isCapNodeJsProject(packageJson: Package): boolean;
  * Returns true if the project is a CAP Java project.
  *
  * @param projectRoot - the root path of the project
+ * @param [capCustomPaths] - optional, relative CAP paths like app, db, srv
  * @returns - true if the project is a CAP project
  */
-export declare function isCapJavaProject(projectRoot: string): Promise<boolean>;
+export declare function isCapJavaProject(projectRoot: string, capCustomPaths?: CapCustomPaths): Promise<boolean>;
 /**
  * Returns the CAP project type, undefined if it is not a CAP project.
  *

package/dist/project/cap.js

@@ -30,11 +30,13 @@ exports.isCapNodeJsProject = isCapNodeJsProject;
  * Returns true if the project is a CAP Java project.
  *
  * @param projectRoot - the root path of the project
+ * @param [capCustomPaths] - optional, relative CAP paths like app, db, srv
  * @returns - true if the project is a CAP project
  */
-function isCapJavaProject(projectRoot) {
+function isCapJavaProject(projectRoot, capCustomPaths) {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const { srv } = yield getCapCustomPaths(projectRoot);
+        const srv = (_a = capCustomPaths === null || capCustomPaths === void 0 ? void 0 : capCustomPaths.srv) !== null && _a !== void 0 ? _a : (yield getCapCustomPaths(projectRoot)).srv;
         return (0, file_1.fileExists)((0, path_1.join)(projectRoot, srv, 'src', 'main', 'resources', 'application.yaml'));
     });
 }
@@ -47,7 +49,11 @@ exports.isCapJavaProject = isCapJavaProject;
  */
 function getCapProjectType(projectRoot) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (yield isCapJavaProject(projectRoot)) {
+        const capCustomPaths = yield getCapCustomPaths(projectRoot);
+        if (!(yield (0, file_1.fileExists)((0, path_1.join)(projectRoot, capCustomPaths.srv)))) {
+            return undefined;
+        }
+        if (yield isCapJavaProject(projectRoot, capCustomPaths)) {
             return 'CAPJava';
         }
         let packageJson;
@@ -342,27 +348,29 @@ function loadGlobalCdsModule() {
  * @returns - result of call 'cds --version'
  */
 function getCdsVersionInfo(cwd) {
-    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;
+    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);
                 }
-                resolve(versions);
-            }
-            else {
-                reject(new Error('Module path not found'));
-            }
-        });
-        cdsVersionInfo.on('error', (error) => {
-            reject(error);
+                else {
+                    reject(new Error('Module path not found'));
+                }
+            });
+            cdsVersionInfo.on('error', (error) => {
+                reject(error);
+            });
         });
     });
 }

package/dist/project/index.d.ts

@@ -2,7 +2,7 @@ export { getCapCustomPaths, getCapModelAndServices, getCapProjectType, isCapJava
 export { getNodeModulesPath } from './dependencies';
 export { getAppProgrammingLanguage } from './info';
 export { loadModuleFromProject } from './module-loader';
-export { findAllApps, findFioriArtifacts, findProjectRoot, getAppRootFromWebappPath } from './search';
+export { findAllApps, findCapProjects, findFioriArtifacts, findProjectRoot, getAppRootFromWebappPath } from './search';
 export { getWebappPath, readUi5Yaml } from './ui5-config';
 export { getMtaPath } from './mta';
 //# sourceMappingURL=index.d.ts.map

package/dist/project/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMtaPath = exports.readUi5Yaml = exports.getWebappPath = exports.getAppRootFromWebappPath = exports.findProjectRoot = exports.findFioriArtifacts = exports.findAllApps = exports.loadModuleFromProject = exports.getAppProgrammingLanguage = exports.getNodeModulesPath = exports.readCapServiceMetadataEdmx = exports.getCapEnvironment = exports.isCapNodeJsProject = exports.isCapJavaProject = exports.getCapProjectType = exports.getCapModelAndServices = exports.getCapCustomPaths = void 0;
+exports.getMtaPath = exports.readUi5Yaml = exports.getWebappPath = exports.getAppRootFromWebappPath = exports.findProjectRoot = exports.findFioriArtifacts = exports.findCapProjects = exports.findAllApps = exports.loadModuleFromProject = exports.getAppProgrammingLanguage = exports.getNodeModulesPath = exports.readCapServiceMetadataEdmx = exports.getCapEnvironment = exports.isCapNodeJsProject = exports.isCapJavaProject = exports.getCapProjectType = exports.getCapModelAndServices = exports.getCapCustomPaths = void 0;
 var cap_1 = require("./cap");
 Object.defineProperty(exports, "getCapCustomPaths", { enumerable: true, get: function () { return cap_1.getCapCustomPaths; } });
 Object.defineProperty(exports, "getCapModelAndServices", { enumerable: true, get: function () { return cap_1.getCapModelAndServices; } });
@@ -17,6 +17,7 @@ var module_loader_1 = require("./module-loader");
 Object.defineProperty(exports, "loadModuleFromProject", { enumerable: true, get: function () { return module_loader_1.loadModuleFromProject; } });
 var search_1 = require("./search");
 Object.defineProperty(exports, "findAllApps", { enumerable: true, get: function () { return search_1.findAllApps; } });
+Object.defineProperty(exports, "findCapProjects", { enumerable: true, get: function () { return search_1.findCapProjects; } });
 Object.defineProperty(exports, "findFioriArtifacts", { enumerable: true, get: function () { return search_1.findFioriArtifacts; } });
 Object.defineProperty(exports, "findProjectRoot", { enumerable: true, get: function () { return search_1.findProjectRoot; } });
 Object.defineProperty(exports, "getAppRootFromWebappPath", { enumerable: true, get: function () { return search_1.getAppRootFromWebappPath; } });

package/dist/project/search.d.ts

@@ -36,4 +36,14 @@ export declare function findFioriArtifacts(options: {
     wsFolders?: readonly WorkspaceFolder[] | string[];
     artifacts: FioriArtifactTypes[];
 }): Promise<FoundFioriArtifacts>;
+/**
+ * Find all CAP project roots by locating pom.xml or package.json in a given workspace.
+ *
+ * @param options - find options
+ * @param options.wsFolders - list of roots, either as vscode WorkspaceFolder[] or array of paths
+ * @returns - root file paths that may contain a CAP project
+ */
+export declare function findCapProjects(options: {
+    readonly wsFolders: WorkspaceFolder[] | string[];
+}): Promise<string[]>;
 //# sourceMappingURL=search.d.ts.map

package/dist/project/search.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findFioriArtifacts = exports.findAllApps = exports.getAppRootFromWebappPath = exports.findProjectRoot = void 0;
+exports.findCapProjects = exports.findFioriArtifacts = exports.findAllApps = exports.getAppRootFromWebappPath = exports.findProjectRoot = void 0;
 const path_1 = require("path");
 const constants_1 = require("../constants");
 const file_1 = require("../file");
@@ -171,7 +171,7 @@ function findRootsForPath(path) {
             if (appPckJson.sapux) {
                 return findRootsWithSapux(appPckJson.sapux, path, appRoot);
             }
-            if ((0, cap_1.isCapNodeJsProject)(appPckJson) || (yield (0, cap_1.isCapJavaProject)(appRoot))) {
+            if ((yield (0, cap_1.getCapProjectType)(appRoot)) !== undefined) {
                 // App is part of a CAP project, but doesn't have own package.json and is not mentioned in sapux array
                 // in root -> not supported
                 return null;
@@ -407,4 +407,34 @@ function findFioriArtifacts(options) {
     });
 }
 exports.findFioriArtifacts = findFioriArtifacts;
+/**
+ * Find all CAP project roots by locating pom.xml or package.json in a given workspace.
+ *
+ * @param options - find options
+ * @param options.wsFolders - list of roots, either as vscode WorkspaceFolder[] or array of paths
+ * @returns - root file paths that may contain a CAP project
+ */
+function findCapProjects(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const result = new Set();
+        const excludeFolders = ['node_modules', 'dist', 'src', 'webapp', 'MDKModule', 'gen'];
+        const fileNames = [constants_1.FileName.Pom, constants_1.FileName.Package];
+        const wsRoots = wsFoldersToRootPaths(options.wsFolders);
+        for (const root of wsRoots) {
+            const filesToCheck = yield (0, file_1.findBy)({
+                fileNames,
+                root,
+                excludeFolders
+            });
+            const foldersToCheck = Array.from(new Set(filesToCheck.map((file) => (0, path_1.dirname)(file)))); //only directories without duplicates
+            for (const folderToCheck of foldersToCheck) {
+                if ((yield (0, cap_1.getCapProjectType)(folderToCheck)) !== undefined) {
+                    result.add(folderToCheck);
+                }
+            }
+        }
+        return Array.from(result);
+    });
+}
+exports.findCapProjects = findCapProjects;
 //# sourceMappingURL=search.js.map

package/package.json

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