@mongosh/node-runtime-worker-thread 3.3.30 → 3.3.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongosh/node-runtime-worker-thread",
-  "version": "3.3.30",
+  "version": "3.3.33",
   "description": "MongoDB shell runtime that lives in a worker thread",
   "homepage": "https://github.com/mongodb-js/mongosh",
   "license": "Apache-2.0",
@@ -17,7 +17,7 @@
     "node": ">=14.15.1"
   },
   "scripts": {
-    "test": "mocha -r \"../../scripts/import-expansions.js\" -r \"./tests/register-worker.js \" --timeout 15000 -r ts-node/register --reporter \"../../configs/mocha-config-mongosh/reporter.ts\" \"./src/**/*.spec.ts\"",
+    "test": "mocha",
     "pretest-ci": "node ../../scripts/run-if-package-requested.js npm run webpack-build -- --no-stats --no-devtool",
     "test-ci": "node ../../scripts/run-if-package-requested.js npm test",
     "test-coverage": "nyc --no-clean --cwd ../.. --reporter=none npm run test",
@@ -40,11 +40,11 @@
     "@mongodb-js/prettier-config-devtools": "^1.0.1",
     "@mongodb-js/sbom-tools": "^0.8.1",
     "@mongodb-js/tsconfig-mongosh": "^1.0.0",
-    "@mongosh/browser-runtime-core": "^3.26.2",
-    "@mongosh/browser-runtime-electron": "^3.26.2",
-    "@mongosh/service-provider-core": "3.6.3",
-    "@mongosh/service-provider-node-driver": "^3.17.5",
-    "@mongosh/types": "^3.14.0",
+    "@mongosh/browser-runtime-core": "^3.29.0",
+    "@mongosh/browser-runtime-electron": "^3.29.0",
+    "@mongosh/service-provider-core": "3.7.0",
+    "@mongosh/service-provider-node-driver": "^3.18.0",
+    "@mongosh/types": "^3.14.1",
     "bson": "^6.10.4",
     "depcheck": "^1.4.7",
     "eslint": "^7.25.0",
@@ -58,5 +58,5 @@
     "system-ca": "^2.0.1",
     "web-worker": "^1.3.0"
   },
-  "gitHead": "8e8f9d1a0486078c4ca75fc7a81535eba535f535"
+  "gitHead": "d2069810a846a535c51c88929224a57e49960778"
 }

package/src/index.spec.ts

@@ -1,4 +1,5 @@
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 import type { MongoshBus } from '@mongosh/types';

package/src/rpc.ts

@@ -8,25 +8,18 @@ export type RPCMessageBus = {
   removeEventListener: Function;
 };
 
