@sap-ux/fiori-elements-writer 2.4.0 → 2.4.2

package/dist/index.js

@@ -68,6 +68,33 @@ function getTypeScriptIgnoreGlob(feApp, coercedUI5Version) {
     }
     return ignore;
 }
+/**
+ * Returns the OPA config.
+ *
+ * @param appOpts - relevant app options for retrieving the opa config
+ * @param appOpts.generateIndex - if an index.html file will be generated
+ * @param appOpts.useVirtualPreviewEndpoints - if virtual endpoints will be used for preview
+ * @param flpAppId - the flp app id
+ * @returns - the opa config { htmlTarget }
+ */
+function getOpaConfig({ generateIndex, useVirtualPreviewEndpoints }, flpAppId) {
+    const flpTarget = useVirtualPreviewEndpoints ? 'flp' : 'flpSandbox';
+    const htmlTarget = generateIndex ? 'index.html' : `test/${flpTarget}.html?sap-ui-xx-viewCache=false#${flpAppId}`;
+    return {
+        htmlTarget
+    };
+}
+/**
+ * Determines if tests should be added.
+ * For now, only if v4 and we have metadata (and therefore a mock server config) or has a cds service.
+ *
+ * @param service - the service data
+ * @param addTests - app option to add tests
+ * @returns - boolean indicating if tests are to be added
+ */
+function shouldAddTest(service, addTests) {
+    return (!!addTests && service?.version === odata_service_writer_1.OdataVersion.v4 && (!!service?.metadata || service?.type === odata_service_writer_1.ServiceType.CDS));
+}
 /**
  * Generate a UI5 application based on the specified Fiori Elements floorplan template.
  *
@@ -150,10 +177,7 @@ async function generate(basePath, data, fs, log) {
     // Update manifest.json with template specific settings
     (0, manifestSettings_1.extendManifestJson)(fs, basePath, rootTemplatesPath, feApp);
     const packageJson = JSON.parse(fs.read(packagePath));
-    // Add tests only if v4, for now, and we have metadata (and therefore a mock server config) or has a cds service
-    const addTest = !!feApp.appOptions.addTests &&
-        feApp.service?.version === odata_service_writer_1.OdataVersion.v4 &&
-        (!!feApp.service?.metadata || feApp.service.type === odata_service_writer_1.ServiceType.CDS);
+    const addTest = shouldAddTest(feApp.service, feApp.appOptions?.addTests);
     if (isEdmxProjectType) {
         // Add scripts to package.json only for non-CAP projects
         packageJson.scripts = Object.assign(packageJson.scripts ?? {}, {
@@ -177,11 +201,11 @@ async function generate(basePath, data, fs, log) {
     }
     fs.writeJSON(packagePath, packageJson);
     if (addTest) {
-        (0, ui5_test_writer_1.generateOPAFiles)(basePath, {
-            htmlTarget: feApp.appOptions?.generateIndex
-                ? 'index.html'
-                : `test/flpSandbox.html?sap-ui-xx-viewCache=false#${feApp.app.flpAppId}`
-        }, fs);
+        const opaConfig = getOpaConfig({
+            generateIndex: feApp.appOptions?.generateIndex,
+            useVirtualPreviewEndpoints: feApp.appOptions?.useVirtualPreviewEndpoints
+        }, feApp.app.flpAppId);
+        (0, ui5_test_writer_1.generateOPAFiles)(basePath, opaConfig, fs);
     }
     if (feApp.service.capService) {
         const enableCdsUi5Plugin = !!feApp?.appOptions?.typescript || !!feApp?.service.capService?.cdsUi5PluginInfo?.isCdsUi5PluginEnabled;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/fiori-elements-writer",
   "description": "SAP Fiori elements application writer",
-  "version": "2.4.0",
+  "version": "2.4.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -27,14 +27,14 @@
     "mem-fs-editor": "9.4.0",
     "read-pkg-up": "7.0.1",
     "semver": "7.5.4",
-    "@sap-ux/odata-service-writer": "0.27.0",
-    "@sap-ux/ui5-application-writer": "1.5.0",
-    "@sap-ux/fe-fpm-writer": "0.34.0",
-    "@sap-ux/ui5-config": "0.28.0",
-    "@sap-ux/ui5-test-writer": "0.7.0",
-    "@sap-ux/fiori-generator-shared": "0.12.0",
-    "@sap-ux/cap-config-writer": "0.10.0",
-    "@sap-ux/annotation-generator": "0.3.32",
+    "@sap-ux/ui5-application-writer": "1.5.1",
+    "@sap-ux/ui5-config": "0.28.1",
+    "@sap-ux/ui5-test-writer": "0.7.1",
+    "@sap-ux/fe-fpm-writer": "0.34.1",
+    "@sap-ux/odata-service-writer": "0.27.1",
+    "@sap-ux/fiori-generator-shared": "0.12.1",
+    "@sap-ux/cap-config-writer": "0.10.1",
+    "@sap-ux/annotation-generator": "0.3.33",
     "@sap-ux/logger": "0.7.0"
   },
   "devDependencies": {