@plugjs/expect5 0.4.6 → 0.4.8

package/dist/test.mjs

@@ -1,15 +1,21 @@
+;const __$$_esm_paths_helper = await (async() => {
+  const __filename = (await import("node:url")).fileURLToPath(import.meta.url);
+  const __dirname = (await import("node:path")).dirname(__filename);
+  return { __filename, __dirname };
+})();
+
 // test.ts
 import { AssertionError } from "node:assert";
 import { BuildFailure } from "@plugjs/plug";
 import { assert } from "@plugjs/plug/asserts";
-import { $blu, $grn, $gry, $ms, $red, $wht, $ylw, ERROR, NOTICE, WARN, log } from "@plugjs/plug/logging";
+import { $blu, $grn, $gry, $ms, $red, $wht, $ylw, ERROR, NOTICE, WARN, log, $p, githubAnnotation } from "@plugjs/plug/logging";
 import * as setup from "./execution/setup.mjs";
 import { Suite, skip } from "./execution/executable.mjs";
 import { runSuite } from "./execution/executor.mjs";
 import { diff } from "./expectation/diff.mjs";
 import { expect } from "./expectation/expect.mjs";
 import { printDiff } from "./expectation/print.mjs";
-import { ExpectationError, stringifyObjectType, stringifyValue } from "./expectation/types.mjs";
+import { ExpectationError, stringifyValue } from "./expectation/types.mjs";
 var _pending = "\u22EF";
 var _success = "\u2714";
 var _failure = "\u2718";
@@ -46,8 +52,11 @@ var Test = class {
       anyGlobal["log"] = log;
     }
     const suite = new Suite(void 0, "", async () => {
-      for (const file of files.absolutePaths())
+      let count = 0;
+      for (const file of files.absolutePaths()) {
+        log.debug("Importing", $p(file), "in suite", $gry(`(${++count}/${files.length})`));
         await import(file);
+      }
     });
     await suite.setup();
     const snum = suite.specs;
