fixup: remove wrappable flag, skip async iter support for now, use fn instead of class

Author: addaleax

packages/java-shell/src/main/kotlin/com/mongodb/mongosh/service/JavaServiceProvider.kt

@@ -22,10 +22,6 @@ internal class JavaServiceProvider(private var client: MongoClient?,
     @HostAccess.Export
     val platform = "JavaShell"
 
-    @JvmField
-    @HostAccess.Export
-    val deepInspectWrappable = false
-
     @HostAccess.Export
     override fun runCommand(database: String, spec: Value): Value = promise {
         getDatabase(database, null).map { db ->

packages/java-shell/src/test/resources/collection/insertOne.expected.1.txt

@@ -0,0 +1,12 @@
+{ "acknowledged": true, "insertedId": <ObjectID> }
+true
+[ { "_id": <ObjectID>, "a": 1, "objectId": <ObjectID>, "maxKey": {"$maxKey": 1}, "minKey": {"$minKey": 1}, "binData": {"$binary": {"base64": "MTIzNA==", "subType": "10"}}, "date": {"$date": {"$numberLong": "1355875200000"}}, "isoDate": {"$date": {"$numberLong": "1355875200000"}}, "numberInt": 24, "timestamp": {"$timestamp": {"t": 100, "i": 0}}, "undefined": null, "null": null, "uuid": <UUID> } ]
+{ "acknowledged": true, "insertedId": null }
+{ "acknowledged": true, "insertedId": {"$date": {"$numberLong": "1355875200000"}} }
+{ "acknowledged": true, "insertedId": <UUID> }
+{ "acknowledged": true, "insertedId": {"$maxKey": 1} }
+{ "acknowledged": true, "insertedId": 24 }
+{ "acknowledged": true, "insertedId": true }
+{ "acknowledged": true, "insertedId": "string key" }
+{ "acknowledged": true, "insertedId": {"$binary": {"base64": "MTIzNA==", "subType": "10"}} }
+{ "acknowledged": true, "insertedId": { "document": "key" } }

packages/service-provider-core/src/cursors.ts

@@ -15,7 +15,7 @@ export interface ServiceProviderBaseCursor<TSchema = Document> {
   next(): Promise<TSchema | null>;
   tryNext(): Promise<TSchema | null>;
   readonly closed: boolean;
-  [Symbol.asyncIterator](): AsyncGenerator<TSchema, void, void>;
+  [Symbol.asyncIterator]?(): AsyncGenerator<TSchema, void, void>;
 }
 
 export interface ServiceProviderAbstractCursor<TSchema = Document>

packages/service-provider-core/src/service-provider.ts

@@ -13,13 +13,10 @@ export default interface ServiceProvider
   extends Readable,
     Writable,
     Closable,
-    Admin {
-  deepInspectWrappable: boolean;
-}
+    Admin {}
 
 export class ServiceProviderCore {
   public bsonLibrary: BSON;
-  public deepInspectWrappable = true;
   constructor(bsonLibrary?: BSON) {
     if (bsonLibrary === undefined) {
       throw new MongoshInternalError('BSON Library is undefined.');

packages/shell-api/src/abstract-cursor.ts

@@ -76,11 +76,9 @@ export abstract class BaseCursor<
   }
 
   async *[Symbol.asyncIterator]() {
-    if (
-      this._cursor[Symbol.asyncIterator] &&
-      this._canDelegateIterationToUnderlyingCursor()
-    ) {
-      yield* this._cursor;
+    const baseIterator = this._cursor[Symbol.asyncIterator];
+    if (baseIterator && this._canDelegateIterationToUnderlyingCursor()) {
+      yield* baseIterator.call(this._cursor);
       return;
     }
 

packages/shell-api/src/custom-inspect.ts

@@ -24,12 +24,16 @@ function customDocumentInspect(
 
 function addInspectSymbol(obj: any) {
   if (!(obj as any)[customInspectSymbol]) {
-    Object.defineProperty(obj, customInspectSymbol, {
-      value: customDocumentInspect,
-      enumerable: false,
-      writable: true,
-      configurable: true,
-    });
+    try {
+      Object.defineProperty(obj, customInspectSymbol, {
+        value: customDocumentInspect,
+        enumerable: false,
+        writable: true,
+        configurable: true,
+      });
+    } catch {
+      // Ignore, if the object is non-extensible we cannot do much about that
+    }
   }
 }
 

packages/shell-api/src/deep-inspect-aggregation-cursor-wrapper.ts

@@ -47,10 +47,10 @@ export class DeepInspectAggregationCursorWrapper<TSchema = Document>
     return this._cursor.closed;
   }
 
-  async *[Symbol.asyncIterator]() {
+  /*async *[Symbol.asyncIterator]() {
     yield* this._cursor;
     return;
-  }
+  }*/
 }
 
 function forwardResultPromise<

packages/shell-api/src/deep-inspect-change-stream-wrapper.ts

@@ -29,10 +29,10 @@ export class DeepInspectChangeStreamWrapper<TSchema = Document>
     return this._cursor.closed;
   }
 
-  async *[Symbol.asyncIterator]() {
+  /*async *[Symbol.asyncIterator]() {
     yield* this._cursor;
     return;
-  }
+  }*/
 }
 
 function forwardResultPromise<

packages/shell-api/src/deep-inspect-find-cursor-wrapper.ts

@@ -61,10 +61,10 @@ export class DeepInspectFindCursorWrapper<TSchema = Document>
     return this._cursor.closed;
   }
 
-  async *[Symbol.asyncIterator]() {
+  /*async *[Symbol.asyncIterator]() {
     yield* this._cursor;
     return;
-  }
+  }*/
 }
 
 function forwardResultPromise<

packages/shell-api/src/deep-inspect-run-command-cursor-wrapper.ts

@@ -32,10 +32,10 @@ export class DeepInspectRunCommandCursorWrapper<TSchema = Document>
     return this._cursor.closed;
   }
 
-  async *[Symbol.asyncIterator]() {
+  /*async *[Symbol.asyncIterator]() {
     yield* this._cursor;
     return;
-  }
+  }*/
 }
 
 function forwardResultPromise<