cbor-x 1.6.6 → 1.6.8

package/encode.js

@@ -181,7 +181,7 @@ export class Encoder extends Decoder {
 				if (throwOnIterable)
 					return;
 				encode(value)
-				if (bundledStrings) {
+				if (bundledStrings && bundledStrings.position) { // position is only set once a bundle has been started
 					writeBundles(start, encode)
 				}
 				encoder.offset = position // update the offset so next serialization doesn't write over our buffer, but can continue writing to same buffer sequentially

package/iterators.js

@@ -47,7 +47,7 @@ export function decodeIter (bufferIterator, options = {}) {
   }
 
   const decoder = new Decoder(options)
-  let incomplete
+  let incomplete, fatalError
   const parser = (chunk) => {
     let yields
     // if there's incomplete data from previous chunk, concatinate and try again
@@ -59,26 +59,28 @@ export function decodeIter (bufferIterator, options = {}) {
     try {
       yields = decoder.decodeMultiple(chunk)
     } catch (err) {
+      yields = err.values
       if (err.incomplete) {
         incomplete = chunk.slice(err.lastPosition)
-        yields = err.values
       } else {
-        throw err
+        fatalError = err
       }
     }
-    return yields
+    return yields || []
   }
 
   if (typeof bufferIterator[Symbol.iterator] === 'function') {
     return (function * iter () {
       for (const value of bufferIterator) {
         yield * parser(value)
+        if (fatalError) throw fatalError
       }
     })()
   } else if (typeof bufferIterator[Symbol.asyncIterator] === 'function') {
     return (async function * iter () {
       for await (const value of bufferIterator) {
         yield * parser(value)
+        if (fatalError) throw fatalError
       }
     })()
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cbor-x",
   "author": "Kris Zyp",
-  "version": "1.6.6",
+  "version": "1.6.8",
   "description": "Ultra-fast and conformant CBOR (RFC 8949) implementation with support for numerous tag extensions including records and structured cloning",
   "license": "MIT",
   "types": "./index.d.ts",

package/stream.js

@@ -36,24 +36,22 @@ export class DecoderStream extends Transform {
 			chunk = Buffer.concat([this.incompleteBuffer, chunk])
 			this.incompleteBuffer = null
 		}
-		let values
+		let values, fatalError
 		try {
 			values = this.decoder.decodeMultiple(chunk)
 		} catch(error) {
-			if (error.incomplete) {
+			values = error.values
+			if (error.incomplete)
 				this.incompleteBuffer = chunk.slice(error.lastPosition)
-				values = error.values
-			} else {
-				return callback(error)
-			}
-		} finally {
-			for (let value of values || []) {
-				if (value === null)
-					value = this.getNullValue()
-				this.push(value)
-			}
+			else
+				fatalError = error
+		}
+		for (let value of values || []) {
+			if (value === null)
+				value = this.getNullValue()
+			this.push(value)
 		}
-		callback()
+		callback(fatalError)
 	}
 	getNullValue() {
 		return Symbol.for(null)