Avoid tracking state unnecessary

This can just as easily be derived.

Author: badeball

lib/plugin-event-handlers.ts

@@ -98,7 +98,6 @@ interface StateTestStarted {
     accumulation: messages.Envelope[];
     current: messages.Envelope[];
   };
-  testCaseStartedId: string;
 }
 
 interface StateStepStarted {
@@ -109,8 +108,6 @@ interface StateStepStarted {
     accumulation: messages.Envelope[];
     current: messages.Envelope[];
   };
-  testCaseStartedId: string;
-  testStepStartedId: string;
 }
 
 interface StateStepFinished {
@@ -121,7 +118,6 @@ interface StateStepFinished {
     accumulation: messages.Envelope[];
     current: messages.Envelope[];
   };
-  testCaseStartedId: string;
 }
 
 interface StateTestFinished {
@@ -197,6 +193,8 @@ let state: State = {
 
 const isFeature = (spec: Cypress.Spec) => spec.name.endsWith(".feature");
 
+const last = <E>(col: E[]): E => col[col.length - 1];
+
 const end = (stream: stream.Writable) =>
   new Promise<void>((resolve) => stream.end(resolve));
 
@@ -728,10 +726,15 @@ export async function afterScreenshotHandler(
     return details;
   }
 
+  const { testCaseStartedId, testStepId } = ensure(
+    last(state.messages.current).testStepStarted,
+    "Expected to find a testStepStarted last",
+  );
+
   const message: messages.Envelope = {
     attachment: {
-      testCaseStartedId: state.testCaseStartedId,
-      testStepId: state.testStepStartedId,
+      testCaseStartedId,
+      testStepId,
       body: buffer.toString("base64"),
       mediaType: "image/png",
       contentEncoding:
@@ -864,7 +867,6 @@ export const testCaseStartedHandler = createGracefullPluginEventHandler(
         accumulation: state.messages.accumulation,
         current: state.messages.current.concat({ testCaseStarted: data }),
       },
-      testCaseStartedId: data.id,
     };
 
     return true;
@@ -901,8 +903,6 @@ export const testStepStartedHandler = createGracefullPluginEventHandler(
         accumulation: state.messages.accumulation,
         current: state.messages.current.concat({ testStepStarted: data }),
       },
-      testCaseStartedId: state.testCaseStartedId,
-      testStepStartedId: data.testStepId,
     };
 
     return true;
@@ -1059,7 +1059,6 @@ export const testStepFinishedHandler = createGracefullPluginEventHandler(
         accumulation: state.messages.accumulation,
         current: state.messages.current.concat({ testStepFinished }),
       },
-      testCaseStartedId: state.testCaseStartedId,
     };
 
     return true;
@@ -1120,10 +1119,15 @@ export const createStringAttachmentHandler = createGracefullPluginEventHandler(
         throw createStateError("createStringAttachmentHandler", state.state);
     }
 
+    const { testCaseStartedId, testStepId } = ensure(
+      last(state.messages.current).testStepStarted,
+      "Expected to find a testStepStarted last",
+    );
+
     const message: messages.Envelope = {
       attachment: {
-        testCaseStartedId: state.testCaseStartedId,
-        testStepId: state.testStepStartedId,
+        testCaseStartedId,
+        testStepId,
         body: data,
         fileName,
         mediaType: mediaType,