fix(deps): bump query-parser, ejson-shell-parser → shell-bson-parser C…

…OMPASS-4655 (#6025)
mongodb-js · Jul 17, 2024 · 39b6779 · 39b6779
1 parent 359db84
commit 39b6779
Show file tree

Hide file tree

Showing 18 changed files with 80 additions and 81 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/compass-aggregations/package.json b/packages/compass-aggregations/package.json
@@ -77,9 +77,9 @@
     "@mongodb-js/explain-plan-helper": "^1.1.14",
     "@mongodb-js/mongodb-constants": "^0.10.0",
     "@mongodb-js/my-queries-storage": "^0.13.0",
+    "@mongodb-js/shell-bson-parser": "^1.1.0",
     "bson": "^6.7.0",
     "compass-preferences-model": "^2.25.0",
-    "ejson-shell-parser": "^2.0.1",
     "hadron-app-registry": "^9.2.1",
     "hadron-document": "^8.5.5",
     "hadron-type-checker": "^7.2.2",
@@ -90,7 +90,7 @@
     "mongodb-database-model": "^2.22.1",
     "mongodb-instance-model": "^12.23.1",
     "mongodb-ns": "^2.4.2",
-    "mongodb-query-parser": "^4.1.2",
+    "mongodb-query-parser": "^4.2.0",
     "mongodb-schema": "^12.2.0",
     "prop-types": "^15.7.2",
     "re-resizable": "^6.9.0",

diff --git a/packages/compass-aggregations/src/modules/pipeline-builder/pipeline-parser/utils.ts b/packages/compass-aggregations/src/modules/pipeline-builder/pipeline-parser/utils.ts
@@ -1,6 +1,6 @@
 import babelGenerate from '@babel/generator';
 import type { Node } from '@babel/types';
-import _parseShellBSON, { ParseMode } from 'ejson-shell-parser';
+import _parseShellBSON, { ParseMode } from '@mongodb-js/shell-bson-parser';
 import { prettify } from '@mongodb-js/compass-editor';
 import type { FormatOptions } from '@mongodb-js/compass-editor';
 

diff --git a/packages/compass-crud/package.json b/packages/compass-crud/package.json
@@ -84,19 +84,19 @@
     "@mongodb-js/explain-plan-helper": "^1.1.14",
     "@mongodb-js/my-queries-storage": "^0.13.0",
     "@mongodb-js/reflux-state-mixin": "^1.0.3",
+    "@mongodb-js/shell-bson-parser": "^1.1.0",
     "ag-grid-community": "^20.2.0",
     "ag-grid-react": "^20.2.0",
     "bson": "^6.7.0",
     "compass-preferences-model": "^2.25.0",
-    "ejson-shell-parser": "^2.0.1",
     "hadron-app-registry": "^9.2.1",
     "hadron-document": "^8.5.5",
     "hadron-type-checker": "^7.2.2",
     "jsondiffpatch": "^0.5.0",
     "lodash": "^4.17.21",
     "mongodb-data-service": "^22.22.1",
     "mongodb-ns": "^2.4.2",
-    "mongodb-query-parser": "^4.1.2",
+    "mongodb-query-parser": "^4.2.0",
     "prop-types": "^15.7.2",
     "react": "^17.0.2",
     "reflux": "^0.4.1",

diff --git a/packages/compass-crud/src/stores/crud-store.ts b/packages/compass-crud/src/stores/crud-store.ts
@@ -7,7 +7,7 @@ import StateMixin from '@mongodb-js/reflux-state-mixin';
 import type { Element } from 'hadron-document';
 import { Document } from 'hadron-document';
 import HadronDocument from 'hadron-document';
-import _parseShellBSON, { ParseMode } from 'ejson-shell-parser';
+import _parseShellBSON, { ParseMode } from '@mongodb-js/shell-bson-parser';
 import type { PreferencesAccess } from 'compass-preferences-model/provider';
 import { capMaxTimeMSAtPreferenceLimit } from 'compass-preferences-model/provider';
 import type { Stage } from '@mongodb-js/explain-plan-helper';

diff --git a/packages/compass-editor/package.json b/packages/compass-editor/package.json
@@ -74,7 +74,7 @@
     "@lezer/highlight": "^1.1.3",
     "@mongodb-js/compass-components": "^1.28.0",
     "@mongodb-js/mongodb-constants": "^0.10.0",
-    "mongodb-query-parser": "^4.1.2",
+    "mongodb-query-parser": "^4.2.0",
     "polished": "^4.2.2",
     "prettier": "^2.7.1",
     "react": "^17.0.2"

diff --git a/packages/compass-export-to-language/package.json b/packages/compass-export-to-language/package.json
@@ -54,9 +54,9 @@
     "@mongodb-js/compass-editor": "^0.27.0",
     "@mongodb-js/compass-maybe-protect-connection-string": "^0.23.0",
     "@mongodb-js/compass-telemetry": "^1.1.1",
+    "@mongodb-js/shell-bson-parser": "^1.1.0",
     "bson-transpilers": "^3.0.5",
     "compass-preferences-model": "^2.25.0",
-    "ejson-shell-parser": "^2.0.1",
     "hadron-app-registry": "^9.2.1",
     "mongodb-ns": "^2.4.2",
     "react": "^17.0.2",

diff --git a/packages/compass-export-to-language/src/modules/count-aggregation-stages-in-string.ts b/packages/compass-export-to-language/src/modules/count-aggregation-stages-in-string.ts
@@ -1,4 +1,4 @@
-import parseShellBSON, { ParseMode } from 'ejson-shell-parser';
+import parseShellBSON, { ParseMode } from '@mongodb-js/shell-bson-parser';
 
 export function countAggregationStagesInString(source: string): number {
   const parsed = parseShellBSON(source, { mode: ParseMode.Loose });

diff --git a/packages/compass-generative-ai/package.json b/packages/compass-generative-ai/package.json
@@ -83,7 +83,7 @@
     "decomment": "^0.9.5",
     "depcheck": "^1.4.1",
     "digest-fetch": "^2.0.3",
-    "ejson-shell-parser": "^2.0.1",
+    "@mongodb-js/shell-bson-parser": "^1.1.0",
     "electron-mocha": "^12.2.0",
     "eslint": "^7.25.0",
     "mocha": "^10.2.0",

diff --git a/packages/compass-generative-ai/scripts/ai-accuracy-tests/ai-accuracy-tests.ts b/packages/compass-generative-ai/scripts/ai-accuracy-tests/ai-accuracy-tests.ts
@@ -18,7 +18,7 @@
 import { MongoCluster } from 'mongodb-runner';
 import os from 'os';
 import assert from 'assert';
-import ejsonShellParser from 'ejson-shell-parser';
+import ejsonShellParser from '@mongodb-js/shell-bson-parser';
 import { MongoClient } from 'mongodb';
 import { EJSON } from 'bson';
 import type { Document } from 'bson';

diff --git a/packages/compass-import-export/package.json b/packages/compass-import-export/package.json
@@ -67,7 +67,7 @@
     "mongodb": "^6.7.0",
     "mongodb-data-service": "^22.22.1",
     "mongodb-ns": "^2.4.2",
-    "mongodb-query-parser": "^4.1.2",
+    "mongodb-query-parser": "^4.2.0",
     "mongodb-schema": "^12.2.0",
     "papaparse": "^5.3.2",
     "react": "^17.0.2",

diff --git a/packages/compass-indexes/package.json b/packages/compass-indexes/package.json
@@ -78,14 +78,14 @@
     "@mongodb-js/compass-workspaces": "^0.17.0",
     "@mongodb-js/connection-storage": "^0.16.0",
     "@mongodb-js/mongodb-constants": "^0.10.0",
+    "@mongodb-js/shell-bson-parser": "^1.1.0",
     "bson": "^6.7.0",
     "compass-preferences-model": "^2.25.0",
-    "ejson-shell-parser": "^2.0.1",
     "hadron-app-registry": "^9.2.1",
     "lodash": "^4.17.21",
     "mongodb": "^6.7.0",
     "mongodb-data-service": "^22.22.1",
-    "mongodb-query-parser": "^4.1.2",
+    "mongodb-query-parser": "^4.2.0",
     "numeral": "^2.0.6",
     "react": "^17.0.2",
     "react-redux": "^8.1.3",

diff --git a/packages/compass-indexes/src/components/search-indexes-modals/base-search-index-modal.tsx b/packages/compass-indexes/src/components/search-indexes-modals/base-search-index-modal.tsx
@@ -32,7 +32,7 @@ import {
   createSearchIndexAutocompleter,
 } from '@mongodb-js/compass-editor';
 import type { EditorRef } from '@mongodb-js/compass-editor';
-import _parseShellBSON, { ParseMode } from 'ejson-shell-parser';
+import _parseShellBSON, { ParseMode } from '@mongodb-js/shell-bson-parser';
 import type { Document } from 'mongodb';
 import { SearchIndexTemplateDropdown } from '../search-index-template-dropdown';
 import {

diff --git a/packages/compass-query-bar/package.json b/packages/compass-query-bar/package.json
@@ -87,7 +87,7 @@
     "mongodb": "^6.7.0",
     "mongodb-instance-model": "^12.23.1",
     "mongodb-ns": "^2.4.2",
-    "mongodb-query-parser": "^4.1.2",
+    "mongodb-query-parser": "^4.2.0",
     "mongodb-query-util": "^2.2.4",
     "mongodb-schema": "^12.2.0",
     "react": "^17.0.2",

diff --git a/packages/compass-schema-validation/package.json b/packages/compass-schema-validation/package.json
@@ -82,7 +82,7 @@
     "javascript-stringify": "^2.0.1",
     "lodash": "^4.17.21",
     "mongodb-ns": "^2.4.2",
-    "mongodb-query-parser": "^4.1.2",
+    "mongodb-query-parser": "^4.2.0",
     "prop-types": "^15.7.2",
     "react": "^17.0.2",
     "react-redux": "^8.1.3",

diff --git a/packages/connection-form/package.json b/packages/connection-form/package.json
@@ -50,14 +50,14 @@
     "@mongodb-js/compass-components": "^1.28.0",
     "@mongodb-js/compass-editor": "^0.27.0",
     "@mongodb-js/connection-info": "^0.5.1",
+    "@mongodb-js/shell-bson-parser": "^1.1.0",
     "compass-preferences-model": "^2.25.0",
-    "ejson-shell-parser": "^2.0.1",
     "lodash": "^4.17.21",
     "mongodb": "^6.7.0",
     "mongodb-build-info": "^1.7.2",
     "mongodb-connection-string-url": "^3.0.1",
     "mongodb-data-service": "^22.22.1",
-    "mongodb-query-parser": "^4.1.2",
+    "mongodb-query-parser": "^4.2.0",
     "react": "^17.0.2"
   },
   "devDependencies": {

diff --git a/packages/connection-form/src/utils/csfle-handler.ts b/packages/connection-form/src/utils/csfle-handler.ts
@@ -8,7 +8,9 @@ import type {
 } from 'mongodb';
 import type { KMSProviderName } from './csfle-kms-fields';
 import { toJSString } from 'mongodb-query-parser';
-import parseShellStringToEJSON, { ParseMode } from 'ejson-shell-parser';
+import parseShellStringToEJSON, {
+  ParseMode,
+} from '@mongodb-js/shell-bson-parser';
 
 const DEFAULT_FLE_OPTIONS: NonNullable<ConnectionOptions['fleOptions']> = {
   storeCredentials: false,

diff --git a/packages/databases-collections/package.json b/packages/databases-collections/package.json
@@ -76,7 +76,7 @@
     "mongodb-database-model": "^2.22.1",
     "mongodb-instance-model": "^12.23.1",
     "mongodb-ns": "^2.4.2",
-    "mongodb-query-parser": "^4.1.2",
+    "mongodb-query-parser": "^4.2.0",
     "prop-types": "^15.7.2",
     "react": "^17.0.2",
     "react-redux": "^8.1.3",