whatwg-url 15.1.0 → 16.0.1

package/README.md

@@ -4,12 +4,10 @@ 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 [05a5d83](https://github.com/whatwg/url/commit/05a5d834deba31622390ee05a3dcbc22496b7bb5).
+whatwg-url is currently up to date with the URL spec up to commit [b6b3251](https://github.com/whatwg/url/commit/b6b3251fe911ab33d68fb051efe0e4d39ae4145e).
 
 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
@@ -20,8 +18,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 })`
-- [Basic URL parser](https://url.spec.whatwg.org/#concept-basic-url-parser): `basicURLParse(input, { baseURL, url, stateOverride })`
+- [URL parser](https://url.spec.whatwg.org/#concept-url-parser): `parseURL(input, { baseURL, encoding = "UTF-8" })`
+- [Basic URL parser](https://url.spec.whatwg.org/#concept-basic-url-parser): `basicURLParse(input, { baseURL, url, stateOverride, encoding = "UTF-8" })`
 - [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)`
 - [URL path serializer](https://url.spec.whatwg.org/#url-path-serializer): `serializePath(urlRecord)`

package/lib/URL-impl.js

@@ -2,6 +2,7 @@
 const usm = require("./url-state-machine");
 const urlencoded = require("./urlencoded");
 const URLSearchParams = require("./URLSearchParams");
+const URL = require("./URL");
 
 exports.implementation = class URLImpl {
   // Unlike the spec, we duplicate some code between the constructor and canParse, because we want to give useful error
@@ -32,7 +33,7 @@ exports.implementation = class URLImpl {
 
   static parse(globalObject, input, base) {
     try {
-      return new URLImpl(globalObject, [input, base]);
+      return URL.createImpl(globalObject, [input, base]);
     } catch {
       return null;
     }

package/lib/percent-encoding.js

@@ -55,13 +55,16 @@ function isFragmentPercentEncode(c) {
 
 // https://url.spec.whatwg.org/#query-percent-encode-set
 const extraQueryPercentEncodeSet = new Set([p(" "), p("\""), p("#"), p("<"), p(">")]);
+const extraQueryPercentEncodeChars = String.fromCodePoint(...[...extraQueryPercentEncodeSet].sort());
 function isQueryPercentEncode(c) {
   return isC0ControlPercentEncode(c) || extraQueryPercentEncodeSet.has(c);
 }
 
 // https://url.spec.whatwg.org/#special-query-percent-encode-set
+const extraSpecialQueryPercentEncodeSet = new Set([...extraQueryPercentEncodeSet, p("'")]);
+const extraSpecialQueryPercentEncodeChars = String.fromCodePoint(...[...extraSpecialQueryPercentEncodeSet].sort());
 function isSpecialQueryPercentEncode(c) {
-  return isQueryPercentEncode(c) || c === p("'");
+  return isC0ControlPercentEncode(c) || extraSpecialQueryPercentEncodeSet.has(c);
 }
 
 // https://url.spec.whatwg.org/#path-percent-encode-set
@@ -135,6 +138,8 @@ module.exports = {
   isPathPercentEncode,
   isUserinfoPercentEncode,
   isURLEncodedPercentEncode,
+  extraQueryPercentEncodeChars,
+  extraSpecialQueryPercentEncodeChars,
   percentDecodeString,
   percentDecodeBytes,
   utf8PercentEncodeString,

package/lib/url-state-machine.js

@@ -1,11 +1,14 @@
 "use strict";
+require("@exodus/bytes/encoding.js"); // for legacy multi-byte encodings
+const { percentEncodeAfterEncoding } = require("@exodus/bytes/whatwg.js");
 const tr46 = require("tr46");
 
 const infra = require("./infra");
 const { utf8DecodeWithoutBOM } = require("./encoding");
-const { percentDecodeString, utf8PercentEncodeCodePoint, utf8PercentEncodeString, isC0ControlPercentEncode,
-  isFragmentPercentEncode, isQueryPercentEncode, isSpecialQueryPercentEncode, isPathPercentEncode,
-  isUserinfoPercentEncode } = require("./percent-encoding");
+const { percentDecodeString, utf8PercentEncodeCodePoint, utf8PercentEncodeString,
+  isC0ControlPercentEncode, isFragmentPercentEncode,
+  extraQueryPercentEncodeChars, extraSpecialQueryPercentEncodeChars,
+  isPathPercentEncode, isUserinfoPercentEncode } = require("./percent-encoding");
 
 function p(char) {
   return char.codePointAt(0);
@@ -498,11 +501,11 @@ function isNormalizedWindowsDriveLetter(string) {
   return /^[A-Za-z]:$/u.test(string);
 }
 
-function URLStateMachine(input, base, encodingOverride, url, stateOverride) {
+function URLStateMachine(input, base, encoding, url, stateOverride) {
   this.pointer = 0;
   this.input = input;
   this.base = base || null;
-  this.encodingOverride = encodingOverride || "utf-8";
+  this.encoding = encoding || "utf-8";
   this.stateOverride = stateOverride;
   this.url = url;
   this.failure = false;
@@ -1092,12 +1095,16 @@ URLStateMachine.prototype["parse opaque path"] = function parseOpaquePath(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";
+    this.encoding = "utf-8";
   }
 
   if ((!this.stateOverride && c === p("#")) || isNaN(c)) {
-    const queryPercentEncodePredicate = isSpecial(this.url) ? isSpecialQueryPercentEncode : isQueryPercentEncode;
-    this.url.query += utf8PercentEncodeString(this.buffer, queryPercentEncodePredicate);
+    const percentEncodeSet = isSpecial(this.url) ? extraSpecialQueryPercentEncodeChars : extraQueryPercentEncodeChars;
+    this.url.query += percentEncodeAfterEncoding(
+      this.encoding,
+      this.buffer,
+      percentEncodeSet
+    );
 
     this.buffer = "";
 
@@ -1241,7 +1248,7 @@ module.exports.basicURLParse = function (input, options) {
     options = {};
   }
 
-  const usm = new URLStateMachine(input, options.baseURL, options.encodingOverride, options.url, options.stateOverride);
+  const usm = new URLStateMachine(input, options.baseURL, options.encoding, options.url, options.stateOverride);
   if (usm.failure) {
     return null;
   }
@@ -1273,5 +1280,5 @@ module.exports.parseURL = function (input, options) {
   }
 
   // We don't handle blobs, so this just delegates:
-  return module.exports.basicURLParse(input, { baseURL: options.baseURL, encodingOverride: options.encodingOverride });
+  return module.exports.basicURLParse(input, { baseURL: options.baseURL, encoding: options.encoding });
 };

package/lib/utils.js

@@ -110,11 +110,22 @@ function isArrayIndexPropName(P) {
   return true;
 }
 
-const byteLengthGetter =
+const arrayBufferByteLengthGetter =
     Object.getOwnPropertyDescriptor(ArrayBuffer.prototype, "byteLength").get;
 function isArrayBuffer(value) {
   try {
-    byteLengthGetter.call(value);
+    arrayBufferByteLengthGetter.call(value);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+const sharedArrayBufferByteLengthGetter =
+  Object.getOwnPropertyDescriptor(SharedArrayBuffer.prototype, "byteLength").get;
+function isSharedArrayBuffer(value) {
+  try {
+    sharedArrayBufferByteLengthGetter.call(value);
     return true;
   } catch {
     return false;
@@ -219,6 +230,7 @@ module.exports = exports = {
   tryImplForWrapper,
   iterInternalSymbol,
   isArrayBuffer,
+  isSharedArrayBuffer,
   isArrayIndexPropName,
   supportsPropertyIndex,
   supportedPropertyIndices,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whatwg-url",
-  "version": "15.1.0",
+  "version": "16.0.1",
   "description": "An implementation of the WHATWG URL Standard's URL API and parsing machinery",
   "main": "index.js",
   "files": [
@@ -15,20 +15,21 @@
     "url": "git+https://github.com/jsdom/whatwg-url.git"
   },
   "dependencies": {
+    "@exodus/bytes": "^1.11.0",
     "tr46": "^6.0.0",
-    "webidl-conversions": "^8.0.0"
+    "webidl-conversions": "^8.0.1"
   },
   "devDependencies": {
-    "@domenic/eslint-config": "^4.0.1",
-    "benchmark": "^2.1.4",
+    "@domenic/eslint-config": "^4.1.0",
+    "tinybench": "^6.0.0",
     "c8": "^10.1.3",
-    "esbuild": "^0.25.9",
-    "eslint": "^9.35.0",
-    "globals": "^16.4.0",
-    "webidl2js": "^19.0.0"
+    "esbuild": "^0.27.2",
+    "eslint": "^9.39.2",
+    "globals": "^17.3.0",
+    "webidl2js": "^19.1.0"
   },
   "engines": {
-    "node": ">=20"
+    "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
   },
   "scripts": {
     "coverage": "c8 node --test --experimental-test-coverage test/*.js",