@testrelic/maestro-analytics 1.0.1 → 1.1.0

package/dist/cli.cjs

@@ -1040,7 +1040,7 @@ function mapCommandCategory(category) {
     case "ai":
       return "assertion";
     case "navigation":
-      return "custom_step";
+      return "navigation";
     case "device":
       return "custom_step";
     case "media":
@@ -3669,6 +3669,31 @@ function buildFlowRecordingMap(commandSteps) {
   }
   return map;
 }
+function commandsForFlow(commandSteps, flowFile) {
+  const flowBase = (0, import_node_path13.basename)(flowFile, (0, import_node_path13.extname)(flowFile)).toLowerCase();
+  if (!flowBase || commandSteps.size === 0) {
+    return { commands: [], matchedAnyFile: false };
+  }
+  const stripCmdPrefix = (p) => (0, import_node_path13.basename)(p, (0, import_node_path13.extname)(p)).replace(/^commands[-_]?/i, "").toLowerCase();
+  for (const [cmdFile, cmds] of commandSteps) {
+    if (stripCmdPrefix(cmdFile) === flowBase) {
+      return { commands: cmds, matchedAnyFile: true };
+    }
+  }
+  for (const [cmdFile, cmds] of commandSteps) {
+    const stripped = stripCmdPrefix(cmdFile);
+    if (stripped.length >= 3 && stripped.includes(flowBase)) {
+      return { commands: cmds, matchedAnyFile: true };
+    }
+  }
+  for (const [cmdFile, cmds] of commandSteps) {
+    const stripped = stripCmdPrefix(cmdFile);
+    if (stripped.length >= 3 && flowBase.includes(stripped)) {
+      return { commands: cmds, matchedAnyFile: true };
+    }
+  }
+  return { commands: [], matchedAnyFile: false };
+}
 function platformToOs(platform) {
   switch (platform) {
     case "android":
@@ -3682,6 +3707,12 @@ function platformToOs(platform) {
   }
 }
 function flowToTestResult(flow) {
+  const consoleLogs = flow.logEntries.length > 0 ? flow.logEntries.map((entry) => ({
+    level: entry.level.toLowerCase(),
+    message: entry.message,
+    timestamp: entry.timestamp,
+    source: entry.source
+  })) : void 0;
   return {
     testId: `${flow.flowFile}::${flow.flowName}`,
     title: flow.flowName,
@@ -3701,26 +3732,39 @@ function flowToTestResult(flow) {
     source: "maestro",
     platform: flow.platform !== "unknown" ? flow.platform : void 0,
     os: platformToOs(flow.platform),
-    deviceName: flow.deviceId
+    deviceName: flow.deviceId,
+    ...consoleLogs ? { consoleLogs } : {}
   };
 }
+function logEntriesForFlow(allEntries, flowStartedAt, flowCompletedAt) {
+  if (allEntries.length === 0) return [];
+  const startMs = Date.parse(flowStartedAt);
+  const endMs = Date.parse(flowCompletedAt);
+  if (Number.isNaN(startMs) || Number.isNaN(endMs)) {
+    return allEntries.slice();
+  }
+  return allEntries.filter((entry) => {
+    const t = Date.parse(entry.timestamp);
+    if (Number.isNaN(t)) return true;
+    return t >= startMs && t <= endMs;
+  });
+}
 async function orchestrateReport(input) {
   const { config } = input;
   const startedAt = (/* @__PURE__ */ new Date()).toISOString();
   const testRunId = config.testRunId ?? (0, import_node_crypto3.randomUUID)();
   const artifacts = collectArtifacts(input.testOutputDir, input.debugOutputDir);
   const junitPath = input.junitPath ?? artifacts.junitReportPath;
+  const logFiles = input.debugOutputDir ? discoverLogFiles(input.debugOutputDir) : artifacts.logPaths;
+  const allLogEntries = [];
+  for (const logFile of logFiles) {
+    const entries = parseLogFile(logFile);
+    if (entries.length > 0) allLogEntries.push(...entries);
+  }
   let platform = input.platform ?? "unknown";
-  if (platform === "unknown") {
-    const logFiles = input.debugOutputDir ? discoverLogFiles(input.debugOutputDir) : artifacts.logPaths;
-    for (const logFile of logFiles) {
-      const logEntries = parseLogFile(logFile);
-      const detected = detectPlatformFromLogs(logEntries);
-      if (detected !== "unknown") {
-        platform = detected;
-        break;
-      }
-    }
+  if (platform === "unknown" && allLogEntries.length > 0) {
+    const detected = detectPlatformFromLogs(allLogEntries);
+    if (detected !== "unknown") platform = detected;
   }
   const flowMetadataMap = /* @__PURE__ */ new Map();
   if (input.flowsDir && (0, import_node_fs15.existsSync)(input.flowsDir)) {
@@ -3747,8 +3791,8 @@ async function orchestrateReport(input) {
   if (junitPath && (0, import_node_fs15.existsSync)(junitPath)) {
     const junit = parseJUnitFile(junitPath);
     const allCommands = Array.from(commandSteps.values()).flat();
-    const assertionCommands = allCommands.filter((c) => c.category === "assertion");
-    const nonAssertionCommands = allCommands.filter((c) => c.category !== "assertion");
+    const allAssertions = allCommands.filter((c) => c.category === "assertion");
+    const allNonAssertions = allCommands.filter((c) => c.category !== "assertion");
     for (const suite of junit.testSuites) {
       for (const testCase of suite.testCases) {
         const name = testCase.name;
@@ -3760,6 +3804,9 @@ async function orchestrateReport(input) {
         const flowFile = testCase.classname || name;
         const flowBase = (0, import_node_path13.basename)(flowFile, (0, import_node_path13.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;
         flowResults.push({
           flowName: name,
           flowFile,
@@ -3772,12 +3819,12 @@ async function orchestrateReport(input) {
           completedAt: flowCompletedAt,
           tags: meta?.tags ?? [],
           properties: meta?.properties ?? {},
-          commands: nonAssertionCommands,
-          assertions: assertionCommands,
+          commands: perFlowCommands,
+          assertions: perFlowAssertions,
           screenshotPaths: matchScreenshotsToFlow(flowFile, artifacts.screenshotPaths),
           videoPath: matchVideoToFlow(flowFile, artifacts.videoPaths, recordingPath),
           aiDefects: allAiDefects,
-          logEntries: [],
+          logEntries: logEntriesForFlow(allLogEntries, flowStartedAt, flowCompletedAt),
           failureMessage: testCase.failureMessage ?? testCase.errorMessage ?? null,
           failureType: testCase.failureType ?? testCase.errorType ?? null,
           subflowRefs: meta?.subflowRefs ?? [],
@@ -3805,7 +3852,10 @@ async function orchestrateReport(input) {
         screenshotPaths: [],
         videoPath: null,
         aiDefects: [],
-        logEntries: [],
+        // No JUnit window to bound by; if maestro.log was parsed, surface
+        // every entry so the platform's Logs tab is still useful for
+        // pre-test setup / runtime failures.
+        logEntries: allLogEntries.slice(),
         failureMessage: null,
         failureType: null,
         subflowRefs: meta.subflowRefs,