remove unnecessary dependencies from node bindings

Author: baileympearson

.evergreen/config.yml

@@ -512,23 +512,11 @@ tasks:
     vars:
       test_env: PROJECT_DIRECTORY=${project_directory}
 
-- name: build-and-test-node
-  commands:
-    - func: "fetch source"
-    - func: "build and test node"
-    - func: "attach node xunit results"
-
 - name: build-and-publish-node
   commands:
     - func: "fetch source"
     - func: "build and publish node"
 
-- name: build-and-test-node-no-peer-dependencies
-  commands:
-    - func: "fetch source"
-    - func: "build and test node no peer dependencies"
-    - func: "attach node xunit results"
-
 # Note: keep this disabled unless you want master to force-push
 - name: build-and-test-node-force-publish
   commands:
@@ -927,7 +915,7 @@ tasks:
 - name: rpm-package-build
   tags: [packaging]
   run_on: &docker-distros
-    # * The RHEL76-docker distro runs an old and unsupported version of Docker. 
+    # * The RHEL76-docker distro runs an old and unsupported version of Docker.
     # * (We requires the --mount parameter)
     - ubuntu2004-small
     - ubuntu2004
@@ -1003,8 +991,6 @@ buildvariants:
   - build-and-test-and-upload
   - build-and-test-shared-bson
   - build-and-test-asan
-  - build-and-test-node
-  - build-and-test-node-no-peer-dependencies
   - build-and-publish-node
   - test-java
   - name: publish-packages
@@ -1017,8 +1003,6 @@ buildvariants:
   - build-and-test-and-upload
   - build-and-test-shared-bson
   - build-and-test-asan-mac
-  - build-and-test-node
-  - build-and-test-node-no-peer-dependencies
   - build-and-publish-node
   - build-and-test-csharp
   - test-python
@@ -1063,8 +1047,6 @@ buildvariants:
   - build-and-test-and-upload
   - build-and-test-shared-bson
   - build-and-test-csharp
-  - build-and-test-node
-  - build-and-test-node-no-peer-dependencies
   - build-and-publish-node
   - test-java
   - windows-upload-check
@@ -1090,8 +1072,6 @@ buildvariants:
   tasks:
   - build-and-test-and-upload
   - build-and-test-shared-bson
-  - build-and-test-node
-  - build-and-test-node-no-peer-dependencies
   - test-java
   - name: publish-packages
     distros:
@@ -1108,8 +1088,6 @@ buildvariants:
   - build-and-test-and-upload
   - build-and-test-shared-bson
   - build-and-test-asan
-  - build-and-test-node
-  - build-and-test-node-no-peer-dependencies
   - test-java
   - name: publish-packages
     distros:
@@ -1126,8 +1104,6 @@ buildvariants:
   - build-and-test-and-upload
   - build-and-test-shared-bson
   - build-and-test-asan
-  - build-and-test-node
-  - build-and-test-node-no-peer-dependencies
   - name: publish-packages
     distros:
     - rhel70-small
@@ -1142,8 +1118,6 @@ buildvariants:
   - build-and-test-and-upload
   - build-and-test-shared-bson
   - build-and-test-asan
-  - build-and-test-node
-  - build-and-test-node-no-peer-dependencies
   - test-java
   - name: publish-packages
     distros:
@@ -1159,8 +1133,6 @@ buildvariants:
   - build-and-test-and-upload
   - build-and-test-shared-bson
   - build-and-test-asan
-  - build-and-test-node
-  - build-and-test-node-no-peer-dependencies
   - test-java
   - name: publish-packages
     distros:
@@ -1177,8 +1149,6 @@ buildvariants:
   - build-and-test-and-upload
   - build-and-test-shared-bson
   - build-and-test-asan
-  - build-and-test-node
-  - build-and-test-node-no-peer-dependencies
   - test-java
   - name: publish-packages
     distros:
@@ -1208,8 +1178,6 @@ buildvariants:
   tasks:
   - build-and-test-and-upload
   - build-and-test-shared-bson
-  - build-and-test-node
-  - build-and-test-node-no-peer-dependencies
   - test-python
   - test-java
   - name: publish-packages
@@ -1239,8 +1207,6 @@ buildvariants:
   tasks:
   - build-and-test-and-upload
   - build-and-test-shared-bson
-  - build-and-test-node
-  - build-and-test-node-no-peer-dependencies
   - test-java
   - name: publish-packages
     distros:
@@ -1257,8 +1223,6 @@ buildvariants:
   - build-and-test-and-upload
   - build-and-test-shared-bson
   - build-and-test-asan
-  - build-and-test-node
-  - build-and-test-node-no-peer-dependencies
   - test-java
   - name: publish-packages
     distros:
@@ -1275,8 +1239,6 @@ buildvariants:
   - build-and-test-and-upload
   - build-and-test-shared-bson
   - build-and-test-asan
-  - build-and-test-node
-  - build-and-test-node-no-peer-dependencies
   - test-java
   - name: publish-packages
     distros:
