Publish version 0.1.15.

serde_wasm_bindgen was silently dropping many attributes (I suspect it is triggered by serde flatten) so this switches to serializing to JSON for passing values from wasm to js.

Cargo.toml

@@ -2,7 +2,7 @@
 
 [package]
 name = "organic"
-version = "0.1.14"
+version = "0.1.15"
 authors = ["Tom Alexander <tom@fizz.buzz>"]
 description = "An org-mode parser."
 edition = "2021"
@@ -52,6 +52,7 @@ path = "src/lib.rs"
 
 [dependencies]
 futures = { version = "0.3.28", optional = true }
+gloo-utils = "0.2.0"
 nom = "7.1.1"
 opentelemetry = { version = "0.20.0", optional = true, default-features = false, features = ["trace", "rt-tokio"] }
 opentelemetry-otlp = { version = "0.13.0", optional = true }

Makefile

@@ -7,6 +7,7 @@ MAKEFLAGS += --no-builtin-rules
 TESTJOBS := 4
 OS:=$(shell uname -s)
 RELEASEFLAGS :=
+WASMTARGET := bundler # or web
 
 ifeq ($(OS),Linux)
   TESTJOBS:=$(shell nproc)
@@ -32,7 +33,7 @@ release:
 .PHONY: wasm
 wasm:
 > cargo build --target=wasm32-unknown-unknown --profile wasm --bin wasm --features wasm
-> wasm-bindgen --target web --out-dir target/wasm32-unknown-unknown/js target/wasm32-unknown-unknown/wasm/wasm.wasm
+> wasm-bindgen --target $(WASMTARGET) --out-dir target/wasm32-unknown-unknown/js target/wasm32-unknown-unknown/wasm/wasm.wasm
 
 .PHONY: clean
 clean:

README.md

@@ -10,17 +10,16 @@ Currently, Organic parses most documents the same as the official org-mode parse
 
 ### Project Goals
 - We aim to provide perfect parity with the emacs org-mode parser. In that regard, any document that parses differently between Emacs and Organic is considered a bug.
-- The parser should have minimal dependencies. This should reduce effort w.r.t.: security audits, legal compliance, portability.
+- The parser should have minimal dependencies.
-- The parser should be usable everywhere. In the interest of getting org-mode used in as many places as possible, this parser should be usable by everyone everywhere. This means:
+- The parser should be usable everywhere. In the interest of getting org used in as many places as possible, this parser should be usable by everyone everywhere. This means:
   - It must have a permissive license.
-  - We will investigate compiling to WASM. This is an important goal of the project and will definitely happen, but only after the parser has a more stable API.
+  - It compiles to both natively and to wasm.
   - We will investigate compiling to a C library for native linking to other code. This is more of a maybe-goal for the project.
 ### Project Non-Goals
 - This project will not include an elisp engine since that would drastically increase the complexity of the code. Any features requiring an elisp engine will not be implemented (for example, Emacs supports embedded eval expressions in documents but this parser will never support that).
 - This project is exclusively an org-mode **parser**. This limits its scope to roughly the output of `(org-element-parse-buffer)`. It will not render org-mode documents in other formats like HTML or LaTeX.
 ### Project Maybe-Goals
 - table.el support. Currently we support org-mode tables but org-mode also allows table.el tables. So far, their use in org-mode documents seems rather uncommon so this is a low-priority feature.
-- Document editing support. I do not anticipate any advanced editing features to make editing ergonomic, but it should be relatively easy to be able to parse an org-mode document and serialize it back into org-mode. This would enable cool features to be built on top of the library like auto-formatters. To accomplish this feature, We'd have to capture all of the various separators and whitespace that we are currently simply throwing away. This would add many additional fields to the parsed structs and it would add more noise to the parsers themselves, so I do not want to approach this feature until the parser is more complete since it would make modifications and refactoring more difficult.
 ### Supported Versions
 This project targets the version of Emacs and Org-mode that are built into the [organic-test docker image](docker/organic_test/Dockerfile). This is newer than the version of Org-mode that shipped with Emacs 29.1. The parser itself does not depend on Emacs or Org-mode though, so this only matters for development purposes when running the automated tests that compare against upstream Org-mode.
 

src/wasm/macros.rs

@@ -11,6 +11,7 @@ macro_rules! to_wasm {
                 $wasm_context: crate::wasm::to_wasm::ToWasmContext<'_>,
             ) -> Result<Self::Output, crate::error::CustomError> {
                 let $original = self;
+                #[allow(unused_braces)]
                 $fnbody
             }
         }

src/wasm_cli/mod.rs

@@ -1,3 +1,6 @@
+use gloo_utils::format::JsValueSerdeExt;
+use wasm_bindgen::JsValue;
+
 use crate::parser::parse_with_settings;
 use crate::settings::GlobalSettings;
 use crate::wasm::ParseResult;
@@ -8,17 +11,15 @@ pub fn parse_org(org_contents: &str) -> wasm_bindgen::JsValue {
     let rust_parsed = match parse_with_settings(org_contents, &GlobalSettings::default()) {
         Ok(document) => document,
         Err(err) => {
-            return serde_wasm_bindgen::to_value(&ParseResult::Error(format!("{:?}", err)))
+            return JsValue::from_serde(&ParseResult::Error(format!("{:?}", err))).unwrap();
-                .unwrap();
         }
     };
     let to_wasm_context = ToWasmContext::new(org_contents);
     let wasm_document = match rust_parsed.to_wasm(to_wasm_context) {
         Ok(document) => document,
         Err(err) => {
-            return serde_wasm_bindgen::to_value(&ParseResult::Error(format!("{:?}", err)))
+            return JsValue::from_serde(&ParseResult::Error(format!("{:?}", err))).unwrap();
-                .unwrap();
         }
     };
-    serde_wasm_bindgen::to_value(&ParseResult::Success(wasm_document)).unwrap()
+    JsValue::from_serde(&ParseResult::Success(wasm_document)).unwrap()
 }