msgpackr 1.11.11 → 2.0.0

package/dist/index.js

@@ -29,7 +29,6 @@
 	C1.name = 'MessagePack 0xC1';
 	var sequentialMode = false;
 	var inlineObjectReadThreshold = 2;
-	var readStruct;
 
 	class Unpackr {
 		constructor(options) {
@@ -61,8 +60,8 @@
 				// re-entrant execution, save the state and restore it after we do this unpack
 				return saveState(() => {
 					clearSource();
-					return this ? this.unpack(source, options) : Unpackr.prototype.unpack.call(defaultOptions, source, options)
-				})
+					return this ? this.unpack(source, options) : Unpackr.prototype.unpack.call(defaultOptions, source, options);
+				});
 			}
 			if (!source.buffer && source.constructor === ArrayBuffer)
 				source = typeof Buffer !== 'undefined' ? Buffer.from(source) : new Uint8Array(source);
@@ -86,14 +85,14 @@
 				// if it doesn't have a buffer, maybe it is the wrong type of object
 				src = null;
 				if (source instanceof Uint8Array)
-					throw error
-				throw new Error('Source must be a Uint8Array or Buffer but was a ' + ((source && typeof source == 'object') ? source.constructor.name : typeof source))
+					throw error;
+				throw new Error('Source must be a Uint8Array or Buffer but was a ' + ((source && typeof source == 'object') ? source.constructor.name : typeof source));
 			}
 			if (this instanceof Unpackr) {
 				currentUnpackr = this;
 				if (this.structures) {
 					currentStructures = this.structures;
-					return checkedRead(options)
+					return checkedRead();
 				} else if (!currentStructures || currentStructures.length > 0) {
 					currentStructures = [];
 				}
@@ -102,7 +101,7 @@
 				if (!currentStructures || currentStructures.length > 0)
 					currentStructures = [];
 			}
-			return checkedRead(options)
+			return checkedRead();
 		}
 		unpackMultiple(source, forEach) {
 			let values, lastPosition = 0;
@@ -115,7 +114,7 @@
 					while(position$1 < size) {
 						lastPosition = position$1;
 						if (forEach(checkedRead(), lastPosition, position$1) === false) {
-							return
+							return;
 						}
 					}
 				}
@@ -125,12 +124,12 @@
 						lastPosition = position$1;
 						values.push(checkedRead());
 					}
-					return values
+					return values;
 				}
 			} catch(error) {
 				error.lastPosition = lastPosition;
 				error.values = values;
-				throw error
+				throw error;
 			} finally {
 				sequentialMode = false;
 				clearSource();
@@ -160,10 +159,10 @@
 					}
 				}
 			}
-			return this.structures = loadedStructures
+			return this.structures = loadedStructures;
 		}
 		decode(source, options) {
-			return this.unpack(source, options)
+			return this.unpack(source, options);
 		}
 	}
 	function checkedRead(options) {
@@ -173,15 +172,7 @@
 				if (sharedLength < currentStructures.length)
 					currentStructures.length = sharedLength;
 			}
-			let result;
-			if (currentUnpackr.randomAccessStructure && src[position$1] < 0x40 && src[position$1] >= 0x20 && readStruct) {
-				result = readStruct(src, position$1, srcEnd, currentUnpackr);
-				src = null; // dispose of this so that recursive unpack calls don't save state
-				if (!(options && options.lazy) && result)
-					result = result.toJSON();
-				position$1 = srcEnd;
-			} else
-				result = read();
+			let result = read();
 			if (bundledStrings$1) { // bundled strings to skip past
 				position$1 = bundledStrings$1.postBundlePosition;
 				bundledStrings$1 = null;
@@ -201,7 +192,7 @@
 					referenceMap = null;
 			} else if (position$1 > srcEnd) {
 				// over read
-				throw new Error('Unexpected end of MessagePack data')
+				throw new Error('Unexpected end of MessagePack data');
 			} else if (!sequentialMode) {
 				let jsonView;
 				try {
@@ -209,10 +200,10 @@
 				} catch(error) {
 					jsonView = '(JSON view not available ' + error + ')';
 				}
-				throw new Error('Data read, but end of buffer not reached ' + jsonView)
+				throw new Error('Data read, but end of buffer not reached ' + jsonView);
 			}
 			// else more to read, but we are reading sequentially, so don't clear source yet
-			return result
+			return result;
 		} catch(error) {
 			if (currentStructures && currentStructures.restoreStructures)
 				restoreStructures();
@@ -220,7 +211,7 @@
 			if (error instanceof RangeError || error.message.startsWith('Unexpected end of buffer') || position$1 > srcEnd) {
 				error.incomplete = true;
 			}
-			throw error
+			throw error;
 		}
 	}
 
@@ -236,7 +227,7 @@
 		if (token < 0xa0) {
 			if (token < 0x80) {
 				if (token < 0x40)
-					return token
+					return token;
 				else {
 					let structure = currentStructures[token & 0x3f] ||
 						currentUnpackr.getStructures && loadStructures()[token & 0x3f];
@@ -244,9 +235,9 @@
 						if (!structure.read) {
 							structure.read = createStructureReader(structure, token & 0x3f);
 						}
-						return structure.read()
+						return structure.read();
 					} else
-						return token
+						return token;
 				}
 			} else if (token < 0x90) {
 				// map
@@ -259,13 +250,13 @@
 							key = '__proto_';
 						object[key] = read();
 					}
-					return object
+					return object;
 				} else {
 					let map = new Map();
 					for (let i = 0; i < token; i++) {
 						map.set(read(), read());
 					}
-					return map
+					return map;
 				}
 			} else {
 				token -= 0x90;
@@ -274,91 +265,91 @@
 					array[i] = read();
 				}
 				if (currentUnpackr.freezeData)
