Merge branch 'array-buffer'

fetch.js

@@ -184,12 +184,24 @@
     return fileReaderReady(reader)
   }
 
+  function bufferClone(buf) {
+    if (buf.slice) {
+      return buf.slice(0)
+    } else {
+      var view = new Uint8Array(buf.byteLength)
+      view.set(new Uint8Array(buf))
+      return view.buffer
+    }
+  }
+
   function Body() {
     this.bodyUsed = false
 
     this._initBody = function(body) {
       this._bodyInit = body
-      if (typeof body === 'string') {
+      if (!body) {
+        this._bodyText = ''
+      } else if (typeof body === 'string') {
         this._bodyText = body
       } else if (support.blob && Blob.prototype.isPrototypeOf(body)) {
         this._bodyBlob = body
@@ -197,14 +209,12 @@
         this._bodyFormData = body
       } else if (support.searchParams && URLSearchParams.prototype.isPrototypeOf(body)) {
         this._bodyText = body.toString()
-      } else if (!body) {
-        this._bodyText = ''
       } else if (support.arrayBuffer && support.blob && isDataView(body)) {
+        this._bodyArrayBuffer = bufferClone(body.buffer)
         // IE 10-11 can't handle a DataView body.
-        this._bodyInit = new Blob([body.buffer])
+        this._bodyInit = new Blob([this._bodyArrayBuffer])
       } else if (support.arrayBuffer && (ArrayBuffer.prototype.isPrototypeOf(body) || isArrayBufferView(body))) {
-        // Only support ArrayBuffers for POST method.
-        // Receiving ArrayBuffers happens via Blobs, instead.
+        this._bodyArrayBuffer = bufferClone(body)
       } else {
         throw new Error('unsupported BodyInit type')
       }
@@ -229,36 +239,43 @@
 
         if (this._bodyBlob) {
           return Promise.resolve(this._bodyBlob)
+        } else if (this._bodyArrayBuffer) {
+          return Promise.resolve(new Blob([this._bodyArrayBuffer]))
         } else if (this._bodyFormData) {
           throw new Error('could not read FormData body as blob')
         } else {
           return Promise.resolve(new Blob([this._bodyText]))
         }
       }
+    }
 
-      this.arrayBuffer = function() {
-        return this.blob().then(readBlobAsArrayBuffer)
+    this.text = function() {
+      var rejected = consumed(this)
+      if (rejected) {
+        return rejected
       }
 
-      this.text = function() {
-        var rejected = consumed(this)
-        if (rejected) {
-          return rejected
-        }
+      if (this._bodyBlob) {
+        return readBlobAsText(this._bodyBlob)
+      } else if (this._bodyArrayBuffer) {
+        var view = new Uint8Array(this._bodyArrayBuffer)
+        var str = String.fromCharCode.apply(null, view)
+        return Promise.resolve(str)
+      } else if (this._bodyFormData) {
+        throw new Error('could not read FormData body as text')
+      } else {
+        return Promise.resolve(this._bodyText)
+      }
+    }
 
-        if (this._bodyBlob) {
-          return readBlobAsText(this._bodyBlob)
-        } else if (this._bodyFormData) {
-          throw new Error('could not read FormData body as text')
+    if (support.arrayBuffer) {
+      this.arrayBuffer = function() {
+        if (this._bodyArrayBuffer) {
+          return consumed(this) || Promise.resolve(this._bodyArrayBuffer)
         } else {
-          return Promise.resolve(this._bodyText)
+          return this.blob().then(readBlobAsArrayBuffer)
         }
       }
-    } else {
-      this.text = function() {
-        var rejected = consumed(this)
-        return rejected ? rejected : Promise.resolve(this._bodyText)
-      }
     }
 
     if (support.formData) {

test/test.js

@@ -63,6 +63,10 @@ function arrayBufferFromText(text) {
   return buf
 }
 
+function readArrayBufferAsText(buf) {
+  return String.fromCharCode.apply(null, new Uint8Array(buf))
+}
+
 var native = {}
 var keepGlobals = ['fetch', 'Headers', 'Request', 'Response']
 var exercise = ['polyfill']
@@ -97,6 +101,51 @@ exercise.forEach(function(exerciseMode) {
     var nativeFirefox = /Firefox\//.test(navigator.userAgent) && exerciseMode === 'native'
     var polyfillFirefox = /Firefox\//.test(navigator.userAgent) && exerciseMode === 'polyfill'
 
+    // https://fetch.spec.whatwg.org/#concept-bodyinit-extract
+    function testBodyExtract(factory) {
+      suite('body extract', function() {
+        var expected = 'Hello World!'
+        var inputs = [['type USVString', expected]]
+        if (support.blob) {
+          inputs.push(['type Blob', new Blob([expected])])
+        }
+        if (support.arrayBuffer) {
+          inputs = inputs.concat([
+            ['type ArrayBuffer', arrayBufferFromText(expected)],
+            ['type TypedArray', new Uint8Array(arrayBufferFromText(expected))],
+            ['type DataView', new DataView(arrayBufferFromText(expected))],
+          ])
+        }
+
+        inputs.forEach(function(input) {
+          var typeLabel = input[0], body = input[1]
+
+          suite(typeLabel, function() {
+            featureDependent(test, support.blob, 'consume as blob', function() {
+              var r = factory(body)
+              return r.blob().then(readBlobAsText).then(function(text) {
+                assert.equal(text, expected)
+              })
+            })
+
+            test('consume as text', function() {
+              var r = factory(body)
+              return r.text().then(function(text) {
+                assert.equal(text, expected)
+              })
+            })
+
+            featureDependent(test, support.arrayBuffer, 'consume as array buffer', function() {
+              var r = factory(body)
+              return r.arrayBuffer().then(readArrayBufferAsText).then(function(text) {
+                assert.equal(text, expected)
+              })
+            })
+          })
+        })
+      })
+    }
+
 // https://fetch.spec.whatwg.org/#headers-class
 suite('Headers', function() {
   test('constructor copies headers', function() {
@@ -426,39 +475,8 @@ suite('Request', function() {
     })
   })
 
-  // https://fetch.spec.whatwg.org/#concept-bodyinit-extract
-  suite('BodyInit extract', function() {
-    featureDependent(suite, support.blob, 'type Blob', function() {
-      test('consume as blob', function() {
-        var request = new Request('', {method: 'POST', body: new Blob(['hello'])})
-        return request.blob().then(readBlobAsText).then(function(text) {
-          assert.equal(text, 'hello')
-        })
-      })
-
-      test('consume as text', function() {
-        var request = new Request('', {method: 'POST', body: new Blob(['hello'])})
-        return request.text().then(function(text) {
-          assert.equal(text, 'hello')
-        })
-      })
-    })
-
-    suite('type USVString', function() {
-      test('consume as text', function() {
-        var request = new Request('', {method: 'POST', body: 'hello'})
-        return request.text().then(function(text) {
-          assert.equal(text, 'hello')
-        })
-      })
-
-      featureDependent(test, support.blob, 'consume as blob', function() {
-        var request = new Request('', {method: 'POST', body: 'hello'})
-        return request.blob().then(readBlobAsText).then(function(text) {
-          assert.equal(text, 'hello')
-        })
-      })
-    })
+  testBodyExtract(function(body) {
+    return new Request('', { method: 'POST', body: body })
   })
 })
 
@@ -471,39 +489,8 @@ suite('Response', function() {
     assert.isTrue(res.ok)
   })
 
-  // https://fetch.spec.whatwg.org/#concept-bodyinit-extract
-  suite('BodyInit extract', function() {
-    featureDependent(suite, support.blob, 'type Blob', function() {
-      test('consume as blob', function() {
-        var response = new Response(new Blob(['hello']))
-        return response.blob().then(readBlobAsText).then(function(text) {
-          assert.equal(text, 'hello')
-        })
-      })
-
-      test('consume as text', function() {
-        var response = new Response(new Blob(['hello']))
-        return response.text().then(function(text) {
-          assert.equal(text, 'hello')
-        })
-      })
-    })
-
-    suite('type USVString', function() {
-      test('consume as text', function() {
-        var response = new Response('hello')
-        return response.text().then(function(text) {
-          assert.equal(text, 'hello')
-        })
-      })
-
-      featureDependent(test, support.blob, 'consume as blob', function() {
-        var response = new Response('hello')
-        return response.blob().then(readBlobAsText).then(function(text) {
-          assert.equal(text, 'hello')
-        })
-      })
-    })
+  testBodyExtract(function(body) {
+    return new Response(body)
   })
 
   test('creates Headers object from raw headers', function() {
@@ -943,19 +930,6 @@ suite('fetch method', function() {
         assert.equal(response.headers.get('Content-Type'), 'text/html; charset=utf-8')
       })
     })
-
-    featureDependent(test, support.blob, 'handles binary', function() {
-      return fetch('/binary').then(function(response) {
-        return response.arrayBuffer()
-      }).then(function(buf) {
-        assert(buf instanceof ArrayBuffer, 'buf is an ArrayBuffer instance')
-        assert.equal(buf.byteLength, 256, 'buf.byteLength is correct')
-        var view = new Uint8Array(buf)
-        for (var i = 0; i < 256; i++) {
-          assert.equal(view[i], i)
-        }
-      })
-    })
   })
 
 // https://fetch.spec.whatwg.org/#methods