@sap-ux/fiori-elements-writer 0.6.1 → 0.6.2

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, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     return __awaiter(this, void 0, void 0, function* () {
         // Clone rather than modifying callers refs
         const feApp = cloneDeep_1.default(data);
@@ -66,7 +66,7 @@ function generate(basePath, data, fs) {
         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';
+        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 }), undefined, {
             globOptions: { ignore }
@@ -81,26 +81,27 @@ function generate(basePath, data, fs) {
             fe_fpm_writer_1.generateCustomPage(basePath, {
                 entity: config.entityConfig.mainEntityName,
                 name: config.pageName,
-                minUI5Version: (_d = feApp.ui5) === null || _d === void 0 ? void 0 : _d.minUI5Version
+                minUI5Version: (_d = feApp.ui5) === null || _d === void 0 ? void 0 : _d.minUI5Version,
+                typescript: (_e = feApp.appOptions) === null || _e === void 0 ? void 0 : _e.typescript
             }, fs);
         }
         else {
             // Copy version specific common templates and version specific, floorplan specific templates
-            const templateVersionPath = path_1.join(rootTemplatesPath, `v${(_e = feApp.service) === null || _e === void 0 ? void 0 : _e.version}`);
+            const templateVersionPath = path_1.join(rootTemplatesPath, `v${(_f = feApp.service) === null || _f === void 0 ? void 0 : _f.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 });
+                fs.copyTpl(path_1.join(templatePath, '**/*.*'), basePath, feApp, {}, { ignoreNoMatch: true, globOptions: { ignore } });
             });
         }
         // 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: !((_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,
+            localOnly: !((_g = feApp.service) === null || _g === void 0 ? void 0 : _g.url),
+            addMock: !!((_h = feApp.service) === null || _h === void 0 ? void 0 : _h.metadata),
+            sapClient: (_j = feApp.service) === null || _j === void 0 ? void 0 : _j.client,
             flpAppId: feApp.app.flpAppId,
-            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
+            startFile: (_k = data === null || data === void 0 ? void 0 : data.app) === null || _k === void 0 ? void 0 : _k.startFile,
+            localStartFile: (_l = data === null || data === void 0 ? void 0 : data.app) === null || _l === void 0 ? void 0 : _l.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.6.1",
+  "version": "0.6.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -21,7 +21,7 @@
   ],
   "dependencies": {
     "@sap-ux/odata-service-writer": "0.14.6",
-    "@sap-ux/ui5-application-writer": "0.16.0",
+    "@sap-ux/ui5-application-writer": "0.16.1",
     "@sap-ux/fe-fpm-writer": "0.17.0",
     "@sap-ux/ui5-config": "0.14.5",
     "ejs": "3.1.7",

package/templates/common/add/webapp/test/flpSandbox.html

@@ -67,9 +67,14 @@
         data-sap-ui-resourceroots='{"<%- app.id  %>": "../"}'
         data-sap-ui-frameOptions="allow"<% if (templateOptions.changesLoader) {%>
         data-sap-ui-flexibilityServices='[{"applyConnector":"<%= app.id.replace(/\./g, "/") %>/test/changes_loader", "custom":true}]'<% } %>>
-        </script><% if (appOptions.loadReuseLibs) { %>
-        <script id="locate-reuse-libs" src="../utils/locate-reuse-libs.js" data-sap-ui-manifest-uri="../manifest.json">
-        </script><% } %><% if (templateOptions.changesPreview) { %>
+    </script><% if (appOptions.loadReuseLibs) { %>
+    <script id="locate-reuse-libs" src="../utils/locate-reuse-libs.js" data-sap-ui-manifest-uri="../manifest.json">
+    </script><% } else { %>
+    <script>
+        sap.ui.getCore().attachInit(function () {
+            sap.ushell.Container.createRenderer().placeAt("content");
+        });
+    </script><% } %><% if (templateOptions.changesPreview) { %>
     <!-- relevant for version < 1.78.0 only -->
 	<script src="changes_preview.js"></script><% } %>
 </head>

package/templates/v4/feop/add/webapp/Component.ts

@@ -0,0 +1,22 @@
+import AppComponent from '<%- app.baseComponent %>';
+
+/**
+ * @namespace <%- app.id %>
+ */
+export default class Component extends AppComponent {
+
+	public static metadata = {
+		manifest: "json"
+	};
+
+	/**
+	 * Gets the component startup parameters, setting preferredMode to 'create'.
+	 *
+	 * @returns startup parameters containing preferredMode set to 'create'
+	 */
+	public getStartupParameters(): Promise<object> {
+		return Promise.resolve({
+			preferredMode: ["create"]
+		});
+	}
+}