Split out more functions

Author: devongovett

src/lib.rs

@@ -24,8 +24,12 @@ mod swc_utils;
 
 use crate::{
     hast_util_to_swc::hast_util_to_swc as to_swc,
-    mdx_plugin_recma_document::{mdx_plugin_recma_document, Options as DocumentOptions},
-    mdx_plugin_recma_jsx_rewrite::{mdx_plugin_recma_jsx_rewrite, Options as RewriteOptions},
+    mdx_plugin_recma_document::{
+        mdx_plugin_recma_document as wrap_document, Options as DocumentOptions,
+    },
+    mdx_plugin_recma_jsx_rewrite::{
+        mdx_plugin_recma_jsx_rewrite as jsx_rewrite, Options as RewriteOptions,
+    },
     swc::{parse_esm, parse_expression, serialize},
     swc_util_build_jsx::{swc_util_build_jsx, Options as BuildOptions},
 };
@@ -34,7 +38,7 @@ use markdown::{
     message::{self, Message},
     to_mdast, Constructs, Location, ParseOptions,
 };
-use swc_core::alloc::collections::FxHashSet;
+use swc_core::{alloc::collections::FxHashSet, common::Span};
 
 pub use crate::configuration::{MdxConstructs, MdxParseOptions, Options};
 pub use crate::mdast_util_to_hast::mdast_util_to_hast;
@@ -60,7 +64,11 @@ pub use crate::mdx_plugin_recma_document::JsxRuntime;
 pub fn compile(value: &str, options: &Options) -> Result<String, message::Message> {
     let mdast = mdast_util_from_mdx(value, options)?;
     let hast = mdast_util_to_hast(&mdast);
-    let mut program = hast_util_to_swc(&hast, value, options)?;
+    let location = Location::new(value.as_bytes());
+    let mut explicit_jsxs = FxHashSet::default();
+    let mut program = hast_util_to_swc(&hast, options, Some(&location), &mut explicit_jsxs)?;
+    mdx_plugin_recma_document(&mut program, &options, Some(&location))?;
+    mdx_plugin_recma_jsx_rewrite(&mut program, &options, Some(&location), &explicit_jsxs)?;
     Ok(serialize(&mut program.module, Some(&program.comments)))
 }
 
