From ceb03cfb037cf7024a5048b17b508ddda59cfa05 Mon Sep 17 00:00:00 2001 From: Nayeem Rahman Date: Tue, 13 Jun 2023 16:45:06 +0100 Subject: refactor(core): cleanup feature flags for js source inclusion (#19463) Remove `ExtensionFileSourceCode::LoadedFromFsDuringSnapshot` and feature `include_js_for_snapshotting` since they leak paths that are only applicable in this repo to embedders. Replace with feature `exclude_js_sources`. Additionally the feature `force_include_js_sources` allows negating it, if both features are set. We need both of these because features are additive and there must be a way of force including sources for snapshot creation while still having the `exclude_js_sources` feature. `force_include_js_sources` is only set for build deps, so sources are still excluded from the final binary. You can also specify `force_include_js_sources` on any extension to override the above features for that extension. Towards #19398. But there was still the snapshot-from-snapshot situation where code could be executed twice, I addressed that by making `mod_evaluate()` and scripts like `core/01_core.js` behave idempotently. This allowed unifying `ext::init_ops()` and `ext::init_ops_and_esm()` into `ext::init()`. --- bench_util/benches/op_baseline.rs | 2 +- bench_util/benches/utf8.rs | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'bench_util') diff --git a/bench_util/benches/op_baseline.rs b/bench_util/benches/op_baseline.rs index 4b3bc0203..a8aadda01 100644 --- a/bench_util/benches/op_baseline.rs +++ b/bench_util/benches/op_baseline.rs @@ -19,7 +19,7 @@ deno_core::extension!( ); fn setup() -> Vec { - vec![bench_setup::init_ops()] + vec![bench_setup::init()] } #[op] diff --git a/bench_util/benches/utf8.rs b/bench_util/benches/utf8.rs index 9bc7cdaee..6d0a5977e 100644 --- a/bench_util/benches/utf8.rs +++ b/bench_util/benches/utf8.rs @@ -7,14 +7,12 @@ use deno_bench_util::bencher::Bencher; use deno_bench_util::BenchOptions; use deno_core::Extension; use deno_core::ExtensionFileSource; -use deno_core::ExtensionFileSourceCode; fn setup() -> Vec { vec![Extension::builder("bench_setup") .js(vec![ExtensionFileSource { specifier: "ext:bench_setup/setup.js", - code: ExtensionFileSourceCode::IncludedInBinary( - r#" + code: r#" const hello = "hello world\n"; const hello1k = hello.repeat(1e3); const hello1m = hello.repeat(1e6); @@ -22,7 +20,6 @@ fn setup() -> Vec { const hello1kEncoded = Deno.core.encode(hello1k); const hello1mEncoded = Deno.core.encode(hello1m); "#, - ), }]) .build()] } -- cgit v1.2.3