msgpackr 1.9.1 → 1.9.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "msgpackr",
   "author": "Kris Zyp",
-  "version": "1.9.1",
+  "version": "1.9.3",
   "description": "Ultra-fast MessagePack implementation with extensions for records and structured cloning",
   "license": "MIT",
   "types": "./index.d.ts",
@@ -20,7 +20,7 @@
   },
   "scripts": {
     "benchmark": "node ./tests/benchmark.cjs",
-    "build": "rollup -c && cpy index.d.ts . --rename=index.d.cts",
+    "build": "rollup -c && cpy index.d.ts . --rename=index.d.cts && cpy pack.d.ts . --rename=pack.d.cts && cpy unpack.d.ts . --rename=unpack.d.cts",
     "dry-run": "npm publish --dry-run",
     "prepare": "npm run build",
     "test": "mocha tests/test**.*js -u tdd --experimental-json-modules"
@@ -28,6 +28,10 @@
   "type": "module",
   "exports": {
     ".": {
+      "types": {
+        "require": "./index.d.cts",
+        "import": "./index.d.ts"
+      },
       "node": {
         "require": "./dist/node.cjs",
         "import": "./node-index.js"
@@ -36,13 +40,13 @@
         "require": "./dist/node.cjs",
         "import": "./node-index.js"
       },
-      "types": {
-        "require": "./index.d.cts",
-        "import": "./index.d.ts"
-      },
       "default": "./index.js"
     },
     "./pack": {
+      "types": {
+        "require": "./pack.d.cts",
+        "import": "./pack.d.ts"
+      },
       "node": {
         "import": "./index.js",
         "require": "./dist/node.cjs"
@@ -54,6 +58,10 @@
       "default": "./pack.js"
     },
     "./unpack": {
+      "types": {
+        "require": "./unpack.d.cts",
+        "import": "./unpack.d.ts"
+      },
       "node": {
         "import": "./index.js",
         "require": "./dist/node.cjs"

package/unpack.d.cts

@@ -0,0 +1,2 @@
+export { Unpackr, Decoder, unpack, unpackMultiple, decode,
+	addExtension, FLOAT32_OPTIONS, Options, Extension, clearSource, roundFloat32 } from '.'

package/unpack.js

@@ -119,10 +119,10 @@ export class Unpackr {
 			let size = source.length
 			let value = this ? this.unpack(source, size) : defaultUnpackr.unpack(source, size)
 			if (forEach) {
-				if (forEach(value) === false) return;
+				if (forEach(value, lastPosition, position) === false) return;
 				while(position < size) {
 					lastPosition = position
-					if (forEach(checkedRead()) === false) {
+					if (forEach(checkedRead(), lastPosition, position) === false) {
 						return
 					}
 				}
@@ -199,6 +199,10 @@ export function checkedRead(options) {
 			position = bundledStrings.postBundlePosition
 			bundledStrings = null
 		}
+		if (sequentialMode)
+			// we only need to restore the structures if there was an error, but if we completed a read,
+			// we can clear this out and keep the structures we read
+			currentStructures.restoreStructures = null
 
 		if (position == srcEnd) {
 			// finished reading this source, cleanup references
@@ -971,7 +975,10 @@ const recordDefinition = (id, highByte) => {
 		structure.highByte = highByte
 	}
 	let existingStructure = currentStructures[id]
-	if (existingStructure && existingStructure.isShared) {
+	// If it is a shared structure, we need to restore any changes after reading.
+	// Also in sequential mode, we may get incomplete reads and thus errors, and we need to restore
+	// to the state prior to an incomplete read in order to properly resume.
+	if (existingStructure && (existingStructure.isShared || sequentialMode)) {
 		(currentStructures.restoreStructures || (currentStructures.restoreStructures = []))[id] = existingStructure
 	}
 	currentStructures[id] = structure
@@ -981,10 +988,10 @@ const recordDefinition = (id, highByte) => {
 currentExtensions[0] = () => {} // notepack defines extension 0 to mean undefined, so use that as the default here
 currentExtensions[0].noBuffer = true
 
-let glbl = typeof globalThis === 'object' ? globalThis : window;
+let errors = { Error, TypeError, ReferenceError };
 currentExtensions[0x65] = () => {
 	let data = read()
-	return (glbl[data[0]] || Error)(data[1])
+	return (errors[data[0]] || Error)(data[1])
 }
 
 currentExtensions[0x69] = (data) => {
@@ -1022,6 +1029,7 @@ currentExtensions[0x73] = () => new Set(read())
 
 export const typedArrays = ['Int8','Uint8','Uint8Clamped','Int16','Uint16','Int32','Uint32','Float32','Float64','BigInt64','BigUint64'].map(type => type + 'Array')
 
+let glbl = typeof globalThis === 'object' ? globalThis : window;
 currentExtensions[0x74] = (data) => {
 	let typeCode = data[0]
 	let typedArrayName = typedArrays[typeCode]