-					return Object.freeze(array)
-				return array
+					return Object.freeze(array);
+				return array;
 			}
 		} else if (token < 0xc0) {
 			// fixstr
 			let length = token - 0xa0;
 			if (srcStringEnd >= position$1) {
-				return srcString.slice(position$1 - srcStringStart, (position$1 += length) - srcStringStart)
+				return srcString.slice(position$1 - srcStringStart, (position$1 += length) - srcStringStart);
 			}
 			if (srcStringEnd == 0 && srcEnd < 140) {
 				// for small blocks, avoiding the overhead of the extract call is helpful
 				let string = length < 16 ? shortStringInJS(length) : longStringInJS(length);
 				if (string != null)
-					return string
+					return string;
 			}
-			return readFixedString(length)
+			return readFixedString(length);
 		} else {
 			let value;
 			switch (token) {
-				case 0xc0: return null
+				case 0xc0: return null;
 				case 0xc1:
 					if (bundledStrings$1) {
 						value = read(); // followed by the length of the string in characters (not bytes!)
 						if (value > 0)
-							return bundledStrings$1[1].slice(bundledStrings$1.position1, bundledStrings$1.position1 += value)
+							return bundledStrings$1[1].slice(bundledStrings$1.position1, bundledStrings$1.position1 += value);
 						else
-							return bundledStrings$1[0].slice(bundledStrings$1.position0, bundledStrings$1.position0 -= value)
+							return bundledStrings$1[0].slice(bundledStrings$1.position0, bundledStrings$1.position0 -= value);
 					}
 					return C1; // "never-used", return special object to denote that
-				case 0xc2: return false
-				case 0xc3: return true
+				case 0xc2: return false;
+				case 0xc3: return true;
 				case 0xc4:
 					// bin 8
 					value = src[position$1++];
 					if (value === undefined)
-						throw new Error('Unexpected end of buffer')
-					return readBin(value)
+						throw new Error('Unexpected end of buffer');
+					return readBin(value);
 				case 0xc5:
 					// bin 16
 					value = dataView.getUint16(position$1);
 					position$1 += 2;
-					return readBin(value)
+					return readBin(value);
 				case 0xc6:
 					// bin 32
 					value = dataView.getUint32(position$1);
 					position$1 += 4;
-					return readBin(value)
+					return readBin(value);
 				case 0xc7:
 					// ext 8
-					return readExt(src[position$1++])
+					return readExt(src[position$1++]);
 				case 0xc8:
 					// ext 16
 					value = dataView.getUint16(position$1);
 					position$1 += 2;
-					return readExt(value)
+					return readExt(value);
 				case 0xc9:
 					// ext 32
 					value = dataView.getUint32(position$1);
 					position$1 += 4;
-					return readExt(value)
+					return readExt(value);
 				case 0xca:
 					value = dataView.getFloat32(position$1);
 					if (currentUnpackr.useFloat32 > 2) {
 						// this does rounding of numbers that were encoded in 32-bit float to nearest significant decimal digit that could be preserved
 						let multiplier = mult10[((src[position$1] & 0x7f) << 1) | (src[position$1 + 1] >> 7)];
 						position$1 += 4;
-						return ((multiplier * value + (value > 0 ? 0.5 : -0.5)) >> 0) / multiplier
+						return ((multiplier * value + (value > 0 ? 0.5 : -0.5)) >> 0) / multiplier;
 					}
 					position$1 += 4;
-					return value
+					return value;
 				case 0xcb:
 					value = dataView.getFloat64(position$1);
 					position$1 += 8;
-					return value
+					return value;
 				// uint handlers
 				case 0xcc:
-					return src[position$1++]
+					return src[position$1++];
 				case 0xcd:
 					value = dataView.getUint16(position$1);
 					position$1 += 2;
-					return value
+					return value;
 				case 0xce:
 					value = dataView.getUint32(position$1);
 					position$1 += 4;
-					return value
+					return value;
 				case 0xcf:
 					if (currentUnpackr.int64AsType === 'number') {
 						value = dataView.getUint32(position$1) * 0x100000000;
@@ -371,19 +362,19 @@
 					} else
 						value = dataView.getBigUint64(position$1);
 					position$1 += 8;
-					return value
+					return value;
 
 				// int handlers
 				case 0xd0:
-					return dataView.getInt8(position$1++)
+					return dataView.getInt8(position$1++);
 				case 0xd1:
 					value = dataView.getInt16(position$1);
 					position$1 += 2;
-					return value
+					return value;
 				case 0xd2:
 					value = dataView.getInt32(position$1);
 					position$1 += 4;
-					return value
+					return value;
 				case 0xd3:
 					if (currentUnpackr.int64AsType === 'number') {
 						value = dataView.getInt32(position$1) * 0x100000000;
@@ -396,96 +387,96 @@
 					} else
 						value = dataView.getBigInt64(position$1);
 					position$1 += 8;
-					return value
+					return value;
 
 				case 0xd4:
 					// fixext 1
 					value = src[position$1++];
 					if (value == 0x72) {
-						return recordDefinition(src[position$1++] & 0x3f)
+						return recordDefinition(src[position$1++] & 0x3f);
 					} else {
 						let extension = currentExtensions[value];
 						if (extension) {
 							if (extension.read) {
 								position$1++; // skip filler byte
-								return extension.read(read())
+								return extension.read(read());
 							} else if (extension.noBuffer) {
 								position$1++; // skip filler byte
-								return extension()
+								return extension();
 							} else
-								return extension(src.subarray(position$1, ++position$1))
+								return extension(src.subarray(position$1, ++position$1));
 						} else
-							throw new Error('Unknown extension ' + value)
+							throw new Error('Unknown extension ' + value);
 					}
 				case 0xd5:
 					// fixext 2
 					value = src[position$1];
 					if (value == 0x72) {
 						position$1++;
-						return recordDefinition(src[position$1++] & 0x3f, src[position$1++])
+						return recordDefinition(src[position$1++] & 0x3f, src[position$1++]);
 					} else
-						return readExt(2)
+						return readExt(2);
 				case 0xd6:
 					// fixext 4
-					return readExt(4)
+					return readExt(4);
 				case 0xd7:
 					// fixext 8
-					return readExt(8)
+					return readExt(8);
 				case 0xd8:
 					// fixext 16
-					return readExt(16)
+					return readExt(16);
 				case 0xd9:
 				// str 8
 					value = src[position$1++];
 					if (srcStringEnd >= position$1) {
-						return srcString.slice(position$1 - srcStringStart, (position$1 += value) - srcStringStart)
+						return srcString.slice(position$1 - srcStringStart, (position$1 += value) - srcStringStart);
 					}
-					return readString8(value)
+					return readString8(value);
 				case 0xda:
 				// str 16
 					value = dataView.getUint16(position$1);
 					position$1 += 2;
 					if (srcStringEnd >= position$1) {
-						return srcString.slice(position$1 - srcStringStart, (position$1 += value) - srcStringStart)
+						return srcString.slice(position$1 - srcStringStart, (position$1 += value) - srcStringStart);
 					}
-					return readString16(value)
+					return readString16(value);
 				case 0xdb:
 				// str 32
 					value = dataView.getUint32(position$1);
 					position$1 += 4;
 					if (srcStringEnd >= position$1) {
-						return srcString.slice(position$1 - srcStringStart, (position$1 += value) - srcStringStart)
+						return srcString.slice(position$1 - srcStringStart, (position$1 += value) - srcStringStart);
 					}
-					return readString32(value)
+					return readString32(value);
 				case 0xdc:
 				// array 16
 					value = dataView.getUint16(position$1);
 					position$1 += 2;
-					return readArray(value)
+					return readArray(value);
 				case 0xdd:
 				// array 32
 					value = dataView.getUint32(position$1);
 					position$1 += 4;
-					return readArray(value)
+					return readArray(value);
 				case 0xde:
 				// map 16
 					value = dataView.getUint16(position$1);
 					position$1 += 2;
-					return readMap(value)
+					return readMap(value);
 				case 0xdf:
 				// map 32
 					value = dataView.getUint32(position$1);
 					position$1 += 4;
-					return readMap(value)
+					return readMap(value);
 				default: // negative int
 					if (token >= 0xe0)
-						return token - 0x100
+						return token - 0x100;
 					if (token === undefined) {
 						let error = new Error('Unexpected end of MessagePack data');
 						error.incomplete = true;
-						throw error
+						throw error;
 					}
-					throw new Error('Unknown MessagePack token ' + token)
+					throw new Error('Unknown MessagePack token ' + token);
 
 			}
 		}
