@sap-ux/preview-middleware 0.17.20 → 0.17.23

package/README.md

@@ -188,7 +188,7 @@ return flp.router
 
 
 ## [Migration](#migration)
-If you have no custom modifications in the local Fiori Launchpad sandbox files (`webapp/test/flpSandbox.html` or `webapp/test/flpSandboxMockserver.html`), the conversion is finished.
+If you have no custom modifications in the local Fiori Launchpad sandbox files (`<webapp>/test/flpSandbox.html` or `<webapp>/test/flpSandboxMockserver.html`), the conversion is finished.
 
 If you have custom modifications in the local Fiori Launchpad sandbox files, you need to migrate them into a custom .js or .ts file (depending on your setup) and integrate this file as a custom `init` script into the configuration options of the middleware.
 

package/dist/base/config.js

@@ -160,6 +160,11 @@ function getFlexSettings() {
  */
 async function addApp(templateConfig, manifest, app, logger) {
     const id = manifest['sap.app']?.id ?? '';
+    if (manifest['sap.app']?.type === 'component') {
+        logger.debug(`No application added for id '${id}' because its type is 'component'`);
+        templateConfig.apps = templateConfig.apps ?? {};
+        return;
+    }
     const appName = getAppName(manifest, app.intent);
     templateConfig.ui5.resources[id] = app.target;
     templateConfig.apps[appName] = {

package/dist/base/flp.d.ts

@@ -3,7 +3,7 @@ import type { Editor as MemFsEditor } from 'mem-fs-editor';
 import type { Router } from 'express';
 import type { Logger, ToolsLogger } from '@sap-ux/logger';
 import type { MiddlewareUtils } from '@ui5/server';
-import type { Manifest } from '@sap-ux/project-access';
+import { type Manifest } from '@sap-ux/project-access';
 import { AdpPreview, type AdpPreviewConfig, type CommonChangeProperties, type OperationType } from '@sap-ux/adp-tooling';
 import type { FlpConfig, MiddlewareConfig, RtaConfig, TestConfig } from '../types';
 import { type TemplateConfig } from './config';
@@ -29,6 +29,7 @@ export declare class FlpSandbox {
     readonly rta?: RtaConfig;
     readonly test?: TestConfig[];
     readonly router: EnhancedRouter;
+    private fs;
     /**
      * Constructor setting defaults and keeping reference to workspace resources.
      *
@@ -77,12 +78,41 @@ export declare class FlpSandbox {
      * @returns Promise that resolves when the application dependencies are set
      */
     private setApplicationDependencies;
+    /**
+     * Handler for the GET requests to the runtime adaptation editor in developer mode.
+     *
+     * @param res the response
+     * @param rta runtime adaptation configuration
+     * @param previewUrl the url of the preview
+     * @private
+     */
+    private editorGetHandlerDeveloperMode;
+    /**
+     * Handler for the GET requests to the runtime adaptation editor.
+     *
+     * @param req the request
+     * @param res the response
+     * @param rta runtime adaptation configuration
+     * @param previewUrl the url of the preview
+     * @param editor editor configuration
+     * @private
+     */
+    private editorGetHandler;
     /**
      * Add additional routes for configured editors.
      *
      * @param rta runtime authoring configuration
      */
     private addEditorRoutes;
+    /**
+     * Handler for the GET requests to the FLP.
+     *
+     * @param req the request
+     * @param res the response
+     * @param next the next function
+     * @private
+     */
+    private flpGetHandler;
     /**
      * Add routes for html and scripts required for a local FLP.
      */
@@ -120,10 +150,53 @@ export declare class FlpSandbox {
      * Add additional routes for apps also to be shown in the local FLP.
      */
     private addRoutesForAdditionalApps;
+    /**
+     * Handler for flex changes GET requests.
+     *
+     * @param res the response
+     * @private
+     */
+    private flexGetHandler;
+    /**
+     * Handler for flex changes POST requests.
+     *
+     * @param req the request
+     * @param res the response
+     * @private
+     */
+    private flexPostHandler;
+    /**
+     * Handler for flex changes DELETE requests.
+     *
+     * @param req the request
+     * @param res the response
+     * @private
+     */
+    private flexDeleteHandler;
     /**
      * Create required routes for flex.
      */
     private createFlexHandler;
+    /**
+     * Handler for the GET requests to the HTML of the test suite.
+     *
+     * @param res the response
+     * @param testsuite the test suite template
+     * @param config the test configuration
+     * @private
+     */
+    private testSuiteHtmlGetHandler;
+    /**
+     * Handler for the GET requests to the JS of the test suite.
+     *
+     * @param res the response
+     * @param next the next function
+     * @param config the test configuration
+     * @param initTemplate the test runner template
+     * @param testPaths the paths to the test files
+     * @private
+     */
+    private testSuiteJsGetHandler;
     /**
      * If it is part of TestConfig, create a test suite for the test configurations.
      *
@@ -142,6 +215,27 @@ export declare class FlpSandbox {
      * @private
      */
     private sendResponse;
+    /**
+     * Handler for the GET requests to the HTML of the test runner.
+     *
+     * @param res the response
+     * @param next the next function
+     * @param config test configuration
+     * @param htmlTemplate the test runner template
+     * @param id application id from manifest
+     */
+    private testRunnerHtmlGetHandler;
+    /**
+     * Handler for the GET requests to the JS of the test runner.
+     *
+     * @param res the response
+     * @param next the next function
+     * @param config test configuration
+     * @param initTemplate the test runner template
+     * @param ns namespace for the test files
+     * @private
+     */
+    private testRunnerJsGetHandler;
     /**
      * Add routes for html and scripts required for a local test FLP.
      *

package/dist/base/flp.js

@@ -4,10 +4,11 @@ exports.FlpSandbox = void 0;
 exports.initAdp = initAdp;
 const mem_fs_1 = require("mem-fs");
 const mem_fs_editor_1 = require("mem-fs-editor");
-const ejs_1 = require("ejs");
 const fs_1 = require("fs");
-const path_1 = require("path");
+const ejs_1 = require("ejs");
 const express_1 = require("express");
+const path_1 = require("path");
+const project_access_1 = require("@sap-ux/project-access");
 const adp_tooling_1 = require("@sap-ux/adp-tooling");
 const btp_utils_1 = require("@sap-ux/btp-utils");
 const feature_toggle_1 = require("@sap-ux/feature-toggle");
@@ -30,6 +31,7 @@ class FlpSandbox {
     rta;
     test;
     router;
+    fs;
     /**
      * Constructor setting defaults and keeping reference to workspace resources.
      *
@@ -173,6 +175,61 @@ class FlpSandbox {
             this.templateConfig.apps[appName].applicationDependencies = this.adp.descriptor;
         }
     }
+    /**
+     * Handler for the GET requests to the runtime adaptation editor in developer mode.
+     *
+     * @param res the response
+     * @param rta runtime adaptation configuration
+     * @param previewUrl the url of the preview
+     * @private
+     */
+    async editorGetHandlerDeveloperMode(res, rta, previewUrl) {
+        const scenario = rta.options?.scenario;
+        let templatePreviewUrl = `${previewUrl}?sap-ui-xx-viewCache=false&fiori-tools-rta-mode=forAdaptation&sap-ui-rta-skip-flex-validation=true&sap-ui-xx-condense-changes=true#${this.config.intent.object}-${this.config.intent.action}`;
+        if (scenario === 'ADAPTATION_PROJECT') {
+            templatePreviewUrl = templatePreviewUrl.replace('?', `?sap-ui-layer=${rta.layer}&`);
+        }
+        const template = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../../templates/flp/editor.html'), 'utf-8');
+        const features = feature_toggle_1.FeatureToggleAccess.getAllFeatureToggles();
+        const envPort = process.env.FIORI_TOOLS_LIVERELOAD_PORT;
+        let livereloadPort = envPort ? parseInt(envPort, 10) : DEFAULT_LIVERELOAD_PORT;
+        livereloadPort = isNaN(livereloadPort) ? DEFAULT_LIVERELOAD_PORT : livereloadPort;
+        const envLivereloadUrl = (0, btp_utils_1.isAppStudio)() ? await (0, btp_utils_1.exposePort)(livereloadPort) : undefined;
+        const html = (0, ejs_1.render)(template, {
+            previewUrl: templatePreviewUrl,
+            telemetry: rta.options?.telemetry ?? false,
+            appName: rta.options?.appName,
+            scenario,
+            livereloadPort,
+            livereloadUrl: envLivereloadUrl,
+            features: JSON.stringify(features)
+        });
+        this.sendResponse(res, 'text/html', 200, html);
+    }
+    /**
+     * Handler for the GET requests to the runtime adaptation editor.
+     *
+     * @param req the request
+     * @param res the response
+     * @param rta runtime adaptation configuration
+     * @param previewUrl the url of the preview
+     * @param editor editor configuration
+     * @private
+     */
+    async editorGetHandler(req, res, rta, previewUrl, editor) {
+        if (!req.query['fiori-tools-rta-mode']) {
+            // Redirect to the same URL but add the necessary parameter
+            const params = structuredClone(req.query);
+            params['sap-ui-xx-viewCache'] = 'false';
+            params['fiori-tools-rta-mode'] = 'true';
+            params['sap-ui-rta-skip-flex-validation'] = 'true';
+            params['sap-ui-xx-condense-changes'] = 'true';
+            res.redirect(302, `${previewUrl}?${new URLSearchParams(params)}`);
+            return;
+        }
+        const html = (await this.generateSandboxForEditor(req, rta, editor)).replace('</body>', `</body>\n<!-- livereload disabled for editor </body>-->`);
+        this.sendResponse(res, 'text/html', 200, html);
+    }
     /**
      * Add additional routes for configured editors.
      *
@@ -186,27 +243,7 @@ class FlpSandbox {
                 previewUrl = `${previewUrl}.inner.html`;
                 editor.pluginScript ??= 'open/ux/preview/client/cpe/init';
                 this.router.get(editor.path, async (_req, res) => {
-                    const scenario = rta.options?.scenario;
-                    let templatePreviewUrl = `${previewUrl}?sap-ui-xx-viewCache=false&fiori-tools-rta-mode=forAdaptation&sap-ui-rta-skip-flex-validation=true&sap-ui-xx-condense-changes=true#${this.config.intent.object}-${this.config.intent.action}`;
-                    if (scenario === 'ADAPTATION_PROJECT') {
-                        templatePreviewUrl = templatePreviewUrl.replace('?', `?sap-ui-layer=${rta.layer}&`);
-                    }
-                    const template = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../../templates/flp/editor.html'), 'utf-8');
-                    const features = feature_toggle_1.FeatureToggleAccess.getAllFeatureToggles();
-                    const envPort = process.env.FIORI_TOOLS_LIVERELOAD_PORT;
-                    let livereloadPort = envPort ? parseInt(envPort, 10) : DEFAULT_LIVERELOAD_PORT;
-                    livereloadPort = isNaN(livereloadPort) ? DEFAULT_LIVERELOAD_PORT : livereloadPort;
-                    const envLivereloadUrl = (0, btp_utils_1.isAppStudio)() ? await (0, btp_utils_1.exposePort)(livereloadPort) : undefined;
-                    const html = (0, ejs_1.render)(template, {
-                        previewUrl: templatePreviewUrl,
-                        telemetry: rta.options?.telemetry ?? false,
-                        appName: rta.options?.appName,
-                        scenario,
-                        livereloadPort,
-                        livereloadUrl: envLivereloadUrl,
-                        features: JSON.stringify(features)
-                    });
-                    this.sendResponse(res, 'text/html', 200, html);
+                    await this.editorGetHandlerDeveloperMode(res, rta, previewUrl);
                 });
                 let path = (0, path_1.dirname)(editor.path);
                 if (!path.endsWith('/')) {
@@ -215,21 +252,45 @@ class FlpSandbox {
                 this.router.use(`${path}editor`, (0, express_1.static)(cpe));
             }
             this.router.get(previewUrl, async (req, res) => {
-                if (!req.query['fiori-tools-rta-mode']) {
-                    // Redirect to the same URL but add the necessary parameter
-                    const params = structuredClone(req.query);
-                    params['sap-ui-xx-viewCache'] = 'false';
-                    params['fiori-tools-rta-mode'] = 'true';
-                    params['sap-ui-rta-skip-flex-validation'] = 'true';
-                    params['sap-ui-xx-condense-changes'] = 'true';
-                    res.redirect(302, `${previewUrl}?${new URLSearchParams(params)}`);
-                    return;
-                }
-                const html = (await this.generateSandboxForEditor(req, rta, editor)).replace('</body>', `</body>\n<!-- livereload disabled for editor </body>-->`);
-                this.sendResponse(res, 'text/html', 200, html);
+                await this.editorGetHandler(req, res, rta, previewUrl, editor);
             });
         }
     }
+    /**
+     * Handler for the GET requests to the FLP.
+     *
+     * @param req the request
+     * @param res the response
+     * @param next the next function
+     * @private
+     */
+    async flpGetHandler(req, res, next) {
+        // connect API (karma test runner) has no request query property
+        if ('query' in req && 'redirect' in res && !req.query['sap-ui-xx-viewCache']) {
+            // Redirect to the same URL but add the necessary parameter
+            const params = structuredClone(req.query);
+            params['sap-ui-xx-viewCache'] = 'false';
+            res.redirect(302, `${this.config.path}?${new URLSearchParams(params)}`);
+            return;
+        }
+        await this.setApplicationDependencies();
+        // inform the user if a html file exists on the filesystem
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        const file = await this.project.byPath(this.config.path);
+        if (file) {
+            this.logger.info(`HTML file returned at ${this.config.path} is loaded from the file system.`);
+            next();
+        }
+        else {
+            const ui5Version = await this.getUi5Version(
+            //use protocol from request header referer as fallback for connect API (karma test runner)
+            'protocol' in req
+                ? req.protocol
+                : req.headers.referer?.substring(0, req.headers.referer.indexOf(':')) ?? 'http', req.headers.host, 'ui5-patched-router' in req ? req['ui5-patched-router']?.baseUrl : undefined);
+            const html = (0, ejs_1.render)(this.getSandboxTemplate(ui5Version.major), this.templateConfig);
+            this.sendResponse(res, 'text/html', 200, html);
+        }
+    }
     /**
      * Add routes for html and scripts required for a local FLP.
      */
@@ -237,33 +298,9 @@ class FlpSandbox {
         // register static client sources
         this.router.use(config_1.PREVIEW_URL.client.path, (0, express_1.static)(config_1.PREVIEW_URL.client.local));
         // add route for the sandbox html
-        this.router.get(this.config.path, (async (req, res, next) => {
-            // connect API (karma test runner) has no request query property
-            if ('query' in req && 'redirect' in res && !req.query['sap-ui-xx-viewCache']) {
-                // Redirect to the same URL but add the necessary parameter
-                const params = structuredClone(req.query);
-                params['sap-ui-xx-viewCache'] = 'false';
-                res.redirect(302, `${this.config.path}?${new URLSearchParams(params)}`);
-                return;
-            }
-            await this.setApplicationDependencies();
-            // inform the user if a html file exists on the filesystem
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-            const file = await this.project.byPath(this.config.path);
-            if (file) {
-                this.logger.info(`HTML file returned at ${this.config.path} is loaded from the file system.`);
-                next();
-            }
-            else {
-                const ui5Version = await this.getUi5Version(
-                //use protocol from request header referer as fallback for connect API (karma test runner)
-                'protocol' in req
-                    ? req.protocol
-                    : req.headers.referer?.substring(0, req.headers.referer.indexOf(':')) ?? 'http', req.headers.host, 'ui5-patched-router' in req ? req['ui5-patched-router']?.baseUrl : undefined);
-                const html = (0, ejs_1.render)(this.getSandboxTemplate(ui5Version.major), this.templateConfig);
-                this.sendResponse(res, 'text/html', 200, html);
-            }
-        }));
+        this.router.get(this.config.path, async (req, res, next) => {
+            await this.flpGetHandler(req, res, next);
+        });
     }
     /**
      * Read the UI5 version.
@@ -338,8 +375,10 @@ class FlpSandbox {
         for (const app of this.config.apps) {
             let manifest;
             if (app.local) {
-                manifest = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(app.local, 'webapp/manifest.json'), 'utf-8'));
-                this.router.use(app.target, (0, express_1.static)((0, path_1.join)(app.local, 'webapp')));
+                this.fs = this.fs ?? (0, mem_fs_editor_1.create)((0, mem_fs_1.create)());
+                const webappPath = await (0, project_access_1.getWebappPath)(app.local, this.fs);
+                manifest = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(webappPath, 'manifest.json'), 'utf-8'));
+                this.router.use(app.target, (0, express_1.static)(webappPath));
                 this.logger.info(`Serving additional application at ${app.target} from ${app.local}`);
             }
             else if (app.componentId) {
@@ -360,53 +399,125 @@ class FlpSandbox {
         }
     }
     /**
-     * Create required routes for flex.
+     * Handler for flex changes GET requests.
+     *
+     * @param res the response
+     * @private
      */
-    createFlexHandler() {
-        const fs = (0, mem_fs_editor_1.create)((0, mem_fs_1.create)());
-        const api = `${config_1.PREVIEW_URL.api}/changes`;
-        this.router.use(api, (0, express_1.json)());
-        this.router.get(api, (async (_req, res) => {
-            const changes = await (0, flex_1.readChanges)(this.project, this.logger);
+    async flexGetHandler(res) {
+        const changes = await (0, flex_1.readChanges)(this.project, this.logger);
+        if (this.onChangeRequest) {
+            this.fs = this.fs ?? (0, mem_fs_editor_1.create)((0, mem_fs_1.create)());
+            for (const change of Object.values(changes)) {
+                await this.onChangeRequest('read', change, this.fs, this.logger);
+            }
+        }
+        this.sendResponse(res, 'application/json', 200, JSON.stringify(changes));
+    }
+    /**
+     * Handler for flex changes POST requests.
+     *
+     * @param req the request
+     * @param res the response
+     * @private
+     */
+    async flexPostHandler(req, res) {
+        this.fs = this.fs ?? (0, mem_fs_editor_1.create)((0, mem_fs_1.create)());
+        try {
+            const change = req.body;
             if (this.onChangeRequest) {
-                for (const change of Object.values(changes)) {
-                    await this.onChangeRequest('read', change, fs, this.logger);
-                }
+                await this.onChangeRequest('write', change, this.fs, this.logger);
             }
-            this.sendResponse(res, 'application/json', 200, JSON.stringify(changes));
-        }));
-        this.router.post(api, (async (req, res) => {
-            try {
-                const change = req.body;
-                if (this.onChangeRequest) {
-                    await this.onChangeRequest('write', change, fs, this.logger);
-                }
-                const { success, message } = (0, flex_1.writeChange)(change, this.utils.getProject().getSourcePath(), fs, this.logger);
-                if (success) {
-                    fs.commit(() => this.sendResponse(res, 'text/plain', 200, message ?? ''));
-                }
-                else {
-                    this.sendResponse(res, 'text/plain', 400, 'INVALID_DATA');
-                }
+            const { success, message } = (0, flex_1.writeChange)(change, this.utils.getProject().getSourcePath(), this.fs, this.logger);
+            if (success) {
+                this.fs.commit(() => this.sendResponse(res, 'text/plain', 200, message ?? ''));
             }
-            catch (error) {
-                this.sendResponse(res, 'text/plain', 500, error.message);
+            else {
+                this.sendResponse(res, 'text/plain', 400, 'INVALID_DATA');
             }
-        }));
-        this.router.delete(api, (async (req, res) => {
-            try {
-                const { success, message } = (0, flex_1.deleteChange)(req.body, this.utils.getProject().getSourcePath(), this.logger);
-                if (success) {
-                    this.sendResponse(res, 'text/plain', 200, message ?? '');
-                }
-                else {
-                    this.sendResponse(res, 'text/plain', 400, 'INVALID_DATA');
-                }
+        }
+        catch (error) {
+            this.sendResponse(res, 'text/plain', 500, error.message);
+        }
+    }
+    /**
+     * Handler for flex changes DELETE requests.
+     *
+     * @param req the request
+     * @param res the response
+     * @private
+     */
+    async flexDeleteHandler(req, res) {
+        try {
+            const { success, message } = (0, flex_1.deleteChange)(req.body, this.utils.getProject().getSourcePath(), this.logger);
+            if (success) {
+                this.sendResponse(res, 'text/plain', 200, message ?? '');
             }
-            catch (error) {
-                this.sendResponse(res, 'text/plain', 500, error.message);
+            else {
+                this.sendResponse(res, 'text/plain', 400, 'INVALID_DATA');
             }
-        }));
+        }
+        catch (error) {
+            this.sendResponse(res, 'text/plain', 500, error.message);
+        }
+    }
+    /**
+     * Create required routes for flex.
+     */
+    createFlexHandler() {
+        const api = `${config_1.PREVIEW_URL.api}/changes`;
+        this.router.use(api, (0, express_1.json)());
+        this.router.get(api, async (_req, res) => {
+            await this.flexGetHandler(res);
+        });
+        this.router.post(api, async (req, res) => {
+            await this.flexPostHandler(req, res);
+        });
+        this.router.delete(api, async (req, res) => {
+            await this.flexDeleteHandler(req, res);
+        });
+    }
+    /**
+     * Handler for the GET requests to the HTML of the test suite.
+     *
+     * @param res the response
+     * @param testsuite the test suite template
+     * @param config the test configuration
+     * @private
+     */
+    async testSuiteHtmlGetHandler(res, testsuite, config) {
+        this.logger.debug(`Serving test route: ${config.path}`);
+        const templateConfig = {
+            basePath: this.templateConfig.basePath,
+            initPath: config.init
+        };
+        const html = (0, ejs_1.render)(testsuite, templateConfig);
+        this.sendResponse(res, 'text/html', 200, html);
+    }
+    /**
+     * Handler for the GET requests to the JS of the test suite.
+     *
+     * @param res the response
+     * @param next the next function
+     * @param config the test configuration
+     * @param initTemplate the test runner template
+     * @param testPaths the paths to the test files
+     * @private
+     */
+    async testSuiteJsGetHandler(res, next, config, initTemplate, testPaths) {
+        const files = await this.project.byGlob(config.init.replace('.js', '.[jt]s'));
+        if (files?.length > 0) {
+            this.logger.warn(`Script returned at ${config.path} is loaded from the file system.`);
+            next();
+        }
+        else {
+            this.logger.debug(`Serving test route: ${config.init}`);
+            const templateConfig = {
+                testPaths: testPaths
+            };
+            const js = (0, ejs_1.render)(initTemplate, templateConfig);
+            this.sendResponse(res, 'application/javascript', 200, js);
+        }
     }
     /**
      * If it is part of TestConfig, create a test suite for the test configurations.
@@ -425,18 +536,11 @@ class FlpSandbox {
             return;
         }
         const testsuite = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../../templates/test/testsuite.qunit.html'), 'utf-8');
-        const initTemplate = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../../templates/test/testsuite.qunit.js'), 'utf-8');
         const config = (0, test_1.mergeTestConfigDefaults)(testsuiteConfig);
         this.logger.debug(`Add route for ${config.path}`);
-        this.router.get(config.path, (async (_req, res, _next) => {
-            this.logger.debug(`Serving test route: ${config.path}`);
-            const templateConfig = {
-                basePath: this.templateConfig.basePath,
-                initPath: config.init
-            };
-            const html = (0, ejs_1.render)(testsuite, templateConfig);
-            this.sendResponse(res, 'text/html', 200, html);
-        }));
+        this.router.get(config.path, async (_req, res) => {
+            await this.testSuiteHtmlGetHandler(res, testsuite, config);
+        });
         if (testsuiteConfig.init !== undefined) {
             this.logger.debug(`Skip serving testsuite init script in favor of provided script: ${testsuiteConfig.init}`);
             return;
@@ -449,22 +553,11 @@ class FlpSandbox {
             const mergedConfig = (0, test_1.mergeTestConfigDefaults)(testConfig);
             testPaths.push(path_1.posix.relative(path_1.posix.dirname(config.path), mergedConfig.path));
         }
+        const initTemplate = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../../templates/test/testsuite.qunit.js'), 'utf-8');
         this.logger.debug(`Add route for ${config.init}`);
-        this.router.get(config.init, (async (_req, res, next) => {
-            const files = await this.project.byGlob(config.init.replace('.js', '.[jt]s'));
-            if (files?.length > 0) {
-                this.logger.warn(`Script returned at ${config.path} is loaded from the file system.`);
-                next();
-            }
-            else {
-                this.logger.debug(`Serving test route: ${config.init}`);
-                const templateConfig = {
-                    testPaths: testPaths
-                };
-                const js = (0, ejs_1.render)(initTemplate, templateConfig);
-                this.sendResponse(res, 'application/javascript', 200, js);
-            }
-        }));
+        this.router.get(config.init, async (_req, res, next) => {
+            await this.testSuiteJsGetHandler(res, next, config, initTemplate, testPaths);
+        });
     }
     /**
      * Send a response with the given content type, status and body.
@@ -483,6 +576,53 @@ class FlpSandbox {
         res.write(body);
         res.end();
     }
+    /**
+     * Handler for the GET requests to the HTML of the test runner.
+     *
+     * @param res the response
+     * @param next the next function
+     * @param config test configuration
+     * @param htmlTemplate the test runner template
+     * @param id application id from manifest
+     */
+    async testRunnerHtmlGetHandler(res, next, config, htmlTemplate, id) {
+        this.logger.debug(`Serving test route: ${config.path}`);
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        const file = await this.project.byPath(config.path);
+        if (file) {
+            this.logger.warn(`HTML file returned at ${config.path} is loaded from the file system.`);
+            next();
+        }
+        else {
+            const templateConfig = (0, config_1.createTestTemplateConfig)(config, id, this.templateConfig.ui5.theme);
+            const html = (0, ejs_1.render)(htmlTemplate, templateConfig);
+            this.sendResponse(res, 'text/html', 200, html);
+        }
+    }
+    /**
+     * Handler for the GET requests to the JS of the test runner.
+     *
+     * @param res the response
+     * @param next the next function
+     * @param config test configuration
+     * @param initTemplate the test runner template
+     * @param ns namespace for the test files
+     * @private
+     */
+    async testRunnerJsGetHandler(res, next, config, initTemplate, ns) {
+        this.logger.debug(`Serving test init script: ${config.init}`);
+        const files = await this.project.byGlob(config.init.replace('.js', '.[jt]s'));
+        if (files?.length > 0) {
+            this.logger.warn(`Script returned at ${config.path} is loaded from the file system.`);
+            next();
+        }
+        else {
+            const testFiles = await this.project.byGlob(config.pattern);
+            const templateConfig = { tests: (0, test_1.generateImportList)(ns, testFiles) };
+            const js = (0, ejs_1.render)(initTemplate, templateConfig);
+            this.sendResponse(res, 'application/javascript', 200, js);
+        }
+    }
     /**
      * Add routes for html and scripts required for a local test FLP.
      *
@@ -492,45 +632,23 @@ class FlpSandbox {
     addTestRoutes(configs, id) {
         const ns = id.replace(/\./g, '/');
         const htmlTemplate = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../../templates/test/qunit.html'), 'utf-8');
-        const initTemplate = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../../templates/test/qunit.js'), 'utf-8');
         for (const testConfig of configs) {
             const config = (0, test_1.mergeTestConfigDefaults)(testConfig);
             this.logger.debug(`Add route for ${config.path}`);
             // add route for the *.qunit.html
-            this.router.get(config.path, (async (_req, res, next) => {
-                this.logger.debug(`Serving test route: ${config.path}`);
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-                const file = await this.project.byPath(config.path);
-                if (file) {
-                    this.logger.warn(`HTML file returned at ${config.path} is loaded from the file system.`);
-                    next();
-                }
-                else {
-                    const templateConfig = (0, config_1.createTestTemplateConfig)(config, id, this.templateConfig.ui5.theme);
-                    const html = (0, ejs_1.render)(htmlTemplate, templateConfig);
-                    this.sendResponse(res, 'text/html', 200, html);
-                }
-            }));
+            this.router.get(config.path, async (_req, res, next) => {
+                await this.testRunnerHtmlGetHandler(res, next, config, htmlTemplate, id);
+            });
             if (testConfig.init !== undefined) {
                 this.logger.debug(`Skip serving test init script in favor of provided script: ${testConfig.init}`);
                 continue;
             }
             // add route for the init file
+            const initTemplate = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../../templates/test/qunit.js'), 'utf-8');
             this.logger.debug(`Add route for ${config.init}`);
-            this.router.get(config.init, (async (_req, res, next) => {
-                this.logger.debug(`Serving test init script: ${config.init}`);
-                const files = await this.project.byGlob(config.init.replace('.js', '.[jt]s'));
-                if (files?.length > 0) {
-                    this.logger.warn(`Script returned at ${config.path} is loaded from the file system.`);
-                    next();
-                }
-                else {
-                    const testFiles = await this.project.byGlob(config.pattern);
-                    const templateConfig = { tests: (0, test_1.generateImportList)(ns, testFiles) };
-                    const js = (0, ejs_1.render)(initTemplate, templateConfig);
-                    this.sendResponse(res, 'application/javascript', 200, js);
-                }
-            }));
+            this.router.get(config.init, async (_req, res, next) => {
+                await this.testRunnerJsGetHandler(res, next, config, initTemplate, ns);
+            });
         }
     }
 }
@@ -539,7 +657,7 @@ exports.FlpSandbox = FlpSandbox;
  * Creates an attribute string that can be added to an HTML element.
  *
  * @param attributes map with attributes and their values
- * @param indent indentation thats inserted before each attribute
+ * @param indent indentation that's inserted before each attribute
  * @param prefix value that should be added at the start of to all attribute names
  * @returns attribute string
  */

package/package.json

@@ -9,7 +9,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Apreview-middleware"
   },
-  "version": "0.17.20",
+  "version": "0.17.23",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -26,11 +26,11 @@
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
     "@sap-ux/logger": "0.6.0",
-    "@sap-ux/feature-toggle": "0.2.3",
     "@sap-ux/btp-utils": "1.0.1",
-    "@sap-ux/adp-tooling": "0.12.124",
+    "@sap-ux/adp-tooling": "0.12.125",
+    "@sap-ux/feature-toggle": "0.2.3",
     "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.5.35",
-    "@sap-ux/project-access": "1.29.4"
+    "@sap-ux/project-access": "1.29.5"
   },
   "devDependencies": {
     "connect": "^3.7.0",
@@ -52,7 +52,7 @@
     "@sap-ux/axios-extension": "1.18.5",
     "@sap-ux/store": "1.0.0",
     "@sap-ux/ui5-info": "0.8.3",
-    "@sap-ux/i18n": "0.2.0"
+    "@sap-ux/i18n": "0.2.1"
   },
   "peerDependencies": {
     "express": "4"