summaryrefslogtreecommitdiff
path: root/deno_typescript/lib.rs
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2020-01-08 15:06:04 +0100
committerGitHub <noreply@github.com>2020-01-08 15:06:04 +0100
commitcbdf9c50095b86e72a8e0e715a02f6eb327f7c53 (patch)
treee663acae0cbb3410090b2ac087a28ce57987a606 /deno_typescript/lib.rs
parent8466460311ce3522d598def7155144b082b2b9ad (diff)
refactor: module loading in EsIsolate (#3615)
* refactored RecursiveLoad - it was renamed to RecursiveModuleLoad, it does not take ownership of isolate anymore - a struct implementing Stream that yields SourceCodeInfo * untangled module loading logic between RecursiveLoad and isolate - that logic is encapsulated in EsIsolate and RecursiveModuleLoad, where isolate just consumes modules as they become available - does not require to pass Arc<Mutex<Isolate>> around anymore * removed EsIsolate.mods_ in favor of Modules and moved them inside EsIsolate * EsIsolate now requires "loader" argument during construction - struct that implements Loader trait * rewrite first methods on isolate as async
Diffstat (limited to 'deno_typescript/lib.rs')
-rw-r--r--deno_typescript/lib.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/deno_typescript/lib.rs b/deno_typescript/lib.rs
index 430493f33..c86ed645b 100644
--- a/deno_typescript/lib.rs
+++ b/deno_typescript/lib.rs
@@ -10,7 +10,7 @@ use deno_core::js_check;
pub use deno_core::v8_set_flags;
use deno_core::CoreOp;
use deno_core::ErrBox;
-use deno_core::EsIsolate;
+use deno_core::Isolate;
use deno_core::ModuleSpecifier;
use deno_core::PinnedBuf;
use deno_core::StartupData;
@@ -64,13 +64,13 @@ where
}
pub struct TSIsolate {
- isolate: Box<EsIsolate>,
+ isolate: Box<Isolate>,
state: Arc<Mutex<TSState>>,
}
impl TSIsolate {
fn new(bundle: bool) -> TSIsolate {
- let mut isolate = EsIsolate::new(StartupData::None, false);
+ let mut isolate = Isolate::new(StartupData::None, false);
js_check(isolate.execute("assets/typescript.js", TYPESCRIPT_CODE));
js_check(isolate.execute("compiler_main.js", COMPILER_CODE));
@@ -180,7 +180,7 @@ pub fn mksnapshot_bundle(
bundle: &Path,
state: Arc<Mutex<TSState>>,
) -> Result<(), ErrBox> {
- let runtime_isolate = &mut EsIsolate::new(StartupData::None, true);
+ let runtime_isolate = &mut Isolate::new(StartupData::None, true);
let source_code_vec = std::fs::read(bundle)?;
let source_code = std::str::from_utf8(&source_code_vec)?;
@@ -203,7 +203,7 @@ pub fn mksnapshot_bundle_ts(
bundle: &Path,
state: Arc<Mutex<TSState>>,
) -> Result<(), ErrBox> {
- let runtime_isolate = &mut EsIsolate::new(StartupData::None, true);
+ let runtime_isolate = &mut Isolate::new(StartupData::None, true);
let source_code_vec = std::fs::read(bundle)?;
let source_code = std::str::from_utf8(&source_code_vec)?;
@@ -222,7 +222,7 @@ pub fn mksnapshot_bundle_ts(
}
fn write_snapshot(
- runtime_isolate: &mut EsIsolate,
+ runtime_isolate: &mut Isolate,
bundle: &Path,
) -> Result<(), ErrBox> {
println!("creating snapshot...");