@sap-ux/preview-middleware 0.5.7 → 0.6.1

package/dist/client/flp/init.js

@@ -3,38 +3,6 @@
 sap.ui.define(["sap/base/Log", "sap/ui/core/IconPool", "sap/base/i18n/ResourceBundle", "sap/base/util/UriParameters"], function (Log, IconPool, ResourceBundle, UriParameters) {
   "use strict";
 
-  /**
-   * Fetch the manifest from the given application urls, then parse them for custom libs, and finally request their urls.
-   *
-   * @param appUrls application urls
-   * @returns returns a promise when the registration is completed.
-   */
-  const registerComponentDependencyPaths = function (appUrls) {
-    try {
-      return Promise.resolve(getManifestLibs(appUrls)).then(function (libs) {
-        const _temp = function () {
-          if (libs && libs.length > 0) {
-            let url = '/sap/bc/ui2/app_index/ui5_app_info?id=' + libs;
-            const sapClient = UriParameters.fromQuery(window.location.search).get('sap-client');
-            if (sapClient && sapClient.length === 3) {
-              url = url + '&sap-client=' + sapClient;
-            }
-            return Promise.resolve(fetch(url)).then(function (response) {
-              return Promise.resolve(response.json()).then(function (_response$json) {
-                registerModules(_response$json);
-              });
-            });
-          }
-        }();
-        if (_temp && _temp.then) return _temp.then(function () {});
-      });
-    } catch (e) {
-      return Promise.reject(e);
-    }
-  };
-  /**
-   * Register SAP fonts that are also registered in a productive Fiori launchpad.
-   */
   /**
    * SAPUI5 delivered namespaces from https://ui5.sap.com/#/api/sap
    */
@@ -67,25 +35,20 @@ sap.ui.define(["sap/base/Log", "sap/ui/core/IconPool", "sap/base/i18n/ResourceBu
     const result = {};
     const promises = [];
     for (const url of appUrls) {
-      promises.push(fetch(`${url}/manifest.json`).then(function (resp) {
-        try {
-          return Promise.resolve(resp.json()).then(function (manifest) {
-            if (manifest) {
-              if (manifest['sap.ui5'] && manifest['sap.ui5'].dependencies) {
-                if (manifest['sap.ui5'].dependencies.libs) {
-                  addKeys(manifest['sap.ui5'].dependencies.libs, result);
-                }
-                if (manifest['sap.ui5'].dependencies.components) {
-                  addKeys(manifest['sap.ui5'].dependencies.components, result);
-                }
-              }
-              if (manifest['sap.ui5'] && manifest['sap.ui5'].componentUsages) {
-                addKeys(manifest['sap.ui5'].componentUsages, result);
-              }
+      promises.push(fetch(`${url}/manifest.json`).then(async resp => {
+        const manifest = await resp.json();
+        if (manifest) {
+          if (manifest['sap.ui5'] && manifest['sap.ui5'].dependencies) {
+            if (manifest['sap.ui5'].dependencies.libs) {
+              addKeys(manifest['sap.ui5'].dependencies.libs, result);
             }
-          });
-        } catch (e) {
-          return Promise.reject(e);
+            if (manifest['sap.ui5'].dependencies.components) {
+              addKeys(manifest['sap.ui5'].dependencies.components, result);
+            }
+          }
+          if (manifest['sap.ui5'] && manifest['sap.ui5'].componentUsages) {
+            addKeys(manifest['sap.ui5'].componentUsages, result);
+          }
         }
       }));
     }
@@ -115,6 +78,29 @@ sap.ui.define(["sap/base/Log", "sap/ui/core/IconPool", "sap/base/i18n/ResourceBu
       }
     });
   }
+
+  /**
+   * Fetch the manifest from the given application urls, then parse them for custom libs, and finally request their urls.
+   *
+   * @param appUrls application urls
+   * @returns returns a promise when the registration is completed.
+   */
+  async function registerComponentDependencyPaths(appUrls) {
+    const libs = await getManifestLibs(appUrls);
+    if (libs && libs.length > 0) {
+      let url = '/sap/bc/ui2/app_index/ui5_app_info?id=' + libs;
+      const sapClient = UriParameters.fromQuery(window.location.search).get('sap-client');
+      if (sapClient && sapClient.length === 3) {
+        url = url + '&sap-client=' + sapClient;
+      }
+      const response = await fetch(url);
+      registerModules(await response.json());
+    }
+  }
+
+  /**
+   * Register SAP fonts that are also registered in a productive Fiori launchpad.
+   */
   function registerSAPFonts() {
     //Fiori Theme font family and URI
     const fioriTheme = {
@@ -159,30 +145,25 @@ sap.ui.define(["sap/base/Log", "sap/ui/core/IconPool", "sap/base/i18n/ResourceBu
     } = _ref;
     // Register RTA if configured
     if (flex) {
-      sap.ushell.Container.attachRendererCreatedEvent(function () {
-        try {
-          return Promise.resolve(sap.ushell.Container.getServiceAsync('AppLifeCycle')).then(function (serviceInstance) {
-            serviceInstance.attachAppLoaded(event => {
-              const oView = event.getParameter('componentInstance');
-              const requiredLibs = ['sap/ui/rta/api/startAdaptation'];
-              const flexSettings = JSON.parse(flex);
-              if (flexSettings.pluginScript) {
-                requiredLibs.push(flexSettings.pluginScript);
-                delete flexSettings.pluginScript;
-              }
-              sap.ui.require(requiredLibs, function (startAdaptation, pluginScript) {
-                const options = {
-                  rootControl: oView,
-                  validateAppVersion: false,
-                  flexSettings
-                };
-                startAdaptation(options, pluginScript);
-              });
-            });
+      sap.ushell.Container.attachRendererCreatedEvent(async function () {
+        const serviceInstance = await sap.ushell.Container.getServiceAsync('AppLifeCycle');
+        serviceInstance.attachAppLoaded(event => {
+          const oView = event.getParameter('componentInstance');
+          const requiredLibs = ['sap/ui/rta/api/startAdaptation'];
+          const flexSettings = JSON.parse(flex);
+          if (flexSettings.pluginScript) {
+            requiredLibs.push(flexSettings.pluginScript);
+            delete flexSettings.pluginScript;
+          }
+          sap.ui.require(requiredLibs, function (startAdaptation, pluginScript) {
+            const options = {
+              rootControl: oView,
+              validateAppVersion: false,
+              flexSettings
+            };
+            startAdaptation(options, pluginScript);
           });
-        } catch (e) {
-          return Promise.reject(e);
-        }
+        });
       });
     }
 

package/dist/ui5/middleware.js

@@ -18,17 +18,17 @@ const adp_tooling_1 = require("@sap-ux/adp-tooling");
  * @param rootProject reference to the project
  * @param config configuration from the ui5.yaml
  * @param flp FlpSandbox instance
+ * @param util middleware utilities provided by the UI5 CLI
  * @param logger logger instance
  */
-function initAdp(rootProject, config, flp, logger) {
+function initAdp(rootProject, config, flp, util, logger) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const appVariant = yield rootProject.byPath('/manifest.appdescr_variant');
         if (appVariant) {
-            const adp = new adp_tooling_1.AdpPreview(config, rootProject, logger);
+            const adp = new adp_tooling_1.AdpPreview(config, rootProject, util, logger);
             const variant = JSON.parse(yield appVariant.getString());
             const layer = yield adp.init(variant);
-            logger.warn(variant);
             if (flp.rta) {
                 flp.rta.layer = layer;
                 flp.rta.options = {
@@ -40,6 +40,7 @@ function initAdp(rootProject, config, flp, logger) {
             }
             yield flp.init(adp.descriptor.manifest, adp.descriptor.name, adp.resources);
             flp.router.use(adp.descriptor.url, adp.proxy.bind(adp));
+            adp.addApis(flp.router);
         }
         else {
             throw new Error('ADP configured but no manifest.appdescr_variant found.');
@@ -65,7 +66,7 @@ function createRouter({ resources, options, middlewareUtil }, logger) {
         // configure the FLP sandbox based on information from the manifest
         const flp = new flp_1.FlpSandbox(config, resources.rootProject, middlewareUtil, logger);
         if (config.adp) {
-            yield initAdp(resources.rootProject, config.adp, flp, logger);
+            yield initAdp(resources.rootProject, config.adp, flp, middlewareUtil, logger);
         }
         else {
             const manifest = yield resources.rootProject.byPath('/manifest.json');

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.5.7",
+  "version": "0.6.1",
   "license": "Apache-2.0",
   "author": "@SAP/ux-tools-team",
   "main": "dist/index.js",
@@ -24,7 +24,7 @@
   "dependencies": {
     "ejs": "3.1.9",
     "@sap-ux/logger": "0.3.8",
-    "@sap-ux/adp-tooling": "0.2.5"
+    "@sap-ux/adp-tooling": "0.3.1"
   },
   "devDependencies": {
     "@types/ejs": "3.1.2",
@@ -36,7 +36,7 @@
     "express": "4.18.2",
     "nock": "13.2.1",
     "supertest": "6.3.3",
-    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.1.2",
+    "@private/preview-middleware-client": "npm:@sap-ux-private/preview-middleware-client@0.2.0",
     "@sap-ux/project-access": "1.13.6",
     "@sap-ux/store": "0.3.14"
   },
@@ -53,7 +53,7 @@
     "build:middleware": "tsc --build",
     "build:client": "pnpm -C ../preview-middleware-client run build && copyfiles --exclude **/*-dbg.js --up 4 \"./node_modules/@private/preview-middleware-client/dist/**/*\" \"./dist/client\"",
     "watch": "tsc --watch",
-    "clean": "rimraf dist test/test-output coverage *.tsbuildinfo",
+    "clean": "rimraf --glob dist test/test-output coverage *.tsbuildinfo",
     "format": "prettier --write '**/*.{js,json,ts,yaml,yml}' --ignore-path ../../.prettierignore",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",