Skip to content

Cache document.currentScript for non-ESM output #2520

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.

Sign up for GitHub

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

Closed
wants to merge 15 commits into from
Closed

Cache document.currentScript for non-ESM output #2520

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0ea5cd7
Refractor JS init input argument default initialization
Apr 10, 2021
0bf818b
Update mod.rs
Apr 10, 2021
eb58e3b
Optimize ESM module output
Apr 10, 2021
6e0f172
Fill in missing comma
Apr 10, 2021
88202dd
Reformat
Apr 10, 2021
1e2e0fc
Fix formatting
Apr 10, 2021
d8dadc1
Use constant variable
Apr 12, 2021
7aae7a6
Update mod.rs
Apr 12, 2021
2abfbf6
Update mod.rs
Apr 12, 2021
673d9cd
Leave comment
Apr 16, 2021
38bcafc
Update mod.rs
Apr 19, 2021
0908b94
Merge pull request #1 from rustwasm/master
Apr 19, 2021
962be7c
Update with rebase
Apr 19, 2021
8129ebe
remove '\' from output
Jul 12, 2021
6850ead
Merge branch 'rustwasm:master' into patch-1
Jul 12, 2021
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
64 changes: 37 additions & 27 deletions crates/cli-support/src/js/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,35 +656,43 @@ impl<'a> Context<'a> {
}
}

let default_module_path = if !self.config.omit_default_module_path {
match self.config.mode {
OutputMode::Web => format!(
"\
if (typeof input === 'undefined') {{
input = new URL('{stem}_bg.wasm', import.meta.url);
}}",
stem = self.config.stem()?
),
OutputMode::NoModules { .. } => "\
if (typeof input === 'undefined') {
let src;
if (typeof document === 'undefined') {
src = location.href;
} else {
src = document.currentScript.src;
}
input = src.replace(/\\.js$/, '_bg.wasm');
}"
.to_string(),
_ => "".to_string(),
let (default_module_path_creator, default_input_initializer): (String, &'static str) = {
const ASSIGNMENT_STRING: &'static str = " = default_wasm_source_url";
const EMPTY: (String, &'static str) = (String::new(), "");
let config = &self.config;

if !config.omit_default_module_path {
match config.mode {
OutputMode::Web => (
format!(
"const default_wasm_source_url = new URL('{stem}_bg.wasm', import.meta.url);",
stem = config.stem()?
),
ASSIGNMENT_STRING,
),
OutputMode::NoModules { .. } => (
"\
// Document#currentScript is a getter,
// it's value changes upon evaluating each script,
// therefore it must be cached
const default_wasm_source_url = (typeof document !== 'undefined'
? document.currentScript.src
: location.href
).replace(/\\.js$/, '_bg.wasm');
"
.to_string(),
ASSIGNMENT_STRING,
),
_ => EMPTY,
}
} else {
EMPTY
}
} else {
String::from("")
};

let ts = self.ts_for_init_fn(
has_memory,
!self.config.omit_default_module_path && !default_module_path.is_empty(),
!self.config.omit_default_module_path && !default_module_path_creator.is_empty(),
Copy link
Author

@ghost ghost Apr 19, 2021 •
edited by ghost
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I'm following this logic correctly, the entire expression could be shortened to the following:

!default_module_path_creator.is_empty()

cc @diceride

If someone omits the default path, and chooses, say, Node.js, there still won't be a default path, therefore we can just check if there isn't a default path via .is_empty().

)?;

// Initialize the `imports` object for all import definitions that we're
Expand Down Expand Up @@ -771,8 +779,9 @@ impl<'a> Context<'a> {
}}
}}

async function init(input{init_memory_arg}) {{
{default_module_path}
{default_module_path_creator}

async function init(input{default_input_initializer}{init_memory_arg}) {{
const imports = {{}};
{imports_init}

Expand All @@ -791,7 +800,8 @@ impl<'a> Context<'a> {
}}
",
init_memory_arg = init_memory_arg,
default_module_path = default_module_path,
default_module_path_creator = default_module_path_creator,
default_input_initializer = default_input_initializer,
init_memory = init_memory,
start = if needs_manual_start {
"wasm.__wbindgen_start();"
Expand Down