@sap-ux/preview-middleware 0.25.7 → 0.25.9

package/dist/base/flp.d.ts

@@ -308,6 +308,19 @@ export declare class FlpSandbox {
      * @returns {Promise<void>} A promise that resolves when the operation is complete.
      */
     private storeI18nKeysHandler;
+    /**
+     * Parses i18n configuration from manifest and returns path and locale settings.
+     *
+     * @returns i18n path, supported locales, and fallback locale
+     */
+    private parseI18nConfig;
+    /**
+     * Extracts i18n path from object configuration (bundleName or bundleUrl).
+     *
+     * @param i18nConfig - The i18n configuration object
+     * @returns The resolved i18n path
+     */
+    private getI18nPathFromConfig;
     /**
      * Adds a route to store i18n properties in the i18n file.
      * This function updates the i18n file with new properties provided in the request body.

package/dist/base/flp.js

@@ -833,30 +833,20 @@ class FlpSandbox {
      */
     async storeI18nKeysHandler(req, res) {
         try {
-            // getSourcePath() returns the webapp path directly for all project types
             const webappPath = this.utils.getProject().getSourcePath();
-            const i18nConfig = this.manifest['sap.app'].i18n;
-            let i18nPath = 'i18n/i18n.properties';
-            let fallbackLocale;
-            let supportedLocales = [];
-            if (typeof i18nConfig === 'string') {
-                i18nPath = i18nConfig;
+            const { i18nPath, supportedLocales, fallbackLocale } = this.parseI18nConfig();
+            let requestedLocale = req.query.locale ?? fallbackLocale ?? '';
+            if (!requestedLocale && supportedLocales.length > 0) {
+                requestedLocale = supportedLocales[0];
             }
-            else if (typeof i18nConfig === 'object' && i18nConfig !== null && 'bundleUrl' in i18nConfig) {
-                const { bundleUrl: i18nPathFromConfig, supportedLocales: locales = [], fallbackLocale: fallback } = i18nConfig;
-                i18nPath = i18nPathFromConfig;
-                supportedLocales = locales;
-                fallbackLocale = fallback;
+            if (requestedLocale && supportedLocales.length > 0 && !supportedLocales.includes(requestedLocale)) {
+                this.sendResponse(res, 'text/plain', 400, `Locale "${requestedLocale}" is not supported. Supported: ${supportedLocales.join(', ')}`);
+                return;
             }
-            const requestedLocale = req.query.locale ?? fallbackLocale ?? '';
             const baseFilePath = (0, node_path_1.join)(webappPath, i18nPath);
             const filePath = requestedLocale
                 ? baseFilePath.replace('.properties', `_${requestedLocale}.properties`)
                 : baseFilePath;
-            if (requestedLocale && supportedLocales.length > 0 && !supportedLocales.includes(requestedLocale)) {
-                this.sendResponse(res, 'text/plain', 400, `Locale "${requestedLocale}" is not supported. Supported: ${supportedLocales.join(', ')}`);
-                return;
-            }
             const entries = (req.body || []).map((entry) => ({
                 ...entry,
                 annotation: entry.comment ?? entry.annotation
@@ -869,6 +859,48 @@ class FlpSandbox {
             this.sendResponse(res, 'text/plain', 500, 'File could not be updated.');
         }
     }
+    /**
+     * Parses i18n configuration from manifest and returns path and locale settings.
+     *
+     * @returns i18n path, supported locales, and fallback locale
+     */
+    parseI18nConfig() {
+        const i18nConfig = this.manifest['sap.app'].i18n;
+        let i18nPath = 'i18n/i18n.properties';
+        let fallbackLocale;
+        let supportedLocales = [];
+        if (typeof i18nConfig === 'string') {
+            i18nPath = i18nConfig;
+        }
+        else if (typeof i18nConfig === 'object' && i18nConfig !== null) {
+            i18nPath = this.getI18nPathFromConfig(i18nConfig);
+            supportedLocales = i18nConfig.supportedLocales ?? [];
+            fallbackLocale = i18nConfig.fallbackLocale;
+        }
+        return { i18nPath, supportedLocales, fallbackLocale };
+    }
+    /**
+     * Extracts i18n path from object configuration (bundleName or bundleUrl).
+     *
+     * @param i18nConfig - The i18n configuration object
+     * @returns The resolved i18n path
+     */
+    getI18nPathFromConfig(i18nConfig) {
+        if ('bundleName' in i18nConfig && i18nConfig.bundleName) {
+            const appId = this.manifest['sap.app'].id;
+            const bundlePath = i18nConfig.bundleName.startsWith(`${appId}.`)
+                ? i18nConfig.bundleName.substring(appId.length + 1)
+                : i18nConfig.bundleName;
+            if ('bundleUrl' in i18nConfig && i18nConfig.bundleUrl) {
+                this.logger.info(`Both bundleName and bundleUrl are provided in i18n config. Using bundleName: ${i18nConfig.bundleName}`);
+            }
+            return `${bundlePath.replaceAll('.', '/')}.properties`;
+        }
+        if ('bundleUrl' in i18nConfig && i18nConfig.bundleUrl) {
+            return i18nConfig.bundleUrl;
+        }
+        return 'i18n/i18n.properties';
+    }
     /**
      * Adds a route to store i18n properties in the i18n file.
      * This function updates the i18n file with new properties provided in the request body.

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.25.7",
+  "version": "0.25.9",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -27,7 +27,7 @@
     "mem-fs-editor": "9.4.0",
     "qrcode": "1.5.4",
     "@sap/bas-sdk": "3.13.3",
-    "@sap-ux/adp-tooling": "0.18.105",
+    "@sap-ux/adp-tooling": "0.18.106",
     "@sap-ux/btp-utils": "1.1.12",
     "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.7.22",
     "@sap-ux/feature-toggle": "0.3.7",