qunitx 1.2.6 → 1.2.7

package/dist/deno/index.d.ts

@@ -24,9 +24,10 @@
  *
  * @module
  */
-import type { AssertionErrorOptions } from "../types.d.ts";
 import '../../vendor/qunit.js';
+import { AssertionError as DenoAssertionError } from 'jsr:@std/assert';
 import Assert from '../shared/assert.d.ts';
+import type { AssertionErrorOptions } from '../types.d.ts';
 import Module from './module.d.ts';
 import Test from './test.d.ts';
 /**
@@ -92,6 +93,24 @@ export { Assert };
  * ```
  */
 export { default as module } from './module.d.ts';
+/**
+ * Registers a skipped test. Equivalent to `test.skip`. The test body is never
+ * executed and the test is reported as ignored by Deno's runner.
+ *
+ * @param {string} testName - Name of the test to skip.
+ * @param {function} [_testContent] - Optional body (ignored — the test will not run).
+ * @example
+ * ```js
+ * import { module, skip } from "qunitx";
+ *
+ * module("Math", () => {
+ *   skip("addition is not yet implemented", (assert) => {
+ *     assert.equal(1 + 1, 2);
+ *   });
+ * });
+ * ```
+ */
+export declare const skip: (testName: string, _testContent?: unknown) => void;
 /**
  * Defines an individual test. Wraps Deno's `it()` and handles the full QUnit
  * lifecycle: `beforeEach`/`afterEach` hooks, async assertion waiting, and step
@@ -123,24 +142,6 @@ export { default as module } from './module.d.ts';
  * ```
  */
 export { default as test } from './test.d.ts';
