bson 4.7.0 → 5.0.0-alpha.1

package/src/long.ts

@@ -1,5 +1,5 @@
+import { BSON_MAJOR_VERSION } from './constants';
 import type { EJSONOptions } from './extended_json';
-import { isObjectLike } from './parser/utils';
 import type { Timestamp } from './timestamp';
 
 interface LongWASMHelpers {
@@ -100,10 +100,18 @@ export interface LongExtended {
  * Common constant values ZERO, ONE, NEG_ONE, etc. are found as static properties on this class.
  */
 export class Long {
-  _bsontype!: 'Long';
+  get _bsontype(): 'Long' {
+    return 'Long';
+  }
+  /** @internal */
+  get [Symbol.for('@@mdb.bson.version')](): BSON_MAJOR_VERSION {
+    return BSON_MAJOR_VERSION;
+  }
 
   /** An indicator used to reliably determine if an object is a Long or not. */
-  __isLong__!: true;
+  get __isLong__(): boolean {
+    return true;
+  }
 
   /**
    * The high 32 bits as a signed value.
@@ -134,8 +142,6 @@ export class Long {
    * @param unsigned - Whether unsigned or not, defaults to signed
    */
   constructor(low: number | bigint | string = 0, high?: number | boolean, unsigned?: boolean) {
-    if (!(this instanceof Long)) return new Long(low, high, unsigned);
-
     if (typeof low === 'bigint') {
       Object.assign(this, Long.fromBigInt(low, !!high));
     } else if (typeof low === 'string') {
@@ -145,13 +151,6 @@ export class Long {
       this.high = (high as number) | 0;
       this.unsigned = !!unsigned;
     }
-
-    Object.defineProperty(this, '__isLong__', {
-      value: true,
-      configurable: false,
-      writable: false,
-      enumerable: false
-    });
   }
 
   static TWO_PWR_24 = Long.fromInt(TWO_PWR_24_DBL);
@@ -332,7 +331,12 @@ export class Long {
    * Tests if the specified object is a Long.
    */
   static isLong(value: unknown): value is Long {
-    return isObjectLike(value) && value['__isLong__'] === true;
+    return (
+      value != null &&
+      typeof value === 'object' &&
+      '__isLong__' in value &&
+      value.__isLong__ === true
+    );
   }
 
   /**
@@ -1035,6 +1039,3 @@ export class Long {
     return `new Long("${this.toString()}"${this.unsigned ? ', true' : ''})`;
   }
 }
-
-Object.defineProperty(Long.prototype, '__isLong__', { value: true });
-Object.defineProperty(Long.prototype, '_bsontype', { value: 'Long' });

package/src/max_key.ts

@@ -1,3 +1,5 @@
+import { BSON_MAJOR_VERSION } from './constants';
+
 /** @public */
 export interface MaxKeyExtended {
   $maxKey: 1;
@@ -9,10 +11,12 @@ export interface MaxKeyExtended {
  * @category BSONType
  */
 export class MaxKey {
-  _bsontype!: 'MaxKey';
-
-  constructor() {
-    if (!(this instanceof MaxKey)) return new MaxKey();
+  get _bsontype(): 'MaxKey' {
+    return 'MaxKey';
+  }
+  /** @internal */
+  get [Symbol.for('@@mdb.bson.version')](): BSON_MAJOR_VERSION {
+    return BSON_MAJOR_VERSION;
   }
 
   /** @internal */
@@ -34,5 +38,3 @@ export class MaxKey {
     return 'new MaxKey()';
   }
 }
-
-Object.defineProperty(MaxKey.prototype, '_bsontype', { value: 'MaxKey' });

package/src/min_key.ts

@@ -1,3 +1,5 @@
+import { BSON_MAJOR_VERSION } from './constants';
+
 /** @public */
 export interface MinKeyExtended {
   $minKey: 1;
@@ -9,10 +11,12 @@ export interface MinKeyExtended {
  * @category BSONType
  */
 export class MinKey {
-  _bsontype!: 'MinKey';
-
-  constructor() {
-    if (!(this instanceof MinKey)) return new MinKey();
+  get _bsontype(): 'MinKey' {
+    return 'MinKey';
+  }
+  /** @internal */
+  get [Symbol.for('@@mdb.bson.version')](): BSON_MAJOR_VERSION {
+    return BSON_MAJOR_VERSION;
   }
 
   /** @internal */
@@ -34,5 +38,3 @@ export class MinKey {
     return 'new MinKey()';
   }
 }
-
-Object.defineProperty(MinKey.prototype, '_bsontype', { value: 'MinKey' });

package/src/objectid.ts

@@ -1,7 +1,7 @@
-import { Buffer } from 'buffer';
-import { ensureBuffer } from './ensure_buffer';
+import { BSON_MAJOR_VERSION } from './constants';
 import { BSONTypeError } from './error';
-import { deprecate, isUint8Array, randomBytes } from './parser/utils';
+import { isUint8Array } from './parser/utils';
+import { BSONDataView, ByteUtils } from './utils/byte_utils';
 
 // Regular expression that checks for hex value
 const checkForHexRegExp = new RegExp('^[0-9a-fA-F]{24}$');
@@ -11,7 +11,7 @@ let PROCESS_UNIQUE: Uint8Array | null = null;
 
 /** @public */
 export interface ObjectIdLike {
-  id: string | Buffer;
+  id: string | Uint8Array;
   __id?: string;
   toHexString(): string;
 }
@@ -29,15 +29,21 @@ const kId = Symbol('id');
  * @category BSONType
  */
 export class ObjectId {
-  _bsontype!: 'ObjectID';
+  get _bsontype(): 'ObjectId' {
+    return 'ObjectId';
+  }
+  /** @internal */
+  get [Symbol.for('@@mdb.bson.version')](): BSON_MAJOR_VERSION {
+    return BSON_MAJOR_VERSION;
+  }
 
   /** @internal */
-  static index = Math.floor(Math.random() * 0xffffff);
+  private static index = Math.floor(Math.random() * 0xffffff);
 
   static cacheHexString: boolean;
 
   /** ObjectId Bytes @internal */
-  private [kId]!: Buffer;
+  private [kId]!: Uint8Array;
   /** ObjectId hexString cache @internal */
   private __id?: string;
 
@@ -46,9 +52,7 @@ export class ObjectId {
    *
    * @param inputId - Can be a 24 character hex string, 12 byte binary Buffer, or a number.
    */
-  constructor(inputId?: string | number | ObjectId | ObjectIdLike | Buffer | Uint8Array) {
-    if (!(this instanceof ObjectId)) return new ObjectId(inputId);
-
+  constructor(inputId?: string | number | ObjectId | ObjectIdLike | Uint8Array) {
     // workingId is set based on type of input and whether valid id exists for the input
     let workingId;
     if (typeof inputId === 'object' && inputId && 'id' in inputId) {
@@ -58,7 +62,7 @@ export class ObjectId {
         );
       }
       if ('toHexString' in inputId && typeof inputId.toHexString === 'function') {
-        workingId = Buffer.from(inputId.toHexString(), 'hex');
+        workingId = ByteUtils.fromHex(inputId.toHexString());
       } else {
         workingId = inputId.id;
       }
@@ -73,17 +77,18 @@ export class ObjectId {
       this[kId] = ObjectId.generate(typeof workingId === 'number' ? workingId : undefined);
     } else if (ArrayBuffer.isView(workingId) && workingId.byteLength === 12) {
       // If intstanceof matches we can escape calling ensure buffer in Node.js environments
-      this[kId] = workingId instanceof Buffer ? workingId : ensureBuffer(workingId);
+      this[kId] = ByteUtils.toLocalBufferType(workingId);
     } else if (typeof workingId === 'string') {
       if (workingId.length === 12) {
-        const bytes = Buffer.from(workingId);
+        // TODO(NODE-4361): Remove string of length 12 support
+        const bytes = ByteUtils.fromUTF8(workingId);
         if (bytes.byteLength === 12) {
           this[kId] = bytes;
         } else {
           throw new BSONTypeError('Argument passed in must be a string of 12 bytes');
         }
       } else if (workingId.length === 24 && checkForHexRegExp.test(workingId)) {
-        this[kId] = Buffer.from(workingId, 'hex');
+        this[kId] = ByteUtils.fromHex(workingId);
       } else {
         throw new BSONTypeError(
           'Argument passed in must be a string of 12 bytes or a string of 24 hex characters or an integer'
@@ -94,7 +99,7 @@ export class ObjectId {
     }
     // If we are caching the hex string
     if (ObjectId.cacheHexString) {
-      this.__id = this.id.toString('hex');
+      this.__id = ByteUtils.toHex(this.id);
     }
   }
 
@@ -102,37 +107,24 @@ export class ObjectId {
    * The ObjectId bytes
    * @readonly
    */
-  get id(): Buffer {
+  get id(): Uint8Array {
     return this[kId];
   }
 
-  set id(value: Buffer) {
+  set id(value: Uint8Array) {
     this[kId] = value;
     if (ObjectId.cacheHexString) {
-      this.__id = value.toString('hex');
+      this.__id = ByteUtils.toHex(value);
     }
   }
 
-  /**
-   * The generation time of this ObjectId instance
-   * @deprecated Please use getTimestamp / createFromTime which returns an int32 epoch
-   */
-  get generationTime(): number {
-    return this.id.readInt32BE(0);
-  }
-
-  set generationTime(value: number) {
-    // Encode time into first 4 bytes
-    this.id.writeUInt32BE(value, 0);
-  }
-
   /** Returns the ObjectId id as a 24 character hex string representation */
   toHexString(): string {
     if (ObjectId.cacheHexString && this.__id) {
       return this.__id;
     }
 
-    const hexString = this.id.toString('hex');
+    const hexString = ByteUtils.toHex(this.id);
 
     if (ObjectId.cacheHexString && !this.__id) {
       this.__id = hexString;
@@ -143,11 +135,9 @@ export class ObjectId {
 
   /**
    * Update the ObjectId index
-   * @privateRemarks
-   * Used in generating new ObjectId's on the driver
    * @internal
    */
-  static getInc(): number {
+  private static getInc(): number {
     return (ObjectId.index = (ObjectId.index + 1) % 0xffffff);
   }
 
@@ -156,20 +146,20 @@ export class ObjectId {
    *
    * @param time - pass in a second based timestamp.
    */
-  static generate(time?: number): Buffer {
+  static generate(time?: number): Uint8Array {
     if ('number' !== typeof time) {
       time = Math.floor(Date.now() / 1000);
     }
 
     const inc = ObjectId.getInc();
-    const buffer = Buffer.alloc(12);
+    const buffer = ByteUtils.allocate(12);
 
     // 4-byte timestamp
-    buffer.writeUInt32BE(time, 0);
+    BSONDataView.fromUint8Array(buffer).setUint32(0, time, false);
 
     // set PROCESS_UNIQUE if yet not initialized
     if (PROCESS_UNIQUE === null) {
-      PROCESS_UNIQUE = randomBytes(5);
+      PROCESS_UNIQUE = ByteUtils.randomBytes(5);
     }
 
     // 5-byte process unique
@@ -188,13 +178,13 @@ export class ObjectId {
   }
 
   /**
-   * Converts the id into a 24 character hex string for printing
-   *
-   * @param format - The Buffer toString format parameter.
+   * Converts the id into a 24 character hex string for printing, unless encoding is provided.
+   * @param encoding - hex or base64
    */
-  toString(format?: string): string {
+  toString(encoding?: 'hex' | 'base64'): string {
     // Is the id a buffer then use the buffer toString method to return the format
-    if (format) return this.id.toString(format);
+    if (encoding === 'base64') return ByteUtils.toBase64(this.id);
+    if (encoding === 'hex') return this.toHexString();
     return this.toHexString();
   }
 
@@ -214,7 +204,7 @@ export class ObjectId {
     }
 
     if (otherId instanceof ObjectId) {
-      return this[kId][11] === otherId[kId][11] && this[kId].equals(otherId[kId]);
+      return this[kId][11] === otherId[kId][11] && ByteUtils.equals(this[kId], otherId[kId]);
     }
 
     if (
@@ -223,7 +213,7 @@ export class ObjectId {
       otherId.length === 12 &&
       isUint8Array(this.id)
     ) {
-      return otherId === Buffer.prototype.toString.call(this.id, 'latin1');
+      return ByteUtils.equals(this.id, ByteUtils.fromISO88591(otherId));
     }
 
     if (typeof otherId === 'string' && ObjectId.isValid(otherId) && otherId.length === 24) {
@@ -231,7 +221,7 @@ export class ObjectId {
     }
 
     if (typeof otherId === 'string' && ObjectId.isValid(otherId) && otherId.length === 12) {
-      return Buffer.from(otherId).equals(this.id);
+      return ByteUtils.equals(ByteUtils.fromUTF8(otherId), this.id);
     }
 
     if (
@@ -250,7 +240,7 @@ export class ObjectId {
   /** Returns the generation date (accurate up to the second) that this ID was generated. */
   getTimestamp(): Date {
     const timestamp = new Date();
-    const time = this.id.readUInt32BE(0);
+    const time = BSONDataView.fromUint8Array(this.id).getUint32(0, false);
     timestamp.setTime(Math.floor(time) * 1000);
     return timestamp;
   }
@@ -266,9 +256,9 @@ export class ObjectId {
    * @param time - an integer number representing a number of seconds.
    */
   static createFromTime(time: number): ObjectId {
-    const buffer = Buffer.from([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+    const buffer = ByteUtils.fromNumberArray([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
     // Encode time into first 4 bytes
-    buffer.writeUInt32BE(time, 0);
+    BSONDataView.fromUint8Array(buffer).setUint32(0, time, false);
     // Return the new objectId
     return new ObjectId(buffer);
   }
@@ -286,7 +276,7 @@ export class ObjectId {
       );
     }
 
-    return new ObjectId(Buffer.from(hexString, 'hex'));
+    return new ObjectId(ByteUtils.fromHex(hexString));
   }
 
   /**
@@ -294,7 +284,7 @@ export class ObjectId {
    *
    * @param id - ObjectId instance to validate.
    */
-  static isValid(id: string | number | ObjectId | ObjectIdLike | Buffer | Uint8Array): boolean {
+  static isValid(id: string | number | ObjectId | ObjectIdLike | Uint8Array): boolean {
     if (id == null) return false;
 
     try {
@@ -330,25 +320,3 @@ export class ObjectId {
     return `new ObjectId("${this.toHexString()}")`;
   }
 }
-
-// Deprecated methods
-Object.defineProperty(ObjectId.prototype, 'generate', {
-  value: deprecate(
-    (time: number) => ObjectId.generate(time),
-    'Please use the static `ObjectId.generate(time)` instead'
-  )
-});
-
-Object.defineProperty(ObjectId.prototype, 'getInc', {
-  value: deprecate(() => ObjectId.getInc(), 'Please use the static `ObjectId.getInc()` instead')
-});
-
-Object.defineProperty(ObjectId.prototype, 'get_inc', {
-  value: deprecate(() => ObjectId.getInc(), 'Please use the static `ObjectId.getInc()` instead')
-});
-
-Object.defineProperty(ObjectId, 'get_inc', {
-  value: deprecate(() => ObjectId.getInc(), 'Please use the static `ObjectId.getInc()` instead')
-});
-
-Object.defineProperty(ObjectId.prototype, '_bsontype', { value: 'ObjectID' });

package/src/parser/calculate_size.ts

@@ -1,10 +1,10 @@
-import { Buffer } from 'buffer';
 import { Binary } from '../binary';
 import type { Document } from '../bson';
 import * as constants from '../constants';
-import { isAnyArrayBuffer, isDate, isRegExp, normalizedFunctionString } from './utils';
+import { ByteUtils } from '../utils/byte_utils';
+import { isAnyArrayBuffer, isDate, isRegExp } from './utils';
 
-export function calculateObjectSize(
+export function internalCalculateObjectSize(
   object: Document,
   serializeFunctions?: boolean,
   ignoreUndefined?: boolean
@@ -29,7 +29,7 @@ export function calculateObjectSize(
     }
 
     // Calculate size
-    for (const key in object) {
+    for (const key of Object.keys(object)) {
       totalLength += calculateElement(key, object[key], serializeFunctions, false, ignoreUndefined);
     }
   }
@@ -53,7 +53,7 @@ function calculateElement(
 
   switch (typeof value) {
     case 'string':
-      return 1 + Buffer.byteLength(name, 'utf8') + 1 + 4 + Buffer.byteLength(value, 'utf8') + 1;
+      return 1 + ByteUtils.utf8ByteLength(name) + 1 + 4 + ByteUtils.utf8ByteLength(value) + 1;
     case 'number':
       if (
         Math.floor(value) === value &&
@@ -62,61 +62,61 @@ function calculateElement(
       ) {
         if (value >= constants.BSON_INT32_MIN && value <= constants.BSON_INT32_MAX) {
           // 32 bit
-          return (name != null ? Buffer.byteLength(name, 'utf8') + 1 : 0) + (4 + 1);
+          return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + (4 + 1);
         } else {
-          return (name != null ? Buffer.byteLength(name, 'utf8') + 1 : 0) + (8 + 1);
+          return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + (8 + 1);
         }
       } else {
         // 64 bit
-        return (name != null ? Buffer.byteLength(name, 'utf8') + 1 : 0) + (8 + 1);
+        return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + (8 + 1);
       }
     case 'undefined':
       if (isArray || !ignoreUndefined)
-        return (name != null ? Buffer.byteLength(name, 'utf8') + 1 : 0) + 1;
+        return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + 1;
       return 0;
     case 'boolean':
-      return (name != null ? Buffer.byteLength(name, 'utf8') + 1 : 0) + (1 + 1);
+      return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + (1 + 1);
     case 'object':
       if (value == null || value['_bsontype'] === 'MinKey' || value['_bsontype'] === 'MaxKey') {
-        return (name != null ? Buffer.byteLength(name, 'utf8') + 1 : 0) + 1;
-      } else if (value['_bsontype'] === 'ObjectId' || value['_bsontype'] === 'ObjectID') {
-        return (name != null ? Buffer.byteLength(name, 'utf8') + 1 : 0) + (12 + 1);
+        return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + 1;
+      } else if (value['_bsontype'] === 'ObjectId') {
+        return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + (12 + 1);
       } else if (value instanceof Date || isDate(value)) {
-        return (name != null ? Buffer.byteLength(name, 'utf8') + 1 : 0) + (8 + 1);
+        return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + (8 + 1);
       } else if (
         ArrayBuffer.isView(value) ||
         value instanceof ArrayBuffer ||
         isAnyArrayBuffer(value)
       ) {
         return (
-          (name != null ? Buffer.byteLength(name, 'utf8') + 1 : 0) + (1 + 4 + 1) + value.byteLength
+          (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + (1 + 4 + 1) + value.byteLength
         );
       } else if (
         value['_bsontype'] === 'Long' ||
         value['_bsontype'] === 'Double' ||
         value['_bsontype'] === 'Timestamp'
       ) {
-        return (name != null ? Buffer.byteLength(name, 'utf8') + 1 : 0) + (8 + 1);
+        return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + (8 + 1);
       } else if (value['_bsontype'] === 'Decimal128') {
-        return (name != null ? Buffer.byteLength(name, 'utf8') + 1 : 0) + (16 + 1);
+        return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + (16 + 1);
       } else if (value['_bsontype'] === 'Code') {
         // Calculate size depending on the availability of a scope
         if (value.scope != null && Object.keys(value.scope).length > 0) {
           return (
-            (name != null ? Buffer.byteLength(name, 'utf8') + 1 : 0) +
+            (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) +
             1 +
             4 +
             4 +
-            Buffer.byteLength(value.code.toString(), 'utf8') +
+            ByteUtils.utf8ByteLength(value.code.toString()) +
             1 +
-            calculateObjectSize(value.scope, serializeFunctions, ignoreUndefined)
+            internalCalculateObjectSize(value.scope, serializeFunctions, ignoreUndefined)
           );
         } else {
           return (
-            (name != null ? Buffer.byteLength(name, 'utf8') + 1 : 0) +
+            (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) +
             1 +
             4 +
-            Buffer.byteLength(value.code.toString(), 'utf8') +
+            ByteUtils.utf8ByteLength(value.code.toString()) +
             1
           );
         }
@@ -125,18 +125,18 @@ function calculateElement(
         // Check what kind of subtype we have
         if (binary.sub_type === Binary.SUBTYPE_BYTE_ARRAY) {
           return (
-            (name != null ? Buffer.byteLength(name, 'utf8') + 1 : 0) +
+            (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) +
             (binary.position + 1 + 4 + 1 + 4)
           );
         } else {
           return (
-            (name != null ? Buffer.byteLength(name, 'utf8') + 1 : 0) + (binary.position + 1 + 4 + 1)
+            (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + (binary.position + 1 + 4 + 1)
           );
         }
       } else if (value['_bsontype'] === 'Symbol') {
         return (
-          (name != null ? Buffer.byteLength(name, 'utf8') + 1 : 0) +
-          Buffer.byteLength(value.value, 'utf8') +
+          (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) +
+          ByteUtils.utf8ByteLength(value.value) +
           4 +
           1 +
           1
@@ -157,15 +157,15 @@ function calculateElement(
         }
 
         return (
-          (name != null ? Buffer.byteLength(name, 'utf8') + 1 : 0) +
+          (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) +
           1 +
-          calculateObjectSize(ordered_values, serializeFunctions, ignoreUndefined)
+          internalCalculateObjectSize(ordered_values, serializeFunctions, ignoreUndefined)
         );
       } else if (value instanceof RegExp || isRegExp(value)) {
         return (
-          (name != null ? Buffer.byteLength(name, 'utf8') + 1 : 0) +
+          (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) +
           1 +
-          Buffer.byteLength(value.source, 'utf8') +
+          ByteUtils.utf8ByteLength(value.source) +
           1 +
           (value.global ? 1 : 0) +
           (value.ignoreCase ? 1 : 0) +
@@ -174,53 +174,29 @@ function calculateElement(
         );
       } else if (value['_bsontype'] === 'BSONRegExp') {
         return (
-          (name != null ? Buffer.byteLength(name, 'utf8') + 1 : 0) +
+          (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) +
           1 +
-          Buffer.byteLength(value.pattern, 'utf8') +
+          ByteUtils.utf8ByteLength(value.pattern) +
           1 +
-          Buffer.byteLength(value.options, 'utf8') +
+          ByteUtils.utf8ByteLength(value.options) +
           1
         );
       } else {
         return (
-          (name != null ? Buffer.byteLength(name, 'utf8') + 1 : 0) +
-          calculateObjectSize(value, serializeFunctions, ignoreUndefined) +
+          (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) +
+          internalCalculateObjectSize(value, serializeFunctions, ignoreUndefined) +
           1
         );
       }
     case 'function':
-      // WTF for 0.4.X where typeof /someregexp/ === 'function'
-      if (value instanceof RegExp || isRegExp(value) || String.call(value) === '[object RegExp]') {
+      if (serializeFunctions) {
         return (
-          (name != null ? Buffer.byteLength(name, 'utf8') + 1 : 0) +
+          (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) +
           1 +
-          Buffer.byteLength(value.source, 'utf8') +
-          1 +
-          (value.global ? 1 : 0) +
-          (value.ignoreCase ? 1 : 0) +
-          (value.multiline ? 1 : 0) +
+          4 +
+          ByteUtils.utf8ByteLength(value.toString()) +
           1
         );
-      } else {
-        if (serializeFunctions && value.scope != null && Object.keys(value.scope).length > 0) {
-          return (
-            (name != null ? Buffer.byteLength(name, 'utf8') + 1 : 0) +
-            1 +
-            4 +
-            4 +
-            Buffer.byteLength(normalizedFunctionString(value), 'utf8') +
-            1 +
-            calculateObjectSize(value.scope, serializeFunctions, ignoreUndefined)
-          );
-        } else if (serializeFunctions) {
-          return (
-            (name != null ? Buffer.byteLength(name, 'utf8') + 1 : 0) +
-            1 +
-            4 +
-            Buffer.byteLength(normalizedFunctionString(value), 'utf8') +
-            1
-          );
-        }
       }
   }