Fixed #42; version bump

calebsander · calebsander · commit 208c54ee5a80 · 2016-11-17T19:53:44.000-05:00
diff --git a/compiled/download.js b/compiled/download.js
diff --git a/compiled/upload-download.js b/compiled/upload-download.js
diff --git a/compiled/upload.js b/compiled/upload.js
diff --git a/docs/ArrayType.html b/docs/ArrayType.html
@@ -141,7 +141,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1002">line 1002</a>
+        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1007">line 1007</a>
     </li></ul></dd>
     
 
@@ -1152,7 +1152,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1043">line 1043</a>
+        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1048">line 1048</a>
     </li></ul></dd>
     
 
diff --git a/docs/ChoiceType.html b/docs/ChoiceType.html
@@ -145,7 +145,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1219">line 1219</a>
+        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1224">line 1224</a>
     </li></ul></dd>
     
 
@@ -1159,7 +1159,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1253">line 1253</a>
+        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1258">line 1258</a>
     </li></ul></dd>
     
 
diff --git a/docs/EnumType.html b/docs/EnumType.html
@@ -214,7 +214,7 @@ <h6>Properties</h6>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1151">line 1151</a>
+        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1156">line 1156</a>
     </li></ul></dd>
     
 
@@ -1232,7 +1232,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1196">line 1196</a>
+        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1201">line 1201</a>
     </li></ul></dd>
     
 
diff --git a/docs/GrowableBuffer.html b/docs/GrowableBuffer.html
@@ -1338,7 +1338,7 @@ <h4 class="name" id="toBuffer"><span class="type-signature"></span>toBuffer<span
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="lib_growable-buffer.js.html">lib/growable-buffer.js</a>, <a href="lib_growable-buffer.js.html#line158">line 158</a>
+        <a href="lib_growable-buffer.js.html">lib/growable-buffer.js</a>, <a href="lib_growable-buffer.js.html#line159">line 159</a>
     </li></ul></dd>
     
 
diff --git a/docs/MapType.html b/docs/MapType.html
@@ -164,7 +164,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1089">line 1089</a>
+        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1094">line 1094</a>
     </li></ul></dd>
     
 
@@ -1178,7 +1178,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1122">line 1122</a>
+        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1127">line 1127</a>
     </li></ul></dd>
     
 
diff --git a/docs/NamedChoiceType.html b/docs/NamedChoiceType.html
@@ -156,7 +156,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1302">line 1302</a>
+        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1307">line 1307</a>
     </li></ul></dd>
     
 
@@ -1189,7 +1189,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1368">line 1368</a>
+        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1373">line 1373</a>
     </li></ul></dd>
     
 
diff --git a/docs/OptionalType.html b/docs/OptionalType.html
@@ -142,7 +142,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1522">line 1522</a>
+        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1527">line 1527</a>
     </li></ul></dd>
     
 
@@ -1162,7 +1162,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1555">line 1555</a>
+        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1560">line 1560</a>
     </li></ul></dd>
     
 
diff --git a/docs/PointerType.html b/docs/PointerType.html
@@ -144,7 +144,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1588">line 1588</a>
+        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1593">line 1593</a>
     </li></ul></dd>
     
 
@@ -1165,7 +1165,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1630">line 1630</a>
+        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1635">line 1635</a>
     </li></ul></dd>
     
 
diff --git a/docs/RecursiveType.html b/docs/RecursiveType.html
@@ -145,7 +145,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1405">line 1405</a>
+        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1410">line 1410</a>
     </li></ul></dd>
     
 
@@ -1163,7 +1163,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1479">line 1479</a>
+        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1484">line 1484</a>
     </li></ul></dd>
     
 
diff --git a/docs/SetType.html b/docs/SetType.html
@@ -93,7 +93,7 @@ <h4 class="name" id="SetType"><span class="type-signature"></span>new SetType<sp
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1059">line 1059</a>
+        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1064">line 1064</a>
     </li></ul></dd>
     
 
@@ -1104,7 +1104,7 @@ <h5>Parameters:</h5>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1071">line 1071</a>
+        <a href="structure-types.js.html">structure-types.js</a>, <a href="structure-types.js.html#line1076">line 1076</a>
     </li></ul></dd>
     
 
