@mongosh/service-provider-core 5.0.1 → 5.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -64,13 +64,12 @@ function getHostInformation(host) {
64
64
  };
65
65
  }
66
66
  function getConnectExtraInfo({ connectionString, buildInfo, atlasVersion, resolvedHostname, isLocalAtlas, serverName = 'unknown', }) {
67
- var _a, _b, _c;
68
- const auth_type = (_a = connectionString === null || connectionString === void 0 ? void 0 : connectionString.searchParams.get('authMechanism')) !== null && _a !== void 0 ? _a : undefined;
69
- const uri = (_b = connectionString === null || connectionString === void 0 ? void 0 : connectionString.toString()) !== null && _b !== void 0 ? _b : '';
70
- buildInfo !== null && buildInfo !== void 0 ? buildInfo : (buildInfo = {});
67
+ const auth_type = connectionString?.searchParams.get('authMechanism') ?? undefined;
68
+ const uri = connectionString?.toString() ?? '';
69
+ buildInfo ??= {};
71
70
  const { isDataLake: is_data_federation, dlVersion } = getBuildInfo.getDataLake(buildInfo);
72
71
  const { serverOs, serverArch } = getBuildInfo.getBuildEnv(buildInfo);
73
- const isAtlas = !!(atlasVersion === null || atlasVersion === void 0 ? void 0 : atlasVersion.atlasVersion) || getBuildInfo.isAtlas(uri);
72
+ const isAtlas = !!atlasVersion?.atlasVersion || getBuildInfo.isAtlas(uri);
74
73
  return {
75
74
  ...getHostInformation(resolvedHostname || uri),
76
75
  is_atlas: isAtlas,
@@ -84,7 +83,7 @@ function getConnectExtraInfo({ connectionString, buildInfo, atlasVersion, resolv
84
83
  is_data_federation,
85
84
  is_stream: getBuildInfo.isAtlasStream(uri),
86
85
  dl_version: dlVersion || undefined,
87
- atlas_version: (_c = atlasVersion === null || atlasVersion === void 0 ? void 0 : atlasVersion.atlasVersion) !== null && _c !== void 0 ? _c : null,
86
+ atlas_version: atlasVersion?.atlasVersion ?? null,
88
87
  is_genuine: serverName === 'mongodb' || serverName === 'unknown',
89
88
  non_genuine_server_name: serverName,
90
89
  is_local_atlas: isLocalAtlas,
@@ -1 +1 @@
1
- {"version":3,"file":"connect-info.js","sourceRoot":"","sources":["../src/connect-info.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6DA,sCA6CC;AAxGD,iEAAmD;AA2BnD,SAAS,kBAAkB,CAAC,IAAa;IACvC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO;YACL,YAAY,EAAE,KAAK;YACnB,SAAS,EAAE,KAAK;YAChB,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,IAAI,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;QACnC,OAAO;YACL,YAAY,EAAE,IAAI;YAClB,SAAS,EAAE,KAAK;YAChB,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,IAAI,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;QACtC,OAAO;YACL,YAAY,EAAE,KAAK;YACnB,SAAS,EAAE,IAAI;YACf,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,OAAO;QACL,YAAY,EAAE,KAAK;QACnB,SAAS,EAAE,KAAK;QAChB,YAAY,EAAE,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC;KACzC,CAAC;AACJ,CAAC;AAED,SAAwB,mBAAmB,CAAC,EAC1C,gBAAgB,EAChB,SAAS,EACT,YAAY,EACZ,gBAAgB,EAChB,YAAY,EACZ,UAAU,GAAG,SAAS,GAQvB;;IACC,MAAM,SAAS,GACb,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,CAAC,GAAG,CAAC,eAAe,CAAC,mCAAI,SAAS,CAAC;IACnE,MAAM,GAAG,GAAG,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,QAAQ,EAAE,mCAAI,EAAE,CAAC;IAE/C,SAAS,aAAT,SAAS,cAAT,SAAS,IAAT,SAAS,GAAK,EAAE,EAAC;IAEjB,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,SAAS,EAAE,GACjD,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAEtC,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACrE,MAAM,OAAO,GAAG,CAAC,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,CAAA,IAAI,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAE1E,OAAO;QACL,GAAG,kBAAkB,CAAC,gBAAgB,IAAI,GAAG,CAAC;QAC9C,QAAQ,EAAE,OAAO;QACjB,cAAc,EAAE,SAAS,CAAC,OAAO;QACjC,YAAY,EAAE,OAAO,CAAC,OAAO;QAC7B,SAAS,EAAE,QAAQ,IAAI,SAAS;QAChC,GAAG;QACH,WAAW,EAAE,UAAU,IAAI,SAAS;QACpC,aAAa,EAAE,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC;QACnD,SAAS;QACT,kBAAkB;QAClB,SAAS,EAAE,YAAY,CAAC,aAAa,CAAC,GAAG,CAAC;QAC1C,UAAU,EAAE,SAAS,IAAI,SAAS;QAClC,aAAa,EAAE,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,YAAY,mCAAI,IAAI;QACjD,UAAU,EAAE,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,SAAS;QAChE,uBAAuB,EAAE,UAAU;QACnC,cAAc,EAAE,YAAY;KAC7B,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"connect-info.js","sourceRoot":"","sources":["../src/connect-info.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6DA,sCA6CC;AAxGD,iEAAmD;AA2BnD,SAAS,kBAAkB,CAAC,IAAa;IACvC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO;YACL,YAAY,EAAE,KAAK;YACnB,SAAS,EAAE,KAAK;YAChB,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,IAAI,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;QACnC,OAAO;YACL,YAAY,EAAE,IAAI;YAClB,SAAS,EAAE,KAAK;YAChB,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,IAAI,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;QACtC,OAAO;YACL,YAAY,EAAE,KAAK;YACnB,SAAS,EAAE,IAAI;YACf,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,OAAO;QACL,YAAY,EAAE,KAAK;QACnB,SAAS,EAAE,KAAK;QAChB,YAAY,EAAE,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC;KACzC,CAAC;AACJ,CAAC;AAED,SAAwB,mBAAmB,CAAC,EAC1C,gBAAgB,EAChB,SAAS,EACT,YAAY,EACZ,gBAAgB,EAChB,YAAY,EACZ,UAAU,GAAG,SAAS,GAQvB;IACC,MAAM,SAAS,GACb,gBAAgB,EAAE,YAAY,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,SAAS,CAAC;IACnE,MAAM,GAAG,GAAG,gBAAgB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAE/C,SAAS,KAAK,EAAE,CAAC;IAEjB,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,SAAS,EAAE,GACjD,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAEtC,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACrE,MAAM,OAAO,GAAG,CAAC,CAAC,YAAY,EAAE,YAAY,IAAI,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAE1E,OAAO;QACL,GAAG,kBAAkB,CAAC,gBAAgB,IAAI,GAAG,CAAC;QAC9C,QAAQ,EAAE,OAAO;QACjB,cAAc,EAAE,SAAS,CAAC,OAAO;QACjC,YAAY,EAAE,OAAO,CAAC,OAAO;QAC7B,SAAS,EAAE,QAAQ,IAAI,SAAS;QAChC,GAAG;QACH,WAAW,EAAE,UAAU,IAAI,SAAS;QACpC,aAAa,EAAE,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC;QACnD,SAAS;QACT,kBAAkB;QAClB,SAAS,EAAE,YAAY,CAAC,aAAa,CAAC,GAAG,CAAC;QAC1C,UAAU,EAAE,SAAS,IAAI,SAAS;QAClC,aAAa,EAAE,YAAY,EAAE,YAAY,IAAI,IAAI;QACjD,UAAU,EAAE,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,SAAS;QAChE,uBAAuB,EAAE,UAAU;QACnC,cAAc,EAAE,YAAY;KAC7B,CAAC;AACJ,CAAC"}
package/lib/readable.d.ts CHANGED
@@ -14,6 +14,7 @@ export interface TopologyDescription {
14
14
  export default interface Readable {
15
15
  aggregate(database: string, collection: string, pipeline: Document[], options?: AggregateOptions & Abortable, dbOptions?: DbOptions): ServiceProviderAggregationCursor;
16
16
  aggregateDb(database: string, pipeline: Document[], options?: AggregateOptions & Abortable, dbOptions?: DbOptions): ServiceProviderAggregationCursor;
17
+ hasUnifiedAggregateOptions?(): boolean;
17
18
  count(db: string, coll: string, query?: Document, options?: CountOptions, dbOptions?: DbOptions): Promise<number>;
18
19
  countDocuments(database: string, collection: string, filter?: Document, options?: CountDocumentsOptions & Abortable, dbOptions?: DbOptions): Promise<number>;
19
20
  distinct(database: string, collection: string, fieldName: string, filter?: Document, options?: DistinctOptions, dbOptions?: DbOptions): Promise<Document>;
@@ -4,7 +4,7 @@ exports.textEncodingPolyfill = textEncodingPolyfill;
4
4
  if (typeof TextDecoder !== 'function' ||
5
5
  typeof TextEncoder !== 'function') {
6
6
  const global = (typeof globalThis === 'object' &&
7
- (globalThis === null || globalThis === void 0 ? void 0 : globalThis.Object) === Object &&
7
+ globalThis?.Object === Object &&
8
8
  globalThis) ||
9
9
  Function('return this')();
10
10
  Object.assign(global, textEncodingPolyfill());
@@ -1 +1 @@
1
- {"version":3,"file":"textencoder-polyfill.js","sourceRoot":"","sources":["../src/textencoder-polyfill.ts"],"names":[],"mappings":";;AAqCS,oDAAoB;AAjC7B,IAGE,OAAO,WAAW,KAAK,UAAU;IAGjC,OAAO,WAAW,KAAK,UAAU,EACjC,CAAC;IACD,MAAM,MAAM,GACV,CAAC,OAAO,UAAU,KAAK,QAAQ;QAC7B,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,MAAK,MAAM;QAC7B,UAAU,CAAC;QAEb,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;IAC5B,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;AAChD,CAAC;AAGD,SAAS,oBAAoB;IAC3B,MAAM,WAAW;QACf,MAAM,CAAC,MAAc;YACnB,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACrC,CAAC;KACF;IACD,MAAM,WAAW;QACf,MAAM,CAAC,KAAiB;YACtB,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAChD,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC9C,CAAC;KACF;IACD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC;AACtC,CAAC"}
1
+ {"version":3,"file":"textencoder-polyfill.js","sourceRoot":"","sources":["../src/textencoder-polyfill.ts"],"names":[],"mappings":";;AAqCS,oDAAoB;AAjC7B,IAGE,OAAO,WAAW,KAAK,UAAU;IAGjC,OAAO,WAAW,KAAK,UAAU,EACjC,CAAC;IACD,MAAM,MAAM,GACV,CAAC,OAAO,UAAU,KAAK,QAAQ;QAC7B,UAAU,EAAE,MAAM,KAAK,MAAM;QAC7B,UAAU,CAAC;QAEb,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;IAC5B,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;AAChD,CAAC;AAGD,SAAS,oBAAoB;IAC3B,MAAM,WAAW;QACf,MAAM,CAAC,MAAc;YACnB,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACrC,CAAC;KACF;IACD,MAAM,WAAW;QACf,MAAM,CAAC,KAAiB;YACtB,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAChD,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC9C,CAAC;KACF;IACD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC;AACtC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mongosh/service-provider-core",
3
- "version": "5.0.1",
3
+ "version": "5.0.3",
4
4
  "description": "MongoDB Shell Core Service Provider Package",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -36,7 +36,7 @@
36
36
  },
37
37
  "dependencies": {
38
38
  "@mongosh/errors": "2.4.6",
39
- "@mongosh/shell-bson": "3.0.1",
39
+ "@mongosh/shell-bson": "3.0.3",
40
40
  "bson": "^7.2.0",
41
41
  "mongodb": "^7.1.0",
42
42
  "mongodb-build-info": "^1.9.5",
@@ -49,5 +49,5 @@
49
49
  "eslint": "^7.25.0",
50
50
  "prettier": "^2.8.8"
51
51
  },
52
- "gitHead": "281d2607b3fab2fe6d5d5e88f7fbb051a111297d"
52
+ "gitHead": "8046da7b463930861417f6b414580823af71889f"
53
53
  }
package/src/readable.ts CHANGED
@@ -73,6 +73,13 @@ export default interface Readable {
73
73
  dbOptions?: DbOptions
74
74
  ): ServiceProviderAggregationCursor;
75
75
 
76
+ /**
77
+ * Set if options like readPrefence, readConcern, writeConcern can be
78
+ * set on AggregateOptions or need to be set as part of DbOptions.
79
+ * (True for the Node.js driver, false for the Java driver)
80
+ */
81
+ hasUnifiedAggregateOptions?(): boolean;
82
+
76
83
  /**
77
84
  * Returns the count of documents that would match a find() query for the
78
85
  * collection or view. The db.collection.count() method does not perform the