Media Type: Expose more-complete, unstringified parse results

Author: ethanresnick

index.js

@@ -47,8 +47,8 @@ Negotiator.prototype.mediaType = function mediaType(available) {
   return set && set[0];
 };
 
-Negotiator.prototype.mediaTypes = function mediaTypes(available) {
-  return preferredMediaTypes(this.request.headers.accept, available);
+Negotiator.prototype.mediaTypes = function mediaTypes(available, options) {
+  return preferredMediaTypes(this.request.headers.accept, available, options);
 };
 
 // Backwards compatibility

lib/mediaType.js

@@ -120,15 +120,39 @@ function specify(type, spec, index) {
 
 }
 
-function preferredMediaTypes(accept, provided) {
+/**
+ * Returns a list of the acceptable media ranges in preferred order.
+ *
+ * @param {string} accept The raw contents of the `Accept` header
+ * @param {string[]} provided The media ranges the server can produce
+ *     for the resource in question.
+ * @param {Object} options Configuration options
+ * @param {boolean} options.detailed When `provided` is not defined, such
+ *    that the caller is asking for a list of _all_ the parsed media types,
+ *    setting this option to true returns an {type, parameters, q} object
+ *    for each type, rather just than a string.
+ */
+function preferredMediaTypes(accept, provided, options) {
   // RFC 2616 sec 14.2: no header = */*
   var accepts = parseAccept(accept === undefined ? '*/*' : accept || '');
 
   if (!provided) {
     // sorted list of all types
-    return accepts.filter(isQuality).sort(compareSpecs).map(function getType(spec) {
-      return spec.full;
-    });
+    var sorted = accepts.filter(isQuality).sort(compareSpecs);
+
+    if(!(options && options.detailed)) {
+      return sorted.map(function(spec) {
+        return spec.full;
+      });
+    } else {
+      return sorted.map(function(spec) {
+        return {
+          type: "" + spec.type + '/' + spec.subtype,
+          parameters: spec.params,
+          q: spec.q
+        };
+      });
+    }
   }
 
   var priorities = provided.map(function getPriority(type, index) {

test/mediaType.js

@@ -194,6 +194,20 @@ describe('negotiator.mediaTypes()', function () {
   })
 })
 
+describe('negotiator.mediaTypes(undefined, true)', function() {
+  whenAccept('text/html;LEVEL=1, application/json;q=0.5', function () {
+    it('should return more-detailed spec objects', function () {
+      assert.deepEqual(
+        this.negotiator.mediaTypes(undefined, {detailed: true}),
+        [
+          {"type": "text/html", "parameters": {"level": "1"}, "q": 1},
+          {"type": "application/json", "parameters": {}, "q": 0.5},
+        ]
+      );
+    })
+  });
+})
+
 describe('negotiator.mediaTypes(array)', function () {
   whenAccept(undefined, function () {
     it('should return return original list', mediaTypesNegotiated(