whatwg-mimetype 2.1.0 → 2.2.0

package/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright © 2017 Domenic Denicola <d@domenic.me>
+Copyright © 2017–2018 Domenic Denicola <d@domenic.me>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/README.md

@@ -24,7 +24,7 @@ console.assert(mimeType.isXML() === false);
 
 Parsing is a fairly complex process; see [the specification](https://mimesniff.spec.whatwg.org/#parsing-a-mime-type) for details (and similarly [for serialization](https://mimesniff.spec.whatwg.org/#serializing-a-mime-type)).
 
-This package's algorithms conform to those of the WHATWG [MIME Sniffing Standard](https://mimesniff.spec.whatwg.org/), and is aligned up to commit [cc81ec4](https://github.com/whatwg/mimesniff/commit/cc81ec48288944562c4554069da1d74a71e199fb).
+This package's algorithms conform to those of the WHATWG [MIME Sniffing Standard](https://mimesniff.spec.whatwg.org/), and is aligned up to commit [190c18a](https://github.com/whatwg/mimesniff/commit/190c18af1d81754ff298cfb6fc9e581afdce4d2c).
 
 ## `MIMEType` API
 

package/lib/parser.js

@@ -72,46 +72,47 @@ module.exports = input => {
     }
 
     let parameterValue = "";
-    if (position < input.length) {
-      if (input[position] === "\"") {
-        ++position;
+    if (input[position] === "\"") {
+      ++position;
 
-        while (true) {
-          while (position < input.length && input[position] !== "\"" && input[position] !== "\\") {
-            parameterValue += input[position];
-            ++position;
-          }
+      while (true) {
+        while (position < input.length && input[position] !== "\"" && input[position] !== "\\") {
+          parameterValue += input[position];
+          ++position;
+        }
 
-          if (position < input.length && input[position] === "\\") {
+        if (position < input.length && input[position] === "\\") {
+          ++position;
+          if (position < input.length) {
+            parameterValue += input[position];
             ++position;
-            if (position < input.length) {
-              parameterValue += input[position];
-              ++position;
-              continue;
-            } else {
-              parameterValue += "\\";
-              break;
-            }
+            continue;
           } else {
+            parameterValue += "\\";
             break;
           }
+        } else {
+          break;
         }
+      }
 
-        while (position < input.length && input[position] !== ";") {
-          ++position;
-        }
-      } else {
-        while (position < input.length && input[position] !== ";") {
-          parameterValue += input[position];
-          ++position;
-        }
+      while (position < input.length && input[position] !== ";") {
+        ++position;
+      }
+    } else {
+      while (position < input.length && input[position] !== ";") {
+        parameterValue += input[position];
+        ++position;
+      }
 
-        parameterValue = removeTrailingASCIIWhitespace(parameterValue);
+      parameterValue = removeTrailingASCIIWhitespace(parameterValue);
+
+      if (parameterValue === "") {
+        continue;
       }
     }
 
     if (parameterName.length > 0 &&
-        parameterValue.length > 0 &&
         solelyContainsHTTPTokenCodePoints(parameterName) &&
         soleyContainsHTTPQuotedStringTokenCodePoints(parameterValue) &&
         !mimeType.parameters.has(parameterName)) {

package/lib/serializer.js

@@ -13,7 +13,7 @@ module.exports = mimeType => {
     serialization += name;
     serialization += "=";
 
-    if (!solelyContainsHTTPTokenCodePoints(value)) {
+    if (!solelyContainsHTTPTokenCodePoints(value) || value.length === 0) {
       value = value.replace(/(["\\])/g, "\\$1");
       value = `"${value}"`;
     }

package/lib/utils.js

@@ -13,11 +13,11 @@ exports.isASCIIWhitespaceChar = char => {
 };
 
 exports.solelyContainsHTTPTokenCodePoints = string => {
-  return /^[-!#$%&'*+.^_`|~A-Za-z0-9]+$/.test(string);
+  return /^[-!#$%&'*+.^_`|~A-Za-z0-9]*$/.test(string);
 };
 
 exports.soleyContainsHTTPQuotedStringTokenCodePoints = string => {
-  return /^[\t\u0020-\u007E\u0080-\u00FF]+$/.test(string);
+  return /^[\t\u0020-\u007E\u0080-\u00FF]*$/.test(string);
 };
 
 exports.asciiLowercase = string => {

package/package.json

@@ -8,7 +8,7 @@
     "http",
     "whatwg"
   ],
-  "version": "2.1.0",
+  "version": "2.2.0",
   "author": "Domenic Denicola <d@domenic.me> (https://domenic.me/)",
   "license": "MIT",
   "repository": "jsdom/whatwg-mimetype",
@@ -23,11 +23,11 @@
     "pretest": "node scripts/get-latest-platform-tests.js"
   },
   "devDependencies": {
-    "eslint": "^4.12.1",
-    "jest": "^21.2.1",
+    "eslint": "^5.5.0",
+    "jest": "^23.6.0",
     "printable-string": "^0.3.0",
-    "request": "^2.83.0",
-    "whatwg-encoding": "^1.0.3"
+    "request": "^2.88.0",
+    "whatwg-encoding": "^1.0.4"
   },
   "jest": {
     "coverageDirectory": "coverage",