remove onDemand accessors

Author: PavelSafronov

src/bson.ts

@@ -38,32 +38,32 @@ export function parseToElementsToArray(bytes: Uint8Array, offset?: number): BSON
   return Array.isArray(res) ? res : [...res];
 }
 
-export const getInt32LE = BSON.onDemand.NumberUtils.getInt32LE;
-export const getFloat64LE = BSON.onDemand.NumberUtils.getFloat64LE;
-export const getBigInt64LE = BSON.onDemand.NumberUtils.getBigInt64LE;
-export const toUTF8 = BSON.onDemand.ByteUtils.toUTF8;
+export const getInt32LE = BSON.NumberUtils.getInt32LE;
+export const getFloat64LE = BSON.NumberUtils.getFloat64LE;
+export const getBigInt64LE = BSON.NumberUtils.getBigInt64LE;
+export const toUTF8 = BSON.ByteUtils.toUTF8;
 
 // BSON wrappers
 
 // writeInt32LE, same order of arguments as Buffer.writeInt32LE
 export const writeInt32LE = (destination: Uint8Array, value: number, offset: number) =>
-  BSON.onDemand.NumberUtils.setInt32LE(destination, offset, value);
+  BSON.NumberUtils.setInt32LE(destination, offset, value);
 
 // various wrappers that consume and return local buffer types
 
 export const fromUTF8 = (text: string) =>
-  ByteUtils.toLocalBufferType(BSON.onDemand.ByteUtils.fromUTF8(text));
+  ByteUtils.toLocalBufferType(BSON.ByteUtils.fromUTF8(text));
 export const fromBase64 = (b64: string) =>
-  ByteUtils.toLocalBufferType(BSON.onDemand.ByteUtils.fromBase64(b64));
+  ByteUtils.toLocalBufferType(BSON.ByteUtils.fromBase64(b64));
 export const fromNumberArray = (array: number[]) =>
-  ByteUtils.toLocalBufferType(BSON.onDemand.ByteUtils.fromNumberArray(array));
+  ByteUtils.toLocalBufferType(BSON.ByteUtils.fromNumberArray(array));
 export const concatBuffers = (list: Uint8Array[]) => {
-  return ByteUtils.toLocalBufferType(BSON.onDemand.ByteUtils.concat(list));
+  return ByteUtils.toLocalBufferType(BSON.ByteUtils.concat(list));
 };
 export const allocateBuffer = (size: number) =>
-  ByteUtils.toLocalBufferType(BSON.onDemand.ByteUtils.allocate(size));
+  ByteUtils.toLocalBufferType(BSON.ByteUtils.allocate(size));
 export const allocateUnsafeBuffer = (size: number) =>
-  ByteUtils.toLocalBufferType(BSON.onDemand.ByteUtils.allocateUnsafe(size));
+  ByteUtils.toLocalBufferType(BSON.ByteUtils.allocateUnsafe(size));
 
 // validates buffer inputs, used for read operations
 const validateBufferInputs = (buffer: Uint8Array, offset: number, length: number) => {

src/cmap/auth/aws4.ts

@@ -31,7 +31,7 @@ export type SignedHeaders = {
 const getHexSha256 = async (str: string): Promise<string> => {
   const data = stringToBuffer(str);
   const hashBuffer = await crypto.subtle.digest('SHA-256', data);
-  const hashHex = BSON.onDemand.ByteUtils.toHex(new Uint8Array(hashBuffer));
+  const hashHex = BSON.ByteUtils.toHex(new Uint8Array(hashBuffer));
   return hashHex;
 };
 
@@ -81,8 +81,8 @@ const convertHeaderValue = (value: string | number) => {
  * @returns Uint8Array containing the UTF-8 encoded string.
  */
 function stringToBuffer(str: string): Uint8Array {
-  const data = new Uint8Array(BSON.onDemand.ByteUtils.utf8ByteLength(str));
-  BSON.onDemand.ByteUtils.encodeUTF8Into(data, str, 0);
+  const data = new Uint8Array(BSON.ByteUtils.utf8ByteLength(str));
+  BSON.ByteUtils.encodeUTF8Into(data, str, 0);
   return data;
 }
 
@@ -189,7 +189,7 @@ export async function aws4Sign(
 
   // 5. Calculate the signature
   const signatureBuffer = await getHmacSha256(signingKey, stringToSign);
-  const signature = BSON.onDemand.ByteUtils.toHex(signatureBuffer);
+  const signature = BSON.ByteUtils.toHex(signatureBuffer);
 
   // 6. Add the signature to the request
   // Calculate the Authorization header

src/cmap/commands.ts

@@ -40,7 +40,7 @@ const QUERY_FAILURE = 2;
 const SHARD_CONFIG_STALE = 4;
 const AWAIT_CAPABLE = 8;
 
-const encodeUTF8Into = BSON.onDemand.ByteUtils.encodeUTF8Into;
+const encodeUTF8Into = BSON.ByteUtils.encodeUTF8Into;
 
 /** @internal */
 export type WriteProtocolMessageType = OpQueryRequest | OpMsgRequest;

src/cmap/connection.ts

@@ -176,7 +176,7 @@ function streamIdentifier(stream: Stream, options: ConnectionOptions): string {
     return HostAddress.fromHostPort(remoteAddress, remotePort).toString();
   }
 
-  return BSON.onDemand.ByteUtils.toHex(uuidV4());
+  return BSON.ByteUtils.toHex(uuidV4());
 }
 
 /** @internal */

src/cmap/handshake/client_metadata.ts

@@ -114,7 +114,7 @@ export async function makeClientMetadata(
   // Add app name first, it must be sent
   if (appName.length > 0) {
     const name =
-      BSON.onDemand.ByteUtils.utf8ByteLength(appName) <= 128
+      BSON.ByteUtils.utf8ByteLength(appName) <= 128
         ? appName
         : toUTF8(fromUTF8(appName), 0, 128, false);
     metadataDocument.ifItFitsItSits('application', { name });