diff --git a/package-lock.json b/package-lock.json index a09401cd9..7a5d4d040 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7557,6 +7557,10 @@ "resolved": "packages/cli-repl", "link": true }, + "node_modules/@mongosh/connectivity-tests": { + "resolved": "packages/connectivity-tests", + "link": true + }, "node_modules/@mongosh/docker-build-scripts": { "resolved": "scripts/docker", "link": true @@ -12197,9 +12201,9 @@ } }, "node_modules/bson": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/bson/-/bson-6.0.0.tgz", - "integrity": "sha512-FoWvdELfF2wQaUo8S/a1Rh2BDwJEUancDDnzdTpYymJTZjmvRpLWoqRPelKn+XSeh5D4YddWDG66cLtEhGGvcg==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/bson/-/bson-6.1.0.tgz", + "integrity": "sha512-yiQ3KxvpVoRpx1oD1uPz4Jit9tAVTJgjdmjDKtUErkOoL9VNoF8Dd58qtAOL5E40exx2jvAT9sqdRSK/r+SHlA==", "engines": { "node": ">=16.20.1" } @@ -13169,10 +13173,6 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, - "node_modules/@mongosh/connectivity-tests": { - "resolved": "packages/connectivity-tests", - "link": true - }, "node_modules/console-browserify": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", @@ -16905,7 +16905,7 @@ "version": "4.7.7", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz", "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==", - "dev": true, + "devOptional": true, "dependencies": { "minimist": "^1.2.5", "neo-async": "^2.6.0", @@ -16926,7 +16926,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, + "devOptional": true, "engines": { "node": ">=0.10.0" } @@ -23029,7 +23029,7 @@ "version": "2.6.2", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true + "devOptional": true }, "node_modules/netmask": { "version": "2.0.2", @@ -29132,7 +29132,7 @@ "version": "5.1.6", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", - "dev": true, + "devOptional": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -29164,7 +29164,6 @@ "version": "3.15.3", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.3.tgz", "integrity": "sha512-6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg==", - "dev": true, "optional": true, "bin": { "uglifyjs": "bin/uglifyjs" @@ -30317,7 +30316,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true + "devOptional": true }, "node_modules/workerpool": { "version": "6.2.1", @@ -30850,7 +30849,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.0.0", + "bson": "^6.1.0", "depcheck": "^1.4.3", "eslint": "^7.25.0", "prettier": "^2.8.8", @@ -31328,7 +31327,7 @@ "@mongosh/service-provider-core": "0.0.0-dev.0", "@mongosh/service-provider-server": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.0.0", + "bson": "^6.1.0", "depcheck": "^1.4.3", "eslint": "^7.25.0", "mocha": "^10.2.0", @@ -31347,7 +31346,7 @@ "dependencies": { "@aws-sdk/credential-providers": "^3.347.1", "@mongosh/errors": "0.0.0-dev.0", - "bson": "^6.0.0", + "bson": "^6.1.0", "mongodb": "^6.0.0", "mongodb-build-info": "^1.6.2" }, @@ -31415,7 +31414,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.0.0", + "bson": "^6.1.0", "depcheck": "^1.4.3", "eslint": "^7.25.0", "mongodb": "^6.0.0", @@ -31456,7 +31455,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.0.0", + "bson": "^6.1.0", "cross-spawn": "^7.0.3", "escape-string-regexp": "^4.0.0", "joi": "^17.4.0", @@ -37722,7 +37721,7 @@ "@mongosh/shell-api": "0.0.0-dev.0", "@mongosh/shell-evaluator": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.0.0", + "bson": "^6.1.0", "depcheck": "^1.4.3", "eslint": "^7.25.0", "prettier": "^2.8.8", @@ -37875,6 +37874,12 @@ } } }, + "@mongosh/connectivity-tests": { + "version": "file:packages/connectivity-tests", + "requires": { + "mongosh": "0.0.0-dev.0" + } + }, "@mongosh/docker-build-scripts": { "version": "file:scripts/docker", "requires": { @@ -38067,7 +38072,7 @@ "@mongosh/service-provider-core": "0.0.0-dev.0", "@mongosh/service-provider-server": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.0.0", + "bson": "^6.1.0", "depcheck": "^1.4.3", "eslint": "^7.25.0", "interruptor": "^1.0.1", @@ -38086,7 +38091,7 @@ "@mongodb-js/prettier-config-devtools": "^1.0.1", "@mongodb-js/tsconfig-mongosh": "^1.0.0", "@mongosh/errors": "0.0.0-dev.0", - "bson": "^6.0.0", + "bson": "^6.1.0", "depcheck": "^1.4.3", "eslint": "^7.25.0", "mongodb": "^6.0.0", @@ -38130,7 +38135,7 @@ "@mongosh/i18n": "0.0.0-dev.0", "@mongosh/service-provider-core": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.0.0", + "bson": "^6.1.0", "depcheck": "^1.4.3", "eslint": "^7.25.0", "mongodb": "^6.0.0", @@ -38166,7 +38171,7 @@ "@types/cross-spawn": "^6.0.2", "@types/node-fetch": "^2.6.4", "@types/tar": "^4.0.4", - "bson": "^6.0.0", + "bson": "^6.1.0", "cross-spawn": "^7.0.3", "depcheck": "^1.4.3", "escape-string-regexp": "^4.0.0", @@ -41891,9 +41896,9 @@ } }, "bson": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/bson/-/bson-6.0.0.tgz", - "integrity": "sha512-FoWvdELfF2wQaUo8S/a1Rh2BDwJEUancDDnzdTpYymJTZjmvRpLWoqRPelKn+XSeh5D4YddWDG66cLtEhGGvcg==" + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/bson/-/bson-6.1.0.tgz", + "integrity": "sha512-yiQ3KxvpVoRpx1oD1uPz4Jit9tAVTJgjdmjDKtUErkOoL9VNoF8Dd58qtAOL5E40exx2jvAT9sqdRSK/r+SHlA==" }, "buffer": { "version": "4.9.2", @@ -42659,12 +42664,6 @@ "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==", "dev": true }, - "connectivity-tests": { - "version": "file:packages/connectivity-tests", - "requires": { - "mongosh": "0.0.0-dev.0" - } - }, "console-browserify": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", @@ -45555,7 +45554,7 @@ "version": "4.7.7", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz", "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==", - "dev": true, + "devOptional": true, "requires": { "minimist": "^1.2.5", "neo-async": "^2.6.0", @@ -45568,7 +45567,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true + "devOptional": true } } }, @@ -50230,7 +50229,7 @@ "version": "2.6.2", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true + "devOptional": true }, "netmask": { "version": "2.0.2", @@ -54966,7 +54965,7 @@ "version": "5.1.6", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", - "dev": true + "devOptional": true }, "ua-parser-js": { "version": "0.7.35", @@ -54978,7 +54977,6 @@ "version": "3.15.3", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.3.tgz", "integrity": "sha512-6iCVm2omGJbsu3JWac+p6kUiOpg3wFO2f8lIXjfEb8RrmLjzog1wTPMmwKB7swfzzqxj9YM+sGUM++u1qN4qJg==", - "dev": true, "optional": true }, "unbox-primitive": { @@ -55807,7 +55805,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true + "devOptional": true }, "workerpool": { "version": "6.2.1", diff --git a/packages/browser-runtime-core/package.json b/packages/browser-runtime-core/package.json index 0c0823397..25a338df8 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.0.0", + "bson": "^6.1.0", "depcheck": "^1.4.3", "eslint": "^7.25.0", "prettier": "^2.8.8", diff --git a/packages/node-runtime-worker-thread/package.json b/packages/node-runtime-worker-thread/package.json index 9ae89ed28..814915591 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-server": "0.0.0-dev.0", "@mongosh/types": "0.0.0-dev.0", - "bson": "^6.0.0", + "bson": "^6.1.0", "depcheck": "^1.4.3", "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 1b3df7d1f..d386efa2c 100644 --- a/packages/service-provider-core/package.json +++ b/packages/service-provider-core/package.json @@ -45,7 +45,7 @@ "dependencies": { "@aws-sdk/credential-providers": "^3.347.1", "@mongosh/errors": "0.0.0-dev.0", - "bson": "^6.0.0", + "bson": "^6.1.0", "mongodb": "^6.0.0", "mongodb-build-info": "^1.6.2" }, diff --git a/packages/shell-api/package.json b/packages/shell-api/package.json index 840f1fa56..b3b4703e3 100644 --- a/packages/shell-api/package.json +++ b/packages/shell-api/package.json @@ -52,7 +52,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.0.0", + "bson": "^6.1.0", "depcheck": "^1.4.3", "eslint": "^7.25.0", "mongodb": "^6.0.0", diff --git a/packages/shell-api/src/shell-bson.spec.ts b/packages/shell-api/src/shell-bson.spec.ts index 09cebec1f..068856328 100644 --- a/packages/shell-api/src/shell-bson.spec.ts +++ b/packages/shell-api/src/shell-bson.spec.ts @@ -764,6 +764,7 @@ describe('Shell BSON', function () { delete bsonProperties.createPk; // @internal delete bsonProperties.getInc; // private delete bsonProperties.is; // private + delete bsonProperties._fromString; // private try { expect(shellProperties).to.deep.equal(bsonProperties); diff --git a/packages/shell-api/src/shell-bson.ts b/packages/shell-api/src/shell-bson.ts index 3274b2c18..44d26b91e 100644 --- a/packages/shell-api/src/shell-bson.ts +++ b/packages/shell-api/src/shell-bson.ts @@ -340,7 +340,11 @@ export default function constructShellBson( // Add the driver types to bsonPkg so we can deprecate the shell ones later Decimal128: assignAll( functionCtorWithoutProps(bson.Decimal128), - pickWithExactKeyMatch(bson.Decimal128, ['prototype', 'fromString']) + pickWithExactKeyMatch(bson.Decimal128, [ + 'prototype', + 'fromString', + 'fromStringWithRounding', + ]) ), BSONSymbol: assignAll( functionCtorWithoutProps(bson.BSONSymbol), diff --git a/packages/snippet-manager/package.json b/packages/snippet-manager/package.json index 0c3daea69..5ea4a9bbb 100644 --- a/packages/snippet-manager/package.json +++ b/packages/snippet-manager/package.json @@ -38,7 +38,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.0.0", + "bson": "^6.1.0", "cross-spawn": "^7.0.3", "escape-string-regexp": "^4.0.0", "joi": "^17.4.0",