@@ -506,7 +497,7 @@
 				}
 				if (structure.highByte === 0)
 					structure.read = createSecondByteReader(firstId, structure.read);
-				return optimizedReadObject() // second byte is already read, if there is one so immediately read object
+				return optimizedReadObject(); // second byte is already read, if there is one so immediately read object
 			}
 			let object = {};
 			for (let i = 0, l = structure.length; i < l; i++) {
@@ -517,38 +508,38 @@
 			}
 			if (currentUnpackr.freezeData)
 				return Object.freeze(object);
-			return object
+			return object;
 		}
 		readObject.count = 0;
 		if (structure.highByte === 0) {
-			return createSecondByteReader(firstId, readObject)
+			return createSecondByteReader(firstId, readObject);
 		}
-		return readObject
+		return readObject;
 	}
 
 	const createSecondByteReader = (firstId, read0) => {
 		return function() {
 			let highByte = src[position$1++];
 			if (highByte === 0)
-				return read0()
+				return read0();
 			let id = firstId < 32 ? -(firstId + (highByte << 5)) : firstId + (highByte << 5);
 			let structure = currentStructures[id] || loadStructures()[id];
 			if (!structure) {
-				throw new Error('Record id is not defined for ' + id)
+				throw new Error('Record id is not defined for ' + id);
 			}
 			if (!structure.read)
 				structure.read = createStructureReader(structure, firstId);
-			return structure.read()
-		}
+			return structure.read();
+		};
 	};
 
 	function loadStructures() {
 		let loadedStructures = saveState(() => {
 			// save the state in case getStructures modifies our buffer
 			src = null;
-			return currentUnpackr.getStructures()
+			return currentUnpackr.getStructures();
 		});
-		return currentStructures = currentUnpackr._mergeStructures(loadedStructures, currentStructures)
+		return currentStructures = currentUnpackr._mergeStructures(loadedStructures, currentStructures);
 	}
 
 	var readFixedString = readStringJS;
@@ -560,10 +551,10 @@
 		let result;
 		if (length < 16) {
 			if (result = shortStringInJS(length))
-				return result
+				return result;
 		}
 		if (length > 64 && decoder)
-			return decoder.decode(src.subarray(position$1, position$1 += length))
+			return decoder.decode(src.subarray(position$1, position$1 += length));
 		const end = position$1 + length;
 		const units = [];
 		result = '';
@@ -626,7 +617,7 @@
 			result += fromCharCode.apply(String, units);
 		}
 
-		return result
+		return result;
 	}
 
 	function readArray(length) {
@@ -635,8 +626,8 @@
 			array[i] = read();
 		}
 		if (currentUnpackr.freezeData)
-			return Object.freeze(array)
-		return array
+			return Object.freeze(array);
+		return array;
 	}
 
 	function readMap(length) {
@@ -648,13 +639,13 @@
 					key = '__proto_';
 				object[key] = read();
 			}
-			return object
+			return object;
 		} else {
 			let map = new Map();
 			for (let i = 0; i < length; i++) {
 				map.set(read(), read());
 			}
-			return map
+			return map;
 		}
 	}
 
@@ -666,40 +657,40 @@
 			const byte = src[position$1++];
 			if ((byte & 0x80) > 0) {
 					position$1 = start;
-					return
+					return;
 				}
 				bytes[i] = byte;
 			}
