@sap-ux/fe-fpm-writer 0.25.0 → 0.25.1

package/dist/app/index.js

@@ -5,10 +5,51 @@ const mem_fs_1 = require("mem-fs");
 const mem_fs_editor_1 = require("mem-fs-editor");
 const path_1 = require("path");
 const semver_1 = require("semver");
+const project_access_1 = require("@sap-ux/project-access");
 const defaults_1 = require("../common/defaults");
 const templates_1 = require("../templates");
 const utils_1 = require("../common/utils");
 exports.MIN_VERSION = '1.94.0';
+/**
+ * If a minUI5Version is set and it is smaller than the minimum required, increase it.
+ *
+ * @param {Manifest} manifest - content of the mnaifest.json
+ * @param {Editor} fs - the mem-fs editor instance
+ * @param {string} manifestPath - path to the manifest.json file
+ */
+function adaptMinUI5Version(manifest, fs, manifestPath) {
+    const minUI5VersionArray = (0, project_access_1.getMinUI5VersionAsArray)(manifest, true);
+    if (minUI5VersionArray?.length > 0) {
+        let update = false;
+        for (let index = 0; index < minUI5VersionArray.length; index++) {
+            const minUI5Version = minUI5VersionArray[index];
+            if (minUI5Version && (0, semver_1.valid)(minUI5Version) && (0, semver_1.lt)(minUI5Version, exports.MIN_VERSION)) {
+                minUI5VersionArray[index] = exports.MIN_VERSION;
+                update = true;
+            }
+        }
+        if (update) {
+            if (minUI5VersionArray.length === 1) {
+                fs.extendJSON(manifestPath, {
+                    'sap.ui5': {
+                        dependencies: {
+                            minUI5Version: minUI5VersionArray[0]
+                        }
+                    }
+                });
+            }
+            else if (minUI5VersionArray.length > 1) {
+                fs.extendJSON(manifestPath, {
+                    'sap.ui5': {
+                        dependencies: {
+                            minUI5Version: minUI5VersionArray
+                        }
+                    }
+                });
+            }
+        }
+    }
+}
 /**
  * Enable the flexible programming model for an application.
  *
@@ -39,19 +80,10 @@ function enableFPM(basePath, config = {}, fs) {
         });
     }
     // if a minUI5Version is set and it is smaller than the minimum required, increase it
-    const minUI5Version = manifest['sap.ui5']?.dependencies?.minUI5Version;
-    if (minUI5Version && (0, semver_1.valid)(minUI5Version) && (0, semver_1.lt)(minUI5Version, exports.MIN_VERSION)) {
-        fs.extendJSON(manifestPath, {
-            'sap.ui5': {
-                dependencies: {
-                    minUI5Version: exports.MIN_VERSION
-                }
-            }
-        });
-    }
+    adaptMinUI5Version(manifest, fs, manifestPath);
     // add type extensions if required
     if (config.typescript) {
-        (0, utils_1.addExtensionTypes)(basePath, manifest['sap.ui5']?.dependencies.minUI5Version, fs);
+        (0, utils_1.addExtensionTypes)(basePath, (0, project_access_1.getMinimumUI5Version)(manifest), fs);
     }
     // enable FCL if requested
     if (config.fcl) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/fe-fpm-writer",
   "description": "SAP Fiori elements flexible programming model writer",
-  "version": "0.25.0",
+  "version": "0.25.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -33,7 +33,7 @@
     "@types/mem-fs": "1.1.2",
     "@types/mem-fs-editor": "7.0.1",
     "@types/semver": "7.5.2",
-    "@sap-ux/project-access": "1.23.0"
+    "@sap-ux/project-access": "1.25.7"
   },
   "engines": {
     "node": ">=18.x"