Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: make error format configurable #9441

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

feat: make error format configurable #9441

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b943059
feat: make error format configurable
Aug 21, 2024
d1a5728
patch
Aug 22, 2024
09eeb68
revert
Aug 22, 2024
454cae4
repair
Aug 23, 2024
c3f4596
repair
Aug 23, 2024
89bd609
repair
Aug 23, 2024
7c3980b
repair
Aug 23, 2024
5ff4634
fix: type
Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 16 additions & 19 deletions bindings/binding_core_node/src/minify.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
use std::sync::Arc;

use napi::{
bindgen_prelude::{AbortSignal, AsyncTask, Buffer},
Task,
bindgen_prelude::{AbortSignal, AsyncTask, Buffer, Env, FromNapiValue},
sys::{napi_env, napi_value},
JsUnknown, NapiValue, Task,
};
use serde::Deserialize;
use swc_core::{
base::{
config::{ErrorFormat, JsMinifyOptions},
config::{JsMinifyOptions},
TransformOutput,
},
common::{collections::AHashMap, sync::Lrc, FileName, SourceFile, SourceMap},
Expand Down Expand Up @@ -39,7 +40,7 @@ impl MinifyTarget {
assert_eq!(
codes.len(),
1,
"swc.minify does not support concatting multiple files yet"
"swc.minify does not support concatenating multiple files yet"
);

let (filename, code) = codes.iter().next().unwrap();
Expand All @@ -57,17 +58,17 @@ impl Task for MinifyTask {

fn compute(&mut self) -> napi::Result<Self::Output> {
let input: MinifyTarget = deserialize_json(&self.code)?;
let options: JsMinifyOptions = deserialize_json(&self.options)?;

try_with(self.c.cm.clone(), false, ErrorFormat::Normal, |handler| {
let fm = input.to_file(self.c.cm.clone());
let options = self.options.clone();
mertcanaltin marked this conversation as resolved.
Show resolved Hide resolved

try_with(self.c.cm.clone(), false, Default::default(), |handler| {
let fm = input.to_file(self.c.cm.clone());

self.c.minify(fm, handler, &options)
})
.convert_err()
}

fn resolve(&mut self, _env: napi::Env, output: Self::Output) -> napi::Result<Self::JsValue> {
fn resolve(&mut self, _env: Env, output: Self::Output) -> napi::Result<Self::JsValue> {
Ok(output)
}
}
Expand All @@ -76,7 +77,8 @@ impl Task for MinifyTask {
fn minify(code: Buffer, opts: Buffer, signal: Option<AbortSignal>) -> AsyncTask<MinifyTask> {
crate::util::init_default_trace_subscriber();
let code = String::from_utf8_lossy(code.as_ref()).to_string();
let options = String::from_utf8_lossy(opts.as_ref()).to_string();
let opts_str = String::from_utf8_lossy(opts.as_ref()).to_string();
mertcanaltin marked this conversation as resolved.
Show resolved Hide resolved
let options: JsMinifyOptions = deserialize_json(&opts_str).expect("Invalid options format");
mertcanaltin marked this conversation as resolved.
Show resolved Hide resolved

let c = get_compiler();

Expand All @@ -89,18 +91,13 @@ fn minify(code: Buffer, opts: Buffer, signal: Option<AbortSignal>) -> AsyncTask<
pub fn minify_sync(code: Buffer, opts: Buffer) -> napi::Result<TransformOutput> {
crate::util::init_default_trace_subscriber();
let code: MinifyTarget = get_deserialized(code)?;
let opts = get_deserialized(opts)?;

let options: JsMinifyOptions = deserialize_json(&String::from_utf8_lossy(opts.as_ref()).to_string())?;
let c = get_compiler();

let fm = code.to_file(c.cm.clone());

try_with(
c.cm.clone(),
false,
// TODO(kdy1): Maybe make this configurable?
ErrorFormat::Normal,
|handler| c.minify(fm, handler, &opts),
)
try_with(c.cm.clone(), false, Default::default(), |handler| {
c.minify(fm, handler, &options)
})
.convert_err()
}