fix: pass full options without json helpers

Author: Goldziher

crates/html-to-markdown-node/index.js

@@ -574,29 +574,21 @@ if (!nativeBinding) {
 module.exports = nativeBinding
 module.exports.convert = nativeBinding.convert
 module.exports.convertBuffer = nativeBinding.convertBuffer
-module.exports.convertBufferJson = nativeBinding.convertBufferJson
 module.exports.convertBufferWithOptionsHandle = nativeBinding.convertBufferWithOptionsHandle
 module.exports.convertInlineImagesBuffer = nativeBinding.convertInlineImagesBuffer
-module.exports.convertInlineImagesBufferJson = nativeBinding.convertInlineImagesBufferJson
 module.exports.convertInlineImagesBufferWithOptionsHandle = nativeBinding.convertInlineImagesBufferWithOptionsHandle
-module.exports.convertJson = nativeBinding.convertJson
 module.exports.convertWithInlineImages = nativeBinding.convertWithInlineImages
 module.exports.convertWithInlineImagesHandle = nativeBinding.convertWithInlineImagesHandle
-module.exports.convertWithInlineImagesJson = nativeBinding.convertWithInlineImagesJson
 module.exports.convertWithMetadata = nativeBinding.convertWithMetadata
 module.exports.convertWithMetadataBuffer = nativeBinding.convertWithMetadataBuffer
-module.exports.convertWithMetadataBufferJson = nativeBinding.convertWithMetadataBufferJson
 module.exports.convertWithMetadataBufferWithMetadataHandle = nativeBinding.convertWithMetadataBufferWithMetadataHandle
 module.exports.convertWithMetadataBufferWithOptionsAndMetadataHandle = nativeBinding.convertWithMetadataBufferWithOptionsAndMetadataHandle
 module.exports.convertWithMetadataBufferWithOptionsHandle = nativeBinding.convertWithMetadataBufferWithOptionsHandle
 module.exports.convertWithMetadataHandle = nativeBinding.convertWithMetadataHandle
-module.exports.convertWithMetadataJson = nativeBinding.convertWithMetadataJson
 module.exports.convertWithOptionsHandle = nativeBinding.convertWithOptionsHandle
 module.exports.convertWithVisitor = nativeBinding.convertWithVisitor
 module.exports.createConversionOptionsHandle = nativeBinding.createConversionOptionsHandle
-module.exports.createConversionOptionsHandleJson = nativeBinding.createConversionOptionsHandleJson
 module.exports.createMetadataConfigHandle = nativeBinding.createMetadataConfigHandle
-module.exports.createMetadataConfigHandleJson = nativeBinding.createMetadataConfigHandleJson
 module.exports.JsCodeBlockStyle = nativeBinding.JsCodeBlockStyle
 module.exports.JsHeadingStyle = nativeBinding.JsHeadingStyle
 module.exports.JsHighlightStyle = nativeBinding.JsHighlightStyle

crates/html-to-markdown-node/src/handles.rs

@@ -5,9 +5,7 @@ use crate::types::{JsHtmlExtraction, JsInlineImage, JsInlineImageWarning};
 use crate::types::{JsMetadataConfig, JsMetadataExtraction, convert_metadata};
 #[cfg(feature = "async-visitor")]
 use crate::visitor::JsVisitorBridge;
-#[cfg(feature = "metadata")]
-use html_to_markdown_bindings_common::parse_metadata_config;
-use html_to_markdown_bindings_common::{error::error_message, parse_conversion_options, parse_inline_image_config};
+use html_to_markdown_bindings_common::error::error_message;
 #[cfg(feature = "metadata")]
 use html_to_markdown_rs::metadata::MetadataConfig as RustMetadataConfig;
 use html_to_markdown_rs::safety::guard_panic;
@@ -220,13 +218,6 @@ pub fn convert_with_visitor<'env>(
     env.spawn_future(convert_with_visitor_async_impl(html, options, bridge))
 }
 
-#[napi(js_name = "convertJson")]
-pub fn convert_json(html: String, options_json: Option<String>) -> Result<String> {
-    let rust_options = parse_conversion_options(options_json.as_deref()).map_err(to_js_error)?;
-    guard_panic(|| profiling::maybe_profile(|| html_to_markdown_rs::convert(&html, rust_options.clone())))
-        .map_err(to_js_error)
-}
-
 #[napi]
 pub fn start_profiling(output_path: String, frequency: Option<i32>) -> Result<()> {
     let freq = frequency.unwrap_or(1000);
@@ -247,42 +238,19 @@ pub fn convert_buffer(html: Buffer, options: Option<JsConversionOptions>) -> Res
         .map_err(to_js_error)
 }
 
-#[napi(js_name = "convertBufferJson")]
-pub fn convert_buffer_json(html: Buffer, options_json: Option<String>) -> Result<String> {
-    let html = buffer_to_str(&html)?;
-    let rust_options = parse_conversion_options(options_json.as_deref()).map_err(to_js_error)?;
-    guard_panic(|| profiling::maybe_profile(|| html_to_markdown_rs::convert(html, rust_options.clone())))
-        .map_err(to_js_error)
-}
-
 /// Create a reusable `ConversionOptions` handle.
 #[napi]
 pub fn create_conversion_options_handle(options: Option<JsConversionOptions>) -> External<RustConversionOptions> {
     External::new(options.map(Into::into).unwrap_or_default())
 }
 
-#[napi(js_name = "createConversionOptionsHandleJson")]
-pub fn create_conversion_options_handle_json(options_json: Option<String>) -> Result<External<RustConversionOptions>> {
-    let rust_options = parse_conversion_options(options_json.as_deref()).map_err(to_js_error)?;
-    Ok(External::new(rust_options.unwrap_or_default()))
-}
-
 /// Create a reusable `MetadataConfig` handle.
 #[cfg(feature = "metadata")]
 #[napi]
 pub fn create_metadata_config_handle(metadata_config: Option<JsMetadataConfig>) -> External<RustMetadataConfig> {
     External::new(metadata_config.map(Into::into).unwrap_or_default())
 }
 
-#[cfg(feature = "metadata")]
-#[napi(js_name = "createMetadataConfigHandleJson")]
-pub fn create_metadata_config_handle_json(
-    metadata_config_json: Option<String>,
-) -> Result<External<RustMetadataConfig>> {
-    let rust_config = parse_metadata_config(metadata_config_json.as_deref()).map_err(to_js_error)?;
-    Ok(External::new(rust_config))
-}
-
 /// Convert HTML using a previously-created `ConversionOptions` handle.
 #[napi]
 pub fn convert_with_options_handle(html: String, options: &External<RustConversionOptions>) -> Result<String> {
@@ -359,21 +327,6 @@ fn convert_inline_images_with_handle_impl(
     Ok(build_js_extraction(extraction))
 }
 
-fn convert_inline_images_json_impl(
-    html: &str,
-    options_json: Option<String>,
-    image_config_json: Option<String>,
-) -> Result<JsHtmlExtraction> {
-    let rust_options = parse_conversion_options(options_json.as_deref()).map_err(to_js_error)?;
-    let rust_config = parse_inline_image_config(image_config_json.as_deref()).map_err(to_js_error)?;
-
-    let extraction =
-        guard_panic(|| html_to_markdown_rs::convert_with_inline_images(html, rust_options, rust_config, None))
-            .map_err(to_js_error)?;
-
-    Ok(build_js_extraction(extraction))
-}
-
 /// Convert HTML to Markdown while collecting inline images
 ///
 /// # Arguments
@@ -412,15 +365,6 @@ pub fn convert_with_inline_images_handle(
     convert_inline_images_with_handle_impl(&html, options, image_config)
 }
 
-#[napi(js_name = "convertWithInlineImagesJson")]
-pub fn convert_with_inline_images_json(
-    html: String,
-    options_json: Option<String>,
-    image_config_json: Option<String>,
-) -> Result<JsHtmlExtraction> {
-    convert_inline_images_json_impl(&html, options_json, image_config_json)
-}
-
 /// Convert inline images from Buffer/Uint8Array input without an intermediate string allocation.
 #[napi(js_name = "convertInlineImagesBuffer")]
 pub fn convert_inline_images_buffer(
@@ -443,16 +387,6 @@ pub fn convert_inline_images_buffer_with_options_handle(
     convert_inline_images_with_handle_impl(html, options, image_config)
 }
 
-#[napi(js_name = "convertInlineImagesBufferJson")]
-pub fn convert_inline_images_buffer_json(
-    html: Buffer,
-    options_json: Option<String>,
-    image_config_json: Option<String>,
-) -> Result<JsHtmlExtraction> {
-    let html = buffer_to_str(&html)?;
-    convert_inline_images_json_impl(html, options_json, image_config_json)
-}
-
 /// Convert HTML to Markdown with metadata extraction.
 ///
 /// # Arguments
@@ -523,16 +457,6 @@ pub fn convert_with_metadata_handle(
     })
 }
 