@@ -1293,8 +1255,6 @@ buildvariants:
   - build-and-test-and-upload
   - build-and-test-shared-bson
   - build-and-test-asan
-  - build-and-test-node
-  - build-and-test-node-no-peer-dependencies
   - build-and-publish-node
   - test-java
   - name: publish-packages
@@ -1312,8 +1272,6 @@ buildvariants:
   - build-and-test-and-upload
   - build-and-test-shared-bson
   - build-and-test-asan
-  - build-and-test-node
-  - build-and-test-node-no-peer-dependencies
   - build-and-test-csharp
   - test-java
   - name: publish-packages
@@ -1341,8 +1299,6 @@ buildvariants:
   - build-and-test-and-upload
   - build-and-test-shared-bson
   - build-and-test-asan
-  - build-and-test-node
-  - build-and-test-node-no-peer-dependencies
   - test-java
   - name: publish-packages
     distros:
@@ -1360,8 +1316,6 @@ buildvariants:
   - build-and-test-and-upload
   - build-and-test-shared-bson
   - build-and-test-asan
-  - build-and-test-node
-  - build-and-test-node-no-peer-dependencies
   - build-and-test-csharp
   - test-java
   - upload-java
@@ -1378,8 +1332,6 @@ buildvariants:
   - build-and-test-and-upload
   - build-and-test-shared-bson
   - build-and-test-asan
-  - build-and-test-node
-  - build-and-test-node-no-peer-dependencies
   - test-java
   - name: publish-packages
     distros:
@@ -1397,8 +1349,6 @@ buildvariants:
   - build-and-test-and-upload
   - build-and-test-shared-bson
   - build-and-test-asan
-  - build-and-test-node
-  - build-and-test-node-no-peer-dependencies
   # see https://jira.mongodb.org/browse/MONGOCRYPT-515
   #- build-and-test-csharp
   - test-java
@@ -1417,8 +1367,6 @@ buildvariants:
   - build-and-test-and-upload
   - build-and-test-shared-bson
   - build-and-test-asan
-  - build-and-test-node
-  - build-and-test-node-no-peer-dependencies
   - test-java
   - name: publish-packages
     distros:
@@ -1447,8 +1395,6 @@ buildvariants:
     compile_env: MACOS_UNIVERSAL=ON CMAKE=/opt/homebrew/bin/cmake
   tasks:
   - build-and-test-and-upload
-  - build-and-test-node
-  - build-and-test-node-no-peer-dependencies
   - build-and-publish-node
   - test-python
   - test-java

bindings/node/.eslintrc.json

@@ -2,8 +2,11 @@
   "root": true,
   "extends": [
     "eslint:recommended",
-    "plugin:prettier/recommended"
+    "plugin:prettier/recommended",
+    "plugin:@typescript-eslint/eslint-recommended",
+    "plugin:@typescript-eslint/recommended"
   ],
+  "ignorePatterns": "lib/**/*",
   "env": {
     "node": true,
     "mocha": true,
@@ -13,6 +16,7 @@
     "ecmaVersion": 2019
   },
   "plugins": [
+    "@typescript-eslint",
     "prettier"
   ],
   "rules": {
@@ -34,8 +38,17 @@
     "prettier/prettier": "error",
     "no-console": "error",
     "valid-typeof": "error",
-    "eqeqeq": ["error", "always", {"null": "ignore"}],
-    "strict": ["error", "global"],
+    "eqeqeq": [
+      "error",
+      "always",
+      {
+        "null": "ignore"
+      }
+    ],
+    "strict": [
+      "error",
+      "global"
+    ],
     "no-restricted-syntax": [
       "error",
       {
@@ -58,9 +71,9 @@
   },
   "overrides": [
     {
-      // Settings for javascript test files
+      // Settings for test files
       "files": [
-        "test/**/*.js"
+        "test/**/*.ts"
       ],
       "rules": {
         "no-console": "off",

bindings/node/.gitignore

@@ -20,3 +20,7 @@ deps
 *.tgz
 
 xunit.xml
+
+# built typescript
+lib
+prebuilds

bindings/node/src/mongocrypt.cc renamed to bindings/node/addon/mongocrypt.cc

@@ -18,7 +18,7 @@
         ]
     },
     'sources': [
-      'src/mongocrypt.cc'
+      'addon/mongocrypt.cc'
     ],
     'xcode_settings': {
       'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',

bindings/node/src/mongocrypt.h renamed to bindings/node/addon/mongocrypt.h

@@ -0,0 +1,12 @@
+#! /usr/bin/env node
+var cp = require('child_process');
+var fs = require('fs');
+var os = require('os');
+
+if (fs.existsSync('src')) {
+  cp.spawn('npm', ['run', 'build:ts'], { stdio: 'inherit', shell: os.platform() === 'win32' });
+} else {
+  if (!fs.existsSync('lib')) {
+    console.warn('MongoDB: No compiled javascript present, the driver is not installed correctly.');
+  }
+}