-			return fromCharCode.apply(String, bytes)
+			return fromCharCode.apply(String, bytes);
 	}
 	function shortStringInJS(length) {
 		if (length < 4) {
 			if (length < 2) {
 				if (length === 0)
-					return ''
+					return '';
 				else {
 					let a = src[position$1++];
 					if ((a & 0x80) > 1) {
 						position$1 -= 1;
-						return
+						return;
 					}
-					return fromCharCode(a)
+					return fromCharCode(a);
 				}
 			} else {
 				let a = src[position$1++];
 				let b = src[position$1++];
 				if ((a & 0x80) > 0 || (b & 0x80) > 0) {
 					position$1 -= 2;
-					return
+					return;
 				}
 				if (length < 3)
-					return fromCharCode(a, b)
+					return fromCharCode(a, b);
 				let c = src[position$1++];
 				if ((c & 0x80) > 0) {
 					position$1 -= 3;
-					return
+					return;
 				}
-				return fromCharCode(a, b, c)
+				return fromCharCode(a, b, c);
 			}
 		} else {
 			let a = src[position$1++];
@@ -708,34 +699,34 @@
 			let d = src[position$1++];
 			if ((a & 0x80) > 0 || (b & 0x80) > 0 || (c & 0x80) > 0 || (d & 0x80) > 0) {
 				position$1 -= 4;
-				return
+				return;
 			}
 			if (length < 6) {
 				if (length === 4)
-					return fromCharCode(a, b, c, d)
+					return fromCharCode(a, b, c, d);
 				else {
 					let e = src[position$1++];
 					if ((e & 0x80) > 0) {
 						position$1 -= 5;
-						return
+						return;
 					}
-					return fromCharCode(a, b, c, d, e)
+					return fromCharCode(a, b, c, d, e);
 				}
 			} else if (length < 8) {
 				let e = src[position$1++];
 				let f = src[position$1++];
 				if ((e & 0x80) > 0 || (f & 0x80) > 0) {
 					position$1 -= 6;
-					return
+					return;
 				}
 				if (length < 7)
-					return fromCharCode(a, b, c, d, e, f)
+					return fromCharCode(a, b, c, d, e, f);
 				let g = src[position$1++];
 				if ((g & 0x80) > 0) {
 					position$1 -= 7;
-					return
+					return;
 				}
-				return fromCharCode(a, b, c, d, e, f, g)
+				return fromCharCode(a, b, c, d, e, f, g);
 			} else {
 				let e = src[position$1++];
 				let f = src[position$1++];
@@ -743,34 +734,34 @@
 				let h = src[position$1++];
 				if ((e & 0x80) > 0 || (f & 0x80) > 0 || (g & 0x80) > 0 || (h & 0x80) > 0) {
 					position$1 -= 8;
-					return
+					return;
 				}
 				if (length < 10) {
 					if (length === 8)
-						return fromCharCode(a, b, c, d, e, f, g, h)
+						return fromCharCode(a, b, c, d, e, f, g, h);
 					else {
 						let i = src[position$1++];
 						if ((i & 0x80) > 0) {
 							position$1 -= 9;
-							return
+							return;
 						}
-						return fromCharCode(a, b, c, d, e, f, g, h, i)
+						return fromCharCode(a, b, c, d, e, f, g, h, i);
 					}
 				} else if (length < 12) {
 					let i = src[position$1++];
 					let j = src[position$1++];
 					if ((i & 0x80) > 0 || (j & 0x80) > 0) {
 						position$1 -= 10;
-						return
+						return;
 					}
 					if (length < 11)
-						return fromCharCode(a, b, c, d, e, f, g, h, i, j)
+						return fromCharCode(a, b, c, d, e, f, g, h, i, j);
 					let k = src[position$1++];
 					if ((k & 0x80) > 0) {
 						position$1 -= 11;
-						return
+						return;
 					}
-					return fromCharCode(a, b, c, d, e, f, g, h, i, j, k)
+					return fromCharCode(a, b, c, d, e, f, g, h, i, j, k);
 				} else {
 					let i = src[position$1++];
 					let j = src[position$1++];
@@ -778,34 +769,34 @@
 					let l = src[position$1++];
 					if ((i & 0x80) > 0 || (j & 0x80) > 0 || (k & 0x80) > 0 || (l & 0x80) > 0) {
 						position$1 -= 12;
-						return
+						return;
 					}
 					if (length < 14) {
 						if (length === 12)
-							return fromCharCode(a, b, c, d, e, f, g, h, i, j, k, l)
+							return fromCharCode(a, b, c, d, e, f, g, h, i, j, k, l);
 						else {
 							let m = src[position$1++];
 							if ((m & 0x80) > 0) {
 								position$1 -= 13;
-								return
+								return;
 							}
-							return fromCharCode(a, b, c, d, e, f, g, h, i, j, k, l, m)
+							return fromCharCode(a, b, c, d, e, f, g, h, i, j, k, l, m);
 						}
 					} else {
 						let m = src[position$1++];
 						let n = src[position$1++];
 						if ((m & 0x80) > 0 || (n & 0x80) > 0) {
 							position$1 -= 14;
-							return
+							return;
 						}
 						if (length < 15)
-							return fromCharCode(a, b, c, d, e, f, g, h, i, j, k, l, m, n)
+							return fromCharCode(a, b, c, d, e, f, g, h, i, j, k, l, m, n);
 						let o = src[position$1++];
 						if ((o & 0x80) > 0) {
 							position$1 -= 15;
-							return
+							return;
 						}
-						return fromCharCode(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o)
+						return fromCharCode(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o);
 					}
 				}
 			}
@@ -823,22 +814,22 @@
 				case 0xd9:
 				// str 8
 					length = src[position$1++];
-					break
+					break;
 				case 0xda:
 				// str 16
 					length = dataView.getUint16(position$1);
 					position$1 += 2;
-					break
+					break;
 				case 0xdb:
 				// str 32
 					length = dataView.getUint32(position$1);
 					position$1 += 4;
-					break
+					break;
 				default:
-					throw new Error('Expected string')
+					throw new Error('Expected string');
 			}
 		}
-		return readStringJS(length)
+		return readStringJS(length);
 	}
 
 
@@ -846,7 +837,7 @@
 		return currentUnpackr.copyBuffers ?
 			// specifically use the copying slice (not the node one)
 			Uint8Array.prototype.slice.call(src, position$1, position$1 += length) :
-			src.subarray(position$1, position$1 += length)
+			src.subarray(position$1, position$1 += length);
 	}
 	function readExt(length) {
 		let type = src[position$1++];
@@ -859,10 +850,10 @@
 				} finally {
 					position$1 = end;
 				}
-			})
+			});
 		}
 		else