-#[cfg(feature = "metadata")]
-#[napi(js_name = "convertWithMetadataJson")]
-pub fn convert_with_metadata_json(
-    html: String,
-    options_json: Option<String>,
-    metadata_config_json: Option<String>,
-) -> Result<JsMetadataExtraction> {
-    convert_metadata_json_impl(&html, options_json, metadata_config_json)
-}
-
 /// Convert HTML from Buffer/Uint8Array with metadata extraction without intermediate string allocation.
 #[cfg(feature = "metadata")]
 #[napi(js_name = "convertWithMetadataBuffer")]
@@ -614,34 +538,3 @@ pub fn convert_with_metadata_buffer_with_options_and_metadata_handle(
         metadata: convert_metadata(metadata),
     })
 }
-
-/// Convert HTML from Buffer/Uint8Array with metadata extraction using JSON config.
-#[cfg(feature = "metadata")]
-#[napi(js_name = "convertWithMetadataBufferJson")]
-pub fn convert_with_metadata_buffer_json(
-    html: Buffer,
-    options_json: Option<String>,
-    metadata_config_json: Option<String>,
-) -> Result<JsMetadataExtraction> {
-    let html = buffer_to_str(&html)?;
-    convert_metadata_json_impl(html, options_json, metadata_config_json)
-}
-
-#[cfg(feature = "metadata")]
-fn convert_metadata_json_impl(
-    html: &str,
-    options_json: Option<String>,
-    metadata_config_json: Option<String>,
-) -> Result<JsMetadataExtraction> {
-    let rust_options = parse_conversion_options(options_json.as_deref()).map_err(to_js_error)?;
-    let rust_config = parse_metadata_config(metadata_config_json.as_deref()).map_err(to_js_error)?;
-
-    let (markdown, metadata) =
-        guard_panic(|| html_to_markdown_rs::convert_with_metadata(html, rust_options, rust_config, None))
-            .map_err(to_js_error)?;
-
-    Ok(JsMetadataExtraction {
-        markdown,
-        metadata: convert_metadata(metadata),
-    })
-}

crates/html-to-markdown-py/src/conversion/inline_images.rs

@@ -15,7 +15,6 @@ use crate::options::ConversionOptions;
 use crate::types::{InlineImageConfig, inline_image_to_py, warning_to_py};
 #[cfg(feature = "visitor")]
 use crate::visitor;
-use html_to_markdown_bindings_common::{parse_conversion_options, parse_inline_image_config};
 use html_to_markdown_rs::DEFAULT_INLINE_IMAGE_LIMIT;
 #[cfg(feature = "visitor")]
 use html_to_markdown_rs::visitor::HtmlVisitor;
@@ -153,40 +152,6 @@ pub fn convert_with_inline_images<'py>(
     Ok((extraction.markdown, images, warnings))
 }
 