-/**
- * Registers a skipped test. Equivalent to `test.skip`. The test body is never
- * executed and the test is reported as ignored by Deno's runner.
- *
- * @param {string} testName - Name of the test to skip.
- * @param {function} [_testContent] - Optional body (ignored — the test will not run).
- * @example
- * ```js
- * import { module, skip } from "qunitx";
- *
- * module("Math", () => {
- *   skip("addition is not yet implemented", (assert) => {
- *     assert.equal(1 + 1, 2);
- *   });
- * });
- * ```
- */
-export declare const skip: (testName: string, _testContent?: unknown) => void;
 export declare const todo: (testName: string, _testContent?: unknown) => void;
 /**
  * The default export provides the full QUnitX API as a single object.

package/dist/deno/index.js

@@ -244,7 +244,7 @@ var require_qunit = __commonJS({
       };
       function objectValues2(obj) {
         var allowArray = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : true;
-        var vals = allowArray && is2("array", obj) ? [] : {};
+        var vals = allowArray && is("array", obj) ? [] : {};
         for (var key in obj) {
           if (hasOwn$1.call(obj, key)) {
             var val = obj[key];
@@ -306,7 +306,7 @@ var require_qunit = __commonJS({
             return _typeof(obj);
         }
       }
-      function is2(type, obj) {
+      function is(type, obj) {
         return objectType2(obj) === type;
       }
       function generateHash(module3, testName) {
@@ -791,11 +791,11 @@ var require_qunit = __commonJS({
               type = "null";
             } else if (typeof obj === "undefined") {
               type = "undefined";
-            } else if (is2("regexp", obj)) {
+            } else if (is("regexp", obj)) {
               type = "regexp";
-            } else if (is2("date", obj)) {
+            } else if (is("date", obj)) {
               type = "date";
-            } else if (is2("function", obj)) {
+            } else if (is("function", obj)) {
               type = "function";
             } else if (obj.setInterval !== void 0 && obj.document !== void 0 && obj.nodeType === void 0) {
               type = "window";
@@ -4297,7 +4297,7 @@ var require_qunit = __commonJS({
         equiv,
         reporters,
         hooks,
-        is: is2,
+        is,
         objectType: objectType2,
         on,
         onError: onWindowError,
@@ -5973,6 +5973,9 @@ var require_qunit = __commonJS({
   }
 });
 
+// shims/deno/index.ts
+var import_qunit2 = __toESM(require_qunit(), 1);
+
 // jsr:https://jsr.io/@std/assert/1.0.19/assertion_error.ts
 var AssertionError = class extends Error {
   /** Constructs a new instance.
@@ -6017,9 +6020,6 @@ var ANSI_PATTERN = new RegExp(
   "g"
 );
 
-// shims/deno/index.ts
-var import_qunit2 = __toESM(require_qunit(), 1);
-
 // shims/shared/assert.ts
 var import_qunit = __toESM(require_qunit(), 1);
 
@@ -6053,11 +6053,8 @@ function objectType(obj) {
       return typeof obj;
   }
 }
-function is(type, obj) {
-  return objectType(obj) === type;
-}
 function objectValues(obj, allowArray = true) {
-  const vals = allowArray && is("array", obj) ? [] : {};
+  const vals = allowArray && objectType(obj) === "array" ? [] : {};
   for (const key in obj) {
     if (hasOwn.call(obj, key)) {
       const val = obj[key];
@@ -6089,13 +6086,15 @@ function validateExpectedExceptionArgs(expected, message, assertionMethod) {
       expected = void 0;
       return [expected, message];
     } else {
-      throw new Error("assert." + assertionMethod + " does not accept a string value for the expected argument.\nUse a non-string object value (e.g. RegExp or validator function) instead if necessary.");
+      throw new Error(
+        `assert.${assertionMethod} does not accept a string value for the expected argument.
+Use a non-string object value (e.g. RegExp or validator function) instead if necessary.`
+      );
     }
   }
-  const valid = !expected || // TODO: be more explicit here
-  expectedType === "regexp" || expectedType === "function" || expectedType === "object";
+  const valid = !expected || expectedType === "regexp" || expectedType === "function" || expectedType === "object";
   if (!valid) {
-    throw new Error("Invalid expected value type (" + expectedType + ") provided to assert." + assertionMethod + ".");
+    throw new Error(`Invalid expected value type (${expectedType}) provided to assert.${assertionMethod}.`);
   }
   return [expected, message];
 }
@@ -6125,13 +6124,15 @@ function validateException(actual, expected, message) {
 function errorString(error) {
   const resultErrorString = String(error);
   if (resultErrorString.slice(0, 7) === "[object") {
-    return (error.name || "Error") + (error.message ? ": ".concat(error.message) : "");
-  } else {
-    return resultErrorString;
+    const name = error.name || "Error";
+    const msg = error.message;
+    return msg ? `${name}: ${msg}` : name;
   }
+  return resultErrorString;
 }
 
 // shims/shared/assert.ts
+var PENDING = /* @__PURE__ */ Symbol("pending");
 var Assert = class _Assert {
   /** @internal Set by each runtime shim before tests run. */
   static QUnit;
@@ -6143,7 +6144,7 @@ var Assert = class _Assert {
   test;
   /** @internal */
   constructor(module2, test3) {
-    this.test = test3 || module2.context;
+    this.test = test3 || module2.testContext;
   }
   /** @internal */
   _incrementAssertionCount() {
@@ -6185,19 +6186,10 @@ var Assert = class _Assert {
    * ```
    */
   step(message) {
-    let assertionMessage = message;
-    let result = !!message;
     this.test.steps.push(message);
-    if (typeof message === "undefined" || message === "") {
-      assertionMessage = "You must provide a message to assert.step";
-    } else if (typeof message !== "string") {
-      assertionMessage = "You must provide a string value to assert.step";
-      result = false;
-    }
-    this.pushResult({
-      result,
-      message: assertionMessage
-    });
+    const result = typeof message === "string" && message.length > 0;
+    const assertionMessage = result ? message : message === void 0 || message === "" ? "You must provide a message to assert.step" : "You must provide a string value to assert.step";
+    this.pushResult({ result, message: assertionMessage });
   }
   /**
    * Asserts that the steps recorded via {@linkcode Assert.prototype.step} match the given array,
@@ -6257,14 +6249,9 @@ var Assert = class _Assert {
    * ```
    */
   async() {
-    let resolveFn;
-    const done = new Promise((resolve) => {
-      resolveFn = resolve;
-    });
-    this.test.asyncOps.push(done);
-    return () => {
-      resolveFn();
-    };
+    const { promise, resolve } = Promise.withResolvers();
+    this.test.asyncOps.push(promise);
+    return resolve;
   }
   /** @internal Used by the test runner to wait for all async operations to complete. */
   waitForAsyncOps() {
@@ -6662,7 +6649,7 @@ var Assert = class _Assert {
    * ```
    */
   throws(blockFn, expectedInput, assertionMessage) {
-    this?._incrementAssertionCount();
+    this._incrementAssertionCount();
     const [expected, message] = validateExpectedExceptionArgs(expectedInput, assertionMessage, "throws");
     if (typeof blockFn !== "function") {
       throw new _Assert.AssertionError({
@@ -6672,8 +6659,9 @@ var Assert = class _Assert {
         stackStartFn: this.throws
       });
     }
+    let returnValue;
     try {
-      blockFn();
+      returnValue = blockFn();
     } catch (error) {
       const [result, validatedExpected, validatedMessage] = validateException(error, expected, message);
       if (result === false) {
@@ -6686,6 +6674,14 @@ var Assert = class _Assert {
       }
       return;
     }
+    if (returnValue !== null && typeof returnValue === "object" && typeof returnValue.then === "function") {
+      throw new _Assert.AssertionError({
+        actual: returnValue,
+        expected,
+        message: "Function passed to `assert.throws` returned a Promise \u2014 did you mean to use `assert.rejects`?",
+        stackStartFn: this.throws
+      });
+    }
     throw new _Assert.AssertionError({
       actual: blockFn,
       expected,
@@ -6720,15 +6716,13 @@ var Assert = class _Assert {
         stackStartFn: this.rejects
       });
     }
-    let didReject = false;
-    let rejectionError;
+    let caught = PENDING;
     try {
       await promise;
     } catch (error) {
-      didReject = true;
-      rejectionError = error;
+      caught = error;
     }
-    if (!didReject) {
+    if (caught === PENDING) {
       throw new _Assert.AssertionError({
         actual: promise,
         expected,
@@ -6736,7 +6730,7 @@ var Assert = class _Assert {
         stackStartFn: this.rejects
       });
     }
-    const [result, validatedExpected, validatedMessage] = validateException(rejectionError, expected, message);
+    const [result, validatedExpected, validatedMessage] = validateException(caught, expected, message);
     if (result === false) {
       throw new _Assert.AssertionError({
         actual: result,
@@ -6756,51 +6750,34 @@ ${description}
 
 ${inspect(expected)}`;
 }
+var INSPECT_OPTIONS = { depth: 10, colors: true, compact: false };
 function inspect(value) {
-  return Assert.inspect(value, { depth: 10, colors: true, compact: false });
+  return Assert.inspect(value, INSPECT_OPTIONS);
 }
 
 // shims/shared/test-context.ts
 var TestContext = class _TestContext {
   static Assert;
-  #name;
-  get name() {
-    return this.#name;
-  }
-  set name(value) {
-    this.#name = value;
-  }
-  #module;
-  get module() {
-    return this.#module;
-  }
-  set module(value) {
-    this.#module = value;
-  }
-  #asyncOps = [];
-  get asyncOps() {
-    return this.#asyncOps;
-  }
-  set asyncOps(value) {
-    this.#asyncOps = value;
-  }
-  #assert;
-  get assert() {
-    return this.#assert;
-  }
-  set assert(value) {
-    this.#assert = value;
-  }
-  #timeout;
-  get timeout() {
-    return this.#timeout;
-  }
-  set timeout(value) {
-    this.#timeout = value;
-  }
+  name;
+  module;
+  asyncOps = [];
+  assert;
+  timeout;
+  steps = [];
+  expectedAssertionCount;
+  totalExecutedAssertions = 0;
+  userContext = {};
   rejectTimeout;
   #timeoutHandle;
   #timedOut = false;
+  constructor(name, moduleContext) {
+    if (moduleContext) {
+      this.name = `${moduleContext.name} | ${name}`;
+      this.module = moduleContext;
+      this.module.tests.push(this);
+      this.assert = new _TestContext.Assert(moduleContext, this);
+    }
+  }
   setTimeoutDuration(ms) {
     if (this.#timeoutHandle !== void 0) {
       clearTimeout(this.#timeoutHandle);
@@ -6818,59 +6795,29 @@ var TestContext = class _TestContext {
       this.#timeoutHandle = void 0;
     }
   }
-  #steps = [];
-  get steps() {
-    return this.#steps;
-  }
-  set steps(value) {
-    this.#steps = value;
-  }
-  #expectedAssertionCount;
-  get expectedAssertionCount() {
-    return this.#expectedAssertionCount;
-  }
-  set expectedAssertionCount(value) {
-    this.#expectedAssertionCount = value;
-  }
-  #totalExecutedAssertions = 0;
-  get totalExecutedAssertions() {
-    return this.#totalExecutedAssertions;
-  }
-  set totalExecutedAssertions(value) {
-    this.#totalExecutedAssertions = value;
-  }
-  userContext = {};
-  constructor(name, moduleContext) {
-    if (moduleContext) {
-      this.name = `${moduleContext.name} | ${name}`;
-      this.module = moduleContext;
-      this.module.tests.push(this);
-      this.assert = new _TestContext.Assert(moduleContext, this);
-    }
-  }
   finish() {
     if (this.#timedOut) return;
-    if (this.totalExecutedAssertions === 0) {
-      this.assert.pushResult({
-        result: false,
-        actual: this.totalExecutedAssertions,
-        expected: "> 0",
-        message: `Expected at least one assertion to be run for test: ${this.name}`
-      });
-    } else if (this.steps.length > 0) {
+    if (this.steps.length > 0) {
       this.assert.pushResult({
         result: false,
         actual: this.steps,
         expected: [],
         message: `Expected assert.verifySteps() to be called before end of test after using assert.step(). Unverified steps: ${this.steps.join(", ")}`
       });
-    } else if (this.expectedAssertionCount && this.expectedAssertionCount !== this.totalExecutedAssertions) {
+    } else if (this.expectedAssertionCount !== void 0 && this.expectedAssertionCount !== this.totalExecutedAssertions) {
       this.assert.pushResult({
         result: false,
         actual: this.totalExecutedAssertions,
         expected: this.expectedAssertionCount,
         message: `Expected ${this.expectedAssertionCount} assertions, but ${this.totalExecutedAssertions} were run for test: ${this.name}`
       });
+    } else if (this.expectedAssertionCount === void 0 && this.totalExecutedAssertions === 0) {
+      this.assert.pushResult({
+        result: false,
+        actual: this.totalExecutedAssertions,
+        expected: "> 0",
+        message: `Expected at least one assertion to be run for test: ${this.name}`
+      });
     }
   }
 };
@@ -6880,21 +6827,21 @@ var ModuleContext = class _ModuleContext {
   static Assert;
   static currentModuleChain = [];
   static get lastModule() {
-    return this.currentModuleChain[this.currentModuleChain.length - 1];
+    return this.currentModuleChain.at(-1);
   }
   name;
   assert;
   userContext;
   // Internal fallback assert for modules with no direct tests
-  context = new TestContext();
+  testContext = new TestContext();
   moduleChain = [];
   beforeEachHooks = [];
   afterEachHooks = [];
   tests = [];
   constructor(name) {
-    const parentModule = _ModuleContext.currentModuleChain[_ModuleContext.currentModuleChain.length - 1];
+    const parentModule = _ModuleContext.currentModuleChain.at(-1);
     _ModuleContext.currentModuleChain.push(this);
-    this.moduleChain = _ModuleContext.currentModuleChain.slice(0);
+    this.moduleChain = [..._ModuleContext.currentModuleChain];
     this.name = parentModule ? `${parentModule.name} > ${name}` : name;
     this.assert = new _ModuleContext.Assert(this);
     this.userContext = parentModule ? Object.create(parentModule.userContext) : /* @__PURE__ */ Object.create(null);
@@ -7699,12 +7646,12 @@ function module(moduleName, runtimeOptions, moduleContent) {
     });
     return;
   }
-  const targetModuleContent = moduleContent ? moduleContent : runtimeOptions;
+  const targetModuleContent = moduleContent ?? runtimeOptions;
   const moduleContext = new ModuleContext(moduleName);
   describe(moduleName, { ...targetRuntimeOptions }, function() {
     const beforeHooks = [];
     const afterHooks = [];
-    beforeAll(async function() {
+    beforeAll(async () => {
       const firstTest = moduleContext.tests[0];
       const beforeAssert = firstTest ? firstTest.assert : moduleContext.assert;
       for (const hook of beforeHooks) {
@@ -7712,17 +7659,16 @@ function module(moduleName, runtimeOptions, moduleContent) {
       }
     });
     afterAll(async () => {
-      for (const testContext of moduleContext.tests) {
-        await testContext.assert.waitForAsyncOps();
-      }
-      const lastTest = moduleContext.tests[moduleContext.tests.length - 1];
+      const allAsyncOps = moduleContext.tests.flatMap((t) => t.asyncOps);
+      if (allAsyncOps.length > 0) await Promise.all(allAsyncOps);
+      const lastTest = moduleContext.tests.at(-1);
       if (lastTest) {
-        for (let j = afterHooks.length - 1; j >= 0; j--) {
-          await afterHooks[j].call(lastTest.userContext, lastTest.assert, { context: lastTest.userContext });
+        for (const hook of afterHooks.toReversed()) {
+          await hook.call(lastTest.userContext, lastTest.assert, { context: lastTest.userContext });
         }
       }
-      for (let i = 0, len = moduleContext.tests.length; i < len; i++) {
-        moduleContext.tests[i].finish();
+      for (const testCtx of moduleContext.tests) {
+        testCtx.finish();
       }
     });
     targetModuleContent.call(moduleContext.userContext, {
@@ -7738,7 +7684,7 @@ function module(moduleName, runtimeOptions, moduleContent) {
       after(afterFn) {
         afterHooks.push(afterFn);
       }
-    }, { moduleName, options: runtimeOptions, context: moduleContext.userContext });
+    }, { moduleName, options: targetRuntimeOptions, context: moduleContext.userContext });
     ModuleContext.currentModuleChain.pop();
   });
 }
@@ -7764,37 +7710,36 @@ function test2(testName, runtimeOptions, testContent) {
     });
     return;
   }
-  const targetTestContent = testContent ? testContent : runtimeOptions;
+  const targetTestContent = testContent ?? runtimeOptions;
   const context = new TestContext(testName, moduleContext);
   const userContext = Object.create(moduleContext.userContext);
   context.userContext = userContext;
   it(testName, { ...targetRuntimeOptions }, function() {
-    return new Promise((resolve, reject) => {
-      context.rejectTimeout = reject;
-      (async () => {
-        const hookMeta = { context: userContext };
-        try {
-          for (const module2 of context.module.moduleChain) {
-            for (const hook of module2.beforeEachHooks) {
-              await hook.call(userContext, context.assert, hookMeta);
-            }
+    const { promise, resolve, reject } = Promise.withResolvers();
+    context.rejectTimeout = reject;
+    const hookMeta = { context: userContext };
+    (async () => {
+      try {
+        for (const mod of context.module.moduleChain) {
+          for (const hook of mod.beforeEachHooks) {
+            await hook.call(userContext, context.assert, hookMeta);
           }
-          const result = await targetTestContent.call(userContext, context.assert, { testName, options: runtimeOptions, context: userContext });
-          await context.assert.waitForAsyncOps();
-          for (let i = context.module.moduleChain.length - 1; i >= 0; i--) {
-            const module2 = context.module.moduleChain[i];
-            for (let j = module2.afterEachHooks.length - 1; j >= 0; j--) {
-              await module2.afterEachHooks[j].call(userContext, context.assert, hookMeta);
-            }
+        }
+        await targetTestContent.call(userContext, context.assert, { testName, options: targetRuntimeOptions, context: userContext });
+        await context.assert.waitForAsyncOps();
+        for (const mod of context.module.moduleChain.toReversed()) {
+          for (const hook of mod.afterEachHooks.toReversed()) {
+            await hook.call(userContext, context.assert, hookMeta);
           }
-          resolve(result);
-        } catch (err) {
-          reject(err);
-        } finally {
-          context.clearTimeoutHandle();
         }
-      })();
-    });
+        resolve();
+      } catch (err) {
+        reject(err);
+      } finally {
+        context.clearTimeoutHandle();
+      }
+    })();
+    return promise;
   });
 }
 test2.skip = function skipTest(testName, _testContent) {

package/dist/deno/module.d.ts

@@ -1,7 +1,5 @@
 import type Assert from '../shared/assert.d.ts';
 import type { HooksObject } from '../types.d.ts';
-export type { Assert };
-export type { HookFn, HooksObject, PushResultInfo } from '../types.d.ts';
 /**
  * Defines a test module (suite) for Deno's BDD test runner.
  *
@@ -45,3 +43,5 @@ declare namespace module {
     var todo: (moduleName: string, _moduleContent?: unknown) => void;
 }
 export default module;
+export type { Assert };
+export type { HookFn, HooksObject, PushResultInfo } from '../types.d.ts';

package/dist/deno/module.js

@@ -1,4 +1,4 @@
-import { describe, beforeAll, afterAll } from "jsr:@std/testing/bdd";
+import { afterAll, beforeAll, describe } from "jsr:@std/testing/bdd";
 import ModuleContext from "../shared/module-context.js";
 function module(moduleName, runtimeOptions, moduleContent) {
   const targetRuntimeOptions = moduleContent ? runtimeOptions : {};
@@ -8,12 +8,12 @@ function module(moduleName, runtimeOptions, moduleContent) {
     });
     return;
   }
-  const targetModuleContent = moduleContent ? moduleContent : runtimeOptions;
+  const targetModuleContent = moduleContent ?? runtimeOptions;
   const moduleContext = new ModuleContext(moduleName);
   describe(moduleName, { ...targetRuntimeOptions }, function() {
     const beforeHooks = [];
     const afterHooks = [];
-    beforeAll(async function() {
+    beforeAll(async () => {
       const firstTest = moduleContext.tests[0];
       const beforeAssert = firstTest ? firstTest.assert : moduleContext.assert;
       for (const hook of beforeHooks) {
@@ -21,17 +21,16 @@ function module(moduleName, runtimeOptions, moduleContent) {
       }
     });
     afterAll(async () => {
-      for (const testContext of moduleContext.tests) {
-        await testContext.assert.waitForAsyncOps();
-      }
-      const lastTest = moduleContext.tests[moduleContext.tests.length - 1];
+      const allAsyncOps = moduleContext.tests.flatMap((t) => t.asyncOps);
+      if (allAsyncOps.length > 0) await Promise.all(allAsyncOps);
+      const lastTest = moduleContext.tests.at(-1);
       if (lastTest) {
-        for (let j = afterHooks.length - 1; j >= 0; j--) {
-          await afterHooks[j].call(lastTest.userContext, lastTest.assert, { context: lastTest.userContext });
+        for (const hook of afterHooks.toReversed()) {
+          await hook.call(lastTest.userContext, lastTest.assert, { context: lastTest.userContext });
         }
       }
-      for (let i = 0, len = moduleContext.tests.length; i < len; i++) {
-        moduleContext.tests[i].finish();
+      for (const testCtx of moduleContext.tests) {
+        testCtx.finish();
       }
     });
     targetModuleContent.call(moduleContext.userContext, {
@@ -47,7 +46,7 @@ function module(moduleName, runtimeOptions, moduleContent) {
       after(afterFn) {
         afterHooks.push(afterFn);
       }
-    }, { moduleName, options: runtimeOptions, context: moduleContext.userContext });
+    }, { moduleName, options: targetRuntimeOptions, context: moduleContext.userContext });
     ModuleContext.currentModuleChain.pop();
   });
 }

package/dist/deno/test.d.ts

@@ -1,6 +1,4 @@
 import type Assert from '../shared/assert.d.ts';
-export type { Assert };
-export type { PushResultInfo } from '../types.d.ts';
 /**
  * Defines an individual test within a module for Deno's BDD test runner.
  *
@@ -48,3 +46,5 @@ declare namespace test {
     var todo: (testName: string, _testContent?: unknown) => void;
 }
 export default test;
+export type { Assert };
+export type { PushResultInfo } from '../types.d.ts';