-			throw new Error('Unknown extension type ' + type)
+			throw new Error('Unknown extension type ' + type);
 	}
 
 	var keyCache = new Array(4096);
@@ -872,12 +863,12 @@
 			// fixstr, potentially use key cache
 			length = length - 0xa0;
 			if (srcStringEnd >= position$1) // if it has been extracted, must use it (and faster anyway)
-				return srcString.slice(position$1 - srcStringStart, (position$1 += length) - srcStringStart)
+				return srcString.slice(position$1 - srcStringStart, (position$1 += length) - srcStringStart);
 			else if (!(srcStringEnd == 0 && srcEnd < 180))
-				return readFixedString(length)
+				return readFixedString(length);
 		} else { // not cacheable, go back and do a standard read
 			position$1--;
-			return asSafeString(read())
+			return asSafeString(read());
 		}
 		let key = ((length << 5) ^ (length > 1 ? dataView.getUint16(position$1) : length > 0 ? src[position$1] : 0)) & 0xfff;
 		let entry = keyCache[key];
@@ -890,7 +881,7 @@
 				chunk = dataView.getUint32(checkPosition);
 				if (chunk != entry[i++]) {
 					checkPosition = 0x70000000;
-					break
+					break;
 				}
 				checkPosition += 4;
 			}
@@ -899,12 +890,12 @@
 				chunk = src[checkPosition++];
 				if (chunk != entry[i++]) {
 					checkPosition = 0x70000000;
-					break
+					break;
 				}
 			}
 			if (checkPosition === end) {
 				position$1 = checkPosition;
-				return entry.string
+				return entry.string;
 			}
 			end -= 3;
 			checkPosition = position$1;
@@ -925,8 +916,8 @@
 		// for small blocks, avoiding the overhead of the extract call is helpful
 		let string = length < 16 ? shortStringInJS(length) : longStringInJS(length);
 		if (string != null)
-			return entry.string = string
-		return entry.string = readFixedString(length)
+			return entry.string = string;
+		return entry.string = readFixedString(length);
 	}
 
 	function asSafeString(property) {
@@ -957,7 +948,7 @@
 		}
 		currentStructures[id] = structure;
 		structure.read = createStructureReader(structure, firstByte);
-		return structure.read()
+		return structure.read();
 	};
 	currentExtensions[0] = () => {}; // notepack defines extension 0 to mean undefined, so use that as the default here
 	currentExtensions[0].noBuffer = true;
@@ -979,17 +970,17 @@
 						out <<= BigInt(64);
 						out |= view.getBigUint64(i);
 					}
-					return out
+					return out;
 				}
 				// if (length === 8) return view.getBigUint64(start)
 				let middle = start + (length >> 4 << 3);
 				let left = decode(start, middle);
 				let right = decode(middle, end);
-				return (left << BigInt((end - middle) * 8)) | right
+				return (left << BigInt((end - middle) * 8)) | right;
 			};
 			head = (head << BigInt((view.byteLength - headLength) * 8)) | decode(headLength, view.byteLength);
 		}
-		return head
+		return head;
 	};
 
 	let errors = {
@@ -1000,14 +991,14 @@
 		if (!errors[data[0]]) {
 			let error = Error(data[1], { cause: data[2] });
 			error.name = data[0];
-			return error
+			return error;
 		}
-		return errors[data[0]](data[1], { cause: data[2] })
+		return errors[data[0]](data[1], { cause: data[2] });
 	};
 
 	currentExtensions[0x69] = (data) => {
 		// id extension (for structured clones)
-		if (currentUnpackr.structuredClone === false) throw new Error('Structured clone extension is disabled')
+		if (currentUnpackr.structuredClone === false) throw new Error('Structured clone extension is disabled');
 		let id = dataView.getUint32(position$1 - 4);
 		if (!referenceMap)
 			referenceMap = new Map();
@@ -1028,7 +1019,7 @@
 		let targetProperties = read(); // read the next value as the target object to id
 		if (!refEntry.used) {
 			// no cycle, can just use the returned read object
-			return refEntry.target = targetProperties // replace the placeholder with the real one
+			return refEntry.target = targetProperties; // replace the placeholder with the real one
 		} else {
 			// there is a cycle, so we have to assign properties to original target
 			Object.assign(target, targetProperties);
@@ -1039,16 +1030,16 @@
 			for (let [k, v] of targetProperties.entries()) target.set(k, v);
 		if (target instanceof Set)
 			for (let i of Array.from(targetProperties)) target.add(i);
-		return target
+		return target;
 	};
 
 	currentExtensions[0x70] = (data) => {
 		// pointer extension (for structured clones)
-		if (currentUnpackr.structuredClone === false) throw new Error('Structured clone extension is disabled')
+		if (currentUnpackr.structuredClone === false) throw new Error('Structured clone extension is disabled');
 		let id = dataView.getUint32(position$1 - 4);
 		let refEntry = referenceMap.get(id);
 		refEntry.used = true;
-		return refEntry.target
+		return refEntry.target;
 	};
 
 	currentExtensions[0x73] = () => new Set(read());
@@ -1063,15 +1054,15 @@
 
 		let typedArrayName = typedArrays[typeCode];
 		if (!typedArrayName) {
-			if (typeCode === 16) return buffer
-			if (typeCode === 17) return new DataView(buffer)
-			throw new Error('Could not find typed array for code ' + typeCode)
+			if (typeCode === 16) return buffer;
+			if (typeCode === 17) return new DataView(buffer);
+			throw new Error('Could not find typed array for code ' + typeCode);
 		}
-		return new glbl[typedArrayName](buffer)
+		return new glbl[typedArrayName](buffer);
 	};
 	currentExtensions[0x78] = () => {
 		let data = read();
-		return new RegExp(data[0], data[1])
+		return new RegExp(data[0], data[1]);
 	};
 	const TEMP_BUNDLE = [];
 	currentExtensions[0x62] = (data) => {
@@ -1084,23 +1075,23 @@
 		bundledStrings$1.position1 = 0;
 		bundledStrings$1.postBundlePosition = position$1;
 		position$1 = dataPosition;
-		return read()
+		return read();
 	};
 
 	currentExtensions[0xff] = (data) => {
 		// 32-bit date extension
 		if (data.length == 4)
-			return new Date((data[0] * 0x1000000 + (data[1] << 16) + (data[2] << 8) + data[3]) * 1000)
+			return new Date((data[0] * 0x1000000 + (data[1] << 16) + (data[2] << 8) + data[3]) * 1000);
 		else if (data.length == 8)
 			return new Date(
 				((data[0] << 22) + (data[1] << 14) + (data[2] << 6) + (data[3] >> 2)) / 1000000 +
-				((data[3] & 0x3) * 0x100000000 + data[4] * 0x1000000 + (data[5] << 16) + (data[6] << 8) + data[7]) * 1000)
+				((data[3] & 0x3) * 0x100000000 + data[4] * 0x1000000 + (data[5] << 16) + (data[6] << 8) + data[7]) * 1000);
 		else if (data.length == 12)
 			return new Date(
 				((data[0] << 24) + (data[1] << 16) + (data[2] << 8) + data[3]) / 1000000 +
-				(((data[4] & 0x80) ? -0x1000000000000 : 0) + data[6] * 0x10000000000 + data[7] * 0x100000000 + data[8] * 0x1000000 + (data[9] << 16) + (data[10] << 8) + data[11]) * 1000)
+				(((data[4] & 0x80) ? -0x1000000000000 : 0) + data[6] * 0x10000000000 + data[7] * 0x100000000 + data[8] * 0x1000000 + (data[9] << 16) + (data[10] << 8) + data[11]) * 1000);
 		else
