diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2020-01-29 18:54:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-29 18:54:23 +0100 |
commit | 161adfc51b750a7c8c62a898ea9948c2ad5b6cd9 (patch) | |
tree | 6d53db2a4acd30207372f665a3ba463e26db6fcf /cli/compilers/ts.rs | |
parent | d14864c57cebbd1d5bc18b8a9e05e522eb9987b0 (diff) |
workers: proper TS libs, more spec-compliant APIs (#3812)
* split lib.deno_main.d.ts into:
- lib.deno.shared_globals.d.ts
- lib.deno.window.d.ts
- lib.deno.worker.d.ts
* remove no longer used libs:
- lib.deno_main.d.ts
- lib.deno_worker.d.ts
* change module loading to use proper TS library for compilation
* align to Worker API spec:
- Worker.terminate()
- self.close()
- self.name
Diffstat (limited to 'cli/compilers/ts.rs')
-rw-r--r-- | cli/compilers/ts.rs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/cli/compilers/ts.rs b/cli/compilers/ts.rs index 946617fa5..5aa299518 100644 --- a/cli/compilers/ts.rs +++ b/cli/compilers/ts.rs @@ -37,6 +37,12 @@ lazy_static! { Regex::new(r#""checkJs"\s*?:\s*?true"#).unwrap(); } +#[derive(Clone, Copy)] +pub enum TargetLib { + Main, + Worker, +} + /// Struct which represents the state of the compiler /// configuration where the first is canonical name for the configuration file, /// second is a vector of the bytes of the contents of the configuration file, @@ -318,6 +324,7 @@ impl TsCompiler { &self, global_state: ThreadSafeGlobalState, source_file: &SourceFile, + target: TargetLib, ) -> Pin<Box<CompiledModuleFuture>> { if self.has_compiled(&source_file.url) { return match self.get_compiled_module(&source_file.url) { @@ -360,7 +367,10 @@ impl TsCompiler { &source_file.url ); - let target = "main"; + let target = match target { + TargetLib::Main => "main", + TargetLib::Worker => "worker", + }; let root_names = vec![module_url.to_string()]; let req_msg = req( @@ -710,7 +720,7 @@ mod tests { let fut = async move { let result = mock_state .ts_compiler - .compile_async(mock_state.clone(), &out) + .compile_async(mock_state.clone(), &out, TargetLib::Main) .await; assert!(result.is_ok()); |