-enum RPCMessageTypes {
-  Message,
-  Error,
-}
-
 type RPCMessage = {
-  type: RPCMessageTypes.Message;
+  type: 'Message';
   payload: string;
 };
 
 type RPCError = {
-  type: RPCMessageTypes.Error;
+  type: 'Error';
   payload: Error;
 };
 
 function isRPCError(data: any): data is RPCError {
-  return (
-    data && typeof data === 'object' && data.type === RPCMessageTypes.Error
-  );
+  return data && typeof data === 'object' && data.type === 'Error';
 }
 
 function getRPCOptions(messageBus: RPCMessageBus): PostmsgRpcOptions {
@@ -59,13 +52,13 @@ export function exposeAll<O extends object>(
       key,
       async (...args: unknown[]) => {
         try {
-          return { type: RPCMessageTypes.Message, payload: await val(...args) };
+          return { type: 'Message', payload: await val(...args) };
         } catch (e: any) {
           // If server (whatever is executing the exposed method) throws during
           // the execution, we want to propagate error to the client (whatever
           // issued the call) and re-throw there. We will do this with a special
           // return type.
-          return { type: RPCMessageTypes.Error, payload: serializeError(e) };
+          return { type: 'Error', payload: serializeError(e) };
         }
       },
       getRPCOptions(messageBus)

package/src/serializer.spec.ts

@@ -6,7 +6,6 @@ import {
   deserializeError,
   serializeEvaluationResult,
   deserializeEvaluationResult,
-  SerializedResultTypes,
   serializeConnectOptions,
   deserializeConnectOptions,
 } from './serializer';
@@ -50,10 +49,7 @@ describe('serializer', function () {
         printable: new SyntaxError('Ooops!'),
       });
 
-      expect(serialized).to.have.property(
-        'type',
-        SerializedResultTypes.SerializedErrorResult
-      );
+      expect(serialized).to.have.property('type', 'SerializedErrorResult');
       expect(serialized).to.have.property('printable').not.instanceof(Error);
       expect(serialized).to.have.nested.property(
         'printable.name',
@@ -68,10 +64,7 @@ describe('serializer', function () {
         printable: function abc() {},
       });
 
-      expect(serialized).to.have.property(
-        'type',
-        SerializedResultTypes.InspectResult
-      );
+      expect(serialized).to.have.property('type', 'InspectResult');
       expect(serialized).to.have.property('printable', '[Function: abc]');
     });
 
@@ -81,10 +74,7 @@ describe('serializer', function () {
         printable: { foo: 'bar' },
       });
 
-      expect(serialized).to.have.property(
-        'type',
-        SerializedResultTypes.SerializedShellApiResult
-      );
+      expect(serialized).to.have.property('type', 'SerializedShellApiResult');
       expect(serialized).to.have.nested.property(
         'printable.origType',
         'TotallyRealShellApiType'
@@ -100,7 +90,7 @@ describe('serializer', function () {
   describe('deserializeEvaluationResult', function () {
     it('should deserialize SerializedErrorResult', function () {
       const deserialized = deserializeEvaluationResult({
-        type: SerializedResultTypes.SerializedErrorResult,
+        type: 'SerializedErrorResult',
         printable: { name: 'TypeError', message: 'Uh-oh' },
       });
 
@@ -117,7 +107,7 @@ describe('serializer', function () {
 
     it('should deserialize SerializedShellApiResult', function () {
       const deserialized = deserializeEvaluationResult({
-        type: SerializedResultTypes.SerializedShellApiResult,
+        type: 'SerializedShellApiResult',
         printable: {
           origType: 'ShellApiResult',
           serializedValue: { foo: 'bar' },

package/src/serializer.ts

@@ -44,11 +44,10 @@ export function deserializeError(err: any): Error {
   return Object.assign(new Error(), err);
 }
 
-export enum SerializedResultTypes {
-  SerializedErrorResult = 'SerializedErrorResult',
-  InspectResult = 'InspectResult',
-  SerializedShellApiResult = 'SerializedShellApiResult',
-}
+export type SerializedResultTypes =
+  | 'SerializedErrorResult'
+  | 'InspectResult'
+  | 'SerializedShellApiResult';
 
 export function serializeEvaluationResult({
   type,
@@ -63,7 +62,7 @@ export function serializeEvaluationResult({
   // Errors are serialized as some error metadata can be lost without this
   if (isError(printable)) {
     return {
-      type: SerializedResultTypes.SerializedErrorResult,
+      type: 'SerializedErrorResult',
       printable: serializeError(printable),
       source,
     };
@@ -77,7 +76,7 @@ export function serializeEvaluationResult({
   // before passing to the main thread
   if (type === null) {
     return {
-      type: SerializedResultTypes.InspectResult,
+      type: 'InspectResult',
       printable: inspect(printable),
       source,
     };
@@ -87,7 +86,7 @@ export function serializeEvaluationResult({
   // to preserve as much information as possible, including serializing the
   // printable value to EJSON as its a common thing to be returned by shell-api
   return {
-    type: SerializedResultTypes.SerializedShellApiResult,
+    type: 'SerializedShellApiResult',
     printable: {
       origType: type,
       serializedValue: EJSON.serialize(printable),
@@ -100,11 +99,11 @@ export function deserializeEvaluationResult({
   printable,
   source,
 }: RuntimeEvaluationResult): RuntimeEvaluationResult {
-  if (type === SerializedResultTypes.SerializedErrorResult) {
+  if (type === 'SerializedErrorResult') {
     return { type, printable: deserializeError(printable), source };
   }
 
-  if (type === SerializedResultTypes.SerializedShellApiResult) {
+  if (type === 'SerializedShellApiResult') {
     return {
       type: printable.origType,
       printable: EJSON.deserialize(printable.serializedValue),

package/src/worker-runtime.spec.ts

@@ -1,7 +1,8 @@
 import path from 'path';
 import { once } from 'events';
 import Worker from 'web-worker';
-import chai, { expect } from 'chai';
+import * as chai from 'chai';
+import { expect } from 'chai';
 import sinonChai from 'sinon-chai';
 import sinon from 'sinon';
 import { EJSON, ObjectId } from 'bson';

package/webpack.config.js

@@ -20,11 +20,17 @@ const config = {
   plugins: [webpackDependenciesPlugin],
   externals: {
     'mongodb-client-encryption': 'commonjs2 mongodb-client-encryption',
+    'mongodb-client-encryption/package.json':
+      'commonjs2 mongodb-client-encryption/package.json',
     kerberos: 'commonjs2 kerberos',
+    'kerberos/package.json': 'commonjs2 kerberos/package.json',
     snappy: 'commonjs2 snappy',
     interruptor: 'commonjs2 interruptor',
     'os-dns-native': 'commonjs2 os-dns-native',
     'system-ca': 'commonjs2 system-ca',
+    // TODO(MONGOSH-3055): This is a temporary workaround.
+    // @aws-sdk/client-sts is an optional peer dependency of @aws-sdk/credential-providers
+    '@aws-sdk/client-sts': 'commonjs2 @aws-sdk/client-sts',
   },
 };