split runtime and globalRuntime invocation

Author: formaceft-93

packages/allure-cypress/src/reporter.ts

@@ -461,11 +461,11 @@ export class AllureCypress {
 
   #applyRuntimeApiMessages = (context: SpecContext, message: RuntimeMessage) => {
     const rootUuid = this.#resolveRootUuid(context);
-    if (!rootUuid && !isGlobalRuntimeMessage(message)) {
+    if (isGlobalRuntimeMessage(message)) {
+      this.allureRuntime.applyGlobalRuntimeMessages([message]);
       return;
     }
     if (!rootUuid) {
-      this.allureRuntime.applyGlobalRuntimeMessages([message]);
       return;
     }
     this.allureRuntime.applyRuntimeMessages(rootUuid, [message]);

packages/allure-jasmine/src/index.ts

@@ -81,11 +81,11 @@ export default class AllureJasmineReporter implements jasmine.CustomReporter {
 
   handleAllureRuntimeMessages(message: RuntimeMessage) {
     const rootUuid = this.currentAllureFixtureUuid ?? this.currentAllureTestUuid;
-    if (!rootUuid && !isGlobalRuntimeMessage(message)) {
+    if (isGlobalRuntimeMessage(message)) {
+      this.allureRuntime.applyGlobalRuntimeMessages([message]);
       return;
     }
     if (!rootUuid) {
-      this.allureRuntime.applyGlobalRuntimeMessages([message]);
       return;
     }
     this.allureRuntime.applyRuntimeMessages(rootUuid, [message]);

packages/allure-jest/src/environmentFactory.ts

@@ -76,11 +76,11 @@ const createJestEnvironment = <T extends typeof JestEnvironment>(Base: T): T =>
 
     handleAllureRuntimeMessage(message: RuntimeMessage) {
       const executableUuid = last(this.runContext.executables);
-      if (!executableUuid && !isGlobalRuntimeMessage(message)) {
+      if (isGlobalRuntimeMessage(message)) {
+        this.runtime.applyGlobalRuntimeMessages([message]);
         return;
       }
       if (!executableUuid) {
-        this.runtime.applyGlobalRuntimeMessages([message]);
         return;
       }
       this.runtime.applyRuntimeMessages(executableUuid, [message]);

packages/allure-js-commons/src/sdk/reporter/ReporterRuntime.ts

@@ -592,15 +592,6 @@ export class ReporterRuntime {
         case "attachment_path":
           this.#handleAttachmentPathMessage(rootUuid, message.data);
           return;
-        case "global_attachment_content":
-          this.#handleGlobalAttachmentContentMessage(message.data);
-          return;
-        case "global_attachment_path":
-          this.#handleGlobalAttachmentPathMessage(message.data);
-          return;
-        case "global_error":
-          this.#handleGlobalErrorMessage(message.data);
-          return;
         default:
           // eslint-disable-next-line no-console
           console.error(`could not apply runtime messages: unknown message ${JSON.stringify(message)}`);

packages/allure-mocha/src/AllureMochaReporter.ts

@@ -89,16 +89,16 @@ export class AllureMochaReporter extends Mocha.reporters.Base {
   }
 
   applyRuntimeMessages = (...message: RuntimeMessage[]) => {
-    const root = this.currentHook ?? this.currentTest;
-    if (root) {
-      this.runtime.applyRuntimeMessages(root, message);
-      return;
-    }
-
     const globalMessages = message.filter(isGlobalRuntimeMessage);
     if (globalMessages.length) {
       this.runtime.applyGlobalRuntimeMessages(globalMessages);
     }
+
+    const root = this.currentHook ?? this.currentTest;
+    const scopedMessages = message.filter((m) => !isGlobalRuntimeMessage(m));
+    if (root && scopedMessages.length) {
+      this.runtime.applyRuntimeMessages(root, scopedMessages);
+    }
   };
 
   /**

packages/allure-playwright/src/index.ts

@@ -22,6 +22,7 @@ import {
   getMessageAndTraceFromError,
   getMetadataLabel,
   hasLabel,
+  isGlobalRuntimeMessage,
   stripAnsi,
 } from "allure-js-commons/sdk";
 import {
@@ -701,6 +702,11 @@ export class AllureReporter implements ReporterV2 {
         return;
       }
 
+      if (isGlobalRuntimeMessage(message)) {
+        this.allureRuntime!.applyGlobalRuntimeMessages([message]);
+        return;
+      }
+
       this.allureRuntime!.applyRuntimeMessages(testUuid, [message]);
       return;
     }

packages/allure-vitest/src/reporter.ts

@@ -3,7 +3,7 @@ import type { TestModule } from "vitest/node";
 import type { Reporter } from "vitest/reporters";
 import { LabelName, Stage, Status } from "allure-js-commons";
 import type { RuntimeMessage } from "allure-js-commons/sdk";
-import { getMessageAndTraceFromError, getStatusFromError } from "allure-js-commons/sdk";
+import { getMessageAndTraceFromError, getStatusFromError, isGlobalRuntimeMessage } from "allure-js-commons/sdk";
 import type { ReporterConfig } from "allure-js-commons/sdk/reporter";
 import {
   ReporterRuntime,
@@ -126,7 +126,15 @@ export default class AllureVitestReporter implements Reporter {
         });
       }
 
-      this.allureReporterRuntime!.applyRuntimeMessages(testUuid, allureRuntimeMessages);
+      const globalMessages = allureRuntimeMessages.filter(isGlobalRuntimeMessage);
+      if (globalMessages.length) {
+        this.allureReporterRuntime!.applyGlobalRuntimeMessages(globalMessages);
+      }
+
+      const scopedMessages = allureRuntimeMessages.filter((m) => !isGlobalRuntimeMessage(m));
+      if (scopedMessages.length) {
+        this.allureReporterRuntime!.applyRuntimeMessages(testUuid, scopedMessages);
+      }
 
       switch (task.result?.state) {
         case "fail": {

packages/newman-reporter-allure/src/index.ts

@@ -410,7 +410,6 @@ class AllureReporter {
       this.allureRuntime.writeScope(this.currentScope);
       this.currentScope = undefined;
     }
-    this.allureRuntime.writeGlobals();
   }
 
   #pathToItem(item: Item): string[] {