From 6981bccb593bf4c540fad860e0b50976cd0f394d Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Thu, 12 May 2022 11:19:09 +0200 Subject: [PATCH 1/9] feat(deps): bump driver to 4.6.0, mongosh to 1.4.1 COMPASS-5619 --- package-lock.json | 1154 ++++------------- packages/compass-aggregations/package.json | 2 +- packages/compass-collection/package.json | 4 +- packages/compass-connections/package.json | 2 +- .../src/modules/telemetry.spec.ts | 1 - packages/compass-e2e-tests/package.json | 2 +- packages/compass-import-export/package.json | 2 +- packages/compass-schema/package.json | 2 +- packages/compass-shell/package.json | 10 +- packages/compass/package.json | 7 +- packages/connection-form/package.json | 2 +- .../csfle-tab/csfle-tab.tsx | 2 - .../src/utils/csfle-handler.spec.ts | 1 - .../src/utils/csfle-handler.ts | 4 - .../connection-form/src/utils/validation.ts | 1 - packages/connection-model/package.json | 4 +- packages/data-service/package.json | 5 +- .../data-service/src/connect-mongo-client.ts | 9 +- .../src/csfle-collection-tracker.spec.ts | 5 - .../src/csfle-collection-tracker.ts | 2 - .../data-service/src/data-service.spec.ts | 1 - packages/data-service/src/data-service.ts | 1 - packages/index-model/package.json | 2 +- 23 files changed, 301 insertions(+), 924 deletions(-) diff --git a/package-lock.json b/package-lock.json index 335a73833bf..98f631cfe99 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1392,17 +1392,6 @@ } } }, - "node_modules/@ampproject/remapping": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz", - "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==", - "dependencies": { - "@jridgewell/trace-mapping": "^0.3.0" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/@babel/cli": { "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.14.5.tgz", @@ -5234,28 +5223,6 @@ "node": ">= 6" } }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz", - "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.11", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz", - "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==" - }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz", - "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==", - "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" - } - }, "node_modules/@leafygreen-ui/a11y": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/@leafygreen-ui/a11y/-/a11y-1.2.2.tgz", @@ -6906,9 +6873,9 @@ "link": true }, "node_modules/@mongodb-js/devtools-connect": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-1.3.1.tgz", - "integrity": "sha512-lm36AajX8rbG/9bUhygeV9b19wKc39enpllcoXq/1OabaH7BCpZ9sVyLq5iSzBnYduyVLQH3WyILKnp0vyijeg==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-1.4.2.tgz", + "integrity": "sha512-rNbjzMPQWxKbMc5hEL+BZPSvoh/f9k2DvqE7ilR7B/NjSt2QFo66nz5RFQbQchaB1XA8+K73ch2SPlYrZl0Exw==", "dependencies": { "system-ca": "^1.0.2" }, @@ -7123,76 +7090,44 @@ "resolved": "configs/webpack-config-compass", "link": true }, - "node_modules/@mongosh/async-rewriter2": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-1.2.3.tgz", - "integrity": "sha512-cl2bje3CMs2oK5mNNNgHHq4zLfgdACsuahsw190G9YTUhDJELVoNS5fvU3ZGiZ4FE01J+MXRmQpdj8IzNVwFRw==", + "node_modules/@mongosh/arg-parser": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-1.4.1.tgz", + "integrity": "sha512-ifyZZEYymnXt6+oCRA7R2K5kc/Gm1NLR92vJgF2wjuTbOsVWQ6mxIc+IKz2z1Or4bgjjeIGaOPB3HCjkbKOgSw==", "dependencies": { - "@babel/core": "^7.16.12", - "@babel/plugin-transform-destructuring": "^7.16.7", - "@babel/plugin-transform-parameters": "^7.16.7", - "@babel/plugin-transform-shorthand-properties": "^7.16.7", - "@babel/types": "^7.16.8", - "@types/babel__core": "^7.1.18" + "@mongosh/errors": "1.4.1", + "@mongosh/i18n": "1.4.1", + "mongodb-connection-string-url": "^2.5.2" }, "engines": { "node": ">=12.4.0" } }, - "node_modules/@mongosh/async-rewriter2/node_modules/@babel/core": { - "version": "7.17.5", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.5.tgz", - "integrity": "sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==", + "node_modules/@mongosh/async-rewriter2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-1.4.1.tgz", + "integrity": "sha512-DpSKZwfs0ybnM0s6TxwDwfKuUZvJcTGAgAC0F3b6wms2X5cysSQ3Tl3vzAubaZkAERfqN409C+5bnsS+M0enMw==", "dependencies": { - "@ampproject/remapping": "^2.1.0", - "@babel/code-frame": "^7.16.7", - "@babel/generator": "^7.17.3", - "@babel/helper-compilation-targets": "^7.16.7", - "@babel/helper-module-transforms": "^7.16.7", - "@babel/helpers": "^7.17.2", - "@babel/parser": "^7.17.3", - "@babel/template": "^7.16.7", - "@babel/traverse": "^7.17.3", - "@babel/types": "^7.17.0", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.1.2", - "semver": "^6.3.0" - }, - "engines": { - "node": ">=6.9.0" + "@babel/core": "7.16.x", + "@babel/plugin-transform-destructuring": "^7.16.7", + "@babel/plugin-transform-parameters": "^7.16.7", + "@babel/plugin-transform-shorthand-properties": "^7.16.7", + "@babel/types": "^7.16.8", + "@types/babel__core": "^7.1.18" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/babel" - } - }, - "node_modules/@mongosh/async-rewriter2/node_modules/@babel/parser": { - "version": "7.17.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.3.tgz", - "integrity": "sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==", "bin": { - "parser": "bin/babel-parser.js" + "async-rewrite": "bin/async-rewrite.js" }, "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@mongosh/async-rewriter2/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "bin": { - "semver": "bin/semver.js" + "node": ">=12.4.0" } }, "node_modules/@mongosh/autocomplete": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-1.2.3.tgz", - "integrity": "sha512-UjzwbDISGW6Or/AfuYlaiYhAcO/L2u/2bDPoRVoo8mb+P4vd+jAjinXSs0n/f91X+TZla2gjnil3v+pDH5PdhQ==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-1.4.1.tgz", + "integrity": "sha512-h1rb68tIOpdH1I5yal5LzP5pklXmV8bfCrR9DDkZa0M4HeAaw7a00U/0U+6/HHxBAqKAJ4PRViM5aXlpDU2gKg==", "dependencies": { - "@mongosh/shell-api": "1.2.3", + "@mongosh/shell-api": "1.4.1", "mongodb-ace-autocompleter": "^0.11.0", "semver": "^7.3.2" }, @@ -7201,18 +7136,18 @@ } }, "node_modules/@mongosh/browser-repl": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/browser-repl/-/browser-repl-1.2.3.tgz", - "integrity": "sha512-HqQajS8XZjGIMJ0DuRCSOvl005yBnfAn3huzSGrQpwZp9o+3b/fCd1fuNit0PhfBjMPFNJMQlMscx51uzZA6Iw==", - "dependencies": { - "@mongosh/browser-runtime-core": "1.2.3", - "@mongosh/errors": "1.2.3", - "@mongosh/history": "1.2.3", - "@mongosh/i18n": "1.2.3", - "@mongosh/node-runtime-worker-thread": "1.2.3", - "@mongosh/service-provider-core": "1.2.3", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/browser-repl/-/browser-repl-1.4.1.tgz", + "integrity": "sha512-atGbtLIjRbLQhUE2QkPQ/5sbQ7XQDdwLGF2Jlf53ORwC4SEkM9GbQxL4CXdnK5UaNOidjk6/KnNPFrAiEOQ+sQ==", + "dependencies": { + "@mongosh/browser-runtime-core": "1.4.1", + "@mongosh/errors": "1.4.1", + "@mongosh/history": "1.4.1", + "@mongosh/i18n": "1.4.1", + "@mongosh/node-runtime-worker-thread": "1.4.1", + "@mongosh/service-provider-core": "1.4.1", "karma": "^6.3.9", - "pretty-bytes": "^5.3.0", + "numeral": "^2.0.6", "text-table": "^0.2.0" }, "engines": { @@ -7229,54 +7164,54 @@ "react-dom": "^16.12.0" } }, + "node_modules/@mongosh/browser-repl/node_modules/numeral": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/numeral/-/numeral-2.0.6.tgz", + "integrity": "sha1-StCAk21EPCVhrtnyGX7//iX05QY=", + "engines": { + "node": "*" + } + }, "node_modules/@mongosh/browser-runtime-core": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/browser-runtime-core/-/browser-runtime-core-1.2.3.tgz", - "integrity": "sha512-GMZZFV7JLgRV60juXsV/GrBwBtDtPn4BXDarbPJsePRWUMYa3v7r3ZWNyaQPR5O1FssT/O1HziwxDB7X5Vbckg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/browser-runtime-core/-/browser-runtime-core-1.4.1.tgz", + "integrity": "sha512-HwKy1dJJma/ZkrxprEtfOPTrDcJVF8lzq9m0P/NGI1V9iT9UYSgN3K80Hy0qCwDU85w8DA8XfDYty6H7b4o4ZQ==", "dependencies": { - "@mongosh/autocomplete": "1.2.3", - "@mongosh/service-provider-core": "1.2.3", - "@mongosh/shell-api": "1.2.3", - "@mongosh/shell-evaluator": "1.2.3" + "@mongosh/autocomplete": "1.4.1", + "@mongosh/service-provider-core": "1.4.1", + "@mongosh/shell-api": "1.4.1", + "@mongosh/shell-evaluator": "1.4.1" }, "engines": { "node": ">=12.4.0" } }, "node_modules/@mongosh/errors": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-1.2.3.tgz", - "integrity": "sha512-h32uPDLvDcNktCpceruiUSYyluSgG3ByUJ9mKHZQtINdIJ4iHzwSajEPW2c2Zm87hiEnS4u8rbS1fVby4vLBoA==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-1.4.1.tgz", + "integrity": "sha512-X9xiQMby9asoPh9Bo1KlYbGde7of5V08w1AF0g3QnlF2YNbZShnXWdTEPwTK2q+6L1vKVQ898xBZdJMuaGVVBw==", "engines": { "node": ">=12.4.0" } }, "node_modules/@mongosh/history": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-1.2.3.tgz", - "integrity": "sha512-FFdYQOETDwd4qoDKb0E/zfmWb33HXRn4kG7EeXIpiWuOUCd42Nju1+tVGeJkOquA7O42SDtxgeWEIABImDinfg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-1.4.1.tgz", + "integrity": "sha512-ZK+tNp+XOltIgnYWsH3wVYbYxkgeSkHk+ktoGxFJqegMD5fbnJAW3G1mG/smBswbfIGQqVokoDEVDEs8HJ0Klw==", "dependencies": { - "mongodb-connection-string-url": "^2.3.2", + "mongodb-connection-string-url": "^2.5.2", "mongodb-redact": "^0.2.2" }, "engines": { "node": ">=12.4.0" } }, - "node_modules/@mongosh/history/node_modules/mongodb-redact": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/mongodb-redact/-/mongodb-redact-0.2.2.tgz", - "integrity": "sha512-tmgDpSBymFtKggsLzpa0vDYaqh2wEXOswBZtJkXvbPKP0ThfPwoFYXtOukactU6WZsC4RYmpSPM4P6582FR/Xw==", - "dependencies": { - "lodash": "^4.17.15" - } - }, "node_modules/@mongosh/i18n": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-1.2.3.tgz", - "integrity": "sha512-ucNLoHQaxvVx3okhoS3ABsYasx2QDnQXrWemyBHliQ4hhjyhPPLgR/L2jcCG6CUPY/+So88LuOmpyihvC2AP7Q==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-1.4.1.tgz", + "integrity": "sha512-CMFdsS4PZSyXsLN/xf2ntwqPtO5Q0fEXn2Q+RBv4Y8fp/BdQi/p7wqKfiDPvKRC8ehzeP4tgImF66b5E89nYew==", "dependencies": { - "@mongosh/errors": "1.2.3", + "@mongosh/errors": "1.4.1", "mustache": "^4.0.0" }, "engines": { @@ -7284,14 +7219,14 @@ } }, "node_modules/@mongosh/logging": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-1.2.3.tgz", - "integrity": "sha512-IYWk50fg80YIA1QiCTLHLIoj9PuRuVX+aMH1Wre2PzSmloOqTTozeizUytq1jKaJJs2tgiXgDZ/qTDsdETi5Yg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-1.4.1.tgz", + "integrity": "sha512-pdQSGOsjoaM5jr+/9+z1p7QUeTbtk7SSdGHlxuE5VIm60BqqzEPRwvwhhrRLU7RRHT+fkC3lOIJrEFy1oMea/Q==", "dependencies": { - "@mongodb-js/devtools-connect": "^1.2.4", - "@mongosh/errors": "1.2.3", - "@mongosh/history": "1.2.3", - "@mongosh/types": "1.2.3", + "@mongodb-js/devtools-connect": "^1.4.2", + "@mongosh/errors": "1.4.1", + "@mongosh/history": "1.4.1", + "@mongosh/types": "1.4.1", "mongodb-log-writer": "^1.1.3", "mongodb-redact": "^0.2.2" }, @@ -7299,18 +7234,10 @@ "node": ">=12.4.0" } }, - "node_modules/@mongosh/logging/node_modules/mongodb-redact": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/mongodb-redact/-/mongodb-redact-0.2.2.tgz", - "integrity": "sha512-tmgDpSBymFtKggsLzpa0vDYaqh2wEXOswBZtJkXvbPKP0ThfPwoFYXtOukactU6WZsC4RYmpSPM4P6582FR/Xw==", - "dependencies": { - "lodash": "^4.17.15" - } - }, "node_modules/@mongosh/node-runtime-worker-thread": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/node-runtime-worker-thread/-/node-runtime-worker-thread-1.2.3.tgz", - "integrity": "sha512-LLBhgoyfe1yyluLi7/244DtwauucJhg4tyMRf5a41QBgSnc08+cXSxODxhLWiWIPqp6AiUnONa0ArASU/TM8vQ==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/node-runtime-worker-thread/-/node-runtime-worker-thread-1.4.1.tgz", + "integrity": "sha512-p2TbZMmB0mTPuTwIz0UuybWl7KoxdJaQeHEliudyo2pl9W9E+xa6ty6XW/Z6M7SlCyB6A6Oha3QIiYQtiecQ3Q==", "dependencies": { "interruptor": "^1.0.1", "system-ca": "^1.0.2" @@ -7320,66 +7247,57 @@ } }, "node_modules/@mongosh/service-provider-core": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-1.2.3.tgz", - "integrity": "sha512-LZU2sYGs/pFmFyVxIlL8UJfTfZrWrdOksY0OLyJgyw7HkdGh3gR+yH9+IjFHMs0VLd+J1PiZFhjvZJEPKl1Gng==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-1.4.1.tgz", + "integrity": "sha512-RItP+FpGSAKqOtj5UtSygeg+W4Y0ll6Ur/VYRh2opn17HMIu6CwkL9QumFf0TM9RZKaO9wZ2fQbIaV5BXVAwSg==", "dependencies": { - "@mongosh/errors": "1.2.3", - "@mongosh/i18n": "1.2.3", - "bson": "^4.6.1", - "mongodb": "^4.4.0", - "mongodb-build-info": "^1.2.0", - "mongodb-connection-string-url": "^2.3.2" + "@mongosh/errors": "1.4.1", + "bson": "^4.6.2", + "mongodb": "^4.6.0", + "mongodb-build-info": "^1.2.0" }, "engines": { "node": ">=12.4.0" }, "optionalDependencies": { - "mongodb-client-encryption": "^2.0.0" + "mongodb-client-encryption": "^2.2.0-alpha.0" } }, "node_modules/@mongosh/shell-api": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-1.2.3.tgz", - "integrity": "sha512-g8rMNw+VUUiCea61aVqHHoQliSib30acaDsPkKm7MdMZHJjjkZ5n9A9rzWfIC2RIfKUprV7xTuytz/ewb8Hthg==", - "dependencies": { - "@mongosh/errors": "1.2.3", - "@mongosh/history": "1.2.3", - "@mongosh/i18n": "1.2.3", - "@mongosh/service-provider-core": "1.2.3", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-1.4.1.tgz", + "integrity": "sha512-u8wANhL4rs9vrMNZBd6DJXEOLCnug2KERpRn8Iqo4bkC0xFMSQ9q//LulhxlzcIVxhHFY9rOudCyNKBNfgeZbg==", + "dependencies": { + "@mongosh/arg-parser": "1.4.1", + "@mongosh/errors": "1.4.1", + "@mongosh/history": "1.4.1", + "@mongosh/i18n": "1.4.1", + "@mongosh/service-provider-core": "1.4.1", "mongodb-redact": "^0.2.2" }, "engines": { "node": ">=12.4.0" } }, - "node_modules/@mongosh/shell-api/node_modules/mongodb-redact": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/mongodb-redact/-/mongodb-redact-0.2.2.tgz", - "integrity": "sha512-tmgDpSBymFtKggsLzpa0vDYaqh2wEXOswBZtJkXvbPKP0ThfPwoFYXtOukactU6WZsC4RYmpSPM4P6582FR/Xw==", - "dependencies": { - "lodash": "^4.17.15" - } - }, "node_modules/@mongosh/shell-evaluator": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-1.2.3.tgz", - "integrity": "sha512-tGRjgH4LJL38MBl5EQLe9aZL0jzjIMhCjdfu1QjtH25dAWvsvRQHMrdb+greIdnwxgVIvIBjCbsjzrGk4znrpQ==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-1.4.1.tgz", + "integrity": "sha512-vcsQST5J+XEBlvmP0fSyZn2ZV8qQHwGWuEAm99PYAQ54vU0MV+cd04f1kb+wWIIFwqoTid9oNxRFc5oys3i1dw==", "dependencies": { - "@mongosh/async-rewriter2": "1.2.3", - "@mongosh/history": "1.2.3", - "@mongosh/shell-api": "1.2.3" + "@mongosh/async-rewriter2": "1.4.1", + "@mongosh/history": "1.4.1", + "@mongosh/shell-api": "1.4.1" }, "engines": { "node": ">=12.4.0" } }, "node_modules/@mongosh/types": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-1.2.3.tgz", - "integrity": "sha512-d7sN4s41fFLiQ5zNBzBm7nzyuyRyK8m/+12g4pD7/45zM4AaKqn+1keD+yIYmGPQe7FwW7PJdqJokaIPC/VUJw==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-1.4.1.tgz", + "integrity": "sha512-vZl7j8SDaFLTtI2XLUshnJirAIUHorCh0kK2FS3JWBnxGF5bUEUUPqUKZhg1QEK1PFI5wydxy5LYLmCT8OMTyA==", "dependencies": { - "@mongodb-js/devtools-connect": "^1.2.4" + "@mongodb-js/devtools-connect": "^1.4.2" }, "engines": { "node": ">=12.4.0" @@ -38573,11 +38491,11 @@ } }, "node_modules/mongodb": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.4.1.tgz", - "integrity": "sha512-IAD3nFtCR4s22vi5qjqkCBnuyDDrOW8WVSSmgHquOvGaP1iTD+XpC5tr8wAUbZ2EeZkaswwBKQFHDvl4qYcKqQ==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.6.0.tgz", + "integrity": "sha512-1gsxVXmjFTPJ+CkMG9olE4bcVsyY8lBJN9m5B5vj+LZ7wkBqq3PO8RVmNX9GwCBOBz1KV0zM00vPviUearSv7A==", "dependencies": { - "bson": "^4.6.1", + "bson": "^4.6.3", "denque": "^2.0.1", "mongodb-connection-string-url": "^2.5.2", "socks": "^2.6.2" @@ -38618,11 +38536,10 @@ } }, "node_modules/mongodb-client-encryption": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-2.1.0.tgz", - "integrity": "sha512-9HlH2HlvF091SBj4aTV4duPgJzSPPpLc82CFvuMCCp15dP3HKvjMQec/lj1IzTfIH3ydgzteBw3z6PkKuIFujg==", + "version": "2.2.0-alpha.0", + "resolved": "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-2.2.0-alpha.0.tgz", + "integrity": "sha512-2JnWaYfEB3w84rJw3REIchyfgxMj7ZqWqkk0x9ZV3UWZ85sPcG4WMNyNm+ngys4W4omqB9PBxN4U9IqCset36Q==", "hasInstallScript": true, - "optional": true, "dependencies": { "bindings": "^1.5.0", "node-addon-api": "^4.3.0", @@ -38640,7 +38557,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", - "optional": true, "dependencies": { "mimic-response": "^3.1.0" }, @@ -38655,7 +38571,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz", "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==", - "optional": true, "engines": { "node": ">=8" } @@ -38664,7 +38579,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", - "optional": true, "engines": { "node": ">=10" }, @@ -38673,10 +38587,9 @@ } }, "node_modules/mongodb-client-encryption/node_modules/node-abi": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.8.0.tgz", - "integrity": "sha512-tzua9qWWi7iW4I42vUPKM+SfaF0vQSLAm4yO5J83mSwB7GeoWrDKC/K+8YCnYNwqP5duwazbw2X9l4m8SC2cUw==", - "optional": true, + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.15.0.tgz", + "integrity": "sha512-Ic6z/j6I9RLm4ov7npo1I48UQr2BEyFCqh6p7S1dhEx9jPO0GPGq/e2Rb7x7DroQrmiVMz/Bw1vJm9sPAl2nxA==", "dependencies": { "semver": "^7.3.5" }, @@ -38685,10 +38598,9 @@ } }, "node_modules/mongodb-client-encryption/node_modules/prebuild-install": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.0.1.tgz", - "integrity": "sha512-QBSab31WqkyxpnMWQxubYAHR5S9B2+r81ucocew34Fkl98FhvKIF50jIJnNOBmAZfyNV7vE5T6gd3hTVWgY6tg==", - "optional": true, + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.0.tgz", + "integrity": "sha512-CNcMgI1xBypOyGqjp3wOc8AAo1nMhZS3Cwd3iHIxOdAUbb+YxdNuM4Z5iIrZ8RLvOsf3F3bl7b7xGq6DjQoNYA==", "dependencies": { "detect-libc": "^2.0.0", "expand-template": "^2.0.3", @@ -38715,7 +38627,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "optional": true, "dependencies": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -38739,7 +38650,6 @@ "url": "https://feross.org/support" } ], - "optional": true, "dependencies": { "decompress-response": "^6.0.0", "once": "^1.3.1", @@ -39115,34 +39025,6 @@ "node": ">=0.6.19" } }, - "node_modules/mongodb-fle": { - "name": "mongodb", - "version": "4.6.0-alpha.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.6.0-alpha.0.tgz", - "integrity": "sha512-JuYil9/1UJvFyFjVFJj0srRXrAa3tGTpvg7Mdq4bA/uXP+DxxARlF7S38JAmKyQG03CM/NgYL5TCoq/SDAyMiw==", - "dev": true, - "dependencies": { - "bson": "^4.6.3", - "denque": "^2.0.1", - "mongodb-connection-string-url": "^2.5.2", - "socks": "^2.6.2" - }, - "engines": { - "node": ">=12.9.0" - }, - "optionalDependencies": { - "saslprep": "^1.0.3" - } - }, - "node_modules/mongodb-fle/node_modules/denque": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/denque/-/denque-2.0.1.tgz", - "integrity": "sha512-tfiWc6BQLXNLpNiR5iGd0Ocu3P3VpxfzFiqubLgMfhfOw9WyvgJBd46CClNn9k3qfbjvT//0cf7AlYRX/OslMQ==", - "dev": true, - "engines": { - "node": ">=0.10" - } - }, "node_modules/mongodb-index-model": { "resolved": "packages/index-model", "link": true @@ -39544,6 +39426,14 @@ "resolved": "https://registry.npmjs.org/lodash.forown/-/lodash.forown-4.4.0.tgz", "integrity": "sha1-hRFc8E9z75ZuztUlEdOJPMRmg68=" }, + "node_modules/mongodb-redact": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/mongodb-redact/-/mongodb-redact-0.2.2.tgz", + "integrity": "sha512-tmgDpSBymFtKggsLzpa0vDYaqh2wEXOswBZtJkXvbPKP0ThfPwoFYXtOukactU6WZsC4RYmpSPM4P6582FR/Xw==", + "dependencies": { + "lodash": "^4.17.15" + } + }, "node_modules/mongodb-reflux-store": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/mongodb-reflux-store/-/mongodb-reflux-store-0.0.1.tgz", @@ -44704,6 +44594,7 @@ "version": "5.6.0", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==", + "dev": true, "engines": { "node": ">=6" }, @@ -56784,7 +56675,7 @@ "hasInstallScript": true, "license": "SSPL", "dependencies": { - "@mongosh/node-runtime-worker-thread": "^1.2.3", + "@mongosh/node-runtime-worker-thread": "^1.4.1", "clipboard": "^2.0.6", "kerberos": "^2.0.0", "keytar": "^7.7.0", @@ -56872,7 +56763,7 @@ "make-fetch-happen": "^8.0.14", "marky": "^1.2.1", "mocha": "^8.4.0", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "mongodb-connection-model": "^21.16.0", "mongodb-data-service": "^21.20.0", "mongodb-download-url": "^1.2.0", @@ -56920,7 +56811,7 @@ "lodash.debounce": "^4.0.8", "lodash.isempty": "^4.4.0", "lodash.isstring": "^4.0.1", - "mongodb": "^4.4.1", + "mongodb": "^4.6.0", "mongodb-ns": "^2.4.0", "re-resizable": "^6.9.0", "react-bootstrap": "^0.32.4", @@ -62710,7 +62601,7 @@ "hadron-app-registry": "^8.11.0", "hadron-ipc": "^2.10.0", "mocha": "^8.4.0", - "mongodb": "^4.4.1", + "mongodb": "^4.6.0", "mongodb-collection-model": "^4.22.0", "mongodb-connection-string-url": "^2.5.2", "mongodb-data-service": "^21.20.0", @@ -62729,7 +62620,7 @@ "@mongodb-js/compass-components": "^0.14.0", "bson": "*", "hadron-ipc": "^2.10.0", - "mongodb": "^4.4.1", + "mongodb": "^4.6.0", "mongodb-collection-model": "^4.22.0", "mongodb-data-service": "^21.20.0", "numeral": "*", @@ -63833,7 +63724,7 @@ "@mongodb-js/connection-form": "^0.5.0", "debug": "^4.2.0", "lodash": "^4.17.21", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "react": "^16.14.0", "react-dom": "^16.14.0", "uuid": "^8.2.0" @@ -65168,7 +65059,7 @@ "hadron-build": "^24.16.0", "lodash": "^4.17.21", "mocha": "*", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "mongodb-connection-string-url": "^2.5.2", "mongodb-log-writer": "^1.1.4", "mongodb-runner": "^4.9.0", @@ -70130,7 +70021,7 @@ "lodash.throttle": "^4.1.1", "marky": "^1.2.1", "mime-types": "^2.1.24", - "mongodb": "^4.4.1", + "mongodb": "^4.6.0", "mongodb-ns": "^2.4.0", "mongodb-query-parser": "^2.4.6", "object-sizeof": "^1.5.1", @@ -78700,7 +78591,7 @@ "leaflet-defaulticon-compatibility": "^0.1.1", "lodash": "^4.17.21", "mocha": "^8.4.0", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "mongodb-ns": "^2.4.0", "node-fetch": "^2.6.1", "nyc": "^15.1.0", @@ -85525,10 +85416,10 @@ "@leafygreen-ui/code": "^9.4.0", "@mongodb-js/compass-logging": "^0.11.0", "@mongodb-js/mongodb-redux-common": "^1.11.0", - "@mongosh/browser-repl": "^1.2.3", - "@mongosh/logging": "^1.2.3", - "@mongosh/node-runtime-worker-thread": "^1.2.3", - "@mongosh/service-provider-core": "^1.2.3" + "@mongosh/browser-repl": "^1.4.1", + "@mongosh/logging": "^1.4.1", + "@mongosh/node-runtime-worker-thread": "^1.4.1", + "@mongosh/service-provider-core": "^1.4.1" }, "devDependencies": { "@babel/cli": "^7.14.3", @@ -85575,7 +85466,7 @@ "karma-webpack": "^4.0.2", "mocha": "^5.2.0", "mocha-webpack": "^2.0.0-beta.0", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "mongodb-reflux-store": "^0.0.1", "node-loader": "^0.6.0", "nyc": "^13.1.0", @@ -93989,28 +93880,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "packages/compass/node_modules/decompress-response": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", - "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", - "dependencies": { - "mimic-response": "^3.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "packages/compass/node_modules/detect-libc": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz", - "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==", - "engines": { - "node": ">=8" - } - }, "packages/compass/node_modules/diff": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", @@ -94118,17 +93987,6 @@ "node": ">=10" } }, - "packages/compass/node_modules/mimic-response": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", - "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "packages/compass/node_modules/mocha": { "version": "8.4.0", "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz", @@ -94196,76 +94054,12 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, - "packages/compass/node_modules/mongodb-client-encryption": { - "version": "2.2.0-alpha.0", - "resolved": "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-2.2.0-alpha.0.tgz", - "integrity": "sha512-2JnWaYfEB3w84rJw3REIchyfgxMj7ZqWqkk0x9ZV3UWZ85sPcG4WMNyNm+ngys4W4omqB9PBxN4U9IqCset36Q==", - "hasInstallScript": true, - "dependencies": { - "bindings": "^1.5.0", - "node-addon-api": "^4.3.0", - "prebuild-install": "^7.0.1", - "socks": "^2.6.1" - }, - "engines": { - "node": ">=12.9.0" - }, - "peerDependencies": { - "mongodb": ">=3.4.0" - } - }, "packages/compass/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, - "packages/compass/node_modules/node-abi": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.15.0.tgz", - "integrity": "sha512-Ic6z/j6I9RLm4ov7npo1I48UQr2BEyFCqh6p7S1dhEx9jPO0GPGq/e2Rb7x7DroQrmiVMz/Bw1vJm9sPAl2nxA==", - "dependencies": { - "semver": "^7.3.5" - }, - "engines": { - "node": ">=10" - } - }, - "packages/compass/node_modules/prebuild-install": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.0.tgz", - "integrity": "sha512-CNcMgI1xBypOyGqjp3wOc8AAo1nMhZS3Cwd3iHIxOdAUbb+YxdNuM4Z5iIrZ8RLvOsf3F3bl7b7xGq6DjQoNYA==", - "dependencies": { - "detect-libc": "^2.0.0", - "expand-template": "^2.0.3", - "github-from-package": "0.0.0", - "minimist": "^1.2.3", - "mkdirp-classic": "^0.5.3", - "napi-build-utils": "^1.0.1", - "node-abi": "^3.3.0", - "npmlog": "^4.0.1", - "pump": "^3.0.0", - "rc": "^1.2.7", - "simple-get": "^4.0.0", - "tar-fs": "^2.0.0", - "tunnel-agent": "^0.6.0" - }, - "bin": { - "prebuild-install": "bin.js" - }, - "engines": { - "node": ">=10" - } - }, - "packages/compass/node_modules/pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dependencies": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, "packages/compass/node_modules/readdirp": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", @@ -94287,30 +94081,6 @@ "randombytes": "^2.1.0" } }, - "packages/compass/node_modules/simple-get": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", - "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "dependencies": { - "decompress-response": "^6.0.0", - "once": "^1.3.1", - "simple-concat": "^1.0.0" - } - }, "packages/compass/node_modules/supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -94417,7 +94187,7 @@ "depcheck": "^1.4.1", "eslint": "^7.25.0", "mocha": "^8.4.0", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "mongodb-data-service": "^21.20.0", "nyc": "^15.1.0", "prettier": "2.3.2", @@ -94753,14 +94523,14 @@ "eslint-config-mongodb-js": "^5.0.3", "mocha": "^8.0.1", "mock-require": "^3.0.3", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "mongodb-runner": "^4.9.0", "proxyquire": "^2.1.0", "sinon": "^9.0.2", "uuid": "^8.2.0" }, "peerDependencies": { - "mongodb": "^4.4.0" + "mongodb": "^4.6.0" } }, "packages/connection-model/node_modules/anymatch": { @@ -95200,8 +94970,7 @@ "eslint": "^7.25.0", "kerberos": "^2.0.0", "mocha": "^8.4.0", - "mongodb": "^4.4.0", - "mongodb-fle": "npm:mongodb@^4.6.0-alpha.0", + "mongodb": "^4.6.0", "mongodb-runner": "^4.9.0", "nyc": "^15.0.0", "prettier": "2.3.2", @@ -95214,7 +94983,7 @@ "node": ">=14.17.5" }, "peerDependencies": { - "mongodb": "^4.4.0" + "mongodb": "^4.6.0" } }, "packages/data-service/node_modules/anymatch": { @@ -95312,28 +95081,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "packages/data-service/node_modules/decompress-response": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", - "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", - "dependencies": { - "mimic-response": "^3.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "packages/data-service/node_modules/detect-libc": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz", - "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==", - "engines": { - "node": ">=8" - } - }, "packages/data-service/node_modules/diff": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", @@ -95429,17 +95176,6 @@ "node": ">=10" } }, - "packages/data-service/node_modules/mimic-response": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", - "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "packages/data-service/node_modules/mocha": { "version": "8.4.0", "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz", @@ -95522,76 +95258,12 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "packages/data-service/node_modules/mongodb-client-encryption": { - "version": "2.2.0-alpha.0", - "resolved": "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-2.2.0-alpha.0.tgz", - "integrity": "sha512-2JnWaYfEB3w84rJw3REIchyfgxMj7ZqWqkk0x9ZV3UWZ85sPcG4WMNyNm+ngys4W4omqB9PBxN4U9IqCset36Q==", - "hasInstallScript": true, - "dependencies": { - "bindings": "^1.5.0", - "node-addon-api": "^4.3.0", - "prebuild-install": "^7.0.1", - "socks": "^2.6.1" - }, - "engines": { - "node": ">=12.9.0" - }, - "peerDependencies": { - "mongodb": ">=3.4.0" - } - }, "packages/data-service/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, - "packages/data-service/node_modules/node-abi": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.15.0.tgz", - "integrity": "sha512-Ic6z/j6I9RLm4ov7npo1I48UQr2BEyFCqh6p7S1dhEx9jPO0GPGq/e2Rb7x7DroQrmiVMz/Bw1vJm9sPAl2nxA==", - "dependencies": { - "semver": "^7.3.5" - }, - "engines": { - "node": ">=10" - } - }, - "packages/data-service/node_modules/prebuild-install": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.0.tgz", - "integrity": "sha512-CNcMgI1xBypOyGqjp3wOc8AAo1nMhZS3Cwd3iHIxOdAUbb+YxdNuM4Z5iIrZ8RLvOsf3F3bl7b7xGq6DjQoNYA==", - "dependencies": { - "detect-libc": "^2.0.0", - "expand-template": "^2.0.3", - "github-from-package": "0.0.0", - "minimist": "^1.2.3", - "mkdirp-classic": "^0.5.3", - "napi-build-utils": "^1.0.1", - "node-abi": "^3.3.0", - "npmlog": "^4.0.1", - "pump": "^3.0.0", - "rc": "^1.2.7", - "simple-get": "^4.0.0", - "tar-fs": "^2.0.0", - "tunnel-agent": "^0.6.0" - }, - "bin": { - "prebuild-install": "bin.js" - }, - "engines": { - "node": ">=10" - } - }, - "packages/data-service/node_modules/pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dependencies": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, "packages/data-service/node_modules/readdirp": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", @@ -95613,30 +95285,6 @@ "randombytes": "^2.1.0" } }, - "packages/data-service/node_modules/simple-get": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", - "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "dependencies": { - "decompress-response": "^6.0.0", - "once": "^1.3.1", - "simple-concat": "^1.0.0" - } - }, "packages/data-service/node_modules/sinon": { "version": "9.2.4", "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.2.4.tgz", @@ -100375,7 +100023,7 @@ "eslint": "^7.25.0", "eslint-config-mongodb-js": "^5.0.3", "mocha": "^7.1.0", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "mongodb-runner": "^4.9.0" } }, @@ -104511,14 +104159,6 @@ } }, "dependencies": { - "@ampproject/remapping": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz", - "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==", - "requires": { - "@jridgewell/trace-mapping": "^0.3.0" - } - }, "@babel/cli": { "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.14.5.tgz", @@ -107346,25 +106986,6 @@ "@types/yargs": "^13.0.0" } }, - "@jridgewell/resolve-uri": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz", - "integrity": "sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==" - }, - "@jridgewell/sourcemap-codec": { - "version": "1.4.11", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz", - "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==" - }, - "@jridgewell/trace-mapping": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz", - "integrity": "sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==", - "requires": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" - } - }, "@leafygreen-ui/a11y": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/@leafygreen-ui/a11y/-/a11y-1.2.2.tgz", @@ -108692,7 +108313,7 @@ "lodash.isempty": "^4.4.0", "lodash.isstring": "^4.0.1", "mocha": "^8.4.0", - "mongodb": "^4.4.1", + "mongodb": "^4.6.0", "mongodb-ace-autocompleter": "^0.12.0", "mongodb-connection-model": "^21.16.0", "mongodb-data-service": "^21.20.0", @@ -113013,7 +112634,7 @@ "hadron-app-registry": "^8.11.0", "hadron-ipc": "^2.10.0", "mocha": "^8.4.0", - "mongodb": "^4.4.1", + "mongodb": "^4.6.0", "mongodb-collection-model": "^4.22.0", "mongodb-connection-string-url": "^2.5.2", "mongodb-data-service": "^21.20.0", @@ -113602,7 +113223,7 @@ "eslint": "^7.25.0", "lodash": "^4.17.21", "mocha": "^8.4.0", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "mongodb-build-info": "^1.3.0", "mongodb-cloud-info": "^1.1.3", "mongodb-connection-string-url": "^2.5.2", @@ -117912,7 +117533,7 @@ "marky": "^1.2.1", "mime-types": "^2.1.24", "mocha": "^8.4.0", - "mongodb": "^4.4.1", + "mongodb": "^4.6.0", "mongodb-data-service": "^21.20.0", "mongodb-ns": "^2.4.0", "mongodb-query-parser": "^2.4.6", @@ -123288,7 +122909,7 @@ "mapbox-gl": "^1.2.0", "mocha": "^8.4.0", "moment": "^2.27.0", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "mongodb-ns": "^2.4.0", "mongodb-query-util": "^0.0.3", "mongodb-schema": "^8.2.5", @@ -128486,10 +128107,10 @@ "@mongodb-js/compass-components": "^0.14.0", "@mongodb-js/compass-logging": "^0.11.0", "@mongodb-js/mongodb-redux-common": "^1.11.0", - "@mongosh/browser-repl": "^1.2.3", - "@mongosh/logging": "^1.2.3", - "@mongosh/node-runtime-worker-thread": "^1.2.3", - "@mongosh/service-provider-core": "^1.2.3", + "@mongosh/browser-repl": "^1.4.1", + "@mongosh/logging": "^1.4.1", + "@mongosh/node-runtime-worker-thread": "^1.4.1", + "@mongosh/service-provider-core": "^1.4.1", "ace-builds": "^1.4.3", "autoprefixer": "^9.4.6", "babel-loader": "^8.2.2", @@ -128525,7 +128146,7 @@ "karma-webpack": "^4.0.2", "mocha": "^5.2.0", "mocha-webpack": "^2.0.0-beta.0", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "mongodb-reflux-store": "^0.0.1", "node-loader": "^0.6.0", "nyc": "^13.1.0", @@ -133734,7 +133355,7 @@ "eslint": "^7.25.0", "lodash": "^4.17.21", "mocha": "^8.4.0", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "mongodb-build-info": "^1.4.0", "mongodb-connection-string-url": "^2.5.2", "mongodb-data-service": "^21.20.0", @@ -134217,9 +133838,9 @@ } }, "@mongodb-js/devtools-connect": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-1.3.1.tgz", - "integrity": "sha512-lm36AajX8rbG/9bUhygeV9b19wKc39enpllcoXq/1OabaH7BCpZ9sVyLq5iSzBnYduyVLQH3WyILKnp0vyijeg==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-1.4.2.tgz", + "integrity": "sha512-rNbjzMPQWxKbMc5hEL+BZPSvoh/f9k2DvqE7ilR7B/NjSt2QFo66nz5RFQbQchaB1XA8+K73ch2SPlYrZl0Exw==", "requires": { "os-dns-native": "^1.2.0", "resolve-mongodb-srv": "^1.1.1", @@ -138304,207 +137925,159 @@ } } }, + "@mongosh/arg-parser": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-1.4.1.tgz", + "integrity": "sha512-ifyZZEYymnXt6+oCRA7R2K5kc/Gm1NLR92vJgF2wjuTbOsVWQ6mxIc+IKz2z1Or4bgjjeIGaOPB3HCjkbKOgSw==", + "requires": { + "@mongosh/errors": "1.4.1", + "@mongosh/i18n": "1.4.1", + "mongodb-connection-string-url": "^2.5.2" + } + }, "@mongosh/async-rewriter2": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-1.2.3.tgz", - "integrity": "sha512-cl2bje3CMs2oK5mNNNgHHq4zLfgdACsuahsw190G9YTUhDJELVoNS5fvU3ZGiZ4FE01J+MXRmQpdj8IzNVwFRw==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-1.4.1.tgz", + "integrity": "sha512-DpSKZwfs0ybnM0s6TxwDwfKuUZvJcTGAgAC0F3b6wms2X5cysSQ3Tl3vzAubaZkAERfqN409C+5bnsS+M0enMw==", "requires": { - "@babel/core": "^7.16.12", + "@babel/core": "7.16.x", "@babel/plugin-transform-destructuring": "^7.16.7", "@babel/plugin-transform-parameters": "^7.16.7", "@babel/plugin-transform-shorthand-properties": "^7.16.7", "@babel/types": "^7.16.8", "@types/babel__core": "^7.1.18" - }, - "dependencies": { - "@babel/core": { - "version": "7.17.5", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.5.tgz", - "integrity": "sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==", - "requires": { - "@ampproject/remapping": "^2.1.0", - "@babel/code-frame": "^7.16.7", - "@babel/generator": "^7.17.3", - "@babel/helper-compilation-targets": "^7.16.7", - "@babel/helper-module-transforms": "^7.16.7", - "@babel/helpers": "^7.17.2", - "@babel/parser": "^7.17.3", - "@babel/template": "^7.16.7", - "@babel/traverse": "^7.17.3", - "@babel/types": "^7.17.0", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.2", - "json5": "^2.1.2", - "semver": "^6.3.0" - } - }, - "@babel/parser": { - "version": "7.17.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.17.3.tgz", - "integrity": "sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==" - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - } } }, "@mongosh/autocomplete": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-1.2.3.tgz", - "integrity": "sha512-UjzwbDISGW6Or/AfuYlaiYhAcO/L2u/2bDPoRVoo8mb+P4vd+jAjinXSs0n/f91X+TZla2gjnil3v+pDH5PdhQ==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-1.4.1.tgz", + "integrity": "sha512-h1rb68tIOpdH1I5yal5LzP5pklXmV8bfCrR9DDkZa0M4HeAaw7a00U/0U+6/HHxBAqKAJ4PRViM5aXlpDU2gKg==", "requires": { - "@mongosh/shell-api": "1.2.3", + "@mongosh/shell-api": "1.4.1", "mongodb-ace-autocompleter": "^0.11.0", "semver": "^7.3.2" } }, "@mongosh/browser-repl": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/browser-repl/-/browser-repl-1.2.3.tgz", - "integrity": "sha512-HqQajS8XZjGIMJ0DuRCSOvl005yBnfAn3huzSGrQpwZp9o+3b/fCd1fuNit0PhfBjMPFNJMQlMscx51uzZA6Iw==", - "requires": { - "@mongosh/browser-runtime-core": "1.2.3", - "@mongosh/errors": "1.2.3", - "@mongosh/history": "1.2.3", - "@mongosh/i18n": "1.2.3", - "@mongosh/node-runtime-worker-thread": "1.2.3", - "@mongosh/service-provider-core": "1.2.3", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/browser-repl/-/browser-repl-1.4.1.tgz", + "integrity": "sha512-atGbtLIjRbLQhUE2QkPQ/5sbQ7XQDdwLGF2Jlf53ORwC4SEkM9GbQxL4CXdnK5UaNOidjk6/KnNPFrAiEOQ+sQ==", + "requires": { + "@mongosh/browser-runtime-core": "1.4.1", + "@mongosh/errors": "1.4.1", + "@mongosh/history": "1.4.1", + "@mongosh/i18n": "1.4.1", + "@mongosh/node-runtime-worker-thread": "1.4.1", + "@mongosh/service-provider-core": "1.4.1", "karma": "^6.3.9", - "pretty-bytes": "^5.3.0", + "numeral": "^2.0.6", "text-table": "^0.2.0" + }, + "dependencies": { + "numeral": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/numeral/-/numeral-2.0.6.tgz", + "integrity": "sha1-StCAk21EPCVhrtnyGX7//iX05QY=" + } } }, "@mongosh/browser-runtime-core": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/browser-runtime-core/-/browser-runtime-core-1.2.3.tgz", - "integrity": "sha512-GMZZFV7JLgRV60juXsV/GrBwBtDtPn4BXDarbPJsePRWUMYa3v7r3ZWNyaQPR5O1FssT/O1HziwxDB7X5Vbckg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/browser-runtime-core/-/browser-runtime-core-1.4.1.tgz", + "integrity": "sha512-HwKy1dJJma/ZkrxprEtfOPTrDcJVF8lzq9m0P/NGI1V9iT9UYSgN3K80Hy0qCwDU85w8DA8XfDYty6H7b4o4ZQ==", "requires": { - "@mongosh/autocomplete": "1.2.3", - "@mongosh/service-provider-core": "1.2.3", - "@mongosh/shell-api": "1.2.3", - "@mongosh/shell-evaluator": "1.2.3" + "@mongosh/autocomplete": "1.4.1", + "@mongosh/service-provider-core": "1.4.1", + "@mongosh/shell-api": "1.4.1", + "@mongosh/shell-evaluator": "1.4.1" } }, "@mongosh/errors": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-1.2.3.tgz", - "integrity": "sha512-h32uPDLvDcNktCpceruiUSYyluSgG3ByUJ9mKHZQtINdIJ4iHzwSajEPW2c2Zm87hiEnS4u8rbS1fVby4vLBoA==" + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/errors/-/errors-1.4.1.tgz", + "integrity": "sha512-X9xiQMby9asoPh9Bo1KlYbGde7of5V08w1AF0g3QnlF2YNbZShnXWdTEPwTK2q+6L1vKVQ898xBZdJMuaGVVBw==" }, "@mongosh/history": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-1.2.3.tgz", - "integrity": "sha512-FFdYQOETDwd4qoDKb0E/zfmWb33HXRn4kG7EeXIpiWuOUCd42Nju1+tVGeJkOquA7O42SDtxgeWEIABImDinfg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/history/-/history-1.4.1.tgz", + "integrity": "sha512-ZK+tNp+XOltIgnYWsH3wVYbYxkgeSkHk+ktoGxFJqegMD5fbnJAW3G1mG/smBswbfIGQqVokoDEVDEs8HJ0Klw==", "requires": { - "mongodb-connection-string-url": "^2.3.2", + "mongodb-connection-string-url": "^2.5.2", "mongodb-redact": "^0.2.2" - }, - "dependencies": { - "mongodb-redact": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/mongodb-redact/-/mongodb-redact-0.2.2.tgz", - "integrity": "sha512-tmgDpSBymFtKggsLzpa0vDYaqh2wEXOswBZtJkXvbPKP0ThfPwoFYXtOukactU6WZsC4RYmpSPM4P6582FR/Xw==", - "requires": { - "lodash": "^4.17.15" - } - } } }, "@mongosh/i18n": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-1.2.3.tgz", - "integrity": "sha512-ucNLoHQaxvVx3okhoS3ABsYasx2QDnQXrWemyBHliQ4hhjyhPPLgR/L2jcCG6CUPY/+So88LuOmpyihvC2AP7Q==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/i18n/-/i18n-1.4.1.tgz", + "integrity": "sha512-CMFdsS4PZSyXsLN/xf2ntwqPtO5Q0fEXn2Q+RBv4Y8fp/BdQi/p7wqKfiDPvKRC8ehzeP4tgImF66b5E89nYew==", "requires": { - "@mongosh/errors": "1.2.3", + "@mongosh/errors": "1.4.1", "mustache": "^4.0.0" } }, "@mongosh/logging": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-1.2.3.tgz", - "integrity": "sha512-IYWk50fg80YIA1QiCTLHLIoj9PuRuVX+aMH1Wre2PzSmloOqTTozeizUytq1jKaJJs2tgiXgDZ/qTDsdETi5Yg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/logging/-/logging-1.4.1.tgz", + "integrity": "sha512-pdQSGOsjoaM5jr+/9+z1p7QUeTbtk7SSdGHlxuE5VIm60BqqzEPRwvwhhrRLU7RRHT+fkC3lOIJrEFy1oMea/Q==", "requires": { - "@mongodb-js/devtools-connect": "^1.2.4", - "@mongosh/errors": "1.2.3", - "@mongosh/history": "1.2.3", - "@mongosh/types": "1.2.3", + "@mongodb-js/devtools-connect": "^1.4.2", + "@mongosh/errors": "1.4.1", + "@mongosh/history": "1.4.1", + "@mongosh/types": "1.4.1", "mongodb-log-writer": "^1.1.3", "mongodb-redact": "^0.2.2" - }, - "dependencies": { - "mongodb-redact": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/mongodb-redact/-/mongodb-redact-0.2.2.tgz", - "integrity": "sha512-tmgDpSBymFtKggsLzpa0vDYaqh2wEXOswBZtJkXvbPKP0ThfPwoFYXtOukactU6WZsC4RYmpSPM4P6582FR/Xw==", - "requires": { - "lodash": "^4.17.15" - } - } } }, "@mongosh/node-runtime-worker-thread": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/node-runtime-worker-thread/-/node-runtime-worker-thread-1.2.3.tgz", - "integrity": "sha512-LLBhgoyfe1yyluLi7/244DtwauucJhg4tyMRf5a41QBgSnc08+cXSxODxhLWiWIPqp6AiUnONa0ArASU/TM8vQ==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/node-runtime-worker-thread/-/node-runtime-worker-thread-1.4.1.tgz", + "integrity": "sha512-p2TbZMmB0mTPuTwIz0UuybWl7KoxdJaQeHEliudyo2pl9W9E+xa6ty6XW/Z6M7SlCyB6A6Oha3QIiYQtiecQ3Q==", "requires": { "interruptor": "^1.0.1", "system-ca": "^1.0.2" } }, "@mongosh/service-provider-core": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-1.2.3.tgz", - "integrity": "sha512-LZU2sYGs/pFmFyVxIlL8UJfTfZrWrdOksY0OLyJgyw7HkdGh3gR+yH9+IjFHMs0VLd+J1PiZFhjvZJEPKl1Gng==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-1.4.1.tgz", + "integrity": "sha512-RItP+FpGSAKqOtj5UtSygeg+W4Y0ll6Ur/VYRh2opn17HMIu6CwkL9QumFf0TM9RZKaO9wZ2fQbIaV5BXVAwSg==", "requires": { - "@mongosh/errors": "1.2.3", - "@mongosh/i18n": "1.2.3", - "bson": "^4.6.1", - "mongodb": "^4.4.0", + "@mongosh/errors": "1.4.1", + "bson": "^4.6.2", + "mongodb": "^4.6.0", "mongodb-build-info": "^1.2.0", - "mongodb-client-encryption": "^2.0.0", - "mongodb-connection-string-url": "^2.3.2" + "mongodb-client-encryption": "^2.2.0-alpha.0" } }, "@mongosh/shell-api": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-1.2.3.tgz", - "integrity": "sha512-g8rMNw+VUUiCea61aVqHHoQliSib30acaDsPkKm7MdMZHJjjkZ5n9A9rzWfIC2RIfKUprV7xTuytz/ewb8Hthg==", - "requires": { - "@mongosh/errors": "1.2.3", - "@mongosh/history": "1.2.3", - "@mongosh/i18n": "1.2.3", - "@mongosh/service-provider-core": "1.2.3", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-1.4.1.tgz", + "integrity": "sha512-u8wANhL4rs9vrMNZBd6DJXEOLCnug2KERpRn8Iqo4bkC0xFMSQ9q//LulhxlzcIVxhHFY9rOudCyNKBNfgeZbg==", + "requires": { + "@mongosh/arg-parser": "1.4.1", + "@mongosh/errors": "1.4.1", + "@mongosh/history": "1.4.1", + "@mongosh/i18n": "1.4.1", + "@mongosh/service-provider-core": "1.4.1", "mongodb-redact": "^0.2.2" - }, - "dependencies": { - "mongodb-redact": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/mongodb-redact/-/mongodb-redact-0.2.2.tgz", - "integrity": "sha512-tmgDpSBymFtKggsLzpa0vDYaqh2wEXOswBZtJkXvbPKP0ThfPwoFYXtOukactU6WZsC4RYmpSPM4P6582FR/Xw==", - "requires": { - "lodash": "^4.17.15" - } - } } }, "@mongosh/shell-evaluator": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-1.2.3.tgz", - "integrity": "sha512-tGRjgH4LJL38MBl5EQLe9aZL0jzjIMhCjdfu1QjtH25dAWvsvRQHMrdb+greIdnwxgVIvIBjCbsjzrGk4znrpQ==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-1.4.1.tgz", + "integrity": "sha512-vcsQST5J+XEBlvmP0fSyZn2ZV8qQHwGWuEAm99PYAQ54vU0MV+cd04f1kb+wWIIFwqoTid9oNxRFc5oys3i1dw==", "requires": { - "@mongosh/async-rewriter2": "1.2.3", - "@mongosh/history": "1.2.3", - "@mongosh/shell-api": "1.2.3" + "@mongosh/async-rewriter2": "1.4.1", + "@mongosh/history": "1.4.1", + "@mongosh/shell-api": "1.4.1" } }, "@mongosh/types": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-1.2.3.tgz", - "integrity": "sha512-d7sN4s41fFLiQ5zNBzBm7nzyuyRyK8m/+12g4pD7/45zM4AaKqn+1keD+yIYmGPQe7FwW7PJdqJokaIPC/VUJw==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@mongosh/types/-/types-1.4.1.tgz", + "integrity": "sha512-vZl7j8SDaFLTtI2XLUshnJirAIUHorCh0kK2FS3JWBnxGF5bUEUUPqUKZhg1QEK1PFI5wydxy5LYLmCT8OMTyA==", "requires": { - "@mongodb-js/devtools-connect": "^1.2.4" + "@mongodb-js/devtools-connect": "^1.4.2" } }, "@mrmlnc/readdir-enhanced": { @@ -146763,7 +146336,7 @@ "hadron-build": "^24.16.0", "lodash": "^4.17.21", "mocha": "*", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "mongodb-compass": "^0.0.1-dev.0", "mongodb-connection-string-url": "^2.5.2", "mongodb-log-writer": "^1.1.4", @@ -170235,11 +169808,11 @@ "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==" }, "mongodb": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.4.1.tgz", - "integrity": "sha512-IAD3nFtCR4s22vi5qjqkCBnuyDDrOW8WVSSmgHquOvGaP1iTD+XpC5tr8wAUbZ2EeZkaswwBKQFHDvl4qYcKqQ==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.6.0.tgz", + "integrity": "sha512-1gsxVXmjFTPJ+CkMG9olE4bcVsyY8lBJN9m5B5vj+LZ7wkBqq3PO8RVmNX9GwCBOBz1KV0zM00vPviUearSv7A==", "requires": { - "bson": "^4.6.1", + "bson": "^4.6.3", "denque": "^2.0.1", "mongodb-connection-string-url": "^2.5.2", "saslprep": "^1.0.3", @@ -170288,10 +169861,9 @@ } }, "mongodb-client-encryption": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-2.1.0.tgz", - "integrity": "sha512-9HlH2HlvF091SBj4aTV4duPgJzSPPpLc82CFvuMCCp15dP3HKvjMQec/lj1IzTfIH3ydgzteBw3z6PkKuIFujg==", - "optional": true, + "version": "2.2.0-alpha.0", + "resolved": "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-2.2.0-alpha.0.tgz", + "integrity": "sha512-2JnWaYfEB3w84rJw3REIchyfgxMj7ZqWqkk0x9ZV3UWZ85sPcG4WMNyNm+ngys4W4omqB9PBxN4U9IqCset36Q==", "requires": { "bindings": "^1.5.0", "node-addon-api": "^4.3.0", @@ -170303,7 +169875,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", - "optional": true, "requires": { "mimic-response": "^3.1.0" } @@ -170311,29 +169882,25 @@ "detect-libc": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz", - "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==", - "optional": true + "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==" }, "mimic-response": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", - "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", - "optional": true + "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==" }, "node-abi": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.8.0.tgz", - "integrity": "sha512-tzua9qWWi7iW4I42vUPKM+SfaF0vQSLAm4yO5J83mSwB7GeoWrDKC/K+8YCnYNwqP5duwazbw2X9l4m8SC2cUw==", - "optional": true, + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.15.0.tgz", + "integrity": "sha512-Ic6z/j6I9RLm4ov7npo1I48UQr2BEyFCqh6p7S1dhEx9jPO0GPGq/e2Rb7x7DroQrmiVMz/Bw1vJm9sPAl2nxA==", "requires": { "semver": "^7.3.5" } }, "prebuild-install": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.0.1.tgz", - "integrity": "sha512-QBSab31WqkyxpnMWQxubYAHR5S9B2+r81ucocew34Fkl98FhvKIF50jIJnNOBmAZfyNV7vE5T6gd3hTVWgY6tg==", - "optional": true, + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.0.tgz", + "integrity": "sha512-CNcMgI1xBypOyGqjp3wOc8AAo1nMhZS3Cwd3iHIxOdAUbb+YxdNuM4Z5iIrZ8RLvOsf3F3bl7b7xGq6DjQoNYA==", "requires": { "detect-libc": "^2.0.0", "expand-template": "^2.0.3", @@ -170354,7 +169921,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "optional": true, "requires": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -170364,7 +169930,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", - "optional": true, "requires": { "decompress-response": "^6.0.0", "once": "^1.3.1", @@ -170772,7 +170337,7 @@ "@mongodb-js/prettier-config-compass": "^0.5.0", "@mongodb-js/tsconfig-compass": "^0.6.0", "@mongodb-js/webpack-config-compass": "^0.8.0", - "@mongosh/node-runtime-worker-thread": "^1.2.3", + "@mongosh/node-runtime-worker-thread": "^1.4.1", "@octokit/rest": "^18.5.3", "@types/analytics-node": "^3.1.7", "ampersand-model": "^8.0.1", @@ -170820,7 +170385,7 @@ "make-fetch-happen": "^8.0.14", "marky": "^1.2.1", "mocha": "^8.4.0", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "mongodb-client-encryption": "^2.2.0-alpha.0", "mongodb-connection-model": "^21.16.0", "mongodb-data-service": "^21.20.0", @@ -170916,19 +170481,6 @@ "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", "dev": true }, - "decompress-response": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", - "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", - "requires": { - "mimic-response": "^3.1.0" - } - }, - "detect-libc": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz", - "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==" - }, "diff": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", @@ -171000,11 +170552,6 @@ "chalk": "^4.0.0" } }, - "mimic-response": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", - "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==" - }, "mocha": { "version": "8.4.0", "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz", @@ -171057,60 +170604,12 @@ } } }, - "mongodb-client-encryption": { - "version": "2.2.0-alpha.0", - "resolved": "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-2.2.0-alpha.0.tgz", - "integrity": "sha512-2JnWaYfEB3w84rJw3REIchyfgxMj7ZqWqkk0x9ZV3UWZ85sPcG4WMNyNm+ngys4W4omqB9PBxN4U9IqCset36Q==", - "requires": { - "bindings": "^1.5.0", - "node-addon-api": "^4.3.0", - "prebuild-install": "^7.0.1", - "socks": "^2.6.1" - } - }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, - "node-abi": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.15.0.tgz", - "integrity": "sha512-Ic6z/j6I9RLm4ov7npo1I48UQr2BEyFCqh6p7S1dhEx9jPO0GPGq/e2Rb7x7DroQrmiVMz/Bw1vJm9sPAl2nxA==", - "requires": { - "semver": "^7.3.5" - } - }, - "prebuild-install": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.0.tgz", - "integrity": "sha512-CNcMgI1xBypOyGqjp3wOc8AAo1nMhZS3Cwd3iHIxOdAUbb+YxdNuM4Z5iIrZ8RLvOsf3F3bl7b7xGq6DjQoNYA==", - "requires": { - "detect-libc": "^2.0.0", - "expand-template": "^2.0.3", - "github-from-package": "0.0.0", - "minimist": "^1.2.3", - "mkdirp-classic": "^0.5.3", - "napi-build-utils": "^1.0.1", - "node-abi": "^3.3.0", - "npmlog": "^4.0.1", - "pump": "^3.0.0", - "rc": "^1.2.7", - "simple-get": "^4.0.0", - "tar-fs": "^2.0.0", - "tunnel-agent": "^0.6.0" - } - }, - "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, "readdirp": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", @@ -171129,16 +170628,6 @@ "randombytes": "^2.1.0" } }, - "simple-get": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", - "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", - "requires": { - "decompress-response": "^6.0.0", - "once": "^1.3.1", - "simple-concat": "^1.0.0" - } - }, "supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -171178,7 +170667,7 @@ "lodash": "^4.17.15", "mocha": "^8.0.1", "mock-require": "^3.0.3", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "mongodb-connection-string-url": "^2.5.2", "mongodb-runner": "^4.9.0", "mongodb3": "npm:mongodb@^3.6.3", @@ -171527,12 +171016,11 @@ "kerberos": "^2.0.0", "lodash": "^4.17.20", "mocha": "^8.4.0", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "mongodb-build-info": "^1.3.0", "mongodb-client-encryption": "^2.2.0-alpha.0", "mongodb-connection-model": "^21.16.0", "mongodb-connection-string-url": "^2.5.2", - "mongodb-fle": "npm:mongodb@^4.6.0-alpha.0", "mongodb-index-model": "^3.10.0", "mongodb-ns": "^2.4.0", "mongodb-runner": "^4.9.0", @@ -171610,19 +171098,6 @@ "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", "dev": true }, - "decompress-response": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", - "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", - "requires": { - "mimic-response": "^3.1.0" - } - }, - "detect-libc": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz", - "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==" - }, "diff": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", @@ -171688,11 +171163,6 @@ "chalk": "^4.0.0" } }, - "mimic-response": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", - "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==" - }, "mocha": { "version": "8.4.0", "resolved": "https://registry.npmjs.org/mocha/-/mocha-8.4.0.tgz", @@ -171754,60 +171224,12 @@ } } }, - "mongodb-client-encryption": { - "version": "2.2.0-alpha.0", - "resolved": "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-2.2.0-alpha.0.tgz", - "integrity": "sha512-2JnWaYfEB3w84rJw3REIchyfgxMj7ZqWqkk0x9ZV3UWZ85sPcG4WMNyNm+ngys4W4omqB9PBxN4U9IqCset36Q==", - "requires": { - "bindings": "^1.5.0", - "node-addon-api": "^4.3.0", - "prebuild-install": "^7.0.1", - "socks": "^2.6.1" - } - }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, - "node-abi": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.15.0.tgz", - "integrity": "sha512-Ic6z/j6I9RLm4ov7npo1I48UQr2BEyFCqh6p7S1dhEx9jPO0GPGq/e2Rb7x7DroQrmiVMz/Bw1vJm9sPAl2nxA==", - "requires": { - "semver": "^7.3.5" - } - }, - "prebuild-install": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.0.tgz", - "integrity": "sha512-CNcMgI1xBypOyGqjp3wOc8AAo1nMhZS3Cwd3iHIxOdAUbb+YxdNuM4Z5iIrZ8RLvOsf3F3bl7b7xGq6DjQoNYA==", - "requires": { - "detect-libc": "^2.0.0", - "expand-template": "^2.0.3", - "github-from-package": "0.0.0", - "minimist": "^1.2.3", - "mkdirp-classic": "^0.5.3", - "napi-build-utils": "^1.0.1", - "node-abi": "^3.3.0", - "npmlog": "^4.0.1", - "pump": "^3.0.0", - "rc": "^1.2.7", - "simple-get": "^4.0.0", - "tar-fs": "^2.0.0", - "tunnel-agent": "^0.6.0" - } - }, - "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, "readdirp": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", @@ -171826,16 +171248,6 @@ "randombytes": "^2.1.0" } }, - "simple-get": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", - "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", - "requires": { - "decompress-response": "^6.0.0", - "once": "^1.3.1", - "simple-concat": "^1.0.0" - } - }, "sinon": { "version": "9.2.4", "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.2.4.tgz", @@ -172386,27 +171798,6 @@ } } }, - "mongodb-fle": { - "version": "npm:mongodb@4.6.0-alpha.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.6.0-alpha.0.tgz", - "integrity": "sha512-JuYil9/1UJvFyFjVFJj0srRXrAa3tGTpvg7Mdq4bA/uXP+DxxARlF7S38JAmKyQG03CM/NgYL5TCoq/SDAyMiw==", - "dev": true, - "requires": { - "bson": "^4.6.3", - "denque": "^2.0.1", - "mongodb-connection-string-url": "^2.5.2", - "saslprep": "^1.0.3", - "socks": "^2.6.2" - }, - "dependencies": { - "denque": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/denque/-/denque-2.0.1.tgz", - "integrity": "sha512-tfiWc6BQLXNLpNiR5iGd0Ocu3P3VpxfzFiqubLgMfhfOw9WyvgJBd46CClNn9k3qfbjvT//0cf7AlYRX/OslMQ==", - "dev": true - } - } - }, "mongodb-index-model": { "version": "file:packages/index-model", "requires": { @@ -172420,7 +171811,7 @@ "eslint-config-mongodb-js": "^5.0.3", "lodash": "^4.17.15", "mocha": "^7.1.0", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "mongodb-js-errors": "^0.5.0", "mongodb-ns": "^2.4.0", "mongodb-runner": "^4.9.0" @@ -173016,6 +172407,14 @@ } } }, + "mongodb-redact": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/mongodb-redact/-/mongodb-redact-0.2.2.tgz", + "integrity": "sha512-tmgDpSBymFtKggsLzpa0vDYaqh2wEXOswBZtJkXvbPKP0ThfPwoFYXtOukactU6WZsC4RYmpSPM4P6582FR/Xw==", + "requires": { + "lodash": "^4.17.15" + } + }, "mongodb-reflux-store": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/mongodb-reflux-store/-/mongodb-reflux-store-0.0.1.tgz", @@ -177179,7 +176578,8 @@ "pretty-bytes": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", - "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==" + "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==", + "dev": true }, "pretty-error": { "version": "2.1.2", diff --git a/packages/compass-aggregations/package.json b/packages/compass-aggregations/package.json index 91e952a8587..91a09447ebe 100644 --- a/packages/compass-aggregations/package.json +++ b/packages/compass-aggregations/package.json @@ -110,7 +110,7 @@ "lodash.debounce": "^4.0.8", "lodash.isempty": "^4.4.0", "lodash.isstring": "^4.0.1", - "mongodb": "^4.4.1", + "mongodb": "^4.6.0", "mongodb-ns": "^2.4.0", "re-resizable": "^6.9.0", "react-bootstrap": "^0.32.4", diff --git a/packages/compass-collection/package.json b/packages/compass-collection/package.json index 638142eec07..67f92655c43 100644 --- a/packages/compass-collection/package.json +++ b/packages/compass-collection/package.json @@ -59,7 +59,7 @@ "@mongodb-js/compass-components": "^0.14.0", "bson": "*", "hadron-ipc": "^2.10.0", - "mongodb": "^4.4.1", + "mongodb": "^4.6.0", "mongodb-collection-model": "^4.22.0", "mongodb-data-service": "^21.20.0", "numeral": "*", @@ -99,7 +99,7 @@ "hadron-app-registry": "^8.11.0", "hadron-ipc": "^2.10.0", "mocha": "^8.4.0", - "mongodb": "^4.4.1", + "mongodb": "^4.6.0", "mongodb-collection-model": "^4.22.0", "mongodb-connection-string-url": "^2.5.2", "mongodb-data-service": "^21.20.0", diff --git a/packages/compass-connections/package.json b/packages/compass-connections/package.json index f6f02789ad8..762fd55461b 100644 --- a/packages/compass-connections/package.json +++ b/packages/compass-connections/package.json @@ -58,7 +58,7 @@ "@mongodb-js/connection-form": "^0.5.0", "debug": "^4.2.0", "lodash": "^4.17.21", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "react": "^16.14.0", "react-dom": "^16.14.0", "uuid": "^8.2.0" diff --git a/packages/compass-connections/src/modules/telemetry.spec.ts b/packages/compass-connections/src/modules/telemetry.spec.ts index 79831b69c61..15eb1ad3a5f 100644 --- a/packages/compass-connections/src/modules/telemetry.spec.ts +++ b/packages/compass-connections/src/modules/telemetry.spec.ts @@ -538,7 +538,6 @@ describe('connection tracking', function () { local: { key: 'asdf' }, aws: { accessKeyId: 'asdf', secretAccessKey: 'asdf' }, }, - // @ts-expect-error next driver release will have types encryptedFieldsMap: { ['foo.bar']: {}, }, diff --git a/packages/compass-e2e-tests/package.json b/packages/compass-e2e-tests/package.json index be1d393005e..21b8a870feb 100644 --- a/packages/compass-e2e-tests/package.json +++ b/packages/compass-e2e-tests/package.json @@ -56,7 +56,7 @@ "hadron-build": "^24.16.0", "lodash": "^4.17.21", "mocha": "*", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "mongodb-connection-string-url": "^2.5.2", "mongodb-log-writer": "^1.1.4", "mongodb-runner": "^4.9.0", diff --git a/packages/compass-import-export/package.json b/packages/compass-import-export/package.json index fd0f0254b0b..eeb56c4f37a 100644 --- a/packages/compass-import-export/package.json +++ b/packages/compass-import-export/package.json @@ -80,7 +80,7 @@ "lodash.throttle": "^4.1.1", "marky": "^1.2.1", "mime-types": "^2.1.24", - "mongodb": "^4.4.1", + "mongodb": "^4.6.0", "mongodb-ns": "^2.4.0", "mongodb-query-parser": "^2.4.6", "object-sizeof": "^1.5.1", diff --git a/packages/compass-schema/package.json b/packages/compass-schema/package.json index a074c3c8d3c..2c404f8664c 100644 --- a/packages/compass-schema/package.json +++ b/packages/compass-schema/package.json @@ -104,7 +104,7 @@ "leaflet-defaulticon-compatibility": "^0.1.1", "lodash": "^4.17.21", "mocha": "^8.4.0", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "mongodb-ns": "^2.4.0", "node-fetch": "^2.6.1", "nyc": "^15.1.0", diff --git a/packages/compass-shell/package.json b/packages/compass-shell/package.json index 89b33262759..c8482c0045a 100644 --- a/packages/compass-shell/package.json +++ b/packages/compass-shell/package.json @@ -46,10 +46,10 @@ "@leafygreen-ui/code": "^9.4.0", "@mongodb-js/compass-logging": "^0.11.0", "@mongodb-js/mongodb-redux-common": "^1.11.0", - "@mongosh/browser-repl": "^1.2.3", - "@mongosh/logging": "^1.2.3", - "@mongosh/node-runtime-worker-thread": "^1.2.3", - "@mongosh/service-provider-core": "^1.2.3" + "@mongosh/browser-repl": "^1.4.1", + "@mongosh/logging": "^1.4.1", + "@mongosh/node-runtime-worker-thread": "^1.4.1", + "@mongosh/service-provider-core": "^1.4.1" }, "peerDependencies": { "@mongodb-js/compass-components": "^0.14.0", @@ -106,7 +106,7 @@ "karma-webpack": "^4.0.2", "mocha": "^5.2.0", "mocha-webpack": "^2.0.0-beta.0", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "mongodb-reflux-store": "^0.0.1", "node-loader": "^0.6.0", "nyc": "^13.1.0", diff --git a/packages/compass/package.json b/packages/compass/package.json index ba36df61a85..aebba25cae1 100644 --- a/packages/compass/package.json +++ b/packages/compass/package.json @@ -93,6 +93,9 @@ "**/mongodb-client-encryption/package.json", "**/mongodb-client-encryption/lib/**", "**/mongodb-client-encryption/build/**", + "**/socks/**", + "**/smart-buffer/**", + "**/ip/**", "**/bl/**", "**/nan/**", "**/node_modules/bindings/**", @@ -157,7 +160,7 @@ "email": "compass@mongodb.com" }, "dependencies": { - "@mongosh/node-runtime-worker-thread": "^1.2.3", + "@mongosh/node-runtime-worker-thread": "^1.4.1", "clipboard": "^2.0.6", "kerberos": "^2.0.0", "keytar": "^7.7.0", @@ -245,7 +248,7 @@ "make-fetch-happen": "^8.0.14", "marky": "^1.2.1", "mocha": "^8.4.0", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "mongodb-connection-model": "^21.16.0", "mongodb-data-service": "^21.20.0", "mongodb-download-url": "^1.2.0", diff --git a/packages/connection-form/package.json b/packages/connection-form/package.json index 79f13030579..a82b89e6b33 100644 --- a/packages/connection-form/package.json +++ b/packages/connection-form/package.json @@ -78,7 +78,7 @@ "depcheck": "^1.4.1", "eslint": "^7.25.0", "mocha": "^8.4.0", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "mongodb-data-service": "^21.20.0", "nyc": "^15.1.0", "prettier": "2.3.2", diff --git a/packages/connection-form/src/components/advanced-options-tabs/csfle-tab/csfle-tab.tsx b/packages/connection-form/src/components/advanced-options-tabs/csfle-tab/csfle-tab.tsx index 9c9b30bea1c..72d5378b44c 100644 --- a/packages/connection-form/src/components/advanced-options-tabs/csfle-tab/csfle-tab.tsx +++ b/packages/connection-form/src/components/advanced-options-tabs/csfle-tab/csfle-tab.tsx @@ -207,11 +207,9 @@ function CSFLETab({ { - // @ts-expect-error next driver release will have types handleFieldChanged('encryptedFieldsMap', value); }} /> diff --git a/packages/connection-form/src/utils/csfle-handler.spec.ts b/packages/connection-form/src/utils/csfle-handler.spec.ts index 23171cfe31b..1ffd62307c6 100644 --- a/packages/connection-form/src/utils/csfle-handler.spec.ts +++ b/packages/connection-form/src/utils/csfle-handler.spec.ts @@ -323,7 +323,6 @@ describe('csfle-handler', function () { '$compass.rawText': exampleString, '$compass.error': null, }, - // @ts-expect-error next driver release will have types encryptedFieldsMap: { '$compass.rawText': exampleString, '$compass.error': null, diff --git a/packages/connection-form/src/utils/csfle-handler.ts b/packages/connection-form/src/utils/csfle-handler.ts index 09439c4800c..8a3297c4b71 100644 --- a/packages/connection-form/src/utils/csfle-handler.ts +++ b/packages/connection-form/src/utils/csfle-handler.ts @@ -192,7 +192,6 @@ export function hasAnyCsfleOption(o: Readonly): boolean { o.bypassAutoEncryption || o.keyVaultNamespace || o.schemaMap || - // @ts-expect-error next driver release will have types o.encryptedFieldsMap || [ ...Object.values(o.tlsOptions ?? {}), @@ -264,11 +263,8 @@ export function adjustCSFLEParams( autoEncryptionOptions.schemaMap['$compass.rawText'] ); } - // @ts-expect-error next driver release will have types if (autoEncryptionOptions?.encryptedFieldsMap?.['$compass.error'] === null) { - // @ts-expect-error next driver release will have types autoEncryptionOptions.encryptedFieldsMap = textToEncryptedFieldConfig( - // @ts-expect-error next driver release will have types autoEncryptionOptions.encryptedFieldsMap['$compass.rawText'] ); } diff --git a/packages/connection-form/src/utils/validation.ts b/packages/connection-form/src/utils/validation.ts index 9a84dec39b5..71f88795108 100644 --- a/packages/connection-form/src/utils/validation.ts +++ b/packages/connection-form/src/utils/validation.ts @@ -263,7 +263,6 @@ function validateCSFLEErrors( const errors: ConnectionFormError[] = []; for (const fieldName of ['schemaMap', 'encryptedFieldsMap'] as const) { const encryptedFieldConfigError = - // @ts-expect-error next driver release will have types autoEncryptionOptions[fieldName]?.['$compass.error']; if (encryptedFieldConfigError) { errors.push({ diff --git a/packages/connection-model/package.json b/packages/connection-model/package.json index 7ca7425cb70..9c82b15f265 100644 --- a/packages/connection-model/package.json +++ b/packages/connection-model/package.json @@ -30,7 +30,7 @@ "posttest-ci": "node ../../scripts/killall-mongo.js" }, "peerDependencies": { - "mongodb": "^4.4.0" + "mongodb": "^4.6.0" }, "dependencies": { "@mongodb-js/ssh-tunnel": "^1.6.0", @@ -55,7 +55,7 @@ "eslint-config-mongodb-js": "^5.0.3", "mocha": "^8.0.1", "mock-require": "^3.0.3", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "mongodb-runner": "^4.9.0", "proxyquire": "^2.1.0", "sinon": "^9.0.2", diff --git a/packages/data-service/package.json b/packages/data-service/package.json index c7ab6a996dd..3d21a7c4fd8 100644 --- a/packages/data-service/package.json +++ b/packages/data-service/package.json @@ -56,7 +56,7 @@ "reformat": "npm run prettier -- --write ." }, "peerDependencies": { - "mongodb": "^4.4.0" + "mongodb": "^4.6.0" }, "dependencies": { "@mongodb-js/compass-logging": "^0.11.0", @@ -90,8 +90,7 @@ "eslint": "^7.25.0", "kerberos": "^2.0.0", "mocha": "^8.4.0", - "mongodb": "^4.4.0", - "mongodb-fle": "npm:mongodb@^4.6.0-alpha.0", + "mongodb": "^4.6.0", "mongodb-runner": "^4.9.0", "nyc": "^15.0.0", "prettier": "2.3.2", diff --git a/packages/data-service/src/connect-mongo-client.ts b/packages/data-service/src/connect-mongo-client.ts index 7ea7fd5b0ba..6a479fedcff 100644 --- a/packages/data-service/src/connect-mongo-client.ts +++ b/packages/data-service/src/connect-mongo-client.ts @@ -1,6 +1,5 @@ import type { MongoClientOptions } from 'mongodb'; import { MongoClient } from 'mongodb'; -import { MongoClient as FLEMongoClient } from 'mongodb-fle'; import { connectMongoClient, hookLogger } from '@mongodb-js/devtools-connect'; import type { DevtoolsConnectOptions } from '@mongodb-js/devtools-connect'; import type SSHTunnel from '@mongodb-js/ssh-tunnel'; @@ -46,7 +45,6 @@ export default async function connectMongoClientCompass( ...options.autoEncryption, extraOptions: { ...options.autoEncryption?.extraOptions, - // @ts-expect-error next driver release has types csflePath: process.env.COMPASS_CSFLE_LIBRARY_PATH, }, }; @@ -63,12 +61,7 @@ export default async function connectMongoClientCompass( if (socks5Options) { Object.assign(options, socks5Options); } - - const BaseMongoClient = - process.env.COMPASS_CSFLE_SUPPORT === 'true' - ? (FLEMongoClient as unknown as typeof MongoClient) - : MongoClient; - class CompassMongoClient extends BaseMongoClient { + class CompassMongoClient extends MongoClient { constructor(url: string, options?: MongoClientOptions) { super(url, options); if (setupListeners) { diff --git a/packages/data-service/src/csfle-collection-tracker.spec.ts b/packages/data-service/src/csfle-collection-tracker.spec.ts index ed71ecbf404..9265be53fef 100644 --- a/packages/data-service/src/csfle-collection-tracker.spec.ts +++ b/packages/data-service/src/csfle-collection-tracker.spec.ts @@ -43,7 +43,6 @@ describe('CSFLECollectionTracker', function () { kmsProviders: { local: { key: 'A'.repeat(128) } }, keyVaultNamespace: `${dbName}.kv`, extraOptions: { - // @ts-expect-error until next driver bump csflePath: process.env.COMPASS_CSFLE_LIBRARY_PATH, }, ...autoEncryption, @@ -192,7 +191,6 @@ describe('CSFLECollectionTracker', function () { context('with client-side FLE2 schema info', function () { beforeEach(async function () { [tracker, dataService] = await createTracker({ - // @ts-expect-error next driver release updates types encryptedFieldsMap: { [`${dbName}.test2`]: { fields: [{ path: 'a', keyId: SOME_UUID1, bsonType: 'string' }], @@ -298,14 +296,12 @@ describe('CSFLECollectionTracker', function () { 'CRUD' ); await crudClient.db(dbName).createCollection('test2', { - // @ts-expect-error next driver release updates types encryptedFields: { fields: [{ path: 'a', keyId: SOME_UUID1, bsonType: 'string' }], }, }); await crudClient.db(dbName).createCollection('test3', { - // @ts-expect-error next driver release updates types encryptedFields: { fields: [{ path: 'n.a', keyId: SOME_UUID2, bsonType: 'string' }], }, @@ -368,7 +364,6 @@ describe('CSFLECollectionTracker', function () { dataService as any )._initializedClient('META'); await metadataClient.db(dbName).createCollection('test2', { - // @ts-expect-error next driver release updates types encryptedFields: { fields: [{ path: 'b', keyId: SOME_UUID1, bsonType: 'string' }], }, diff --git a/packages/data-service/src/csfle-collection-tracker.ts b/packages/data-service/src/csfle-collection-tracker.ts index b8208ea4cc6..eb6a6b784bb 100644 --- a/packages/data-service/src/csfle-collection-tracker.ts +++ b/packages/data-service/src/csfle-collection-tracker.ts @@ -102,7 +102,6 @@ function extractEncrytedFieldFromAutoEncryptionOptions( return [ ...extractEncryptedFieldsFromSchema(autoEncryption.schemaMap?.[ns]), ...extractEncryptedFieldsFromEncryptedFieldsConfig( - // @ts-expect-error next driver release updates types autoEncryption?.encryptedFieldsMap?.[ns] ), ]; @@ -227,7 +226,6 @@ export class CSFLECollectionTrackerImpl implements CSFLECollectionTracker { const { autoEncryption } = this._crudClient.options; for (const ns of [ ...Object.keys(autoEncryption?.schemaMap ?? {}), - // @ts-expect-error next driver release updates types ...Object.keys(autoEncryption?.encryptedFieldsMap ?? {}), ]) { log.info( diff --git a/packages/data-service/src/data-service.spec.ts b/packages/data-service/src/data-service.spec.ts index 124878d64ec..98980ae3bc3 100644 --- a/packages/data-service/src/data-service.spec.ts +++ b/packages/data-service/src/data-service.spec.ts @@ -1358,7 +1358,6 @@ describe('DataService', function () { autoEncryption: { keyVaultNamespace: 'abc.def', schemaMap: { 'a.b': {} }, - // @ts-expect-error next driver release will have types encryptedFieldsMap: { 'a.c': {} }, kmsProviders: { aws: { accessKeyId: 'id', secretAccessKey: 'secret' }, diff --git a/packages/data-service/src/data-service.ts b/packages/data-service/src/data-service.ts index 6f4aa49a489..0de1ef52ebb 100644 --- a/packages/data-service/src/data-service.ts +++ b/packages/data-service/src/data-service.ts @@ -2409,7 +2409,6 @@ export class DataServiceImpl extends EventEmitter implements DataService { return { storeCredentials: fleOptions?.storeCredentials, encryptedFieldsMapNamespaces: Object.keys({ - // @ts-expect-error next driver release will have types ...fleOptions?.autoEncryption?.encryptedFieldsMap, ...fleOptions?.autoEncryption?.schemaMap, }), diff --git a/packages/index-model/package.json b/packages/index-model/package.json index 97913031235..10ab009c9f1 100644 --- a/packages/index-model/package.json +++ b/packages/index-model/package.json @@ -43,7 +43,7 @@ "eslint": "^7.25.0", "eslint-config-mongodb-js": "^5.0.3", "mocha": "^7.1.0", - "mongodb": "^4.4.0", + "mongodb": "^4.6.0", "mongodb-runner": "^4.9.0" } } From 23a7ffbc51a81249242e7d7431d479dc1287d30f Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Thu, 12 May 2022 11:49:07 +0200 Subject: [PATCH 2/9] fixup: missed ts-expects-error --- packages/compass-connections/src/modules/telemetry.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/compass-connections/src/modules/telemetry.ts b/packages/compass-connections/src/modules/telemetry.ts index 493efd6b824..1656271ac76 100644 --- a/packages/compass-connections/src/modules/telemetry.ts +++ b/packages/compass-connections/src/modules/telemetry.ts @@ -61,7 +61,6 @@ function getCsfleInformation( const kmsProviders = configuredKMSProviders(fleOptions?.autoEncryption ?? {}); const csfleInfo: Record = { is_csfle: kmsProviders.length > 0, - // @ts-expect-error next driver release has types has_csfle_schema: !!fleOptions?.autoEncryption.encryptedFieldsMap, }; From 7537a3bd1a184fd98cb689109ba960ab1894760a Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Thu, 12 May 2022 11:53:41 +0200 Subject: [PATCH 3/9] fixup: add optional chaining in telemetry --- packages/compass-connections/src/modules/telemetry.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/compass-connections/src/modules/telemetry.ts b/packages/compass-connections/src/modules/telemetry.ts index 1656271ac76..03876489bbf 100644 --- a/packages/compass-connections/src/modules/telemetry.ts +++ b/packages/compass-connections/src/modules/telemetry.ts @@ -61,7 +61,7 @@ function getCsfleInformation( const kmsProviders = configuredKMSProviders(fleOptions?.autoEncryption ?? {}); const csfleInfo: Record = { is_csfle: kmsProviders.length > 0, - has_csfle_schema: !!fleOptions?.autoEncryption.encryptedFieldsMap, + has_csfle_schema: !!fleOptions?.autoEncryption?.encryptedFieldsMap, }; for (const kmsProvider of ['aws', 'gcp', 'kmip', 'local', 'azure'] as const) { From 7ea4d57ff6669e4f6171de3d947299861fb07044 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Thu, 12 May 2022 12:03:32 +0200 Subject: [PATCH 4/9] fixup: account for changes to main branch --- packages/data-service/src/data-service.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/data-service/src/data-service.spec.ts b/packages/data-service/src/data-service.spec.ts index e1494b80fc5..290c3dba9c6 100644 --- a/packages/data-service/src/data-service.spec.ts +++ b/packages/data-service/src/data-service.spec.ts @@ -3,7 +3,7 @@ import type { Document } from 'bson'; import { ObjectId } from 'bson'; import { expect } from 'chai'; import type { Sort } from 'mongodb'; -import { MongoClient } from 'mongodb-fle'; +import { MongoClient } from 'mongodb'; import sinon from 'sinon'; import { v4 as uuid } from 'uuid'; From 3137f8becb0805d6e0e7394384163036ce005c6d Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Thu, 12 May 2022 12:09:09 +0200 Subject: [PATCH 5/9] fixup: drop another ts-expect-error that was added in main --- packages/data-service/src/data-service.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/data-service/src/data-service.ts b/packages/data-service/src/data-service.ts index 58d18606f6b..b89d0bf28d9 100644 --- a/packages/data-service/src/data-service.ts +++ b/packages/data-service/src/data-service.ts @@ -1394,7 +1394,6 @@ export class DataServiceImpl extends EventEmitter implements DataService { const options: DropCollectionOptions = {}; const encryptedFieldsInfo = result?.[0]?.options?.encryptedFields; if (encryptedFieldsInfo) { - // @ts-expect-error next driver release has types options.encryptedFields = encryptedFieldsInfo; } coll.drop(options, (error, result) => { From 0b12c1a53777c10a128fbe0a10af1410fb169a90 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Thu, 12 May 2022 12:36:54 +0200 Subject: [PATCH 6/9] fixup: package bumps affected linting, fix it --- packages/compass-aggregations/src/modules/pipeline.ts | 2 +- .../src/utils/cancellable-aggregation.ts | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/compass-aggregations/src/modules/pipeline.ts b/packages/compass-aggregations/src/modules/pipeline.ts index 06614d5a50e..b03f78dcfb6 100644 --- a/packages/compass-aggregations/src/modules/pipeline.ts +++ b/packages/compass-aggregations/src/modules/pipeline.ts @@ -922,7 +922,7 @@ const aggregate = ( dispatch( stagePreviewUpdated(docs || [], index, e as Error, true, getState().env) ); - cursor.close(); + void cursor.close(); dispatch( globalAppRegistryEmit('agg-pipeline-executed', { id: getState().id, diff --git a/packages/compass-aggregations/src/utils/cancellable-aggregation.ts b/packages/compass-aggregations/src/utils/cancellable-aggregation.ts index 32783e5054c..0879b27de83 100644 --- a/packages/compass-aggregations/src/utils/cancellable-aggregation.ts +++ b/packages/compass-aggregations/src/utils/cancellable-aggregation.ts @@ -40,12 +40,15 @@ export async function aggregatePipeline({ { ...defaultOptions, ...options } ); const abort = () => { - cursor.close(); - dataService.killSessions(session).catch(() => { + Promise.all([ + cursor.close(), + dataService.killSessions(session) + ]).catch((err) => { log.warn( mongoLogId(1001000105), 'Aggregations', - 'Attempting to kill the session failed' + 'Attempting to kill the session failed', + { error: err.message } ); }); }; From 46f13c8d79af5f5bf86e21d43d8c1f0923b34afe Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Thu, 12 May 2022 13:19:55 +0200 Subject: [PATCH 7/9] fixup: adjust test for linting fix --- .../compass-aggregations/src/modules/aggregation.spec.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/compass-aggregations/src/modules/aggregation.spec.ts b/packages/compass-aggregations/src/modules/aggregation.spec.ts index 24596637f61..0616c753cd4 100644 --- a/packages/compass-aggregations/src/modules/aggregation.spec.ts +++ b/packages/compass-aggregations/src/modules/aggregation.spec.ts @@ -116,7 +116,7 @@ describe('aggregation module', function () { stub(aggregateMock, 'toArray').callsFake(async () => new Promise(() => { })); const cursorCloseSpy = spy(aggregateMock, 'close'); - const killSessionsCatchSpy = spy(); + const killSessionsSpy = spy(); store.dispatch({ type: DATA_SERVICE_CONNECTED, dataService: new class { @@ -124,9 +124,8 @@ describe('aggregation module', function () { return {}; } killSessions() { - return { - catch: () => killSessionsCatchSpy(), - } + killSessionsSpy(); + return Promise.resolve(); } aggregate() { return aggregateMock; @@ -140,7 +139,7 @@ describe('aggregation module', function () { await wait(); - expect(killSessionsCatchSpy.getCalls().map(x => x.args), 'calls killSessions with correct args').to.deep.equal([[]]); + expect(killSessionsSpy.getCalls().map(x => x.args), 'calls killSessions with correct args').to.deep.equal([[]]); expect(cursorCloseSpy.getCalls().map(x => x.args), 'calls cursorClose with correct args').to.deep.equal([[]]); expect(store.getState().aggregation).to.deep.equal({ documents, From 5e5e2407d63abbcf555a58895be1a807a1cec74e Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Thu, 12 May 2022 14:26:19 +0200 Subject: [PATCH 8/9] fixup: also use non-fle client to drop aux collections in csfle test --- packages/data-service/src/csfle-collection-tracker.spec.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/data-service/src/csfle-collection-tracker.spec.ts b/packages/data-service/src/csfle-collection-tracker.spec.ts index 9265be53fef..62f072229ff 100644 --- a/packages/data-service/src/csfle-collection-tracker.spec.ts +++ b/packages/data-service/src/csfle-collection-tracker.spec.ts @@ -340,6 +340,9 @@ describe('CSFLECollectionTracker', function () { dataService as any )._initializedClient('META'); await metadataClient.db(dbName).dropCollection('test2'); + await metadataClient.db(dbName).dropCollection('enxcol_.test2.esc').catch(() => {}); + await metadataClient.db(dbName).dropCollection('enxcol_.test2.ecc').catch(() => {}); + await metadataClient.db(dbName).dropCollection('enxcol_.test2.ecoc').catch(() => {}); }); it('ensures that writes fail when server validation has been removed in the background', async function () { From 3b3563f120da13d291aff39ae9e2e2a43c6cb4dd Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Thu, 12 May 2022 14:57:52 +0200 Subject: [PATCH 9/9] fixup: prettier --- .../src/csfle-collection-tracker.spec.ts | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/data-service/src/csfle-collection-tracker.spec.ts b/packages/data-service/src/csfle-collection-tracker.spec.ts index 62f072229ff..0fc38d7677e 100644 --- a/packages/data-service/src/csfle-collection-tracker.spec.ts +++ b/packages/data-service/src/csfle-collection-tracker.spec.ts @@ -340,9 +340,18 @@ describe('CSFLECollectionTracker', function () { dataService as any )._initializedClient('META'); await metadataClient.db(dbName).dropCollection('test2'); - await metadataClient.db(dbName).dropCollection('enxcol_.test2.esc').catch(() => {}); - await metadataClient.db(dbName).dropCollection('enxcol_.test2.ecc').catch(() => {}); - await metadataClient.db(dbName).dropCollection('enxcol_.test2.ecoc').catch(() => {}); + await metadataClient + .db(dbName) + .dropCollection('enxcol_.test2.esc') + .catch(() => {}); + await metadataClient + .db(dbName) + .dropCollection('enxcol_.test2.ecc') + .catch(() => {}); + await metadataClient + .db(dbName) + .dropCollection('enxcol_.test2.ecoc') + .catch(() => {}); }); it('ensures that writes fail when server validation has been removed in the background', async function () {