cbor-x 1.5.2 → 1.5.4

package/dist/node.cjs

@@ -36,6 +36,16 @@ let defaultOptions = {
 	mapsAsObjects: true
 };
 let sequentialMode = false;
+let inlineObjectReadThreshold = 2;
+// no-eval build
+try {
+	new Function('');
+} catch(error) {
+	// if eval variants are not supported, do not create inline object readers ever
+	inlineObjectReadThreshold = Infinity;
+}
+
+
 
 class Decoder {
 	constructor(options) {
@@ -468,7 +478,7 @@ function createStructureReader(structure) {
 				return compiledReader(read) // with the right length, so we use it
 			compiledReader = compiledReader.next; // see if there is another reader with the right length
 		}
-		if (this.slowReads++ >= 3) { // create a fast compiled reader
+		if (this.slowReads++ >= inlineObjectReadThreshold) { // create a fast compiled reader
 			let array = this.length == length ? this : this.slice(0, length);
 			compiledReader = currentDecoder.keyMap 
 			? new Function('r', 'return {' + array.map(k => currentDecoder.decodeKey(k)).map(k => validName.test(k) ? safeKey(k) + ':r()' : ('[' + JSON.stringify(k) + ']:r()')).join(',') + '}')
@@ -1135,7 +1145,7 @@ try {
 	textEncoder = new TextEncoder();
 } catch (error) {}
 let extensions, extensionClasses;
-const Buffer$1 = globalThis.Buffer;
+const Buffer$1 = typeof globalThis === 'object' && globalThis.Buffer;
 const hasNodeBuffer = typeof Buffer$1 !== 'undefined';
 const ByteArrayAllocate = hasNodeBuffer ? Buffer$1.allocUnsafeSlow : Uint8Array;
 const ByteArray = hasNodeBuffer ? Buffer$1 : Uint8Array;
@@ -1686,6 +1696,13 @@ class Encoder extends Decoder {
 							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
 					}
@@ -1739,7 +1756,7 @@ class Encoder extends Decoder {
 			}
 			if (encoder.keyMap) { 
 				for (let i = 0; i < length; i++) {
-					encode(encodeKey(keys[i]));
+					encode(encoder.encodeKey(keys[i]));
 					encode(vals[i]);
 				}
 			} else {