-#[pyfunction]
-#[pyo3(signature = (html, options_json=None, image_config_json=None))]
-pub fn convert_with_inline_images_json<'py>(
-    py: Python<'py>,
-    html: &str,
-    options_json: Option<&str>,
-    image_config_json: Option<&str>,
-) -> PyInlineExtraction {
-    let html = html.to_owned();
-    let rust_options = parse_conversion_options(options_json).map_err(to_py_err)?;
-    let rust_config = parse_inline_image_config(image_config_json).map_err(to_py_err)?;
-    let extraction = py
-        .detach(move || {
-            run_with_guard_and_profile(|| {
-                html_to_markdown_rs::convert_with_inline_images(&html, rust_options.clone(), rust_config.clone(), None)
-            })
-        })
-        .map_err(to_py_err)?;
-
-    let images = extraction
-        .inline_images
-        .into_iter()
-        .map(|image| inline_image_to_py(py, image))
-        .collect::<PyResult<Vec<_>>>()?;
-
-    let warnings = extraction
-        .warnings
-        .into_iter()
-        .map(|warning| warning_to_py(py, warning))
-        .collect::<PyResult<Vec<_>>>()?;
-
-    Ok((extraction.markdown, images, warnings))
-}
-
 /// Convert HTML to Markdown with inline images using a pre-parsed options handle.
 #[pyfunction]
 #[pyo3(signature = (html, handle, image_config=None))]

crates/html-to-markdown-py/src/conversion/metadata.rs

@@ -15,7 +15,6 @@ use crate::options::ConversionOptions;
 use crate::types::{MetadataConfig, extended_metadata_to_py};
 #[cfg(feature = "visitor")]
 use crate::visitor;
-use html_to_markdown_bindings_common::{parse_conversion_options, parse_metadata_config};
 use html_to_markdown_rs::metadata::DEFAULT_MAX_STRUCTURED_DATA_SIZE;
 #[cfg(feature = "visitor")]
 use html_to_markdown_rs::visitor::HtmlVisitor;
@@ -262,31 +261,6 @@ pub fn convert_with_metadata<'py>(
     Ok((markdown, metadata_dict))
 }
 
-#[pyfunction]
-#[pyo3(signature = (html, options_json=None, metadata_config_json=None))]
-pub fn convert_with_metadata_json(
-    py: Python<'_>,
-    html: &str,
-    options_json: Option<&str>,
-    metadata_config_json: Option<&str>,
-) -> PyResult<(String, Py<PyAny>)> {
-    let html = html.to_owned();
-    let rust_options = parse_conversion_options(options_json).map_err(to_py_err)?;
-    let rust_cfg = parse_metadata_config(metadata_config_json).map_err(to_py_err)?;
-
-    let result = py
-        .detach(move || {
-            run_with_guard_and_profile(|| {
-                html_to_markdown_rs::convert_with_metadata(&html, rust_options.clone(), rust_cfg.clone(), None)
-            })
-        })
-        .map_err(to_py_err)?;
-
-    let (markdown, metadata) = result;
-    let metadata_dict = extended_metadata_to_py(py, metadata)?;
-    Ok((markdown, metadata_dict))
-}
-
 /// Convert HTML to Markdown with metadata using a pre-parsed options handle.
 #[pyfunction]
 #[pyo3(signature = (html, handle, metadata_config=None))]

crates/html-to-markdown-py/src/conversion/mod.rs

@@ -10,9 +10,7 @@ pub mod metadata;
 
 // Re-export all pyfunction-decorated conversion functions
 #[cfg(feature = "inline-images")]
-pub use inline_images::{
-    convert_with_inline_images, convert_with_inline_images_handle, convert_with_inline_images_json,
-};
+pub use inline_images::{convert_with_inline_images, convert_with_inline_images_handle};
 
 #[cfg(feature = "metadata")]
-pub use metadata::{convert_with_metadata, convert_with_metadata_handle, convert_with_metadata_json};
+pub use metadata::{convert_with_metadata, convert_with_metadata_handle};