-			return new Date('invalid')
+			return new Date('invalid');
 	};
 	// registration of bulk record definition?
 	// currentExtensions[0x52] = () =>
@@ -1134,7 +1125,7 @@
 		currentStructures.splice(0, currentStructures.length, ...savedStructuresContents);
 		currentUnpackr = savedPackr;
 		dataView = new DataView(src.buffer, src.byteOffset, src.byteLength);
-		return value
+		return value;
 	}
 	function clearSource() {
 		src = null;
@@ -1169,7 +1160,7 @@
 	function roundFloat32(float32Number) {
 		f32Array[0] = float32Number;
 		let multiplier = mult10[((u8Array[3] & 0x7f) << 1) | (u8Array[2] >> 7)];
-		return ((multiplier * float32Number + (float32Number > 0 ? 0.5 : -0.5)) >> 0) / multiplier
+		return ((multiplier * float32Number + (float32Number > 0 ? 0.5 : -0.5)) >> 0) / multiplier;
 	}
 
 	let textEncoder;
@@ -1179,7 +1170,7 @@
 	let extensions, extensionClasses;
 	const hasNodeBuffer = typeof Buffer !== 'undefined';
 	const ByteArrayAllocate = hasNodeBuffer ?
-		function(length) { return Buffer.allocUnsafeSlow(length) } : Uint8Array;
+		function(length) { return Buffer.allocUnsafeSlow(length); } : Uint8Array;
 	const ByteArray = hasNodeBuffer ? Buffer : Uint8Array;
 	const MAX_BUFFER_SIZE = hasNodeBuffer ? 0x100000000 : 0x7fd00000;
 	let target, keysTarget;
@@ -1187,7 +1178,6 @@
 	let position = 0;
 	let safeEnd;
 	let bundledStrings = null;
-	let writeStructSlots;
 	const MAX_BUNDLE_SIZE = 0x5500; // maximum characters such that the encoded bytes fits in 16 bits.
 	const hasNonLatin = /[\u0080-\uFFFF]/;
 	const RECORD_SYMBOL = Symbol('record-id');
@@ -1200,10 +1190,10 @@
 			let structures;
 			let referenceMap;
 			let encodeUtf8 = ByteArray.prototype.utf8Write ? function(string, position) {
-				return target.utf8Write(string, position, target.byteLength - position)
+				return target.utf8Write(string, position, target.byteLength - position);
 			} : (textEncoder && textEncoder.encodeInto) ?
 				function(string, position) {
-					return textEncoder.encodeInto(string, target.subarray(position)).written
+					return textEncoder.encodeInto(string, target.subarray(position)).written;
 				} : false;
 
 			let packr = this;
@@ -1215,7 +1205,7 @@
 			if (maxSharedStructures == null)
 				maxSharedStructures = hasSharedStructures ? 32 : 0;
 			if (maxSharedStructures > 8160)
-				throw new Error('Maximum maxSharedStructure is 8160')
+				throw new Error('Maximum maxSharedStructure is 8160');
 			if (options.structuredClone && options.moreTypes == undefined) {
 				this.moreTypes = true;
 			}
@@ -1229,7 +1219,7 @@
 			let sharedLimitId = maxSharedStructures + 0x40;
 			let maxStructureId = maxSharedStructures + maxOwnStructures + 0x40;
 			if (maxStructureId > 8256) {
-				throw new Error('Maximum maxSharedStructure + maxOwnStructure is 8192')
+				throw new Error('Maximum maxSharedStructure + maxOwnStructure is 8192');
 			}
 			let recordIdsToRemove = [];
 			let transitionsCount = 0;
@@ -1265,7 +1255,7 @@
 					let sharedLength = structures.sharedLength || 0;
 					if (sharedLength > maxSharedStructures) {
 						//if (maxSharedStructures <= 32 && structures.sharedLength > 32) // TODO: could support this, but would need to update the limit ids
-						throw new Error('Shared structures is larger than maximum shared structures, try increasing maxSharedStructures to ' + structures.sharedLength)
+						throw new Error('Shared structures is larger than maximum shared structures, try increasing maxSharedStructures to ' + structures.sharedLength);
 					}
 					if (!structures.transitions) {
 						// rebuild our structure transitions
@@ -1273,7 +1263,7 @@
 						for (let i = 0; i < sharedLength; i++) {
 							let keys = structures[i];
 							if (!keys)
-								continue
+								continue;
 							let nextTransition, transition = structures.transitions;
 							for (let j = 0, l = keys.length; j < l; j++) {
 								let key = keys[j];
@@ -1295,14 +1285,7 @@
 					hasSharedUpdate = false;
 				let encodingError;
 				try {
-					if (packr.randomAccessStructure && value && typeof value === 'object') {
-						if (value.constructor === Object) writeStruct(value); // simple object
-						else if (value.constructor !== Map && !Array.isArray(value) && !extensionClasses.some(extClass => value instanceof extClass)) {
-							// allow user classes, if they don't need special handling (but do use toJSON if available)
-							writeStruct(value.toJSON ? value.toJSON() : value);
-						} else pack(value);
-					} else
-						pack(value);
+					pack(value);
 					let lastBundle = bundledStrings;
 					if (bundledStrings)
 						writeBundles(start, pack, 0);
@@ -1339,15 +1322,15 @@
 						packr.offset = position;
 						let serialized = insertIds(target.subarray(start, position), idsToInsert);
 						referenceMap = null;
-						return serialized
+						return serialized;
 					}
 					packr.offset = position; // update the offset so next serialization doesn't write over our buffer, but can continue writing to same buffer sequentially
 					if (encodeOptions & REUSE_BUFFER_MODE) {
 						target.start = start;
 						target.end = position;
-						return target
+						return target;
 					}
-					return target.subarray(start, position) // position can change if we call pack again in saveStructures, so we get the buffer now
+					return target.subarray(start, position); // position can change if we call pack again in saveStructures, so we get the buffer now
 				} catch(error) {
 					encodingError = error;
 					throw error;
@@ -1362,12 +1345,12 @@
 							if (!encodingError) { // TODO: If there is an encoding error, should make the structures as uninitialized so they get rebuilt next time
 								if (packr.saveStructures(newSharedData, newSharedData.isCompatible) === false) {
 									// get updated structures and try again if the update failed
-									return packr.pack(value, encodeOptions)
+									return packr.pack(value, encodeOptions);
 								}
 								packr.lastNamedStructuresLength = sharedLength;
 								// don't keep large buffers around
 								if (target.length > 0x40000000) target = null;
-								return returnBuffer
+								return returnBuffer;
 							}
 						}
 					}
@@ -1453,7 +1436,7 @@
 						bundledStrings[twoByte ? 0 : 1] += value;
 						target[position++] = 0xc1;
 						pack(twoByte ? -strLength : strLength);
-						return
+						return;
 					}
 					let headerSize;
 					// first we estimate the header size, so we can write to the correct location
@@ -1527,7 +1510,7 @@
 				} else if (type === 'number') {
 					if (value >>> 0 === value) {// positive integer, 32-bit or less
 						// positive uint
-						if (value < 0x20 || (value < 0x80 && this.useRecords === false) || (value < 0x40 && !this.randomAccessStructure)) {
+						if (value < 0x40 || (value < 0x80 && this.useRecords === false)) {
 							target[position++] = value;
 						} else if (value < 0x100) {
 							target[position++] = 0xcc;
@@ -1566,7 +1549,7 @@
 									// this checks for rounding of numbers that were encoded in 32-bit float to nearest significant decimal digit that could be preserved
 									((xShifted = value * mult10[((target[position] & 0x7f) << 1) | (target[position + 1] >> 7)]) >> 0) === xShifted) {
 								position += 4;
-								return
+								return;
 							} else
 								position--; // move back into position for writing a double
 						}
@@ -1589,7 +1572,7 @@
 								target[position++] = 0x70; // "p" for pointer
 								targetView.setUint32(position, referee.id);
 								position += 4;
-								return
+								return;
 							} else
 								referenceMap.set(value, { offset: position - start });
 						}