diff --git a/docs/lib_growable-buffer.js.html b/docs/lib_growable-buffer.js.html
@@ -162,6 +162,7 @@ <h1 class="page-title">Source: lib/growable-buffer.js</h1>
 	 * @return {GrowableBuffer} {@link this}
 	 */
 	addAll(buffer) {
+		assert.instanceOf(buffer, ArrayBuffer)
 		const oldSize = this.size
 		const newSize = this.size + buffer.byteLength
 		this.grow(newSize)
diff --git a/docs/structure-types.js.html b/docs/structure-types.js.html
@@ -1011,8 +1011,13 @@ <h1 class="page-title">Source: structure-types.js</h1>
 		assert.instanceOf(value, Object)
 		for (const field of this.fields) {
 			const fieldValue = value[field[NAME]]
-			if (fieldValue === undefined) assert.fail('Value for field "' + field[NAME] + '" missing')
-			field[TYPE].writeValue(buffer, fieldValue, false)
+			try { field[TYPE].writeValue(buffer, fieldValue, false) }
+			catch (writeError) {
+				//Reporting that field is missing is more useful than, for example,
+				//Saying "undefined is not an instance of Number"
+				if (fieldValue === undefined) assert.fail('Value for field "' + field[NAME] + '" missing')
+				throw writeError //throw original error if field is defined, but just invalid
+			}
 		}
 		setPointers(buffer, root)
 	}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "structure-bytes",
-	"version": "2.20.9",
+	"version": "2.21.9",
 	"description": "A library for more efficient data transfers by separating the structure from the values and efficiently storing each as binary data",
 	"main": "index.js",
 	"dependencies": {
@@ -15,7 +15,7 @@
 		"browserify": "13.1.x",
 		"coveralls": "2.11.x",
 		"google-closure-compiler-js": "20161024.0.0",
-		"nyc": "8.4.x"
+		"nyc": "9.0.x"
 	},
 	"directories": {
 		"test": "test"
diff --git a/structure-types.js b/structure-types.js
@@ -983,8 +983,13 @@ class StructType extends AbsoluteType {
 		assert.instanceOf(value, Object)
 		for (const field of this.fields) {
 			const fieldValue = value[field[NAME]]
-			if (fieldValue === undefined) assert.fail('Value for field "' + field[NAME] + '" missing')
-			field[TYPE].writeValue(buffer, fieldValue, false)
+			try { field[TYPE].writeValue(buffer, fieldValue, false) }
+			catch (writeError) {
+				//Reporting that field is missing is more useful than, for example,
+				//Saying "undefined is not an instance of Number"
+				if (fieldValue === undefined) assert.fail('Value for field "' + field[NAME] + '" missing')
+				throw writeError //throw original error if field is defined, but just invalid
+			}
 		}
 		setPointers(buffer, root)
 	}
diff --git a/test/value-bytes/struct.js b/test/value-bytes/struct.js
@@ -9,6 +9,10 @@ assert.throws(
 	() => type.writeValue(gb, {b: [true]}),
 	'Value for field "i" missing'
 )
+assert.throws(
+	() => type.writeValue(gb, {b: 2}),
+	'2 is not an instance of Array'
+)
 const VALUE = {
 	b: [true, false, true],
 	i: 675,
@@ -17,4 +21,20 @@ const VALUE = {
 gb = new GrowableBuffer
 type.writeValue(gb, VALUE)
 assert.equal(gb.toBuffer(), bufferFrom([0, 0, 0, 3, 0b10100000, 0x00, 0x00, 0x02, 0xa3, 0xc3, 0xa0, 0xc3, 0x9f, 0xc3, 0xa7, 0xc3, 0xb0, 0xc3, 0xaa, 0]))
-assert.equal(r.value({buffer: gb.toBuffer(), type}), VALUE)
+assert.equal(r.value({buffer: gb.toBuffer(), type}), VALUE)
+
+let typeWithOptionalField = new t.StructType({
+	optional: new t.OptionalType(new t.StringType),
+	required: new t.DoubleType
+})
+assert.equal(typeWithOptionalField.valueBuffer({
+	required: 2.0, optional: 'test'
+}), bufferFrom([
+	0xff,
+		0x74, 0x65, 0x73, 0x74, 0, //eslint-disable-line indent
+	0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+]))
+assert.equal(typeWithOptionalField.valueBuffer({required: 2.0}), bufferFrom([
+	0,
+	0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+]))
