swc-project/swc
1
1
Fork 0
mirror of https://github.com/swc-project/swc.git synced 2024-12-26 07:02:28 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(bindings/cli): Change order of checking inputs to workaround a Windows issue (#7077)

Browse Source
This commit is contained in:
realtimetodie 2023-03-14 04:47:52 +01:00 committed by GitHub
parent afe5c70f44
commit 7bbec92d23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
bindings/swc_cli/src/commands/compile.rs
View File

@ -347,34 +347,7 @@ impl CompileOptions {
fn collect_inputs(&self) -> anyhow::Result<Vec<InputContext>> { fn collect_inputs(&self) -> anyhow::Result<Vec<InputContext>> {
let compiler = COMPILER.clone(); let compiler = COMPILER.clone();
let stdin_input = collect_stdin_input(); if !self.files.is_empty() {
if stdin_input.is_some() && !self.files.is_empty() {
anyhow::bail!("Cannot specify inputs from stdin and files at the same time");
}
if let Some(stdin_input) = stdin_input {
let options = self.build_transform_options(&self.filename.as_deref())?;
let fm = compiler.cm.new_source_file(
if options.filename.is_empty() {
FileName::Anon
} else {
FileName::Real(options.filename.clone().into())
},
stdin_input,
);
return Ok(vec![InputContext {
options,
fm,
compiler,
file_path: self
.filename
.clone()
.unwrap_or_else(|| PathBuf::from("unknown")),
file_extension: self.out_file_extension.clone().into(),
}]);
} else if !self.files.is_empty() {
let included_extensions = if let Some(extensions) = &self.extensions { let included_extensions = if let Some(extensions) = &self.extensions {
extensions.clone() extensions.clone()
} else { } else {
@ -407,6 +380,35 @@ impl CompileOptions {
.collect::<anyhow::Result<Vec<InputContext>>>(); .collect::<anyhow::Result<Vec<InputContext>>>();
} }
let stdin_input = collect_stdin_input();
if stdin_input.is_some() && !self.files.is_empty() {
anyhow::bail!("Cannot specify inputs from stdin and files at the same time");
}
if let Some(stdin_input) = stdin_input {
let options = self.build_transform_options(&self.filename.as_deref())?;
let fm = compiler.cm.new_source_file(
if options.filename.is_empty() {
FileName::Anon
} else {
FileName::Real(options.filename.clone().into())
},
stdin_input,
);
return Ok(vec![InputContext {
options,
fm,
compiler,
file_path: self
.filename
.clone()
.unwrap_or_else(|| PathBuf::from("unknown")),
file_extension: self.out_file_extension.clone().into(),
}]);
}
anyhow::bail!("Input is empty"); anyhow::bail!("Input is empty");
} }