move assert extensions into runner and add types

Author: samizdatco

test/canvas.test.js

@@ -5,18 +5,9 @@
 const fs = require('fs'),
       tmp = require('tmp'),
       path = require('path'),
-      assert = require('node:assert'),
-      {describe, test, beforeEach, afterEach} = require('node:test'),
+      {assert, describe, test, beforeEach, afterEach} = require('./runner'),
       {Canvas, Image} = require('../lib');
 
-assert.contains = (actual, expected) => assert((actual || []).includes(expected))
-assert.doesNotContain = (actual, expected) => assert(!((actual || [expected]).includes(expected)))
-assert.matchesSubset = (actual, expected) => Object.entries(expected).forEach(([key, val]) => assert.deepEqual(actual[key], val))
-assert.nearEqual = (actual, expected) => assert.ok(
-  Math.abs(expected - actual) < Math.pow(10, -2) / 2,
-  new assert.AssertionError({actual, expected, operator:"≈"})
-)
-
 const BLACK = [0,0,0,255],
       WHITE = [255,255,255,255],
       CLEAR = [0,0,0,0],

test/context2d.test.js

@@ -2,19 +2,10 @@
 
 "use strict"
 
-const assert = require('node:assert'),
-      {describe, test, beforeEach, afterEach} = require('node:test'),
+const {assert, describe, test, beforeEach, afterEach} = require('./runner'),
       {Canvas, DOMMatrix, DOMPoint, ImageData, Path2D, FontLibrary, loadImage} = require('../lib'),
       css = require('../lib/classes/css')
 
-assert.contains = (actual, expected) => assert((actual || []).includes(expected))
-assert.doesNotContain = (actual, expected) => assert(!((actual || [expected]).includes(expected)))
-assert.matchesSubset = (actual, expected) => Object.entries(expected).forEach(([key, val]) => assert.deepEqual(actual[key], val))
-assert.nearEqual = (actual, expected) => assert.ok(
-  Math.abs(expected - actual) < Math.pow(10, -2) / 2,
-  new assert.AssertionError({actual, expected, operator:"≈"})
-)
-
 const BLACK = [0,0,0,255],
       WHITE = [255,255,255,255],
       GREEN = [0,128,0,255],

test/media.test.js

@@ -5,20 +5,11 @@
 const path = require('path'),
       os = require('os'),
       fs = require('fs'),
-      assert = require('node:assert'),
       nock = require('nock'),
-      {describe, test, beforeEach, afterEach} = require('node:test'),
+      {assert, describe, test, beforeEach, afterEach} = require('./runner'),
       {pathToFileURL, fileURLToPath} = require('url'),
       {Canvas, Image, ImageData, FontLibrary, loadImage, loadImageData} = require('../lib')
 
-assert.contains = (actual, expected) => assert((actual || []).includes(expected))
-assert.doesNotContain = (actual, expected) => assert(!((actual || [expected]).includes(expected)))
-assert.matchesSubset = (actual, expected) => Object.entries(expected).forEach(([key, val]) => assert.equal(actual[key], val))
-assert.nearEqual = (actual, expected) => assert.ok(
-  Math.abs(expected - actual) < Math.pow(10, -2) / 2,
-  new assert.AssertionError({actual, expected, operator:"≈"})
-)
-
 const scope = nock('http://_h_o_s_t_')
   .persist()
   .get(/.*/)

test/path2d.test.js

@@ -2,18 +2,9 @@
 
 "use strict"
 
-const assert = require('node:assert'),
-      {describe, test, beforeEach, afterEach} = require('node:test'),
+const {assert, describe, test, beforeEach, afterEach} = require('./runner'),
       {Canvas, DOMMatrix, Path2D, DOMPoint} = require('../lib');
 
-assert.contains = (actual, expected) => assert((actual || []).includes(expected))
-assert.doesNotContain = (actual, expected) => assert(!((actual || [expected]).includes(expected)))
-assert.matchesSubset = (actual, expected) => Object.entries(expected).forEach(([key, val]) => assert.deepEqual(actual[key], val))
-assert.nearEqual = (actual, expected) => assert.ok(
-  Math.abs(expected - actual) < Math.pow(10, -2) / 2,
-  new assert.AssertionError({actual, expected, operator:"≈"})
-)
-
 const BLACK = [0,0,0,255],
       WHITE = [255,255,255,255],
       CLEAR = [0,0,0,0],

test/runner/index.d.ts

@@ -0,0 +1,11 @@
+import * as originalAssert from 'assert';
+export {describe, test, beforeEach, afterEach} from 'node:test';
+
+type ExtendedAssert = typeof originalAssert & {
+  contains(actual: unknown, expected: unknown): void;
+  doesNotContain(actual: unknown, expected: unknown): void;
+  matchesSubset(actual: unknown, expected: unknown): void;
+  nearEqual(actual: number, expected: number): void;
+}
+
+export declare const assert: ExtendedAssert;

test/runner/index.js

@@ -0,0 +1,14 @@
+const {describe, test, beforeEach, afterEach} = require('node:test'),
+      assert = require('node:assert')
+
+Object.assign(assert, {
+  contains: (actual, expected) => assert((actual || []).includes(expected)),
+  doesNotContain: (actual, expected) => assert(!((actual || [expected]).includes(expected))),
+  matchesSubset: (actual, expected) => Object.entries(expected).forEach(([key, val]) => assert.deepEqual(actual[key], val)),
+  nearEqual: (actual, expected) => assert.ok(
+    Math.abs(expected - actual) < Math.pow(10, -2) / 2,
+    new assert.AssertionError({actual, expected, operator:"≈"})
+  )
+})
+
+module.exports = {assert, describe, test, beforeEach, afterEach}