add timestamp test && fix vitest issue

Author: formaceft-93

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

@@ -758,7 +758,7 @@ export class ReporterRuntime {
       fileExtension: message.fileExtension,
     });
 
-    this.#writeGlobals(`${randomUuid()}-globals.json`, {
+    this.#writeGlobals({
       attachments: [this.#createGlobalAttachment(message.name, message.contentType, attachmentSource)],
       errors: [],
     });
@@ -770,14 +770,14 @@ export class ReporterRuntime {
       fileExtension: message.fileExtension ?? extname(message.path),
     });
 
-    this.#writeGlobals(`${randomUuid()}-globals.json`, {
+    this.#writeGlobals({
       attachments: [this.#createGlobalAttachment(message.name, message.contentType, attachmentSource)],
       errors: [],
     });
   };
 
   #handleGlobalErrorMessage = (message: RuntimeGlobalErrorMessage["data"]) => {
-    this.#writeGlobals(`${randomUuid()}-globals.json`, {
+    this.#writeGlobals({
       attachments: [],
       errors: [{ ...message, timestamp: Date.now() }],
     });
@@ -832,8 +832,8 @@ export class ReporterRuntime {
     timestamp: Date.now(),
   });
 
-  #writeGlobals = (distFileName: string, globals: Globals): void => {
-    this.writer.writeGlobals(distFileName, globals);
+  #writeGlobals = (globals: Globals): void => {
+    this.writer.writeGlobals(`${randomUuid()}-globals.json`, globals);
   };
 
   #writeFixturesOfScope = ({ fixtures, tests }: TestScope) => {

packages/allure-js-commons/test/sdk/reporter/ReporterRuntime.spec.ts

@@ -997,6 +997,48 @@ describe("ReporterRuntime", () => {
       );
     });
 
