From 26d1b1264f0189ebc2c93fafa1495ef79b56a07f Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Fri, 22 Nov 2024 18:38:33 +0100 Subject: [PATCH 1/3] chore(deps): bump driver, bson, oidc-plugin to latest MONGOSH-1916 --- package-lock.json | 52 +++++++++---------- package.json | 6 +-- packages/arg-parser/package.json | 2 +- packages/browser-repl/package.json | 2 +- packages/browser-runtime-core/package.json | 2 +- packages/cli-repl/package.json | 2 +- packages/e2e-tests/package.json | 4 +- .../node-runtime-worker-thread/package.json | 2 +- packages/service-provider-core/package.json | 4 +- .../service-provider-node-driver/package.json | 2 +- packages/shell-api/package.json | 4 +- packages/shell-api/src/mongo.ts | 6 ++- packages/shell-api/src/shell-bson.ts | 6 +++ packages/snippet-manager/package.json | 2 +- packages/types/package.json | 2 +- 15 files changed, 54 insertions(+), 44 deletions(-) diff --git a/package-lock.json b/package-lock.json index fb5577e789..bbce52a739 100644 --- a/package-lock.json +++ b/package-lock.json @@ -59,7 +59,7 @@ "glob": "^10.3.12", "husky": "^9.0.11", "mocha": "^10.2.0", - "mongodb": "^6.10.0", + "mongodb": "^6.11.0", "mongodb-runner": "^5.7.1", "node-gyp": "^9.0.0 || ^10.2.0", "nyc": "^15.1.0", @@ -5929,9 +5929,9 @@ "license": "Apache-2.0" }, "node_modules/@mongodb-js/oidc-plugin": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@mongodb-js/oidc-plugin/-/oidc-plugin-1.1.2.tgz", - "integrity": "sha512-lMSOUX28ranfDt/a9WKZJcGEmUgSZ6F8KvSyGSKkzWPLRucb05slQmFN4lA5RR2fQIPrTLNPCdV39qAU2RLUSQ==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@mongodb-js/oidc-plugin/-/oidc-plugin-1.1.4.tgz", + "integrity": "sha512-OKJ2wgxSDbElaa42KuidpozKWfjfac64xzN2ilzolkYm0MZeegzt4KkTkdlixbyjlgNB9J8UNtDTAfRKTw5f8w==", "license": "Apache-2.0", "dependencies": { "express": "^4.18.2", @@ -12075,9 +12075,9 @@ } }, "node_modules/bson": { - "version": "6.9.0", - "resolved": "https://registry.npmjs.org/bson/-/bson-6.9.0.tgz", - "integrity": "sha512-X9hJeyeM0//Fus+0pc5dSUMhhrrmWwQUtdavaQeF3Ta6m69matZkGWV/MrBcnwUeLC8W9kwwc2hfkZgUuCX3Ig==", + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.0.tgz", + "integrity": "sha512-ROchNosXMJD2cbQGm84KoP7vOGPO6/bOAW0veMMbzhXLqoZptcaYRVLitwvuhwhjjpU1qP4YZRWLhgETdgqUQw==", "license": "Apache-2.0", "engines": { "node": ">=16.20.1" @@ -21333,13 +21333,13 @@ } }, "node_modules/mongodb": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.10.0.tgz", - "integrity": "sha512-gP9vduuYWb9ZkDM546M+MP2qKVk5ZG2wPF63OvSRuUbqCR+11ZCAE1mOfllhlAG0wcoJY5yDL/rV3OmYEwXIzg==", + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.11.0.tgz", + "integrity": "sha512-yVbPw0qT268YKhG241vAMLaDQAPbRyTgo++odSgGc9kXnzOujQI60Iyj23B9sQQFPSvmNPvMZ3dsFz0aN55KgA==", "license": "Apache-2.0", "dependencies": { - "@mongodb-js/saslprep": "^1.1.5", - "bson": "^6.7.0", + "@mongodb-js/saslprep": "^1.1.9", + "bson": "^6.10.0", "mongodb-connection-string-url": "^3.0.0" }, "engines": { @@ -28878,7 +28878,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.10.0", + "mongodb": "^6.11.0", "prettier": "^2.8.8" }, "engines": { @@ -28979,7 +28979,7 @@ "karma-mocha-reporter": "^2.2.5", "karma-typescript": "^5.5.4", "karma-webpack": "^5.0.0", - "mongodb": "^6.10.0", + "mongodb": "^6.11.0", "path-browserify": "^1.0.1", "prettier": "^2.8.8", "prop-types": "^15.7.2", @@ -29067,7 +29067,7 @@ "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.9.0", + "bson": "^6.10.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8", @@ -29275,7 +29275,7 @@ "chai-as-promised": "^7.1.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.10.0", + "mongodb": "^6.11.0", "mongodb-crypt-library-dummy": "^1.0.2", "prettier": "^2.8.8", "webpack-merge": "^5.8.0" @@ -29330,13 +29330,13 @@ "@types/chai-as-promised": "^7.1.3", "@types/node": "^14.14.6", "@types/rimraf": "^3.0.0", - "bson": "^6.9.0", + "bson": "^6.10.0", "chai-as-promised": "^7.1.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", "lodash": "^4.17.21", "moment": "^2.29.1", - "mongodb": "^6.10.0", + "mongodb": "^6.11.0", "node-fetch": "^3.3.2", "prettier": "^2.8.8", "rimraf": "^3.0.2" @@ -29650,7 +29650,7 @@ "@mongosh/service-provider-core": "0.0.0-dev.0", "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.9.0", + "bson": "^6.10.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "mocha": "^10.2.0", @@ -29669,8 +29669,8 @@ "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", "@mongosh/errors": "0.0.0-dev.0", - "bson": "^6.9.0", - "mongodb": "^6.10.0", + "bson": "^6.10.0", + "mongodb": "^6.11.0", "mongodb-build-info": "^1.7.2", "mongodb-connection-string-url": "^3.0.1" }, @@ -29700,7 +29700,7 @@ "@mongosh/service-provider-core": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", "aws4": "^1.12.0", - "mongodb": "^6.10.0", + "mongodb": "^6.11.0", "mongodb-connection-string-url": "^3.0.1", "socks": "^2.8.3" }, @@ -29738,10 +29738,10 @@ "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.9.0", + "bson": "^6.10.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.10.0", + "mongodb": "^6.11.0", "prettier": "^2.8.8", "semver": "^7.5.3" }, @@ -29781,7 +29781,7 @@ "@mongosh/errors": "0.0.0-dev.0", "@mongosh/shell-api": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.9.0", + "bson": "^6.10.0", "cross-spawn": "^7.0.5", "escape-string-regexp": "^4.0.0", "joi": "^17.4.0", @@ -29825,7 +29825,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.10.0", + "mongodb": "^6.11.0", "prettier": "^2.8.8" }, "engines": { diff --git a/package.json b/package.json index d6922e3b62..90611bdf32 100644 --- a/package.json +++ b/package.json @@ -107,12 +107,13 @@ "@types/which": "^1.3.2", "chai": "^4.2.0", "cross-env": "^6.0.3", + "depcheck": "^1.4.7", "duplexpair": "^1.0.2", "find-up": "^5.0.0", "glob": "^10.3.12", "husky": "^9.0.11", "mocha": "^10.2.0", - "mongodb": "^6.10.0", + "mongodb": "^6.11.0", "mongodb-runner": "^5.7.1", "node-gyp": "^9.0.0 || ^10.2.0", "nyc": "^15.1.0", @@ -130,8 +131,7 @@ "webpack-bundle-analyzer": "^4.7.0", "webpack-cli": "^4.3.1", "which": "^2.0.2", - "yaml": "^1.10.0", - "depcheck": "^1.4.7" + "yaml": "^1.10.0" }, "optionalDependencies": { "lerna": "^8.1.8" diff --git a/packages/arg-parser/package.json b/packages/arg-parser/package.json index 4ff68bcd9f..7811a42ff1 100644 --- a/packages/arg-parser/package.json +++ b/packages/arg-parser/package.json @@ -46,7 +46,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.10.0", + "mongodb": "^6.11.0", "prettier": "^2.8.8" } } diff --git a/packages/browser-repl/package.json b/packages/browser-repl/package.json index 7640c4f91c..268d3c7ab3 100644 --- a/packages/browser-repl/package.json +++ b/packages/browser-repl/package.json @@ -69,7 +69,7 @@ "@babel/plugin-proposal-class-properties": "^7.8.3", "@babel/preset-react": "^7.18.6", "@babel/preset-typescript": "^7.18.6", - "mongodb": "^6.10.0", + "mongodb": "^6.11.0", "@mongodb-js/compass-components": "*", "@mongodb-js/compass-editor": "*", "@mongodb-js/eslint-config-mongosh": "^1.0.0", diff --git a/packages/browser-runtime-core/package.json b/packages/browser-runtime-core/package.json index 2806aae0ea..7da16bb7a7 100644 --- a/packages/browser-runtime-core/package.json +++ b/packages/browser-runtime-core/package.json @@ -42,7 +42,7 @@ "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.9.0", + "bson": "^6.10.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "prettier": "^2.8.8", diff --git a/packages/cli-repl/package.json b/packages/cli-repl/package.json index ed350d5b79..1407817f6d 100644 --- a/packages/cli-repl/package.json +++ b/packages/cli-repl/package.json @@ -94,7 +94,7 @@ "yargs-parser": "^20.2.4" }, "devDependencies": { - "mongodb": "^6.10.0", + "mongodb": "^6.11.0", "@mongodb-js/eslint-config-mongosh": "^1.0.0", "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/sbom-tools": "^0.7.0", diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json index 9f2ac5906b..2e3ddce49c 100644 --- a/packages/e2e-tests/package.json +++ b/packages/e2e-tests/package.json @@ -39,13 +39,13 @@ "@types/chai-as-promised": "^7.1.3", "@types/node": "^14.14.6", "@types/rimraf": "^3.0.0", - "bson": "^6.9.0", + "bson": "^6.10.0", "chai-as-promised": "^7.1.1", "depcheck": "^1.4.7", "eslint": "^7.25.0", "lodash": "^4.17.21", "moment": "^2.29.1", - "mongodb": "^6.10.0", + "mongodb": "^6.11.0", "node-fetch": "^3.3.2", "prettier": "^2.8.8", "rimraf": "^3.0.2" diff --git a/packages/node-runtime-worker-thread/package.json b/packages/node-runtime-worker-thread/package.json index 0d682a30fe..e617b6fbe8 100644 --- a/packages/node-runtime-worker-thread/package.json +++ b/packages/node-runtime-worker-thread/package.json @@ -42,7 +42,7 @@ "@mongosh/service-provider-core": "0.0.0-dev.0", "@mongosh/service-provider-node-driver": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.9.0", + "bson": "^6.10.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", "mocha": "^10.2.0", diff --git a/packages/service-provider-core/package.json b/packages/service-provider-core/package.json index 2e2aad1e80..e2ddb4a129 100644 --- a/packages/service-provider-core/package.json +++ b/packages/service-provider-core/package.json @@ -45,8 +45,8 @@ "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", "@mongosh/errors": "0.0.0-dev.0", - "bson": "^6.9.0", - "mongodb": "^6.10.0", + "bson": "^6.10.0", + "mongodb": "^6.11.0", "mongodb-build-info": "^1.7.2", "mongodb-connection-string-url": "^3.0.1" }, diff --git a/packages/service-provider-node-driver/package.json b/packages/service-provider-node-driver/package.json index 65199f0cf6..84412e4655 100644 --- a/packages/service-provider-node-driver/package.json +++ b/packages/service-provider-node-driver/package.json @@ -53,7 +53,7 @@ "@mongosh/service-provider-core": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", "aws4": "^1.12.0", - "mongodb": "^6.10.0", + "mongodb": "^6.11.0", "mongodb-connection-string-url": "^3.0.1", "socks": "^2.8.3" }, diff --git a/packages/shell-api/package.json b/packages/shell-api/package.json index df069b6ead..f5ed4361f3 100644 --- a/packages/shell-api/package.json +++ b/packages/shell-api/package.json @@ -52,10 +52,10 @@ "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.9.0", + "bson": "^6.10.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.10.0", + "mongodb": "^6.11.0", "prettier": "^2.8.8", "semver": "^7.5.3" } diff --git a/packages/shell-api/src/mongo.ts b/packages/shell-api/src/mongo.ts index af82f57038..e163f72a30 100644 --- a/packages/shell-api/src/mongo.ts +++ b/packages/shell-api/src/mongo.ts @@ -709,7 +709,11 @@ export default class Mongo extends ShellApiClass { } } - const allSessionOptions = ['causalConsistency', 'snapshot'] as const; + const allSessionOptions = [ + 'causalConsistency', + 'snapshot', + 'defaultTimeoutMS', + ] as const; function assertAllSessionOptionsUsed( // eslint-disable-next-line @typescript-eslint/no-unused-vars _options: (typeof allSessionOptions)[number] | 'defaultTransactionOptions' diff --git a/packages/shell-api/src/shell-bson.ts b/packages/shell-api/src/shell-bson.ts index 8ae1b375d7..71b8257637 100644 --- a/packages/shell-api/src/shell-bson.ts +++ b/packages/shell-api/src/shell-bson.ts @@ -392,6 +392,10 @@ export default function constructShellBson( 'prototype', 'createFromBase64', 'createFromHexString', + 'fromInt8Array', + 'fromFloat32Array', + 'fromPackedBits', + 'fromBits', 'BUFFER_SIZE', 'SUBTYPE_DEFAULT', 'SUBTYPE_FUNCTION', @@ -402,7 +406,9 @@ export default function constructShellBson( 'SUBTYPE_ENCRYPTED', 'SUBTYPE_COLUMN', 'SUBTYPE_SENSITIVE', + 'SUBTYPE_VECTOR', 'SUBTYPE_USER_DEFINED', + 'VECTOR_TYPE', ]) ), Double: assignAll( diff --git a/packages/snippet-manager/package.json b/packages/snippet-manager/package.json index 1e71aedb8b..45d820a782 100644 --- a/packages/snippet-manager/package.json +++ b/packages/snippet-manager/package.json @@ -39,7 +39,7 @@ "@mongosh/errors": "0.0.0-dev.0", "@mongosh/shell-api": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.9.0", + "bson": "^6.10.0", "cross-spawn": "^7.0.5", "escape-string-regexp": "^4.0.0", "joi": "^17.4.0", diff --git a/packages/types/package.json b/packages/types/package.json index 8bad80c765..cf6b0fa37c 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -46,7 +46,7 @@ "@mongodb-js/tsconfig-mongosh": "^1.0.0", "depcheck": "^1.4.7", "eslint": "^7.25.0", - "mongodb": "^6.10.0", + "mongodb": "^6.11.0", "prettier": "^2.8.8" } } From c88fc5be4d9be20d5709a4c2002bde8fc0f9288d Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Mon, 25 Nov 2024 12:42:41 +0100 Subject: [PATCH 2/3] fixup: bump oidc-plugin to very latest version --- package-lock.json | 8 ++++---- packages/service-provider-node-driver/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index bbce52a739..77e5587d5d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5929,9 +5929,9 @@ "license": "Apache-2.0" }, "node_modules/@mongodb-js/oidc-plugin": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@mongodb-js/oidc-plugin/-/oidc-plugin-1.1.4.tgz", - "integrity": "sha512-OKJ2wgxSDbElaa42KuidpozKWfjfac64xzN2ilzolkYm0MZeegzt4KkTkdlixbyjlgNB9J8UNtDTAfRKTw5f8w==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@mongodb-js/oidc-plugin/-/oidc-plugin-1.1.5.tgz", + "integrity": "sha512-K76ADgrDpL+lg6L/QsEBIGbSjTEUljYDGDX75Tq4+zIkx3JQgeQhS5J3qZNzKwJa4nj+EwhihaADLRgsMpAtrA==", "license": "Apache-2.0", "dependencies": { "express": "^4.18.2", @@ -29695,7 +29695,7 @@ "license": "Apache-2.0", "dependencies": { "@mongodb-js/devtools-connect": "^3.3.3", - "@mongodb-js/oidc-plugin": "^1.1.2", + "@mongodb-js/oidc-plugin": "^1.1.5", "@mongosh/errors": "0.0.0-dev.0", "@mongosh/service-provider-core": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", diff --git a/packages/service-provider-node-driver/package.json b/packages/service-provider-node-driver/package.json index 84412e4655..3d9e10153a 100644 --- a/packages/service-provider-node-driver/package.json +++ b/packages/service-provider-node-driver/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "@mongodb-js/devtools-connect": "^3.3.3", - "@mongodb-js/oidc-plugin": "^1.1.2", + "@mongodb-js/oidc-plugin": "^1.1.5", "@mongosh/errors": "0.0.0-dev.0", "@mongosh/service-provider-core": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", From ba5b8eb2a61abfe52dac39a31e672188be8b7bf1 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Mon, 25 Nov 2024 16:41:18 +0100 Subject: [PATCH 3/3] fixup: also bump driver in vscode test for consistency --- testing/test-vscode.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/test-vscode.sh b/testing/test-vscode.sh index b5516e4dc5..9635ef75ef 100755 --- a/testing/test-vscode.sh +++ b/testing/test-vscode.sh @@ -13,8 +13,8 @@ cd "$test_root_dir" git clone --depth=10 https://github.com/mongodb-js/vscode.git cd vscode npm install --force -rm -rf node_modules/@mongosh -(cd node_modules && ln -s "$mongosh_root_dir/packages" @mongosh) +rm -rf node_modules/@mongosh node_modules/mongodb +(cd node_modules && ln -s "$mongosh_root_dir/packages" @mongosh && ln -s "$mongosh_root_dir/node_modules/mongodb" mongodb) # This test can require a lot of memory so we bump the maximum size. NODE_OPTIONS=--max-old-space-size=4096 npm test cd /tmp