bson 7.2.0 → 7.3.0

package/lib/bson.cjs

@@ -698,7 +698,7 @@ class Binary extends BSONValue {
             !Array.isArray(buffer)) {
             throw new BSONError('Binary can only be constructed from Uint8Array or number[]');
         }
-        this.sub_type = subType ?? Binary.BSON_BINARY_SUBTYPE_DEFAULT;
+        this.sub_type = (subType ?? Binary.BSON_BINARY_SUBTYPE_DEFAULT) & 0xff;
         if (buffer == null) {
             this.buffer = ByteUtils.allocate(Binary.BUFFER_SIZE);
             this.position = 0;
@@ -804,7 +804,7 @@ class Binary extends BSONValue {
         if (this.sub_type === Binary.SUBTYPE_UUID) {
             return new UUID(this.buffer.subarray(0, this.position));
         }
-        throw new BSONError(`Binary sub_type "${this.sub_type}" is not supported for converting to UUID. Only "${Binary.SUBTYPE_UUID}" is currently supported.`);
+        throw new BSONError(`Binary sub_type "${this.sub_type}" (${typeof this.sub_type}) is not supported for converting to UUID. Only 0x${Binary.SUBTYPE_UUID.toString(16).padStart(2, '0')} is currently supported.`);
     }
     static createFromHexString(hex, subType) {
         return new Binary(ByteUtils.fromHex(hex), subType);
@@ -2593,13 +2593,24 @@ class MinKey extends BSONValue {
     }
 }
 
-let PROCESS_UNIQUE = null;
 const __idCache = new WeakMap();
 class ObjectId extends BSONValue {
     get _bsontype() {
         return 'ObjectId';
     }
-    static index = Math.floor(Math.random() * 0xffffff);
+    static index = 0;
+    static PROCESS_UNIQUE = null;
+    static resetState = () => {
+        this.index = Math.floor(Math.random() * 0x1000000);
+        this.PROCESS_UNIQUE = ByteUtils.randomBytes(5);
+    };
+    static {
+        this.resetState();
+        const { startupSnapshot } = globalThis?.process?.getBuiltinModule('v8') ?? {};
+        if (startupSnapshot?.isBuildingSnapshot()) {
+            startupSnapshot?.addDeserializeCallback(this.resetState);
+        }
+    }
     static cacheHexString;
     buffer;
     constructor(inputId) {
@@ -2676,7 +2687,7 @@ class ObjectId extends BSONValue {
         return hexString;
     }
     static getInc() {
-        return (ObjectId.index = (ObjectId.index + 1) % 0xffffff);
+        return (ObjectId.index = (ObjectId.index + 1) % 0x1000000);
     }
     static generate(time) {
         if ('number' !== typeof time) {
@@ -2685,9 +2696,7 @@ class ObjectId extends BSONValue {
         const inc = ObjectId.getInc();
         const buffer = ByteUtils.allocateUnsafe(12);
         NumberUtils.setInt32BE(buffer, 0, time);
-        if (PROCESS_UNIQUE === null) {
-            PROCESS_UNIQUE = ByteUtils.randomBytes(5);
-        }
+        const PROCESS_UNIQUE = this.PROCESS_UNIQUE;
         buffer[4] = PROCESS_UNIQUE[0];
         buffer[5] = PROCESS_UNIQUE[1];
         buffer[6] = PROCESS_UNIQUE[2];
@@ -2805,23 +2814,33 @@ class ObjectId extends BSONValue {
 }
 
 function internalCalculateObjectSize(object, serializeFunctions, ignoreUndefined) {
-    let totalLength = 4 + 1;
-    if (Array.isArray(object)) {
-        for (let i = 0; i < object.length; i++) {
-            totalLength += calculateElement(i.toString(), object[i], serializeFunctions, true, ignoreUndefined);
-        }
-    }
-    else {
-        if (typeof object?.toBSON === 'function') {
-            object = object.toBSON();
+    const objectStack = [
+        { obj: object, ignoreUndefined: ignoreUndefined ?? false }
+    ];
+    let total = 0;
+    while (objectStack.length > 0) {
+        const { obj, ignoreUndefined: frameIgnoreUndefined } = objectStack.pop();
+        total += 5;
+        const isObjArray = Array.isArray(obj);
+        let target = obj;
+        if (!isObjArray && typeof obj?.toBSON === 'function') {
+            target = obj.toBSON();
+        }
+        if (isObjArray) {
+            const array = target;
+            for (let i = 0; i < array.length; i++) {
+                total += calculateElementSize(i.toString(), array[i], serializeFunctions, true, frameIgnoreUndefined, objectStack);
+            }
         }
-        for (const key of Object.keys(object)) {
-            totalLength += calculateElement(key, object[key], serializeFunctions, false, ignoreUndefined);
+        else {
+            for (const key of Object.keys(target)) {
+                total += calculateElementSize(key, target[key], serializeFunctions, false, frameIgnoreUndefined, objectStack);
+            }
         }
     }
-    return totalLength;
+    return total;
 }
-function calculateElement(name, value, serializeFunctions = false, isArray = false, ignoreUndefined = false) {
+function calculateElementSize(name, value, serializeFunctions = false, isArray = false, ignoreUndefined = false, objectStack) {
     if (typeof value?.toBSON === 'function') {
         value = value.toBSON();
     }
@@ -2833,21 +2852,21 @@ function calculateElement(name, value, serializeFunctions = false, isArray = fal
                 value >= JS_INT_MIN &&
                 value <= JS_INT_MAX) {
                 if (value >= BSON_INT32_MIN && value <= BSON_INT32_MAX) {
-                    return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + (4 + 1);
+                    return ByteUtils.utf8ByteLength(name) + 1 + (4 + 1);
                 }
                 else {
-                    return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + (8 + 1);
+                    return ByteUtils.utf8ByteLength(name) + 1 + (8 + 1);
                 }
             }
             else {
-                return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + (8 + 1);
+                return ByteUtils.utf8ByteLength(name) + 1 + (8 + 1);
             }
         case 'undefined':
             if (isArray || !ignoreUndefined)
-                return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + 1;
+                return ByteUtils.utf8ByteLength(name) + 1 + 1;
             return 0;
         case 'boolean':
-            return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + (1 + 1);
+            return ByteUtils.utf8ByteLength(name) + 1 + (1 + 1);
         case 'object':
             if (value != null &&
                 typeof value._bsontype === 'string' &&
@@ -2855,39 +2874,41 @@ function calculateElement(name, value, serializeFunctions = false, isArray = fal
                 throw new BSONVersionError();
             }
             else if (value == null || value._bsontype === 'MinKey' || value._bsontype === 'MaxKey') {
-                return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + 1;
+                return ByteUtils.utf8ByteLength(name) + 1 + 1;
             }
             else if (value._bsontype === 'ObjectId') {
-                return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + (12 + 1);
+                return ByteUtils.utf8ByteLength(name) + 1 + (12 + 1);
             }
             else if (value instanceof Date || isDate(value)) {
-                return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + (8 + 1);
+                return ByteUtils.utf8ByteLength(name) + 1 + (8 + 1);
             }
             else if (ArrayBuffer.isView(value) ||
                 value instanceof ArrayBuffer ||
                 isAnyArrayBuffer(value)) {
-                return ((name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + (1 + 4 + 1) + value.byteLength);
+                return ByteUtils.utf8ByteLength(name) + 1 + (1 + 4 + 1) + value.byteLength;
             }
             else if (value._bsontype === 'Long' ||
                 value._bsontype === 'Double' ||
                 value._bsontype === 'Timestamp') {
-                return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + (8 + 1);
+                return ByteUtils.utf8ByteLength(name) + 1 + (8 + 1);
             }
             else if (value._bsontype === 'Decimal128') {
-                return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + (16 + 1);
+                return ByteUtils.utf8ByteLength(name) + 1 + (16 + 1);
             }
             else if (value._bsontype === 'Code') {
                 if (value.scope != null && Object.keys(value.scope).length > 0) {
-                    return ((name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) +
+                    objectStack.push({ obj: value.scope, ignoreUndefined });
+                    return (ByteUtils.utf8ByteLength(name) +
+                        1 +
                         1 +
                         4 +
                         4 +
                         ByteUtils.utf8ByteLength(value.code.toString()) +
-                        1 +
-                        internalCalculateObjectSize(value.scope, serializeFunctions, ignoreUndefined));
+                        1);
                 }
                 else {
-                    return ((name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) +
+                    return (ByteUtils.utf8ByteLength(name) +
+                        1 +
                         1 +
                         4 +
                         ByteUtils.utf8ByteLength(value.code.toString()) +
@@ -2897,19 +2918,14 @@ function calculateElement(name, value, serializeFunctions = false, isArray = fal
             else if (value._bsontype === 'Binary') {
                 const binary = value;
                 if (binary.sub_type === Binary.SUBTYPE_BYTE_ARRAY) {
-                    return ((name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) +
-                        (binary.position + 1 + 4 + 1 + 4));
+                    return ByteUtils.utf8ByteLength(name) + 1 + (binary.position + 1 + 4 + 1 + 4);
                 }
                 else {
-                    return ((name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + (binary.position + 1 + 4 + 1));
+                    return ByteUtils.utf8ByteLength(name) + 1 + (binary.position + 1 + 4 + 1);
                 }
             }
             else if (value._bsontype === 'Symbol') {
-                return ((name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) +
-                    ByteUtils.utf8ByteLength(value.value) +
-                    4 +
-                    1 +
-                    1);
+                return (ByteUtils.utf8ByteLength(name) + 1 + ByteUtils.utf8ByteLength(value.value) + 4 + 1 + 1);
             }
             else if (value._bsontype === 'DBRef') {
                 const ordered_values = Object.assign({
@@ -2919,12 +2935,12 @@ function calculateElement(name, value, serializeFunctions = false, isArray = fal
                 if (value.db != null) {
                     ordered_values['$db'] = value.db;
                 }
-                return ((name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) +
-                    1 +
-                    internalCalculateObjectSize(ordered_values, serializeFunctions, ignoreUndefined));
+                objectStack.push({ obj: ordered_values, ignoreUndefined: true });
+                return ByteUtils.utf8ByteLength(name) + 1 + 1;
             }
             else if (value instanceof RegExp || isRegExp(value)) {
-                return ((name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) +
+                return (ByteUtils.utf8ByteLength(name) +
+                    1 +
                     1 +
                     ByteUtils.utf8ByteLength(value.source) +
                     1 +
@@ -2934,7 +2950,8 @@ function calculateElement(name, value, serializeFunctions = false, isArray = fal
                     1);
             }
             else if (value._bsontype === 'BSONRegExp') {
-                return ((name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) +
+                return (ByteUtils.utf8ByteLength(name) +
+                    1 +
                     1 +
                     ByteUtils.utf8ByteLength(value.pattern) +
                     1 +
@@ -2942,13 +2959,13 @@ function calculateElement(name, value, serializeFunctions = false, isArray = fal
                     1);
             }
             else {
-                return ((name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) +
-                    internalCalculateObjectSize(value, serializeFunctions, ignoreUndefined) +
-                    1);
+                objectStack.push({ obj: value, ignoreUndefined });
+                return ByteUtils.utf8ByteLength(name) + 1 + 1;
             }
         case 'function':
             if (serializeFunctions) {
-                return ((name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) +
+                return (ByteUtils.utf8ByteLength(name) +
+                    1 +
                     1 +
                     4 +
                     ByteUtils.utf8ByteLength(value.toString()) +
@@ -2956,7 +2973,7 @@ function calculateElement(name, value, serializeFunctions = false, isArray = fal
             }
             return 0;
         case 'bigint':
-            return (name != null ? ByteUtils.utf8ByteLength(name) + 1 : 0) + (8 + 1);
+            return ByteUtils.utf8ByteLength(name) + 1 + (8 + 1);
         case 'symbol':
             return 0;
         default:
@@ -3172,7 +3189,28 @@ function internalDeserialize(buffer, options, isArray) {
     return deserializeObject(buffer, index, options, isArray);
 }
 const allowedDBRefKeys = /^\$ref$|^\$id$|^\$db$/;
+function assignValue(dest, name, value) {
+    if (name === '__proto__') {
+        Object.defineProperty(dest, name, {
+            value,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+    }
+    else {
+        dest[name] = value;
+    }
+}
+function toPotentialDbRef(doc) {
+    if (isDBRefLike(doc)) {
+        const { $ref, $id, $db, ...fields } = doc;
+        return new DBRef($ref, $id, $db, fields);
+    }
+    return doc;
+}
 function deserializeObject(buffer, index, options, isArray = false) {
+    options = { ...options };
     const fieldsAsRaw = options['fieldsAsRaw'] == null ? null : options['fieldsAsRaw'];
     const raw = options['raw'] == null ? false : options['raw'];
     const bsonRegExp = typeof options['bsonRegExp'] === 'boolean' ? options['bsonRegExp'] : false;
@@ -3223,31 +3261,87 @@ function deserializeObject(buffer, index, options, isArray = false) {
     index += 4;
     if (size < 5 || size > buffer.length)
         throw new BSONError('corrupt bson message');
-    const object = isArray ? [] : {};
+    const rootObject = isArray ? [] : {};
     let arrayIndex = 0;
     let isPossibleDBRef = isArray ? false : null;
+    let currentFrame = null;
+    let currentDest = rootObject;
+    let currentIsArray = isArray;
     while (true) {
         const elementType = buffer[index++];
-        if (elementType === 0)
-            break;
+        if (elementType === 0) {
+            if (currentFrame) {
+                if (index === currentFrame.lastIndex) {
+                    const completedFrame = currentFrame;
+                    currentFrame = completedFrame.prev;
+                    if (currentFrame === null) {
+                        currentDest = rootObject;
+                        currentIsArray = isArray;
+                    }
+                    else {
+                        currentDest = currentFrame.holdingDocument;
+                        currentIsArray = currentFrame.isArray;
+                    }
+                    let result = completedFrame.holdingDocument;
+                    switch (completedFrame.elementType) {
+                        case BSON_DATA_OBJECT:
+                            if (completedFrame.isPossibleDBRef) {
+                                result = toPotentialDbRef(result);
+                            }
+                            break;
+                        case BSON_DATA_ARRAY:
+                            break;
+                        case BSON_DATA_CODE_W_SCOPE:
+                            result = new Code(completedFrame.functionString, completedFrame.holdingDocument);
+                            break;
+                        default:
+                            throw new BSONError('Unexpected element type in frame stack');
+                    }
+                    assignValue(currentDest, completedFrame.propertyName, result);
+                    continue;
+                }
+                else {
+                    if (currentFrame.elementType === BSON_DATA_ARRAY) {
+                        throw new BSONError('corrupted array bson');
+                    }
+                    throw new BSONError('Bad BSON Document: object not properly terminated');
+                }
+            }
+            else {
+                break;
+            }
+        }
         let i = index;
         while (buffer[i] !== 0x00 && i < buffer.length) {
             i++;
         }
         if (i >= buffer.byteLength)
             throw new BSONError('Bad BSON Document: illegal CString');
-        const name = isArray ? arrayIndex++ : ByteUtils.toUTF8(buffer, index, i, false);
-        let shouldValidateKey = true;
-        if (globalUTFValidation || utf8KeysSet?.has(name)) {
+        const name = currentIsArray
+            ? currentFrame !== null
+                ? currentFrame.arrayIndex++
+                : arrayIndex++
+            : ByteUtils.toUTF8(buffer, index, i, false);
+        let shouldValidateKey;
+        if (currentFrame !== null) {
+            shouldValidateKey = currentFrame.validationSetting;
+        }
+        else if (globalUTFValidation || utf8KeysSet?.has(name)) {
             shouldValidateKey = validationSetting;
         }
         else {
             shouldValidateKey = !validationSetting;
         }
-        if (isPossibleDBRef !== false && name[0] === '$') {
+        if (currentFrame !== null) {
+            if (currentFrame.isPossibleDBRef !== false && typeof name === 'string' && name[0] === '$') {
+                currentFrame.isPossibleDBRef = allowedDBRefKeys.test(name);
+            }
+        }
+        else if (isPossibleDBRef !== false && name[0] === '$') {
             isPossibleDBRef = allowedDBRefKeys.test(name);
         }
         let value;
+        let isDeferredValue = false;
         index = i + 1;
         if (elementType === BSON_DATA_STRING) {
             const stringSize = NumberUtils.getInt32LE(buffer, index);
@@ -3293,39 +3387,58 @@ function deserializeObject(buffer, index, options, isArray = false) {
             value = buffer[index++] === 1;
         }
         else if (elementType === BSON_DATA_OBJECT) {
-            const _index = index;
             const objectSize = NumberUtils.getInt32LE(buffer, index);
-            if (objectSize <= 0 || objectSize > buffer.length - index)
+            if (objectSize < 5 || objectSize > buffer.length - index)
                 throw new BSONError('bad embedded document length in bson');
-            if (raw) {
+            if (raw || (currentFrame?.raw ?? false)) {
                 value = buffer.subarray(index, index + objectSize);
+                index = index + objectSize;
             }
             else {
-                let objectOptions = options;
-                if (!globalUTFValidation) {
-                    objectOptions = { ...options, validation: { utf8: shouldValidateKey } };
-                }
-                value = deserializeObject(buffer, _index, objectOptions, false);
+                isDeferredValue = true;
+                const objectFrame = {
+                    holdingDocument: {},
+                    elementType: BSON_DATA_OBJECT,
+                    propertyName: name,
+                    functionString: null,
+                    lastIndex: index + objectSize,
+                    isArray: false,
+                    arrayIndex: 0,
+                    raw: false,
+                    isPossibleDBRef: null,
+                    validationSetting: shouldValidateKey,
+                    prev: currentFrame
+                };
+                currentFrame = objectFrame;
+                currentDest = objectFrame.holdingDocument;
+                currentIsArray = false;
+                index = index + 4;
             }
-            index = index + objectSize;
         }
         else if (elementType === BSON_DATA_ARRAY) {
-            const _index = index;
             const objectSize = NumberUtils.getInt32LE(buffer, index);
-            let arrayOptions = options;
+            if (objectSize < 5 || objectSize > buffer.length - index)
+                throw new BSONError('bad embedded array length in bson');
             const stopIndex = index + objectSize;
-            if (fieldsAsRaw && fieldsAsRaw[name]) {
-                arrayOptions = { ...options, raw: true };
-            }
-            if (!globalUTFValidation) {
-                arrayOptions = { ...arrayOptions, validation: { utf8: shouldValidateKey } };
-            }
-            value = deserializeObject(buffer, _index, arrayOptions, true);
-            index = index + objectSize;
-            if (buffer[index - 1] !== 0)
-                throw new BSONError('invalid array terminator byte');
-            if (index !== stopIndex)
-                throw new BSONError('corrupted array bson');
+            const arrayRaw = !!(fieldsAsRaw && fieldsAsRaw[name]) || (currentFrame?.raw ?? false);
+            isDeferredValue = true;
+            const arrayFrame = {
+                holdingDocument: [],
+                elementType: BSON_DATA_ARRAY,
+                propertyName: name,
+                functionString: null,
+                lastIndex: stopIndex,
+                isArray: true,
+                arrayIndex: 0,
+                raw: arrayRaw,
+                isPossibleDBRef: false,
+                validationSetting: shouldValidateKey,
+                prev: currentFrame
+            };
+            currentFrame = arrayFrame;
+            currentDest = arrayFrame.holdingDocument;
+            currentIsArray = true;
+            index = index + 4;
         }
         else if (elementType === BSON_DATA_UNDEFINED) {
             value = undefined;
@@ -3497,15 +3610,32 @@ function deserializeObject(buffer, index, options, isArray = false) {
             index = index + stringSize;
             const _index = index;
             const objectSize = NumberUtils.getInt32LE(buffer, index);
-            const scopeObject = deserializeObject(buffer, _index, options, false);
-            index = index + objectSize;
+            if (objectSize < 5 || objectSize > buffer.length - index)
+                throw new BSONError('bad scope document size in code_w_scope');
             if (totalSize < 4 + 4 + objectSize + stringSize) {
                 throw new BSONError('code_w_scope total size is too short, truncating scope');
             }
             if (totalSize > 4 + 4 + objectSize + stringSize) {
                 throw new BSONError('code_w_scope total size is too long, clips outer document');
             }
-            value = new Code(functionString, scopeObject);
+            isDeferredValue = true;
+            const scopeFrame = {
+                holdingDocument: {},
+                elementType: BSON_DATA_CODE_W_SCOPE,
+                propertyName: name,
+                functionString: functionString,
+                lastIndex: _index + objectSize,
+                isArray: false,
+                arrayIndex: 0,
+                raw: false,
+                isPossibleDBRef: null,
+                validationSetting: shouldValidateKey,
+                prev: currentFrame
+            };
+            currentFrame = scopeFrame;
+            currentDest = scopeFrame.holdingDocument;
+            currentIsArray = false;
+            index = index + 4;
         }
         else if (elementType === BSON_DATA_DBPOINTER) {
             const stringSize = NumberUtils.getInt32LE(buffer, index);
@@ -3526,18 +3656,14 @@ function deserializeObject(buffer, index, options, isArray = false) {
         else {
             throw new BSONError(`Detected unknown BSON type ${elementType.toString(16)} for fieldname "${name}"`);
         }
-        if (name === '__proto__') {
-            Object.defineProperty(object, name, {
-                value,
-                writable: true,
-                enumerable: true,
-                configurable: true
-            });
-        }
-        else {
-            object[name] = value;
+        if (!isDeferredValue) {
+            assignValue(currentDest, name, value);
         }
     }
+    if (currentFrame !== null) {
+        throw new BSONError('corrupted bson, more objects expected based on the current document size');
+    }
+    const object = rootObject;
     if (size !== index - startIndex) {
         if (isArray)
             throw new BSONError('corrupt array bson');
@@ -3545,14 +3671,7 @@ function deserializeObject(buffer, index, options, isArray = false) {
     }
     if (!isPossibleDBRef)
         return object;
-    if (isDBRefLike(object)) {
-        const copy = Object.assign({}, object);
-        delete copy.$ref;
-        delete copy.$id;
-        delete copy.$db;
-        return new DBRef(object.$ref, object.$id, object.$db, copy);
-    }
-    return object;
+    return toPotentialDbRef(object);
 }
 
 const regexp = /\x00/;
@@ -3661,7 +3780,7 @@ function serializeMinMax(buffer, key, value, index) {
     if (value === null) {
         buffer[index++] = BSON_DATA_NULL;
     }
-    else if (value._bsontype === 'MinKey') {
+    else if (value[bsonType] === 'MinKey') {
         buffer[index++] = BSON_DATA_MIN_KEY;
     }
     else {
@@ -3698,19 +3817,6 @@ function serializeBuffer(buffer, key, value, index) {
     index = index + size;
     return index;
 }
-function serializeObject(buffer, key, value, index, checkKeys, depth, serializeFunctions, ignoreUndefined, path) {
-    if (path.has(value)) {
-        throw new BSONError('Cannot convert circular structure to BSON');
-    }
-    path.add(value);
-    buffer[index++] = Array.isArray(value) ? BSON_DATA_ARRAY : BSON_DATA_OBJECT;
-    const numberOfWrittenBytes = ByteUtils.encodeUTF8Into(buffer, key, index);
-    index = index + numberOfWrittenBytes;
-    buffer[index++] = 0;
-    const endIndex = serializeInto(buffer, value, checkKeys, index, depth + 1, serializeFunctions, ignoreUndefined, path);
-    path.delete(value);
-    return endIndex;
-}
 function serializeDecimal128(buffer, key, value, index) {
     buffer[index++] = BSON_DATA_DECIMAL128;
     const numberOfWrittenBytes = ByteUtils.encodeUTF8Into(buffer, key, index);
@@ -3722,7 +3828,7 @@ function serializeDecimal128(buffer, key, value, index) {
 }
 function serializeLong(buffer, key, value, index) {
     buffer[index++] =
-        value._bsontype === 'Long' ? BSON_DATA_LONG : BSON_DATA_TIMESTAMP;
+        value[bsonType] === 'Long' ? BSON_DATA_LONG : BSON_DATA_TIMESTAMP;
     const numberOfWrittenBytes = ByteUtils.encodeUTF8Into(buffer, key, index);
     index = index + numberOfWrittenBytes;
     buffer[index++] = 0;
@@ -3761,38 +3867,6 @@ function serializeFunction(buffer, key, value, index) {
     buffer[index++] = 0;
     return index;
 }
-function serializeCode(buffer, key, value, index, checkKeys = false, depth = 0, serializeFunctions = false, ignoreUndefined = true, path) {
-    if (value.scope && typeof value.scope === 'object') {
-        buffer[index++] = BSON_DATA_CODE_W_SCOPE;
-        const numberOfWrittenBytes = ByteUtils.encodeUTF8Into(buffer, key, index);
-        index = index + numberOfWrittenBytes;
-        buffer[index++] = 0;
-        let startIndex = index;
-        const functionString = value.code;
-        index = index + 4;
-        const codeSize = ByteUtils.encodeUTF8Into(buffer, functionString, index + 4) + 1;
-        NumberUtils.setInt32LE(buffer, index, codeSize);
-        buffer[index + 4 + codeSize - 1] = 0;
-        index = index + codeSize + 4;
-        const endIndex = serializeInto(buffer, value.scope, checkKeys, index, depth + 1, serializeFunctions, ignoreUndefined, path);
-        index = endIndex - 1;
-        const totalSize = endIndex - startIndex;
-        startIndex += NumberUtils.setInt32LE(buffer, startIndex, totalSize);
-        buffer[index++] = 0;
-    }
-    else {
-        buffer[index++] = BSON_DATA_CODE;
-        const numberOfWrittenBytes = ByteUtils.encodeUTF8Into(buffer, key, index);
-        index = index + numberOfWrittenBytes;
-        buffer[index++] = 0;
-        const functionString = value.code.toString();
-        const size = ByteUtils.encodeUTF8Into(buffer, functionString, index + 4) + 1;
-        NumberUtils.setInt32LE(buffer, index, size);
-        index = index + 4 + size - 1;
-        buffer[index++] = 0;
-    }
-    return index;
-}
 function serializeBinary(buffer, key, value, index) {
     buffer[index++] = BSON_DATA_BINARY;
     const numberOfWrittenBytes = ByteUtils.encodeUTF8Into(buffer, key, index);
@@ -3832,26 +3906,59 @@ function serializeSymbol(buffer, key, value, index) {
     buffer[index++] = 0;
     return index;
 }
-function serializeDBRef(buffer, key, value, index, depth, serializeFunctions, path) {
-    buffer[index++] = BSON_DATA_OBJECT;
-    const numberOfWrittenBytes = ByteUtils.encodeUTF8Into(buffer, key, index);
-    index = index + numberOfWrittenBytes;
-    buffer[index++] = 0;
-    let startIndex = index;
-    let output = {
-        $ref: value.collection || value.namespace,
-        $id: value.oid
+function makeFrame(sourceObject, objectSizeIndex, codeSizeIndex, prev, checkKeys, ignoreUndefined) {
+    if (Array.isArray(sourceObject)) {
+        return {
+            sourceObject,
+            isArray: true,
+            objectSizeIndex,
+            codeSizeIndex,
+            iterTarget: sourceObject,
+            keys: null,
+            keyIndex: 0,
+            mapIterator: null,
+            prev,
+            checkKeys,
+            ignoreUndefined
+        };
+    }
+    if (sourceObject instanceof Map || isMap(sourceObject)) {
+        return {
+            sourceObject,
+            isArray: false,
+            objectSizeIndex,
+            codeSizeIndex,
+            iterTarget: sourceObject,
+            keys: null,
+            keyIndex: 0,
+            mapIterator: sourceObject.entries(),
+            prev,
+            checkKeys,
+            ignoreUndefined
+        };
+    }
+    let target = sourceObject;
+    if (typeof target?.toBSON === 'function') {
+        target = target.toBSON();
+        if (target != null && typeof target !== 'object') {
+            throw new BSONError('toBSON function did not return an object');
+        }
+    }
+    return {
+        sourceObject,
+        isArray: false,
+        objectSizeIndex,
+        codeSizeIndex,
+        iterTarget: target,
+        keys: Object.keys(target),
+        keyIndex: 0,
+        mapIterator: null,
+        prev,
+        checkKeys,
+        ignoreUndefined
     };
-    if (value.db != null) {
-        output.$db = value.db;
-    }
-    output = Object.assign(output, value.fields);
-    const endIndex = serializeInto(buffer, output, false, index, depth + 1, serializeFunctions, true, path);
-    const size = endIndex - startIndex;
-    startIndex += NumberUtils.setInt32LE(buffer, index, size);
-    return endIndex;
 }
-function serializeInto(buffer, object, checkKeys, startingIndex, depth, serializeFunctions, ignoreUndefined, path) {
+function serializeInto(buffer, object, checkKeys, startingIndex, serializeFunctions, ignoreUndefined, path) {
     if (path == null) {
         if (object == null) {
             buffer[0] = 0x05;
@@ -3879,308 +3986,200 @@ function serializeInto(buffer, object, checkKeys, startingIndex, depth, serializ
         path = new Set();
     }
     path.add(object);
+    let currentFrame = makeFrame(object, startingIndex, null, null, checkKeys, ignoreUndefined);
     let index = startingIndex + 4;
-    if (Array.isArray(object)) {
-        for (let i = 0; i < object.length; i++) {
-            const key = `${i}`;
-            let value = object[i];
-            if (typeof value?.toBSON === 'function') {
-                value = value.toBSON();
-            }
-            const type = typeof value;
-            if (value === undefined) {
-                index = serializeNull(buffer, key, value, index);
-            }
-            else if (value === null) {
-                index = serializeNull(buffer, key, value, index);
-            }
-            else if (type === 'string') {
-                index = serializeString(buffer, key, value, index);
-            }
-            else if (type === 'number') {
-                index = serializeNumber(buffer, key, value, index);
-            }
-            else if (type === 'bigint') {
-                index = serializeBigInt(buffer, key, value, index);
-            }
-            else if (type === 'boolean') {
-                index = serializeBoolean(buffer, key, value, index);
-            }
-            else if (type === 'object' && value._bsontype == null) {
-                if (value instanceof Date || isDate(value)) {
-                    index = serializeDate(buffer, key, value, index);
-                }
-                else if (value instanceof Uint8Array || isUint8Array(value)) {
-                    index = serializeBuffer(buffer, key, value, index);
-                }
-                else if (value instanceof RegExp || isRegExp(value)) {
-                    index = serializeRegExp(buffer, key, value, index);
-                }
-                else {
-                    index = serializeObject(buffer, key, value, index, checkKeys, depth, serializeFunctions, ignoreUndefined, path);
+    while (currentFrame !== null) {
+        const frame = currentFrame;
+        let key;
+        let value;
+        if (frame.mapIterator !== null) {
+            const next = frame.mapIterator.next();
+            if (next.done) {
+                buffer[index++] = 0x00;
+                NumberUtils.setInt32LE(buffer, frame.objectSizeIndex, index - frame.objectSizeIndex);
+                if (frame.codeSizeIndex !== null) {
+                    NumberUtils.setInt32LE(buffer, frame.codeSizeIndex, index - frame.codeSizeIndex);
                 }
+                path.delete(frame.sourceObject);
+                currentFrame = frame.prev;
+                continue;
             }
-            else if (type === 'object') {
-                if (value[BSON_VERSION_SYMBOL] !== BSON_MAJOR_VERSION) {
-                    throw new BSONVersionError();
-                }
-                else if (value._bsontype === 'ObjectId') {
-                    index = serializeObjectId(buffer, key, value, index);
-                }
-                else if (value._bsontype === 'Decimal128') {
-                    index = serializeDecimal128(buffer, key, value, index);
-                }
-                else if (value._bsontype === 'Long' || value._bsontype === 'Timestamp') {
-                    index = serializeLong(buffer, key, value, index);
-                }
-                else if (value._bsontype === 'Double') {
-                    index = serializeDouble(buffer, key, value, index);
-                }
-                else if (value._bsontype === 'Code') {
-                    index = serializeCode(buffer, key, value, index, checkKeys, depth, serializeFunctions, ignoreUndefined, path);
-                }
-                else if (value._bsontype === 'Binary') {
-                    index = serializeBinary(buffer, key, value, index);
-                }
-                else if (value._bsontype === 'BSONSymbol') {
-                    index = serializeSymbol(buffer, key, value, index);
-                }
-                else if (value._bsontype === 'DBRef') {
-                    index = serializeDBRef(buffer, key, value, index, depth, serializeFunctions, path);
-                }
-                else if (value._bsontype === 'BSONRegExp') {
-                    index = serializeBSONRegExp(buffer, key, value, index);
-                }
-                else if (value._bsontype === 'Int32') {
-                    index = serializeInt32(buffer, key, value, index);
-                }
-                else if (value._bsontype === 'MinKey' || value._bsontype === 'MaxKey') {
-                    index = serializeMinMax(buffer, key, value, index);
-                }
-                else if (typeof value._bsontype !== 'undefined') {
-                    throw new BSONError(`Unrecognized or invalid _bsontype: ${String(value._bsontype)}`);
+            key = next.value[0];
+            value = next.value[1];
+        }
+        else if (frame.keys !== null) {
+            if (frame.keyIndex >= frame.keys.length) {
+                buffer[index++] = 0x00;
+                NumberUtils.setInt32LE(buffer, frame.objectSizeIndex, index - frame.objectSizeIndex);
+                if (frame.codeSizeIndex !== null) {
+                    NumberUtils.setInt32LE(buffer, frame.codeSizeIndex, index - frame.codeSizeIndex);
                 }
+                path.delete(frame.sourceObject);
+                currentFrame = frame.prev;
+                continue;
             }
-            else if (type === 'function' && serializeFunctions) {
-                index = serializeFunction(buffer, key, value, index);
-            }
+            key = frame.keys[frame.keyIndex++];
+            value = frame.iterTarget[key];
         }
-    }
-    else if (object instanceof Map || isMap(object)) {
-        const iterator = object.entries();
-        let done = false;
-        while (!done) {
-            const entry = iterator.next();
-            done = !!entry.done;
-            if (done)
+        else {
+            const arr = frame.iterTarget;
+            if (frame.keyIndex >= arr.length) {
+                buffer[index++] = 0x00;
+                NumberUtils.setInt32LE(buffer, frame.objectSizeIndex, index - frame.objectSizeIndex);
+                if (frame.codeSizeIndex !== null) {
+                    NumberUtils.setInt32LE(buffer, frame.codeSizeIndex, index - frame.codeSizeIndex);
+                }
+                path.delete(frame.sourceObject);
+                currentFrame = frame.prev;
                 continue;
-            const key = entry.value ? entry.value[0] : undefined;
-            let value = entry.value ? entry.value[1] : undefined;
-            if (typeof value?.toBSON === 'function') {
-                value = value.toBSON();
-            }
-            const type = typeof value;
-            if (typeof key === 'string' && !ignoreKeys.has(key)) {
-                if (key.match(regexp) != null) {
-                    throw new BSONError('key ' + key + ' must not contain null bytes');
+            }
+            const i = frame.keyIndex++;
+            key = String(i);
+            value = arr[i];
+        }
+        if (typeof value?.toBSON === 'function') {
+            value = value.toBSON();
+        }
+        if (!frame.isArray && typeof key === 'string' && !(key[0] === '$' && ignoreKeys.has(key))) {
+            if (regexp.test(key)) {
+                throw new BSONError('key ' + key + ' must not contain null bytes');
+            }
+            if (frame.checkKeys) {
+                if ('$' === key[0]) {
+                    throw new BSONError('key ' + key + " must not start with '$'");
                 }
-                if (checkKeys) {
-                    if ('$' === key[0]) {
-                        throw new BSONError('key ' + key + " must not start with '$'");
-                    }
-                    else if (key.includes('.')) {
-                        throw new BSONError('key ' + key + " must not contain '.'");
-                    }
+                else if (key.includes('.')) {
+                    throw new BSONError('key ' + key + " must not contain '.'");
                 }
             }
-            if (value === undefined) {
-                if (ignoreUndefined === false)
-                    index = serializeNull(buffer, key, value, index);
-            }
-            else if (value === null) {
+        }
+        const type = typeof value;
+        if (value === undefined) {
+            if (frame.isArray || frame.ignoreUndefined === false) {
                 index = serializeNull(buffer, key, value, index);
             }
-            else if (type === 'string') {
-                index = serializeString(buffer, key, value, index);
-            }
-            else if (type === 'number') {
-                index = serializeNumber(buffer, key, value, index);
-            }
-            else if (type === 'bigint') {
-                index = serializeBigInt(buffer, key, value, index);
+        }
+        else if (value === null) {
+            index = serializeNull(buffer, key, value, index);
+        }
+        else if (type === 'string') {
+            index = serializeString(buffer, key, value, index);
+        }
+        else if (type === 'number') {
+            index = serializeNumber(buffer, key, value, index);
+        }
+        else if (type === 'bigint') {
+            index = serializeBigInt(buffer, key, value, index);
+        }
+        else if (type === 'boolean') {
+            index = serializeBoolean(buffer, key, value, index);
+        }
+        else if (type === 'object' && value._bsontype == null) {
+            if (value instanceof Date || isDate(value)) {
+                index = serializeDate(buffer, key, value, index);
             }
-            else if (type === 'boolean') {
-                index = serializeBoolean(buffer, key, value, index);
+            else if (value instanceof Uint8Array || isUint8Array(value)) {
+                index = serializeBuffer(buffer, key, value, index);
             }
-            else if (type === 'object' && value._bsontype == null) {
-                if (value instanceof Date || isDate(value)) {
-                    index = serializeDate(buffer, key, value, index);
-                }
-                else if (value instanceof Uint8Array || isUint8Array(value)) {
-                    index = serializeBuffer(buffer, key, value, index);
-                }
-                else if (value instanceof RegExp || isRegExp(value)) {
-                    index = serializeRegExp(buffer, key, value, index);
-                }
-                else {
-                    index = serializeObject(buffer, key, value, index, checkKeys, depth, serializeFunctions, ignoreUndefined, path);
-                }
+            else if (value instanceof RegExp || isRegExp(value)) {
+                index = serializeRegExp(buffer, key, value, index);
             }
-            else if (type === 'object') {
-                if (value[BSON_VERSION_SYMBOL] !== BSON_MAJOR_VERSION) {
-                    throw new BSONVersionError();
-                }
-                else if (value._bsontype === 'ObjectId') {
-                    index = serializeObjectId(buffer, key, value, index);
-                }
-                else if (value._bsontype === 'Decimal128') {
-                    index = serializeDecimal128(buffer, key, value, index);
-                }
-                else if (value._bsontype === 'Long' || value._bsontype === 'Timestamp') {
-                    index = serializeLong(buffer, key, value, index);
-                }
-                else if (value._bsontype === 'Double') {
-                    index = serializeDouble(buffer, key, value, index);
-                }
-                else if (value._bsontype === 'Code') {
-                    index = serializeCode(buffer, key, value, index, checkKeys, depth, serializeFunctions, ignoreUndefined, path);
-                }
-                else if (value._bsontype === 'Binary') {
-                    index = serializeBinary(buffer, key, value, index);
-                }
-                else if (value._bsontype === 'BSONSymbol') {
-                    index = serializeSymbol(buffer, key, value, index);
-                }
-                else if (value._bsontype === 'DBRef') {
-                    index = serializeDBRef(buffer, key, value, index, depth, serializeFunctions, path);
-                }
-                else if (value._bsontype === 'BSONRegExp') {
-                    index = serializeBSONRegExp(buffer, key, value, index);
-                }
-                else if (value._bsontype === 'Int32') {
-                    index = serializeInt32(buffer, key, value, index);
-                }
-                else if (value._bsontype === 'MinKey' || value._bsontype === 'MaxKey') {
-                    index = serializeMinMax(buffer, key, value, index);
-                }
-                else if (typeof value._bsontype !== 'undefined') {
-                    throw new BSONError(`Unrecognized or invalid _bsontype: ${String(value._bsontype)}`);
+            else {
+                if (path.has(value)) {
+                    throw new BSONError('Cannot convert circular structure to BSON');
                 }
-            }
-            else if (type === 'function' && serializeFunctions) {
-                index = serializeFunction(buffer, key, value, index);
-            }
-        }
-    }
-    else {
-        if (typeof object?.toBSON === 'function') {
-            object = object.toBSON();
-            if (object != null && typeof object !== 'object') {
-                throw new BSONError('toBSON function did not return an object');
+                const nestedIsArray = Array.isArray(value);
+                buffer[index++] = nestedIsArray ? BSON_DATA_ARRAY : BSON_DATA_OBJECT;
+                index += ByteUtils.encodeUTF8Into(buffer, key, index);
+                buffer[index++] = 0x00;
+                const nestedStartIndex = index;
+                path.add(value);
+                currentFrame = makeFrame(value, nestedStartIndex, null, frame, frame.checkKeys, frame.ignoreUndefined);
+                index += 4;
             }
         }
-        for (const key of Object.keys(object)) {
-            let value = object[key];
-            if (typeof value?.toBSON === 'function') {
-                value = value.toBSON();
+        else if (type === 'object') {
+            if (value[BSON_VERSION_SYMBOL] !== BSON_MAJOR_VERSION) {
+                throw new BSONVersionError();
             }
-            const type = typeof value;
-            if (typeof key === 'string' && !ignoreKeys.has(key)) {
-                if (key.match(regexp) != null) {
-                    throw new BSONError('key ' + key + ' must not contain null bytes');
-                }
-                if (checkKeys) {
-                    if ('$' === key[0]) {
-                        throw new BSONError('key ' + key + " must not start with '$'");
-                    }
-                    else if (key.includes('.')) {
-                        throw new BSONError('key ' + key + " must not contain '.'");
+            const tag = value[bsonType];
+            if (tag === 'ObjectId') {
+                index = serializeObjectId(buffer, key, value, index);
+            }
+            else if (tag === 'Decimal128') {
+                index = serializeDecimal128(buffer, key, value, index);
+            }
+            else if (tag === 'Long' || tag === 'Timestamp') {
+                index = serializeLong(buffer, key, value, index);
+            }
+            else if (tag === 'Double') {
+                index = serializeDouble(buffer, key, value, index);
+            }
+            else if (tag === 'Code') {
+                const codeValue = value;
+                if (codeValue.scope && typeof codeValue.scope === 'object') {
+                    buffer[index++] = BSON_DATA_CODE_W_SCOPE;
+                    index += ByteUtils.encodeUTF8Into(buffer, key, index);
+                    buffer[index++] = 0x00;
+                    const codeTotalSizeIndex = index;
+                    index += 4;
+                    const functionString = codeValue.code;
+                    const codeSize = ByteUtils.encodeUTF8Into(buffer, functionString, index + 4) + 1;
+                    NumberUtils.setInt32LE(buffer, index, codeSize);
+                    buffer[index + 4 + codeSize - 1] = 0;
+                    index = index + codeSize + 4;
+                    const scope = codeValue.scope;
+                    if (path.has(scope)) {
+                        throw new BSONError('Cannot convert circular structure to BSON');
                     }
+                    path.add(scope);
+                    currentFrame = makeFrame(scope, index, codeTotalSizeIndex, frame, frame.checkKeys, frame.ignoreUndefined);
+                    index += 4;
+                }
+                else {
+                    buffer[index++] = BSON_DATA_CODE;
+                    index += ByteUtils.encodeUTF8Into(buffer, key, index);
+                    buffer[index++] = 0x00;
+                    const functionString = codeValue.code.toString();
+                    const size = ByteUtils.encodeUTF8Into(buffer, functionString, index + 4) + 1;
+                    NumberUtils.setInt32LE(buffer, index, size);
+                    index = index + 4 + size - 1;
+                    buffer[index++] = 0;
                 }
             }
-            if (value === undefined) {
-                if (ignoreUndefined === false)
-                    index = serializeNull(buffer, key, value, index);
-            }
-            else if (value === null) {
-                index = serializeNull(buffer, key, value, index);
-            }
-            else if (type === 'string') {
-                index = serializeString(buffer, key, value, index);
+            else if (tag === 'Binary') {
+                index = serializeBinary(buffer, key, value, index);
             }
-            else if (type === 'number') {
-                index = serializeNumber(buffer, key, value, index);
+            else if (tag === 'BSONSymbol') {
+                index = serializeSymbol(buffer, key, value, index);
             }
-            else if (type === 'bigint') {
-                index = serializeBigInt(buffer, key, value, index);
+            else if (tag === 'DBRef') {
+                const dbref = value;
+                const orderedValues = Object.assign({ $ref: dbref.collection, $id: dbref.oid }, dbref.db != null ? { $db: dbref.db } : null, dbref.fields);
+                buffer[index++] = BSON_DATA_OBJECT;
+                index += ByteUtils.encodeUTF8Into(buffer, key, index);
+                buffer[index++] = 0x00;
+                path.add(orderedValues);
+                currentFrame = makeFrame(orderedValues, index, null, frame, false, true);
+                index += 4;
             }
-            else if (type === 'boolean') {
-                index = serializeBoolean(buffer, key, value, index);
+            else if (tag === 'BSONRegExp') {
+                index = serializeBSONRegExp(buffer, key, value, index);
             }
-            else if (type === 'object' && value._bsontype == null) {
-                if (value instanceof Date || isDate(value)) {
-                    index = serializeDate(buffer, key, value, index);
-                }
-                else if (value instanceof Uint8Array || isUint8Array(value)) {
-                    index = serializeBuffer(buffer, key, value, index);
-                }
-                else if (value instanceof RegExp || isRegExp(value)) {
-                    index = serializeRegExp(buffer, key, value, index);
-                }
-                else {
-                    index = serializeObject(buffer, key, value, index, checkKeys, depth, serializeFunctions, ignoreUndefined, path);
-                }
+            else if (tag === 'Int32') {
+                index = serializeInt32(buffer, key, value, index);
             }
-            else if (type === 'object') {
-                if (value[BSON_VERSION_SYMBOL] !== BSON_MAJOR_VERSION) {
-                    throw new BSONVersionError();
-                }
-                else if (value._bsontype === 'ObjectId') {
-                    index = serializeObjectId(buffer, key, value, index);
-                }
-                else if (value._bsontype === 'Decimal128') {
-                    index = serializeDecimal128(buffer, key, value, index);
-                }
-                else if (value._bsontype === 'Long' || value._bsontype === 'Timestamp') {
-                    index = serializeLong(buffer, key, value, index);
-                }
-                else if (value._bsontype === 'Double') {
-                    index = serializeDouble(buffer, key, value, index);
-                }
-                else if (value._bsontype === 'Code') {
-                    index = serializeCode(buffer, key, value, index, checkKeys, depth, serializeFunctions, ignoreUndefined, path);
-                }
-                else if (value._bsontype === 'Binary') {
-                    index = serializeBinary(buffer, key, value, index);
-                }
-                else if (value._bsontype === 'BSONSymbol') {
-                    index = serializeSymbol(buffer, key, value, index);
-                }
-                else if (value._bsontype === 'DBRef') {
-                    index = serializeDBRef(buffer, key, value, index, depth, serializeFunctions, path);
-                }
-                else if (value._bsontype === 'BSONRegExp') {
-                    index = serializeBSONRegExp(buffer, key, value, index);
-                }
-                else if (value._bsontype === 'Int32') {
-                    index = serializeInt32(buffer, key, value, index);
-                }
-                else if (value._bsontype === 'MinKey' || value._bsontype === 'MaxKey') {
-                    index = serializeMinMax(buffer, key, value, index);
-                }
-                else if (typeof value._bsontype !== 'undefined') {
-                    throw new BSONError(`Unrecognized or invalid _bsontype: ${String(value._bsontype)}`);
-                }
+            else if (tag === 'MinKey' || tag === 'MaxKey') {
+                index = serializeMinMax(buffer, key, value, index);
             }
-            else if (type === 'function' && serializeFunctions) {
-                index = serializeFunction(buffer, key, value, index);
+            else if (typeof value._bsontype !== 'undefined') {
+                throw new BSONError(`Unrecognized or invalid _bsontype: ${String(value._bsontype)}`);
             }
         }
+        else if (type === 'function' && serializeFunctions) {
+            index = serializeFunction(buffer, key, value, index);
+        }
     }
-    path.delete(object);
-    buffer[index++] = 0x00;
-    const size = index - startingIndex;
-    startingIndex += NumberUtils.setInt32LE(buffer, startingIndex, size);
     return index;
 }
 
@@ -4463,21 +4462,22 @@ function parse(text, options) {
         return deserializeValue(value, ejsonOptions);
     });
 }
-function stringify(value, replacer, space, options) {
-    if (space != null && typeof space === 'object') {
-        options = space;
-        space = 0;
+function stringify(value, replacerOrOptions, spaceOrOptions, options) {
+    if (spaceOrOptions != null && typeof spaceOrOptions === 'object') {
+        options = spaceOrOptions;
+        spaceOrOptions = undefined;
     }
-    if (replacer != null && typeof replacer === 'object' && !Array.isArray(replacer)) {
-        options = replacer;
-        replacer = undefined;
-        space = 0;
+    if (replacerOrOptions != null &&
+        typeof replacerOrOptions === 'object' &&
+        !Array.isArray(replacerOrOptions)) {
+        options = replacerOrOptions;
+        replacerOrOptions = undefined;
     }
     const serializeOptions = Object.assign({ relaxed: true, legacy: false }, options, {
         seenObjects: [{ propertyName: '(root)', obj: null }]
     });
     const doc = serializeValue(value, serializeOptions);
-    return JSON.stringify(doc, replacer, space);
+    return JSON.stringify(doc, replacerOrOptions, spaceOrOptions);
 }
 function EJSONserialize(value, options) {
     options = options || {};
@@ -4639,7 +4639,7 @@ function serialize(object, options = {}) {
     if (buffer.length < minInternalBufferSize) {
         buffer = ByteUtils.allocate(minInternalBufferSize);
     }
-    const serializationIndex = serializeInto(buffer, object, checkKeys, 0, 0, serializeFunctions, ignoreUndefined, null);
+    const serializationIndex = serializeInto(buffer, object, checkKeys, 0, serializeFunctions, ignoreUndefined, null);
     const finishedBuffer = ByteUtils.allocateUnsafe(serializationIndex);
     finishedBuffer.set(buffer.subarray(0, serializationIndex), 0);
     return finishedBuffer;
@@ -4649,7 +4649,7 @@ function serializeWithBufferAndIndex(object, finalBuffer, options = {}) {
     const serializeFunctions = typeof options.serializeFunctions === 'boolean' ? options.serializeFunctions : false;
     const ignoreUndefined = typeof options.ignoreUndefined === 'boolean' ? options.ignoreUndefined : true;
     const startIndex = typeof options.index === 'number' ? options.index : 0;
-    const serializationIndex = serializeInto(buffer, object, checkKeys, 0, 0, serializeFunctions, ignoreUndefined, null);
+    const serializationIndex = serializeInto(buffer, object, checkKeys, 0, serializeFunctions, ignoreUndefined, null);
     finalBuffer.set(buffer.subarray(0, serializationIndex), startIndex);
     return startIndex + serializationIndex - 1;
 }