working!

Author: baileympearson

.mocharc.json

@@ -3,10 +3,15 @@
   "require": [
     "source-map-support/register",
     "ts-node/register",
-    "test/tools/chai-addons.js"
+    "test/tools/chai-addons.mts"
   ],
   "extension": [
-    "ts"
+    "mts"
+  ],
+  "node-option": [
+    "expose-gc",
+    "experimental-specifier-resolution=node",
+    "loader=ts-node/esm"
   ],
   "recursive": true,
   "failZero": true,

src/crypto_callbacks.ts renamed to src/crypto_callbacks.mts

@@ -1,7 +1,9 @@
-import { cryptoCallbacks } from './crypto_callbacks';
+import { createRequire } from 'module';
+import { cryptoCallbacks } from './crypto_callbacks.mjs';
 export { cryptoCallbacks };
 
 function load() {
+  const require = createRequire(import.meta.url);
   try {
     return require('../build/Release/mongocrypt.node');
   } catch {
@@ -74,7 +76,7 @@ type MongoCryptConstructorOptions = {
 };
 
 export interface MongoCryptConstructor {
-  new (options: MongoCryptConstructorOptions): MongoCrypt;
+  new(options: MongoCryptConstructorOptions): MongoCrypt;
   libmongocryptVersion: string;
 }
 
@@ -136,6 +138,6 @@ export const MongoCrypt: MongoCryptConstructor = class MongoCrypt extends mc.Mon
 
 /** exported for testing only. */
 interface MongoCryptContextCtor {
-  new (): MongoCryptContext;
+  new(): MongoCryptContext;
 }
 export const MongoCryptContextCtor: MongoCryptContextCtor = mc.MongoCryptContextCtor;

src/index.ts renamed to src/index.mts

@@ -0,0 +1,9 @@
+import * as chai from 'chai';
+import sinonChai from 'sinon-chai';
+import * as chaiSubset from 'chai-subset';
+
+chai.use(sinonChai);
+// @ts-expect-error
+chai.use(chaiSubset.default);
+
+chai.config.truncateThreshold = 0;

test/tools/chai-addons.js

@@ -4,9 +4,11 @@
 		"strict": false,
 		"allowJs": false,
 		"checkJs": false,
+		"types": [
+			"mocha"
+		]
 	},
 	"include": [
-		"../node_modules/@types/mocha/index.d.ts",
-		"./**/*.ts"
+		"./**/*.mts"
 	]
-}
+}

test/tools/chai-addons.mts

@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { MongoCrypt, MongoCryptContext, MongoCryptContextCtor } from '../../src';
+import { MongoCrypt, MongoCryptContext, MongoCryptContextCtor } from '../../src/index.mjs'
 import { serialize, Binary, Long } from 'bson';
 import * as crypto from 'crypto';
 
@@ -19,15 +19,15 @@ describe('MongoCryptConstructor', () => {
   const mc = new MongoCrypt({
     kmsProviders: serialize({ aws: {} }),
     cryptoCallbacks: {
-      aes256CbcEncryptHook: () => {},
-      aes256CbcDecryptHook: () => {},
-      aes256CtrEncryptHook: () => {},
-      aes256CtrDecryptHook: () => {},
+      aes256CbcEncryptHook: () => { },
+      aes256CbcDecryptHook: () => { },
+      aes256CtrEncryptHook: () => { },
+      aes256CtrDecryptHook: () => { },
       randomHook,
-      hmacSha512Hook: () => {},
-      hmacSha256Hook: () => {},
-      sha256Hook: () => {},
-      signRsaSha256Hook: () => {}
+      hmacSha512Hook: () => { },
+      hmacSha256Hook: () => { },
+      sha256Hook: () => { },
+      signRsaSha256Hook: () => { }
     }
   });
 
@@ -41,17 +41,17 @@ describe('MongoCryptConstructor', () => {
         kmsProviders: serialize({ aws: {} }),
         schemaMap: serialize({}),
         encryptedFieldsMap: serialize({}),
-        logger: () => {},
+        logger: () => { },
         cryptoCallbacks: {
-          aes256CbcEncryptHook: () => {},
-          aes256CbcDecryptHook: () => {},
-          aes256CtrEncryptHook: () => {},
-          aes256CtrDecryptHook: () => {},
+          aes256CbcEncryptHook: () => { },
+          aes256CbcDecryptHook: () => { },
+          aes256CtrEncryptHook: () => { },
+          aes256CtrDecryptHook: () => { },
           randomHook,
-          hmacSha512Hook: () => {},
-          hmacSha256Hook: () => {},
-          sha256Hook: () => {},
-          signRsaSha256Hook: () => {}
+          hmacSha512Hook: () => { },
+          hmacSha256Hook: () => { },
+          sha256Hook: () => { },
+          signRsaSha256Hook: () => { }
         },
 
         bypassQueryAnalysis: false

test/tsconfig.json

@@ -4,7 +4,7 @@ import * as path from 'node:path';
 import * as fs from 'node:fs';
 import * as sinon from 'sinon';
 import { EJSON, BSON, Binary } from 'bson';
-import { MongoCrypt, MongoCryptConstructor, cryptoCallbacks } from '../../src';
+import { MongoCrypt, MongoCryptConstructor, cryptoCallbacks } from '../../src/index.mjs';
 import { expect } from 'chai';
 
 const NEED_MONGO_KEYS = 3;
@@ -23,7 +23,7 @@ const LOCAL_KEY = new Uint8Array([
 const kmsProviders = { local: { key: LOCAL_KEY } };
 const algorithm = 'AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic';
 const keyDocument = EJSON.parse(
-  fs.readFileSync(path.join(__dirname, '..', 'benchmarks', 'keyDocument.json'), 'utf8'),
+  fs.readFileSync(path.join(import.meta.dirname, '..', 'benchmarks', 'keyDocument.json'), 'utf8'),
   {
     relaxed: false
   }

test/unit/bindings.test.ts renamed to test/unit/bindings.test.mts

@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import * as bindings from '../../src/index';
+import * as bindings from '../../src/index.mjs';
 
 describe('index.ts', () => {
   it('only has three exports', () => {

test/unit/crypto.test.ts renamed to test/unit/crypto.test.mts

@@ -5,12 +5,13 @@
     "strict": true,
     "alwaysStrict": true,
     "target": "ES2020",
-    "module": "commonJS",
+    "module": "esnext",
     "moduleResolution": "node",
     "skipLibCheck": true,
     "erasableSyntaxOnly": true,
     "lib": [
-      "es2020", "es2021.WeakRef"
+      "es2020",
+      "es2021.WeakRef"
     ],
     // We don't make use of tslib helpers, all syntax used is supported by target engine
     "importHelpers": false,
@@ -43,4 +44,4 @@
   "include": [
     "src/**/*"
   ]
-}
+}