@sap/ux-ui5-tooling 1.7.1 → 1.7.3

package/dist/cli/index.js

@@ -21347,115 +21347,6 @@ var require_browser2 = __commonJS({
   }
 });
 
-// ../lib/store/node_modules/has-flag/index.js
-var require_has_flag2 = __commonJS({
-  "../lib/store/node_modules/has-flag/index.js"(exports2, module2) {
-    "use strict";
-    module2.exports = (flag, argv) => {
-      argv = argv || process.argv;
-      const prefix = flag.startsWith("-") ? "" : flag.length === 1 ? "-" : "--";
-      const pos = argv.indexOf(prefix + flag);
-      const terminatorPos = argv.indexOf("--");
-      return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos);
-    };
-  }
-});
-
-// ../lib/store/node_modules/supports-color/index.js
-var require_supports_color2 = __commonJS({
-  "../lib/store/node_modules/supports-color/index.js"(exports2, module2) {
-    "use strict";
-    var os = require("os");
-    var hasFlag = require_has_flag2();
-    var env3 = process.env;
-    var forceColor;
-    if (hasFlag("no-color") || hasFlag("no-colors") || hasFlag("color=false")) {
-      forceColor = false;
-    } else if (hasFlag("color") || hasFlag("colors") || hasFlag("color=true") || hasFlag("color=always")) {
-      forceColor = true;
-    }
-    if ("FORCE_COLOR" in env3) {
-      forceColor = env3.FORCE_COLOR.length === 0 || parseInt(env3.FORCE_COLOR, 10) !== 0;
-    }
-    function translateLevel(level) {
-      if (level === 0) {
-        return false;
-      }
-      return {
-        level,
-        hasBasic: true,
-        has256: level >= 2,
-        has16m: level >= 3
-      };
-    }
-    function supportsColor(stream) {
-      if (forceColor === false) {
-        return 0;
-      }
-      if (hasFlag("color=16m") || hasFlag("color=full") || hasFlag("color=truecolor")) {
-        return 3;
-      }
-      if (hasFlag("color=256")) {
-        return 2;
-      }
-      if (stream && !stream.isTTY && forceColor !== true) {
-        return 0;
-      }
-      const min = forceColor ? 1 : 0;
-      if (process.platform === "win32") {
-        const osRelease = os.release().split(".");
-        if (Number(process.versions.node.split(".")[0]) >= 8 && Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
-          return Number(osRelease[2]) >= 14931 ? 3 : 2;
-        }
-        return 1;
-      }
-      if ("CI" in env3) {
-        if (["TRAVIS", "CIRCLECI", "APPVEYOR", "GITLAB_CI"].some((sign) => sign in env3) || env3.CI_NAME === "codeship") {
-          return 1;
-        }
-        return min;
-      }
-      if ("TEAMCITY_VERSION" in env3) {
-        return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env3.TEAMCITY_VERSION) ? 1 : 0;
-      }
-      if (env3.COLORTERM === "truecolor") {
-        return 3;
-      }
-      if ("TERM_PROGRAM" in env3) {
-        const version = parseInt((env3.TERM_PROGRAM_VERSION || "").split(".")[0], 10);
-        switch (env3.TERM_PROGRAM) {
-          case "iTerm.app":
-            return version >= 3 ? 3 : 2;
-          case "Apple_Terminal":
-            return 2;
-        }
-      }
-      if (/-256(color)?$/i.test(env3.TERM)) {
-        return 2;
-      }
-      if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env3.TERM)) {
-        return 1;
-      }
-      if ("COLORTERM" in env3) {
-        return 1;
-      }
-      if (env3.TERM === "dumb") {
-        return min;
-      }
-      return min;
-    }
-    function getSupportLevel(stream) {
-      const level = supportsColor(stream);
-      return translateLevel(level);
-    }
-    module2.exports = {
-      supportsColor: getSupportLevel,
-      stdout: getSupportLevel(process.stdout),
-      stderr: getSupportLevel(process.stderr)
-    };
-  }
-});
-
 // ../lib/store/node_modules/debug/src/node.js
 var require_node2 = __commonJS({
   "../lib/store/node_modules/debug/src/node.js"(exports2, module2) {
@@ -21471,7 +21362,7 @@ var require_node2 = __commonJS({
     }, "Instance method `debug.destroy()` is deprecated and no longer does anything. It will be removed in the next major version of `debug`.");
     exports2.colors = [6, 2, 3, 4, 5, 1];
     try {
-      const supportsColor = require_supports_color2();
+      const supportsColor = require_supports_color();
       if (supportsColor && (supportsColor.stderr || supportsColor).level >= 2) {
         exports2.colors = [
           20,
@@ -58644,7 +58535,7 @@ var require_package5 = __commonJS({
   "../lib/telemetry/dist/package.json"(exports2, module2) {
     module2.exports = {
       name: "@sap/ux-telemetry",
-      version: "1.7.1",
+      version: "1.7.3",
       description: "SAP Fiori tools telemetry library",
       main: "dist/src/index.js",
       author: "SAP SE",
@@ -58669,10 +58560,10 @@ var require_package5 = __commonJS({
       },
       dependencies: {
         "@sap-ux/store": "0.3.0",
-        "@sap/ux-cds": "1.7.1",
-        "@sap/ux-common-utils": "1.7.1",
-        "@sap/ux-feature-toggle": "1.7.1",
-        "@sap/ux-project-access": "1.7.1",
+        "@sap/ux-cds": "1.7.3",
+        "@sap/ux-common-utils": "1.7.3",
+        "@sap/ux-feature-toggle": "1.7.3",
+        "@sap/ux-project-access": "1.7.3",
         applicationinsights: "1.4.1",
         "performance-now": "2.1.0",
         yaml: "2.0.0-10"
@@ -62181,10 +62072,36 @@ var require_yamlFile = __commonJS({
     }
     exports2.readUi5YamlConfig = readUi5YamlConfig;
     async function getParsedUi5YamlConfig(dirPath, filename) {
+      var _a2;
       const contents = await readUi5YamlConfig(dirPath, filename);
       if (contents) {
         try {
-          return yaml.parse(contents);
+          const parsed = yaml.parse(contents);
+          if (((_a2 = parsed == null ? void 0 : parsed.server) == null ? void 0 : _a2.customMiddleware) && Array.isArray(parsed.server.customMiddleware)) {
+            for (const middleware of parsed.server.customMiddleware) {
+              const configuration = middleware == null ? void 0 : middleware.configuration;
+              const services = [];
+              if (Array.isArray(configuration == null ? void 0 : configuration.service)) {
+                services.push(...configuration.service);
+              } else if (configuration == null ? void 0 : configuration.service) {
+                services.push(configuration.service);
+              }
+              if (Array.isArray(configuration == null ? void 0 : configuration.services)) {
+                services.push(...configuration.services);
+              } else if (configuration == null ? void 0 : configuration.services) {
+                services.push(configuration.services);
+              }
+              for (const service of services) {
+                if (service.mockdataRootPath) {
+                  service.mockdataPath = service.mockdataRootPath;
+                }
+                if (service.metadataXmlPath) {
+                  service.metadataPath = service.metadataXmlPath;
+                }
+              }
+            }
+          }
+          return parsed;
         } catch (e) {
           throw new Error(i18n_1.i18n.t("ERROR_UI5_YAML_PARSING", { filePath: path_1.join(dirPath, filename), parsingError: e.message }));
         }
@@ -62272,10 +62189,10 @@ var require_mockServer = __commonJS({
       }
       return (services == null ? void 0 : services.length) ? services : null;
     }
-    function matchMockServiceByMetadataPath(mockService, metadataPath) {
-      const { metadataXmlPath } = mockService;
-      if (metadataXmlPath) {
-        return metadataPath.endsWith(path_1.normalize(metadataXmlPath));
+    function matchMockServiceByMetadataPath(mockService, path4) {
+      const { metadataPath } = mockService;
+      if (metadataPath) {
+        return path4.endsWith(path_1.normalize(metadataPath));
       }
       return false;
     }
@@ -63062,9 +62979,9 @@ var require_utils9 = __commonJS({
         const { services, mockFolder } = await ui5Config_1.getMockServicesConfiguration(configDir, config2);
         if (services) {
           const mockService = ui5Config_1.findMockServiceByMetadataPath(services, serviceMetadataPath);
-          if (mockService == null ? void 0 : mockService.mockdataRootPath) {
+          if (mockService == null ? void 0 : mockService.mockdataPath) {
             const servicesConfigFilePath = mockFolder ? path_1.resolve(configDir, mockFolder) : configDir;
-            return path_1.resolve(servicesConfigFilePath, mockService.mockdataRootPath);
+            return path_1.resolve(servicesConfigFilePath, mockService.mockdataPath);
           }
         }
       }
@@ -63078,6 +62995,11 @@ var require_types4 = __commonJS({
   "../lib/telemetry/dist/src/toolsSuiteTelemetry/types.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
+    var ToolsId;
+    (function(ToolsId2) {
+      ToolsId2["UNKNOWN"] = "UNKNOWN";
+      ToolsId2["NO_TOOLS_ID"] = "NO_TOOLS_ID";
+    })(ToolsId = exports2.ToolsId || (exports2.ToolsId = {}));
     var ODataSource;
     (function(ODataSource2) {
       ODataSource2["CAPJava"] = "CAPJava";
@@ -63102,6 +63024,7 @@ var require_types4 = __commonJS({
       CommonProperties2["TemplateType"] = "cmn.template";
       CommonProperties2["DeployTargetType"] = "cmn.deployTarget";
       CommonProperties2["ODataSourceType"] = "cmn.odataSource";
+      CommonProperties2["AppToolsId"] = "cmn.toolsId";
     })(CommonProperties = exports2.CommonProperties || (exports2.CommonProperties = {}));
   }
 });
@@ -63297,10 +63220,12 @@ var require_toolsSuiteTelemetryDataProcessor = __commonJS({
       const templateType = await getTemplateType(appPath);
       const deployTarget = await getDeployTarget(appPath);
       const odataSource = await getODataSource(appPath);
+      const toolsId = await getToolsId(appPath);
       const output3 = {};
       output3[types_1.CommonProperties.TemplateType] = templateType;
       output3[types_1.CommonProperties.DeployTargetType] = deployTarget;
       output3[types_1.CommonProperties.ODataSourceType] = odataSource;
+      output3[types_1.CommonProperties.AppToolsId] = toolsId;
       return output3;
     }
     async function getTemplateType(appPath) {
@@ -63385,6 +63310,20 @@ var require_toolsSuiteTelemetryDataProcessor = __commonJS({
     function getInternalVsExternal() {
       return ux_feature_toggle_1.isInternalFeaturesSettingEnabled() ? "internal" : "external";
     }
+    async function getToolsId(appPath) {
+      var _a2, _b, _c;
+      try {
+        const manifestPath = path_1.default.join(appPath, "webapp", "manifest.json");
+        if (fs_1.default.existsSync(manifestPath)) {
+          const manifest = JSON.parse(fs_1.default.readFileSync(manifestPath, "utf-8"));
+          return (_c = (_b = (_a2 = manifest["sap.app"]) == null ? void 0 : _a2.sourceTemplate) == null ? void 0 : _b.toolsId) != null ? _c : types_1.ToolsId.NO_TOOLS_ID;
+        }
+        return types_1.ToolsId.NO_TOOLS_ID;
+      } catch (err) {
+        console.log(`[Telemetry]: ${err.message}`);
+        return types_1.ToolsId.NO_TOOLS_ID;
+      }
+    }
   }
 });
 
@@ -69119,7 +69058,7 @@ var require_styles = __commonJS({
 });
 
 // ../../node_modules/@colors/colors/lib/system/has-flag.js
-var require_has_flag3 = __commonJS({
+var require_has_flag2 = __commonJS({
   "../../node_modules/@colors/colors/lib/system/has-flag.js"(exports2, module2) {
     "use strict";
     module2.exports = function(flag, argv) {
@@ -69137,7 +69076,7 @@ var require_supports_colors = __commonJS({
   "../../node_modules/@colors/colors/lib/system/supports-colors.js"(exports2, module2) {
     "use strict";
     var os = require("os");
-    var hasFlag = require_has_flag3();
+    var hasFlag = require_has_flag2();
     var env3 = process.env;
     var forceColor = void 0;
     if (hasFlag("no-color") || hasFlag("no-colors") || hasFlag("color=false")) {
@@ -141260,7 +141199,7 @@ var require_styles2 = __commonJS({
 });
 
 // ../../node_modules/cli-table3/node_modules/colors/lib/system/has-flag.js
-var require_has_flag4 = __commonJS({
+var require_has_flag3 = __commonJS({
   "../../node_modules/cli-table3/node_modules/colors/lib/system/has-flag.js"(exports2, module2) {
     "use strict";
     module2.exports = function(flag, argv) {
@@ -141278,7 +141217,7 @@ var require_supports_colors2 = __commonJS({
   "../../node_modules/cli-table3/node_modules/colors/lib/system/supports-colors.js"(exports2, module2) {
     "use strict";
     var os = require("os");
-    var hasFlag = require_has_flag4();
+    var hasFlag = require_has_flag3();
     var env3 = process.env;
     var forceColor = void 0;
     if (hasFlag("no-color") || hasFlag("no-colors") || hasFlag("color=false")) {