mirror of
https://github.com/denoland/deno.git
synced 2024-12-22 23:34:47 -05:00
c9ef182886
- Fixes cargo publish on deno_typescript, deno_cli_snapshots, and deno_cli. - Combines cli_snapshots and js into one directory. - Extracts TS version at compile time rather than runtime - Bumps version awkwardly - it was necessary to test end-to-end publishing. Sorry. - Adds git submodule deno_typescript/typescript
96 lines
2.6 KiB
Rust
96 lines
2.6 KiB
Rust
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
|
|
use super::dispatch_json::{Deserialize, JsonOp, Value};
|
|
use crate::state::ThreadSafeState;
|
|
use crate::tokio_util;
|
|
use deno::*;
|
|
|
|
#[derive(Deserialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
struct CacheArgs {
|
|
module_id: String,
|
|
contents: String,
|
|
extension: String,
|
|
}
|
|
|
|
pub fn op_cache(
|
|
state: &ThreadSafeState,
|
|
args: Value,
|
|
_zero_copy: Option<PinnedBuf>,
|
|
) -> Result<JsonOp, ErrBox> {
|
|
let args: CacheArgs = serde_json::from_value(args)?;
|
|
|
|
let module_specifier = ModuleSpecifier::resolve_url(&args.module_id)
|
|
.expect("Should be valid module specifier");
|
|
|
|
state.ts_compiler.cache_compiler_output(
|
|
&module_specifier,
|
|
&args.extension,
|
|
&args.contents,
|
|
)?;
|
|
|
|
Ok(JsonOp::Sync(json!({})))
|
|
}
|
|
|
|
#[derive(Deserialize)]
|
|
struct FetchSourceFilesArgs {
|
|
specifiers: Vec<String>,
|
|
referrer: String,
|
|
}
|
|
|
|
pub fn op_fetch_source_files(
|
|
state: &ThreadSafeState,
|
|
args: Value,
|
|
_zero_copy: Option<PinnedBuf>,
|
|
) -> Result<JsonOp, ErrBox> {
|
|
let args: FetchSourceFilesArgs = serde_json::from_value(args)?;
|
|
|
|
// TODO(ry) Maybe a security hole. Only the compiler worker should have access
|
|
// to this. Need a test to demonstrate the hole.
|
|
let is_dyn_import = false;
|
|
|
|
let mut futures = vec![];
|
|
for specifier in &args.specifiers {
|
|
let resolved_specifier =
|
|
state.resolve(specifier, &args.referrer, false, is_dyn_import)?;
|
|
let fut = state
|
|
.file_fetcher
|
|
.fetch_source_file_async(&resolved_specifier);
|
|
futures.push(fut);
|
|
}
|
|
|
|
// WARNING: Here we use tokio_util::block_on() which starts a new Tokio
|
|
// runtime for executing the future. This is so we don't inadvertently run
|
|
// out of threads in the main runtime.
|
|
let files = tokio_util::block_on(futures::future::join_all(futures))?;
|
|
let res: Vec<serde_json::value::Value> = files
|
|
.into_iter()
|
|
.map(|file| {
|
|
json!({
|
|
"moduleName": file.url.to_string(),
|
|
"filename": file.filename.to_str().unwrap(),
|
|
"mediaType": file.media_type as i32,
|
|
"sourceCode": String::from_utf8(file.source_code).unwrap(),
|
|
})
|
|
})
|
|
.collect();
|
|
|
|
Ok(JsonOp::Sync(json!(res)))
|
|
}
|
|
|
|
#[derive(Deserialize)]
|
|
struct FetchAssetArgs {
|
|
name: String,
|
|
}
|
|
|
|
pub fn op_fetch_asset(
|
|
_state: &ThreadSafeState,
|
|
args: Value,
|
|
_zero_copy: Option<PinnedBuf>,
|
|
) -> Result<JsonOp, ErrBox> {
|
|
let args: FetchAssetArgs = serde_json::from_value(args)?;
|
|
if let Some(source_code) = deno_cli_snapshots::get_asset(&args.name) {
|
|
Ok(JsonOp::Sync(json!(source_code)))
|
|
} else {
|
|
panic!("op_fetch_asset bad asset {}", args.name)
|
|
}
|
|
}
|