@sap-ux/preview-middleware 0.17.9 → 0.17.11

package/dist/base/flp.js

@@ -217,7 +217,7 @@ class FlpSandbox {
             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 = JSON.parse(JSON.stringify(req.query));
+                    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';

package/dist/client/cpe/changes/flex-change.js

@@ -25,7 +25,7 @@ sap.ui.define([
             const isBindingModel = isBindingString && modifiedControlModifiedProperties?.type === 'string';
             const changeType = isBindingString ? 'BindProperty' : 'Property';
             if (isBindingModel) {
-                validateBindingModel(modifiedControl, change.value);
+                await validateBindingModel(modifiedControl, change.value);
             }
             const property = isBindingString ? 'newBinding' : 'newValue';
             const modifiedValue = {

package/dist/client/cpe/changes/flex-change.ts

@@ -35,7 +35,7 @@ export async function applyChange(options: UI5AdaptationOptions, change: Propert
         const changeType = isBindingString ? 'BindProperty' : 'Property';
 
         if (isBindingModel) {
-            validateBindingModel(modifiedControl, change.value as string);
+            await validateBindingModel(modifiedControl, change.value as string);
         }
 
         const property = isBindingString ? 'newBinding' : 'newValue';

package/dist/client/cpe/changes/validator.js

@@ -1,30 +1,35 @@
 "use strict";
 
-sap.ui.define([], function () {
+sap.ui.define(["../../i18n"], function (____i18n) {
   "use strict";
 
+  const getTextBundle = ____i18n["getTextBundle"];
   /**
    * Function to validate if a given value is a valid binding model.
    *
    * @param modifiedControl control to be modified.
    * @param value value to be checked.
    */
-  function validateBindingModel(modifiedControl, value) {
+  async function validateBindingModel(modifiedControl, value) {
+    const textBundle = await getTextBundle();
     const bindingValue = value.replace(/[{}]/gi, '').trim();
     const bindingParts = bindingValue.split('>').filter(el => el !== '');
     if (!bindingParts.length) {
-      throw new SyntaxError('Invalid binding string.');
+      throw new SyntaxError(textBundle.getText('INVALID_BINDING_STRING'));
     }
-    if (bindingParts[0].trim() === 'i18n') {
-      if (bindingParts.length === 2) {
-        const resourceKey = bindingParts[1].trim();
-        const resourceBundle = modifiedControl.getModel('i18n').getResourceBundle();
-        if (!resourceBundle.getText(resourceKey, undefined, true)) {
-          throw new SyntaxError('Invalid key in the binding string. Supported value pattern is {i18n>YOUR_KEY}. Check if the key already exists in i18n.properties.' + 'If not, add the key in the i18n.properties file and reload the editor for the new key to take effect.');
-        }
-      } else {
-        throw new SyntaxError('Invalid binding string. Supported value pattern is {i18n>YOUR_KEY}');
+    if (bindingParts.length === 2) {
+      const bindingModel = bindingParts[0];
+      const resourceKey = bindingParts[1].trim();
+      const resourceModel = modifiedControl.getModel(bindingModel);
+      if (!resourceModel) {
+        throw new SyntaxError(textBundle.getText('INVALID_BINDING_MODEL'));
       }
+      const resourceBundle = resourceModel.getResourceBundle();
+      if (!resourceBundle.getText(resourceKey, undefined, true)) {
+        throw new SyntaxError(textBundle.getText('INVALID_BINDING_MODEL_KEY'));
+      }
+    } else {
+      throw new SyntaxError(textBundle.getText('INVALID_BINDING_STRING_FORMAT'));
     }
   }
   var __exports = {

package/dist/client/cpe/changes/validator.ts

@@ -1,6 +1,7 @@
 import ResourceBundle from 'sap/base/i18n/ResourceBundle';
 import ResourceModel from 'sap/ui/model/resource/ResourceModel';
 import type UI5Element from 'sap/ui/core/Element';
+import { getTextBundle } from '../../i18n';
 
 /**
  * Function to validate if a given value is a valid binding model.
@@ -8,26 +9,27 @@ import type UI5Element from 'sap/ui/core/Element';
  * @param modifiedControl control to be modified.
  * @param value value to be checked.
  */
-export function validateBindingModel(modifiedControl: UI5Element, value: string): void {
+export async function validateBindingModel(modifiedControl: UI5Element, value: string): Promise<void> {
+    const textBundle = await getTextBundle();
     const bindingValue = value.replace(/[{}]/gi, '').trim();
     const bindingParts = bindingValue.split('>').filter((el) => el !== '');
 
     if (!bindingParts.length) {
-        throw new SyntaxError('Invalid binding string.');
+        throw new SyntaxError(textBundle.getText('INVALID_BINDING_STRING'));
     }
 
-    if (bindingParts[0].trim() === 'i18n') {
-        if (bindingParts.length === 2) {
-            const resourceKey = bindingParts[1].trim();
-            const resourceBundle = (modifiedControl.getModel('i18n') as ResourceModel).getResourceBundle() as ResourceBundle;
-            if (!resourceBundle.getText(resourceKey, undefined, true)) {
-                throw new SyntaxError(
-                    'Invalid key in the binding string. Supported value pattern is {i18n>YOUR_KEY}. Check if the key already exists in i18n.properties.' +
-                        'If not, add the key in the i18n.properties file and reload the editor for the new key to take effect.'
-                );
-            }
-        } else {
-            throw new SyntaxError('Invalid binding string. Supported value pattern is {i18n>YOUR_KEY}');
+    if (bindingParts.length === 2) {
+        const bindingModel = bindingParts[0];
+        const resourceKey = bindingParts[1].trim();
+        const resourceModel = (modifiedControl.getModel(bindingModel) as ResourceModel);
+        if(!resourceModel) {
+            throw new SyntaxError(textBundle.getText('INVALID_BINDING_MODEL'));
         }
+        const resourceBundle = resourceModel.getResourceBundle() as ResourceBundle;
+        if (!resourceBundle.getText(resourceKey, undefined, true)) {
+            throw new SyntaxError(textBundle.getText('INVALID_BINDING_MODEL_KEY'));
+        }
+    } else {
+        throw new SyntaxError(textBundle.getText('INVALID_BINDING_STRING_FORMAT'));
     }
 }

package/dist/client/messagebundle.properties

@@ -56,3 +56,8 @@ EXTEND_WITH_ANNOTATION=Extend With Annotation
 ANNOTATION_FILE_HAS_BEEN_FOUND=An annotation file has been found.
 SHOW_FILE_IN_VSCODE=Show File in VSCode
 
+INVALID_BINDING_STRING=Invalid binding string.
+INVALID_BINDING_STRING_FORMAT=Invalid binding string. Supported value pattern is {i18n>YOUR_KEY}
+INVALID_BINDING_MODEL=Invalid binding model.
+INVALID_BINDING_MODEL_KEY=Invalid key in the binding string. Supported value pattern is {i18n>YOUR_KEY}. Check if the key already exists in i18n.properties.If not, add the key in the i18n.properties file and reload the editor for the new key to take effect.
+

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.9",
+  "version": "0.17.11",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -25,12 +25,12 @@
     "ejs": "3.1.10",
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
-    "@sap-ux/feature-toggle": "0.2.3",
     "@sap-ux/btp-utils": "0.18.0",
+    "@sap-ux/feature-toggle": "0.2.3",
     "@sap-ux/logger": "0.6.0",
-    "@sap-ux/adp-tooling": "0.12.119",
+    "@sap-ux/project-access": "1.29.3",
     "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@0.5.33",
-    "@sap-ux/project-access": "1.29.3"
+    "@sap-ux/adp-tooling": "0.12.119"
   },
   "devDependencies": {
     "@types/ejs": "3.1.2",
@@ -46,11 +46,11 @@
     "supertest": "6.3.3",
     "@sap-ux-private/playwright": "0.1.0",
     "dotenv": "16.3.1",
-    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.11.54",
-    "@sap-ux/store": "1.0.0",
-    "@sap-ux/i18n": "0.2.0",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.11.55",
     "@sap-ux/axios-extension": "1.18.3",
-    "@sap-ux/ui5-info": "0.8.3"
+    "@sap-ux/store": "1.0.0",
+    "@sap-ux/ui5-info": "0.8.3",
+    "@sap-ux/i18n": "0.2.0"
   },
   "peerDependencies": {
     "express": "4"