Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ext/url): add URL.parse #23318

Merged
merged 3 commits into from
Apr 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 42 additions & 2 deletions ext/url/00_url.js
Original file line number Diff line number Diff line change
Expand Up @@ -351,17 +351,29 @@ function trim(s) {
// Represents a "no port" value. A port in URL cannot be greater than 2^16 - 1
const NO_PORT = 65536;

const skipInit = Symbol();
const componentsBuf = new Uint32Array(8);

class URL {
/** @type {URLSearchParams|null} */
#queryObject = null;
/** @type {string} */
#serialization;
/** @type {number} */
#schemeEnd;
/** @type {number} */
#usernameEnd;
/** @type {number} */
#hostStart;
/** @type {number} */
#hostEnd;
/** @type {number} */
#port;
/** @type {number} */
#pathStart;
/** @type {number} */
#queryStart;
/** @type {number} */
#fragmentStart;

[_updateUrlSearch](value) {
Expand All @@ -378,18 +390,46 @@ class URL {
* @param {string} [base]
*/
constructor(url, base = undefined) {
// skip initialization for URL.parse
if (url === skipInit) {
return;
}
const prefix = "Failed to construct 'URL'";
webidl.requiredArguments(arguments.length, 1, prefix);
url = webidl.converters.DOMString(url, prefix, "Argument 1");
if (base !== undefined) {
base = webidl.converters.DOMString(base, prefix, "Argument 2");
}
this[webidl.brand] = webidl.brand;
const status = opUrlParse(url, base);
this[webidl.brand] = webidl.brand;
this.#serialization = getSerialization(status, url, base);
this.#updateComponents();
}

/**
* @param {string} url
* @param {string} [base]
*/
static parse(url, base = undefined) {
const prefix = "Failed to execute 'URL.parse'";
webidl.requiredArguments(arguments.length, 1, prefix);
url = webidl.converters.DOMString(url, prefix, "Argument 1");
if (base !== undefined) {
base = webidl.converters.DOMString(base, prefix, "Argument 2");
}
const status = opUrlParse(url, base);
if (status !== 0 && status !== 1) {
return null;
}
// If initialized with webidl.createBranded, private properties are not be accessible,
// so it is passed through the constructor
const self = new this(skipInit);
self[webidl.brand] = webidl.brand;
self.#serialization = getSerialization(status, url, base);
self.#updateComponents();
return self;
}

/**
* @param {string} url
* @param {string} [base]
Expand Down Expand Up @@ -799,7 +839,7 @@ class URL {
}
}

/** @return {string} */
/** @return {URLSearchParams} */
get searchParams() {
if (this.#queryObject == null) {
this.#queryObject = new URLSearchParams(this.search);
Expand Down
1 change: 1 addition & 0 deletions ext/url/lib.deno_url.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ declare interface URL {
declare var URL: {
readonly prototype: URL;
new (url: string | URL, base?: string | URL): URL;
parse(url: string | URL, base?: string | URL): URL | null;
canParse(url: string | URL, base?: string | URL): boolean;
createObjectURL(blob: Blob): string;
revokeObjectURL(url: string): void;
Expand Down
Loading