@@ -1639,7 +1622,7 @@
 										} else {
 											pack(writeResult);
 										}
-										return
+										return;
 									}
 									let currentTarget = target;
 									let currentTargetView = targetView;
@@ -1656,7 +1639,7 @@
 												makeRoom(position);
 											return {
 												target, targetView, position: position - size
-											}
+											};
 										}, pack);
 									} finally {
 										// restore current target information (unless already restored)
@@ -1672,7 +1655,7 @@
 											makeRoom(result.length + position);
 										position = writeExtensionData(result, target, position, extension.type);
 									}
-									return
+									return;
 								}
 							}
 							// check isArray after extensions, because extensions can extend Array
@@ -1684,7 +1667,7 @@
 									const json = value.toJSON();
 									// if for some reason value.toJSON returns itself it'll loop forever
 									if (json !== value)
-										return pack(json)
+										return pack(json);
 								}
 
 								// if there is a writeFunction, use it, otherwise just encode as undefined
@@ -1723,7 +1706,7 @@
 								let chunks = [];
 								while (true) {
 									chunks.push(value & mask);
-									if ((value >> BigInt(63)) === empty) break
+									if ((value >> BigInt(63)) === empty) break;
 									value >>= BigInt(64);
 								}
 
@@ -1755,11 +1738,11 @@
 							if (array.length + position > safeEnd)
 								makeRoom(array.length + position);
 							position = writeExtensionData(array, target, position, 0x42);
-							return
+							return;
 						} else {
 							throw new RangeError(value + ' was too large to fit in MessagePack 64-bit integer format, use' +
 								' useBigIntExtension, or set largeBigIntToFloat to convert to float-64, or set' +
-								' largeBigIntToString to convert to string')
+								' largeBigIntToString to convert to string');
 						}
 					}
 					position += 8;
@@ -1772,7 +1755,7 @@
 						target[position++] = 0;
 					}
 				} else {
-					throw new Error('Unknown type: ' + type)
+					throw new Error('Unknown type: ' + type);
 				}
 			};
 
@@ -1923,7 +1906,7 @@
 				if (end > 0x1000000) {
 					// special handling for really large buffers
 					if ((end - start) > MAX_BUFFER_SIZE)
-						throw new Error('Packed buffer would be larger than maximum buffer size')
+						throw new Error('Packed buffer would be larger than maximum buffer size');
 					newSize = Math.min(MAX_BUFFER_SIZE,
 						Math.round(Math.max((end - start) * (end > 0x4000000 ? 1.25 : 2), 0x400000) / 0x1000) * 0x1000);
 				} else // faster handling for smaller buffers