+    it("should set global timestamps within message processing window", () => {
+      const writer = mockWriter();
+      const runtime = new ReporterRuntime({ writer });
+      const before = Date.now();
+
+      runtime.applyGlobalRuntimeMessages([
+        {
+          type: "global_attachment_content",
+          data: {
+            name: "setup-log",
+            content: Buffer.from("hello", "utf-8").toString("base64"),
+            encoding: "base64",
+            contentType: "text/plain",
+            fileExtension: ".txt",
+          },
+        },
+        {
+          type: "global_error",
+          data: {
+            message: "setup failed",
+            trace: "stack",
+          },
+        },
+      ]);
+
+      const after = Date.now();
+      const globalsPayloads = writer.writeGlobals.mock.calls.map(([, globals]) => globals);
+      const attachmentTimestamps = globalsPayloads.flatMap((globals) => globals.attachments.map((a) => a.timestamp));
+      const errorTimestamps = globalsPayloads.flatMap((globals) => globals.errors.map((e) => e.timestamp));
+
+      expect(attachmentTimestamps).toHaveLength(1);
+      expect(errorTimestamps).toHaveLength(1);
+      attachmentTimestamps.forEach((timestamp) => {
+        expect(timestamp).toBeGreaterThanOrEqual(before);
+        expect(timestamp).toBeLessThanOrEqual(after);
+      });
+      errorTimestamps.forEach((timestamp) => {
+        expect(timestamp).toBeGreaterThanOrEqual(before);
+        expect(timestamp).toBeLessThanOrEqual(after);
+      });
+    });
+
     it("should write global attachment from path", () => {
       const writer = mockWriter();
       const runtime = new ReporterRuntime({ writer });

packages/allure-mocha/test/samples/spec/globals/runtimeGlobals.spec.js

@@ -1,7 +1,13 @@
+// cjs: const { it } = require("mocha");
+// cjs: const { writeFileSync } = require("node:fs");
+// cjs: const { join } = require("node:path");
+// cjs: const { globalAttachment, globalAttachmentPath, globalError } = require("allure-js-commons");
+// esm: import { it } from "mocha";
+// esm: import { writeFileSync } from "node:fs";
+// esm: import { join } from "node:path";
+// esm: import { globalAttachment, globalAttachmentPath, globalError } from "allure-js-commons";
+
 it("a test", async () => {
-  const { writeFileSync } = await import("node:fs");
-  const { join } = await import("node:path");
-  const { globalAttachment, globalAttachmentPath, globalError } = await import("allure-js-commons");
   const pathAttachmentFile = join(process.cwd(), "global-path.log");
   writeFileSync(pathAttachmentFile, "hello-from-path", "utf8");
 

packages/allure-mocha/test/samples/spec/globals/runtimeGlobalsContexts.spec.js

@@ -1,6 +1,9 @@
+// cjs: const { after, before, it } = require("mocha");
+// esm: import { after, before, it } from "mocha";
+
 void (async () => {
-  const { globalError } = await import("allure-js-commons");
-  await globalError({ message: "module scope error" });
+  const { globalError: emitGlobalError } = await import("allure-js-commons");
+  await emitGlobalError({ message: "module scope error" });
 })();
 
 before(async () => {

packages/allure-mocha/test/samples/spec/globals/runtimeGlobalsSetupOnly.spec.js

@@ -1,6 +1,9 @@
-const { writeFileSync } = require("node:fs");
-const { join } = require("node:path");
-const { globalAttachment, globalAttachmentPath, globalError } = require("allure-js-commons");
+// cjs: const { writeFileSync } = require("node:fs");
+// cjs: const { join } = require("node:path");
+// cjs: const { globalAttachment, globalAttachmentPath, globalError } = require("allure-js-commons");
+// esm: import { writeFileSync } from "node:fs";
+// esm: import { join } from "node:path";
+// esm: import { globalAttachment, globalAttachmentPath, globalError } from "allure-js-commons";
 
 const setupFilePath = join(process.cwd(), "setup-only.log");
 writeFileSync(setupFilePath, "from-path", "utf8");

packages/allure-vitest/src/VitestTestRuntime.ts

@@ -5,21 +5,26 @@ import { MessageTestRuntime } from "allure-js-commons/sdk/runtime";
 
 const ALLURE_VITEST_GLOBAL_RUNTIME_MESSAGES_KEY = "__allureVitestGlobalRuntimeMessages";
 const ALLURE_VITEST_GLOBAL_RUNTIME_MESSAGES_META_KEY = "allureGlobalRuntimeMessages";
+const ALLURE_VITEST_RUNTIME_MESSAGES_META_KEY = "allureRuntimeMessages";
+
+type RuntimeMessageMetaKey =
+  | typeof ALLURE_VITEST_GLOBAL_RUNTIME_MESSAGES_META_KEY
+  | typeof ALLURE_VITEST_RUNTIME_MESSAGES_META_KEY;
+type RuntimeMessageTaskMeta = TaskMeta & {
+  [ALLURE_VITEST_GLOBAL_RUNTIME_MESSAGES_META_KEY]?: RuntimeMessage[];
+  [ALLURE_VITEST_RUNTIME_MESSAGES_META_KEY]?: RuntimeMessage[];
+};
 
 const addGlobalMessage = (message: RuntimeMessage) => {
   const holder = globalThis as unknown as Record<string, RuntimeMessage[] | undefined>;
   const messages = (holder[ALLURE_VITEST_GLOBAL_RUNTIME_MESSAGES_KEY] ??= []);
   messages.push(message);
 };
 
-const addGlobalMessageToMeta = (meta: TaskMeta, message: RuntimeMessage) => {
-  // @ts-ignore
-  if (!meta[ALLURE_VITEST_GLOBAL_RUNTIME_MESSAGES_META_KEY]) {
-    // @ts-ignore
-    meta[ALLURE_VITEST_GLOBAL_RUNTIME_MESSAGES_META_KEY] = [];
-  }
-  // @ts-ignore
-  meta[ALLURE_VITEST_GLOBAL_RUNTIME_MESSAGES_META_KEY].push(message);
+const addMessageToMeta = (meta: TaskMeta, key: RuntimeMessageMetaKey, message: RuntimeMessage) => {
+  const typedMeta = meta as RuntimeMessageTaskMeta;
+  const messages = (typedMeta[key] ??= []);
+  messages.push(message);
 };
 
 export const takeGlobalRuntimeMessages = (): RuntimeMessage[] => {
@@ -35,17 +40,18 @@ export class VitestTestRuntime extends MessageTestRuntime {
 
     if (isGlobalRuntimeMessage(message)) {
       if (currentTest) {
-        addGlobalMessageToMeta(currentTest.meta, message);
+        addMessageToMeta(currentTest.meta, ALLURE_VITEST_GLOBAL_RUNTIME_MESSAGES_META_KEY, message);
         return Promise.resolve();
       }
 
       try {
         const currentSuite = getCurrentSuite();
 
         if (currentSuite) {
-          // @ts-ignore
-          currentSuite.tasks.forEach((task) => processTask(task, message, true));
-          return Promise.resolve();
+          const hasTargetTest = attachGlobalMessageToFirstTest(currentSuite, message);
+          if (hasTargetTest) {
+            return Promise.resolve();
+          }
         }
       } catch {}
 
@@ -63,8 +69,7 @@ export class VitestTestRuntime extends MessageTestRuntime {
       const currentSuite = getCurrentSuite();
 
       if (currentSuite) {
-        // @ts-ignore
-        currentSuite.tasks.forEach((task) => processTask(task, message));
+        processTask(currentSuite, message);
         return Promise.resolve();
       }
     } catch {}
@@ -87,7 +92,7 @@ const processTask = (task: Task | SuiteCollector, message: RuntimeMessage, isGlo
       break;
     case "test":
       if (isGlobal) {
-        addGlobalMessageToMeta(task.meta, message);
+        addMessageToMeta(task.meta, ALLURE_VITEST_GLOBAL_RUNTIME_MESSAGES_META_KEY, message);
       } else {
         addMessage(task.meta, message);
       }
@@ -97,12 +102,23 @@ const processTask = (task: Task | SuiteCollector, message: RuntimeMessage, isGlo
   }
 };
 
-const addMessage = (meta: TaskMeta, message: RuntimeMessage) => {
-  // @ts-ignore
-  if (!meta.allureRuntimeMessages) {
-    // @ts-ignore
-    meta.allureRuntimeMessages = [];
+// beforeAll is suite-scoped in Vitest (no current test context):
+// https://main.vitest.dev/api/hooks#beforeall
+// Bind a global message to the first test task to avoid duplicating it across every
+// test in the suite when suite-level globals are later collected.
+const attachGlobalMessageToFirstTest = (task: Task | SuiteCollector, message: RuntimeMessage): boolean => {
+  switch (task.type) {
+    case "collector":
+    case "suite":
+      return task.tasks.some((sub) => attachGlobalMessageToFirstTest(sub, message));
+    case "test":
+      addMessageToMeta(task.meta, ALLURE_VITEST_GLOBAL_RUNTIME_MESSAGES_META_KEY, message);
+      return true;
+    default:
+      return false;
   }
-  // @ts-ignore
-  meta.allureRuntimeMessages.push(message);
+};
+
+const addMessage = (meta: TaskMeta, message: RuntimeMessage) => {
+  addMessageToMeta(meta, ALLURE_VITEST_RUNTIME_MESSAGES_META_KEY, message);
 };

packages/allure-vitest/test/spec/runtime/modern/globals.test.ts

@@ -12,7 +12,8 @@ it("writes globals payload from runtime API calls", async () => {
         await globalError({ message: "global setup failed", trace: "stack" });
       });
 
-      test("passes", () => {});
+      test("passes 1", () => {});
+      test("passes 2", () => {});
     `,
   });
 

packages/allure-vitest/test/utils.ts

@@ -32,8 +32,8 @@ export const runVitestInlineTest = async (
   const configFilename = "vitest.config.ts";
   const configPath = join(testDir, configFilename);
   // getPosixPath allows us to interpolate such paths without escaping
-  const setupModulePath = getPosixPath(join(fileDirname, "..", "src", "setup.ts"));
-  const reporterModulePath = getPosixPath(join(fileDirname, "..", "src", "reporter.ts"));
+  const setupModulePath = getPosixPath(require.resolve("allure-vitest/setup"));
+  const reporterModulePath = getPosixPath(require.resolve("allure-vitest/reporter"));
   const allureResultsPath = getPosixPath(join(testDir, "allure-results"));
   const fixtureAccessorOpts = {
     setupModulePath,