@sap-ux/fiori-elements-writer 0.5.2 → 0.5.3

package/dist/index.js

@@ -45,7 +45,7 @@ const semver_1 = __importDefault(require("semver"));
  * @returns Reference to a mem-fs-editor
  */
 function generate(basePath, data, fs) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     return __awaiter(this, void 0, void 0, function* () {
         // Clone rather than modifying callers refs
         const feApp = cloneDeep_1.default(data);
@@ -78,14 +78,18 @@ function generate(basePath, data, fs) {
         // Special handling for FPM because it is not based on template files but used the fpm writer
         if (feApp.template.type === types_1.TemplateType.FlexibleProgrammingModel) {
             const config = feApp.template.settings;
+            // Convert string version to float for FPM writer
+            const minUI5VerSemVer = semver_1.default.coerce((_d = feApp.ui5) === null || _d === void 0 ? void 0 : _d.minUI5Version);
+            const minUI5Version = parseFloat(`${minUI5VerSemVer.major}.${minUI5VerSemVer.minor}`);
             fe_fpm_writer_1.generateCustomPage(basePath, {
                 entity: config.entityConfig.mainEntityName,
-                name: config.pageName
+                name: config.pageName,
+                ui5Version: minUI5Version
             }, fs);
         }
         else {
             // Copy version specific common templates and version specific, floorplan specific templates
-            const templateVersionPath = path_1.join(rootTemplatesPath, `v${(_d = feApp.service) === null || _d === void 0 ? void 0 : _d.version}`);
+            const templateVersionPath = path_1.join(rootTemplatesPath, `v${(_e = feApp.service) === null || _e === void 0 ? void 0 : _e.version}`);
             [path_1.join(templateVersionPath, 'common', 'add'), path_1.join(templateVersionPath, feApp.template.type, 'add')].forEach((templatePath) => {
                 fs.copyTpl(path_1.join(templatePath, '**/*.*'), basePath, feApp, {}, { ignoreNoMatch: true });
             });
@@ -94,12 +98,12 @@ function generate(basePath, data, fs) {
         manifestSettings_1.extendManifestJson(fs, basePath, rootTemplatesPath, feApp);
         const packageJson = JSON.parse(fs.read(packagePath));
         packageJson.scripts = Object.assign(packageJson.scripts, Object.assign({}, packageConfig_1.getPackageJsonTasks({
-            localOnly: !((_e = feApp.service) === null || _e === void 0 ? void 0 : _e.url),
-            addMock: !!((_f = feApp.service) === null || _f === void 0 ? void 0 : _f.metadata),
-            sapClient: (_g = feApp.service) === null || _g === void 0 ? void 0 : _g.client,
+            localOnly: !((_f = feApp.service) === null || _f === void 0 ? void 0 : _f.url),
+            addMock: !!((_g = feApp.service) === null || _g === void 0 ? void 0 : _g.metadata),
+            sapClient: (_h = feApp.service) === null || _h === void 0 ? void 0 : _h.client,
             flpAppId: feApp.app.flpAppId,
-            startFile: (_h = data === null || data === void 0 ? void 0 : data.app) === null || _h === void 0 ? void 0 : _h.startFile,
-            localStartFile: (_j = data === null || data === void 0 ? void 0 : data.app) === null || _j === void 0 ? void 0 : _j.localStartFile
+            startFile: (_j = data === null || data === void 0 ? void 0 : data.app) === null || _j === void 0 ? void 0 : _j.startFile,
+            localStartFile: (_k = data === null || data === void 0 ? void 0 : data.app) === null || _k === void 0 ? void 0 : _k.localStartFile
         })));
         fs.writeJSON(packagePath, packageJson);
         return fs;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/fiori-elements-writer",
   "description": "SAP Fiori elements application writer",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -22,7 +22,7 @@
   "dependencies": {
     "@sap-ux/odata-service-writer": "0.14.6",
     "@sap-ux/ui5-application-writer": "0.15.1",
-    "@sap-ux/fe-fpm-writer": "0.14.2",
+    "@sap-ux/fe-fpm-writer": "0.14.3",
     "@sap-ux/ui5-config": "0.14.5",
     "ejs": "3.1.7",
     "i18next": "20.3.2",