cbor-x 0.9.4 → 1.2.0

package/dist/test.js

@@ -581,6 +581,17 @@
 		outcomesScore: outcomesScore
 	};
 
+	const senmlData = [ 
+		{ bn: '/3303/0/5700', bt: 1278887, v: 35.5 },
+		{ t: 10, v: 34 },
+		{ t: 20, v: 33 },
+		{ t: 30, v: 32 },
+		{ t: 40, v: 31 },
+		{ t: 50, v: 30 } 
+	];
+
+	const senmlKeys = { bs: -6, bv: -5, bu: -4, bt: -3, bn: -2, n: 0, u: 1, v: 2, vs: 3, t: 6, ut: 7, vd: 8 };
+
 	//import inspector from 'inspector'; inspector.open(9229, null, true); debugger
 	function tryRequire(module) {
 		try {
@@ -608,6 +619,27 @@
 	var ITERATIONS = 4000;
 
 	suite('CBOR basic tests', function(){
+
+		test('encode/decode with keyMaps (basic)', function() {
+			var data = senmlData;
+			let cborSenml = new Encoder({ useRecords: false, keyMap: senmlKeys });
+			let cborBasic = new Encoder();
+		  var serialized = cborSenml.encode(data);
+			var deserialized = cborSenml.decode(serialized);
+			assert(serialized.length < cborBasic.encode(data).length);
+			assert.deepEqual(deserialized, data);
+		});
+		
+		test('encode/decode with keyMaps and Records)', function() {
+			var data = senmlData;
+			let cborSenml = new Encoder({ useRecords: true, keyMap: senmlKeys });
+			let cborBasic = new Encoder();
+		  var serialized = cborSenml.encode(data);
+			var deserialized = cborSenml.decode(serialized);
+			assert(serialized.length < cborBasic.encode(data).length);
+			assert.deepEqual(deserialized, data);
+		});
+
 		test('encode/decode data', function(){
 			var data = {
 				data: [
@@ -633,8 +665,40 @@
 			let structures = [];
 			let encoder = new Encoder({ structures });
 			var serialized = encoder.encode(data);
+			serialized = encoder.encode(data);
+			var deserialized = encoder.decode(serialized);
+			assert.deepEqual(deserialized, data);
+		});
+
+		test('mixed structures, shared', function(){
+			let data1 = { a: 1, b: 2, c: 3 };
+			let data2 = { a: 1, b: 2, d: 4 };
+			let data3 = { a: 1, b: 2, e: 5 };
+			let structures = [];
+			let encoder = new Encoder({ structures });
+			var serialized = encoder.encode(data1);
+			var deserialized = encoder.decode(serialized);
+			assert.deepEqual(deserialized, data1);
+			var serialized = encoder.encode(data2);
+			var deserialized = encoder.decode(serialized);
+			assert.deepEqual(deserialized, data2);
+			var serialized = encoder.encode(data3);
+			var deserialized = encoder.decode(serialized);
+			assert.deepEqual(deserialized, data3);
+		});
+
+		test('mixed structures, unshared', function(){
+			let data = [];
+			let encoder = new Encoder({ });
+			for (let i = 0; i< 1000; i++) {
+				data.push({a: 1, ['test' + i]: i});
+			}
+			var serialized = encoder.encode(data);
 			var deserialized = encoder.decode(serialized);
 			assert.deepEqual(deserialized, data);
+			serialized = encoder.encode(data);
+			deserialized = encoder.decode(serialized);
+			assert.deepEqual(deserialized, data);
 		});
 
 		test('mixed array', function(){
@@ -677,9 +741,10 @@
 		});
 		test('encode/decode sample data with records', function(){
 			var data = sampleData;
-			let structures = [];
-			let encoder = new Encoder({ structures, useRecords: true });
+			let sharedSerialized;
+			let encoder = new Encoder({ getStructures() { return }, saveStructures(shared) { sharedSerialized = encode(shared); }, useRecords: true });
 			var serialized = encoder.encode(data);
+			encoder = new Encoder({ getStructures() { return decode(sharedSerialized) }, saveStructures(shared) { sharedSerialized = encode(shared); }, useRecords: true });
 			var deserialized = encoder.decode(serialized);
 			assert.deepEqual(deserialized, data);
 		});
@@ -692,8 +757,7 @@
 		});
 		test('encode/decode sample data with packing and records', function(){
 			var data = sampleData;
-			let structures = [];
-			let encoder = new Encoder({ structures, pack: true, useRecords: true });
+			let encoder = new Encoder({ useStringRefs: true });
 			var serialized = encoder.encode(data);
 			var deserialized = encoder.decode(serialized);
 			assert.deepEqual(deserialized, data);
@@ -732,6 +796,23 @@
 				assert.deepEqual(deserialized, data);
 			}
 		});
+		test('pack/unpack sample data with bundled strings', function(){
+			var data = sampleData;
+			let encoder = new Encoder({ /*structures,*/ useRecords: false, bundleStrings: true });
+			var serialized = encoder.encode(data);
+			var deserialized = encoder.decode(serialized);
+			assert.deepEqual(deserialized, data);
+		});
+		test('pack/unpack sample data with self-descriptive header', function(){
+			var data = sampleData;
+			let encoder = new Encoder({ useSelfDescribedHeader: true });
+			var serialized = encoder.encode(data);
+			var deserialized = encoder.decode(serialized);
+			assert.deepEqual(deserialized, data);
+			assert.equal(serialized[0], 0xd9);
+			assert.equal(serialized[1], 0xd9);
+			assert.equal(serialized[2], 0xf7);
+		});
 		if (typeof Buffer != 'undefined')
 		test('replace data', function(){
 			var data1 = {
@@ -843,6 +924,7 @@
 			let fa = new Float32Array(b.buffer, 8, 2);
 			fa[0] = 2.25;
 			fa[1] = 6;
+			let f64a = new Float64Array([2.3, 4.7]);
 			let map = new Map();
 			map.set('key', 'value');
 			let object = {
@@ -851,6 +933,7 @@
 				regexp: /test/gi,
 				map,
 				float32Array: fa,
+				float64Array: f64a,
 				uint16Array: new Uint16Array([3,4])
 			};
 			let encoder = new Encoder({
@@ -865,6 +948,8 @@
 			assert.equal(deserialized.float32Array.constructor.name, 'Float32Array');
 			assert.equal(deserialized.float32Array[0], 2.25);
 			assert.equal(deserialized.float32Array[1], 6);
+			assert.equal(deserialized.float64Array[0], 2.3);
+			assert.equal(deserialized.float64Array[1], 4.7);
 			assert.equal(deserialized.uint16Array.constructor.name, 'Uint16Array');
 			assert.equal(deserialized.uint16Array[0], 3);
 			assert.equal(deserialized.uint16Array[1], 4);
@@ -931,6 +1016,7 @@
 				date: new Date(1532219539733),
 				farFutureDate: new Date(3532219539133),
 				ancient: new Date(-3532219539133),
+				invalidDate: new Date('invalid')
 			};
 			let encoder = new Encoder();
 			var serialized = encoder.encode(data);
@@ -940,6 +1026,7 @@
 			assert.equal(deserialized.date.getTime(), 1532219539733);
 			assert.equal(deserialized.farFutureDate.getTime(), 3532219539133);
 			assert.equal(deserialized.ancient.getTime(), -3532219539133);
+			assert.equal(deserialized.invalidDate.toString(), 'Invalid Date');
 		});
 		test('map/date with options', function(){
 			var map = new Map();
@@ -948,6 +1035,7 @@
 			var data = {
 				map: map,
 				date: new Date(1532219539011),
+				invalidDate: new Date('invalid')
 			};
 			let encoder = new Encoder({
 				mapsAsObjects: true,
@@ -959,6 +1047,7 @@
 			assert.equal(deserialized.map[4], 'four');
 			assert.equal(deserialized.map.three, 3);
 			assert.equal(deserialized.date.getTime(), 1532219539000);
+			assert.isTrue(isNaN(deserialized.invalidDate.getTime()));
 		});
 		test('key caching', function() {
 			var data = {
@@ -1008,7 +1097,7 @@
 				useFloat32: DECIMAL_FIT
 			});
 			var serialized = encoder.encode(data);
-			assert.equal(serialized.length, 35);
+			assert.equal(serialized.length, 36);
 			var deserialized = encoder.decode(serialized);
 			assert.deepEqual(deserialized, data);
 		});
@@ -1118,7 +1207,10 @@
 			CBOR.decodeMultiple(new Uint8Array([1, 2, 3, 4]), value => values.push(value));
 			assert.deepEqual(values, [1, 2, 3, 4]);
 		});
-
+		test('bad input', function() {
+			let badInput = Buffer.from('7b2273657269616c6e6f223a2265343a30222c226970223a223139322e3136382e312e3335222c226b6579223a226770735f736563726574227d', 'hex');
+			assert.throws(function(){ decode(badInput); }); // should throw, not crash
+		});
 	});
 	suite('CBOR performance tests', function(){
 		test('performance JSON.parse', function() {
@@ -1143,7 +1235,7 @@
 			let structures = [];
 			var serialized = encode(data);
 			console.log('CBOR size', serialized.length);
-			let encoder = new Encoder({ structures });
+			let encoder = new Encoder({ structures, bundleStrings: true });
 			var serialized = encoder.encode(data);
 			console.log('CBOR w/ record ext size', serialized.length);
 			for (var i = 0; i < ITERATIONS; i++) {
@@ -1154,7 +1246,7 @@
 			var data = sampleData;
 			this.timeout(10000);
 			let structures = [];
-			let encoder = new Encoder({ structures });
+			let encoder = new Encoder({ structures, bundleStrings: true });
 			let buffer = typeof Buffer != 'undefined' ? Buffer.alloc(0x10000) : new Uint8Array(0x10000);
 
 			for (var i = 0; i < ITERATIONS; i++) {

package/encode.d.ts

@@ -1,5 +1,5 @@
 import { Decoder } from './decode'
-export { addExtension, FLOAT32_OPTIONS } from './unpack'
+export { addExtension, FLOAT32_OPTIONS } from './decode'
 export class Encoder extends Decoder {
 	encode(value: any): Buffer
 }