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

package/dist/data/defaults.js

@@ -51,7 +51,7 @@ exports.setDefaultTemplateSettings = setDefaultTemplateSettings;
  * @returns Fiori elements app config with updated defaults for unspecified properties
  */
 function setAppDefaults(feApp) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     // Add template information
     if (!((_a = feApp.app.sourceTemplate) === null || _a === void 0 ? void 0 : _a.version) || !((_b = feApp.app.sourceTemplate) === null || _b === void 0 ? void 0 : _b.id)) {
         const packageInfo = read_pkg_up_1.default.sync({ cwd: __dirname });
@@ -78,6 +78,11 @@ function setAppDefaults(feApp) {
     if (!feApp.ui5.minUI5Version) {
         feApp.ui5.minUI5Version = (_h = feApp.ui5.version) !== null && _h !== void 0 ? _h : templateAttributes_1.TemplateTypeAttributes[feApp.template.type].minimumUi5Version[feApp.service.version];
     }
+    // if not explictely disabled, enable the SAP Fiori tools
+    feApp.appOptions = (_j = feApp.appOptions) !== null && _j !== void 0 ? _j : {};
+    if (feApp.appOptions.sapux !== false) {
+        feApp.appOptions.sapux = true;
+    }
     return feApp;
 }
 exports.setAppDefaults = setAppDefaults;

package/dist/data/templateAttributes.js

@@ -62,6 +62,10 @@ const templateLibs = {
         [types_1.TemplateType.OverviewPage]: {
             baseComponent: appComponentLibOVP,
             ui5Libs: [...commonUi5Libs[types_1.OdataVersion.v4], 'sap.ovp', 'sap.ui.rta', 'sap.ui.layout']
+        },
+        [types_1.TemplateType.FlexibleProgrammingModel]: {
+            baseComponent: appComponentLibFioriElements,
+            ui5Libs: [...commonUi5Libs[types_1.OdataVersion.v4], 'sap.fe.templates']
         }
     }
 };
@@ -123,6 +127,12 @@ exports.TemplateTypeAttributes = {
         minimumUi5Version: {
             [types_1.OdataVersion.v4]: '1.90.0'
         }
+    },
+    [types_1.TemplateType.FlexibleProgrammingModel]: {
+        supportedODataVersions: [types_1.OdataVersion.v4],
+        minimumUi5Version: {
+            [types_1.OdataVersion.v4]: '1.94.0'
+        }
     }
 };
 //# sourceMappingURL=templateAttributes.js.map

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import type { Editor } from 'mem-fs-editor';
 import type { App } from '@sap-ux/ui5-application-writer';
-import { FioriElementsApp } from './types';
+import type { FioriElementsApp } from './types';
 /**
  * Generate a UI5 application based on the specified Fiori Elements floorplan template.
  *

package/dist/index.js

@@ -25,10 +25,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = void 0;
 const path_1 = require("path");
 const ejs_1 = require("ejs");
+const fe_fpm_writer_1 = require("@sap-ux/fe-fpm-writer");
 const ui5_application_writer_1 = require("@sap-ux/ui5-application-writer");
 const odata_service_writer_1 = require("@sap-ux/odata-service-writer");
 const packageConfig_1 = require("./packageConfig");
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
+const types_1 = require("./types");
 const validate_1 = require("./validate");
 const defaults_1 = require("./data/defaults");
 const templateAttributes_1 = require("./data/templateAttributes");
@@ -43,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;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     return __awaiter(this, void 0, void 0, function* () {
         // Clone rather than modifying callers refs
         const feApp = cloneDeep_1.default(data);
@@ -63,27 +65,41 @@ function generate(basePath, data, fs) {
         // Add new files from templates e.g.
         const rootTemplatesPath = path_1.join(__dirname, '..', 'templates');
         // Add templates common to all template types
+        // Common files
+        const ignore = ((_c = feApp.appOptions) === null || _c === void 0 ? void 0 : _c.typescript) ? '**/*.js' : '**/*.ts';
         fs.copyTpl(path_1.join(rootTemplatesPath, 'common', 'add', '**/*.*'), basePath, Object.assign(Object.assign({}, feApp), { templateOptions,
-            escapeFLPText: templateAttributes_1.escapeFLPText }));
+            escapeFLPText: templateAttributes_1.escapeFLPText }), undefined, {
+            globOptions: { ignore }
+        });
         // Extend common files
         const packagePath = path_1.join(basePath, 'package.json');
         // Extend package.json
         fs.extendJSON(packagePath, JSON.parse(ejs_1.render(fs.read(path_1.join(rootTemplatesPath, 'common', 'extend', 'package.json')), feApp, {})));
-        const templateVersionPath = path_1.join(rootTemplatesPath, `v${(_c = feApp.service) === null || _c === void 0 ? void 0 : _c.version}`);
-        // Copy version specific common templates and version specific, floorplan specific templates
-        [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 });
-        });
+        // 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;
+            fe_fpm_writer_1.generateCustomPage(basePath, {
+                entity: config.entityConfig.mainEntityName,
+                name: config.pageName
+            }, 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}`);
+            [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 });
+            });
+        }
         // Update manifest.json with template specific settings
         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: !((_d = feApp.service) === null || _d === void 0 ? void 0 : _d.url),
-            addMock: !!((_e = feApp.service) === null || _e === void 0 ? void 0 : _e.metadata),
-            sapClient: (_f = feApp.service) === null || _f === void 0 ? void 0 : _f.client,
+            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,
             flpAppId: feApp.app.flpAppId,
-            startFile: (_g = data === null || data === void 0 ? void 0 : data.app) === null || _g === void 0 ? void 0 : _g.startFile,
-            localStartFile: (_h = data === null || data === void 0 ? void 0 : data.app) === null || _h === void 0 ? void 0 : _h.localStartFile
+            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
         })));
         fs.writeJSON(packagePath, packageJson);
         return fs;

package/dist/types.d.ts

@@ -5,7 +5,8 @@ export declare enum TemplateType {
     ListReportObjectPage = "lrop",
     AnalyticalListPage = "alp",
     OverviewPage = "ovp",
-    FormEntryObjectPage = "feop"
+    FormEntryObjectPage = "feop",
+    FlexibleProgrammingModel = "fpm"
 }
 /**
  * General validation error thrown if app config options contain invalid combinations
@@ -39,6 +40,10 @@ export declare enum TableSelectionMode {
 export interface LROPSettings {
     entityConfig: EntityConfig;
 }
+export interface FPMSettings {
+    entityConfig: EntityConfig;
+    pageName: string;
+}
 export interface WorklistSettings {
     entityConfig: EntityConfig;
 }

package/dist/types.js

@@ -8,6 +8,7 @@ var TemplateType;
     TemplateType["AnalyticalListPage"] = "alp";
     TemplateType["OverviewPage"] = "ovp";
     TemplateType["FormEntryObjectPage"] = "feop";
+    TemplateType["FlexibleProgrammingModel"] = "fpm";
 })(TemplateType = exports.TemplateType || (exports.TemplateType = {}));
 /**
  * General validation error thrown if app config options contain invalid combinations

package/package.json

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

package/templates/common/add/webapp/Component.ts

@@ -0,0 +1,20 @@
+import BaseComponent from '<%- app.baseComponent %>';
+
+/**
+ * @namespace <%- app.id %>
+ */
+export default class Component extends BaseComponent {
+
+	public static metadata = {
+		manifest: "json"
+	};
+
+    /**
+     * The component is initialized by UI5 automatically during the startup of the app and calls the init method once.
+     * @public
+     * @override
+     */
+	//public init() : void {
+    //    super.init();
+	//}
+}