Unverified Commit 1f47f8f4 authored by Donny/강동윤's avatar Donny/강동윤 Committed by GitHub

perf(next-swc): Remove needless JSON conversion (#80671)

### What?

Remove unnecessary JSON operations.

### Why?

 - https://github.com/swc-project/swc/pull/10628
 - https://github.com/swc-project/swc/issues/10610
parent ac0888f2
...@@ -26,50 +26,21 @@ IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ...@@ -26,50 +26,21 @@ IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE. DEALINGS IN THE SOFTWARE.
*/ */
use anyhow::Context;
use napi::bindgen_prelude::*; use napi::bindgen_prelude::*;
use rustc_hash::FxHashMap;
use serde::Deserialize;
use swc_core::{ use swc_core::{
base::{TransformOutput, config::JsMinifyOptions, try_with_handler}, base::{TransformOutput, config::JsMinifyOptions, try_with_handler},
common::{FileName, GLOBALS, SourceFile, SourceMap, errors::ColorConfig, sync::Lrc}, common::{FileName, GLOBALS, errors::ColorConfig},
}; };
use crate::{get_compiler, util::MapErr}; use crate::{get_compiler, util::MapErr};
pub struct MinifyTask { pub struct MinifyTask {
c: swc_core::base::Compiler, c: swc_core::base::Compiler,
code: MinifyTarget, code: Option<String>,
opts: JsMinifyOptions, opts: JsMinifyOptions,
} }
#[derive(Deserialize)]
#[serde(untagged)]
enum MinifyTarget {
/// Code to minify.
Single(String),
/// `{ filename: code }`
Map(FxHashMap<String, String>),
}
impl MinifyTarget {
fn to_file(&self, cm: Lrc<SourceMap>) -> Lrc<SourceFile> {
match self {
MinifyTarget::Single(code) => cm.new_source_file(FileName::Anon.into(), code.clone()),
MinifyTarget::Map(codes) => {
assert_eq!(
codes.len(),
1,
"swc.minify does not support concatenating multiple files yet"
);
let (filename, code) = codes.iter().next().unwrap();
cm.new_source_file(FileName::Real(filename.clone().into()).into(), code.clone())
}
}
}
}
#[napi] #[napi]
impl Task for MinifyTask { impl Task for MinifyTask {
type Output = TransformOutput; type Output = TransformOutput;
...@@ -77,6 +48,8 @@ impl Task for MinifyTask { ...@@ -77,6 +48,8 @@ impl Task for MinifyTask {
type JsValue = TransformOutput; type JsValue = TransformOutput;
fn compute(&mut self) -> napi::Result<Self::Output> { fn compute(&mut self) -> napi::Result<Self::Output> {
let code = self.code.take().unwrap_or_default();
try_with_handler( try_with_handler(
self.c.cm.clone(), self.c.cm.clone(),
swc_core::base::HandlerOpts { swc_core::base::HandlerOpts {
...@@ -85,7 +58,7 @@ impl Task for MinifyTask { ...@@ -85,7 +58,7 @@ impl Task for MinifyTask {
}, },
|handler| { |handler| {
GLOBALS.set(&Default::default(), || { GLOBALS.set(&Default::default(), || {
let fm = self.code.to_file(self.c.cm.clone()); let fm = self.c.cm.new_source_file(FileName::Anon.into(), code);
self.c.minify(fm, handler, &self.opts, Default::default()) self.c.minify(fm, handler, &self.opts, Default::default())
}) })
...@@ -106,24 +79,32 @@ pub fn minify( ...@@ -106,24 +79,32 @@ pub fn minify(
opts: Buffer, opts: Buffer,
signal: Option<AbortSignal>, signal: Option<AbortSignal>,
) -> napi::Result<AsyncTask<MinifyTask>> { ) -> napi::Result<AsyncTask<MinifyTask>> {
let code = serde_json::from_slice(&input)?; let code = String::from_utf8(input.into())
.context("failed to convert input to string")
.convert_err()?;
let opts = serde_json::from_slice(&opts)?; let opts = serde_json::from_slice(&opts)?;
let c = get_compiler(); let c = get_compiler();
let task = MinifyTask { c, code, opts }; let task = MinifyTask {
c,
code: Some(code),
opts,
};
Ok(AsyncTask::with_optional_signal(task, signal)) Ok(AsyncTask::with_optional_signal(task, signal))
} }
#[napi] #[napi]
pub fn minify_sync(input: Buffer, opts: Buffer) -> napi::Result<TransformOutput> { pub fn minify_sync(input: Buffer, opts: Buffer) -> napi::Result<TransformOutput> {
let code: MinifyTarget = serde_json::from_slice(&input)?; let code = String::from_utf8(input.into())
.context("failed to convert input to string")
.convert_err()?;
let opts = serde_json::from_slice(&opts)?; let opts = serde_json::from_slice(&opts)?;
let c = get_compiler(); let c = get_compiler();
let fm = code.to_file(c.cm.clone()); let fm = c.cm.new_source_file(FileName::Anon.into(), code);
try_with_handler( try_with_handler(
c.cm.clone(), c.cm.clone(),
......
...@@ -1364,11 +1364,11 @@ function loadNative(importPath?: string) { ...@@ -1364,11 +1364,11 @@ function loadNative(importPath?: string) {
}, },
minify(src: string, options: any) { minify(src: string, options: any) {
return bindings.minify(toBuffer(src), toBuffer(options ?? {})) return bindings.minify(Buffer.from(src), toBuffer(options ?? {}))
}, },
minifySync(src: string, options: any) { minifySync(src: string, options: any) {
return bindings.minifySync(toBuffer(src), toBuffer(options ?? {})) return bindings.minifySync(Buffer.from(src), toBuffer(options ?? {}))
}, },
parse(src: string, options: any) { parse(src: string, options: any) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment