whatwg-url 8.2.2 → 8.6.0

package/README.md

@@ -4,10 +4,12 @@ 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 [6d4669a](https://github.com/whatwg/url/commit/6d4669a9a8cc90582bdb1e3cdb758e45242812b0).
 
 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"`).
 
+whatwg-url does not yet implement any encoding handling beyond UTF-8. That is, the _encoding override_ parameter does not exist in our API.
+
 ## API
 
 ### The `URL` and `URLSearchParams` classes
@@ -18,8 +20,8 @@ The main API is provided by the [`URL`](https://url.spec.whatwg.org/#url-class)
 
 The following methods are exported for use by places like jsdom that need to implement things like [`HTMLHyperlinkElementUtils`](https://html.spec.whatwg.org/#htmlhyperlinkelementutils). They mostly operate on or return an "internal URL" or ["URL record"](https://url.spec.whatwg.org/#concept-url) type.
 
-- [URL parser](https://url.spec.whatwg.org/#concept-url-parser): `parseURL(input, { baseURL, encodingOverride })`
-- [Basic URL parser](https://url.spec.whatwg.org/#concept-basic-url-parser): `basicURLParse(input, { baseURL, encodingOverride, url, stateOverride })`
+- [URL parser](https://url.spec.whatwg.org/#concept-url-parser): `parseURL(input, { baseURL })`
+- [Basic URL parser](https://url.spec.whatwg.org/#concept-basic-url-parser): `basicURLParse(input, { baseURL, url, stateOverride })`
 - [URL serializer](https://url.spec.whatwg.org/#concept-url-serializer): `serializeURL(urlRecord, excludeFragment)`
 - [Host serializer](https://url.spec.whatwg.org/#concept-host-serializer): `serializeHost(hostFromURLRecord)`
 - [Serialize an integer](https://url.spec.whatwg.org/#serialize-an-integer): `serializeInteger(number)`

package/dist/URLSearchParams-impl.js

@@ -1,5 +1,5 @@
 "use strict";
-const stableSortBy = require("lodash.sortby");
+const stableSortBy = require("lodash/sortBy");
 const urlencoded = require("./urlencoded");
 
 exports.implementation = class URLSearchParamsImpl {

package/dist/url-state-machine.js

@@ -50,11 +50,11 @@ function isNormalizedWindowsDriveLetterString(string) {
 }
 
 function containsForbiddenHostCodePoint(string) {
-  return string.search(/\u0000|\u0009|\u000A|\u000D|\u0020|#|%|\/|:|<|>|\?|@|\[|\\|\]|\^/) !== -1;
+  return string.search(/\u0000|\u0009|\u000A|\u000D|\u0020|#|%|\/|:|<|>|\?|@|\[|\\|\]|\^|\|/) !== -1;
 }
 
 function containsForbiddenHostCodePointExcludingPercent(string) {
-  return string.search(/\u0000|\u0009|\u000A|\u000D|\u0020|#|\/|:|<|>|\?|@|\[|\\|\]|\^/) !== -1;
+  return string.search(/\u0000|\u0009|\u000A|\u000D|\u0020|#|\/|:|<|>|\?|@|\[|\\|\]|\^|\|/) !== -1;
 }
 
 function isSpecialScheme(scheme) {
@@ -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;
       }
     }
@@ -756,6 +756,10 @@ URLStateMachine.prototype["parse host"] = function parseHostName(c, cStr) {
       return failure;
     }
 
+    if (this.stateOverride === "hostname") {
+      return false;
+    }
+
     const host = parseHost(this.buffer, isNotSpecial(this.url));
     if (host === failure) {
       return failure;
@@ -764,9 +768,6 @@ URLStateMachine.prototype["parse host"] = function parseHostName(c, cStr) {
     this.url.host = host;
     this.buffer = "";
     this.state = "port";
-    if (this.stateOverride === "hostname") {
-      return false;
-    }
   } else if (isNaN(c) || c === 47 || c === 63 || c === 35 ||
              (isSpecial(this.url) && c === 92)) {
     --this.pointer;
@@ -841,6 +842,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 +865,6 @@ URLStateMachine.prototype["parse file"] = function parseFile(c) {
         shortenPath(this.url);
       } else {
         this.parseError = true;
-        this.url.host = null;
         this.url.path = [];
       }
 
@@ -885,13 +886,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 +979,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";
@@ -1044,14 +1034,21 @@ URLStateMachine.prototype["parse cannot-be-a-base-URL path"] = function parseCan
   return true;
 };
 
-URLStateMachine.prototype["parse query"] = function parseQuery(c) {
+URLStateMachine.prototype["parse query"] = function parseQuery(c, cStr) {
   if (!isSpecial(this.url) || this.url.scheme === "ws" || this.url.scheme === "wss") {
     this.encodingOverride = "utf-8";
   }
 
-  if (!this.stateOverride & c === 35) {
-    this.url.fragment = "";
-    this.state = "fragment";
+  if ((!this.stateOverride && c === 35) || isNaN(c)) {
+    const queryPercentEncodePredicate = isSpecial(this.url) ? isSpecialQueryPercentEncode : isQueryPercentEncode;
+    this.url.query += utf8PercentEncodeString(this.buffer, queryPercentEncodePredicate);
+
+    this.buffer = "";
+
+    if (c === 35) {
+      this.url.fragment = "";
+      this.state = "fragment";
+    }
   } else if (!isNaN(c)) {
     // TODO: If c is not a URL code point and not "%", parse error.
 
@@ -1061,9 +1058,7 @@ URLStateMachine.prototype["parse query"] = function parseQuery(c) {
       this.parseError = true;
     }
 
-    const queryPercentEncodePredicate = isSpecial(this.url) ? isSpecialQueryPercentEncode : isQueryPercentEncode;
-    // TODO: use "percent-encode after encoding" passing in this.encodingOverride
-    this.url.query += utf8PercentEncodeCodePoint(c, queryPercentEncodePredicate);
+    this.buffer += cStr;
   }
 
   return true;
@@ -1102,8 +1097,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whatwg-url",
-  "version": "8.2.2",
+  "version": "8.6.0",
   "description": "An implementation of the WHATWG URL Standard's URL API and parsing machinery",
   "main": "index.js",
   "files": [
@@ -12,18 +12,18 @@
   "license": "MIT",
   "repository": "jsdom/whatwg-url",
   "dependencies": {
-    "lodash.sortby": "^4.7.0",
-    "tr46": "^2.0.2",
+    "lodash": "^4.7.0",
+    "tr46": "^2.1.0",
     "webidl-conversions": "^6.1.0"
   },
   "devDependencies": {
-    "browserify": "^16.5.2",
+    "browserify": "^17.0.0",
     "domexception": "^2.0.1",
-    "eslint": "^7.7.0",
-    "glob": "^7.1.6",
-    "got": "^11.5.2",
-    "jest": "^26.4.2",
-    "recast": "^0.20.2",
+    "eslint": "^7.28.0",
+    "glob": "^7.1.7",
+    "got": "^11.8.2",
+    "jest": "^27.0.4",
+    "recast": "^0.20.4",
     "webidl2js": "^16.2.0"
   },
   "engines": {