cbor-x 1.5.3 → 1.5.5

package/dist/index.js

@@ -821,9 +821,18 @@
 		return (glbl[data[0]] || Error)(data[1], data[2])
 	};
 	const packedTable = (read) => {
-		if (src[position$1++] != 0x84)
-			throw new Error('Packed values structure must be followed by a 4 element array')
+		if (src[position$1++] != 0x84) {
+			let error = new Error('Packed values structure must be followed by a 4 element array');
+			if (src.length < position$1)
+				error.incomplete = true;
+			throw error
+		}
 		let newPackedValues = read(); // packed values
+		if (!newPackedValues || !newPackedValues.length) {
+			let error = new Error('Packed values structure must be followed by a 4 element array');
+			error.incomplete = true;
+			throw error
+		}
 		packedValues = packedValues ? newPackedValues.concat(packedValues.slice(newPackedValues.length)) : newPackedValues;
 		packedValues.prefixes = read();
 		packedValues.suffixes = read();
@@ -841,7 +850,10 @@
 		}
 		if (typeof data == 'number')
 			return packedValues[16 + (data >= 0 ? 2 * data : (-2 * data - 1))]
-		throw new Error('No support for non-integer packed references yet')
+		let error = new Error('No support for non-integer packed references yet');
+		if (data === undefined)
+			error.incomplete = true;
+		throw error
 	};
 
 	// The following code is an incomplete implementation of http://cbor.schmorp.de/stringref
@@ -967,7 +979,15 @@
 			currentExtensions[littleEndian ? tag : (tag - 4)] = (bytesPerElement == 1 || littleEndian == isLittleEndianMachine$1) ? (buffer) => {
 				if (!TypedArray)
 					throw new Error('Could not find typed array for code ' + tag)
-				// we have to always slice/copy here to get a new ArrayBuffer that is word/byte aligned
+				if (!currentDecoder.copyBuffers) {
+					// try provide a direct view, but will only work if we are byte-aligned
+					if (bytesPerElement === 1 ||
+						bytesPerElement === 2 && !(buffer.byteOffset & 1) ||
+						bytesPerElement === 4 && !(buffer.byteOffset & 3) ||
+						bytesPerElement === 8 && !(buffer.byteOffset & 7))
+						return new TypedArray(buffer.buffer, buffer.byteOffset, buffer.byteLength);
+				}
+				// we have to slice/copy here to get a new ArrayBuffer, if we are not word/byte aligned
 				return new TypedArray(Uint8Array.prototype.slice.call(buffer, 0).buffer)
 			} : buffer => {
 				if (!TypedArray)
@@ -1653,6 +1673,13 @@
 								error.iteratorNotHandled = true;
 								throw error;
 							}
+							if (this.useToJSON && value.toJSON) {
+								const json = value.toJSON();
+								// if for some reason value.toJSON returns itself it'll loop forever
+								if (json !== value)
+									return encode(json)
+							}
+
 							// no extension found, write as object
 							writeObject(value, !value.hasOwnProperty); // if it doesn't have hasOwnProperty, don't do hasOwnProperty checks
 						}
@@ -1706,7 +1733,7 @@
 				}
 				if (encoder.keyMap) { 
 					for (let i = 0; i < length; i++) {
-						encode(encodeKey(keys[i]));
+						encode(encoder.encodeKey(keys[i]));
 						encode(vals[i]);
 					}
 				} else {