msgpackr 1.10.2 → 1.11.0

package/dist/test.js

@@ -1228,7 +1228,7 @@
 			if (!this.structures && options.useRecords != false)
 				this.structures = [];
 			// two byte record ids for shared structures
-			let useTwoByteRecords = maxSharedStructures > 32 || (maxOwnStructures + maxSharedStructures > 64);		
+			let useTwoByteRecords = maxSharedStructures > 32 || (maxOwnStructures + maxSharedStructures > 64);
 			let sharedLimitId = maxSharedStructures + 0x40;
 			let maxStructureId = maxSharedStructures + maxOwnStructures + 0x40;
 			if (maxStructureId > 8256) {
@@ -1246,7 +1246,7 @@
 				}
 				safeEnd = target.length - 10;
 				if (safeEnd - position < 0x800) {
-					// don't start too close to the end, 
+					// don't start too close to the end,
 					target = new ByteArrayAllocate(target.length);
 					targetView = target.dataView || (target.dataView = new DataView(target.buffer, 0, target.length));
 					safeEnd = target.length - 10;
@@ -1589,7 +1589,7 @@
 								targetView.setUint32(position, referee.id);
 								position += 4;
 								return
-							} else 
+							} else
 								referenceMap.set(value, { offset: position - start });
 						}
 						let constructor = value.constructor;
@@ -1617,7 +1617,7 @@
 									pack(entryValue);
 								}
 							}
-						} else {	
+						} else {
 							for (let i = 0, l = extensions.length; i < l; i++) {
 								let extensionClass = extensionClasses[i];
 								if (value instanceof extensionClass) {
@@ -1685,11 +1685,11 @@
 									if (json !== value)
 										return pack(json)
 								}
-								
+
 								// if there is a writeFunction, use it, otherwise just encode as undefined
 								if (type === 'function')
 									return pack(this.writeFunction && this.writeFunction(value));
-								
+
 								// no extension found, write as plain object
 								writeObject(value);
 							}
@@ -1747,9 +1747,19 @@
 				}
 			};
 
-			const writePlainObject = (this.variableMapSize || this.coercibleKeyAsNumber) ? (object) => {
+			const writePlainObject = (this.variableMapSize || this.coercibleKeyAsNumber || this.skipValues) ? (object) => {
 				// this method is slightly slower, but generates "preferred serialization" (optimally small for smaller objects)
-				let keys = Object.keys(object);
+				let keys;
+				if (this.skipValues) {
+					keys = [];
+					for (let key in object) {
+						if ((typeof object.hasOwnProperty !== 'function' || object.hasOwnProperty(key)) &&
+							!this.skipValues.includes(object[key]))
+							keys.push(key);
+					}
+				} else {
+					keys = Object.keys(object);
+				}
 				let length = keys.length;
 				if (length < 0x10) {
 					target[position++] = 0x80 | length;
@@ -1868,9 +1878,9 @@
 					}
 			};
 
-			// craete reference to useRecords if useRecords is a function
+			// create reference to useRecords if useRecords is a function
 			const checkUseRecords = typeof this.useRecords == 'function' && this.useRecords;
-			
+
 			const writeObject = checkUseRecords ? (object) => {
 				checkUseRecords(object) ? writeRecord(object) : writePlainObject(object);
 			} : writeRecord;
@@ -1998,9 +2008,15 @@
 		useBuffer(buffer) {
 			// this means we are finished using our own buffer and we can write over it safely
 			target = buffer;
-			targetView = new DataView(target.buffer, target.byteOffset, target.byteLength);
+			target.dataView || (target.dataView = new DataView(target.buffer, target.byteOffset, target.byteLength));
 			position = 0;
 		}
+		set position (value) {
+			position = value;
+		}
+		get position() {
+			return position;
+		}
 		clearSharedData() {
 			if (this.structures)
 				this.structures = [];
@@ -2715,6 +2731,8 @@
 			src = Uint8Array.prototype.slice.call(src, position, srcEnd);
 			srcEnd -= position;
 			position = 0;
+			if (!unpackr.getStructures)
+				throw new Error(`Reference to shared structure ${recordId} without getStructures method`);
 			unpackr._mergeStructures(unpackr.getStructures());
 			if (!unpackr.typedStructs)
 				throw new Error('Could not find any shared typed structures');
@@ -4247,6 +4265,54 @@
 			const deserialized = unpack(serialized);
 			assert.deepStrictEqual(deserialized, { someData: [1, 2, 3, 4] });
 		});
+		test('skip values', function () {
+			var data = {
+				data: [
+					{ a: 1, name: 'one', type: 'odd', isOdd: true },
+					{ a: 2, name: 'two', type: 'even', isOdd: undefined },
+					{ a: 3, name: 'three', type: 'odd', isOdd: true },
+					{ a: 4, name: 'four', type: 'even', isOdd: null},
+					{ a: 5, name: 'five', type: 'odd', isOdd: true },
+					{ a: 6, name: 'six', type: 'even', isOdd: null }
+				],
+				description: 'some names',
+				types: ['odd', 'even'],
+				convertEnumToNum: [
+					{ prop: 'test' },
+					{ prop: 'test' },
+					{ prop: 'test' },
+					{ prop: 1 },
+					{ prop: 2 },
+					{ prop: [undefined, null] },
+					{ prop: null }
+				]
+			};
+			var expected = {
+				data: [
+					{ a: 1, name: 'one', type: 'odd', isOdd: true },
+					{ a: 2, name: 'two', type: 'even' },
+					{ a: 3, name: 'three', type: 'odd', isOdd: true },
+					{ a: 4, name: 'four', type: 'even', },
+					{ a: 5, name: 'five', type: 'odd', isOdd: true },
+					{ a: 6, name: 'six', type: 'even' }
+				],
+				description: 'some names',
+				types: ['odd', 'even'],
+				convertEnumToNum: [
+					{ prop: 'test' },
+					{ prop: 'test' },
+					{ prop: 'test' },
+					{ prop: 1 },
+					{ prop: 2 },
+					{ prop: [undefined, null] },
+					{}
+				]
+			};
+			let packr = new Packr({ useRecords: false, skipValues: [undefined, null] });
+			var serialized = packr.pack(data);
+			var deserialized = packr.unpack(serialized);
+			assert.deepEqual(deserialized, expected);
+		});
 	});
 	suite('msgpackr performance tests', function(){
 		test('performance JSON.parse', function() {