@sap-ux/preview-middleware 1.0.24 → 1.0.26

package/dist/base/flp.js

@@ -341,7 +341,6 @@ export class FlpSandbox {
         await this.setApplicationDependencies();
         // get filepath from request. Use dummy url to extract it from originalUrl if needed
         const filePath = 'query' in req ? req.path : new URL('http://dummyHost' + req.originalUrl).pathname; //NOSONAR
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         const file = await this.project.byPath(filePath);
         if (file) {
             this.logger.info(`HTML file returned at ${filePath} is loaded from the file system.`);
@@ -734,7 +733,6 @@ export class FlpSandbox {
      */
     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.`);

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

@@ -1,8 +1,25 @@
 "use strict";
 
-sap.ui.define(["sap/ui/rta/command/CommandFactory", "open/ux/preview/client/thirdparty/@sap-ux-private/control-property-editor-common", "./validator", "../../utils/fe-v4"], function (CommandFactory, ___sap_ux_private_control_property_editor_common, ___validatorjs, ____utils_fe_v4js) {
+sap.ui.define(["open/ux/preview/client/thirdparty/@sap-ux-private/control-property-editor-common", "./validator", "../../utils/fe-v4"], function (___sap_ux_private_control_property_editor_common, ___validatorjs, ____utils_fe_v4js) {
   "use strict";
 
+  function __ui5_require_async(path) {
+    return new Promise(function (resolve, reject) {
+      sap.ui.require([path], function (module) {
+        if (!(module && module.__esModule)) {
+          module = module === null || !(typeof module === "object" && path.endsWith("/library")) ? {
+            default: module
+          } : module;
+          Object.defineProperty(module, "__esModule", {
+            value: true
+          });
+        }
+        resolve(module);
+      }, function (err) {
+        reject(err);
+      });
+    });
+  }
   const PropertyType = ___sap_ux_private_control_property_editor_common["PropertyType"];
   const validateBindingModel = ___validatorjs["validateBindingModel"];
   const createManifestPropertyChange = ____utils_fe_v4js["createManifestPropertyChange"];
@@ -44,6 +61,7 @@ sap.ui.define(["sap/ui/rta/command/CommandFactory", "open/ux/preview/client/thir
         propertyName: change.propertyName,
         [property]: change.value
       };
+      const CommandFactory = (await __ui5_require_async('sap/ui/rta/command/CommandFactory')).default;
       const command = await CommandFactory.getCommandFor(modifiedControl, changeType, modifiedValue, null, flexSettings);
       await rta.getCommandStack().pushAndExecute(command);
     } else if (change.propertyType === PropertyType.Configuration) {

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

@@ -1,5 +1,4 @@
 import type FlexCommand from 'sap/ui/rta/command/FlexCommand';
-import CommandFactory from 'sap/ui/rta/command/CommandFactory';
 import { PropertyType, type PropertyChange } from '@sap-ux-private/control-property-editor-common';
 import type { UI5AdaptationOptions } from '../types.js';
 import { validateBindingModel } from './validator.js';
@@ -45,6 +44,7 @@ export async function applyChange(options: UI5AdaptationOptions, change: Propert
             [property]: change.value
         };
 
+        const CommandFactory = (await import('sap/ui/rta/command/CommandFactory')).default;
         const command = await CommandFactory.getCommandFor<FlexCommand>(
             modifiedControl,
             changeType,

package/dist/client/cpe/context-menu-service.ts

@@ -5,8 +5,8 @@ import {
     requestControlContextMenu
 } from '@sap-ux-private/control-property-editor-common';
 import { ActionSenderFunction, SubscribeFunction } from './types.js';
-import RuntimeAuthoring from 'sap/ui/rta/RuntimeAuthoring';
-import { ActionService } from 'sap/ui/rta/service/Action';
+import type RuntimeAuthoring from 'sap/ui/rta/RuntimeAuthoring';
+import type { ActionService } from 'sap/ui/rta/service/Action';
 import { DialogFactory } from '../adp/dialog-factory.js';
 import { getTextBundle } from '../i18n.js';
 import Log from 'sap/base/Log';

package/dist/client/cpe/outline/nodes.js

@@ -89,10 +89,10 @@ sap.ui.define(["sap/base/Log", "../../utils/core", "../../utils/error", "../util
       controlIndex[node.controlType] = [node];
     }
   }
-  function addToPropertyIdMap(node, propertyIdMap) {
+  async function addToPropertyIdMap(node, propertyIdMap) {
     const control = getControlById(node.controlId);
     if (control) {
-      const overlay = getOverlay(control);
+      const overlay = await getOverlay(control);
       const overlayData = overlay?.getDesignTimeMetadata().getData();
       if (!overlayData?.manifestPropertyPath) {
         return;
@@ -146,7 +146,7 @@ sap.ui.define(["sap/base/Log", "../../utils/core", "../../utils/error", "../util
             children: transformedChildren
           };
           indexNode(controlIndex, node);
-          addToPropertyIdMap(node, propertyIdMap);
+          await addToPropertyIdMap(node, propertyIdMap);
           items.push(node);
         }
         if (isAdp && isExtPoint) {

package/dist/client/cpe/outline/nodes.ts

@@ -101,10 +101,10 @@ function indexNode(controlIndex: ControlTreeIndex, node: OutlineNode): void {
     }
 }
 
-function addToPropertyIdMap(node: OutlineNode, propertyIdMap: Map<string, string[]>): void {
+async function addToPropertyIdMap(node: OutlineNode, propertyIdMap: Map<string, string[]>): Promise<void> {
     const control = getControlById(node.controlId);
     if (control) {
-        const overlay = getOverlay(control);
+        const overlay = await getOverlay(control);
         const overlayData = overlay?.getDesignTimeMetadata().getData();
         if (!overlayData?.manifestPropertyPath) {
             return;
@@ -170,7 +170,7 @@ export async function transformNodes(
                 };
 
                 indexNode(controlIndex, node);
-                addToPropertyIdMap(node, propertyIdMap);
+                await addToPropertyIdMap(node, propertyIdMap);
 
                 items.push(node);
             }

package/dist/client/cpe/selection.js

@@ -134,7 +134,7 @@ sap.ui.define(["open/ux/preview/client/thirdparty/@sap-ux-private/control-proper
       this.changeService.onStackChange(async event => {
         const control = event.detail.controls.find(ctrl => ctrl === this.currentSelection);
         if (control) {
-          const overlay = getOverlay(control);
+          const overlay = await getOverlay(control);
           await this.buildProperties(control, sendAction, overlay);
         }
       });

package/dist/client/cpe/selection.ts

@@ -157,7 +157,7 @@ export class SelectionService implements Service {
         this.changeService.onStackChange(async (event) => {
             const control = event.detail.controls.find((ctrl) => ctrl === this.currentSelection);
             if (control) {
-                const overlay = getOverlay(control);
+                const overlay = await getOverlay(control);
                 await this.buildProperties(control, sendAction, overlay);
             }
         });

package/dist/client/cpe/utils.js

@@ -1,8 +1,25 @@
 "use strict";
 
-sap.ui.define(["sap/ui/core/mvc/XMLView", "sap/ui/core/UIComponent", "../utils/core", "sap/ui/dt/OverlayRegistry", "sap/ui/dt/OverlayUtil"], function (XMLView, UIComponent, ___utils_corejs, OverlayRegistry, OverlayUtil) {
+sap.ui.define(["sap/ui/core/mvc/XMLView", "sap/ui/core/UIComponent", "../utils/core"], function (XMLView, UIComponent, ___utils_corejs) {
   "use strict";
 
+  function __ui5_require_async(path) {
+    return new Promise(function (resolve, reject) {
+      sap.ui.require([path], function (module) {
+        if (!(module && module.__esModule)) {
+          module = module === null || !(typeof module === "object" && path.endsWith("/library")) ? {
+            default: module
+          } : module;
+          Object.defineProperty(module, "__esModule", {
+            value: true
+          });
+        }
+        resolve(module);
+      }, function (err) {
+        reject(err);
+      });
+    });
+  }
   const getComponent = ___utils_corejs["getComponent"];
   /**
    * Get runtime control.
@@ -92,7 +109,32 @@ sap.ui.define(["sap/ui/core/mvc/XMLView", "sap/ui/core/UIComponent", "../utils/c
     }, {});
     return manifestProperties;
   }
-  const getOverlay = control => {
+
+  // eslint-disable-next-line @sap-ux/fiori-tools/sap-no-global-variable
+  let overlayModulesPromise;
+
+  /**
+   * Lazily loads and caches the OverlayRegistry and OverlayUtil modules.
+   * The dynamic imports are executed only once; subsequent calls return the same resolved promise.
+   *
+   * @returns Promise resolving to an object containing the OverlayRegistry and OverlayUtil modules.
+   */
+  function getOverlayModules() {
+    overlayModulesPromise ??= Promise.all([__ui5_require_async('sap/ui/dt/OverlayRegistry'), __ui5_require_async('sap/ui/dt/OverlayUtil')]).then(([{
+      default: OverlayRegistry
+    }, {
+      default: OverlayUtil
+    }]) => ({
+      OverlayRegistry,
+      OverlayUtil
+    }));
+    return overlayModulesPromise;
+  }
+  const getOverlay = async control => {
+    const {
+      OverlayRegistry,
+      OverlayUtil
+    } = await getOverlayModules();
     let controlOverlay = OverlayRegistry.getOverlay(control);
     if (!controlOverlay?.getDomRef()) {
       //look for closest control

package/dist/client/cpe/utils.ts

@@ -1,18 +1,16 @@
 import type ManagedObject from 'sap/ui/base/ManagedObject';
 import type Control from 'sap/ui/core/Control';
 import type ElementOverlay from 'sap/ui/dt/ElementOverlay';
+import type OverlayRegistry from 'sap/ui/dt/OverlayRegistry';
+import type OverlayUtil from 'sap/ui/dt/OverlayUtil';
 import DataType from 'sap/ui/base/DataType';
 import ComponentContainer from 'sap/ui/core/ComponentContainer';
 import XMLView from 'sap/ui/core/mvc/XMLView';
 import UIComponent from 'sap/ui/core/UIComponent';
-
 import { getComponent } from '../utils/core.js';
 import { DesigntimeSetting } from 'sap/ui/dt/DesignTimeMetadata';
 import { ChangeService } from './changes/index.js';
 import UI5Element from 'sap/ui/core/Element';
-import OverlayRegistry from 'sap/ui/dt/OverlayRegistry';
-import OverlayUtil from 'sap/ui/dt/OverlayUtil';
-
 
 export interface PropertiesInfo {
     defaultValue: string;
@@ -151,7 +149,28 @@ export function getManifestProperties(
     return manifestProperties;
 }
 
-export const getOverlay = (control: UI5Element): ElementOverlay | undefined => {
+// eslint-disable-next-line @sap-ux/fiori-tools/sap-no-global-variable
+let overlayModulesPromise: Promise<{
+    OverlayRegistry: typeof OverlayRegistry;
+    OverlayUtil: typeof OverlayUtil;
+}> | undefined;
+
+/**
+ * Lazily loads and caches the OverlayRegistry and OverlayUtil modules.
+ * The dynamic imports are executed only once; subsequent calls return the same resolved promise.
+ *
+ * @returns Promise resolving to an object containing the OverlayRegistry and OverlayUtil modules.
+ */
+function getOverlayModules() {
+    overlayModulesPromise ??= Promise.all([
+        import('sap/ui/dt/OverlayRegistry'),
+        import('sap/ui/dt/OverlayUtil')
+    ]).then(([{ default: OverlayRegistry }, { default: OverlayUtil }]) => ({ OverlayRegistry, OverlayUtil }));
+    return overlayModulesPromise;
+}
+
+export const getOverlay = async (control: UI5Element): Promise<ElementOverlay | undefined> => {
+    const { OverlayRegistry, OverlayUtil } = await getOverlayModules();
     let controlOverlay = OverlayRegistry.getOverlay(control);
     if (!controlOverlay?.getDomRef()) {
         //look for closest control

package/dist/client/utils/fe-v4.js

@@ -107,7 +107,7 @@ sap.ui.define(["sap/ui/core/Component", "./core", "../cpe/utils"], function (Com
    * @returns  A Promise resolving to an array of FlexCommand objects.
    */
   async function createManifestPropertyChange(modifiedControl, flexSettings, propertyChanges, propertyPathExtraSegments) {
-    const overlay = getOverlay(modifiedControl);
+    const overlay = await getOverlay(modifiedControl);
     if (!overlay) {
       return undefined;
     }

package/dist/client/utils/fe-v4.ts

@@ -108,7 +108,7 @@ export async function createManifestPropertyChange(
     propertyChanges: Record<string, string | string[] | boolean | number | object | undefined>,
     propertyPathExtraSegments?: string[]
 ): Promise<FlexCommand | undefined> {
-    const overlay = getOverlay(modifiedControl);
+    const overlay = await getOverlay(modifiedControl);
     if (!overlay) {
         return undefined;
     }

package/package.json

@@ -10,7 +10,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Apreview-middleware"
   },
-  "version": "1.0.24",
+  "version": "1.0.26",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -28,7 +28,7 @@
     "mem-fs-editor": "9.4.0",
     "qrcode": "1.5.4",
     "@sap/bas-sdk": "3.13.7",
-    "@sap-ux/adp-tooling": "1.0.17",
+    "@sap-ux/adp-tooling": "1.0.18",
     "@sap-ux/btp-utils": "2.0.2",
     "@sap-ux/control-property-editor-sources": "npm:@sap-ux/control-property-editor@1.0.5",
     "@sap-ux/feature-toggle": "1.0.2",
@@ -54,7 +54,7 @@
     "nock": "14.0.11",
     "npm-run-all2": "8.0.4",
     "supertest": "7.2.2",
-    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@1.0.24",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@1.0.26",
     "@sap-ux-private/playwright": "1.0.2",
     "@sap-ux/axios-extension": "2.0.3",
     "@sap-ux/store": "2.0.1",