@@ -1938,7 +1921,7 @@
 				position -= start;
 				start = 0;
 				safeEnd = newBuffer.length - 10;
-				return target = newBuffer
+				return target = newBuffer;
 			};
 			const newRecord = (transition, keys, newTransitions) => {
 				let recordId = structures.nextId;
@@ -2020,23 +2003,6 @@
 					target[insertionOffset + start] = keysTarget[0];
 				}
 			};
-			const writeStruct = (object) => {
-				let newPosition = writeStructSlots(object, target, start, position, structures, makeRoom, (value, newPosition, notifySharedUpdate) => {
-					if (notifySharedUpdate)
-						return hasSharedUpdate = true;
-					position = newPosition;
-					let startTarget = target;
-					pack(value);
-					resetStructures();
-					if (startTarget !== target) {
-						return { position, targetView, target }; // indicate the buffer was re-allocated
-					}
-					return position;
-				}, this);
-				if (newPosition === 0) // bail and go to a msgpack object
-					return writeObject(object);
-				position = newPosition;
-			};
 		}
 		useBuffer(buffer) {
 			// this means we are finished using our own buffer and we can write over it safely
@@ -2054,8 +2020,6 @@
 		clearSharedData() {
 			if (this.structures)
 				this.structures = [];
-			if (this.typedStructs)
-				this.typedStructs = [];
 		}
 	}
 
@@ -2079,7 +2043,7 @@
 			} else if (isNaN(seconds)) {
 				if (this.onInvalidDate) {
 					allocateForWrite(0);
-					return pack(this.onInvalidDate())
+					return pack(this.onInvalidDate());
 				}
 				// Intentionally invalid timestamp
 				let { target, targetView, position} = allocateForWrite(3);
@@ -2100,7 +2064,7 @@
 		pack(set, allocateForWrite, pack) {
 			if (this.setAsEmptyObject) {
 				allocateForWrite(0);
-				return pack({})
+				return pack({});
 			}
 			let array = Array.from(set);
 			let { target, position} = allocateForWrite(this.moreTypes ? 3 : 0);
@@ -2208,19 +2172,19 @@
 		switch (length) {
 			case 1:
 				target[position++] = 0xd4;
-				break
+				break;
 			case 2:
 				target[position++] = 0xd5;
-				break
+				break;
 			case 4:
 				target[position++] = 0xd6;
-				break
+				break;
 			case 8:
 				target[position++] = 0xd7;
-				break
+				break;
 			case 16:
 				target[position++] = 0xd8;
-				break
+				break;
 			default:
 				if (length < 0x100) {
 					target[position++] = 0xc7;
@@ -2240,7 +2204,7 @@
 		target[position++] = type;
 		target.set(result, position);
 		position += length;
-		return position
+		return position;
 	}
 
 	function insertIds(serialized, idsToInsert) {
@@ -2262,7 +2226,7 @@
 			serialized[position++] = id & 0xff;
 			lastEnd = offset;
 		}
-		return serialized
+		return serialized;
 	}
 
 	function writeBundles(start, pack, incrementPosition) {
@@ -2279,9 +2243,9 @@
 	function addExtension(extension) {
 		if (extension.Class) {
 			if (!extension.pack && !extension.write)
-				throw new Error('Extension has no pack or write function')
+				throw new Error('Extension has no pack or write function');
 			if (extension.pack && !extension.type)
-				throw new Error('Extension has no type (numeric code to identify the extension)')
+				throw new Error('Extension has no type (numeric code to identify the extension)');
 			extensionClasses.unshift(extension.Class);
 			extensions.unshift(extension);
 		}
@@ -2294,7 +2258,7 @@
 				packr._mergeStructures(existingStructures);
 			return compatible;
 		};
-		return structures
+		return structures;
 	}
 
 	let defaultPackr = new Packr({ useRecords: false });
@@ -2315,13 +2279,13 @@
 	 */
 	function packIter (objectIterator, options = {}) {
 	  if (!objectIterator || typeof objectIterator !== 'object') {
-	    throw new Error('first argument must be an Iterable, Async Iterable, or a Promise for an Async Iterable')
+	    throw new Error('first argument must be an Iterable, Async Iterable, or a Promise for an Async Iterable');
 	  } else if (typeof objectIterator[Symbol.iterator] === 'function') {
-	    return packIterSync(objectIterator, options)
+	    return packIterSync(objectIterator, options);
 	  } else if (typeof objectIterator.then === 'function' || typeof objectIterator[Symbol.asyncIterator] === 'function') {
-	    return packIterAsync(objectIterator, options)
+	    return packIterAsync(objectIterator, options);
 	  } else {
-	    throw new Error('first argument must be an Iterable, Async Iterable, Iterator, Async Iterator, or a Promise')
+	    throw new Error('first argument must be an Iterable, Async Iterable, Iterator, Async Iterator, or a Promise');
 	  }
 	}
 
@@ -2348,7 +2312,7 @@
 	 */
 	function unpackIter (bufferIterator, options = {}) {
 	  if (!bufferIterator || typeof bufferIterator !== 'object') {
-	    throw new Error('first argument must be an Iterable, Async Iterable, Iterator, Async Iterator, or a promise')
+	    throw new Error('first argument must be an Iterable, Async Iterable, Iterator, Async Iterator, or a promise');
 	  }
 
 	  const unpackr = new Unpackr(options);
@@ -2368,10 +2332,10 @@
 	        incomplete = chunk.slice(err.lastPosition);
 	        yields = err.values;
 	      } else {
-	        throw err
+	        throw err;
 	      }
 	    }
-	    return yields
+	    return yields;
 	  };
 
 	  if (typeof bufferIterator[Symbol.iterator] === 'function') {
@@ -2379,13 +2343,13 @@
 	      for (const value of bufferIterator) {
 	        yield * parser(value);
 	      }
-	    })()
+	    })();
 	  } else if (typeof bufferIterator[Symbol.asyncIterator] === 'function') {
 	    return (async function * iter () {
 	      for await (const value of bufferIterator) {
 	        yield * parser(value);
 	      }
-	    })()
+	    })();
 	  }
 	}
 	const decodeIter = unpackIter;