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

Add init to url #584

Merged
merged 1 commit into from
Sep 11, 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
1 change: 1 addition & 0 deletions llrt_core/src/module_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ impl Default for ModuleBuilder {
.with_module(ProcessModule)
.with_global(crate::modules::process::init)
.with_global(crate::modules::navigator::init)
.with_global(crate::modules::url::init)
.with_module(UrlModule)
.with_global(crate::modules::http::init)
.with_global(crate::modules::exceptions::init)
Expand Down
3 changes: 0 additions & 3 deletions llrt_core/src/modules/http/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ use hyper_util::{
client::legacy::{connect::HttpConnector, Client},
rt::{TokioExecutor, TokioTimer},
};
use llrt_modules::url::{url_class::URL, url_search_params::URLSearchParams};
use llrt_utils::class::CustomInspectExtension;
use once_cell::sync::Lazy;
use rquickjs::{Class, Ctx, Result};
Expand Down Expand Up @@ -111,8 +110,6 @@ pub fn init(ctx: &Ctx) -> Result<()> {
Class::<Request>::define(&globals)?;
Class::<Response>::define(&globals)?;
Class::<Headers>::define_with_custom_inspect(&globals)?;
Class::<URLSearchParams>::define(&globals)?;
Class::<URL>::define(&globals)?;

blob::init(ctx, &globals)?;

Expand Down
12 changes: 11 additions & 1 deletion llrt_modules/src/modules/url/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ use rquickjs::{
};
use url_crate::{quirks, Url};

use crate::url::url_class::{url_to_http_options, URL};
use self::url_class::{url_to_http_options, URL};
use self::url_search_params::URLSearchParams;
use crate::ModuleInfo;

pub fn domain_to_unicode(domain: &str) -> String {
Expand Down Expand Up @@ -113,6 +114,15 @@ pub fn url_format<'js>(url: Class<'js, URL<'js>>, options: Opt<Value<'js>>) -> R
Ok(string)
}

pub fn init(ctx: &Ctx<'_>) -> Result<()> {
let globals = ctx.globals();

Class::<URLSearchParams>::define(&globals)?;
Class::<URL>::define(&globals)?;

Ok(())
}

pub struct UrlModule;

impl ModuleDef for UrlModule {
Expand Down
Loading