@@ -137,43 +145,51 @@ pub fn mdast_util_from_mdx(
 /// Compile hast into SWC’s ES AST.
 pub fn hast_util_to_swc(
     hast: &hast::Node,
-    value: &str,
     options: &Options,
+    location: Option<&Location>,
+    explicit_jsxs: &mut FxHashSet<Span>,
 ) -> Result<Program, markdown::message::Message> {
+    to_swc(&hast, options.filepath.clone(), location, explicit_jsxs)
+}
+
+/// Wrap the SWC ES AST nodes coming from hast into a whole document.
+pub fn mdx_plugin_recma_document(
+    program: &mut Program,
+    options: &Options,
+    location: Option<&Location>,
+) -> Result<(), markdown::message::Message> {
     let document_options = DocumentOptions {
         pragma: options.pragma.clone(),
         pragma_frag: options.pragma_frag.clone(),
         pragma_import_source: options.pragma_import_source.clone(),
         jsx_import_source: options.jsx_import_source.clone(),
         jsx_runtime: options.jsx_runtime,
     };
+    wrap_document(program, &document_options, location)
+}
+
+/// Rewrite JSX in an MDX file so that components can be passed in and provided.
+/// Also compiles JSX to function calls unless `options.jsx` is true.
+pub fn mdx_plugin_recma_jsx_rewrite(
+    program: &mut Program,
+    options: &Options,
+    location: Option<&Location>,
+    explicit_jsxs: &FxHashSet<Span>,
+) -> Result<(), markdown::message::Message> {
     let rewrite_options = RewriteOptions {
         development: options.development,
         provider_import_source: options.provider_import_source.clone(),
     };
-    let build_options = BuildOptions {
-        development: options.development,
-    };
 
-    let mut explicit_jsxs = FxHashSet::default();
-    let location = Location::new(value.as_bytes());
-    let mut program = to_swc(
-        &hast,
-        options.filepath.clone(),
-        Some(&location),
-        &mut explicit_jsxs,
-    )?;
-    mdx_plugin_recma_document(&mut program, &document_options, Some(&location))?;
-    mdx_plugin_recma_jsx_rewrite(
-        &mut program,
-        &rewrite_options,
-        Some(&location),
-        explicit_jsxs,
-    );
+    jsx_rewrite(program, &rewrite_options, location, explicit_jsxs);
 
     if !options.jsx {
-        swc_util_build_jsx(&mut program, &build_options, Some(&location))?;
+        let build_options = BuildOptions {
+            development: options.development,
+        };
+
+        swc_util_build_jsx(program, &build_options, location)?;
     }
 
-    Ok(program)
+    Ok(())
 }

src/mdx_plugin_recma_jsx_rewrite.rs

@@ -43,7 +43,7 @@ pub fn mdx_plugin_recma_jsx_rewrite(
     program: &mut Program,
     options: &Options,
     location: Option<&Location>,
-    explicit_jsxs: FxHashSet<Span>,
+    explicit_jsxs: &FxHashSet<Span>,
 ) {
     let mut state = State {
         scopes: vec![],
@@ -137,7 +137,7 @@ struct Scope {
 }
 
 /// Context.
-#[derive(Debug, Default, Clone)]
+#[derive(Debug, Clone)]
 struct State<'a> {
     /// Location info.
     location: Option<&'a Location>,
@@ -157,7 +157,7 @@ struct State<'a> {
     /// helper function to throw when they are missing.
     create_error_helper: bool,
 
-    explicit_jsxs: FxHashSet<Span>,
+    explicit_jsxs: &'a FxHashSet<Span>,
 }
 
 impl State<'_> {
@@ -1044,7 +1044,7 @@ mod tests {
 
         let mut program = hast_util_to_swc(&hast, filepath, Some(&location), &mut explicit_jsxs)?;
         mdx_plugin_recma_document(&mut program, &DocumentOptions::default(), Some(&location))?;
-        mdx_plugin_recma_jsx_rewrite(&mut program, options, Some(&location), explicit_jsxs);
+        mdx_plugin_recma_jsx_rewrite(&mut program, options, Some(&location), &explicit_jsxs);
         Ok(serialize(&mut program.module, Some(&program.comments)))
     }
 
@@ -1867,7 +1867,7 @@ function _missingMdxReference(id, component, place) {
                 }))))],
             },
         };
-        mdx_plugin_recma_jsx_rewrite(&mut program, &Options::default(), None, explicit_jsxs);
+        mdx_plugin_recma_jsx_rewrite(&mut program, &Options::default(), None, &explicit_jsxs);
         assert_eq!(
             serialize(&mut program.module, None),
             "let a = <b/>;\n",
@@ -1899,7 +1899,7 @@ function _missingMdxReference(id, component, place) {
                 }))))],
             },
         };
-        mdx_plugin_recma_jsx_rewrite(&mut program, &Options::default(), None, explicit_jsxs);
+        mdx_plugin_recma_jsx_rewrite(&mut program, &Options::default(), None, &explicit_jsxs);
         assert_eq!(
             serialize(&mut program.module, None),
             "let <invalid>;\n",
@@ -1931,7 +1931,7 @@ function _missingMdxReference(id, component, place) {
                 }))))],
             },
         };
-        mdx_plugin_recma_jsx_rewrite(&mut program, &Options::default(), None, explicit_jsxs);
+        mdx_plugin_recma_jsx_rewrite(&mut program, &Options::default(), None, &explicit_jsxs);
         assert_eq!(
             serialize(&mut program.module, None),
             "let a;\n",