whatwg-url 8.2.0 → 8.4.0

package/README.md

@@ -4,7 +4,7 @@ whatwg-url is a full implementation of the WHATWG [URL Standard](https://url.spe
 
 ## Specification conformance
 
-whatwg-url is currently up to date with the URL spec up to commit [83adf0c](https://github.com/whatwg/url/commit/83adf0c9ca9a88948e1e5d93374ffded04eec727).
+whatwg-url is currently up to date with the URL spec up to commit [a19495e](https://github.com/whatwg/url/commit/a19495e27ad95154543b46f751d1a1bf25553808).
 
 For `file:` URLs, whose [origin is left unspecified](https://url.spec.whatwg.org/#concept-url-origin), whatwg-url chooses to use a new opaque origin (which serializes to `"null"`).
 

package/dist/percent-encoding.js

@@ -29,7 +29,10 @@ function percentDecodeBytes(input) {
     }
   }
 
-  return output.slice(0, outputIndex);
+  // TODO: remove the Buffer.from in the next major version; it's only needed for back-compat, and sticking to standard
+  // typed arrays is nicer and simpler.
+  // See https://github.com/jsdom/data-urls/issues/17 for background.
+  return Buffer.from(output.slice(0, outputIndex));
 }
 
 // https://url.spec.whatwg.org/#string-percent-decode

package/dist/url-state-machine.js

@@ -543,7 +543,7 @@ URLStateMachine.prototype["parse scheme"] = function parseScheme(c, cStr) {
         return false;
       }
 
-      if (this.url.scheme === "file" && (this.url.host === "" || this.url.host === null)) {
+      if (this.url.scheme === "file" && this.url.host === "") {
         return false;
       }
     }
@@ -841,6 +841,7 @@ function startsWithWindowsDriveLetter(input, pointer) {
 
 URLStateMachine.prototype["parse file"] = function parseFile(c) {
   this.url.scheme = "file";
+  this.url.host = "";
 
   if (c === 47 || c === 92) {
     if (c === 92) {
@@ -863,7 +864,6 @@ URLStateMachine.prototype["parse file"] = function parseFile(c) {
         shortenPath(this.url);
       } else {
         this.parseError = true;
-        this.url.host = null;
         this.url.path = [];
       }
 
@@ -885,13 +885,12 @@ URLStateMachine.prototype["parse file slash"] = function parseFileSlash(c) {
     }
     this.state = "file host";
   } else {
-    if (this.base !== null && this.base.scheme === "file" &&
-        !startsWithWindowsDriveLetter(this.input, this.pointer)) {
-      if (isNormalizedWindowsDriveLetterString(this.base.path[0])) {
+    if (this.base !== null && this.base.scheme === "file") {
+      if (!startsWithWindowsDriveLetter(this.input, this.pointer) &&
+          isNormalizedWindowsDriveLetterString(this.base.path[0])) {
         this.url.path.push(this.base.path[0]);
-      } else {
-        this.url.host = this.base.host;
       }
+      this.url.host = this.base.host;
     }
     this.state = "path";
     --this.pointer;
@@ -979,21 +978,11 @@ URLStateMachine.prototype["parse path"] = function parsePath(c) {
       this.url.path.push("");
     } else if (!isSingleDot(this.buffer)) {
       if (this.url.scheme === "file" && this.url.path.length === 0 && isWindowsDriveLetterString(this.buffer)) {
-        if (this.url.host !== "" && this.url.host !== null) {
-          this.parseError = true;
-          this.url.host = "";
-        }
         this.buffer = this.buffer[0] + ":";
       }
       this.url.path.push(this.buffer);
     }
     this.buffer = "";
-    if (this.url.scheme === "file" && (c === undefined || c === 63 || c === 35)) {
-      while (this.url.path.length > 1 && this.url.path[0] === "") {
-        this.parseError = true;
-        this.url.path.shift();
-      }
-    }
     if (c === 63) {
       this.url.query = "";
       this.state = "query";
@@ -1102,8 +1091,6 @@ function serializeURL(url, excludeFragment) {
     if (url.port !== null) {
       output += ":" + url.port;
     }
-  } else if (url.host === null && url.scheme === "file") {
-    output += "//";
   }
 
   if (url.cannotBeABaseURL) {

package/index.js

@@ -2,7 +2,7 @@
 
 const { URL, URLSearchParams } = require("./webidl2js-wrapper");
 const urlStateMachine = require("./dist/url-state-machine");
-const urlEncoded = require("./dist/urlencoded");
+const percentEncoding = require("./dist/percent-encoding");
 
 const sharedGlobalObject = {};
 URL.install(sharedGlobalObject, ["Window"]);
@@ -21,4 +21,4 @@ exports.setTheUsername = urlStateMachine.setTheUsername;
 exports.setThePassword = urlStateMachine.setThePassword;
 exports.cannotHaveAUsernamePasswordPort = urlStateMachine.cannotHaveAUsernamePasswordPort;
 
-exports.percentDecode = urlEncoded.percentDecode;
+exports.percentDecode = percentEncoding.percentDecodeBytes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whatwg-url",
-  "version": "8.2.0",
+  "version": "8.4.0",
   "description": "An implementation of the WHATWG URL Standard's URL API and parsing machinery",
   "main": "index.js",
   "files": [