@sap-ux/project-access 1.29.13 → 1.29.14

package/dist/file/file-search.d.ts

@@ -1,6 +1,7 @@
 import type { Editor } from 'mem-fs-editor';
 /**
  * Find function to search for files by names or file extensions.
+ * Empty name and extension option returns all files in the given folder.
  *
  * @param options - find options
  * @param [options.fileNames] - optional array of file names to search for
@@ -10,6 +11,7 @@ import type { Editor } from 'mem-fs-editor';
  * @param [options.memFs] - optional memfs editor instance
  * @param [options.noTraversal] - optional flag to disable root path traversal
  * @returns - array of paths that contain the file
+ * @throws Error[] - list of errors that occurred during the search
  */
 export declare function findBy(options: {
     fileNames?: string[];

package/dist/file/file-search.js

@@ -18,12 +18,16 @@ const fs_1 = require("fs");
  * @param changes - memfs editor changes, usually retrieved by fs.dump()
  * @param fileNames - array of file names to search for
  * @param extensionNames - array of extensions names to search for
+ * @param root - path to root folder
  * @returns - array of deleted and modified files filtered by query
  */
-function getMemFsChanges(changes, fileNames, extensionNames) {
+function getMemFsChanges(changes, fileNames, extensionNames, root) {
     const deleted = [];
     const modified = [];
-    const filteredChanges = Object.keys(changes).filter((f) => fileNames.includes((0, path_1.basename)(f)) || extensionNames.includes((0, path_1.extname)(f)));
+    const filteredChanges = Object.keys(changes).filter((f) => f.startsWith(root.replaceAll(path_1.sep, path_1.posix.sep)) &&
+        (fileNames.includes((0, path_1.basename)(f)) ||
+            extensionNames.includes((0, path_1.extname)(f)) ||
+            (fileNames.length === 0 && extensionNames.length === 0)));
     for (const file of filteredChanges) {
         if (changes[file].state === 'deleted') {
             deleted.push((0, path_1.join)(file));
@@ -34,8 +38,34 @@ function getMemFsChanges(changes, fileNames, extensionNames) {
     }
     return { deleted, modified };
 }
+/**
+ * Returns the search results and fatal errors.
+ * This is required to include potential memfs changes in the search results.
+ *
+ * @param results - array of file paths that were found during the search.
+ * @param fileNames - array of file names that were searched for
+ * @param extensionNames - array of file extensions that were searched for
+ * @param root - root directory where the search was performed
+ * @param errors - array of errors that occurred during the search
+ * @param [memFs] - optional memfs editor instance
+ * @returns - object containing the search results and any fatal errors
+ */
+function getFindResultOnEnd(results, fileNames, extensionNames, root, errors, memFs) {
+    let searchResult = results;
+    let fatalErrors = errors;
+    if (memFs) {
+        const { modified, deleted } = getMemFsChanges(memFs.dump(''), fileNames, extensionNames, root);
+        const merged = Array.from(new Set([...results, ...modified]));
+        searchResult = merged.filter((f) => !deleted.includes(f));
+        // Filter out errors that are of type ENOENT and path is part of memfs changes, which can happen for folders that contain memfs files only.
+        fatalErrors = errors.filter((e) => e.code !== 'ENOENT' ||
+            (typeof e.path === 'string' && !modified.some((f) => f.startsWith(e.path))));
+    }
+    return { searchResult, fatalErrors };
+}
 /**
  * Find function to search for files by names or file extensions.
+ * Empty name and extension option returns all files in the given folder.
  *
  * @param options - find options
  * @param [options.fileNames] - optional array of file names to search for
@@ -45,6 +75,7 @@ function getMemFsChanges(changes, fileNames, extensionNames) {
  * @param [options.memFs] - optional memfs editor instance
  * @param [options.noTraversal] - optional flag to disable root path traversal
  * @returns - array of paths that contain the file
+ * @throws Error[] - list of errors that occurred during the search
  */
 function findBy(options) {
     return new Promise((resolve, reject) => {
@@ -53,6 +84,7 @@ function findBy(options) {
         const extensionNames = Array.isArray(options.extensionNames) ? options.extensionNames : [];
         const excludeFolders = Array.isArray(options.excludeFolders) ? options.excludeFolders : [];
         const noTraversal = options.noTraversal ?? false;
+        const errors = [];
         const finder = (0, findit2_1.default)(options.root);
         finder.on('directory', (dir, _stat, stop) => {
             const base = (0, path_1.basename)(dir);
@@ -61,21 +93,24 @@ function findBy(options) {
             }
         });
         finder.on('file', (file) => {
-            if (extensionNames.includes((0, path_1.extname)(file)) || fileNames.includes((0, path_1.basename)(file))) {
+            if (extensionNames.includes((0, path_1.extname)(file)) ||
+                fileNames.includes((0, path_1.basename)(file)) ||
+                (fileNames.length === 0 && extensionNames.length === 0)) {
                 results.push(file);
             }
         });
         finder.on('end', () => {
-            let searchResult = results;
-            if (options.memFs) {
-                const { modified, deleted } = getMemFsChanges(options.memFs.dump(''), fileNames, extensionNames);
-                const merged = Array.from(new Set([...results, ...modified]));
-                searchResult = merged.filter((f) => !deleted.includes(f));
+            const { searchResult, fatalErrors } = getFindResultOnEnd(results, fileNames, extensionNames, options.root, errors, options.memFs);
+            if (fatalErrors.length === 0) {
+                resolve(searchResult);
+            }
+            else {
+                // eslint-disable-next-line prefer-promise-reject-errors
+                reject(fatalErrors);
             }
-            resolve(searchResult);
         });
         finder.on('error', (error) => {
-            reject(error);
+            errors.push(error);
         });
     });
 }

package/dist/project/cap.js

@@ -51,30 +51,12 @@ async function isCapJavaProject(projectRoot, capCustomPaths, memFs) {
  * @returns {Promise<boolean>} - Resolves to `true` if files are found in the `srv` folder; otherwise, `false`.
  */
 async function checkFilesInSrvFolder(srvFolderPath, memFs) {
-    if (!memFs) {
-        return await (0, file_1.fileExists)(srvFolderPath);
-    }
-    // Load the srv folder and its files into mem-fs
-    // This is necessary as mem-fs operates in-memory and doesn't automatically include files from disk.
-    // By loading the files, we ensure they are available within mem-fs.
-    if (await (0, file_1.fileExists)(srvFolderPath)) {
-        const fileSystemFiles = await (0, file_1.readDirectory)(srvFolderPath);
-        for (const file of fileSystemFiles) {
-            const filePath = (0, path_1.join)(srvFolderPath, file);
-            if (await (0, file_1.fileExists)(filePath)) {
-                const fileContent = await (0, file_1.readFile)(filePath);
-                memFs.write(filePath, fileContent);
-            }
-        }
+    try {
+        return (await (0, file_1.findBy)({ root: srvFolderPath, memFs })).length > 0;
+    }
+    catch (error) {
+        return false;
     }
-    // Dump the mem-fs state
-    const memFsDump = memFs.dump();
-    const memFsFiles = Object.keys(memFsDump).filter((filePath) => {
-        const normalisedFilePath = (0, path_1.resolve)(filePath);
-        const normalisedSrvPath = (0, path_1.resolve)(srvFolderPath);
-        return normalisedFilePath.startsWith(normalisedSrvPath);
-    });
-    return memFsFiles.length > 0;
 }
 /**
  * Returns the CAP project type, undefined if it is not a CAP project.

package/package.json

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