@testrelic/maestro-analytics 1.2.0 → 1.2.1

package/dist/cli.cjs

@@ -1,5 +1,27 @@
 #!/usr/bin/env node
 "use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 
 // src/config.ts
 var import_core2 = require("@testrelic/core");
@@ -1321,8 +1343,8 @@ function discoverFlowFiles(dir) {
 var import_node_fs8 = require("fs");
 var import_node_path7 = require("path");
 var import_node_fs9 = require("fs");
-var LOG_LINE_REGEX = /^(\d{4}-\d{2}-\d{2}[T ]\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:?\d{2})?)\s+(\w+)\s+(.+)$/;
-var TIMESTAMP_ONLY_REGEX = /^\[?(\d{2}:\d{2}:\d{2}(?:\.\d+)?)\]?\s+(\w+)\s+(.+)$/;
+var LOG_LINE_REGEX = /^(\d{4}-\d{2}-\d{2}[T ]\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:?\d{2})?)\s+\[?\s*(\w+)\s*\]?\s+(.+)$/;
+var TIMESTAMP_ONLY_REGEX = /^\[?(\d{2}:\d{2}:\d{2}(?:\.\d+)?)\]?\s+\[?\s*(\w+)\s*\]?\s+(.+)$/;
 function parseLevel(raw) {
   const upper = raw.toUpperCase();
   if (upper === "DEBUG" || upper === "TRACE" || upper === "VERBOSE") return "DEBUG";
@@ -1331,10 +1353,31 @@ function parseLevel(raw) {
   if (upper === "ERROR" || upper === "FATAL" || upper === "SEVERE") return "ERROR";
   return "INFO";
 }
-function parseLogContent(content) {
+function buildEntryTimestamp(dateAnchor, hhmmss) {
+  const m = /^(\d{2}):(\d{2}):(\d{2})(?:\.(\d{1,3}))?$/.exec(hhmmss);
+  if (!m) {
+    return (/* @__PURE__ */ new Date()).toISOString();
+  }
+  const h = Number(m[1]);
+  const mi = Number(m[2]);
+  const s = Number(m[3]);
+  const ms = m[4] ? Number(m[4].padEnd(3, "0")) : 0;
+  const local = new Date(
+    dateAnchor.getFullYear(),
+    dateAnchor.getMonth(),
+    dateAnchor.getDate(),
+    h,
+    mi,
+    s,
+    ms
+  );
+  return local.toISOString();
+}
+function parseLogContent(content, defaultDate) {
   const entries = [];
   const lines = content.split("\n");
-  const today = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
+  const anchorDate = defaultDate instanceof Date ? defaultDate : null;
+  const dateAnchorStr = typeof defaultDate === "string" ? defaultDate : defaultDate instanceof Date ? `${defaultDate.getFullYear()}-${String(defaultDate.getMonth() + 1).padStart(2, "0")}-${String(defaultDate.getDate()).padStart(2, "0")}` : (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
   for (const line2 of lines) {
     const trimmed = line2.trim();
     if (!trimmed) continue;
@@ -1350,8 +1393,9 @@ function parseLogContent(content) {
     }
     match = TIMESTAMP_ONLY_REGEX.exec(trimmed);
     if (match) {
+      const ts = anchorDate ? buildEntryTimestamp(anchorDate, match[1]) : `${dateAnchorStr}T${match[1]}`;
       entries.push({
-        timestamp: `${today}T${match[1]}`,
+        timestamp: ts,
         level: parseLevel(match[2]),
         message: match[3],
         source: null
@@ -1368,10 +1412,10 @@ function parseLogContent(content) {
   }
   return entries;
 }
-function parseLogFile(filePath) {
+function parseLogFile(filePath, defaultDate) {
   try {
     const content = (0, import_node_fs8.readFileSync)(filePath, "utf-8");
-    return parseLogContent(content);
+    return parseLogContent(content, defaultDate);
   } catch {
     return [];
   }
@@ -4563,10 +4607,13 @@ function extractRecordingPath(commands) {
   }
   return null;
 }
+function normaliseCommandFileName(filePath) {
+  return (0, import_node_path16.basename)(filePath).replace(/^commands[-_]?/i, "").replace(/\.json$/i, "").replace(/^\(/, "").replace(/\)$/, "").toLowerCase();
+}
 function buildFlowRecordingMap(commandSteps) {
   const map = /* @__PURE__ */ new Map();
   for (const [filePath, commands] of commandSteps) {
-    const name = (0, import_node_path16.basename)(filePath).replace(/^commands[-_]?/i, "").replace(/\.json$/i, "").toLowerCase();
+    const name = normaliseCommandFileName(filePath);
     const recPath = extractRecordingPath(commands);
     if (recPath && name) map.set(name, recPath);
   }
@@ -4577,7 +4624,7 @@ function commandsForFlow(commandSteps, flowFile) {
   if (!flowBase || commandSteps.size === 0) {
     return { commands: [], matchedAnyFile: false };
   }
-  const stripCmdPrefix = (p) => (0, import_node_path16.basename)(p, (0, import_node_path16.extname)(p)).replace(/^commands[-_]?/i, "").toLowerCase();
+  const stripCmdPrefix = (p) => normaliseCommandFileName(p);
   for (const [cmdFile, cmds] of commandSteps) {
     if (stripCmdPrefix(cmdFile) === flowBase) {
       return { commands: cmds, matchedAnyFile: true };
@@ -4609,7 +4656,7 @@ function platformToOs(platform) {
       return void 0;
   }
 }
-function flowToTestResult(flow, apiCalls) {
+function flowToTestResult(flow, apiCalls, actions) {
   const consoleLogs = flow.logEntries.length > 0 ? flow.logEntries.map((entry) => ({
     level: entry.level.toLowerCase(),
     message: entry.message,
@@ -4637,7 +4684,8 @@ function flowToTestResult(flow, apiCalls) {
     os: platformToOs(flow.platform),
     deviceName: flow.deviceId,
     ...consoleLogs ? { consoleLogs } : {},
-    ...apiCalls && apiCalls.length > 0 ? { apiCalls } : {}
+    ...apiCalls && apiCalls.length > 0 ? { apiCalls } : {},
+    ...actions && actions.length > 0 ? { actions } : {}
   };
 }
 function logEntriesForFlow(allEntries, flowStartedAt, flowCompletedAt) {
@@ -4662,7 +4710,13 @@ async function orchestrateReport(input) {
   const logFiles = input.debugOutputDir ? discoverLogFiles(input.debugOutputDir) : artifacts.logPaths;
   const allLogEntries = [];
   for (const logFile of logFiles) {
-    const entries = parseLogFile(logFile);
+    let mtimeDate;
+    try {
+      const { statSync: statSync5 } = await import("fs");
+      mtimeDate = statSync5(logFile).mtime;
+    } catch {
+    }
+    const entries = parseLogFile(logFile, mtimeDate);
     if (entries.length > 0) allLogEntries.push(...entries);
   }
   let platform = input.platform ?? "unknown";
@@ -4703,14 +4757,19 @@ async function orchestrateReport(input) {
         const meta = flowMetadataMap.get(name);
         const status = testCase.status === "SUCCESS" ? "passed" : testCase.status === "SKIPPED" ? "skipped" : "failed";
         const durationMs = testCase.time * 1e3;
-        const flowStartedAt = startedAt;
-        const flowCompletedAt = new Date(new Date(flowStartedAt).getTime() + durationMs).toISOString();
         const flowFile = testCase.classname || name;
         const flowBase = (0, import_node_path16.basename)(flowFile, (0, import_node_path16.extname)(flowFile)).toLowerCase();
         const recordingPath = flowRecordingMap.get(flowBase) ?? null;
         const { commands: flowCmds, matchedAnyFile } = commandsForFlow(commandSteps, flowFile);
         const perFlowCommands = matchedAnyFile ? flowCmds.filter((c) => c.category !== "assertion") : allNonAssertions;
         const perFlowAssertions = matchedAnyFile ? flowCmds.filter((c) => c.category === "assertion") : allAssertions;
+        const allFlowCmds = [...perFlowCommands, ...perFlowAssertions];
+        const earliestCmdMs = allFlowCmds.reduce((min, c) => {
+          const t = Date.parse(c.timestamp);
+          return Number.isFinite(t) && t < min ? t : min;
+        }, Number.POSITIVE_INFINITY);
+        const flowStartedAt = Number.isFinite(earliestCmdMs) ? new Date(earliestCmdMs).toISOString() : startedAt;
+        const flowCompletedAt = new Date(new Date(flowStartedAt).getTime() + durationMs).toISOString();
         flowResults.push({
           flowName: name,
           flowFile,
@@ -4832,9 +4891,10 @@ async function orchestrateReport(input) {
     }
     const matchedPaths = new Set(videoArtifacts.map((va) => va.path));
     const unmatchedVideos = videoPathsToUpload.filter((v) => !matchedPaths.has(v));
-    const testsForUpload = flowResults.map((f) => {
+    const testsForUpload = flowResults.map((f, i) => {
       const testId = `${f.flowFile}::${f.flowName}`;
-      return flowToTestResult(f, apiCallsByFlow?.get(testId));
+      const tlTest = timeline[i]?.tests?.[0];
+      return flowToTestResult(f, apiCallsByFlow?.get(testId), tlTest?.actions ?? null);
     });
     await finalizeAndUpload(
       cloudClient,