Skip to content

Commit 88c960f

Browse files
committed
Merge branch 'main' of github.com:mongodb-js/mongosh into gagik/options
2 parents 8cec797 + af538cd commit 88c960f

File tree

40 files changed

+321
-649
lines changed

40 files changed

+321
-649
lines changed

.github/workflows/cron-tasks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- uses: actions/setup-node@v6
4040
with:
4141
check-latest: true
42-
node-version: 24.x
42+
node-version: 20.x
4343

4444
- name: Install Dependencies and Compile
4545
run: |

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,4 @@ Alessandro Miliucci <[email protected]>
5959
Ahmad Shah <[email protected]>
6060
Kush Patel <[email protected]>
6161
Taylor Cannon <[email protected]>
62+
Ilya Epelbaum <[email protected]>

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ variable. For detailed instructions for each of our supported platforms, please
4444
--eval [arg] Evaluate javascript
4545
--json[=canonical|relaxed] Print result of --eval as Extended JSON, including errors
4646
--retryWrites[=true|false] Automatically retry write operations upon transient network errors (Default: true)
47+
--deep-inspect[=true|false] Force full depth inspection of server results (default: true if in interactive mode)
4748
4849
Authentication Options:
4950

THIRD_PARTY_NOTICES.md

Lines changed: 126 additions & 189 deletions
Large diffs are not rendered by default.

configs/tsconfig-mongosh/AUTHORS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ Le Roux Bodenstein <[email protected]>
22
github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
33
Anna Henningsen <[email protected]>
44
Paula Stachova <[email protected]>
5+
Gagik Amaryan <[email protected]>
6+
mongodb-devtools-bot[bot] <189715634+mongodb-devtools-bot[bot]@users.noreply.github.com>

configs/tsconfig-mongosh/tsconfig.common.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"noUnusedLocals": false,
1010
"noUnusedParameters": false,
1111
"noImplicitReturns": true,
12+
"erasableSyntaxOnly": true,
1213

1314
"declaration": true,
1415
"removeComments": true,

packages/async-rewriter2/src/error-codes.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @mongoshErrors
55
*/
6-
enum AsyncRewriterErrors {
6+
export const AsyncRewriterErrors = {
77
/**
88
* Signals the use of a Mongosh API call in a place where it is not supported.
99
* This occurs inside of constructors and (non-async) generator functions.
@@ -23,7 +23,7 @@ enum AsyncRewriterErrors {
2323
*
2424
* **Solution: Do not use calls directly in such functions. If necessary, place these calls in an inner 'async' function.**
2525
*/
26-
SyntheticPromiseInAlwaysSyncContext = 'ASYNC-10012',
26+
SyntheticPromiseInAlwaysSyncContext: 'ASYNC-10012',
2727
/**
2828
* Signals the iteration of a Mongosh API object in a place where it is not supported.
2929
* This occurs inside of constructors and (non-async) generator functions.
@@ -44,7 +44,5 @@ enum AsyncRewriterErrors {
4444
*
4545
* **Solution: Do not use calls directly in such functions. If necessary, place these calls in an inner 'async' function.**
4646
*/
47-
SyntheticAsyncIterableInAlwaysSyncContext = 'ASYNC-10013',
48-
}
49-
50-
export { AsyncRewriterErrors };
47+
SyntheticAsyncIterableInAlwaysSyncContext: 'ASYNC-10013',
48+
} as const;

packages/autocomplete/src/index.spec.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { completer, BASE_COMPLETIONS } from './';
2-
import { signatures as shellSignatures, Topologies } from '@mongosh/shell-api';
2+
import { signatures as shellSignatures } from '@mongosh/shell-api';
33

44
import { expect } from 'chai';
55

66
let collections: string[];
77
let databases: string[];
88
const standalone600 = {
9-
topology: () => Topologies.Standalone,
9+
topology: () => 'Standalone' as const,
1010
apiVersionInfo: () => undefined,
1111
connectionInfo: () => ({
1212
is_atlas: false,
@@ -18,7 +18,7 @@ const standalone600 = {
1818
getDatabaseCompletions: () => databases,
1919
};
2020
const standalone440 = {
21-
topology: () => Topologies.Standalone,
21+
topology: () => 'Standalone' as const,
2222
apiVersionInfo: () => undefined,
2323
connectionInfo: () => ({
2424
is_atlas: false,
@@ -30,7 +30,7 @@ const standalone440 = {
3030
getDatabaseCompletions: () => databases,
3131
};
3232
const apiStrictParams = {
33-
topology: () => Topologies.Standalone,
33+
topology: () => 'Standalone' as const,
3434
apiVersionInfo: () => ({
3535
version: '1',
3636
strict: true,
@@ -41,7 +41,7 @@ const apiStrictParams = {
4141
getDatabaseCompletions: () => databases,
4242
};
4343
const sharded440 = {
44-
topology: () => Topologies.Sharded,
44+
topology: () => 'Sharded' as const,
4545
apiVersionInfo: () => undefined,
4646
connectionInfo: () => ({
4747
is_atlas: false,
@@ -54,7 +54,7 @@ const sharded440 = {
5454
};
5555

5656
const standalone300 = {
57-
topology: () => Topologies.Standalone,
57+
topology: () => 'Standalone' as const,
5858
apiVersionInfo: () => undefined,
5959
connectionInfo: () => ({
6060
is_atlas: false,
@@ -66,7 +66,7 @@ const standalone300 = {
6666
getDatabaseCompletions: () => databases,
6767
};
6868
const datalake440 = {
69-
topology: () => Topologies.Sharded,
69+
topology: () => 'Sharded' as const,
7070
apiVersionInfo: () => undefined,
7171
connectionInfo: () => ({
7272
is_atlas: true,
@@ -79,7 +79,7 @@ const datalake440 = {
7979
};
8080

8181
const localAtlas600 = {
82-
topology: () => Topologies.Standalone,
82+
topology: () => 'Standalone' as const,
8383
apiVersionInfo: () => undefined,
8484
connectionInfo: () => ({
8585
is_atlas: false,
@@ -100,7 +100,7 @@ const noParams = {
100100
};
101101

102102
const emptyConnectionInfoParams = {
103-
topology: () => Topologies.Standalone,
103+
topology: () => 'Standalone' as const,
104104
apiVersionInfo: () => undefined,
105105
connectionInfo: () => ({}),
106106
getCollectionCompletionsForCurrentDb: () => collections,

packages/browser-runtime-core/src/autocompleter/shell-api-autocompleter.spec.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import { ShellApiAutocompleter } from './shell-api-autocompleter';
22
import { expect } from 'chai';
3-
import { Topologies } from '@mongosh/shell-api';
43
import type { AutocompleteParameters } from '@mongosh/autocomplete';
54
import type { AutocompletionContext } from '@mongodb-js/mongodb-ts-autocomplete';
65

76
const standalone440Parameters: AutocompleteParameters = {
8-
topology: () => Topologies.Standalone,
7+
topology: () => 'Standalone',
98
apiVersionInfo: () => undefined,
109
connectionInfo: () => ({
1110
is_atlas: false,

packages/build/src/barque.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ describe('Barque', function () {
333333
});
334334

335335
it('platform is not linux', function () {
336-
config.platform = 'macos';
336+
config.platform = 'darwin';
337337
try {
338338
barque = new Barque(config);
339339
} catch (e: any) {

0 commit comments

Comments
 (0)