@sap/ux-ui5-tooling 1.15.6 → 1.16.2

package/dist/middlewares/fiori-tools-appreload.js

@@ -39452,9 +39452,9 @@ var require_esprima = __commonJS({
   }
 });
 
-// ../../node_modules/core-util-is/lib/util.js
+// ../../node_modules/@sap/cf-tools/node_modules/core-util-is/lib/util.js
 var require_util2 = __commonJS({
-  "../../node_modules/core-util-is/lib/util.js"(exports2) {
+  "../../node_modules/@sap/cf-tools/node_modules/core-util-is/lib/util.js"(exports2) {
     function isArray(arg) {
       if (Array.isArray) {
         return Array.isArray(arg);
@@ -39515,7 +39515,7 @@ var require_util2 = __commonJS({
       typeof arg === "undefined";
     }
     exports2.isPrimitive = isPrimitive;
-    exports2.isBuffer = Buffer.isBuffer;
+    exports2.isBuffer = require("buffer").Buffer.isBuffer;
     function objectToString(o) {
       return Object.prototype.toString.call(o);
     }
@@ -40246,11 +40246,16 @@ var require_has_own_prop = __commonJS({
   }
 });
 
-// ../../node_modules/comment-json/src/common.js
+// ../../node_modules/@sap/cf-tools/node_modules/comment-json/src/common.js
 var require_common4 = __commonJS({
-  "../../node_modules/comment-json/src/common.js"(exports2, module2) {
+  "../../node_modules/@sap/cf-tools/node_modules/comment-json/src/common.js"(exports2, module2) {
     var hasOwnProperty = require_has_own_prop();
-    var { isObject, isArray } = require_util2();
+    var {
+      isObject,
+      isArray,
+      isString,
+      isNumber
+    } = require_util2();
     var PREFIX_BEFORE = "before";
     var PREFIX_AFTER_PROP = "after-prop";
     var PREFIX_AFTER_COLON = "after-colon";
@@ -40334,6 +40339,9 @@ var require_common4 = __commonJS({
     };
     var assign2 = (target, source, keys) => {
       keys.forEach((key) => {
+        if (!isString(key) && !isNumber(key)) {
+          return;
+        }
         if (!hasOwnProperty(source, key)) {
           return;
         }
@@ -40386,9 +40394,9 @@ var require_common4 = __commonJS({
   }
 });
 
-// ../../node_modules/comment-json/src/array.js
+// ../../node_modules/@sap/cf-tools/node_modules/comment-json/src/array.js
 var require_array = __commonJS({
-  "../../node_modules/comment-json/src/array.js"(exports2, module2) {
+  "../../node_modules/@sap/cf-tools/node_modules/comment-json/src/array.js"(exports2, module2) {
     var { isArray } = require_util2();
     var { sort } = require_src3();
     var {
@@ -40517,6 +40525,7 @@ var require_array = __commonJS({
         if (!items.length) {
           return ret;
         }
+        move_comments(ret, this, 0, this.length, 0);
         items.forEach((item) => {
           const prev = length;
           length += isArray(item) ? item.length : 1;
@@ -40544,6 +40553,7 @@ var require_array = __commonJS({
           map2[index2] = real_source_index;
           swap_comments(this, index2, real_source_index);
         });
+        return this;
       }
     };
     module2.exports = {
@@ -40552,9 +40562,9 @@ var require_array = __commonJS({
   }
 });
 
-// ../../node_modules/comment-json/src/parse.js
+// ../../node_modules/@sap/cf-tools/node_modules/comment-json/src/parse.js
 var require_parse = __commonJS({
-  "../../node_modules/comment-json/src/parse.js"(exports2, module2) {
+  "../../node_modules/@sap/cf-tools/node_modules/comment-json/src/parse.js"(exports2, module2) {
     var esprima = require_esprima();
     var {
       CommentArray
@@ -40886,9 +40896,9 @@ var require_repeat_string = __commonJS({
   }
 });
 
-// ../../node_modules/comment-json/src/stringify.js
+// ../../node_modules/@sap/cf-tools/node_modules/comment-json/src/stringify.js
 var require_stringify = __commonJS({
-  "../../node_modules/comment-json/src/stringify.js"(exports2, module2) {
+  "../../node_modules/@sap/cf-tools/node_modules/comment-json/src/stringify.js"(exports2, module2) {
     var {
       isArray,
       isObject,
@@ -41088,9 +41098,9 @@ var require_stringify = __commonJS({
   }
 });
 
-// ../../node_modules/comment-json/src/index.js
+// ../../node_modules/@sap/cf-tools/node_modules/comment-json/src/index.js
 var require_src4 = __commonJS({
-  "../../node_modules/comment-json/src/index.js"(exports2, module2) {
+  "../../node_modules/@sap/cf-tools/node_modules/comment-json/src/index.js"(exports2, module2) {
     var { parse: parse2, tokenize } = require_parse();
     var stringify = require_stringify();
     var { CommentArray } = require_array();
@@ -46597,9 +46607,12 @@ var require_cli3 = __commonJS({
     var types_1 = require_types2();
     var Cli = class _Cli {
       static execute(args, options, token2) {
-        token2 = token2 || { isCancellationRequested: false, onCancellationRequested: () => {
-          return;
-        } };
+        token2 = token2 || {
+          isCancellationRequested: false,
+          onCancellationRequested: () => {
+            return;
+          }
+        };
         _Cli.updateSpawnOptions(options);
         return new Promise((resolve2) => {
           let stderr = "";
@@ -46621,7 +46634,7 @@ var require_cli3 = __commonJS({
           });
           childProcess.on("error", (err) => {
             const message = _23.get(err, "code") === "ENOENT" ? `${_Cli.CF_CMD}: command not found` : _23.get(err, "message");
-            resolve2({ "stdout": stdout, "stderr": stderr, error: message, exitCode: types_1.CF_CMD_EXIT_CODE.ERROR });
+            resolve2({ stdout, stderr, error: message, exitCode: types_1.CF_CMD_EXIT_CODE.ERROR });
           });
           token2.onCancellationRequested(() => {
             childProcess.kill();
@@ -46635,26 +46648,26 @@ var require_cli3 = __commonJS({
             try {
               const cfErr = (0, comment_json_1.parse)(stdout);
               const message = _23.get(cfErr, "code") === 10002 ? _Cli.CF_LOGIN_ERROR : _23.get(cfErr, "description", "Internal error occured");
-              resolve2({ "stdout": stdout, "stderr": stderr, exitCode: types_1.CF_CMD_EXIT_CODE.ERROR, error: message });
+              resolve2({ stdout, stderr, exitCode: types_1.CF_CMD_EXIT_CODE.ERROR, error: message });
               return;
             } catch (e) {
             }
           } else if (stdout.startsWith("FAILED") && stdout.indexOf("Error creating request") > 0) {
-            resolve2({ "stdout": stdout, "stderr": stderr, error: _Cli.CF_LOGIN_ERROR, exitCode: types_1.CF_CMD_EXIT_CODE.ERROR });
+            resolve2({ stdout, stderr, error: _Cli.CF_LOGIN_ERROR, exitCode: types_1.CF_CMD_EXIT_CODE.ERROR });
             return;
           } else if (/failed.*\bError\b:/g.test(stdout)) {
             try {
               (0, comment_json_1.parse)(stdout);
             } catch (e) {
-              resolve2({ "stdout": stdout, "stderr": stderr, error: stdout, exitCode: types_1.CF_CMD_EXIT_CODE.ERROR });
+              resolve2({ stdout, stderr, error: stdout, exitCode: types_1.CF_CMD_EXIT_CODE.ERROR });
               return;
             }
           } else if (stdout.startsWith("FAILED") && stdout.indexOf("No API endpoint set") > 0) {
-            resolve2({ "stdout": stdout, "stderr": stderr, error: stdout, exitCode: types_1.CF_CMD_EXIT_CODE.ERROR });
+            resolve2({ stdout, stderr, error: stdout, exitCode: types_1.CF_CMD_EXIT_CODE.ERROR });
             return;
           }
         }
-        resolve2({ "stdout": stdout, "stderr": stderr, exitCode: code });
+        resolve2({ stdout, stderr, exitCode: code });
       }
       static updateSpawnOptions(options) {
         if (options) {
@@ -46694,33 +46707,6 @@ var require_messages = __commonJS({
 var require_utils3 = __commonJS({
   "../../node_modules/@sap/cf-tools/out/src/utils.js"(exports2) {
     "use strict";
-    var __awaiter = exports2 && exports2.__awaiter || function(thisArg, _arguments, P, generator) {
-      function adopt(value) {
-        return value instanceof P ? value : new P(function(resolve2) {
-          resolve2(value);
-        });
-      }
-      return new (P || (P = Promise))(function(resolve2, reject2) {
-        function fulfilled(value) {
-          try {
-            step(generator.next(value));
-          } catch (e) {
-            reject2(e);
-          }
-        }
-        function rejected(value) {
-          try {
-            step(generator["throw"](value));
-          } catch (e) {
-            reject2(e);
-          }
-        }
-        function step(result) {
-          result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
-        }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-      });
-    };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parseRawDictData = exports2.padQuerySpace = exports2.getSpaceGuidThrowIfUndefined = exports2.cfGetConfigFileField = exports2.cfGetConfigFileJson = exports2.isUpsType = exports2.cfGetConfigFilePath = exports2.getTags = exports2.getOrgGUID = exports2.getSpaceFieldGUID = exports2.getDescription = exports2.getLabel = exports2.getName = exports2.getGuid = exports2.padQuery = exports2.ensureQuery = exports2.dataContentAsObject = void 0;
     var _23 = require_lodash();
@@ -46730,20 +46716,18 @@ var require_utils3 = __commonJS({
     var comment_json_1 = require_src4();
     var messages_1 = require_messages();
     var types_1 = require_types2();
-    function dataContentAsObject(filePath) {
-      return __awaiter(this, void 0, void 0, function* () {
-        try {
-          return _23.reduce(_23.split(yield fs.promises.readFile(filePath, { encoding: "utf8" }), os.EOL), (data, line) => {
-            const parts = _23.split(line, "=");
-            if (_23.size(parts) > 1) {
-              data[_23.trim(parts[0])] = _23.trim(parts[1]);
-            }
-            return data;
-          }, {});
-        } catch (error2) {
-          return {};
-        }
-      });
+    async function dataContentAsObject(filePath) {
+      try {
+        return _23.reduce(_23.split(await fs.promises.readFile(filePath, { encoding: "utf8" }), os.EOL), (data, line) => {
+          const parts = _23.split(line, "=");
+          if (_23.size(parts) > 1) {
+            data[_23.trim(parts[0])] = _23.trim(parts[1]);
+          }
+          return data;
+        }, {});
+      } catch (error2) {
+        return {};
+      }
     }
     exports2.dataContentAsObject = dataContentAsObject;
     function ensureQuery(query) {
@@ -46801,40 +46785,34 @@ var require_utils3 = __commonJS({
       return _23.get(resource, "type", types_1.eServiceTypes.managed) === types_1.eServiceTypes.user_provided;
     }
     exports2.isUpsType = isUpsType;
-    function cfGetConfigFileJson(target) {
-      return __awaiter(this, void 0, void 0, function* () {
-        try {
-          return (0, comment_json_1.parse)(yield fs.promises.readFile(cfGetConfigFilePath(target), { encoding: "utf8" }));
-        } catch (error2) {
-        }
-      });
+    async function cfGetConfigFileJson(target) {
+      try {
+        return (0, comment_json_1.parse)(await fs.promises.readFile(cfGetConfigFilePath(target), { encoding: "utf8" }));
+      } catch (error2) {
+      }
     }
     exports2.cfGetConfigFileJson = cfGetConfigFileJson;
-    function cfGetConfigFileField(field, target) {
-      return __awaiter(this, void 0, void 0, function* () {
-        return _23.get(yield cfGetConfigFileJson(target), `${field}`);
-      });
+    async function cfGetConfigFileField(field, target) {
+      return _23.get(await cfGetConfigFileJson(target), `${field}`);
     }
     exports2.cfGetConfigFileField = cfGetConfigFileField;
-    function getSpaceGuidThrowIfUndefined() {
-      return __awaiter(this, void 0, void 0, function* () {
-        const space = getSpaceFieldGUID(yield cfGetConfigFileField("SpaceFields"));
-        if (!space) {
-          throw new Error(messages_1.messages.cf_setting_not_set);
-        }
-        return space;
-      });
+    async function getSpaceGuidThrowIfUndefined() {
+      const space = getSpaceFieldGUID(await cfGetConfigFileField("SpaceFields"));
+      if (!space) {
+        throw new Error(messages_1.messages.cf_setting_not_set);
+      }
+      return space;
     }
     exports2.getSpaceGuidThrowIfUndefined = getSpaceGuidThrowIfUndefined;
-    function padQuerySpace(query, otherFilters) {
-      return __awaiter(this, void 0, void 0, function* () {
-        query = padQuery(query, otherFilters);
-        const filter2 = _23.find(query.filters, ["key", types_1.eFilters.space_guids]);
-        if (!_23.size(filter2 === null || filter2 === void 0 ? void 0 : filter2.value)) {
-          query.filters = _23.concat(query.filters, [{ key: types_1.eFilters.space_guids, value: yield getSpaceGuidThrowIfUndefined() }]);
-        }
-        return query;
-      });
+    async function padQuerySpace(query, otherFilters) {
+      query = padQuery(query, otherFilters);
+      const filter2 = _23.find(query.filters, ["key", types_1.eFilters.space_guids]);
+      if (!_23.size(filter2 === null || filter2 === void 0 ? void 0 : filter2.value)) {
+        query.filters = _23.concat(query.filters, [
+          { key: types_1.eFilters.space_guids, value: await getSpaceGuidThrowIfUndefined() }
+        ]);
+      }
+      return query;
     }
     exports2.padQuerySpace = padQuerySpace;
     function parseRawDictData(data) {
@@ -46858,33 +46836,6 @@ var require_utils3 = __commonJS({
 var require_cf_local = __commonJS({
   "../../node_modules/@sap/cf-tools/out/src/cf-local.js"(exports2) {
     "use strict";
-    var __awaiter = exports2 && exports2.__awaiter || function(thisArg, _arguments, P, generator) {
-      function adopt(value) {
-        return value instanceof P ? value : new P(function(resolve2) {
-          resolve2(value);
-        });
-      }
-      return new (P || (P = Promise))(function(resolve2, reject2) {
-        function fulfilled(value) {
-          try {
-            step(generator.next(value));
-          } catch (e) {
-            reject2(e);
-          }
-        }
-        function rejected(value) {
-          try {
-            step(generator["throw"](value));
-          } catch (e) {
-            reject2(e);
-          }
-        }
-        function step(result) {
-          result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
-        }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-      });
-    };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.cfApi = exports2.cfGetApps = exports2.cfGetServiceInstancesList = exports2.cfGetInstanceKeyParameters = exports2.cfGetInstanceCredentials = exports2.cfGetServiceKeys = exports2.cfLogout = exports2.cfGetServicePlans = exports2.cfGetTarget = exports2.cfGetAuthToken = exports2.cfGetInstanceMetadata = exports2.cfBindLocalUps = exports2.cfBindLocalServices = exports2.cfGetSpaceServices = exports2.cfGetServices = exports2.cfGetTargets = exports2.cfSetOrgSpace = exports2.cfGetManagedServiceInstances = exports2.cfGetServiceInstances = exports2.cfGetServicePlansList = exports2.cfGetAvailableSpaces = exports2.cfGetAvailableOrgs = exports2.cfLogin = exports2.cfCreateUpsInstance = exports2.cfCreateService = exports2.cfGetUpsInstances = exports2.clearCacheServiceInstances = exports2.resolveEndpoint = void 0;
     var comment_json_1 = require_src4();
@@ -46970,22 +46921,30 @@ var require_cf_local = __commonJS({
     };
     var resourceApps = {
       name: "apps",
-      params: _23.uniq(_23.concat(baseParams, [types_1.eFilters.names, types_1.eFilters.space_guids, types_1.eFilters.organization_guids, types_1.eFilters.guids, types_1.eFilters.include]))
+      params: _23.uniq(_23.concat(baseParams, [
+        types_1.eFilters.names,
+        types_1.eFilters.space_guids,
+        types_1.eFilters.organization_guids,
+        types_1.eFilters.guids,
+        types_1.eFilters.include
+      ]))
     };
     function evaluateResponse(data) {
       if (_23.size(_23.get(data, "errors"))) {
-        throw new Error(`${_23.get(data, ["errors", "0", "detail"])} [code: ${_23.get(data, ["errors", "0", "code"])} title: ${_23.get(data, ["errors", "0", "title"])}]`);
+        throw new Error(`${_23.get(data, ["errors", "0", "detail"])} [code: ${_23.get(data, ["errors", "0", "code"])} title: ${_23.get(data, [
+          "errors",
+          "0",
+          "title"
+        ])}]`);
       }
       return data;
     }
-    function resolveEndpoint(query) {
-      return __awaiter(this, void 0, void 0, function* () {
-        try {
-          return /http/.test(new url_1.URL(query).protocol) ? _23.replace(query, (yield cfGetTarget(true))["api endpoint"], "") : query;
-        } catch (e) {
-          return query;
-        }
-      });
+    async function resolveEndpoint(query) {
+      try {
+        return /http/.test(new url_1.URL(query).protocol) ? _23.replace(query, (await cfGetTarget(true))["api endpoint"], "") : query;
+      } catch (e) {
+        return query;
+      }
     }
     exports2.resolveEndpoint = resolveEndpoint;
     var cacheServiceInstanceTypes = {};
@@ -47035,8 +46994,11 @@ var require_cf_local = __commonJS({
         }
         const state = _23.get(resource, "last_operation.state", ENTITY_STATE_INPROGRESS);
         if (state === ENTITY_STATE_INPROGRESS) {
-          progress.progress.report({ "message": `
-${messages_1.messages.service_creation_started}`, increment: Math.floor(1 / maxNumberOfAttemps * 100) });
+          progress.progress.report({
+            message: `
+${messages_1.messages.service_creation_started}`,
+            increment: Math.floor(1 / maxNumberOfAttemps * 100)
+          });
           setTimeout(() => {
             jobFunction().then((retriedResource) => {
               waitForEntity(resolve2, reject2, retriedResource, attempt + 1, maxNumberOfAttemps, jobFunction, progress);
@@ -47047,7 +47009,7 @@ ${messages_1.messages.service_creation_started}`, increment: Math.floor(1 / maxN
         } else if (state === ENTITY_STATE_FAILED) {
           reject2(new Error(messages_1.messages.failed_creating_entity(_23.get(resource, "last_operation.description"), (0, utils_1.getName)(resource))));
         } else {
-          progress.progress.report({ "message": `
+          progress.progress.report({ message: `
 ${messages_1.messages.service_creation_started}`, increment: 100 });
           resolve2(resource);
         }
@@ -47055,44 +47017,36 @@ ${messages_1.messages.service_creation_started}`, increment: 100 });
         reject2(new Error(messages_1.messages.exceed_number_of_attempts((0, utils_1.getName)(resource))));
       }
     }
-    function execQuery(args, fncParse, reverseErrorOrder) {
-      return __awaiter(this, void 0, void 0, function* () {
-        const cliResult = yield cli_1.Cli.execute(args.query, args.options, args.token);
-        if (cliResult.exitCode !== 0) {
-          throw new Error(reverseErrorOrder ? cliResult.stdout || cliResult.stderr || cliResult.error : cliResult.error || cliResult.stderr || cliResult.stdout);
-        }
-        return fncParse ? yield fncParse(evaluateResponse((0, comment_json_1.parse)(cliResult.stdout))) : cliResult.stdout || cliResult.stderr;
-      });
+    async function execQuery(args, fncParse, reverseErrorOrder) {
+      const cliResult = await cli_1.Cli.execute(args.query, args.options, args.token);
+      if (cliResult.exitCode !== 0) {
+        throw new Error(reverseErrorOrder ? cliResult.stdout || cliResult.stderr || cliResult.error : cliResult.error || cliResult.stderr || cliResult.stdout);
+      }
+      return fncParse ? await fncParse(evaluateResponse((0, comment_json_1.parse)(cliResult.stdout))) : cliResult.stdout || cliResult.stderr;
     }
-    function execTotal(args, fncParse) {
-      return __awaiter(this, void 0, void 0, function* () {
-        const collection = [];
-        let query = args.query;
-        while (query) {
-          const result = (0, comment_json_1.parse)(yield execQuery({ query: ["curl", yield resolveEndpoint(query)], options: args.options, token: args.token }));
-          for (const resource of _23.get(result, "resources", [])) {
-            collection.push(fncParse ? yield fncParse(resource, _23.get(result, "included")) : resource);
-          }
-          query = _23.get(result, ["pagination", "next", "href"]);
+    async function execTotal(args, fncParse) {
+      const collection = [];
+      let query = args.query;
+      while (query) {
+        const result = (0, comment_json_1.parse)(await execQuery({ query: ["curl", await resolveEndpoint(query)], options: args.options, token: args.token }));
+        for (const resource of _23.get(result, "resources", [])) {
+          collection.push(fncParse ? await fncParse(resource, _23.get(result, "included")) : resource);
         }
-        return _23.compact(collection);
-      });
+        query = _23.get(result, ["pagination", "next", "href"]);
+      }
+      return _23.compact(collection);
     }
-    function getServiceInstance(query, token2) {
-      return __awaiter(this, void 0, void 0, function* () {
-        evaluateQueryFilters(query, resourceServiceInstances);
-        query = yield (0, utils_1.padQuerySpace)(query, [{ key: types_1.eFilters.type, value: types_1.eServiceTypes.managed }]);
-        const result = yield execTotal({ query: `/v3/service_instances?${composeQuery(query)}`, token: token2 });
-        if (_23.size(result) >= 1) {
-          return _23.head(result);
-        }
-        throw new Error(messages_1.messages.service_not_found(decodeURIComponent(_23.get(_23.find(query.filters, ["key", types_1.eFilters.names]), "value")) || "unknown"));
-      });
+    async function getServiceInstance(query, token2) {
+      evaluateQueryFilters(query, resourceServiceInstances);
+      query = await (0, utils_1.padQuerySpace)(query, [{ key: types_1.eFilters.type, value: types_1.eServiceTypes.managed }]);
+      const result = await execTotal({ query: `/v3/service_instances?${composeQuery(query)}`, token: token2 });
+      if (_23.size(result) >= 1) {
+        return _23.head(result);
+      }
+      throw new Error(messages_1.messages.service_not_found(decodeURIComponent(_23.get(_23.find(query.filters, ["key", types_1.eFilters.names]), "value")) || "unknown"));
     }
-    function getUpsCredentials(instanceGuid, token2) {
-      return __awaiter(this, void 0, void 0, function* () {
-        return execQuery({ query: ["curl", `/v3/service_instances/${instanceGuid}/credentials`], token: token2 }, (data) => data);
-      });
+    async function getUpsCredentials(instanceGuid, token2) {
+      return execQuery({ query: ["curl", `/v3/service_instances/${instanceGuid}/credentials`], token: token2 }, (data) => data);
     }
     function resolveCfResource(data, service) {
       return _23.merge({
@@ -47110,7 +47064,10 @@ ${messages_1.messages.service_creation_started}`, increment: 100 });
     function getCachedServicePlan(plan) {
       if (!cacheServiceInstanceTypes[plan.guid]) {
         cacheServiceInstanceTypes[plan.guid] = execQuery({ query: ["curl", `/v3/service_plans/${plan.guid}?include=service_offering`] }, (data) => {
-          return Promise.resolve(resolveCfResource(data, _23.find(_23.get(data, ["included", "service_offerings"]), ["guid", _23.get(data, ["relationships", "service_offering", "data", "guid"])])));
+          return Promise.resolve(resolveCfResource(data, _23.find(_23.get(data, ["included", "service_offerings"]), [
+            "guid",
+            _23.get(data, ["relationships", "service_offering", "data", "guid"])
+          ])));
         });
       }
       return cacheServiceInstanceTypes[plan.guid];
@@ -47130,117 +47087,145 @@ ${messages_1.messages.service_creation_started}`, increment: 100 });
         }) : Promise.resolve()
       });
     }
-    function resolveServiceInstances(results) {
-      return __awaiter(this, void 0, void 0, function* () {
-        const queries = _23.concat(_23.map(results, "serviceName"), _23.map(results, "credentials"));
-        if (!_23.size(queries)) {
-          return [];
+    async function resolveServiceInstances(results) {
+      const queries = _23.concat(_23.map(results, "serviceName"), _23.map(results, "credentials"));
+      if (!_23.size(queries)) {
+        return [];
+      }
+      return Promise.all(queries).then(async () => {
+        const instances = [];
+        for (const result of results) {
+          const serviceName = await _23.get(result, "serviceName");
+          instances.push({
+            guid: (0, utils_1.getGuid)(result),
+            label: (0, utils_1.getLabel)(result),
+            serviceName: _23.get(serviceName, ["service_offering", "name"], "unknown"),
+            plan_guid: _23.get(result, "plan_guid"),
+            plan: _23.get(serviceName, "name", "unknown"),
+            tags: _23.get(result, "tags"),
+            credentials: await result.credentials
+          });
         }
-        return Promise.all(queries).then(() => __awaiter(this, void 0, void 0, function* () {
-          const instances = [];
-          for (const result of results) {
-            const serviceName = yield _23.get(result, "serviceName");
-            instances.push({
-              guid: (0, utils_1.getGuid)(result),
-              label: (0, utils_1.getLabel)(result),
-              serviceName: _23.get(serviceName, ["service_offering", "name"], "unknown"),
-              plan_guid: _23.get(result, "plan_guid"),
-              plan: _23.get(serviceName, "name", "unknown"),
-              tags: _23.get(result, "tags"),
-              credentials: yield result.credentials
-            });
-          }
-          return _23.compact(instances);
-        }));
+        return _23.compact(instances);
       });
     }
-    function cfGetUpsInstances(query, token2) {
-      return __awaiter(this, void 0, void 0, function* () {
-        evaluateQueryFilters(query, resourceServiceInstances);
-        query = yield (0, utils_1.padQuerySpace)(query, [{ key: types_1.eFilters.type, value: types_1.eServiceTypes.user_provided }]);
-        return resolveServiceInstances(yield execTotal({ query: `/v3/service_instances?${composeQuery(query)}`, token: token2 }, (info) => __awaiter(this, void 0, void 0, function* () {
-          return getServiceInstanceItem(info);
-        })));
-      });
+    async function cfGetUpsInstances(query, token2) {
+      evaluateQueryFilters(query, resourceServiceInstances);
+      query = await (0, utils_1.padQuerySpace)(query, [{ key: types_1.eFilters.type, value: types_1.eServiceTypes.user_provided }]);
+      return resolveServiceInstances(await execTotal({ query: `/v3/service_instances?${composeQuery(query)}`, token: token2 }, async (info) => getServiceInstanceItem(info)));
     }
     exports2.cfGetUpsInstances = cfGetUpsInstances;
-    function cfCreateService(planGuid, instanceName, params, tags, progress, maxNumberOfAttemps) {
-      return __awaiter(this, void 0, void 0, function* () {
-        const spaceGuid = yield (0, utils_1.getSpaceGuidThrowIfUndefined)();
-        maxNumberOfAttemps = _23.isNil(maxNumberOfAttemps) ? 45 : maxNumberOfAttemps;
-        progress = _23.defaults(progress, { progress: { report: () => "" } }, { cancelToken: { isCancellationRequested: false, onCancellationRequested: () => "" } });
-        const request = {
-          type: types_1.eServiceTypes.managed,
-          name: instanceName,
-          relationships: {
-            space: { data: { guid: spaceGuid } },
-            service_plan: { data: { guid: planGuid } }
-          },
-          parameters: params,
-          tags
-        };
-        const result = yield execQuery({ query: ["curl", "/v3/service_instances", "-d", (0, comment_json_1.stringify)(request), "-X", "POST"], token: progress.cancelToken });
-        progress.progress.report({ "message": `
+    async function cfCreateService(planGuid, instanceName, params, tags, progress, maxNumberOfAttemps) {
+      const spaceGuid = await (0, utils_1.getSpaceGuidThrowIfUndefined)();
+      maxNumberOfAttemps = _23.isNil(maxNumberOfAttemps) ? 45 : maxNumberOfAttemps;
+      progress = _23.defaults(progress, { progress: { report: () => "" } }, { cancelToken: { isCancellationRequested: false, onCancellationRequested: () => "" } });
+      const request = {
+        type: types_1.eServiceTypes.managed,
+        name: instanceName,
+        relationships: {
+          space: { data: { guid: spaceGuid } },
+          service_plan: { data: { guid: planGuid } }
+        },
+        parameters: params,
+        tags
+      };
+      const result = await execQuery({
+        query: ["curl", "/v3/service_instances", "-d", (0, comment_json_1.stringify)(request), "-X", "POST"],
+        token: progress.cancelToken
+      });
+      progress.progress.report({ message: `
 ${messages_1.messages.service_creation_started}`, increment: 1 });
-        const query = { filters: [{ key: types_1.eFilters.names, value: encodeURIComponent(instanceName) }, { key: types_1.eFilters.space_guids, value: spaceGuid }] };
-        return new Promise((resolve2, reject2) => {
-          waitForEntity(resolve2, reject2, !_23.isEmpty(_23.replace(result, "\n", "")) ? (0, comment_json_1.parse)(result) : result, 0, maxNumberOfAttemps, () => getServiceInstance(query, progress.cancelToken), progress);
-        });
+      const query = {
+        filters: [
+          { key: types_1.eFilters.names, value: encodeURIComponent(instanceName) },
+          { key: types_1.eFilters.space_guids, value: spaceGuid }
+        ]
+      };
+      return new Promise((resolve2, reject2) => {
+        waitForEntity(resolve2, reject2, !_23.isEmpty(_23.replace(result, "\n", "")) ? (0, comment_json_1.parse)(result) : result, 0, maxNumberOfAttemps, () => getServiceInstance(query, progress.cancelToken), progress);
       });
     }
     exports2.cfCreateService = cfCreateService;
-    function cfCreateUpsInstance(info) {
-      return __awaiter(this, void 0, void 0, function* () {
-        let spaceGuid = info.space_guid;
-        if (!spaceGuid) {
-          spaceGuid = yield (0, utils_1.getSpaceGuidThrowIfUndefined)();
-        }
-        return evaluateResponse((0, comment_json_1.parse)(yield execQuery({
-          query: ["curl", `/v3/service_instances`, "-d", (0, comment_json_1.stringify)(_23.merge({
+    async function cfCreateUpsInstance(info) {
+      let spaceGuid = info.space_guid;
+      if (!spaceGuid) {
+        spaceGuid = await (0, utils_1.getSpaceGuidThrowIfUndefined)();
+      }
+      return evaluateResponse((0, comment_json_1.parse)(await execQuery({
+        query: [
+          "curl",
+          `/v3/service_instances`,
+          "-d",
+          (0, comment_json_1.stringify)(_23.merge({
             name: info.instanceName,
             type: types_1.eServiceTypes.user_provided,
             relationships: { space: { data: { guid: spaceGuid } } }
-          }, info.credentials ? { "credentials": info.credentials } : {}, info.route_service_url ? { "route_service_url": info.route_service_url } : {}, info.syslog_drain_url ? { "syslog_drain_url": info.syslog_drain_url } : {}, info.tags ? { "tags": info.tags } : {})), "-X", "POST"]
-        })));
-      });
+          }, info.credentials ? { credentials: info.credentials } : {}, info.route_service_url ? { route_service_url: info.route_service_url } : {}, info.syslog_drain_url ? { syslog_drain_url: info.syslog_drain_url } : {}, info.tags ? { tags: info.tags } : {})),
+          "-X",
+          "POST"
+        ]
+      })));
     }
     exports2.cfCreateUpsInstance = cfCreateUpsInstance;
-    function cfLogin(endpoint, user, pwd) {
-      return __awaiter(this, void 0, void 0, function* () {
-        let result;
-        try {
-          result = yield execQuery({ query: ["login", "-a", endpoint, "-u", user, "-p", pwd, "-o", "no-org-for-now", "-s", "no-space-for-now"], options: { env: { "CF_COLOR": "false" } } }, void 0, true);
-        } catch (e) {
-          result = _23.get(e, "message", "");
-        }
-        return result.includes(`Authenticating...${types_1.NEW_LINE}${types_1.OK}`) ? types_1.OK : result;
-      });
+    async function cfLogin(options) {
+      let result;
+      try {
+        let query = ["login", "-a"];
+        query = "ssoPasscode" in options ? _23.concat(query, [
+          options.endpoint,
+          "--sso-passcode",
+          options.ssoPasscode,
+          "-o",
+          "no-org-for-now",
+          "-s",
+          "no-space-for-now"
+        ]) : _23.concat(query, [
+          options.endpoint,
+          "-u",
+          options.user,
+          "-p",
+          options.password,
+          "-o",
+          "no-org-for-now",
+          "-s",
+          "no-space-for-now"
+        ]);
+        query = _23.concat(query, options.origin ? ["--origin", options.origin] : []);
+        result = await execQuery({
+          query,
+          options: { env: { CF_COLOR: "false" } }
+        }, void 0, true);
+      } catch (e) {
+        result = _23.get(e, "message", "");
+      }
+      return result.includes(`Authenticating...${types_1.NEW_LINE}${types_1.OK}`) ? types_1.OK : result;
     }
     exports2.cfLogin = cfLogin;
-    function cfGetAvailableOrgs(query) {
-      return __awaiter(this, void 0, void 0, function* () {
-        evaluateQueryFilters(query, resourceOrganizations);
-        return execTotal({ query: `/v3/organizations?${composeQuery(query)}` }, (resource) => {
-          return Promise.resolve({ label: (0, utils_1.getName)(resource), guid: (0, utils_1.getGuid)(resource) });
+    async function cfGetAvailableOrgs(query) {
+      evaluateQueryFilters(query, resourceOrganizations);
+      const ret = execTotal({ query: `/v3/organizations?${composeQuery(query)}` }, (resource) => {
+        return Promise.resolve({
+          label: (0, utils_1.getName)(resource),
+          guid: (0, utils_1.getGuid)(resource)
         });
       });
+      return ret;
     }
     exports2.cfGetAvailableOrgs = cfGetAvailableOrgs;
-    function cfGetAvailableSpaces(orgGuid) {
-      return __awaiter(this, void 0, void 0, function* () {
-        const query = (0, utils_1.ensureQuery)();
-        if (orgGuid) {
-          _23.merge(query.filters, [{ key: types_1.eFilters.organization_guids, value: orgGuid }]);
-        }
-        evaluateQueryFilters(query, resourceSpaces);
-        return execTotal({ query: `/v3/spaces?${composeQuery(query)}` }, (resource) => {
-          return Promise.resolve({
-            label: (0, utils_1.getName)(resource),
-            guid: (0, utils_1.getGuid)(resource),
-            orgGUID: (0, utils_1.getOrgGUID)(resource)
-          });
+    async function cfGetAvailableSpaces(orgGuid) {
+      const query = (0, utils_1.ensureQuery)();
+      if (orgGuid) {
+        _23.merge(query.filters, [{ key: types_1.eFilters.organization_guids, value: orgGuid }]);
+      }
+      evaluateQueryFilters(query, resourceSpaces);
+      const ret = execTotal({ query: `/v3/spaces?${composeQuery(query)}` }, (resource) => {
+        return Promise.resolve({
+          label: (0, utils_1.getName)(resource),
+          guid: (0, utils_1.getGuid)(resource),
+          orgGUID: (0, utils_1.getOrgGUID)(resource)
         });
       });
+      return ret;
     }
     exports2.cfGetAvailableSpaces = cfGetAvailableSpaces;
     function resolvePlanInfo(data, service) {
@@ -47256,224 +47241,193 @@ ${messages_1.messages.service_creation_started}`, increment: 1 });
         }
       } : {});
     }
-    function cfGetServicePlansList(query, token2) {
-      return __awaiter(this, void 0, void 0, function* () {
-        query = yield (0, utils_1.padQuerySpace)(query, [{ key: types_1.eFilters.include, value: "service_offering" }]);
-        evaluateQueryFilters(query, resourceServicePlan);
-        return execTotal({ query: `/v3/service_plans?${composeQuery(query)}`, token: token2 }, (data, included) => {
-          return Promise.resolve(resolvePlanInfo(data, _23.find(_23.get(included, "service_offerings"), ["guid", _23.get(data, ["relationships", "service_offering", "data", "guid"])])));
-        });
+    async function cfGetServicePlansList(query, token2) {
+      query = await (0, utils_1.padQuerySpace)(query, [{ key: types_1.eFilters.include, value: "service_offering" }]);
+      evaluateQueryFilters(query, resourceServicePlan);
+      return execTotal({ query: `/v3/service_plans?${composeQuery(query)}`, token: token2 }, (data, included) => {
+        return Promise.resolve(resolvePlanInfo(data, _23.find(_23.get(included, "service_offerings"), [
+          "guid",
+          _23.get(data, ["relationships", "service_offering", "data", "guid"])
+        ])));
       });
     }
     exports2.cfGetServicePlansList = cfGetServicePlansList;
-    function cfGetServiceInstances(query, token2) {
-      return __awaiter(this, void 0, void 0, function* () {
-        query = yield (0, utils_1.padQuerySpace)(query, [
-          { key: types_1.eFilters.service_plan, value: "guid,name", op: types_1.eOperation.fields },
-          { key: types_1.eFilters.type, value: types_1.eServiceTypes.managed }
-        ]);
-        evaluateQueryFilters(query, resourceServiceInstances);
-        return resolveServiceInstances(yield execTotal({ query: `/v3/service_instances?${composeQuery(query)}`, token: token2 }, (info) => getServiceInstanceItem(info)));
-      });
+    async function cfGetServiceInstances(query, token2) {
+      query = await (0, utils_1.padQuerySpace)(query, [
+        { key: types_1.eFilters.service_plan, value: "guid,name", op: types_1.eOperation.fields },
+        { key: types_1.eFilters.type, value: types_1.eServiceTypes.managed }
+      ]);
+      evaluateQueryFilters(query, resourceServiceInstances);
+      return resolveServiceInstances(await execTotal({ query: `/v3/service_instances?${composeQuery(query)}`, token: token2 }, (info) => getServiceInstanceItem(info)));
     }
     exports2.cfGetServiceInstances = cfGetServiceInstances;
-    function cfGetManagedServiceInstances(query, token2) {
-      return __awaiter(this, void 0, void 0, function* () {
-        return cfGetServiceInstances(query, token2);
-      });
+    async function cfGetManagedServiceInstances(query, token2) {
+      return cfGetServiceInstances(query, token2);
     }
     exports2.cfGetManagedServiceInstances = cfGetManagedServiceInstances;
-    function cfSetOrgSpace(org, space) {
-      return __awaiter(this, void 0, void 0, function* () {
-        yield execQuery({ query: _23.concat(["target", "-o", org], space ? ["-s", space] : []) });
-        clearCacheServiceInstances();
-        void cfGetManagedServiceInstances();
-      });
+    async function cfSetOrgSpace(org, space) {
+      await execQuery({ query: _23.concat(["target", "-o", org], space ? ["-s", space] : []) });
+      clearCacheServiceInstances();
+      void cfGetManagedServiceInstances();
     }
     exports2.cfSetOrgSpace = cfSetOrgSpace;
-    function cfGetTargets() {
-      return __awaiter(this, void 0, void 0, function* () {
-        const targets = yield execQuery({ query: ["targets"] });
-        if (_23.includes(targets, "No targets have been saved yet") || _23.includes(targets, "is not a registered command")) {
-          return [{ label: types_1.DEFAULT_TARGET, isCurrent: true, isDirty: false }];
-        }
-        const targetSubstrings = _23.compact(_23.map(targets.split(types_1.NEW_LINE), (targetSubstring) => targetSubstring.trim()));
-        return _23.map(targetSubstrings, (targetSubstring) => {
-          const parentthesisPos = targetSubstring.indexOf("(current");
-          if (parentthesisPos > 0) {
-            targetSubstring = targetSubstring.substring(0, parentthesisPos);
-            return { label: targetSubstring.trim(), isCurrent: true, isDirty: targetSubstring.includes("modified") };
-          }
-          return { label: targetSubstring, isCurrent: false, isDirty: false };
-        });
+    async function cfGetTargets() {
+      const targets = await execQuery({ query: ["targets"] });
+      if (_23.includes(targets, "No targets have been saved yet") || _23.includes(targets, "is not a registered command")) {
+        return [{ label: types_1.DEFAULT_TARGET, isCurrent: true, isDirty: false }];
+      }
+      const targetSubstrings = _23.compact(_23.map(targets.split(types_1.NEW_LINE), (targetSubstring) => targetSubstring.trim()));
+      return _23.map(targetSubstrings, (targetSubstring) => {
+        const parentthesisPos = targetSubstring.indexOf("(current");
+        if (parentthesisPos > 0) {
+          targetSubstring = targetSubstring.substring(0, parentthesisPos);
+          return { label: targetSubstring.trim(), isCurrent: true, isDirty: targetSubstring.includes("modified") };
+        }
+        return { label: targetSubstring, isCurrent: false, isDirty: false };
       });
     }
     exports2.cfGetTargets = cfGetTargets;
-    function cfGetServices(query, cancellationToken) {
-      return __awaiter(this, void 0, void 0, function* () {
-        evaluateQueryFilters(query, resourceServiceOfferings);
-        return execTotal({ query: `/v3/service_offerings?${composeQuery(yield (0, utils_1.padQuerySpace)(query))}`, token: cancellationToken }, (service) => {
-          return Promise.resolve({
-            label: (0, utils_1.getName)(service),
-            service_plans_url: _23.get(service, ["links", "service_plans", "href"]),
-            guid: (0, utils_1.getGuid)(service),
-            description: (0, utils_1.getDescription)(service)
-          });
+    async function cfGetServices(query, cancellationToken) {
+      evaluateQueryFilters(query, resourceServiceOfferings);
+      return execTotal({ query: `/v3/service_offerings?${composeQuery(await (0, utils_1.padQuerySpace)(query))}`, token: cancellationToken }, (service) => {
+        return Promise.resolve({
+          label: (0, utils_1.getName)(service),
+          service_plans_url: _23.get(service, ["links", "service_plans", "href"]),
+          guid: (0, utils_1.getGuid)(service),
+          description: (0, utils_1.getDescription)(service)
         });
       });
     }
     exports2.cfGetServices = cfGetServices;
-    function cfGetSpaceServices(query, spaceGUID, cancellationToken) {
-      return __awaiter(this, void 0, void 0, function* () {
-        return cfGetServices((0, utils_1.padQuery)(query, [{ key: types_1.eFilters.space_guids, value: spaceGUID }]), cancellationToken);
-      });
+    async function cfGetSpaceServices(query, spaceGUID, cancellationToken) {
+      return cfGetServices((0, utils_1.padQuery)(query, [{ key: types_1.eFilters.space_guids, value: spaceGUID }]), cancellationToken);
     }
     exports2.cfGetSpaceServices = cfGetSpaceServices;
-    function cfBindLocalServices(filePath, instanceNames, tags, serviceKeyNames, serviceKeyParams) {
-      return __awaiter(this, void 0, void 0, function* () {
-        yield execQuery({
-          query: [
-            "bind-local",
-            "-path",
-            filePath,
-            "-service-names",
-            ...instanceNames,
-            ..._23.size(tags) ? _23.concat(["-tags"], tags) : [],
-            ..._23.size(serviceKeyNames) ? _23.concat(["-service-keys"], serviceKeyNames) : [],
-            ..._23.size(serviceKeyParams) ? _23.concat(["-params"], _23.map(serviceKeyParams, (param) => {
-              return (0, comment_json_1.stringify)(param);
-            })) : []
-          ]
-        });
+    async function cfBindLocalServices(filePath, instanceNames, tags, serviceKeyNames, serviceKeyParams, quoteVcap) {
+      await execQuery({
+        query: [
+          "bind-local",
+          "-path",
+          filePath,
+          "-service-names",
+          ...instanceNames,
+          ..._23.size(tags) ? _23.concat(["-tags"], tags) : [],
+          ..._23.size(serviceKeyNames) ? _23.concat(["-service-keys"], serviceKeyNames) : [],
+          ..._23.size(serviceKeyParams) ? _23.concat(["-params"], _23.map(serviceKeyParams, (param) => {
+            return (0, comment_json_1.stringify)(param);
+          })) : [],
+          ...quoteVcap ? ["-quote-vcap"] : []
+        ]
       });
     }
     exports2.cfBindLocalServices = cfBindLocalServices;
-    function cfBindLocalUps(filePath, instanceNames, tags) {
-      return __awaiter(this, void 0, void 0, function* () {
-        yield execQuery({
-          query: _23.concat(["bind-local-ups", "-path", filePath], _23.reduce(instanceNames, (result, instanceName) => {
-            result = _23.concat(result, [`-service-names`, `${instanceName}`]);
-            return result;
-          }, []), _23.reduce(tags, (result, tag) => {
-            result = _23.concat(result, [`-tags`, `${tag}`]);
-            return result;
-          }, []))
-        });
+    async function cfBindLocalUps(filePath, instanceNames, tags, quoteVcap) {
+      await execQuery({
+        query: _23.concat(["bind-local-ups", "-path", filePath], _23.reduce(instanceNames, (result, instanceName) => {
+          result = _23.concat(result, [`-service-names`, `${instanceName}`]);
+          return result;
+        }, []), _23.reduce(tags, (result, tag) => {
+          result = _23.concat(result, [`-tags`, `${tag}`]);
+          return result;
+        }, []), quoteVcap ? ["-quote-vcap"] : [])
       });
     }
     exports2.cfBindLocalUps = cfBindLocalUps;
-    function cfGetInstanceMetadata(instanceName) {
-      return __awaiter(this, void 0, void 0, function* () {
-        const result = yield cfGetServiceInstances(yield (0, utils_1.padQuerySpace)({
-          filters: [
-            { key: types_1.eFilters.names, value: encodeURIComponent(instanceName) },
-            { key: types_1.eFilters.type, value: types_1.eServiceTypes.managed }
-          ]
-        }));
-        if (!_23.size(result)) {
-          throw new Error(messages_1.messages.service_not_found(instanceName));
-        }
-        const serviceInstance = _23.head(result);
-        return {
-          serviceName: (0, utils_1.getLabel)(serviceInstance),
-          plan: _23.get(serviceInstance, "plan"),
-          plan_guid: _23.get(serviceInstance, "plan_guid"),
-          service: _23.get(serviceInstance, "serviceName")
-        };
-      });
+    async function cfGetInstanceMetadata(instanceName) {
+      const result = await cfGetServiceInstances(await (0, utils_1.padQuerySpace)({
+        filters: [
+          { key: types_1.eFilters.names, value: encodeURIComponent(instanceName) },
+          { key: types_1.eFilters.type, value: types_1.eServiceTypes.managed }
+        ]
+      }));
+      if (!_23.size(result)) {
+        throw new Error(messages_1.messages.service_not_found(instanceName));
+      }
+      const serviceInstance = _23.head(result);
+      return {
+        serviceName: (0, utils_1.getLabel)(serviceInstance),
+        plan: _23.get(serviceInstance, "plan"),
+        plan_guid: _23.get(serviceInstance, "plan_guid"),
+        service: _23.get(serviceInstance, "serviceName")
+      };
     }
     exports2.cfGetInstanceMetadata = cfGetInstanceMetadata;
-    function cfGetAuthToken() {
-      return __awaiter(this, void 0, void 0, function* () {
-        return yield execQuery({ query: ["oauth-token"] });
-      });
+    async function cfGetAuthToken() {
+      return await execQuery({ query: ["oauth-token"] });
     }
     exports2.cfGetAuthToken = cfGetAuthToken;
-    function cfGetTarget(weak) {
-      return __awaiter(this, void 0, void 0, function* () {
-        if (!weak) {
-          yield cfGetAuthToken();
-        }
-        return (0, utils_1.parseRawDictData)(yield execQuery({ query: ["target"], options: { env: { "CF_COLOR": "false" } } }));
-      });
+    async function cfGetTarget(weak) {
+      if (!weak) {
+        await cfGetAuthToken();
+      }
+      return (0, utils_1.parseRawDictData)(await execQuery({ query: ["target"], options: { env: { CF_COLOR: "false" } } }));
     }
     exports2.cfGetTarget = cfGetTarget;
-    function cfGetServicePlans(servicePlansUrl) {
-      return __awaiter(this, void 0, void 0, function* () {
-        return execTotal({ query: servicePlansUrl }, (data) => {
-          return Promise.resolve({ label: (0, utils_1.getName)(data), guid: (0, utils_1.getGuid)(data), description: (0, utils_1.getDescription)(data) });
-        });
+    async function cfGetServicePlans(servicePlansUrl) {
+      return execTotal({ query: servicePlansUrl }, (data) => {
+        return Promise.resolve({ label: (0, utils_1.getName)(data), guid: (0, utils_1.getGuid)(data), description: (0, utils_1.getDescription)(data) });
       });
     }
     exports2.cfGetServicePlans = cfGetServicePlans;
-    function cfLogout() {
-      return __awaiter(this, void 0, void 0, function* () {
-        yield execQuery({ query: ["logout"] });
-      });
+    async function cfLogout() {
+      await execQuery({ query: ["logout"] });
     }
     exports2.cfLogout = cfLogout;
-    function cfGetServiceKeys(query, token2) {
-      return __awaiter(this, void 0, void 0, function* () {
-        evaluateQueryFilters(query, resourceServiceCredentialsBinding);
-        return execTotal({ query: `/v3/service_credential_bindings?${composeQuery((0, utils_1.padQuery)(query, [{ key: types_1.eFilters.type, value: "key" }]))}`, token: token2 });
+    async function cfGetServiceKeys(query, token2) {
+      evaluateQueryFilters(query, resourceServiceCredentialsBinding);
+      return execTotal({
+        query: `/v3/service_credential_bindings?${composeQuery((0, utils_1.padQuery)(query, [{ key: types_1.eFilters.type, value: "key" }]))}`,
+        token: token2
       });
     }
     exports2.cfGetServiceKeys = cfGetServiceKeys;
-    function cfGetInstanceCredentials(query, token2) {
-      return __awaiter(this, void 0, void 0, function* () {
-        const results = _23.map(yield cfGetServiceKeys(query, token2), (resource) => {
-          return execQuery({ query: ["curl", `/v3/service_credential_bindings/${(0, utils_1.getGuid)(resource)}/details`], token: token2 }, (data) => data).then((data) => data).catch(() => {
-            return {};
-          });
+    async function cfGetInstanceCredentials(query, token2) {
+      const results = _23.map(await cfGetServiceKeys(query, token2), (resource) => {
+        return execQuery({ query: ["curl", `/v3/service_credential_bindings/${(0, utils_1.getGuid)(resource)}/details`], token: token2 }, (data) => data).then((data) => data).catch(() => {
+          return {};
         });
-        return Promise.all(_23.compact(results));
       });
+      return Promise.all(_23.compact(results));
     }
     exports2.cfGetInstanceCredentials = cfGetInstanceCredentials;
-    function cfGetInstanceKeyParameters(instanceName) {
-      return __awaiter(this, void 0, void 0, function* () {
-        const instance = yield getServiceInstance({ filters: [{ key: types_1.eFilters.names, value: encodeURIComponent(instanceName) }] });
-        const query = { filters: [{ key: types_1.eFilters.service_instance_guids, value: (0, utils_1.getGuid)(instance) }] };
-        let keys = yield cfGetServiceKeys(query);
-        if (!_23.size(keys)) {
-          yield cli_1.Cli.execute(["create-service-key", encodeURIComponent(instanceName), "key"]);
-          keys = yield cfGetServiceKeys((0, utils_1.padQuery)(query, [{ key: types_1.eFilters.names, value: "key" }]));
-        }
-        return execQuery({ query: ["curl", `/v3/service_credential_bindings/${(0, utils_1.getGuid)(_23.head(keys))}/details`] }, (data) => data).then((data) => data).catch(() => {
-          return {};
-        });
+    async function cfGetInstanceKeyParameters(instanceName) {
+      const instance = await getServiceInstance({
+        filters: [{ key: types_1.eFilters.names, value: encodeURIComponent(instanceName) }]
+      });
+      const query = { filters: [{ key: types_1.eFilters.service_instance_guids, value: (0, utils_1.getGuid)(instance) }] };
+      let keys = await cfGetServiceKeys(query);
+      if (!_23.size(keys)) {
+        await cli_1.Cli.execute(["create-service-key", encodeURIComponent(instanceName), "key", "--wait"]);
+        keys = await cfGetServiceKeys((0, utils_1.padQuery)(query, [{ key: types_1.eFilters.names, value: "key" }]));
+      }
+      return execQuery({ query: ["curl", `/v3/service_credential_bindings/${(0, utils_1.getGuid)(_23.head(keys))}/details`] }, (data) => data).then((data) => data).catch(() => {
+        return {};
       });
     }
     exports2.cfGetInstanceKeyParameters = cfGetInstanceKeyParameters;
-    function cfGetServiceInstancesList(query, token2) {
-      return __awaiter(this, void 0, void 0, function* () {
-        query = yield (0, utils_1.padQuerySpace)(query, [{ key: types_1.eFilters.service_plan, value: "guid,name", op: types_1.eOperation.fields }]);
-        evaluateQueryFilters(query, resourceServiceInstances);
-        return resolveServiceInstances(yield execTotal({ query: `/v3/service_instances?${composeQuery(query)}`, token: token2 }, (info) => getServiceInstanceItem(info)));
-      });
+    async function cfGetServiceInstancesList(query, token2) {
+      query = await (0, utils_1.padQuerySpace)(query, [{ key: types_1.eFilters.service_plan, value: "guid,name", op: types_1.eOperation.fields }]);
+      evaluateQueryFilters(query, resourceServiceInstances);
+      return resolveServiceInstances(await execTotal({ query: `/v3/service_instances?${composeQuery(query)}`, token: token2 }, (info) => getServiceInstanceItem(info)));
     }
     exports2.cfGetServiceInstancesList = cfGetServiceInstancesList;
-    function cfGetApps(query, token2) {
-      return __awaiter(this, void 0, void 0, function* () {
-        evaluateQueryFilters(query, resourceApps);
-        return execTotal({ query: `/v3/apps?${composeQuery(yield (0, utils_1.padQuerySpace)(query))}`, token: token2 });
-      });
+    async function cfGetApps(query, token2) {
+      evaluateQueryFilters(query, resourceApps);
+      return execTotal({ query: `/v3/apps?${composeQuery(await (0, utils_1.padQuerySpace)(query))}`, token: token2 });
     }
     exports2.cfGetApps = cfGetApps;
-    function cfApi(params) {
-      return __awaiter(this, void 0, void 0, function* () {
-        const query = ["api"];
-        if (params === null || params === void 0 ? void 0 : params.url) {
-          query.push(params.url);
-        }
-        if (params === null || params === void 0 ? void 0 : params.skip_ssl_validation) {
-          query.push("--skip-ssl-validation");
-        }
-        if (params === null || params === void 0 ? void 0 : params.unset) {
-          query.push("--unset");
-        }
-        return (0, utils_1.parseRawDictData)(yield execQuery({ query: [...query] }));
-      });
+    async function cfApi(params) {
+      const query = ["api"];
+      if (params === null || params === void 0 ? void 0 : params.url) {
+        query.push(params.url);
+      }
+      if (params === null || params === void 0 ? void 0 : params.skip_ssl_validation) {
+        query.push("--skip-ssl-validation");
+      }
+      if (params === null || params === void 0 ? void 0 : params.unset) {
+        query.push("--unset");
+      }
+      return (0, utils_1.parseRawDictData)(await execQuery({ query: [...query] }));
     }
     exports2.cfApi = cfApi;
   }
@@ -47483,55 +47437,31 @@ ${messages_1.messages.service_creation_started}`, increment: 1 });
 var require_cfServicesUtil = __commonJS({
   "../../node_modules/@sap/cf-tools/out/src/cfServicesUtil.js"(exports2) {
     "use strict";
-    var __awaiter = exports2 && exports2.__awaiter || function(thisArg, _arguments, P, generator) {
-      function adopt(value) {
-        return value instanceof P ? value : new P(function(resolve2) {
-          resolve2(value);
-        });
-      }
-      return new (P || (P = Promise))(function(resolve2, reject2) {
-        function fulfilled(value) {
-          try {
-            step(generator.next(value));
-          } catch (e) {
-            reject2(e);
-          }
-        }
-        function rejected(value) {
-          try {
-            step(generator["throw"](value));
-          } catch (e) {
-            reject2(e);
-          }
-        }
-        function step(result) {
-          result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
-        }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-      });
-    };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.isTargetSet = exports2.getInstanceMetadata = exports2.createServiceInstance = exports2.getInstanceCredentials = exports2.getServicesInstancesFilteredByType = void 0;
     var cli_1 = require_cli3();
     var _23 = require_lodash();
     var types_1 = require_types2();
     var cf_local_1 = require_cf_local();
-    function getServicesInstancesFilteredByType(serviceTypes) {
-      return __awaiter(this, void 0, void 0, function* () {
-        const guids = _23.map(yield (0, cf_local_1.cfGetServicePlansList)({ filters: [{ key: types_1.eFilters.service_offering_names, value: _23.join(_23.map(serviceTypes, encodeURIComponent)) }] }), "guid");
-        return _23.size(guids) ? (0, cf_local_1.cfGetManagedServiceInstances)({ "filters": [{ key: types_1.eFilters.service_plan_guids, value: _23.join(guids) }] }) : [];
-      });
+    async function getServicesInstancesFilteredByType(serviceTypes) {
+      const guids = _23.map(await (0, cf_local_1.cfGetServicePlansList)({
+        filters: [{ key: types_1.eFilters.service_offering_names, value: _23.join(_23.map(serviceTypes, encodeURIComponent)) }]
+      }), "guid");
+      return _23.size(guids) ? (0, cf_local_1.cfGetManagedServiceInstances)({ filters: [{ key: types_1.eFilters.service_plan_guids, value: _23.join(guids) }] }) : [];
     }
     exports2.getServicesInstancesFilteredByType = getServicesInstancesFilteredByType;
     function getInstanceCredentials(instanceName) {
       return (0, cf_local_1.cfGetInstanceKeyParameters)(instanceName);
     }
     exports2.getInstanceCredentials = getInstanceCredentials;
-    function createServiceInstance(serviceType, servicePlan, serviceInstanceName, config) {
+    function createServiceInstance(serviceType, servicePlan, serviceInstanceName, config, nowait) {
       let args = ["create-service", serviceType, servicePlan, serviceInstanceName];
       if (config) {
         args = args.concat(["-c", config]);
       }
+      if (nowait !== true) {
+        args.push("--wait");
+      }
       return cli_1.Cli.execute(args);
     }
     exports2.createServiceInstance = createServiceInstance;
@@ -47539,11 +47469,9 @@ var require_cfServicesUtil = __commonJS({
       return (0, cf_local_1.cfGetInstanceMetadata)(instanceName);
     }
     exports2.getInstanceMetadata = getInstanceMetadata;
-    function isTargetSet() {
-      return __awaiter(this, void 0, void 0, function* () {
-        const target = yield (0, cf_local_1.cfGetTarget)();
-        return !_23.isEmpty(target.org) && !_23.isEmpty(target.space);
-      });
+    async function isTargetSet() {
+      const target = await (0, cf_local_1.cfGetTarget)();
+      return !_23.isEmpty(target.org) && !_23.isEmpty(target.space);
     }
     exports2.isTargetSet = isTargetSet;
   }
@@ -47555,9 +47483,13 @@ var require_src5 = __commonJS({
     "use strict";
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0) k2 = k;
-      Object.defineProperty(o, k2, { enumerable: true, get: function() {
-        return m[k];
-      } });
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
     } : function(o, m, k, k2) {
       if (k2 === void 0) k2 = k;
       o[k2] = m[k];
@@ -47565,33 +47497,6 @@ var require_src5 = __commonJS({
     var __exportStar = exports2 && exports2.__exportStar || function(m, exports3) {
       for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports3, p)) __createBinding(exports3, m, p);
     };
-    var __awaiter = exports2 && exports2.__awaiter || function(thisArg, _arguments, P, generator) {
-      function adopt(value) {
-        return value instanceof P ? value : new P(function(resolve2) {
-          resolve2(value);
-        });
-      }
-      return new (P || (P = Promise))(function(resolve2, reject2) {
-        function fulfilled(value) {
-          try {
-            step(generator.next(value));
-          } catch (e) {
-            reject2(e);
-          }
-        }
-        function rejected(value) {
-          try {
-            step(generator["throw"](value));
-          } catch (e) {
-            reject2(e);
-          }
-        }
-        function step(result) {
-          result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
-        }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-      });
-    };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.apiGetInstanceMetadata = exports2.apiCreateServiceInstance = exports2.apiGetInstanceCredentials = exports2.apiGetServicesInstancesFilteredByType = void 0;
     __exportStar(require_types2(), exports2);
@@ -47600,28 +47505,20 @@ var require_src5 = __commonJS({
     __exportStar(require_messages(), exports2);
     __exportStar(require_utils3(), exports2);
     var serviceUtils = require_cfServicesUtil();
-    function apiGetServicesInstancesFilteredByType(serviceTypes) {
-      return __awaiter(this, void 0, void 0, function* () {
-        return serviceUtils.getServicesInstancesFilteredByType(serviceTypes);
-      });
+    async function apiGetServicesInstancesFilteredByType(serviceTypes) {
+      return serviceUtils.getServicesInstancesFilteredByType(serviceTypes);
     }
     exports2.apiGetServicesInstancesFilteredByType = apiGetServicesInstancesFilteredByType;
-    function apiGetInstanceCredentials(instanceName) {
-      return __awaiter(this, void 0, void 0, function* () {
-        return serviceUtils.getInstanceCredentials(instanceName);
-      });
+    async function apiGetInstanceCredentials(instanceName) {
+      return serviceUtils.getInstanceCredentials(instanceName);
     }
     exports2.apiGetInstanceCredentials = apiGetInstanceCredentials;
-    function apiCreateServiceInstance(serviceType, servicePlan, instanceName, config) {
-      return __awaiter(this, void 0, void 0, function* () {
-        return serviceUtils.createServiceInstance(serviceType, servicePlan, instanceName, config);
-      });
+    async function apiCreateServiceInstance(serviceType, servicePlan, instanceName, config) {
+      return serviceUtils.createServiceInstance(serviceType, servicePlan, instanceName, config);
     }
     exports2.apiCreateServiceInstance = apiCreateServiceInstance;
-    function apiGetInstanceMetadata(instanceName) {
-      return __awaiter(this, void 0, void 0, function* () {
-        return serviceUtils.getInstanceMetadata(instanceName);
-      });
+    async function apiGetInstanceMetadata(instanceName) {
+      return serviceUtils.getInstanceMetadata(instanceName);
     }
     exports2.apiGetInstanceMetadata = apiGetInstanceMetadata;
   }
@@ -47641,87 +47538,12 @@ var require_app_studio_env = __commonJS({
   }
 });
 
-// ../../node_modules/@sap-ux/btp-utils/dist/app-studio.js
-var require_app_studio = __commonJS({
-  "../../node_modules/@sap-ux/btp-utils/dist/app-studio.js"(exports2) {
-    "use strict";
-    var __importDefault = exports2 && exports2.__importDefault || function(mod) {
-      return mod && mod.__esModule ? mod : { "default": mod };
-    };
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.BAS_DEST_INSTANCE_CRED_HEADER = void 0;
-    exports2.isAppStudio = isAppStudio;
-    exports2.getAppStudioProxyURL = getAppStudioProxyURL;
-    exports2.getAppStudioBaseURL = getAppStudioBaseURL;
-    exports2.getCredentialsForDestinationService = getCredentialsForDestinationService;
-    exports2.getDestinationUrlForAppStudio = getDestinationUrlForAppStudio;
-    exports2.listDestinations = listDestinations;
-    exports2.exposePort = exposePort;
-    var axios_1 = __importDefault(require_axios());
-    var cf_tools_1 = require_src5();
-    var app_studio_env_1 = require_app_studio_env();
-    exports2.BAS_DEST_INSTANCE_CRED_HEADER = "bas-destination-instance-cred";
-    function isAppStudio() {
-      return !!process.env[app_studio_env_1.ENV.H2O_URL];
-    }
-    function getAppStudioProxyURL() {
-      return process.env[app_studio_env_1.ENV.PROXY_URL];
-    }
-    function getAppStudioBaseURL() {
-      return process.env[app_studio_env_1.ENV.H2O_URL];
-    }
-    async function getCredentialsForDestinationService(instance) {
-      var _a, _b;
-      try {
-        const serviceInfo = await (0, cf_tools_1.cfGetInstanceKeyParameters)(instance);
-        if (!serviceInfo) {
-          throw new Error(`No destination instance ${instance} found`);
-        }
-        const serviceCredentials = serviceInfo.credentials;
-        if (!serviceCredentials) {
-          throw new Error(`No credentials for destination instance ${instance} found`);
-        }
-        const clientId = ((_a = serviceCredentials.uaa) == null ? void 0 : _a.clientid) || serviceCredentials.clientid;
-        const clientSecret = ((_b = serviceCredentials.uaa) == null ? void 0 : _b.clientsecret) || serviceCredentials.clientsecret;
-        return Buffer.from(`${encodeURIComponent(clientId)}:${encodeURIComponent(clientSecret)}`).toString("base64");
-      } catch (error2) {
-        throw new Error(`An error occurred while retrieving service key for the destination instance ${instance}: ${error2}`);
-      }
-    }
-    function getDestinationUrlForAppStudio(name, path) {
-      const origin = `https://${name}.dest`;
-      return path && path.length > 1 ? new URL(path, origin).toString() : origin;
-    }
-    async function listDestinations() {
-      const destinations = {};
-      await axios_1.default.get("/reload", { baseURL: process.env[app_studio_env_1.ENV.PROXY_URL] });
-      const response = await axios_1.default.get("/api/listDestinations", { baseURL: process.env[app_studio_env_1.ENV.H2O_URL] });
-      const list = Array.isArray(response.data) ? response.data : [];
-      list.forEach((destination) => {
-        if (destination.WebIDEEnabled) {
-          destinations[destination.Name] = destination;
-        }
-      });
-      return destinations;
-    }
-    async function exposePort(port, logger) {
-      try {
-        const response = await axios_1.default.get(`http://localhost:3001/AppStudio/api/getHostByPort?port=${port}`);
-        return `${response.data.result}`;
-      } catch (error2) {
-        logger == null ? void 0 : logger.error(`Port ${port} was not exposed!`);
-        return "";
-      }
-    }
-  }
-});
-
 // ../../node_modules/@sap-ux/btp-utils/dist/destination.js
 var require_destination = __commonJS({
   "../../node_modules/@sap-ux/btp-utils/dist/destination.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.DestinationProxyType = exports2.WebIDEAdditionalData = exports2.WebIDEUsage = exports2.ProxyType = exports2.Suffix = exports2.Authentication = void 0;
+    exports2.AbapEnvType = exports2.DestinationProxyType = exports2.WebIDEAdditionalData = exports2.WebIDEUsage = exports2.ProxyType = exports2.Suffix = exports2.Authentication = void 0;
     exports2.isAbapSystem = isAbapSystem;
     exports2.isAbapEnvironmentOnBtp = isAbapEnvironmentOnBtp;
     exports2.isGenericODataDestination = isGenericODataDestination;
@@ -47827,6 +47649,127 @@ var require_destination = __commonJS({
       var _a;
       return !!((_a = destination.WebIDEUsage) == null ? void 0 : _a.includes(WebIDEUsage.ODATA_ABAP));
     }
+    exports2.AbapEnvType = {
+      /**
+       * ABAP instance type
+       */
+      ABAP: "abap",
+      /**
+       * ABAP trial instance type
+       */
+      ABAP_TRIAL: "abap-trial",
+      /**
+       * ABAP CANARY trial instance type
+       */
+      ABAP_CANARY: "abap-canary",
+      /**
+       * ABAP OEM instance type
+       */
+      ABAP_OEM: "abap-oem",
+      /**
+       * ABAP OEM CANARY instance type
+       */
+      ABAP_OEM_CANARY: "abap-oem-canary",
+      /**
+       * ABAP HAAS instance type
+       */
+      ABAP_HAAS: "abap-haas",
+      /**
+       * Destination service instance type
+       */
+      DESTINATION: "destination",
+      /**
+       * ABAP Staging service instance type
+       */
+      ABAP_STAGING: "abap-staging",
+      /**
+       * ABAP Internal Staging service instance type
+       */
+      ABAP_INTERNAL_STAGING: "abap-internal-staging"
+    };
+  }
+});
+
+// ../../node_modules/@sap-ux/btp-utils/dist/app-studio.js
+var require_app_studio = __commonJS({
+  "../../node_modules/@sap-ux/btp-utils/dist/app-studio.js"(exports2) {
+    "use strict";
+    var __importDefault = exports2 && exports2.__importDefault || function(mod) {
+      return mod && mod.__esModule ? mod : { "default": mod };
+    };
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.BAS_DEST_INSTANCE_CRED_HEADER = void 0;
+    exports2.isAppStudio = isAppStudio;
+    exports2.getAppStudioProxyURL = getAppStudioProxyURL;
+    exports2.getAppStudioBaseURL = getAppStudioBaseURL;
+    exports2.getCredentialsForDestinationService = getCredentialsForDestinationService;
+    exports2.getDestinationUrlForAppStudio = getDestinationUrlForAppStudio;
+    exports2.listDestinations = listDestinations;
+    exports2.exposePort = exposePort;
+    var axios_1 = __importDefault(require_axios());
+    var cf_tools_1 = require_src5();
+    var app_studio_env_1 = require_app_studio_env();
+    var destination_1 = require_destination();
+    exports2.BAS_DEST_INSTANCE_CRED_HEADER = "bas-destination-instance-cred";
+    function isAppStudio() {
+      return !!process.env[app_studio_env_1.ENV.H2O_URL];
+    }
+    function getAppStudioProxyURL() {
+      return process.env[app_studio_env_1.ENV.PROXY_URL];
+    }
+    function getAppStudioBaseURL() {
+      return process.env[app_studio_env_1.ENV.H2O_URL];
+    }
+    async function getCredentialsForDestinationService(instance) {
+      var _a, _b;
+      try {
+        const serviceInfo = await (0, cf_tools_1.cfGetInstanceKeyParameters)(instance);
+        if (!serviceInfo) {
+          throw new Error(`No destination instance ${instance} found`);
+        }
+        const serviceCredentials = serviceInfo.credentials;
+        if (!serviceCredentials) {
+          throw new Error(`No credentials for destination instance ${instance} found`);
+        }
+        const clientId = ((_a = serviceCredentials.uaa) == null ? void 0 : _a.clientid) || serviceCredentials.clientid;
+        const clientSecret = ((_b = serviceCredentials.uaa) == null ? void 0 : _b.clientsecret) || serviceCredentials.clientsecret;
+        return Buffer.from(`${encodeURIComponent(clientId)}:${encodeURIComponent(clientSecret)}`).toString("base64");
+      } catch (error2) {
+        throw new Error(`An error occurred while retrieving service key for the destination instance ${instance}: ${error2}`);
+      }
+    }
+    function getDestinationUrlForAppStudio(name, path) {
+      const origin = `https://${name}.dest`;
+      return path && path.length > 1 ? new URL(path, origin).toString() : origin;
+    }
+    function stripS4HCApiHost(host) {
+      const [first, ...rest] = host.split(".");
+      return [first.replace(/-api$/, ""), ...rest].join(".");
+    }
+    async function listDestinations(options) {
+      const destinations = {};
+      await axios_1.default.get("/reload", { baseURL: process.env[app_studio_env_1.ENV.PROXY_URL] });
+      const response = await axios_1.default.get("/api/listDestinations", { baseURL: process.env[app_studio_env_1.ENV.H2O_URL] });
+      const list = Array.isArray(response.data) ? response.data : [];
+      list.forEach((destination) => {
+        if ((options == null ? void 0 : options.stripS4HCApiHosts) && (0, destination_1.isS4HC)(destination)) {
+          destination.Host = stripS4HCApiHost(destination.Host);
+        }
+        if (destination.WebIDEEnabled) {
+          destinations[destination.Name] = destination;
+        }
+      });
+      return destinations;
+    }
+    async function exposePort(port, logger) {
+      try {
+        const response = await axios_1.default.get(`http://localhost:3001/AppStudio/api/getHostByPort?port=${port}`);
+        return `${response.data.result}`;
+      } catch (error2) {
+        logger == null ? void 0 : logger.error(`Port ${port} was not exposed!`);
+        return "";
+      }
+    }
   }
 });
 
@@ -47942,7 +47885,7 @@ var require_livereload = __commonJS({
         if (fileExtension === ".appdescr_variant") {
           global.__SAP_UX_MANIFEST_SYNC_REQUIRED__ = true;
         } else if (fileExtension === ".change") {
-          if (path.endsWith("appdescr_fe_changePageConfiguration.change") || path.endsWith("appdescr_ui_generic_app_changePageConfiguration.change")) {
+          if (path.endsWith("appdescr_fe_changePageConfiguration.change") || path.endsWith("appdescr_ui_generic_app_changePageConfiguration.change") || path.endsWith("appdescr_ui_gen_app_changePageConfig.change") || path.endsWith("appdescr_app_addAnnotationsToOData.change")) {
             global.__SAP_UX_MANIFEST_SYNC_REQUIRED__ = true;
           }
         }