@noma.to/qwik-testing-library 1.3.0 → 1.3.1

package/lib/node_modules/.pnpm/{@vitest_runner@2.1.8 → @vitest_runner@3.0.5}/node_modules/@vitest/runner/dist/index.qwik.cjs

@@ -3,21 +3,23 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const index = require("../../../../../@vitest_utils@2.1.8/node_modules/@vitest/utils/dist/index.qwik.cjs");
+const index = require("../../../../../@vitest_utils@3.0.5/node_modules/@vitest/utils/dist/index.qwik.cjs");
+const sourceMap = require("../../../../../@vitest_utils@3.0.5/node_modules/@vitest/utils/dist/source-map.qwik.cjs");
 const chunkTasks = require("./chunk-tasks.qwik.cjs");
-const helpers = require("../../../../../@vitest_utils@2.1.8/node_modules/@vitest/utils/dist/helpers.qwik.cjs");
-const chunk_commonjsHelpers = require("../../../../../@vitest_utils@2.1.8/node_modules/@vitest/utils/dist/chunk-_commonjsHelpers.qwik.cjs");
+const helpers = require("../../../../../@vitest_utils@3.0.5/node_modules/@vitest/utils/dist/helpers.qwik.cjs");
+const chunk_commonjsHelpers = require("../../../../../@vitest_utils@3.0.5/node_modules/@vitest/utils/dist/chunk-_commonjsHelpers.qwik.cjs");
 class PendingError extends Error {
-  constructor(message, task) {
+  constructor(message, task, note) {
     super(message);
     __publicField(this, "code", "VITEST_PENDING");
     __publicField(this, "taskId");
     this.message = message;
+    this.note = note;
     this.taskId = task.id;
   }
 }
+const now$2 = Date.now;
 const collectorContext = {
-  tasks: [],
   currentSuite: null
 };
 function collectTask(task) {
@@ -36,17 +38,37 @@ function withTimeout(fn, timeout, isHook = false) {
   }
   const { setTimeout, clearTimeout } = index.getSafeTimers();
   return function runWithTimeout(...args) {
-    return Promise.race([
-      fn(...args),
-      new Promise((resolve, reject) => {
-        var _a;
-        const timer = setTimeout(() => {
-          clearTimeout(timer);
-          reject(new Error(makeTimeoutMsg(isHook, timeout)));
-        }, timeout);
-        (_a = timer.unref) == null ? void 0 : _a.call(timer);
-      })
-    ]);
+    const startTime = now$2();
+    return new Promise((resolve_, reject_) => {
+      var _a;
+      const timer = setTimeout(() => {
+        clearTimeout(timer);
+        reject(new Error(makeTimeoutMsg(isHook, timeout)));
+      }, timeout);
+      (_a = timer.unref) == null ? void 0 : _a.call(timer);
+      function resolve(result) {
+        clearTimeout(timer);
+        if (now$2() - startTime >= timeout) {
+          reject_(new Error(makeTimeoutMsg(isHook, timeout)));
+          return;
+        }
+        resolve_(result);
+      }
+      function reject(error) {
+        clearTimeout(timer);
+        reject_(error);
+      }
+      try {
+        const result = fn(...args);
+        if (typeof result === "object" && result != null && typeof result.then === "function") {
+          result.then(resolve, reject);
+        } else {
+          resolve(result);
+        }
+      } catch (error) {
+        reject(error);
+      }
+    });
   };
 }
 function createTestContext(test, runner2) {
@@ -55,17 +77,22 @@ function createTestContext(test, runner2) {
     throw new Error("done() callback is deprecated, use promise instead");
   };
   context.task = test;
-  context.skip = () => {
-    test.pending = true;
-    throw new PendingError("test is skipped; abort execution", test);
+  context.skip = (note) => {
+    test.result ?? (test.result = { state: "skip" });
+    test.result.pending = true;
+    throw new PendingError("test is skipped; abort execution", test, note);
   };
-  context.onTestFailed = (fn) => {
+  context.onTestFailed = (handler, timeout) => {
     test.onFailed || (test.onFailed = []);
-    test.onFailed.push(fn);
+    test.onFailed.push(
+      withTimeout(handler, timeout ?? runner2.config.hookTimeout, true)
+    );
   };
-  context.onTestFinished = (fn) => {
+  context.onTestFinished = (handler, timeout) => {
     test.onFinished || (test.onFinished = []);
-    test.onFinished.push(fn);
+    test.onFinished.push(
+      withTimeout(handler, timeout ?? runner2.config.hookTimeout, true)
+    );
   };
   return ((_a = runner2.extendTaskContext) == null ? void 0 : _a.call(runner2, context)) || context;
 }
@@ -91,14 +118,15 @@ function setHooks(key, hooks) {
 function getHooks(key) {
   return hooksMap.get(key);
 }
-function mergeContextFixtures(fixtures, context = {}) {
-  const fixtureOptionKeys = ["auto"];
+function mergeContextFixtures(fixtures, context, inject) {
+  const fixtureOptionKeys = ["auto", "injected"];
   const fixtureArray = Object.entries(fixtures).map(
     ([prop, value]) => {
       const fixtureItem = { value };
       if (Array.isArray(value) && value.length >= 2 && helpers.isObject(value[1]) && Object.keys(value[1]).some((key) => fixtureOptionKeys.includes(key))) {
         Object.assign(fixtureItem, value[1]);
-        fixtureItem.value = value[0];
+        const userValue = value[0];
+        fixtureItem.value = fixtureItem.injected ? inject(prop) ?? userValue : userValue;
       }
       fixtureItem.prop = prop;
       fixtureItem.isFn = typeof fixtureItem.value === "function";
@@ -283,11 +311,19 @@ createTest(function(name, optionsOrFn, optionsOrTest) {
 });
 let runner;
 let defaultSuite;
+let currentTestFilepath;
 function assert(condition, message) {
   if (!condition) {
     throw new Error(`Vitest failed to find ${message}. This is a bug in Vitest. Please, open an issue with reproduction.`);
   }
 }
+function getTestFilepath() {
+  return currentTestFilepath;
+}
+function getRunner() {
+  assert(runner, "the runner");
+  return runner;
+}
 function getCurrentSuite() {
   const currentSuite = collectorContext.currentSuite || defaultSuite;
   assert(currentSuite, "the current suite");
@@ -311,6 +347,9 @@ function parseArguments(optionsOrFn, optionsOrTest) {
         "Cannot use two objects as arguments. Please provide options and a function callback in that order."
       );
     }
+    console.warn(
+      "Using an object as a third argument is deprecated. Vitest 4 will throw an error if the third argument is not a timeout number. Please use the second argument for options. See more at https://vitest.dev/guide/migration"
+    );
     options = optionsOrTest;
   } else if (typeof optionsOrTest === "number") {
     options = { timeout: optionsOrTest };
@@ -333,7 +372,7 @@ function parseArguments(optionsOrFn, optionsOrTest) {
   };
 }
 function createSuiteCollector(name, factory = () => {
-}, mode, shuffle, each, suiteOptions) {
+}, mode, each, suiteOptions) {
   const tasks = [];
   const factoryQueue = [];
   let suite2;
@@ -346,7 +385,7 @@ function createSuiteCollector(name, factory = () => {
       each: options.each,
       fails: options.fails,
       context: void 0,
-      type: "custom",
+      type: "test",
       file: void 0,
       retry: options.retry ?? runner.config.retry,
       repeats: options.repeats,
@@ -357,9 +396,7 @@ function createSuiteCollector(name, factory = () => {
     if (options.concurrent || !options.sequential && runner.config.sequence.concurrent) {
       task2.concurrent = true;
     }
-    if (shuffle) {
-      task2.shuffle = true;
-    }
+    task2.shuffle = suiteOptions == null ? void 0 : suiteOptions.shuffle;
     const context = createTestContext(task2, runner);
     Object.defineProperty(task2, "context", {
       value: context,
@@ -370,12 +407,21 @@ function createSuiteCollector(name, factory = () => {
       setFn(
         task2,
         withTimeout(
-          withAwaitAsyncAssetions(withFixtures(handler, context), task2),
+          withAwaitAsyncAssertions(withFixtures(handler, context), task2),
           (options == null ? void 0 : options.timeout) ?? runner.config.testTimeout
         )
       );
     }
-    if (runner.config.includeTaskLocation) ;
+    if (runner.config.includeTaskLocation) {
+      const limit = Error.stackTraceLimit;
+      Error.stackTraceLimit = 15;
+      const error = new Error("stacktrace").stack;
+      Error.stackTraceLimit = limit;
+      const stack = findTestFileStackTrace(error, task2.each ?? false);
+      if (stack) {
+        task2.location = stack;
+      }
+    }
     tasks.push(task2);
     return task2;
   };
@@ -419,7 +465,7 @@ function createSuiteCollector(name, factory = () => {
       mode,
       each,
       file: void 0,
-      shuffle,
+      shuffle: suiteOptions == null ? void 0 : suiteOptions.shuffle,
       tasks: [],
       meta: /* @__PURE__ */ Object.create(null),
       concurrent: suiteOptions == null ? void 0 : suiteOptions.concurrent
@@ -454,9 +500,9 @@ function createSuiteCollector(name, factory = () => {
   collectTask(collector);
   return collector;
 }
-function withAwaitAsyncAssetions(fn, task) {
+function withAwaitAsyncAssertions(fn, task) {
   return async (...args) => {
-    await fn(...args);
+    const fnResult = await fn(...args);
     if (task.promises) {
       const result = await Promise.allSettled(task.promises);
       const errors = result.map((r) => r.status === "rejected" ? r.reason : void 0).filter(Boolean);
@@ -464,10 +510,12 @@ function withAwaitAsyncAssetions(fn, task) {
         throw errors;
       }
     }
+    return fnResult;
   };
 }
 function createSuite() {
-  function suiteFn(name, factoryOrOptions, optionsOrFactory = {}) {
+  function suiteFn(name, factoryOrOptions, optionsOrFactory) {
+    var _a;
     const mode = this.only ? "only" : this.skip ? "skip" : this.todo ? "todo" : "run";
     const currentSuite = collectorContext.currentSuite || defaultSuite;
     let { options, handler: factory } = parseArguments(
@@ -476,9 +524,11 @@ function createSuite() {
     );
     const isConcurrentSpecified = options.concurrent || this.concurrent || options.sequential === false;
     const isSequentialSpecified = options.sequential || this.sequential || options.concurrent === false;
-    if (currentSuite == null ? void 0 : currentSuite.options) {
-      options = { ...currentSuite.options, ...options };
-    }
+    options = {
+      ...currentSuite == null ? void 0 : currentSuite.options,
+      ...options,
+      shuffle: this.shuffle ?? options.shuffle ?? ((_a = currentSuite == null ? void 0 : currentSuite.options) == null ? void 0 : _a.shuffle) ?? void 0
+    };
     const isConcurrent = isConcurrentSpecified || options.concurrent && !isSequentialSpecified;
     const isSequential = isSequentialSpecified || options.sequential && !isConcurrentSpecified;
     options.concurrent = isConcurrent && !isSequential;
@@ -487,7 +537,6 @@ function createSuite() {
       formatName(name),
       factory,
       mode,
-      this.shuffle,
       this.each,
       options
     );
@@ -502,7 +551,7 @@ function createSuite() {
       const _name = formatName(name);
       const arrayOnlyCases = cases.every(Array.isArray);
       const { options, handler } = parseArguments(optionsOrFn, fnOrOptions);
-      const fnFirst = typeof optionsOrFn === "function";
+      const fnFirst = typeof optionsOrFn === "function" && typeof fnOrOptions === "object";
       cases.forEach((i, idx) => {
         const items = Array.isArray(i) ? i : [i];
         if (fnFirst) {
@@ -526,6 +575,18 @@ function createSuite() {
       this.setContext("each", void 0);
     };
   };
+  suiteFn.for = function(cases, ...args) {
+    if (Array.isArray(cases) && args.length) {
+      cases = formatTemplateString(cases, args);
+    }
+    return (name, optionsOrFn, fnOrOptions) => {
+      const name_ = formatName(name);
+      const { options, handler } = parseArguments(optionsOrFn, fnOrOptions);
+      cases.forEach((item, idx) => {
+        suite(formatTitle(name_, helpers.toArray(item), idx), options, () => handler(item));
+      });
+    };
+  };
   suiteFn.skipIf = (condition) => condition ? suite.skip : suite;
   suiteFn.runIf = (condition) => condition ? suite : suite.skip;
   return chunkTasks.c(
@@ -545,7 +606,7 @@ function createTaskCollector(fn, context) {
       const _name = formatName(name);
       const arrayOnlyCases = cases.every(Array.isArray);
       const { options, handler } = parseArguments(optionsOrFn, fnOrOptions);
-      const fnFirst = typeof optionsOrFn === "function";
+      const fnFirst = typeof optionsOrFn === "function" && typeof fnOrOptions === "object";
       cases.forEach((i, idx) => {
         const items = Array.isArray(i) ? i : [i];
         if (fnFirst) {
@@ -592,7 +653,14 @@ function createTaskCollector(fn, context) {
     return condition ? this : this.skip;
   };
   taskFn.extend = function(fixtures) {
-    const _context = mergeContextFixtures(fixtures, context);
+    const _context = mergeContextFixtures(
+      fixtures,
+      context || {},
+      (key) => {
+        var _a, _b;
+        return (_b = (_a = getRunner()).injectValue) == null ? void 0 : _b.call(_a, key);
+      }
+    );
     return createTest(function fn2(name, optionsOrFn, optionsOrTest) {
       getCurrentSuite().test.fn.call(
         this,
@@ -661,6 +729,24 @@ function formatTemplateString(cases, args) {
   }
   return res;
 }
+function findTestFileStackTrace(error, each) {
+  const lines = error.split("\n").slice(1);
+  for (const line of lines) {
+    const stack = sourceMap.parseSingleStack(line);
+    if (stack && stack.file === getTestFilepath()) {
+      return {
+        line: stack.line,
+        /**
+         * test.each([1, 2])('name')
+         *                 ^ leads here, but should
+         *                  ^ lead here
+         * in source maps it's the same boundary, so it just points to the start of it
+         */
+        column: each ? stack.column + 1 : stack.column
+      };
+    }
+  }
+}
 globalThis.performance ? globalThis.performance.now.bind(globalThis.performance) : Date.now;
 globalThis.performance ? globalThis.performance.now.bind(globalThis.performance) : Date.now;
 exports.createTaskCollector = createTaskCollector;

package/lib/node_modules/.pnpm/{@vitest_runner@2.1.8 → @vitest_runner@3.0.5}/node_modules/@vitest/runner/dist/index.qwik.mjs

@@ -1,21 +1,23 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-import { getSafeTimers } from "../../../../../@vitest_utils@2.1.8/node_modules/@vitest/utils/dist/index.qwik.mjs";
+import { getSafeTimers } from "../../../../../@vitest_utils@3.0.5/node_modules/@vitest/utils/dist/index.qwik.mjs";
+import { parseSingleStack } from "../../../../../@vitest_utils@3.0.5/node_modules/@vitest/utils/dist/source-map.qwik.mjs";
 import { c as createChainable } from "./chunk-tasks.qwik.mjs";
-import { isNegativeNaN, isObject, objectAttr, toArray, createDefer } from "../../../../../@vitest_utils@2.1.8/node_modules/@vitest/utils/dist/helpers.qwik.mjs";
-import { f as format, o as objDisplay } from "../../../../../@vitest_utils@2.1.8/node_modules/@vitest/utils/dist/chunk-_commonjsHelpers.qwik.mjs";
+import { isNegativeNaN, isObject, objectAttr, toArray, createDefer } from "../../../../../@vitest_utils@3.0.5/node_modules/@vitest/utils/dist/helpers.qwik.mjs";
+import { f as format, o as objDisplay } from "../../../../../@vitest_utils@3.0.5/node_modules/@vitest/utils/dist/chunk-_commonjsHelpers.qwik.mjs";
 class PendingError extends Error {
-  constructor(message, task) {
+  constructor(message, task, note) {
     super(message);
     __publicField(this, "code", "VITEST_PENDING");
     __publicField(this, "taskId");
     this.message = message;
+    this.note = note;
     this.taskId = task.id;
   }
 }
+const now$2 = Date.now;
 const collectorContext = {
-  tasks: [],
   currentSuite: null
 };
 function collectTask(task) {
@@ -34,17 +36,37 @@ function withTimeout(fn, timeout, isHook = false) {
   }
   const { setTimeout, clearTimeout } = getSafeTimers();
   return function runWithTimeout(...args) {
-    return Promise.race([
-      fn(...args),
-      new Promise((resolve, reject) => {
-        var _a;
-        const timer = setTimeout(() => {
-          clearTimeout(timer);
-          reject(new Error(makeTimeoutMsg(isHook, timeout)));
-        }, timeout);
-        (_a = timer.unref) == null ? void 0 : _a.call(timer);
-      })
-    ]);
+    const startTime = now$2();
+    return new Promise((resolve_, reject_) => {
+      var _a;
+      const timer = setTimeout(() => {
+        clearTimeout(timer);
+        reject(new Error(makeTimeoutMsg(isHook, timeout)));
+      }, timeout);
+      (_a = timer.unref) == null ? void 0 : _a.call(timer);
+      function resolve(result) {
+        clearTimeout(timer);
+        if (now$2() - startTime >= timeout) {
+          reject_(new Error(makeTimeoutMsg(isHook, timeout)));
+          return;
+        }
+        resolve_(result);
+      }
+      function reject(error) {
+        clearTimeout(timer);
+        reject_(error);
+      }
+      try {
+        const result = fn(...args);
+        if (typeof result === "object" && result != null && typeof result.then === "function") {
+          result.then(resolve, reject);
+        } else {
+          resolve(result);
+        }
+      } catch (error) {
+        reject(error);
+      }
+    });
   };
 }
 function createTestContext(test, runner2) {
@@ -53,17 +75,22 @@ function createTestContext(test, runner2) {
     throw new Error("done() callback is deprecated, use promise instead");
   };
   context.task = test;
-  context.skip = () => {
-    test.pending = true;
-    throw new PendingError("test is skipped; abort execution", test);
+  context.skip = (note) => {
+    test.result ?? (test.result = { state: "skip" });
+    test.result.pending = true;
+    throw new PendingError("test is skipped; abort execution", test, note);
   };
-  context.onTestFailed = (fn) => {
+  context.onTestFailed = (handler, timeout) => {
     test.onFailed || (test.onFailed = []);
-    test.onFailed.push(fn);
+    test.onFailed.push(
+      withTimeout(handler, timeout ?? runner2.config.hookTimeout, true)
+    );
   };
-  context.onTestFinished = (fn) => {
+  context.onTestFinished = (handler, timeout) => {
     test.onFinished || (test.onFinished = []);
-    test.onFinished.push(fn);
+    test.onFinished.push(
+      withTimeout(handler, timeout ?? runner2.config.hookTimeout, true)
+    );
   };
   return ((_a = runner2.extendTaskContext) == null ? void 0 : _a.call(runner2, context)) || context;
 }
@@ -89,14 +116,15 @@ function setHooks(key, hooks) {
 function getHooks(key) {
   return hooksMap.get(key);
 }
-function mergeContextFixtures(fixtures, context = {}) {
-  const fixtureOptionKeys = ["auto"];
+function mergeContextFixtures(fixtures, context, inject) {
+  const fixtureOptionKeys = ["auto", "injected"];
   const fixtureArray = Object.entries(fixtures).map(
     ([prop, value]) => {
       const fixtureItem = { value };
       if (Array.isArray(value) && value.length >= 2 && isObject(value[1]) && Object.keys(value[1]).some((key) => fixtureOptionKeys.includes(key))) {
         Object.assign(fixtureItem, value[1]);
-        fixtureItem.value = value[0];
+        const userValue = value[0];
+        fixtureItem.value = fixtureItem.injected ? inject(prop) ?? userValue : userValue;
       }
       fixtureItem.prop = prop;
       fixtureItem.isFn = typeof fixtureItem.value === "function";
@@ -281,11 +309,19 @@ createTest(function(name, optionsOrFn, optionsOrTest) {
 });
 let runner;
 let defaultSuite;
+let currentTestFilepath;
 function assert(condition, message) {
   if (!condition) {
     throw new Error(`Vitest failed to find ${message}. This is a bug in Vitest. Please, open an issue with reproduction.`);
   }
 }
+function getTestFilepath() {
+  return currentTestFilepath;
+}
+function getRunner() {
+  assert(runner, "the runner");
+  return runner;
+}
 function getCurrentSuite() {
   const currentSuite = collectorContext.currentSuite || defaultSuite;
   assert(currentSuite, "the current suite");
@@ -309,6 +345,9 @@ function parseArguments(optionsOrFn, optionsOrTest) {
         "Cannot use two objects as arguments. Please provide options and a function callback in that order."
       );
     }
+    console.warn(
+      "Using an object as a third argument is deprecated. Vitest 4 will throw an error if the third argument is not a timeout number. Please use the second argument for options. See more at https://vitest.dev/guide/migration"
+    );
     options = optionsOrTest;
   } else if (typeof optionsOrTest === "number") {
     options = { timeout: optionsOrTest };
@@ -331,7 +370,7 @@ function parseArguments(optionsOrFn, optionsOrTest) {
   };
 }
 function createSuiteCollector(name, factory = () => {
-}, mode, shuffle, each, suiteOptions) {
+}, mode, each, suiteOptions) {
   const tasks = [];
   const factoryQueue = [];
   let suite2;
@@ -344,7 +383,7 @@ function createSuiteCollector(name, factory = () => {
       each: options.each,
       fails: options.fails,
       context: void 0,
-      type: "custom",
+      type: "test",
       file: void 0,
       retry: options.retry ?? runner.config.retry,
       repeats: options.repeats,
@@ -355,9 +394,7 @@ function createSuiteCollector(name, factory = () => {
     if (options.concurrent || !options.sequential && runner.config.sequence.concurrent) {
       task2.concurrent = true;
     }
-    if (shuffle) {
-      task2.shuffle = true;
-    }
+    task2.shuffle = suiteOptions == null ? void 0 : suiteOptions.shuffle;
     const context = createTestContext(task2, runner);
     Object.defineProperty(task2, "context", {
       value: context,
@@ -368,12 +405,21 @@ function createSuiteCollector(name, factory = () => {
       setFn(
         task2,
         withTimeout(
-          withAwaitAsyncAssetions(withFixtures(handler, context), task2),
+          withAwaitAsyncAssertions(withFixtures(handler, context), task2),
           (options == null ? void 0 : options.timeout) ?? runner.config.testTimeout
         )
       );
     }
-    if (runner.config.includeTaskLocation) ;
+    if (runner.config.includeTaskLocation) {
+      const limit = Error.stackTraceLimit;
+      Error.stackTraceLimit = 15;
+      const error = new Error("stacktrace").stack;
+      Error.stackTraceLimit = limit;
+      const stack = findTestFileStackTrace(error, task2.each ?? false);
+      if (stack) {
+        task2.location = stack;
+      }
+    }
     tasks.push(task2);
     return task2;
   };
@@ -417,7 +463,7 @@ function createSuiteCollector(name, factory = () => {
       mode,
       each,
       file: void 0,
-      shuffle,
+      shuffle: suiteOptions == null ? void 0 : suiteOptions.shuffle,
       tasks: [],
       meta: /* @__PURE__ */ Object.create(null),
       concurrent: suiteOptions == null ? void 0 : suiteOptions.concurrent
@@ -452,9 +498,9 @@ function createSuiteCollector(name, factory = () => {
   collectTask(collector);
   return collector;
 }
-function withAwaitAsyncAssetions(fn, task) {
+function withAwaitAsyncAssertions(fn, task) {
   return async (...args) => {
-    await fn(...args);
+    const fnResult = await fn(...args);
     if (task.promises) {
       const result = await Promise.allSettled(task.promises);
       const errors = result.map((r) => r.status === "rejected" ? r.reason : void 0).filter(Boolean);
@@ -462,10 +508,12 @@ function withAwaitAsyncAssetions(fn, task) {
         throw errors;
       }
     }
+    return fnResult;
   };
 }
 function createSuite() {
-  function suiteFn(name, factoryOrOptions, optionsOrFactory = {}) {
+  function suiteFn(name, factoryOrOptions, optionsOrFactory) {
+    var _a;
     const mode = this.only ? "only" : this.skip ? "skip" : this.todo ? "todo" : "run";
     const currentSuite = collectorContext.currentSuite || defaultSuite;
     let { options, handler: factory } = parseArguments(
@@ -474,9 +522,11 @@ function createSuite() {
     );
     const isConcurrentSpecified = options.concurrent || this.concurrent || options.sequential === false;
     const isSequentialSpecified = options.sequential || this.sequential || options.concurrent === false;
-    if (currentSuite == null ? void 0 : currentSuite.options) {
-      options = { ...currentSuite.options, ...options };
-    }
+    options = {
+      ...currentSuite == null ? void 0 : currentSuite.options,
+      ...options,
+      shuffle: this.shuffle ?? options.shuffle ?? ((_a = currentSuite == null ? void 0 : currentSuite.options) == null ? void 0 : _a.shuffle) ?? void 0
+    };
     const isConcurrent = isConcurrentSpecified || options.concurrent && !isSequentialSpecified;
     const isSequential = isSequentialSpecified || options.sequential && !isConcurrentSpecified;
     options.concurrent = isConcurrent && !isSequential;
@@ -485,7 +535,6 @@ function createSuite() {
       formatName(name),
       factory,
       mode,
-      this.shuffle,
       this.each,
       options
     );
@@ -500,7 +549,7 @@ function createSuite() {
       const _name = formatName(name);
       const arrayOnlyCases = cases.every(Array.isArray);
       const { options, handler } = parseArguments(optionsOrFn, fnOrOptions);
-      const fnFirst = typeof optionsOrFn === "function";
+      const fnFirst = typeof optionsOrFn === "function" && typeof fnOrOptions === "object";
       cases.forEach((i, idx) => {
         const items = Array.isArray(i) ? i : [i];
         if (fnFirst) {
@@ -524,6 +573,18 @@ function createSuite() {
       this.setContext("each", void 0);
     };
   };
+  suiteFn.for = function(cases, ...args) {
+    if (Array.isArray(cases) && args.length) {
+      cases = formatTemplateString(cases, args);
+    }
+    return (name, optionsOrFn, fnOrOptions) => {
+      const name_ = formatName(name);
+      const { options, handler } = parseArguments(optionsOrFn, fnOrOptions);
+      cases.forEach((item, idx) => {
+        suite(formatTitle(name_, toArray(item), idx), options, () => handler(item));
+      });
+    };
+  };
   suiteFn.skipIf = (condition) => condition ? suite.skip : suite;
   suiteFn.runIf = (condition) => condition ? suite : suite.skip;
   return createChainable(
@@ -543,7 +604,7 @@ function createTaskCollector(fn, context) {
       const _name = formatName(name);
       const arrayOnlyCases = cases.every(Array.isArray);
       const { options, handler } = parseArguments(optionsOrFn, fnOrOptions);
-      const fnFirst = typeof optionsOrFn === "function";
+      const fnFirst = typeof optionsOrFn === "function" && typeof fnOrOptions === "object";
       cases.forEach((i, idx) => {
         const items = Array.isArray(i) ? i : [i];
         if (fnFirst) {
@@ -590,7 +651,14 @@ function createTaskCollector(fn, context) {
     return condition ? this : this.skip;
   };
   taskFn.extend = function(fixtures) {
-    const _context = mergeContextFixtures(fixtures, context);
+    const _context = mergeContextFixtures(
+      fixtures,
+      context || {},
+      (key) => {
+        var _a, _b;
+        return (_b = (_a = getRunner()).injectValue) == null ? void 0 : _b.call(_a, key);
+      }
+    );
     return createTest(function fn2(name, optionsOrFn, optionsOrTest) {
       getCurrentSuite().test.fn.call(
         this,
@@ -659,6 +727,24 @@ function formatTemplateString(cases, args) {
   }
   return res;
 }
+function findTestFileStackTrace(error, each) {
+  const lines = error.split("\n").slice(1);
+  for (const line of lines) {
+    const stack = parseSingleStack(line);
+    if (stack && stack.file === getTestFilepath()) {
+      return {
+        line: stack.line,
+        /**
+         * test.each([1, 2])('name')
+         *                 ^ leads here, but should
+         *                  ^ lead here
+         * in source maps it's the same boundary, so it just points to the start of it
+         */
+        column: each ? stack.column + 1 : stack.column
+      };
+    }
+  }
+}
 globalThis.performance ? globalThis.performance.now.bind(globalThis.performance) : Date.now;
 globalThis.performance ? globalThis.performance.now.bind(globalThis.performance) : Date.now;
 export {