foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-25 15:29:32 -05:00
Code Issues Packages 1 Wiki Activity

feat: format deno bundle output (#5139)

Browse source
This commit is contained in:
Yoshiya Hinosawa 2020-05-08 03:39:00 +09:00 committed by GitHub
parent 9a8d948420
commit 93cf3bd534
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cli/compilers/ts.rs
View file

@ -7,6 +7,7 @@ use crate::diagnostics::DiagnosticItem;
use crate::disk_cache::DiskCache;
use crate::file_fetcher::SourceFile;
use crate::file_fetcher::SourceFileFetcher;
use crate::fmt;
use crate::fs as deno_fs;
use crate::global_state::GlobalState;
use crate::msg;
@ -343,17 +344,19 @@ impl TsCompiler {
return Err(ErrBox::from(bundle_response.diagnostics));
}
let output_string = fmt::format_text(&bundle_response.bundle_output)?;
if let Some(out_file_) = out_file.as_ref() {
eprintln!("Emitting bundle to {:?}", out_file_);
let output_bytes = bundle_response.bundle_output.as_bytes();
let output_bytes = output_string.as_bytes();
let output_len = output_bytes.len();
deno_fs::write_file(out_file_, output_bytes, 0o666)?;
// TODO(bartlomieju): add "humanFileSize" method
eprintln!("{} bytes emmited.", output_len);
} else {
println!("{}", bundle_response.bundle_output);
println!("{}", output_string);
}
Ok(())

7
cli/fmt.rs
View file

@ -171,6 +171,13 @@ fn format_stdin(check: bool) -> Result<(), ErrBox> {
Ok(())
}
/// Formats the given source text
pub fn format_text(source: &str) -> Result<String, ErrBox> {
dprint::Formatter::new(get_config())
.format_text(&PathBuf::from("_tmp.ts"), &source)
.map_err(|e| OpError::other(e).into())
}
fn files_str(len: usize) -> &'static str {
if len == 1 {
"file"

14
cli/tests/bundle.test.out
View file

@ -6,13 +6,17 @@ let System, __instantiateAsync, __instantiate;
})();
System.register("print_hello", [], function (exports_1, context_1) {
[WILDCARD]
});
System.register("subdir2/mod2", ["print_hello"], function (exports_2, context_2) {
[WILDCARD]
[WILDCARD]
});
System.register(
"subdir2/mod2",
["print_hello"],
function (exports_2, context_2) {
[WILDCARD]
},
);
System.register("mod1", ["subdir2/mod2"], function (exports_3, context_3) {
[WILDCARD]
[WILDCARD]
});
const __exp = __instantiate("mod1");