Merge pull request #161 from dmanto/remove-tap-dev-dep

define and use new TapTestLike local dependence

Author: kraih

src/types.ts

@@ -7,9 +7,24 @@ import type {Agent} from 'node:http';
 import type {Readable, Stream} from 'node:stream';
 import type {URL} from 'node:url';
 import type {InspectOptions} from 'node:util';
-import type {Test} from 'tap';
 import type {CookieJar} from 'tough-cookie';
 
+export interface TestContext {
+  equal(actual: any, expected: any, message?: string): void;
+  not(actual: any, expected: any, message?: string): void;
+  notMatch(actual: any, pattern: RegExp, message?: string): void;
+  match(actual: any, pattern: RegExp, message?: string): void;
+  same(actual: any, expected: any, message?: string): void;
+  plan(count: number): void;
+  skip(message: string): void;
+  todo(message: string): void;
+  ok(value: any, message?: string): void;
+  end(): void;
+
+  beforeEach(callback: (t: TestContext) => Promise<void>): void;
+  afterEach(callback: () => Promise<void>): void;
+}
+
 export type {JSONValue} from '@mojojs/util';
 
 export interface JSONSchema {
@@ -221,7 +236,7 @@ export interface UserAgentWebSocketOptions extends SharedUserAgentRequestOptions
 
 export type URLTarget = string | [string, MojoURLOptions];
 
-export type TestUserAgentOptions = UserAgentOptions & {tap?: Test};
+export type TestUserAgentOptions = UserAgentOptions & {tap?: TestContext};
 
 export interface ValidationError {
   instancePath: string;

src/user-agent/test.ts

@@ -3,13 +3,13 @@ import type {App} from '../app.js';
 import type {
   JSONValue,
   ServerOptions,
+  TestContext,
   TestUserAgentOptions,
   UserAgentRequestOptions,
   UserAgentWebSocketOptions
 } from '../types.js';
 import type {WebSocket} from '../websocket.js';
 import type {URL} from 'node:url';
-import type {Test} from 'tap';
 import assert from 'node:assert/strict';
 import {on} from 'node:events';
 import {MockUserAgent} from './mock.js';
@@ -23,7 +23,7 @@ type SkipFunction = (...args: any[]) => any;
 // Helper function to add required `TestUserAgent` assert methods
 // that are missing in a `TAP` instance. This is as an intended side effect
 // to ensure compatibility with `TestUserAgent` class below
-function addNodeAssertMethods(tapInstance: Test): void {
+function addNodeAssertMethods(tapInstance: TestContext): void {
   (tapInstance as any).strictEqual = tapInstance.equal.bind(tapInstance);
   (tapInstance as any).notStrictEqual = tapInstance.not.bind(tapInstance);
   (tapInstance as any).doesNotMatch = tapInstance.notMatch.bind(tapInstance);
@@ -39,7 +39,7 @@ export class TestUserAgent extends MockUserAgent {
    */
   body: Buffer = Buffer.from('');
 
-  _assert: typeof assert | Test | undefined = undefined;
+  _assert: typeof assert | TestContext | undefined = undefined;
   _dom: DOM | undefined = undefined;
   _finished: [number, string] | null | undefined = undefined;
   _messages: AsyncIterableIterator<JSONValue> | undefined = undefined;
@@ -372,13 +372,13 @@ export class TestUserAgent extends MockUserAgent {
     return this._dom;
   }
 
-  _prepareTap(tap: Test): void {
+  _prepareTap(tap: TestContext): void {
     addNodeAssertMethods(tap);
     this._assert = tap;
     const subtests = [tap];
     const assert = this._assert;
 
-    assert.beforeEach(async t => {
+    assert.beforeEach(async (t: TestContext) => {
       addNodeAssertMethods(t);
       subtests.push(t);
       this._assert = t;