refactor: use util.inspect with passed options

Author: gagik

packages/browser-repl/src/components/utils/inspect.ts

@@ -1,3 +1,4 @@
+import type { CustomInspectFunction } from 'util';
 import { inspect as utilInspect } from 'util';
 import { bsonStringifiers } from '@mongosh/service-provider-core';
 
@@ -14,18 +15,16 @@ import { bsonStringifiers } from '@mongosh/service-provider-core';
 const customInspect = utilInspect.custom || 'inspect';
 const visitedObjects = new WeakSet();
 
-function tryAddInspect(
-  obj: any,
-  stringifier: (this: any, depth: any, options: any) => string
-): void {
+function tryAddInspect(obj: unknown, stringifier: CustomInspectFunction): void {
   try {
     Object.defineProperty(obj, customInspect, {
       writable: true,
       configurable: true,
       enumerable: false,
-      value: function (...args: [any, any]) {
+      value: function (...args: Parameters<CustomInspectFunction>): string {
         try {
           return stringifier.call(this, ...args);
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
         } catch (err: any) {
           // eslint-disable-next-line no-console
           console.warn('Could not inspect bson object', { obj: this, err });

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

@@ -1,4 +1,5 @@
 import { bson as BSON } from './bson-export';
+import type { InspectOptionsStylized, CustomInspectFunction } from 'util';
 import { inspect as utilInspect } from 'util';
 const inspectCustom = Symbol.for('nodejs.util.inspect.custom');
 type BSONClassKey = (typeof BSON)[Exclude<
@@ -8,26 +9,70 @@ type BSONClassKey = (typeof BSON)[Exclude<
 
 // Turn e.g. 'new Double(...)' into 'Double(...)' but preserve possible leading whitespace
 function removeNewFromInspectResult(str: string): string {
-  return String(str).replace(/^(\s*)(new )/, '$1');
+  return str.replace(/^(\s*)(new )/, '$1');
+}
+
+/** Typed array such as Int8Array have a format like 'Int8Array(3) [1, 2, 3]'
+ *  and we want to remove the prefix and keep just the array contents. */
+function removeTypedArrayPrefixFromInspectResult(str: string): string {
+  return str.replace(/^\s*\S+\s*\(\d+\)\s*/, '');
 }
 
 // Create a Node.js-util-inspect() style custom inspect function that
 // strips 'new ' from inspect results but otherwise uses the Node.js
 // driver's bson library's inspect functions.
-function makeClasslessInspect<K extends BSONClassKey>(className: K) {
+function makeClasslessInspect<K extends BSONClassKey>(
+  className: K
+): CustomInspectFunction {
   const originalInspect = BSON[className].prototype.inspect;
   return function (
-    this: (typeof BSON)[typeof className]['prototype'],
-    ...args: any
+    this: typeof originalInspect,
+    ...args: Parameters<typeof originalInspect>
   ) {
     return removeNewFromInspectResult(originalInspect.apply(this, args));
-  };
+  } as CustomInspectFunction;
 }
 
 const binaryInspect = makeClasslessInspect('Binary');
+
+const binaryVectorInspect = function (
+  this: typeof BSON.Binary.prototype,
+  depth: number,
+  options: InspectOptionsStylized
+): string {
+  switch (this.buffer[0]) {
+    case BSON.Binary.VECTOR_TYPE.Int8:
+      return `Binary.fromInt8Array(new Int8Array(${removeTypedArrayPrefixFromInspectResult(
+        utilInspect(this.toInt8Array(), {
+          depth,
+          ...options,
+          ...utilInspect.defaultOptions,
+        })
+      )})`;
+    case BSON.Binary.VECTOR_TYPE.Float32:
+      return `Binary.fromFloat32Array(new Float32Array(${removeTypedArrayPrefixFromInspectResult(
+        utilInspect(this.toFloat32Array(), {
+          depth,
+          ...options,
+          ...utilInspect.defaultOptions,
+        })
+      )})`;
+    case BSON.Binary.VECTOR_TYPE.PackedBit:
+      return `Binary.fromPackedBitArray(new Uint8Array(${removeTypedArrayPrefixFromInspectResult(
+        utilInspect(this.toPackedBits(), {
+          depth,
+          ...options,
+          ...utilInspect.defaultOptions,
+        })
+      )})`;
+    default:
+      return binaryInspect.call(this, depth, options);
+  }
+} satisfies CustomInspectFunction;
+
 export const bsonStringifiers: Record<
   BSONClassKey | 'ObjectID',
-  (this: any, depth: any, options: any) => string
+  CustomInspectFunction
 > = {
   ObjectId: makeClasslessInspect('ObjectId'),
   ObjectID: makeClasslessInspect('ObjectId'),
@@ -44,38 +89,13 @@ export const bsonStringifiers: Record<
   BSONRegExp: makeClasslessInspect('BSONRegExp'),
   Binary: function (
     this: typeof BSON.Binary.prototype,
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    ...args: any[]
+    ...args: Parameters<CustomInspectFunction>
   ): string {
     const hexString = this.toString('hex');
+
     switch (this.sub_type) {
       case BSON.Binary.SUBTYPE_VECTOR:
-        switch (this.buffer[0]) {
-          case BSON.Binary.VECTOR_TYPE.Int8:
-            return `Int8(${utilInspect(
-              Array.from(this.toInt8Array()),
-              // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-              ...args
-            )})`;
-          case BSON.Binary.VECTOR_TYPE.Float32:
-            return `Float32(${utilInspect(
-              Array.from(this.toFloat32Array()),
-              // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-              ...args
-            )})`;
-          case BSON.Binary.VECTOR_TYPE.PackedBit:
-            return `PackedBit(${utilInspect(
-              hexString,
-              // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-              ...args
-            )})`;
-          default:
-            return `Vector(${utilInspect(
-              hexString,
-              // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-              ...args
-            )})`;
-        }
+        return binaryVectorInspect.apply(this, args);
       case BSON.Binary.SUBTYPE_MD5:
         return `MD5('${hexString}')`;
       case BSON.Binary.SUBTYPE_UUID:
@@ -93,7 +113,7 @@ export const bsonStringifiers: Record<
       default:
         return binaryInspect.apply(this, args);
     }
-  },
+  } satisfies CustomInspectFunction,
 };
 
 /**