foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-03 17:34:47 -05:00
Code Issues Packages 1 Wiki Activity

refactor: use primordials for extensions/url (#11225)

Browse source
This commit is contained in:
Luca Casonato 2021-07-02 14:08:28 +02:00 • committed by GitHub
parent c9204c4aee
commit 2544ec9af4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 109 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

136
extensions/url/00_url.js
View file

@ -1,9 +1,28 @@
// Copyright 2018-2021 the Deno authors. All rights reserved. MIT license. // Copyright 2018-2021 the Deno authors. All rights reserved. MIT license.
// @ts-check
/// <reference path="../../core/internal.d.ts" />
/// <reference path="../../core/lib.deno_core.d.ts" />
/// <reference path="../webidl/internal.d.ts" />
"use strict"; "use strict";
((window) => { ((window) => {
const core = window.Deno.core; const core = window.Deno.core;
const webidl = window.__bootstrap.webidl; const webidl = window.__bootstrap.webidl;
const {
ArrayIsArray,
ArrayPrototypeMap,
ArrayPrototypePush,
ArrayPrototypeSome,
ArrayPrototypeSort,
ArrayPrototypeSplice,
ObjectKeys,
StringPrototypeSlice,
Symbol,
SymbolIterator,
SymbolToStringTag,
} = window.__bootstrap.primordials;
const _list = Symbol("list"); const _list = Symbol("list");
const _urlObject = Symbol("url object"); const _urlObject = Symbol("url object");
@ -12,6 +31,9 @@
[_list]; [_list];
[_urlObject] = null; [_urlObject] = null;
/**
* @param {string | [string][] | Record<string, string>} init
*/
constructor(init = "") { constructor(init = "") {
const prefix = "Failed to construct 'URL'"; const prefix = "Failed to construct 'URL'";
init = webidl.converters init = webidl.converters
@ -26,12 +48,12 @@
// If init is a string and starts with U+003F (?), // If init is a string and starts with U+003F (?),
// remove the first code point from init. // remove the first code point from init.
if (init[0] == "?") { if (init[0] == "?") {
init = init.slice(1); init = StringPrototypeSlice(init, 1);
} }
this[_list] = core.opSync("op_url_parse_search_params", init); this[_list] = core.opSync("op_url_parse_search_params", init);
} else if (Array.isArray(init)) { } else if (ArrayIsArray(init)) {
// Overload: sequence<sequence<USVString>> // Overload: sequence<sequence<USVString>>
this[_list] = init.map((pair, i) => { this[_list] = ArrayPrototypeMap(init, (pair, i) => {
if (pair.length !== 2) { if (pair.length !== 2) {
throw new TypeError( throw new TypeError(
`${prefix}: Item ${i + `${prefix}: Item ${i +
@ -42,7 +64,10 @@
}); });
} else { } else {
// Overload: record<USVString, USVString> // Overload: record<USVString, USVString>
this[_list] = Object.keys(init).map((key) => [key, init[key]]); this[_list] = ArrayPrototypeMap(
ObjectKeys(init),
(key) => [key, init[key]],
);
} }
} }
@ -58,6 +83,10 @@
url[_url] = parts; url[_url] = parts;
} }
/**
* @param {string} name
* @param {string} value
*/
append(name, value) { append(name, value) {
webidl.assertBranded(this, URLSearchParams); webidl.assertBranded(this, URLSearchParams);
const prefix = "Failed to execute 'append' on 'URLSearchParams'"; const prefix = "Failed to execute 'append' on 'URLSearchParams'";
@ -70,10 +99,13 @@
prefix, prefix,
context: "Argument 2", context: "Argument 2",
}); });
this[_list].push([name, value]); ArrayPrototypePush(this[_list], [name, value]);
this.#updateUrlSearch(); this.#updateUrlSearch();
} }
/**
* @param {string} name
*/
delete(name) { delete(name) {
webidl.assertBranded(this, URLSearchParams); webidl.assertBranded(this, URLSearchParams);
const prefix = "Failed to execute 'append' on 'URLSearchParams'"; const prefix = "Failed to execute 'append' on 'URLSearchParams'";
@ -86,7 +118,7 @@
let i = 0; let i = 0;
while (i < list.length) { while (i < list.length) {
if (list[i][0] === name) { if (list[i][0] === name) {
list.splice(i, 1); ArrayPrototypeSplice(list, i, 1);
} else { } else {
i++; i++;
} }
@ -94,6 +126,10 @@
this.#updateUrlSearch(); this.#updateUrlSearch();
} }
/**
* @param {string} name
* @returns {string[]}
*/
getAll(name) { getAll(name) {
webidl.assertBranded(this, URLSearchParams); webidl.assertBranded(this, URLSearchParams);
const prefix = "Failed to execute 'getAll' on 'URLSearchParams'"; const prefix = "Failed to execute 'getAll' on 'URLSearchParams'";
@ -105,12 +141,16 @@
const values = []; const values = [];
for (const entry of this[_list]) { for (const entry of this[_list]) {
if (entry[0] === name) { if (entry[0] === name) {
values.push(entry[1]); ArrayPrototypePush(values, entry[1]);
} }
} }
return values; return values;
} }
/**
* @param {string} name
* @return {string | null}
*/
get(name) { get(name) {
webidl.assertBranded(this, URLSearchParams); webidl.assertBranded(this, URLSearchParams);
const prefix = "Failed to execute 'get' on 'URLSearchParams'"; const prefix = "Failed to execute 'get' on 'URLSearchParams'";
@ -127,6 +167,10 @@
return null; return null;
} }
/**
* @param {string} name
* @return {boolean}
*/
has(name) { has(name) {
webidl.assertBranded(this, URLSearchParams); webidl.assertBranded(this, URLSearchParams);
const prefix = "Failed to execute 'has' on 'URLSearchParams'"; const prefix = "Failed to execute 'has' on 'URLSearchParams'";
@ -135,9 +179,13 @@
prefix, prefix,
context: "Argument 1", context: "Argument 1",
}); });
return this[_list].some((entry) => entry[0] === name); return ArrayPrototypeSome(this[_list], (entry) => entry[0] === name);
} }
/**
* @param {string} name
* @param {string} value
*/
set(name, value) { set(name, value) {
webidl.assertBranded(this, URLSearchParams); webidl.assertBranded(this, URLSearchParams);
const prefix = "Failed to execute 'set' on 'URLSearchParams'"; const prefix = "Failed to execute 'set' on 'URLSearchParams'";
@ -165,7 +213,7 @@
found = true; found = true;
i++; i++;
} else { } else {
list.splice(i, 1); ArrayPrototypeSplice(list, i, 1);
} }
} else { } else {
i++; i++;
@ -175,7 +223,7 @@
// Otherwise, append a new name-value pair whose name is name // Otherwise, append a new name-value pair whose name is name
// and value is value, to list. // and value is value, to list.
if (!found) { if (!found) {
list.push([name, value]); ArrayPrototypePush(list, [name, value]);
} }
this.#updateUrlSearch(); this.#updateUrlSearch();
@ -183,16 +231,22 @@
sort() { sort() {
webidl.assertBranded(this, URLSearchParams); webidl.assertBranded(this, URLSearchParams);
this[_list].sort((a, b) => (a[0] === b[0] ? 0 : a[0] > b[0] ? 1 : -1)); ArrayPrototypeSort(
this[_list],
(a, b) => (a[0] === b[0] ? 0 : a[0] > b[0] ? 1 : -1),
);
this.#updateUrlSearch(); this.#updateUrlSearch();
} }
/**
* @return {string}
*/
toString() { toString() {
webidl.assertBranded(this, URLSearchParams); webidl.assertBranded(this, URLSearchParams);
return core.opSync("op_url_stringify_search_params", this[_list]); return core.opSync("op_url_stringify_search_params", this[_list]);
} }
get [Symbol.toStringTag]() { get [SymbolToStringTag]() {
return "URLSearchParams"; return "URLSearchParams";
} }
} }
@ -207,6 +261,10 @@
[_url]; [_url];
#queryObject = null; #queryObject = null;
/**
* @param {string} url
* @param {string} base
*/
constructor(url, base = undefined) { constructor(url, base = undefined) {
const prefix = "Failed to construct 'URL'"; const prefix = "Failed to construct 'URL'";
url = webidl.converters.USVString(url, { prefix, context: "Argument 1" }); url = webidl.converters.USVString(url, { prefix, context: "Argument 1" });
@ -244,17 +302,19 @@
const params = this.#queryObject[_list]; const params = this.#queryObject[_list];
const newParams = core.opSync( const newParams = core.opSync(
"op_url_parse_search_params", "op_url_parse_search_params",
this.search.slice(1), StringPrototypeSlice(this.search, 1),
); );
params.splice(0, params.length, ...newParams); ArrayPrototypeSplice(params, 0, params.length, ...newParams);
} }
} }
/** @return {string} */
get hash() { get hash() {
webidl.assertBranded(this, URL); webidl.assertBranded(this, URL);
return this[_url].hash; return this[_url].hash;
} }
/** @param {string} value */
set hash(value) { set hash(value) {
webidl.assertBranded(this, URL); webidl.assertBranded(this, URL);
const prefix = "Failed to set 'hash' on 'URL'"; const prefix = "Failed to set 'hash' on 'URL'";
@ -265,7 +325,7 @@
}); });
try { try {
this[_url] = core.opSync("op_url_parse", { this[_url] = core.opSync("op_url_parse", {
href: this.href, href: this[_url].href,
setHash: value, setHash: value,
}); });
} catch { } catch {
@ -273,11 +333,13 @@
} }
} }
/** @return {string} */
get host() { get host() {
webidl.assertBranded(this, URL); webidl.assertBranded(this, URL);
return this[_url].host; return this[_url].host;
} }
/** @param {string} value */
set host(value) { set host(value) {
webidl.assertBranded(this, URL); webidl.assertBranded(this, URL);
const prefix = "Failed to set 'host' on 'URL'"; const prefix = "Failed to set 'host' on 'URL'";
@ -288,7 +350,7 @@
}); });
try { try {
this[_url] = core.opSync("op_url_parse", { this[_url] = core.opSync("op_url_parse", {
href: this.href, href: this[_url].href,
setHost: value, setHost: value,
}); });
} catch { } catch {
@ -296,11 +358,13 @@
} }
} }
/** @return {string} */
get hostname() { get hostname() {
webidl.assertBranded(this, URL); webidl.assertBranded(this, URL);
return this[_url].hostname; return this[_url].hostname;
} }
/** @param {string} value */
set hostname(value) { set hostname(value) {
webidl.assertBranded(this, URL); webidl.assertBranded(this, URL);
const prefix = "Failed to set 'hostname' on 'URL'"; const prefix = "Failed to set 'hostname' on 'URL'";
@ -311,7 +375,7 @@
}); });
try { try {
this[_url] = core.opSync("op_url_parse", { this[_url] = core.opSync("op_url_parse", {
href: this.href, href: this[_url].href,
setHostname: value, setHostname: value,
}); });
} catch { } catch {
@ -319,11 +383,13 @@
} }
} }
/** @return {string} */
get href() { get href() {
webidl.assertBranded(this, URL); webidl.assertBranded(this, URL);
return this[_url].href; return this[_url].href;
} }
/** @param {string} value */
set href(value) { set href(value) {
webidl.assertBranded(this, URL); webidl.assertBranded(this, URL);
const prefix = "Failed to set 'href' on 'URL'"; const prefix = "Failed to set 'href' on 'URL'";
@ -338,16 +404,19 @@
this.#updateSearchParams(); this.#updateSearchParams();
} }
/** @return {string} */
get origin() { get origin() {
webidl.assertBranded(this, URL); webidl.assertBranded(this, URL);
return this[_url].origin; return this[_url].origin;
} }
/** @return {string} */
get password() { get password() {
webidl.assertBranded(this, URL); webidl.assertBranded(this, URL);
return this[_url].password; return this[_url].password;
} }
/** @param {string} value */
set password(value) { set password(value) {
webidl.assertBranded(this, URL); webidl.assertBranded(this, URL);
const prefix = "Failed to set 'password' on 'URL'"; const prefix = "Failed to set 'password' on 'URL'";
@ -358,7 +427,7 @@
}); });
try { try {
this[_url] = core.opSync("op_url_parse", { this[_url] = core.opSync("op_url_parse", {
href: this.href, href: this[_url].href,
setPassword: value, setPassword: value,
}); });
} catch { } catch {
@ -366,11 +435,13 @@
} }
} }
/** @return {string} */
get pathname() { get pathname() {
webidl.assertBranded(this, URL); webidl.assertBranded(this, URL);
return this[_url].pathname; return this[_url].pathname;
} }
/** @param {string} value */
set pathname(value) { set pathname(value) {
webidl.assertBranded(this, URL); webidl.assertBranded(this, URL);
const prefix = "Failed to set 'pathname' on 'URL'"; const prefix = "Failed to set 'pathname' on 'URL'";
@ -381,7 +452,7 @@
}); });
try { try {
this[_url] = core.opSync("op_url_parse", { this[_url] = core.opSync("op_url_parse", {
href: this.href, href: this[_url].href,
setPathname: value, setPathname: value,
}); });
} catch { } catch {
@ -389,11 +460,13 @@
} }
} }
/** @return {string} */
get port() { get port() {
webidl.assertBranded(this, URL); webidl.assertBranded(this, URL);
return this[_url].port; return this[_url].port;
} }
/** @param {string} value */
set port(value) { set port(value) {
webidl.assertBranded(this, URL); webidl.assertBranded(this, URL);
const prefix = "Failed to set 'port' on 'URL'"; const prefix = "Failed to set 'port' on 'URL'";
@ -404,7 +477,7 @@
}); });
try { try {
this[_url] = core.opSync("op_url_parse", { this[_url] = core.opSync("op_url_parse", {
href: this.href, href: this[_url].href,
setPort: value, setPort: value,
}); });
} catch { } catch {
@ -412,11 +485,13 @@
} }
} }
/** @return {string} */
get protocol() { get protocol() {
webidl.assertBranded(this, URL); webidl.assertBranded(this, URL);
return this[_url].protocol; return this[_url].protocol;
} }
/** @param {string} value */
set protocol(value) { set protocol(value) {
webidl.assertBranded(this, URL); webidl.assertBranded(this, URL);
const prefix = "Failed to set 'protocol' on 'URL'"; const prefix = "Failed to set 'protocol' on 'URL'";
@ -427,7 +502,7 @@
}); });
try { try {
this[_url] = core.opSync("op_url_parse", { this[_url] = core.opSync("op_url_parse", {
href: this.href, href: this[_url].href,
setProtocol: value, setProtocol: value,
}); });
} catch { } catch {
@ -435,11 +510,13 @@
} }
} }
/** @return {string} */
get search() { get search() {
webidl.assertBranded(this, URL); webidl.assertBranded(this, URL);
return this[_url].search; return this[_url].search;
} }
/** @param {string} value */
set search(value) { set search(value) {
webidl.assertBranded(this, URL); webidl.assertBranded(this, URL);
const prefix = "Failed to set 'search' on 'URL'"; const prefix = "Failed to set 'search' on 'URL'";
@ -450,7 +527,7 @@
}); });
try { try {
this[_url] = core.opSync("op_url_parse", { this[_url] = core.opSync("op_url_parse", {
href: this.href, href: this[_url].href,
setSearch: value, setSearch: value,
}); });
this.#updateSearchParams(); this.#updateSearchParams();
@ -459,11 +536,13 @@
} }
} }
/** @return {string} */
get username() { get username() {
webidl.assertBranded(this, URL); webidl.assertBranded(this, URL);
return this[_url].username; return this[_url].username;
} }
/** @param {string} value */
set username(value) { set username(value) {
webidl.assertBranded(this, URL); webidl.assertBranded(this, URL);
const prefix = "Failed to set 'username' on 'URL'"; const prefix = "Failed to set 'username' on 'URL'";
@ -474,7 +553,7 @@
}); });
try { try {
this[_url] = core.opSync("op_url_parse", { this[_url] = core.opSync("op_url_parse", {
href: this.href, href: this[_url].href,
setUsername: value, setUsername: value,
}); });
} catch { } catch {
@ -482,6 +561,7 @@
} }
} }
/** @return {string} */
get searchParams() { get searchParams() {
if (this.#queryObject == null) { if (this.#queryObject == null) {
this.#queryObject = new URLSearchParams(this.search); this.#queryObject = new URLSearchParams(this.search);
@ -490,17 +570,19 @@
return this.#queryObject; return this.#queryObject;
} }
/** @return {string} */
toString() { toString() {
webidl.assertBranded(this, URL); webidl.assertBranded(this, URL);
return this.href; return this[_url].href;
} }
/** @return {string} */
toJSON() { toJSON() {
webidl.assertBranded(this, URL); webidl.assertBranded(this, URL);
return this.href; return this[_url].href;
} }
get [Symbol.toStringTag]() { get [SymbolToStringTag]() {
return "URL"; return "URL";
} }
} }
@ -523,7 +605,7 @@
] = (V, opts) => { ] = (V, opts) => {
// Union for (sequence<sequence<USVString>> or record<USVString, USVString> or USVString) // Union for (sequence<sequence<USVString>> or record<USVString, USVString> or USVString)
if (webidl.type(V) === "Object" && V !== null) { if (webidl.type(V) === "Object" && V !== null) {
if (V[Symbol.iterator] !== undefined) { if (V[SymbolIterator] !== undefined) {
return webidl.converters["sequence<sequence<USVString>>"](V, opts); return webidl.converters["sequence<sequence<USVString>>"](V, opts);
} }
return webidl.converters["record<USVString, USVString>"](V, opts); return webidl.converters["record<USVString, USVString>"](V, opts);