feat(bindings/html): Accept Buffer|string instead of Buffer (#9625)

swc-project · Oct 8, 2024 · 62edb36 · 62edb36
1 parent 6a3b0fc
commit 62edb36
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 22 deletions.
diff --git a/bindings/binding_html_node/src/lib.rs b/bindings/binding_html_node/src/lib.rs
@@ -694,10 +694,21 @@ fn minify_inner(
     })
 }
 
+fn to_string(code: Either<Buffer, String>) -> String {
+    match code {
+        Either::A(code) => String::from_utf8_lossy(code.as_ref()).to_string(),
+        Either::B(code) => code,
+    }
+}
+
 #[allow(unused)]
 #[napi]
-fn minify(code: Buffer, opts: Buffer, signal: Option<AbortSignal>) -> AsyncTask<MinifyTask> {
-    let code = String::from_utf8_lossy(code.as_ref()).to_string();
+fn minify(
+    code: Either<Buffer, String>,
+    opts: Buffer,
+    signal: Option<AbortSignal>,
+) -> AsyncTask<MinifyTask> {
+    let code = to_string(code);
     let options = String::from_utf8_lossy(opts.as_ref()).to_string();
 
     let task = MinifyTask {
@@ -712,11 +723,11 @@ fn minify(code: Buffer, opts: Buffer, signal: Option<AbortSignal>) -> AsyncTask<
 #[allow(unused)]
 #[napi]
 fn minify_fragment(
-    code: Buffer,
+    code: Either<Buffer, String>,
     opts: Buffer,
     signal: Option<AbortSignal>,
 ) -> AsyncTask<MinifyTask> {
-    let code = String::from_utf8_lossy(code.as_ref()).to_string();
+    let code = to_string(code);
     let options = String::from_utf8_lossy(opts.as_ref()).to_string();
 
     let task = MinifyTask {
@@ -730,17 +741,20 @@ fn minify_fragment(
 
 #[allow(unused)]
 #[napi]
-pub fn minify_sync(code: Buffer, opts: Buffer) -> napi::Result<TransformOutput> {
-    let code = String::from_utf8_lossy(code.as_ref());
+pub fn minify_sync(code: Either<Buffer, String>, opts: Buffer) -> napi::Result<TransformOutput> {
+    let code = to_string(code);
     let options = get_deserialized(opts)?;
 
     minify_inner(&code, options, false).convert_err()
 }
 
 #[allow(unused)]
 #[napi]
-pub fn minify_fragment_sync(code: Buffer, opts: Buffer) -> napi::Result<TransformOutput> {
-    let code = String::from_utf8_lossy(code.as_ref());
+pub fn minify_fragment_sync(
+    code: Either<Buffer, String>,
+    opts: Buffer,
+) -> napi::Result<TransformOutput> {
+    let code = to_string(code);
     let options = get_deserialized(opts)?;
 
     minify_inner(&code, options, true).convert_err()

diff --git a/packages/html/binding.d.ts b/packages/html/binding.d.ts
@@ -22,23 +22,26 @@ export interface Element {
 }
 
 export declare function minify(
-    code: Buffer,
+    code: Buffer | string,
     opts: Buffer,
     signal?: AbortSignal | undefined | null
 ): Promise<TransformOutput>;
 
 export declare function minifyFragment(
-    code: Buffer,
+    code: Buffer | string,
     opts: Buffer,
     signal?: AbortSignal | undefined | null
 ): Promise<TransformOutput>;
 
 export declare function minifyFragmentSync(
-    code: Buffer,
+    code: Buffer | string,
     opts: Buffer
 ): TransformOutput;
 
-export declare function minifySync(code: Buffer, opts: Buffer): TransformOutput;
+export declare function minifySync(
+    code: Buffer | string,
+    opts: Buffer
+): TransformOutput;
 
 export interface TransformOutput {
     code: string;

diff --git a/packages/html/index.ts b/packages/html/index.ts
@@ -19,10 +19,7 @@ export type Options = {
     preserveComments?: string[];
     minifyConditionalComments?: boolean;
     removeEmptyAttributes?: boolean;
-    removeRedundantAttributes?:
-        | "none"
-        | "all"
-        | "smart";
+    removeRedundantAttributes?: "none" | "all" | "smart";
     collapseBooleanAttributes?: boolean;
     normalizeAttributes?: boolean;
     minifyJson?: boolean | { pretty?: boolean };
@@ -48,28 +45,28 @@ export type FragmentOptions = Options & {
 };
 
 export async function minify(
-    content: Buffer,
+    content: string | Buffer,
     options?: Options
 ): Promise<binding.TransformOutput> {
     return binding.minify(content, toBuffer(options ?? {}));
 }
 
 export async function minifyFragment(
-    content: Buffer,
+    content: string | Buffer,
     options?: FragmentOptions
 ): Promise<binding.TransformOutput> {
     return binding.minifyFragment(content, toBuffer(options ?? {}));
 }
 
 export function minifySync(
-    content: Buffer,
+    content: string | Buffer,
     options?: Options
 ): binding.TransformOutput {
     return binding.minifySync(content, toBuffer(options ?? {}));
 }
 
 export async function minifyFragmentSync(
-    content: Buffer,
+    content: string | Buffer,
     options?: FragmentOptions
 ): Promise<binding.TransformOutput> {
     return binding.minifyFragmentSync(content, toBuffer(options ?? {}));

diff --git a/packages/html/package.json b/packages/html/package.json
@@ -45,8 +45,8 @@
         "prepack": "tsc -d && napi prepublish -p scripts/npm --tag-style npm",
         "prepublishOnly": "tsc -d && napi prepublish -p scripts/npm --tagstyle npm",
         "build:ts": "tsc -d",
-        "build": "tsc -d && napi build --manifest-path ../../bindings/Cargo.toml --platform -p binding_html_node --js ./binding.js --dts ./binding.d.ts --release -o .",
-        "build:dev": "tsc -d && napi build --manifest-path ../../bindings/Cargo.toml --platform -p binding_html_node --js ./binding.js --dts ./binding.d.ts -o .",
+        "build": "(tsc -d || true) && napi build --manifest-path ../../bindings/Cargo.toml --platform -p binding_html_node --js ./binding.js --dts ./binding.d.ts --release -o .",
+        "build:dev": "(tsc -d || true) && napi build --manifest-path ../../bindings/Cargo.toml --platform -p binding_html_node --js ./binding.js --dts ./binding.d.ts -o .",
         "test": "echo 'done!'",
         "version": "napi version --npm-dir scripts/npm"
     },