@sap-ux/project-access 1.15.0 → 1.15.2

package/dist/project/cap.js

@@ -22,8 +22,8 @@ const module_loader_1 = require("./module-loader");
  * @returns - true if the project is a CAP Node.js project
  */
 function isCapNodeJsProject(packageJson) {
-    var _a;
-    return !!(packageJson.cds || ((_a = packageJson.dependencies) === null || _a === void 0 ? void 0 : _a['@sap/cds']));
+    var _a, _b;
+    return !!((_a = packageJson.cds) !== null && _a !== void 0 ? _a : (_b = packageJson.dependencies) === null || _b === void 0 ? void 0 : _b['@sap/cds']);
 }
 exports.isCapNodeJsProject = isCapNodeJsProject;
 /**

package/dist/project/dependencies.js

@@ -11,7 +11,7 @@ const constants_1 = require("../constants");
  * @param dependency - name of the dependency
  * @returns - true: has dependency; false: no dependency
  */
-const hasDependency = (packageJson, dependency) => { var _a, _b; return !!(((_a = packageJson.dependencies) === null || _a === void 0 ? void 0 : _a[dependency]) || ((_b = packageJson.devDependencies) === null || _b === void 0 ? void 0 : _b[dependency])); };
+const hasDependency = (packageJson, dependency) => { var _a, _b, _c; return !!((_b = (_a = packageJson.dependencies) === null || _a === void 0 ? void 0 : _a[dependency]) !== null && _b !== void 0 ? _b : (_c = packageJson.devDependencies) === null || _c === void 0 ? void 0 : _c[dependency]); };
 exports.hasDependency = hasDependency;
 /**
  * Returns path to folder that hosts 'node_modules' used by project.

package/dist/project/search.js

@@ -235,7 +235,7 @@ exports.findAllApps = findAllApps;
  * @returns - results as path to apps plus files already parsed, e.g. manifest.json
  */
 function filterApplications(pathMap) {
-    var _a;
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         const result = [];
         const manifestPaths = Object.keys(pathMap).filter((path) => (0, path_1.basename)(path) === constants_1.FileName.Manifest);
@@ -244,7 +244,7 @@ function filterApplications(pathMap) {
                 // All UI5 apps have at least sap.app: { id: <ID>, type: "application" } in manifest.json
                 (_a = pathMap[manifestPath]) !== null && _a !== void 0 ? _a : (pathMap[manifestPath] = yield (0, file_1.readJSON)(manifestPath));
                 const manifest = pathMap[manifestPath];
-                if (!manifest['sap.app'] || !manifest['sap.app'].id || manifest['sap.app'].type !== 'application') {
+                if (!((_b = manifest['sap.app']) === null || _b === void 0 ? void 0 : _b.id) || manifest['sap.app'].type !== 'application') {
                     continue;
                 }
                 const roots = yield findRootsForPath(manifestPath);
@@ -252,7 +252,7 @@ function filterApplications(pathMap) {
                     result.push({ appRoot: roots.appRoot, projectRoot: roots.projectRoot, manifest, manifestPath });
                 }
             }
-            catch (_b) {
+            catch (_c) {
                 // ignore exceptions for invalid manifests
             }
         }
@@ -270,9 +270,10 @@ function filterAdaptations(pathMap) {
         const results = [];
         const manifestAppDescrVars = Object.keys(pathMap).filter((path) => path.endsWith(constants_1.FileName.ManifestAppDescrVar));
         for (const manifestAppDescrVar of manifestAppDescrVars) {
-            const adpPath = yield (0, file_1.findFileUp)('.adp', (0, path_1.dirname)(manifestAppDescrVar));
-            if (adpPath && (yield (0, file_1.fileExists)((0, path_1.join)(adpPath, constants_1.FileName.AdaptationConfig)))) {
-                results.push({ appRoot: (0, path_1.dirname)(adpPath), manifestAppdescrVariantPath: manifestAppDescrVar });
+            const packageJsonPath = yield (0, file_1.findFileUp)(constants_1.FileName.Package, (0, path_1.dirname)(manifestAppDescrVar));
+            const projectRoot = packageJsonPath ? (0, path_1.dirname)(packageJsonPath) : null;
+            if (projectRoot && (yield (0, file_1.fileExists)((0, path_1.join)(projectRoot, 'webapp', constants_1.FileName.ManifestAppDescrVar)))) {
+                results.push({ appRoot: projectRoot, manifestAppdescrVariantPath: manifestAppDescrVar });
             }
         }
         return results;

package/package.json

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