fix crate cf JSON schema and parsing change

Author: cscheid

crates/wasm-qmd-parser/build.md

@@ -0,0 +1,24 @@
+
+```shell
+cd crates/wasm-qmd-parser
+# To work around this error, because Apple Clang doesn't work with wasm32-unknown-unknown?
+# I believe this is not required on a Linux machine.
+# Requires `brew install llvm`.
+# https://github.com/briansmith/ring/issues/1824
+# error: unable to create target: 'No available targets are compatible with triple "wasm32-unknown-unknown"'
+export PATH="/opt/homebrew/opt/llvm/bin:$PATH"
+# To tell rustc to include our C shims located in `wasm-sysroot`, which we eventually compile into the project
+# with `c_shim.rs`.
+# https://github.com/tree-sitter/tree-sitter/discussions/1550#discussioncomment-8445285
+#
+# It also seems like we need to define HAVE_ENDIAN_H to tell tree-sitter we have `endian.h`
+# as it doesn't seem to pick up on that automatically?
+# https://github.com/tree-sitter/tree-sitter/blob/0be215e152d58351d2691484b4398ceff041f2fb/lib/src/portable/endian.h#L18
+export CFLAGS_wasm32_unknown_unknown="-I$(pwd)/wasm-sysroot -Wbad-function-cast -Wcast-function-type -fno-builtin -DHAVE_ENDIAN_H"
+# To just build the wasm-qmd-parser crate
+# cargo build --target wasm32-unknown-unknown
+# To build the wasm-pack bundle
+# Note that you'll need `opt-level = "s"` in your `profile.dev` cargo profile
+# otherwise you can get a "too many locals" error.
+wasm-pack build --target web --dev
+```

crates/wasm-qmd-parser/src/lib.rs

@@ -30,16 +30,16 @@ pub fn run() {
     panic::set_hook(Box::new(console_error_panic_hook::hook));
 }
 
-fn json_to_pandoc(input: &str) -> Result<quarto_markdown_pandoc::pandoc::Pandoc, String> {
+fn json_to_pandoc(input: &str) -> Result<(quarto_markdown_pandoc::pandoc::Pandoc, quarto_markdown_pandoc::pandoc::ASTContext), String> {
     match readers::json::read(&mut input.as_bytes()) {
         Ok(doc) => Ok(doc),
         Err(err) => Err(format!("Unable to read as json: {:?}", err)),
     }
 }
 
-fn pandoc_to_json(doc: &quarto_markdown_pandoc::pandoc::Pandoc) -> Result<String, String> {
+fn pandoc_to_json(doc: &quarto_markdown_pandoc::pandoc::Pandoc, context: &quarto_markdown_pandoc::pandoc::ASTContext) -> Result<String, String> {
     let mut buf = Vec::new();
-    match writers::json::write(doc, &mut buf) {
+    match writers::json::write(doc, context, &mut buf) {
         Ok(_) => {
             // Nothing to do
         }
@@ -81,9 +81,9 @@ pub fn parse_qmd(input: JsValue) -> JsValue {
 #[wasm_bindgen]
 pub fn write_qmd(input: JsValue) -> JsValue {
     let input = as_string(&input, "input");
-    let result = json_to_pandoc(&input).unwrap();
+    let (result, context) = json_to_pandoc(&input).unwrap();
 
-    let json = pandoc_to_json(&result).unwrap();
+    let json = pandoc_to_json(&result, &context).unwrap();
     JsValue::from_str(&json)
 }
 
@@ -92,14 +92,14 @@ pub fn convert(document: JsValue, input_format: JsValue, output_format: JsValue)
     let input = as_string(&document, "document");
     let input_format = as_string(&input_format, "input_format");
     let output_format = as_string(&output_format, "output_format");
-    let doc = match input_format.as_str() {
+    let (doc, context) = match input_format.as_str() {
         "qmd" => wasm_entry_points::qmd_to_pandoc(&input.as_bytes()).unwrap(),
         "json" => json_to_pandoc(&input).unwrap(),
         _ => panic!("Unsupported input format: {}", input_format),
     };
     let output = match output_format.as_str() {
         "qmd" => pandoc_to_qmd(&doc).unwrap(),
-        "json" => pandoc_to_json(&doc).unwrap(),
+        "json" => pandoc_to_json(&doc, &context).unwrap(),
         _ => panic!("Unsupported output format: {}", output_format),
     };
     JsValue::from_str(&output)