whatwg-url 6.0.1 → 6.3.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 [a62223](https://github.com/whatwg/url/commit/a622235308342c9adc7fc2fd1659ff059f7d5e2a).
+whatwg-url is currently up to date with the URL spec up to commit [2eef975](https://github.com/whatwg/url/commit/2eef975e989cb5ae2d62467394778fd6778ddec9).
 
 ## API
 

package/lib/URLSearchParams-impl.js

@@ -32,7 +32,11 @@ exports.implementation = class URLSearchParamsImpl {
 
   _updateSteps() {
     if (this._url !== null) {
-      this._url._url.query = urlencoded.serializeUrlencoded(this._list);
+      let query = urlencoded.serializeUrlencoded(this._list);
+      if (query === "") {
+        query = null;
+      }
+      this._url._url.query = query;
     }
   }
 

package/lib/url-state-machine.js

@@ -68,7 +68,7 @@ function defaultPort(scheme) {
 }
 
 function utf8PercentEncode(c) {
-  const buf = new Buffer(c);
+  const buf = Buffer.from(c);
 
   let str = "";
 
@@ -360,8 +360,8 @@ function parseHost(input, isSpecialArg) {
   }
 
   const domain = percentDecode(Buffer.from(input)).toString();
-  const asciiDomain = tr46.toASCII(domain, false, tr46.PROCESSING_OPTIONS.NONTRANSITIONAL, false);
-  if (asciiDomain === null) {
+  const asciiDomain = domainToASCII(domain);
+  if (asciiDomain === failure) {
     return failure;
   }
 
@@ -438,6 +438,20 @@ function serializeHost(host) {
   return host;
 }
 
+function domainToASCII(domain, beStrict = false) {
+  const result = tr46.toASCII(domain, {
+    checkBidi: true,
+    checkHyphens: false,
+    checkJoiners: true,
+    useSTD3ASCIIRules: beStrict,
+    verifyDNSLength: beStrict
+  });
+  if (result === null) {
+    return failure;
+  }
+  return result;
+}
+
 function trimControlChars(url) {
   return url.replace(/^[\u0000-\u001F\u0020]+|[\u0000-\u001F\u0020]+$/g, "");
 }
@@ -568,10 +582,13 @@ URLStateMachine.prototype["parse scheme"] = function parseScheme(c, cStr) {
       }
     }
     this.url.scheme = this.buffer;
-    this.buffer = "";
     if (this.stateOverride) {
+      if (this.url.port === defaultPort(this.url.scheme)) {
+        this.url.port = null;
+      }
       return false;
     }
+    this.buffer = "";
     if (this.url.scheme === "file") {
       if (this.input[this.pointer + 1] !== 47 || this.input[this.pointer + 2] !== 47) {
         this.parseError = true;
@@ -863,6 +880,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";
 
@@ -888,10 +912,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);
@@ -917,7 +938,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 {
@@ -1081,7 +1103,7 @@ URLStateMachine.prototype["parse query"] = function parseQuery(c, cStr) {
       this.encodingOverride = "utf-8";
     }
 
-    const buffer = new Buffer(this.buffer); // TODO: Use encoding override instead
+    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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whatwg-url",
-  "version": "6.0.1",
+  "version": "6.3.0",
   "description": "An implementation of the WHATWG URL Standard's URL API and parsing machinery",
   "main": "lib/public-api.js",
   "files": [
@@ -11,24 +11,44 @@
   "repository": "jsdom/whatwg-url",
   "dependencies": {
     "lodash.sortby": "^4.7.0",
-    "tr46": "~0.0.3",
+    "tr46": "^1.0.0",
     "webidl-conversions": "^4.0.1"
   },
   "devDependencies": {
+    "domexception": "^1.0.0",
     "eslint": "^4.1.1",
     "istanbul": "~0.4.3",
+    "jest": "^21.0.2",
     "jsdom": "^11.0.0",
-    "mocha": "^3.4.2",
     "recast": "~0.12.6",
     "request": "^2.55.0",
     "webidl2js": "^7.1.0"
   },
   "scripts": {
     "build": "node scripts/transform.js && node scripts/convert-idl.js",
-    "coverage": "istanbul cover node_modules/mocha/bin/_mocha",
+    "coverage": "jest --coverage",
     "lint": "eslint .",
-    "prepublish": "npm run build",
-    "pretest": "node scripts/get-latest-platform-tests.js && npm run build",
-    "test": "mocha"
+    "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",
+    "test": "jest"
+  },
+  "jest": {
+    "collectCoverageFrom": [
+      "lib/**/*.js",
+      "!lib/utils.js"
+    ],
+    "coverageDirectory": "coverage",
+    "coverageReporters": [
+      "lcov",
+      "text-summary"
+    ],
+    "testEnvironment": "node",
+    "testMatch": [
+      "<rootDir>/test/**/*.js"
+    ],
+    "testPathIgnorePatterns": [
+      "^<rootDir>/test/testharness.js$",
+      "^<rootDir>/test/web-platform-tests/"
+    ]
   }
 }