whatwg-url 6.2.1 → 6.5.0

package/README.md

@@ -4,7 +4,7 @@ whatwg-url is a full implementation of the WHATWG [URL Standard](https://url.spe
 
 ## Current status
 
-whatwg-url is currently up to date with the URL spec up to commit [19e0ffa](https://github.com/whatwg/url/commit/19e0ffa225ccc34dde7e76e30fca538d57fa52f6).
+whatwg-url is currently up to date with the URL spec up to commit [6ef17eb](https://github.com/whatwg/url/commit/6ef17ebe1220a7e7c0cfff0785017502ee18808b).
 
 ## API
 
@@ -21,7 +21,7 @@ The following methods are exported for use by places like jsdom that need to imp
 - [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)`
-- [Origin](https://url.spec.whatwg.org/#concept-url-origin) [serializer](https://html.spec.whatwg.org/multipage/browsers.html#serialization-of-an-origin): `serializeURLOrigin(urlRecord)`
+- [Origin](https://url.spec.whatwg.org/#concept-url-origin) [serializer](https://html.spec.whatwg.org/multipage/origin.html#ascii-serialisation-of-an-origin): `serializeURLOrigin(urlRecord)`
 - [Set the username](https://url.spec.whatwg.org/#set-the-username): `setTheUsername(urlRecord, usernameString)`
 - [Set the password](https://url.spec.whatwg.org/#set-the-password): `setThePassword(urlRecord, passwordString)`
 - [Cannot have a username/password/port](https://url.spec.whatwg.org/#cannot-have-a-username-password-port): `cannotHaveAUsernamePasswordPort(urlRecord)`

package/lib/URL-impl.js

@@ -42,6 +42,12 @@ exports.implementation = class URLImpl {
     }
 
     this._url = parsedURL;
+
+    this._query._list.splice(0);
+    const { query } = parsedURL;
+    if (query !== null) {
+      this._query._list = urlencoded.parseUrlencoded(query);
+    }
   }
 
   get origin() {

package/lib/url-state-machine.js

@@ -63,6 +63,10 @@ function isSpecial(url) {
   return isSpecialScheme(url.scheme);
 }
 
+function isNotSpecial(url) {
+  return !isSpecialScheme(url.scheme);
+}
+
 function defaultPort(scheme) {
   return specialSchemes[scheme];
 }
@@ -83,17 +87,22 @@ function isC0ControlPercentEncode(c) {
   return c <= 0x1F || c > 0x7E;
 }
 
-const extraPathPercentEncodeSet = new Set([32, 34, 35, 60, 62, 63, 96, 123, 125]);
-function isPathPercentEncode(c) {
-  return isC0ControlPercentEncode(c) || extraPathPercentEncodeSet.has(c);
-}
-
 const extraUserinfoPercentEncodeSet =
   new Set([47, 58, 59, 61, 64, 91, 92, 93, 94, 124]);
 function isUserinfoPercentEncode(c) {
   return isPathPercentEncode(c) || extraUserinfoPercentEncodeSet.has(c);
 }
 
+const extraFragmentPercentEncodeSet = new Set([32, 34, 60, 62, 96]);
+function isFragmentPercentEncode(c) {
+  return isC0ControlPercentEncode(c) || extraFragmentPercentEncodeSet.has(c);
+}
+
+const extraPathPercentEncodeSet = new Set([35, 63, 123, 125]);
+function isPathPercentEncode(c) {
+  return isFragmentPercentEncode(c) || extraPathPercentEncodeSet.has(c);
+}
+
 function percentEncodeChar(c, encodeSetPredicate) {
   const cStr = String.fromCodePoint(c);
 
@@ -119,7 +128,14 @@ function parseIPv4Number(input) {
     return 0;
   }
 
-  const regex = R === 10 ? /[^0-9]/ : (R === 16 ? /[^0-9A-Fa-f]/ : /[^0-7]/);
+  let regex = /[^0-7]/;
+  if (R === 10) {
+    regex = /[^0-9]/;
+  }
+  if (R === 16) {
+    regex = /[^0-9A-Fa-f]/;
+  }
+
   if (regex.test(input)) {
     return failure;
   }
@@ -346,7 +362,7 @@ function serializeIPv6(address) {
   return output;
 }
 
-function parseHost(input, isSpecialArg) {
+function parseHost(input, isNotSpecialArg = false) {
   if (input[0] === "[") {
     if (input[input.length - 1] !== "]") {
       return failure;
@@ -355,7 +371,7 @@ function parseHost(input, isSpecialArg) {
     return parseIPv6(input.substring(1, input.length - 1));
   }
 
-  if (!isSpecialArg) {
+  if (isNotSpecialArg) {
     return parseOpaqueHost(input);
   }
 
@@ -461,7 +477,7 @@ function trimTabAndNewline(url) {
 }
 
 function shortenPath(url) {
-  const path = url.path;
+  const { path } = url;
   if (path.length === 0) {
     return;
   }
@@ -804,7 +820,7 @@ URLStateMachine.prototype["parse host"] = function parseHostName(c, cStr) {
       return failure;
     }
 
-    const host = parseHost(this.buffer, isSpecial(this.url));
+    const host = parseHost(this.buffer, isNotSpecial(this.url));
     if (host === failure) {
       return failure;
     }
@@ -827,7 +843,7 @@ URLStateMachine.prototype["parse host"] = function parseHostName(c, cStr) {
       return false;
     }
 
-    const host = parseHost(this.buffer, isSpecial(this.url));
+    const host = parseHost(this.buffer, isNotSpecial(this.url));
     if (host === failure) {
       return failure;
     }
@@ -880,6 +896,13 @@ URLStateMachine.prototype["parse port"] = function parsePort(c, cStr) {
 
 const fileOtherwiseCodePoints = new Set([47, 92, 63, 35]);
 
+function startsWithWindowsDriveLetter(input, pointer) {
+  const length = input.length - pointer;
+  return length >= 2 &&
+    isWindowsDriveLetterCodePoints(input[pointer], input[pointer + 1]) &&
+    (length === 2 || fileOtherwiseCodePoints.has(input[pointer + 2]));
+}
+
 URLStateMachine.prototype["parse file"] = function parseFile(c) {
   this.url.scheme = "file";
 
@@ -905,10 +928,7 @@ URLStateMachine.prototype["parse file"] = function parseFile(c) {
       this.url.fragment = "";
       this.state = "fragment";
     } else {
-      if (this.input.length - this.pointer - 1 === 0 || // remaining consists of 0 code points
-          !isWindowsDriveLetterCodePoints(c, this.input[this.pointer + 1]) ||
-          (this.input.length - this.pointer - 1 >= 2 && // remaining has at least 2 code points
-           !fileOtherwiseCodePoints.has(this.input[this.pointer + 2]))) {
+      if (!startsWithWindowsDriveLetter(this.input, this.pointer)) {
         this.url.host = this.base.host;
         this.url.path = this.base.path.slice();
         shortenPath(this.url);
@@ -934,7 +954,8 @@ URLStateMachine.prototype["parse file slash"] = function parseFileSlash(c) {
     }
     this.state = "file host";
   } else {
-    if (this.base !== null && this.base.scheme === "file") {
+    if (this.base !== null && this.base.scheme === "file" &&
+        !startsWithWindowsDriveLetter(this.input, this.pointer)) {
       if (isNormalizedWindowsDriveLetterString(this.base.path[0])) {
         this.url.path.push(this.base.path[0]);
       } else {
@@ -961,7 +982,7 @@ URLStateMachine.prototype["parse file host"] = function parseFileHost(c, cStr) {
       }
       this.state = "path start";
     } else {
-      let host = parseHost(this.buffer, isSpecial(this.url));
+      let host = parseHost(this.buffer, isNotSpecial(this.url));
       if (host === failure) {
         return failure;
       }
@@ -1100,8 +1121,10 @@ URLStateMachine.prototype["parse query"] = function parseQuery(c, cStr) {
 
     const buffer = Buffer.from(this.buffer); // TODO: Use encoding override instead
     for (let i = 0; i < buffer.length; ++i) {
-      if (buffer[i] < 0x21 || buffer[i] > 0x7E || buffer[i] === 0x22 || buffer[i] === 0x23 ||
-          buffer[i] === 0x3C || buffer[i] === 0x3E) {
+      if (buffer[i] < 0x21 ||
+          buffer[i] > 0x7E ||
+          buffer[i] === 0x22 || buffer[i] === 0x23 || buffer[i] === 0x3C || buffer[i] === 0x3E ||
+          (buffer[i] === 0x27 && isSpecial(this.url))) {
         this.url.query += percentEncode(buffer[i]);
       } else {
         this.url.query += String.fromCodePoint(buffer[i]);
@@ -1139,7 +1162,7 @@ URLStateMachine.prototype["parse fragment"] = function parseFragment(c) {
       this.parseError = true;
     }
 
-    this.url.fragment += percentEncodeChar(c, isC0ControlPercentEncode);
+    this.url.fragment += percentEncodeChar(c, isFragmentPercentEncode);
   }
 
   return true;

package/lib/urlencoded.js

@@ -84,10 +84,10 @@ function serializeUrlencodedByte(input) {
     } else if (byte === 42 ||
                byte === 45 ||
                byte === 46 ||
-               byte >= 48 && byte <= 57 ||
-               byte >= 65 && byte <= 90 ||
+               (byte >= 48 && byte <= 57) ||
+               (byte >= 65 && byte <= 90) ||
                byte === 95 ||
-               byte >= 97 && byte <= 122) {
+               (byte >= 97 && byte <= 122)) {
       output += String.fromCodePoint(byte);
     } else {
       output += percentEncode(byte);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whatwg-url",
-  "version": "6.2.1",
+  "version": "6.5.0",
   "description": "An implementation of the WHATWG URL Standard's URL API and parsing machinery",
   "main": "lib/public-api.js",
   "files": [
@@ -11,18 +11,19 @@
   "repository": "jsdom/whatwg-url",
   "dependencies": {
     "lodash.sortby": "^4.7.0",
-    "tr46": "^1.0.0",
-    "webidl-conversions": "^4.0.1"
+    "tr46": "^1.0.1",
+    "webidl-conversions": "^4.0.2"
   },
   "devDependencies": {
-    "domexception": "^1.0.0",
-    "eslint": "^4.1.1",
-    "istanbul": "~0.4.3",
-    "jest": "^21.0.2",
-    "jsdom": "^11.0.0",
-    "recast": "~0.12.6",
-    "request": "^2.55.0",
-    "webidl2js": "^7.1.0"
+    "browserify": "^16.2.2",
+    "domexception": "^1.0.1",
+    "eslint": "^4.19.1",
+    "istanbul": "~0.4.5",
+    "jest": "^22.4.3",
+    "jsdom": "^11.8.0",
+    "recast": "~0.14.7",
+    "request": "^2.85.0",
+    "webidl2js": "^7.4.0"
   },
   "scripts": {
     "build": "node scripts/transform.js && node scripts/convert-idl.js",
@@ -30,6 +31,7 @@
     "lint": "eslint .",
     "prepublish": "node scripts/transform.js && node scripts/convert-idl.js",
     "pretest": "node scripts/get-latest-platform-tests.js && node scripts/transform.js && node scripts/convert-idl.js",
+    "build-live-viewer": "browserify lib/public-api.js --standalone whatwgURL > live-viewer/whatwg-url.js",
     "test": "jest"
   },
   "jest": {
@@ -38,7 +40,10 @@
       "!lib/utils.js"
     ],
     "coverageDirectory": "coverage",
-    "coverageReporters": ["lcov", "text-summary"],
+    "coverageReporters": [
+      "lcov",
+      "text-summary"
+    ],
     "testEnvironment": "node",
     "testMatch": [
       "<rootDir>/test/**/*.js"