From 160d8e2ab07ed60f9d1bfd35842355f6afeb4343 Mon Sep 17 00:00:00 2001 From: shulaoda Date: Thu, 3 Oct 2024 02:27:49 +0800 Subject: [PATCH 1/2] fix(transform): ensure consistent naming for ES2015BindingOptions in index.d.ts --- napi/transform/index.d.ts | 2 +- napi/transform/src/options.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/napi/transform/index.d.ts b/napi/transform/index.d.ts index 9d7b47d988ebd..f5a24e067b8d9 100644 --- a/napi/transform/index.d.ts +++ b/napi/transform/index.d.ts @@ -202,7 +202,7 @@ export interface TransformOptions { /** Configure how TSX and JSX are transformed. */ jsx?: JsxOptions /** Enable ES2015 transformations. */ - es2015?: ES2015BindingOptions + es2015?: Es2015BindingOptions /** Define Plugin */ define?: Record /** Inject Plugin */ diff --git a/napi/transform/src/options.rs b/napi/transform/src/options.rs index 17d0e0de4880d..dba920de7ef13 100644 --- a/napi/transform/src/options.rs +++ b/napi/transform/src/options.rs @@ -39,7 +39,7 @@ pub struct TransformOptions { pub jsx: Option, /// Enable ES2015 transformations. - pub es2015: Option, + pub es2015: Option, /// Define Plugin #[napi(ts_type = "Record")] @@ -275,13 +275,13 @@ impl From for ArrowFunctionsOptions { } #[napi(object)] -pub struct ES2015BindingOptions { +pub struct Es2015BindingOptions { /// Transform arrow functions into function expressions. pub arrow_function: Option, } -impl From for ES2015Options { - fn from(options: ES2015BindingOptions) -> Self { +impl From for ES2015Options { + fn from(options: Es2015BindingOptions) -> Self { ES2015Options { arrow_function: options.arrow_function.map(Into::into) } } } From 49019aa7088ebbec6e7ce03f1d745a30baa72a24 Mon Sep 17 00:00:00 2001 From: shulaoda Date: Thu, 3 Oct 2024 02:31:35 +0800 Subject: [PATCH 2/2] chore: use better solution --- napi/transform/index.d.ts | 4 ++-- napi/transform/src/options.rs | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/napi/transform/index.d.ts b/napi/transform/index.d.ts index f5a24e067b8d9..b9d66d9672358 100644 --- a/napi/transform/index.d.ts +++ b/napi/transform/index.d.ts @@ -12,7 +12,7 @@ export interface ArrowFunctionsBindingOptions { spec?: boolean } -export interface Es2015BindingOptions { +export interface ES2015BindingOptions { /** Transform arrow functions into function expressions. */ arrowFunction?: ArrowFunctionsBindingOptions } @@ -202,7 +202,7 @@ export interface TransformOptions { /** Configure how TSX and JSX are transformed. */ jsx?: JsxOptions /** Enable ES2015 transformations. */ - es2015?: Es2015BindingOptions + es2015?: ES2015BindingOptions /** Define Plugin */ define?: Record /** Inject Plugin */ diff --git a/napi/transform/src/options.rs b/napi/transform/src/options.rs index dba920de7ef13..1f2c06c41e2bd 100644 --- a/napi/transform/src/options.rs +++ b/napi/transform/src/options.rs @@ -39,7 +39,7 @@ pub struct TransformOptions { pub jsx: Option, /// Enable ES2015 transformations. - pub es2015: Option, + pub es2015: Option, /// Define Plugin #[napi(ts_type = "Record")] @@ -274,14 +274,14 @@ impl From for ArrowFunctionsOptions { } } -#[napi(object)] -pub struct Es2015BindingOptions { +#[napi(object, js_name = "ES2015BindingOptions")] +pub struct ES2015BindingOptions { /// Transform arrow functions into function expressions. pub arrow_function: Option, } -impl From for ES2015Options { - fn from(options: Es2015BindingOptions) -> Self { +impl From for ES2015Options { + fn from(options: ES2015BindingOptions) -> Self { ES2015Options { arrow_function: options.arrow_function.map(Into::into) } } }