Fix imports for wasm_test.

src/bin_compare.rs

@@ -6,8 +6,6 @@ use std::io::Read;
 use organic::compare::run_anonymous_compare;
 use organic::compare::run_compare_on_file;
 
-mod util;
-
 #[cfg(feature = "tracing")]
 use crate::init_tracing::init_telemetry;
 #[cfg(feature = "tracing")]

src/bin_wasm_test.rs

@@ -2,17 +2,12 @@
 #![feature(exit_status_error)]
 use std::io::Read;
 
-use organic::settings::GlobalSettings;
+use organic::wasm::compare::wasm_run_anonymous_compare;
-use wasm::wasm_parse_org;
-
-mod error;
-mod wasm;
 
 #[cfg(feature = "tracing")]
 use crate::init_tracing::init_telemetry;
 #[cfg(feature = "tracing")]
 use crate::init_tracing::shutdown_telemetry;
-use crate::wasm::compare::wasm_run_anonymous_compare_with_settings;
 #[cfg(feature = "tracing")]
 mod init_tracing;
 
@@ -41,11 +36,9 @@ async fn main_body() -> Result<(), Box<dyn std::error::Error>> {
     let args = std::env::args().skip(1);
     if args.is_empty() {
         let org_contents = read_stdin_to_string()?;
-        let wasm_result = wasm_parse_org(org_contents.as_str());
+        // let wasm_result = wasm_parse_org(org_contents.as_str());
-        println!("{}", serde_json::to_string(&wasm_result)?);
+        // println!("{}", serde_json::to_string(&wasm_result)?);
-        if wasm_run_anonymous_compare_with_settings(org_contents, &GlobalSettings::default(), false)
+        if wasm_run_anonymous_compare(org_contents).await? {
-            .await?
-        {
         } else {
             Err("Diff results do not match.")?;
         }

src/lib.rs

@@ -12,6 +12,8 @@ extern crate test;
 pub mod compare;
 #[cfg(any(feature = "compare", feature = "wasm_test"))]
 pub mod util;
+#[cfg(feature = "wasm_test")]
+pub mod wasm;
 
 mod context;
 mod error;

src/wasm/angle_link.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::AngleLink;
+use crate::types::AngleLink;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/babel_call.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::BabelCall;
+use crate::types::BabelCall;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/bold.rs

@@ -1,12 +1,12 @@
 use std::marker::PhantomData;
 
-use organic::types::Bold;
 use serde::Deserialize;
 use serde::Serialize;
 
 use super::macros::to_wasm;
 use super::standard_properties::WasmStandardProperties;
 use super::to_wasm::ToWasm;
+use crate::types::Bold;
 use crate::wasm::to_wasm::ToWasmStandardProperties;
 
 #[derive(Debug, Serialize)]

src/wasm/center_block.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::CenterBlock;
+use crate::types::CenterBlock;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/citation.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::Citation;
+use crate::types::Citation;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/citation_reference.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::CitationReference;
+use crate::types::CitationReference;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/clock.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::Clock;
+use crate::types::Clock;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/code.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::Code;
+use crate::types::Code;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/comment.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::Comment;
+use crate::types::Comment;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/comment_block.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::CommentBlock;
+use crate::types::CommentBlock;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/compare/mod.rs

@@ -1,3 +1,4 @@
 mod runner;
 
-pub(crate) use runner::wasm_run_anonymous_compare_with_settings;
+pub use runner::wasm_run_anonymous_compare;
+pub use runner::wasm_run_anonymous_compare_with_settings;

src/wasm/compare/runner.rs

@@ -1,6 +1,12 @@
-use organic::parser::parse_with_settings;
+use crate::context::GlobalSettings;
-use organic::settings::GlobalSettings;
+use crate::parser::parse_with_settings;
-use organic::util::print_versions;
+use crate::util::print_versions;
+
+pub async fn wasm_run_anonymous_compare<P: AsRef<str>>(
+    org_contents: P,
+) -> Result<bool, Box<dyn std::error::Error>> {
+    wasm_run_anonymous_compare_with_settings(org_contents, &GlobalSettings::default(), false).await
+}
 
 pub async fn wasm_run_anonymous_compare_with_settings<'g, 's, P: AsRef<str>>(
     org_contents: P,

src/wasm/diary_sexp.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::DiarySexp;
+use crate::types::DiarySexp;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/document.rs

@@ -1,4 +1,4 @@
-use organic::types::Document;
+use crate::types::Document;
 use serde::Serialize;
 
 use super::ast_node::WasmAstNode;

src/wasm/drawer.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::Drawer;
+use crate::types::Drawer;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/dynamic_block.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::DynamicBlock;
+use crate::types::DynamicBlock;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/entity.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::Entity;
+use crate::types::Entity;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/example_block.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::ExampleBlock;
+use crate::types::ExampleBlock;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/export_block.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::ExportBlock;
+use crate::types::ExportBlock;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/export_snippet.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::ExportSnippet;
+use crate::types::ExportSnippet;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/fixed_width_area.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::FixedWidthArea;
+use crate::types::FixedWidthArea;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/footnote_definition.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::FootnoteDefinition;
+use crate::types::FootnoteDefinition;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/footnote_reference.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::FootnoteReference;
+use crate::types::FootnoteReference;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/headline.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::Heading;
+use crate::types::Heading;
 use serde::Serialize;
 
 use super::ast_node::WasmAstNode;

src/wasm/horizontal_rule.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::HorizontalRule;
+use crate::types::HorizontalRule;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/inline_babel_call.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::InlineBabelCall;
+use crate::types::InlineBabelCall;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/inline_source_block.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::InlineSourceBlock;
+use crate::types::InlineSourceBlock;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/italic.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::Italic;
+use crate::types::Italic;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/keyword.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::Keyword;
+use crate::types::Keyword;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/latex_environment.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::LatexEnvironment;
+use crate::types::LatexEnvironment;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/latex_fragment.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::LatexFragment;
+use crate::types::LatexFragment;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/line_break.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::LineBreak;
+use crate::types::LineBreak;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/mod.rs

@@ -10,7 +10,7 @@ mod code;
 mod comment;
 mod comment_block;
 #[cfg(feature = "wasm_test")]
-pub(crate) mod compare;
+pub mod compare;
 mod diary_sexp;
 mod document;
 mod drawer;

src/wasm/node_property.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::NodeProperty;
+use crate::types::NodeProperty;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/org_macro.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::OrgMacro;
+use crate::types::OrgMacro;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/paragraph.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::Paragraph;
+use crate::types::Paragraph;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/parse_result.rs

@@ -1,10 +1,10 @@
-use organic::parser::parse_with_settings;
-use organic::settings::GlobalSettings;
 use serde::Serialize;
 
 use super::document::WasmDocument;
 use super::ToWasm;
 use super::ToWasmContext;
+use crate::parser::parse_with_settings;
+use crate::settings::GlobalSettings;
 
 #[derive(Debug, Serialize)]
 #[serde(tag = "status", content = "content")]

src/wasm/plain_link.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::PlainLink;
+use crate::types::PlainLink;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/plain_list.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::PlainList;
+use crate::types::PlainList;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/plain_list_item.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::PlainListItem;
+use crate::types::PlainListItem;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/plain_text.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::PlainText;
+use crate::types::PlainText;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/planning.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::Planning;
+use crate::types::Planning;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/property_drawer.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::PropertyDrawer;
+use crate::types::PropertyDrawer;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/quote_block.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::QuoteBlock;
+use crate::types::QuoteBlock;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/radio_link.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::RadioLink;
+use crate::types::RadioLink;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/radio_target.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::RadioTarget;
+use crate::types::RadioTarget;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/regular_link.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::RegularLink;
+use crate::types::RegularLink;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/section.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::Section;
+use crate::types::Section;
 use serde::Serialize;
 
 use super::ast_node::WasmAstNode;

src/wasm/special_block.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::SpecialBlock;
+use crate::types::SpecialBlock;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/src_block.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::SrcBlock;
+use crate::types::SrcBlock;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/standard_properties.rs

@@ -1,5 +1,5 @@
-use organic::types::PostBlank;
+use crate::types::PostBlank;
-use organic::types::StandardProperties;
+use crate::types::StandardProperties;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/statistics_cookie.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::StatisticsCookie;
+use crate::types::StatisticsCookie;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/strike_through.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::StrikeThrough;
+use crate::types::StrikeThrough;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/subscript.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::Subscript;
+use crate::types::Subscript;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/superscript.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::Superscript;
+use crate::types::Superscript;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/table.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::Table;
+use crate::types::Table;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/table_cell.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::TableCell;
+use crate::types::TableCell;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/table_row.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::TableRow;
+use crate::types::TableRow;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/target.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::Target;
+use crate::types::Target;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/timestamp.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::Timestamp;
+use crate::types::Timestamp;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/underline.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::Underline;
+use crate::types::Underline;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/verbatim.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::Verbatim;
+use crate::types::Verbatim;
 use serde::Deserialize;
 use serde::Serialize;
 

src/wasm/verse_block.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use organic::types::VerseBlock;
+use crate::types::VerseBlock;
 use serde::Deserialize;
 use serde::Serialize;