@sap-ux/project-access 1.25.5 → 1.25.7

package/dist/project/cap.d.ts

@@ -116,7 +116,7 @@ export declare const toAbsoluteUri: (projectRoot: string, relativeUri: string) =
  */
 export declare const toReferenceUri: (projectRoot: string, relativeUriFrom: string, relativeUriTo: string) => Promise<string>;
 /**
- * Clear cache of path to global cds module.
+ * Clear cache of request to load global cds module.
  */
-export declare function clearGlobalCdsPathCache(): void;
+export declare function clearGlobalCdsModulePromiseCache(): void;
 //# sourceMappingURL=cap.d.ts.map

package/dist/project/cap.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearGlobalCdsPathCache = exports.toReferenceUri = exports.toAbsoluteUri = exports.clearCdsModuleCache = exports.getCapEnvironment = exports.readCapServiceMetadataEdmx = exports.getCdsServices = exports.getCdsRoots = exports.getCdsFiles = exports.getCapModelAndServices = exports.getCapCustomPaths = exports.isCapProject = exports.getCapProjectType = exports.isCapJavaProject = exports.isCapNodeJsProject = void 0;
+exports.clearGlobalCdsModulePromiseCache = exports.toReferenceUri = exports.toAbsoluteUri = exports.clearCdsModuleCache = exports.getCapEnvironment = exports.readCapServiceMetadataEdmx = exports.getCdsServices = exports.getCdsRoots = exports.getCdsFiles = exports.getCapModelAndServices = exports.getCapCustomPaths = exports.isCapProject = exports.getCapProjectType = exports.isCapJavaProject = exports.isCapNodeJsProject = void 0;
 const child_process_1 = require("child_process");
 const path_1 = require("path");
 const constants_1 = require("../constants");
@@ -493,29 +493,35 @@ async function readPackageNameForFolder(baseUri, relativeUri) {
     }
     return packageName;
 }
-let globalCdsPathCache;
+// Cache for request to load global cds. Cache the promise to avoid starting multiple identical requests in parallel.
+let globalCdsModulePromise;
 /**
  * Try to load global installation of @sap/cds, usually child of @sap/cds-dk.
  *
  * @returns - module @sap/cds from global installed @sap/cds-dk
  */
 async function loadGlobalCdsModule() {
-    if (!globalCdsPathCache) {
-        const versions = await getCdsVersionInfo();
-        if (!versions.home) {
-            throw Error('Can not find global installation of module @sap/cds, which should be part of @sap/cds-dk');
-        }
-        globalCdsPathCache = versions.home;
-    }
-    return (0, module_loader_1.loadModuleFromProject)(globalCdsPathCache, '@sap/cds');
+    globalCdsModulePromise =
+        globalCdsModulePromise ??
+            new Promise((resolve, reject) => {
+                return getCdsVersionInfo().then((versions) => {
+                    if (versions.home) {
+                        resolve((0, module_loader_1.loadModuleFromProject)(versions.home, '@sap/cds'));
+                    }
+                    else {
+                        reject(new Error('Can not find global installation of module @sap/cds, which should be part of @sap/cds-dk'));
+                    }
+                }, reject);
+            });
+    return globalCdsModulePromise;
 }
 /**
- * Clear cache of path to global cds module.
+ * Clear cache of request to load global cds module.
  */
-function clearGlobalCdsPathCache() {
-    globalCdsPathCache = '';
+function clearGlobalCdsModulePromiseCache() {
+    globalCdsModulePromise = undefined;
 }
-exports.clearGlobalCdsPathCache = clearGlobalCdsPathCache;
+exports.clearGlobalCdsModulePromiseCache = clearGlobalCdsModulePromiseCache;
 /**
  * Get cds information, which includes versions and also the home path of cds module.
  *

package/dist/project/info.d.ts

@@ -37,15 +37,16 @@ export declare function getProjectType(projectRoot: string): Promise<ProjectType
  */
 export declare function getMinUI5VersionFromManifest(manifest: Manifest): string | string[] | undefined;
 /**
- * Returns the minUI5Version as string[].
+ * Returns the valid minUI5Version(s) as string[].
  *
  * @param manifest - manifest object
+ * @param noValidation - disables the semver validation
  * @returns minUI5Version, as an array of strings
  */
-export declare function getMinUI5VersionAsArray(manifest: Manifest): string[];
+export declare function getMinUI5VersionAsArray(manifest: Manifest, noValidation?: boolean): string[];
 /**
- * Returns the minUI5Version in string format.
- * If it is defined as an arry, returns the minimum version from it.
+ * Returns the minUI5Version in string format (if valid).
+ * If it is defined as an array, returns the minimum valid version from it.
  *
  * @param manifest - manifest object
  * @returns the minimum version as string

package/dist/project/info.js

@@ -210,33 +210,39 @@ function getMinUI5VersionFromManifest(manifest) {
 }
 exports.getMinUI5VersionFromManifest = getMinUI5VersionFromManifest;
 /**
- * Returns the minUI5Version as string[].
+ * Returns the valid minUI5Version(s) as string[].
  *
  * @param manifest - manifest object
+ * @param noValidation - disables the semver validation
  * @returns minUI5Version, as an array of strings
  */
-function getMinUI5VersionAsArray(manifest) {
-    let result = [];
+function getMinUI5VersionAsArray(manifest, noValidation = false) {
+    const result = [];
     const minUI5Version = getMinUI5VersionFromManifest(manifest);
     if (minUI5Version) {
-        result = Array.isArray(minUI5Version) ? minUI5Version : [minUI5Version];
+        const minUI5VersionArray = Array.isArray(minUI5Version) ? minUI5Version : [minUI5Version];
+        minUI5VersionArray.forEach((version) => {
+            if (noValidation || (0, semver_1.valid)(version)) {
+                result.push(version);
+            }
+        });
     }
     return result;
 }
 exports.getMinUI5VersionAsArray = getMinUI5VersionAsArray;
 /**
- * Returns the minUI5Version in string format.
- * If it is defined as an arry, returns the minimum version from it.
+ * Returns the minUI5Version in string format (if valid).
+ * If it is defined as an array, returns the minimum valid version from it.
  *
  * @param manifest - manifest object
  * @returns the minimum version as string
  */
 function getMinimumUI5Version(manifest) {
     let result;
-    const minUI5VersionArray = getMinUI5VersionAsArray(manifest);
-    if (minUI5VersionArray.length > 0) {
-        minUI5VersionArray.forEach((version) => {
-            if ((0, semver_1.valid)(version) && (!result || (0, semver_1.gte)(result, version))) {
+    const validVersionsArray = getMinUI5VersionAsArray(manifest);
+    if (validVersionsArray.length > 0) {
+        validVersionsArray.forEach((version) => {
+            if (!result || (0, semver_1.gte)(result, version)) {
                 result = version;
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap-ux/project-access",
-  "version": "1.25.5",
+  "version": "1.25.7",
   "description": "Library to access SAP Fiori tools projects",
   "repository": {
     "type": "git",
@@ -36,7 +36,7 @@
     "@types/mem-fs": "1.1.2",
     "@types/mem-fs-editor": "7.0.1",
     "@types/semver": "7.5.2",
-    "@ui5/manifest": "1.61.0",
+    "@ui5/manifest": "1.66.0",
     "vscode-uri": "3.0.7",
     "@sap-ux/logger": "0.6.0"
   },