@@ -80,10 +89,14 @@ var Test = class {
     execution.on("spec:skip", (spec, ms) => {
       if (suite.flag === "only")
         return context.log.leave();
-      context.log.leave(WARN, `${$ylw(_pending)} ${spec.name} ${$ms(ms)} ${$gry("[")}${$ylw("skipped")}${$gry("]")}`);
+      context.log.leave(WARN, `${$ylw(_pending)} ${spec.name} ${$ms(ms, $ylw("skipped"))}`);
     });
     execution.on("spec:pass", (spec, ms) => {
-      context.log.leave(NOTICE, `${$grn(_success)} ${spec.name} ${$ms(ms)}`);
+      if (ms >= spec.timeout * 0.75) {
+        context.log.leave(WARN, `${$ylw(_success)} ${spec.name} ${$ms(ms, $ylw("slow"))}`);
+      } else {
+        context.log.leave(NOTICE, `${$grn(_success)} ${spec.name} ${$ms(ms)}`);
+      }
     });
     execution.on("spec:fail", (spec, ms, { number }) => {
       context.log.leave(
@@ -138,6 +151,7 @@ var Test = class {
 function dumpError(log2, error, genericErrorDiffs) {
   if (error instanceof ExpectationError) {
     log2.enter(ERROR, `${$gry("Expectation Error:")} ${$red(error.message)}`);
+    githubAnnotation({ type: "error", title: "Expectation Error" }, error.message);
     try {
       dumpProps(log2, 17, error);
       dumpStack(log2, error);
@@ -150,6 +164,7 @@ function dumpError(log2, error, genericErrorDiffs) {
   } else if (error instanceof AssertionError) {
     const [message = "Unknown Error", ...lines] = error.message.split("\n");
     log2.enter(ERROR, `${$gry("Assertion Error:")} ${$red(message)}`);
+    githubAnnotation({ type: "error", title: "Assertion Error" }, message);
     try {
       dumpProps(log2, 15, error);
       dumpStack(log2, error);
@@ -170,9 +185,10 @@ function dumpError(log2, error, genericErrorDiffs) {
     }
   } else if (error instanceof Error) {
     const message = error.message || "Unknown Error";
-    const string = stringifyObjectType(error);
-    const type = string === "[AssertionError]" ? "Assertion Error" : string;
-    log2.enter(ERROR, `${$gry(type)}: ${$red(message)}`);
+    const string = Object.getPrototypeOf(error)?.constructor?.name || "Error";
+    const type = string === "AssertionError" ? `${$gry("Assertion Error")}: ` : string === "Error" ? "" : `${$gry(string)}: `;
+    log2.enter(ERROR, `${type}${$red(message)}`);
+    githubAnnotation({ type: "error", title: string }, message);
     try {
       dumpProps(log2, type.length, error);
       dumpStack(log2, error);
@@ -203,7 +219,7 @@ function dumpProps(log2, pad, error) {
     // chai
     "stack"
     // error
-  ].includes(k)).forEach((k) => {
+  ].includes(k)).filter((k) => !(error[k] === null)).filter((k) => !(error[k] === void 0)).forEach((k) => {
     const value = error[k];
     if (k === "code" && value === "ERR_ASSERTION")
       return;

package/dist/test.mjs.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../src/test.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["log"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plugjs/expect5",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -43,11 +43,11 @@
   "author": "Juit Developers <developers@juit.com>",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@types/chai": "^4.3.4",
+    "@types/chai": "^4.3.5",
     "chai": "^4.3.7"
   },
   "peerDependencies": {
-    "@plugjs/plug": "0.4.6"
+    "@plugjs/plug": "0.4.8"
   },
   "files": [
     "*.md",

package/src/expectation/async.ts

@@ -2,10 +2,13 @@ import {
   Expectations,
   type AssertionFunction,
   type AssertedType,
-  type InferMatchers,
+  type InferToEqual,
+  type InferMatcher,
 } from './expectations'
+import { isMatcher, type Constructor } from './types'
+
+import type { Matcher } from './matchers'
 
-import type { Constructor } from './types'
 
 /**
  * Extension to {@link Expectations} adding support for {@link Promise}s.
@@ -26,15 +29,35 @@ export class AsyncExpectations<T = unknown> extends Expectations<T> {
   /* ------------------------------------------------------------------------ */
 
   /**
-   * Expects the value to be a _rejected_ {@link PromiseLike}, and (if
-   * specified) further asserts the rejection reason with an
-   * {@link AssertionFunction}.
+   * Expects the value to be a _rejected_ {@link PromiseLike}.
+   *
+   * Negation: {@link Expectations.toBeResolved `toBeResolved(...)`}
+   */
+  toBeRejected(): Promise<Expectations<PromiseLike<Awaited<T>>>>
+
+  /**
+   * Expects the value to be a _rejected_ {@link PromiseLike}, and further
+   * validates the rejection with a {@link Matcher}.
    *
    * Negation: {@link Expectations.toBeResolved `toBeResolved(...)`}
    */
   toBeRejected(
-      assertion?: AssertionFunction,
-  ): Promise<Expectations<PromiseLike<Awaited<T>>>> {
+    matcher: Matcher,
+  ): Promise<Expectations<PromiseLike<Awaited<T>>>>
+
+  /**
+   * Expects the value to be a _rejected_ {@link PromiseLike}, and further
+   * asserts the rejection reason with an {@link AssertionFunction}.
+   *
+   * Negation: {@link Expectations.toBeResolved `toBeResolved(...)`}
+   */
+  toBeRejected(
+    assertion: AssertionFunction,
+  ): Promise<Expectations<PromiseLike<Awaited<T>>>>
+
+  toBeRejected(
+      assertionOrMatcher?: AssertionFunction | Matcher,
+  ): Promise<Expectations> {
     return Promise.resolve()
         .then(() => {
           this.toHaveProperty('then', (assert) => assert.toBeA('function'))
@@ -42,7 +65,11 @@ export class AsyncExpectations<T = unknown> extends Expectations<T> {
         })
         .then(([ settlement ]) => {
           if (settlement.status === 'rejected') {
-            if (assertion) assertion(new Expectations(settlement.reason, this.remarks))
+            if (isMatcher(assertionOrMatcher)) {
+              assertionOrMatcher.expect(settlement.reason)
+            } else if (assertionOrMatcher) {
+              assertionOrMatcher(new Expectations(settlement.reason, this.remarks))
+            }
             return this as Expectations<any>
           }
 
@@ -54,7 +81,8 @@ export class AsyncExpectations<T = unknown> extends Expectations<T> {
 
   /**
    * Expects the value to be a {@link PromiseLike} _rejected_ with an
-   * {@link Error} _strictly equal_ to the one specified.
+   * {@link Error} {@link Expectations.toStrictlyEqual _strictly equal_}
+   * to the one specified.
    *
    * Negation: {@link Expectations.toBeResolved `toBeResolved(...)`}
    */
@@ -111,15 +139,35 @@ export class AsyncExpectations<T = unknown> extends Expectations<T> {
   /* ------------------------------------------------------------------------ */
 
   /**
-   * Expects the value to be a _resolved_ {@link PromiseLike}, and (if
-   * specified) further asserts the resolved result with an
-   * {@link AssertionFunction}.
+   * Expects the value to be a _resolved_ {@link PromiseLike}.
+   *
+   * Negation: {@link Expectations.toBeRejected `toBeRejected(...)`}
+   */
+  toBeResolved(): Promise<Expectations<PromiseLike<Awaited<T>>>>
+
+  /**
+   * Expects the value to be a _resolved_ {@link PromiseLike}, and further
+   * validates the resolved result with a {@link Matcher}.
+   *
+   * Negation: {@link Expectations.toBeRejected `toBeRejected(...)`}
+   */
+  toBeResolved<Match extends Matcher>(
+    matcher: Match,
+  ): Promise<Expectations<PromiseLike<InferMatcher<unknown, Match>>>>
+
+  /**
+   * Expects the value to be a _resolved_ {@link PromiseLike}, and further
+   * asserts the resolved result with an {@link AssertionFunction}.
    *
    * Negation: {@link Expectations.toBeRejected `toBeRejected(...)`}
    */
   toBeResolved<Assert extends AssertionFunction<Awaited<T>>>(
-      assertion?: Assert,
-  ): Promise<Expectations<PromiseLike<AssertedType<Awaited<T>, Assert>>>> {
+    assertion: Assert,
+  ): Promise<Expectations<PromiseLike<AssertedType<Awaited<T>, Assert>>>>
+
+  toBeResolved(
+      assertion?: AssertionFunction | Matcher,
+  ): Promise<Expectations> {
     return Promise.resolve()
         .then(() => {
           this.toHaveProperty('then', (assert) => assert.toBeA('function'))
@@ -127,7 +175,11 @@ export class AsyncExpectations<T = unknown> extends Expectations<T> {
         })
         .then(([ settlement ]) => {
           if (settlement.status === 'fulfilled') {
-            if (assertion) assertion(new Expectations(settlement.value, this.remarks))
+            if (isMatcher(assertion)) {
+              assertion.expect(settlement.value)
+            } else if (assertion) {
+              assertion(new Expectations(settlement.value, this.remarks))
+            }
             return this as Expectations<any>
           }
 
@@ -139,13 +191,13 @@ export class AsyncExpectations<T = unknown> extends Expectations<T> {
 
   /**
    * Expects the value to be a {@link PromiseLike} _resolved_ with a value
-   * _deeply equal_ to the one specified.
+   * {@link Expectations.toEqual _deeply equal_} to the one specified.
    *
    * Negation: {@link Expectations.toBeRejected `toBeRejected(...)`}
    */
   toBeResolvedWith<Type>(
       expected: Type,
-  ): Promise<Expectations<PromiseLike<InferMatchers<Type>>>> {
+  ): Promise<Expectations<PromiseLike<InferToEqual<Type>>>> {
     return this.toBeResolved((assert) => assert.toEqual(expected)) as any
   }
 }

package/src/expectation/expect.ts

@@ -1,9 +1,9 @@
 import { AsyncExpectations } from './async'
-import { Matchers } from './matchers'
+import { Matcher } from './matchers'
 
 export type { AsyncExpectations } from './async'
 export type { Expectations, NegativeExpectations } from './expectations'
-export type { Matchers, NegativeMatchers } from './matchers'
+export type { Matcher as Matchers, NegativeMatchers } from './matchers'
 
 /* ========================================================================== *
  * EXPECT FUNCTION                                                            *
@@ -12,7 +12,7 @@ export type { Matchers, NegativeMatchers } from './matchers'
 /** The `expect` function exposing expectations and matchers */
 export type Expect = {
   <T = unknown>(value: T, remarks?: string): AsyncExpectations<T>
-} & Omit<Matchers, 'expect'>
+} & Omit<Matcher, 'expect'>
 
 /** The `expect` function exposing expectations and matchers */
 export const expect: Expect = ((value: any, remarks?: string) => {
@@ -20,13 +20,13 @@ export const expect: Expect = ((value: any, remarks?: string) => {
 }) as Expect
 
 /* Inject all our matchers constructors in the `expect` function */
-for (const key of Object.getOwnPropertyNames(Matchers.prototype)) {
+for (const key of Object.getOwnPropertyNames(Matcher.prototype)) {
   if (! key.startsWith('to')) continue
 
-  const matcher = (...args: any[]): any => ((new Matchers() as any)[key](...args))
+  const matcher = (...args: any[]): any => ((new Matcher() as any)[key](...args))
   Object.defineProperty(matcher, 'name', { value: key })
   Object.defineProperty(expect, key, { value: matcher })
 }
 
 /* Inject the negative matcher constructor in the `expect` function */
-Object.defineProperty(expect, 'not', { get: () => new Matchers().not })
+Object.defineProperty(expect, 'not', { get: () => new Matcher().not })

package/src/expectation/expectations.ts

@@ -1,6 +1,6 @@
 import { diff, type Diff } from './diff'
 import { toInclude, toMatchContents } from './include'
-import { type Matchers } from './matchers'
+import { type Matcher } from './matchers'
 import {
   ExpectationError,
   isMatcher,
@@ -28,13 +28,20 @@ export type AssertedType<T, F extends AssertionFunction<any>, R = ReturnType<F>>
       I : // returns Expectations<something>, use "something"
     T // returns something else (void), use T
 
-export type InferMatchers<T> =
-  T extends Matchers<infer V> ? V :
-  T extends Record<any, any> ? { [ k in keyof T ] : InferMatchers<T[k]> } :
+/** Infer the type of a {@link Matcher}  */
+export type InferMatcher<T, M extends Matcher> =
+  M extends Matcher<infer I> ?
+    unknown extends I ? T : T & I :
+    never
+
+/** Recursively infer the type of a {@link Matcher} in a `Record`  */
+export type InferToEqual<T> =
+  T extends Matcher<infer V> ? V :
+  T extends Record<any, any> ? { [ k in keyof T ] : InferToEqual<T[k]> } :
   T
 
 /** Simple wrapper defining the _parent_ instance of an {@link Expectations}. */
-type ExpectationsParent = {
+export type ExpectationsParent = {
   /** Parent {@link Expectations} instance */
   expectations: Expectations,
   /** Property associating _this_ to the parent */
@@ -79,9 +86,31 @@ export class Expectations<T = unknown> {
    * BASIC                                                                    *
    * ------------------------------------------------------------------------ */
 
+  /**
+   * Expects the value to be of the specified _extended_ {@link TypeName type}.
+   *
+   * Negation: {@link NegativeExpectations.toBeA `not.toBeA(...)`}
+   */
+  toBeA<Name extends TypeName>(type: Name): Expectations<TypeMappings[Name]>
+
+  /**
+   * Expects the value to be of the specified _extended_ {@link TypeName type},
+   * and further validates it with a {@link Matcher}.
+   *
+   * Negation: {@link NegativeExpectations.toBeA `not.toBeA(...)`}
+   */
+  toBeA<
+    Name extends TypeName,
+    Mapped extends TypeMappings[Name],
+    Match extends Matcher,
+  >(
+    type: Name,
+    matcher: Match,
+  ): Expectations<InferMatcher<Mapped, Match>>
+
   /**
    * Expects the value to be of the specified _extended_ {@link TypeName type},
-   * and (if specified) further asserts it with an {@link AssertionFunction}.
+   * and further asserts it with an {@link AssertionFunction}.
    *
    * Negation: {@link NegativeExpectations.toBeA `not.toBeA(...)`}
    */
@@ -90,11 +119,20 @@ export class Expectations<T = unknown> {
     Mapped extends TypeMappings[Name],
     Assert extends AssertionFunction<Mapped>,
   >(
-      type: Name,
-      assertion?: Assert,
-  ): Expectations<AssertedType<Mapped, Assert>> {
+    type: Name,
+    assertion: Assert,
+  ): Expectations<AssertedType<Mapped, Assert>>
+
+  toBeA(
+      type: TypeName,
+      assertionOrMatcher?: AssertionFunction | Matcher,
+  ): Expectations {
     if (typeOf(this.value) === type) {
-      if (assertion) assertion(this as Expectations<any>)
+      if (isMatcher(assertionOrMatcher)) {
+        assertionOrMatcher.expect(this.value)
+      } else if (assertionOrMatcher) {
+        assertionOrMatcher(this as Expectations<any>)
+      }
       return this as Expectations<any>
     }
 
@@ -250,9 +288,32 @@ export class Expectations<T = unknown> {
 
   /* ------------------------------------------------------------------------ */
 
+  /**
+   * Expects the value to be an instance of the specified {@link Constructor}.
+   *
+   * Negation: {@link NegativeExpectations.toBeInstanceOf `not.toInstanceOf(...)`}
+   */
+  toBeInstanceOf<Class extends Constructor>(
+    constructor: Class,
+  ): Expectations<InstanceType<Class>>
+
   /**
    * Expects the value to be an instance of the specified {@link Constructor},
-   * and (if specified) further asserts it with an {@link AssertionFunction}.
+   * and further validates it with a {@link Matcher}.
+   *
+   * Negation: {@link NegativeExpectations.toBeInstanceOf `not.toInstanceOf(...)`}
+   */
+  toBeInstanceOf<
+    Class extends Constructor,
+    Match extends Matcher,
+  >(
+    constructor: Class,
+    matcher: Match,
+  ): Expectations<InferMatcher<InstanceType<Class>, Match>>
+
+  /**
+   * Expects the value to be an instance of the specified {@link Constructor},
+   * and further asserts it with an {@link AssertionFunction}.
    *
    * Negation: {@link NegativeExpectations.toBeInstanceOf `not.toInstanceOf(...)`}
    */
@@ -260,11 +321,20 @@ export class Expectations<T = unknown> {
     Class extends Constructor,
     Assert extends AssertionFunction<InstanceType<Class>>,
   >(
-      constructor: Class,
-      assertion?: Assert,
-  ): Expectations<AssertedType<InstanceType<Class>, Assert>> {
+    constructor: Class,
+    assertion: Assert,
+  ): Expectations<AssertedType<InstanceType<Class>, Assert>>
+
+  toBeInstanceOf(
+      constructor: Constructor,
+      assertionOrMatcher?: AssertionFunction | Matcher,
+  ): Expectations {
     if (this.value instanceof constructor) {
-      if (assertion) assertion(this as Expectations<any>)
+      if (isMatcher(assertionOrMatcher)) {
+        assertionOrMatcher.expect(this.value)
+      } else if (assertionOrMatcher) {
+        assertionOrMatcher(this as Expectations<any>)
+      }
       return this as Expectations<any>
     }
 
@@ -404,7 +474,7 @@ export class Expectations<T = unknown> {
    *
    * Negation: {@link NegativeExpectations.toEqual `not.toEqual(...)`}
    */
-  toEqual<Type>(expected: Type): Expectations<InferMatchers<Type>> {
+  toEqual<Type>(expected: Type): Expectations<InferToEqual<Type>> {
     if ((this.value as any) === expected) return this as Expectations<any>
 
     const result = diff(this.value, expected)
@@ -443,6 +513,29 @@ export class Expectations<T = unknown> {
 
   /* ------------------------------------------------------------------------ */
 
+  /**
+   * Expects the value to have the specified _property_.
+   *
+   * Negation: {@link NegativeExpectations.toHaveProperty `not.toHaveProperty(...)`}
+   */
+  toHaveProperty<Prop extends string | number | symbol>(
+    property: Prop,
+  ): Expectations<T & { [keyt in Prop] : unknown }>
+
+  /**
+   * Expects the value to have the specified _property_ and (if specified)
+   * further validates its value with a {@link Matcher}.
+   *
+   * Negation: {@link NegativeExpectations.toHaveProperty `not.toHaveProperty(...)`}
+   */
+  toHaveProperty<
+    Prop extends string | number | symbol,
+    Match extends Matcher,
+  >(
+    property: Prop,
+    matcher: Match,
+  ): Expectations<T & { [keyt in Prop] : InferMatcher<unknown, Match> }>
+
   /**
    * Expects the value to have the specified _property_ and (if specified)
    * further asserts its value with an {@link AssertionFunction}.
@@ -453,9 +546,14 @@ export class Expectations<T = unknown> {
     Prop extends string | number | symbol,
     Assert extends AssertionFunction,
   >(
-      property: Prop,
-      assertion?: Assert,
-  ): Expectations<T & { [keyt in Prop] : AssertedType<unknown, Assert> }> {
+    property: Prop,
+    assertion: Assert,
+  ): Expectations<T & { [keyt in Prop] : AssertedType<unknown, Assert> }>
+
+  toHaveProperty(
+      property: string | number | symbol,
+      assertionOrMatcher?: AssertionFunction | Matcher,
+  ): Expectations {
     this.toBeDefined()
 
     const propertyValue = (this.value as any)[property]
@@ -464,11 +562,15 @@ export class Expectations<T = unknown> {
       this._fail(`to have property "${String(property)}"`)
     }
 
-    if (assertion) {
+    if (assertionOrMatcher) {
+      const parent: ExpectationsParent = { expectations: this, prop: property }
       try {
-        const parent: ExpectationsParent = { expectations: this, prop: property }
-        const expectations = new Expectations(propertyValue, this.remarks, parent)
-        assertion(expectations)
+        if (isMatcher(assertionOrMatcher)) {
+          assertionOrMatcher.expect(propertyValue, parent)
+        } else if (assertionOrMatcher) {
+          const expectations = new Expectations(propertyValue, this.remarks, parent)
+          assertionOrMatcher(expectations)
+        }
       } catch (error) {
         // any caught error difference gets remapped as a property diff
         if ((error instanceof ExpectationError) && (error.diff)) {
@@ -596,12 +698,31 @@ export class Expectations<T = unknown> {
   /* ------------------------------------------------------------------------ */
 
   /**
-   * Expects the value to be a `function` throwing, and (if specified) further
-   * asserts the thrown value with an {@link AssertionFunction}.
+   * Expects the value to be a `function` throwing.
    *
    * Negation: {@link NegativeExpectations.toThrow `not.toThrow()`}
    */
-  toThrow(assert?: AssertionFunction): Expectations<() => any> {
+  toThrow(): Expectations<() => any>
+
+  /**
+   * Expects the value to be a `function` throwing, and further validates the
+   * thrown value with a {@link Matcher}.
+   *
+   * Negation: {@link NegativeExpectations.toThrow `not.toThrow()`}
+   */
+  toThrow(matcher: Matcher): Expectations<() => any>
+
+  /**
+   * Expects the value to be a `function` throwing, and further asserts the
+   * thrown value with an {@link AssertionFunction}.
+   *
+   * Negation: {@link NegativeExpectations.toThrow `not.toThrow()`}
+   */
+  toThrow(assert: AssertionFunction): Expectations<() => any>
+
+  toThrow(
+      assertionOrMatcher?: AssertionFunction | Matcher,
+  ): Expectations<() => any> {
     const func = this.toBeA('function')
 
     let passed = false
@@ -609,7 +730,11 @@ export class Expectations<T = unknown> {
       func.value()
       passed = true
     } catch (thrown) {
-      if (assert) assert(new Expectations(thrown, this.remarks))
+      if (isMatcher(assertionOrMatcher)) {
+        assertionOrMatcher.expect(thrown)
+      } else if (assertionOrMatcher) {
+        assertionOrMatcher(new Expectations(thrown, this.remarks))
+      }
     }
 
     if (passed) this._fail('to throw')