From 0ff61a93e766882016fb502780ee2448ce15e055 Mon Sep 17 00:00:00 2001
From: Cormac Relf <web@cormacrelf.net>
Date: Wed, 25 Nov 2020 05:23:58 +1100
Subject: [PATCH 01/22] Wrap most wasm APIs in a JS version of Result, to avoid
 wasm-bindgen's stack overflows

This way we never call wasm_bindgen's throw_val, which doesn't clean up after itself.

Before:

    driver.batchedUpdates()

After:

    driver.batchedUpdates().unwrap() // may throw an error

The object with the unwrap() method is shaped like { Ok: T } or { Err: Error }.
This object is included in `crates/wasm/src/include.js`, which most builds can
import/bundle by themselves, but not no-modules, which doesn't work yet.
---
 Cargo.lock                                |  14 +-
 crates/citeproc/src/processor.rs          |  16 +-
 crates/csl/src/error.rs                   |   5 +-
 crates/csl/src/locale.rs                  |   6 +
 crates/csl/src/locale/lang.rs             |  13 +-
 crates/csl/src/style/info.rs              |   1 +
 crates/db/src/cite.rs                     |  15 -
 crates/db/src/lib.rs                      |   4 +-
 crates/db/src/xml.rs                      |  39 +-
 crates/proc/src/db.rs                     |  31 +-
 crates/proc/src/disamb/mod.rs             |   2 +-
 crates/wasm/Cargo.toml                    |   2 +-
 crates/wasm/js-demo/js/App.tsx            |   6 +-
 crates/wasm/js-demo/js/Document.ts        |  29 +-
 crates/wasm/js-demo/js/DocumentEditor.tsx |  17 +-
 crates/wasm/js-demo/js/useDocument.ts     |  33 +-
 crates/wasm/js-demo/webpack.config.js     |   2 +-
 crates/wasm/src/include.js                |  81 ++++
 crates/wasm/src/lib.rs                    | 565 +++++++++++++++-------
 crates/wasm/src/options.rs                |  74 +++
 crates/wasm/src/typings.d.ts              |   3 +
 crates/wasm/src/utils.rs                  |  17 +-
 crates/wasm/src/wasm_result.rs            | 204 ++++++++
 23 files changed, 886 insertions(+), 293 deletions(-)
 create mode 100644 crates/wasm/src/include.js
 create mode 100644 crates/wasm/src/options.rs
 create mode 100644 crates/wasm/src/typings.d.ts
 create mode 100644 crates/wasm/src/wasm_result.rs

diff --git a/Cargo.lock b/Cargo.lock
index 9c55a57a..fa832c22 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1978,9 +1978,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.42"
+version = "1.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c51d92969d209b54a98397e1b91c8ae82d8c87a7bb87df0b29aa2ad81454228"
+checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2070,18 +2070,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.20"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08"
+checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.20"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793"
+checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2392,7 +2392,6 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 name = "wasm"
 version = "0.0.1"
 dependencies = [
- "anyhow",
  "cfg-if",
  "citeproc",
  "citeproc-io",
@@ -2406,6 +2405,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
+ "thiserror",
  "wasm-bindgen",
  "wasm-bindgen-futures",
 ]
diff --git a/crates/citeproc/src/processor.rs b/crates/citeproc/src/processor.rs
index 7d1066f4..9da382a2 100644
--- a/crates/citeproc/src/processor.rs
+++ b/crates/citeproc/src/processor.rs
@@ -618,17 +618,11 @@ impl Processor {
     }
 
     pub fn get_langs_in_use(&self) -> Vec<Lang> {
-        let mut langs: HashSet<Lang> = self
-            .all_keys()
-            .iter()
-            .filter_map(|ref_id| self.reference(ref_id.clone()))
-            .filter_map(|refr| refr.language.clone())
-            .collect();
-        let style = self.style();
-        if let Some(dl) = style.default_locale.as_ref() {
-            langs.insert(dl.clone());
-        }
-        langs.into_iter().collect()
+        let dl = self.default_lang();
+        let mut vec: Vec<Lang> = dl.iter_fetchable_langs().collect();
+        vec.sort();
+        vec.dedup();
+        vec
     }
 
     pub fn has_cached_locale(&self, lang: &Lang) -> bool {
diff --git a/crates/csl/src/error.rs b/crates/csl/src/error.rs
index c25ccfd2..ae86203b 100644
--- a/crates/csl/src/error.rs
+++ b/crates/csl/src/error.rs
@@ -37,11 +37,12 @@ where
 
 #[derive(thiserror::Error, Debug)]
 #[cfg_attr(feature = "serde", derive(Serialize))]
+#[cfg_attr(feature = "serde", serde(tag = "tag", content = "content"))]
 #[non_exhaustive]
 pub enum StyleError {
     #[error("invalid style: {0}")]
     Invalid(#[from] CslError),
-    #[error("could not parse style")]
+    #[error("could not parse style: {0}")]
     ParseError(
         #[from]
         #[cfg_attr(feature = "serde", serde(serialize_with = "rox_error_serialize"))]
@@ -50,6 +51,7 @@ pub enum StyleError {
     #[error(
         "incorrectly supplied a dependent style, which refers to a parent {required_parent:?}"
     )]
+    #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
     DependentStyle { required_parent: String },
 }
 
@@ -98,6 +100,7 @@ pub struct InvalidCsl {
     // TODO: serialize_with or otherwise get this into the output
     pub range: Range<usize>,
     pub message: String,
+    #[serde(skip_serializing_if = "String::is_empty")]
     pub hint: String,
 }
 
diff --git a/crates/csl/src/locale.rs b/crates/csl/src/locale.rs
index 26841b04..76e3f266 100644
--- a/crates/csl/src/locale.rs
+++ b/crates/csl/src/locale.rs
@@ -78,6 +78,12 @@ pub struct Locale {
 impl FromStr for Locale {
     type Err = StyleError;
     fn from_str(xml: &str) -> Result<Self, Self::Err> {
+        Locale::parse(xml)
+    }
+}
+
+impl Locale {
+    pub fn parse(xml: &str) -> Result<Self, StyleError> {
         let doc = Document::parse(&xml)?;
         let info = ParseInfo::default();
         let locale = Locale::from_node(&doc.root_element(), &info)?;
diff --git a/crates/csl/src/locale/lang.rs b/crates/csl/src/locale/lang.rs
index c4d4c5b5..5dc7f688 100644
--- a/crates/csl/src/locale/lang.rs
+++ b/crates/csl/src/locale/lang.rs
@@ -17,7 +17,7 @@ pub enum LocaleSource {
 /// A parsable representation of `xml:lang`.
 ///
 /// See http://www.datypic.com/sc/xsd/t-xsd_language.html
-#[derive(Debug, Clone, Eq, PartialEq, Hash)]
+#[derive(Debug, Clone, Eq, PartialEq, Hash, PartialOrd, Ord)]
 pub enum Lang {
     /// ISO 639 language code, + optional hyphen and 2-letter ISO 3166 country code.
     ///
@@ -87,6 +87,13 @@ impl Lang {
             .map(LocaleSource::Inline)
             .chain(self.file_iter().map(LocaleSource::File))
     }
+    pub fn iter_fetchable_langs(&self) -> impl Iterator<Item = Lang> {
+        self.iter()
+            .filter_map(|source| match source {
+                LocaleSource::File(l) => Some(l),
+                _ => None,
+            })
+    }
     fn file_iter(&self) -> FileIter {
         FileIter {
             current: Some(self.clone()),
@@ -154,7 +161,7 @@ fn test_french() {
 /// Language codes for `Lang::Iso`.
 ///
 /// The 3-character codes are ISO 639-3.
-#[derive(Debug, Clone, Eq, PartialEq, Hash, EnumString)]
+#[derive(Debug, Clone, Eq, PartialEq, Hash, EnumString, PartialOrd, Ord)]
 pub enum IsoLang {
     #[strum(serialize = "en", serialize = "eng")]
     English,
@@ -212,7 +219,7 @@ impl fmt::Display for IsoLang {
 /// These countries are used to do dialect fallback. Countries not used in that can be represented
 /// as `IsoCountry::Other`. If a country is in the list, you don't need to allocate to refer to it,
 /// so there are some non-participating countries in the list simply because it's faster.
-#[derive(Debug, Clone, Eq, PartialEq, Hash, EnumString)]
+#[derive(Debug, Clone, Eq, PartialEq, Hash, EnumString, PartialOrd, Ord)]
 pub enum IsoCountry {
     /// United States
     US,
diff --git a/crates/csl/src/style/info.rs b/crates/csl/src/style/info.rs
index 8839b0f9..484d7698 100644
--- a/crates/csl/src/style/info.rs
+++ b/crates/csl/src/style/info.rs
@@ -169,6 +169,7 @@ impl EnumGetAttribute for CitationFormat {}
 #[cfg_attr(feature = "serde", serde(rename_all = "kebab-case"))]
 pub enum Rel {
     #[strum(serialize = "self")]
+    #[cfg_attr(feature = "serde", serde(rename = "self"))]
     RelSelf,
     Documentation,
     /// Not allowed in dependent styles
diff --git a/crates/db/src/cite.rs b/crates/db/src/cite.rs
index 63e91fcc..4ea35bb4 100644
--- a/crates/db/src/cite.rs
+++ b/crates/db/src/cite.rs
@@ -47,9 +47,6 @@ pub trait CiteDatabase: LocaleDatabase + StyleDatabase {
     // All cite ids, in the order they are cited in the document
     fn all_cite_ids(&self) -> Arc<Vec<CiteId>>;
 
-    fn locale_by_cite(&self, id: CiteId) -> Arc<Locale>;
-    fn locale_by_reference(&self, ref_id: Atom) -> Arc<Locale>;
-
     /// Create ghost cites for disambiguation only as needed.
     /// These are subsequently interned into CiteIds.
     fn ghost_cite(&self, ref_id: Atom) -> Arc<Cite<Markup>>;
@@ -123,18 +120,6 @@ fn reference(db: &dyn CiteDatabase, key: Atom) -> Option<Arc<Reference>> {
     }
 }
 
-fn locale_by_cite(db: &dyn CiteDatabase, id: CiteId) -> Arc<Locale> {
-    let cite = id.lookup(db);
-    db.locale_by_reference(cite.ref_id.clone())
-}
-
-fn locale_by_reference(db: &dyn CiteDatabase, ref_id: Atom) -> Arc<Locale> {
-    let refr = db.reference(ref_id);
-    refr.and_then(|r| r.language.clone())
-        .map(|l| db.merged_locale(l))
-        .unwrap_or_else(|| db.default_locale())
-}
-
 /// Type to represent which references should appear in a bibiliography even if they are not cited
 /// in the document. The default is that references only appear if they are cited.
 #[derive(Debug, Clone, Eq, PartialEq)]
diff --git a/crates/db/src/lib.rs b/crates/db/src/lib.rs
index 1e0beca7..d7df3e2b 100644
--- a/crates/db/src/lib.rs
+++ b/crates/db/src/lib.rs
@@ -17,6 +17,6 @@ pub fn safe_default(db: &mut (impl cite::CiteDatabase + xml::LocaleDatabase + xm
     db.set_all_keys_with_durability(Default::default(), Durability::MEDIUM);
     db.set_all_uncited(Default::default());
     db.set_cluster_ids(Arc::new(Default::default()));
-    db.set_locale_input_langs(Default::default());
-    db.set_default_lang_override(Default::default());
+    db.set_locale_input_langs_with_durability(Default::default(), Durability::HIGH);
+    db.set_default_lang_override_with_durability(Default::default(), Durability::HIGH);
 }
diff --git a/crates/db/src/xml.rs b/crates/db/src/xml.rs
index 928b8c6e..b69d9bcc 100644
--- a/crates/db/src/xml.rs
+++ b/crates/db/src/xml.rs
@@ -170,30 +170,34 @@ pub trait LocaleDatabase: StyleDatabase + HasFetcher {
     fn default_lang_override(&self) -> Option<Lang>;
 
     /// Backed by the LocaleFetcher implementation
+    #[salsa::transparent]
     fn locale_xml(&self, key: Lang) -> Option<Arc<String>>;
 
     /// Derived from a `Style`
+    #[salsa::transparent]
     fn inline_locale(&self, key: Option<Lang>) -> Option<Arc<Locale>>;
 
     /// A locale object, which may be `Default::default()`
-    fn locale(&self, key: LocaleSource) -> Option<Arc<Locale>>;
+    fn parsed_locale(&self, key: LocaleSource) -> Option<Arc<Locale>>;
 
     /// Derives the full lang inheritance chain, and merges them into one
+    #[salsa::transparent]
     fn merged_locale(&self, key: Lang) -> Arc<Locale>;
 
-    /// Even though we already have a merged `LocaleOptionsNode` struct, all its fields are
-    /// `Option`. To avoid having to unwrap each field later on, we merge whatever options did
-    /// get provided into a non-`Option` defaults struct.
-    fn locale_options(&self, key: Lang) -> Arc<LocaleOptions>;
-
     fn default_locale(&self) -> Arc<Locale>;
+
+    #[salsa::transparent]
+    fn default_lang(&self) -> Lang;
 }
 
-fn default_locale(db: &dyn LocaleDatabase) -> Arc<Locale> {
-    let overrider = db
+fn default_lang(db: &dyn LocaleDatabase) -> Lang {
+    db
         .default_lang_override()
-        .unwrap_or_else(|| db.style().default_locale.clone().unwrap_or_else(Default::default));
-    db.merged_locale(overrider)
+        .unwrap_or_else(|| db.style().default_locale.clone().unwrap_or_else(Default::default))
+}
+
+fn default_locale(db: &dyn LocaleDatabase) -> Arc<Locale> {
+    db.merged_locale(db.default_lang())
 }
 
 fn locale_xml(db: &dyn LocaleDatabase, key: Lang) -> Option<Arc<String>> {
@@ -216,12 +220,12 @@ fn inline_locale(db: &dyn LocaleDatabase, key: Option<Lang>) -> Option<Arc<Local
     db.style().locale_overrides.get(&key).cloned().map(Arc::new)
 }
 
-fn locale(db: &dyn LocaleDatabase, key: LocaleSource) -> Option<Arc<Locale>> {
+fn parsed_locale(db: &dyn LocaleDatabase, key: LocaleSource) -> Option<Arc<Locale>> {
     match key {
         LocaleSource::File(ref lang) => {
             let string = db.locale_xml(lang.clone());
             string
-                .and_then(|s| match Locale::from_str(&s) {
+                .and_then(|s| match Locale::parse(&s) {
                     Ok(l) => Some(l),
                     Err(e) => {
                         error!("failed to parse locale for lang {}: {:?}", lang, e);
@@ -238,7 +242,7 @@ fn merged_locale(db: &dyn LocaleDatabase, key: Lang) -> Arc<Locale> {
     debug!("requested locale {:?}", key);
     let locales = key
         .iter()
-        .filter_map(|src| db.locale(src))
+        .filter_map(|src| db.parsed_locale(src))
         .collect::<Vec<_>>();
     Arc::new(
         locales
@@ -259,11 +263,6 @@ fn merged_locale(db: &dyn LocaleDatabase, key: Lang) -> Arc<Locale> {
     )
 }
 
-fn locale_options(db: &dyn LocaleDatabase, key: Lang) -> Arc<LocaleOptions> {
-    let merged = &db.merged_locale(key).options_node;
-    Arc::new(LocaleOptions::from_merged(merged))
-}
-
 cfg_if::cfg_if! {
     if #[cfg(feature = "parallel")] {
         pub trait LocaleFetcher: Send + Sync {
@@ -271,7 +270,7 @@ cfg_if::cfg_if! {
             fn fetch_locale(&self, lang: &Lang) -> Option<Locale> {
                 use std::str::FromStr;
                 let s = self.fetch_string(lang).ok()??;
-                Some(Locale::from_str(&s).ok()?)
+                Some(Locale::parse(&s).ok()?)
             }
         }
     } else {
@@ -280,7 +279,7 @@ cfg_if::cfg_if! {
             fn fetch_locale(&self, lang: &Lang) -> Option<Locale> {
                 use std::str::FromStr;
                 let s = self.fetch_string(lang).ok()??;
-                Some(Locale::from_str(&s).ok()?)
+                Some(Locale::parse(&s).ok()?)
             }
         }
     }
diff --git a/crates/proc/src/db.rs b/crates/proc/src/db.rs
index 0cc8ef96..1c99902c 100644
--- a/crates/proc/src/db.rs
+++ b/crates/proc/src/db.rs
@@ -360,7 +360,6 @@ fn ref_not_found(db: &dyn IrDatabase, ref_id: &Atom, log: bool) -> Arc<IrGen> {
 // style
 // cite
 // reference
-// locale_by_cite
 // cite_position
 //  -
 // bib_number
@@ -368,7 +367,7 @@ fn ref_not_found(db: &dyn IrDatabase, ref_id: &Atom, log: bool) -> Arc<IrGen> {
 macro_rules! preamble {
     ($style:ident, $locale:ident, $cite:ident, $refr:ident, $ctx:ident, $db:expr, $id:expr, $pass:expr) => {{
         $style = $db.style();
-        $locale = $db.locale_by_cite($id);
+        $locale = $db.default_locale();
         // Avoid making bibliography ghosts all depend any positional / note num info
         let cite_stuff = match $db.lookup_cite($id) {
             CiteData::RealCite { cite, .. } => (cite, $db.cite_position($id)),
@@ -785,11 +784,12 @@ fn expand_one_name_ir(
     }
     use crate::disamb::names::MatchKey;
 
-    let name_ambiguity_number = |edge: &EdgeData, match_key: Option<&MatchKey>, slot: &[NameVariantMatcher]| -> u32 {
-        slot.iter()
-            .filter(|matcher| matcher.accepts(edge, None))
-            .count() as u32
-    };
+    let name_ambiguity_number =
+        |edge: &EdgeData, match_key: Option<&MatchKey>, slot: &[NameVariantMatcher]| -> u32 {
+            slot.iter()
+                .filter(|matcher| matcher.accepts(edge, None))
+                .count() as u32
+        };
 
     let mut n = 0usize;
     for dnr in nir.disamb_names.iter_mut() {
@@ -846,7 +846,9 @@ fn disambiguate_add_givennames(
     ctx: &mut CiteContext<'_, Markup>,
     also_add: bool,
 ) -> Option<bool> {
-    ctx.disamb_pass = Some(DisambPass::AddGivenName(ctx.style.citation.givenname_disambiguation_rule));
+    ctx.disamb_pass = Some(DisambPass::AddGivenName(
+        ctx.style.citation.givenname_disambiguation_rule,
+    ));
     let _fmt = db.get_formatter();
     let refs = refs_accepting_cite(
         db,
@@ -992,7 +994,14 @@ fn ir_gen2_matching_refs(db: &dyn IrDatabase, id: CiteId) -> Arc<Vec<Atom>> {
     let gndr = style.citation.givenname_disambiguation_rule;
     let cite = id.lookup(db);
     let gen2 = db.ir_gen2_add_given_name(id);
-    let refs = refs_accepting_cite(db, gen2.root, &gen2.arena, Some(id), &cite.ref_id, Some(DisambPass::AddGivenName(gndr)));
+    let refs = refs_accepting_cite(
+        db,
+        gen2.root,
+        &gen2.arena,
+        Some(id),
+        &cite.ref_id,
+        Some(DisambPass::AddGivenName(gndr)),
+    );
     Arc::new(refs)
 }
 
@@ -1464,7 +1473,7 @@ pub fn with_cite_context<T>(
     f: impl FnOnce(CiteContext) -> T,
 ) -> Option<T> {
     let style = db.style();
-    let locale = db.locale_by_cite(id);
+    let locale = db.default_locale();
     let cite = id.lookup(db);
     let refr = db.reference(cite.ref_id.clone())?;
     let (names_delimiter, name_el) = db.name_info_citation();
@@ -1505,7 +1514,7 @@ pub fn with_bib_context<T>(
 ) -> Option<T> {
     let style = db.style();
     let bib = style.bibliography.as_ref()?;
-    let locale = db.locale_by_reference(ref_id.clone());
+    let locale = db.default_locale();
     let cite = Cite::basic(ref_id.clone());
     let refr_arc = db.reference(ref_id);
     let null_ref = citeproc_io::Reference::empty("empty_ref".into(), csl::CslType::Article);
diff --git a/crates/proc/src/disamb/mod.rs b/crates/proc/src/disamb/mod.rs
index 17334f7b..308cf476 100644
--- a/crates/proc/src/disamb/mod.rs
+++ b/crates/proc/src/disamb/mod.rs
@@ -273,7 +273,7 @@ pub fn create_ref_ir<O: OutputFormat>(
     refr: &Reference,
 ) -> Vec<(FreeCond, RefIR)> {
     let style = db.style();
-    let locale = db.locale_by_reference(refr.id.clone());
+    let locale = db.default_locale();
     let ysh_explicit_edge = EdgeData::YearSuffixExplicit;
     let ysh_plain_edge = EdgeData::YearSuffixPlain;
     let ysh_edge = EdgeData::YearSuffix;
diff --git a/crates/wasm/Cargo.toml b/crates/wasm/Cargo.toml
index 865a8133..e4bfbbbb 100644
--- a/crates/wasm/Cargo.toml
+++ b/crates/wasm/Cargo.toml
@@ -53,7 +53,7 @@ js-sys = "0.3.39"
 serde = "1.0.116"
 serde_derive = "1.0.116"
 serde_json = "1.0.57"
-anyhow = "1.0.32"
+thiserror = "1.0.22"
 
 [dependencies.rand]
 version = "0.7.3"
diff --git a/crates/wasm/js-demo/js/App.tsx b/crates/wasm/js-demo/js/App.tsx
index 59cd2b61..5a66d418 100644
--- a/crates/wasm/js-demo/js/App.tsx
+++ b/crates/wasm/js-demo/js/App.tsx
@@ -102,11 +102,11 @@ async function loadEditor() {
             <div style={{display: 'flex'}}>
                 <div style={column}>
                     <h3>Style</h3>
-                    <textarea value={style} onChange={e => setStyle(e.target.value)} style={mono} />
+                    <textarea defaultValue={style} onBlur={e => setStyle(e.target.value)} style={mono} />
                 </div>
                 <div style={column}>
                     <h3>References</h3>
-                    <textarea value={refsText} onChange={e => setRefsText(e.target.value)} style={mono} />
+                    <textarea defaultValue={refsText} onBlur={e => setRefsText(e.target.value)} style={mono} />
                 </div>
             </div>
         </div>;
@@ -125,7 +125,7 @@ const Results = ({ driver, style }: { driver: Result<Driver, any>, style: string
     return driver.match({
         Ok: d => <p>
             locales in use:
-            <code>{JSON.stringify(d.toFetch().sort())}</code>
+            <code>{JSON.stringify(d.toFetch().unwrap().sort())}</code>
         </p>,
         Err: e => <p style={{backgroundColor: '#ff00002b', marginBottom: '5px'}}>{e}</p>,
     });
diff --git a/crates/wasm/js-demo/js/Document.ts b/crates/wasm/js-demo/js/Document.ts
index 4d8ae370..daf3beb4 100644
--- a/crates/wasm/js-demo/js/Document.ts
+++ b/crates/wasm/js-demo/js/Document.ts
@@ -1,7 +1,7 @@
 import { Reference, Cite, Cluster, ClusterPosition, Driver, UpdateSummary, IncludeUncited } from '../../pkg';
 import { produce, immerable, Draft } from 'immer';
 
-export type ClusterId = number;
+export type ClusterId = string;
 export type CiteId = number;
 
 export class RenderedDocument {
@@ -20,7 +20,7 @@ export class RenderedDocument {
     constructor(clusters: Cluster[], oci: Array<ClusterPosition>, driver: Driver) {
         this[immerable] = true;
         this.orderedClusterIds = oci;
-        let render = driver.fullRender();
+        let render = driver.fullRender().unwrap();
         this.builtClusters = render.allClusters;
         for (let bibEntry of render.bibEntries) {
             this.bibliographyIds.push(bibEntry.id);
@@ -128,9 +128,9 @@ export class Document {
 
     private init(driver: Driver) {
         this.driver = driver;
-        driver.initClusters(this.clusters);
-        driver.setClusterOrder(this.clusterPositions());
-        driver.includeUncited(this.includeUncited);
+        driver.initClusters(this.clusters).unwrap();
+        driver.setClusterOrder(this.clusterPositions()).unwrap();
+        driver.includeUncited(this.includeUncited).unwrap();
         this.rendered = new RenderedDocument(this.clusters, this.clusterPositions(), driver);
         console.log(this.driver);
     }
@@ -152,7 +152,7 @@ export class Document {
             fn(draft);
             driver.setClusterOrder(draft.clusterPositions());
             console.time("batchedUpdates");
-            let summary = driver.batchedUpdates();
+            let summary = driver.batchedUpdates().unwrap();
             console.timeEnd("batchedUpdates");
             draft.rendered = draft.rendered.update(summary, this.clusterPositions());
         });
@@ -170,7 +170,7 @@ export class Document {
 
     setIncludeUncited(uncited: IncludeUncited) {
         this.includeUncited = uncited;
-        this.driver.includeUncited(this.includeUncited);
+        this.driver.includeUncited(this.includeUncited).unwrap();
     }
 
     //////////////
@@ -191,16 +191,16 @@ export class Document {
         this.refCounts.decrement(this.clusters[idx]);
         this.clusters[idx] = cluster;
         // Inform the driver
-        this.driver.insertCluster(cluster);
+        this.driver.insertCluster(cluster).unwrap();
     }
 
-    removeCluster(id: number) {
+    removeCluster(id: string) {
         // Mutate
         let idx = this.clusters.findIndex(c => c.id === id);
         this.refCounts.decrement(this.clusters[idx]);
         this.clusters.splice(idx, 1);
         // Inform the driver
-        this.driver.removeCluster(id);
+        this.driver.removeCluster(id).unwrap();
     }
 
     // TODO: be able to pick up a cluster and move it
@@ -239,12 +239,3 @@ export class Document {
     }
 
 }
-
-function inc(x: number | [number, number]): number | [number, number] {
-    if (Array.isArray(x)) {
-        let [a, b] = x;
-        return [a+1, b];
-    } else {
-        return x + 1;
-    }
-}
diff --git a/crates/wasm/js-demo/js/DocumentEditor.tsx b/crates/wasm/js-demo/js/DocumentEditor.tsx
index ce8d90cd..32764dff 100644
--- a/crates/wasm/js-demo/js/DocumentEditor.tsx
+++ b/crates/wasm/js-demo/js/DocumentEditor.tsx
@@ -1,5 +1,5 @@
 import { Document, RenderedDocument } from './Document';
-import React, { useState, useEffect, useCallback } from 'react';
+import React, { useState, useEffect, useCallback, useRef } from 'react';
 import { Cluster, Cite, IncludeUncited } from '../../pkg';
 
 import './bibliography.css';
@@ -10,7 +10,7 @@ const btnStyle = {
 
 export const DocumentEditor = ({document, onChange}: { document: Document; onChange: (d: Document) => void }) => {
   let [csvIncl, setCsvIncl] = useState("");
-    const insertCluster = (before: number) => {
+    const insertCluster = (before: string) => {
         let neu = document.produce(draft => {
             let cl = draft.createCluster([{ id: 'citekey' }]);
             draft.insertCluster(cl, before);
@@ -99,6 +99,17 @@ const ClusterEditor = ({cluster, updateCluster, removeCluster}: {cluster: Cluste
     </>;
 }
 
+function useDidUpdateEffect(fn, inputs) {
+  const didMountRef = useRef(false);
+
+  useEffect(() => {
+    if (didMountRef.current)
+      fn();
+    else
+      didMountRef.current = true;
+  }, inputs);
+}
+
 const CiteEditor = ({cite, update}: {cite: Cite, update: (cite: Cite) => void}) => {
     let [key, setKey] = useState(cite.id);
     let [locator, setLocator] = useState(cite.locator);
@@ -115,7 +126,7 @@ const CiteEditor = ({cite, update}: {cite: Cite, update: (cite: Cite) => void})
         setLocator(l);
     }, []);
 
-    useEffect(() => {
+    useDidUpdateEffect(() => {
         update({ ...cite, id: key, locators: undefined, locator });
     }, [key, locator]);
 
diff --git a/crates/wasm/js-demo/js/useDocument.ts b/crates/wasm/js-demo/js/useDocument.ts
index b95ba31e..e7098dcb 100644
--- a/crates/wasm/js-demo/js/useDocument.ts
+++ b/crates/wasm/js-demo/js/useDocument.ts
@@ -47,13 +47,23 @@ export const useDocument = (initialStyle: string, initialReferences: Reference[]
         // make sure it's not loading wasm in the initial chunk
         const { Driver: CreateDriver } = await import('../../pkg');
         let d: Result<Driver, any> = Result.from(() => {
-            let d = CreateDriver.new(style, fetcher, "html");
-            d.resetReferences(references);
-            return d;
+            try {
+                let driver = CreateDriver.new({
+                    style,
+                    lifecycle: fetcher,
+                    format: "html",
+                    // localeOverride: "de-AT",
+                });
+                let d = driver.unwrap();
+                d.resetReferences(references).unwrap();
+                return d;
+            } catch(e) {
+                console.error("caught in createDriver: ", e);
+            }
         });
         if (d.is_ok()) {
             let newDriver = d.unwrap();
-            newDriver.resetReferences(references);
+            newDriver.resetReferences(references).unwrap();
             await flightFetcher(newDriver);
         }
         setDriver(d);
@@ -63,10 +73,17 @@ export const useDocument = (initialStyle: string, initialReferences: Reference[]
         if (driver.is_ok()) {
             let d = driver.unwrap();
             try {
-                d.setStyle(style);
+                const { parseStyleMetadata } = await import('../../pkg');
+                let meta = parseStyleMetadata(style).unwrap();
+                if (meta.info.parent != null) {
+                    console.log("this is a dependent style!");
+                }
+                console.log(meta);
+                d.setStyle(style).unwrap();
                 setError(None());
             } catch (e) {
                 console.error(e);
+                console.log(e.data);
                 setError(Some("" + e));
             }
             await flightFetcher(d);
@@ -100,7 +117,7 @@ export const useDocument = (initialStyle: string, initialReferences: Reference[]
         setReferences(refs);
         if (driver.is_ok()) {
             let d = driver.unwrap();
-            d.resetReferences(refs);
+            d.resetReferences(refs).unwrap();
             await flightFetcher(d);
             setDocument(document.map(doc => doc.selfUpdate()));
         }
@@ -202,7 +219,7 @@ class _ExampleManager implements Lifecycle {
     async resetReferences(refs: Reference[]) {
         this.references = refs;
         if (this.driver) {
-            this.driver.resetReferences(refs);
+            this.driver.resetReferences(refs).unwrap();
             await this.driver.fetchAll();
             this.update();
         }
@@ -224,7 +241,7 @@ class _ExampleManager implements Lifecycle {
             } else {
                 neu[i] = ref;
             }
-            this.driver && this.driver.resetReferences(refs);
+            this.driver && this.driver.resetReferences(refs).unwrap();
         }
         this.references = neu;
         if (this.driver) {
diff --git a/crates/wasm/js-demo/webpack.config.js b/crates/wasm/js-demo/webpack.config.js
index 963247f9..8b0c3eb5 100644
--- a/crates/wasm/js-demo/webpack.config.js
+++ b/crates/wasm/js-demo/webpack.config.js
@@ -44,7 +44,7 @@ module.exports = {
     new WasmPackPlugin({
       crateDirectory: path.resolve(__dirname, "../"),
       extraArgs: "-- --features console,dot",
-      forceMode: "production",
+      // forceMode: "production",
     }),
   ]
 };
diff --git a/crates/wasm/src/include.js b/crates/wasm/src/include.js
new file mode 100644
index 00000000..f29f27fa
--- /dev/null
+++ b/crates/wasm/src/include.js
@@ -0,0 +1,81 @@
+export class WasmResult {
+  constructor(value) {
+    if (value instanceof Error) {
+      this.Err = value;
+    } else {
+      this.Ok = value;
+    }
+  }
+  is_some() {
+    if (this.hasOwnProperty("Err")) {
+      return false;
+    }
+    return true;
+  }
+  is_none() {
+    return !this.is_some();
+  }
+  unwrap() {
+    if (this.hasOwnProperty("Err")) {
+      throw this.Err;
+    } else {
+      return this.Ok
+    }
+  }
+  unwrap_or(otherwise) {
+    if (this.hasOwnProperty("Err")) {
+      return otherwise;
+    } else {
+      return this.Ok;
+    }
+  }
+  map(func) {
+    if (this.hasOwnProperty("Err")) {
+      return this;
+    } else {
+      return new WasmResult(func(this.Ok));
+    }
+  }
+  map_or(otherwise, func) {
+    if (this.hasOwnProperty("Err")) {
+      return otherwise;
+    } else {
+      return func(this.Ok);
+    }
+  }
+}
+
+export class CiteprocRsError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = "CiteprocRsError";
+    }
+}
+export class CiteprocRsDriverError extends CiteprocRsError {
+    constructor(message, data) {
+        super(message);
+        this.data = data;
+        this.name = "CiteprocRsDriverError";
+    }
+}
+export class CslStyleError extends CiteprocRsError {
+    constructor(message, data) {
+        super(message);
+        this.data = data;
+        this.name = "CslStyleError";
+    }
+}
+
+// For use in no-modules builds for the browser, which have no linking
+let env_global;
+if (typeof self !== "undefined") {
+  env_global = self;
+} else if (typeof window !== "undefined") {
+  env_global = window;
+}
+if (typeof env_global !== "undefined") {
+  env_global.WasmResult = WasmResult;
+  env_global.CiteprocRsError = CiteprocRsError;
+  env_global.CslStyleError = CslStyleError;
+  env_global.CiteprocRsDriverError = CiteprocRsDriverError;
+}
diff --git a/crates/wasm/src/lib.rs b/crates/wasm/src/lib.rs
index f6a12873..f86246df 100644
--- a/crates/wasm/src/lib.rs
+++ b/crates/wasm/src/lib.rs
@@ -6,8 +6,12 @@
 
 #[macro_use]
 mod utils;
+#[macro_use]
+mod wasm_result;
+mod options;
+use wasm_result::*;
+use options::{WasmInitOptions, GetLifecycleError};
 
-extern crate serde_derive;
 #[allow(unused_imports)]
 #[macro_use]
 extern crate log;
@@ -22,12 +26,41 @@ use wasm_bindgen_futures::{future_to_promise, JsFuture};
 
 use citeproc::prelude::*;
 use citeproc::string_id;
-use csl::Lang;
+use csl::{Lang, StyleMeta};
+
+#[wasm_bindgen(js_name = "parseStyleMetadata")]
+pub fn parse_style_metadata(style: &str) -> StyleMetaResult {
+    typescript_serde_result(|| {
+        let meta = StyleMeta::parse(style)?;
+        Ok(meta)
+    })
+}
 
 #[wasm_bindgen]
 pub struct Driver {
     engine: Rc<RefCell<Processor>>,
-    fetcher: Lifecycle,
+    fetcher: Option<Lifecycle>,
+}
+
+#[derive(thiserror::Error, Debug, serde::Serialize)]
+#[serde(tag = "tag", content = "content")]
+pub enum DriverError {
+    #[error("Unknown output format {0}")]
+    UnknownOutputFormat(String),
+    #[error("Style error: {0}")]
+    StyleError(#[from] csl::StyleError),
+    #[error("JSON Deserialization Error: {0}")]
+    JsonError(#[from] #[serde(skip_serializing)] serde_json::Error),
+    #[error("Invalid lifecycle object: {0}")]
+    GetLifecycleError(#[from] GetLifecycleError),
+    #[error("Non-Existent Cluster id: {0}")]
+    NonExistentCluster(String),
+    #[error("Reordering error: {0}")]
+    ReorderingError(#[from] #[serde(skip_serializing)] string_id::ReorderingError),
+
+    // This should not be necessary
+    #[error("Reordering error: {0}")]
+    ReorderingErrorNumericId(#[from] #[serde(skip_serializing)] citeproc::ReorderingError),
 }
 
 #[wasm_bindgen]
@@ -39,101 +72,122 @@ impl Driver {
     /// * `format` is one of { "html", "rtf" }
     ///
     /// Throws an error if it cannot parse the style you gave it.
-    pub fn new(style: &str, lifecycle: Lifecycle, format: &str) -> Result<Driver, JsValue> {
+    pub fn new(options_js: JsValue) -> DriverResult {
         utils::set_panic_hook();
         utils::init_log();
 
-        // The Processor gets a "only has en-US, otherwise empty" fetcher.
-        let us_fetcher = Arc::new(utils::USFetcher);
-        let format = SupportedFormat::from_str(format)
-            .map_err(|_| anyhow::anyhow!("unknown format `{}`", format));
-        let format = js_err!(format);
-
-        let init = InitOptions {
-            style,
-            fetcher: Some(us_fetcher),
-            format,
-            ..Default::default()
-        };
-        let engine = js_err!(Processor::new(init));
-        let engine = Rc::new(RefCell::new(engine));
-        // The Driver manually adds locales fetched via Lifecycle, which asks the consumer
-        // asynchronously.
-        Ok(Driver {
-            engine,
-            fetcher: lifecycle,
+        js_driver_error(|| {
+            // The Processor gets a "only has en-US, otherwise empty" fetcher.
+            let us_fetcher = Arc::new(utils::USFetcher);
+            let options: WasmInitOptions = JsValue::into_serde(&options_js)?;
+            let lifecycle = Lifecycle::from_options_object(&options_js)?;
+            let init = InitOptions {
+                style: options.style.as_ref(),
+                fetcher: Some(us_fetcher),
+                format: options.format,
+                bibliography_nosort: options.bibliography_nosort,
+                locale_override: options.locale_override,
+                test_mode: false,
+                ..Default::default()
+            };
+            let engine = Processor::new(init)?;
+
+            if engine.default_lang() != Lang::en_us() && lifecycle.is_none() {
+                log::warn!("citeproc-rs was initialized with a locale other than en-US, but without a locale fetcher, using built-in en-US instead.");
+            }
+
+            let engine = Rc::new(RefCell::new(engine));
+            // The Driver manually adds locales fetched via Lifecycle, which asks the consumer
+            // asynchronously.
+            Ok(Driver {
+                engine,
+                fetcher: lifecycle,
+            })
         })
+        .into()
     }
 
     /// Sets the style (which will also cause everything to be recomputed)
     #[wasm_bindgen(js_name = "setStyle")]
-    pub fn set_style(&self, style_text: &str) -> Result<(), JsValue> {
-        let mut eng = self.engine.borrow_mut();
-        js_err!(eng.set_style_text(style_text));
-        Ok(())
+    pub fn set_style(&self, style_text: &str) -> WasmResult {
+        js_driver_error(|| {
+            let _ = self.engine.borrow_mut().set_style_text(style_text)?;
+            Ok(JsValue::UNDEFINED)
+        })
     }
 
     /// Completely overwrites the references library.
     /// This **will** delete references that are not in the provided list.
     #[wasm_bindgen(js_name = "resetReferences")]
-    pub fn reset_references(&self, refs: Box<[JsValue]>) -> Result<(), JsValue> {
-        let refs = utils::read_js_array(refs)?;
-        let mut engine = self.engine.borrow_mut();
-        engine.reset_references(refs);
-        Ok(())
+    pub fn reset_references(&self, refs: Box<[JsValue]>) -> EmptyResult {
+        typescript_serde_result(|| {
+            let refs = utils::read_js_array_2(refs)?;
+            self.engine.borrow_mut().reset_references(refs);
+            Ok(())
+        })
     }
 
     /// Inserts or overwrites references as a batch operation.
     /// This **will not** delete references that are not in the provided list.
     #[wasm_bindgen(js_name = "insertReferences")]
-    pub fn insert_references(&self, refs: Box<[JsValue]>) -> Result<(), JsValue> {
-        let refs = utils::read_js_array(refs)?;
-        self.engine.borrow_mut().extend_references(refs);
-        Ok(())
+    pub fn insert_references(&self, refs: Box<[JsValue]>) -> EmptyResult {
+        typescript_serde_result(|| {
+            let refs = utils::read_js_array_2(refs)?;
+            self.engine.borrow_mut().extend_references(refs);
+            Ok(())
+        })
     }
 
     /// Inserts or overwrites a reference.
     ///
     /// * `refr` is a Reference object.
     #[wasm_bindgen(js_name = "insertReference")]
-    pub fn insert_reference(&self, refr: TReference) -> Result<(), JsValue> {
-        let refr = js_err!(refr.into_serde());
-        // inserting & replacing are the same
-        self.engine.borrow_mut().insert_reference(refr);
-        Ok(())
+    pub fn insert_reference(&self, refr: TReference) -> EmptyResult {
+        typescript_serde_result(|| {
+            let refr = refr.into_serde()?;
+            // inserting & replacing are the same
+            self.engine.borrow_mut().insert_reference(refr);
+            Ok(())
+        })
     }
 
     /// Removes a reference by id. If it is cited, any cites will be dangling. It will also
     /// disappear from the bibliography.
     #[wasm_bindgen(js_name = "removeReference")]
-    pub fn remove_reference(&self, id: &str) -> Result<(), JsValue> {
-        let id = Atom::from(id);
-        self.engine.borrow_mut().remove_reference(id);
-        Ok(())
+    pub fn remove_reference(&self, id: &str) -> EmptyResult {
+        typescript_serde_result(|| {
+            let id = Atom::from(id);
+            self.engine.borrow_mut().remove_reference(id);
+            Ok(())
+        })
     }
 
     /// Sets the references to be included in the bibliography despite not being directly cited.
     ///
     /// * `refr` is a
     #[wasm_bindgen(js_name = "includeUncited")]
-    pub fn include_uncited(&self, uncited: TIncludeUncited) -> Result<(), JsValue> {
-        let uncited = js_err!(uncited.into_serde());
-        self.engine.borrow_mut().include_uncited(uncited);
-        Ok(())
+    pub fn include_uncited(&self, uncited: TIncludeUncited) -> EmptyResult {
+        typescript_serde_result(|| {
+            let uncited = uncited.into_serde()?;
+            self.engine.borrow_mut().include_uncited(uncited);
+            Ok(())
+        })
     }
 
     /// Gets a list of locales in use by the references currently loaded.
     ///
     /// Note that Driver comes pre-loaded with the `en-US` locale.
     #[wasm_bindgen(js_name = "toFetch")]
-    pub fn locales_to_fetch(&self) -> Result<JsValue, JsValue> {
-        let eng = self.engine.borrow();
-        let langs: Vec<_> = eng
-            .get_langs_in_use()
-            .iter()
-            .map(|l| l.to_string())
-            .collect();
-        Ok(js_err!(JsValue::from_serde(&langs)))
+    pub fn locales_to_fetch(&self) -> StringArrayResult {
+        typescript_serde_result(|| {
+            let eng = self.engine.borrow();
+            let langs: Vec<_> = eng
+                .get_langs_in_use()
+                .iter()
+                .map(|l| l.to_string())
+                .collect();
+            Ok(langs)
+        })
     }
 
 
@@ -146,29 +200,35 @@ impl Driver {
 
     /// Inserts or replaces a cluster with a matching `id`.
     #[wasm_bindgen(js_name = "insertCluster")]
-    pub fn insert_cluster(&self, cluster: JsValue) -> Result<(), JsValue> {
-        let cluster: string_id::Cluster<Markup> = js_err!(cluster.into_serde());
-        let mut eng = self.engine.borrow_mut();
-        eng.insert_cites_str(&cluster.id, &cluster.cites);
-        Ok(())
+    pub fn insert_cluster(&self, cluster: JsValue) -> EmptyResult {
+        typescript_serde_result(|| {
+            let cluster: string_id::Cluster<Markup> = cluster.into_serde()?;
+            let mut eng = self.engine.borrow_mut();
+            eng.insert_cites_str(&cluster.id, &cluster.cites);
+            Ok(())
+        })
     }
 
     /// Removes a cluster with a matching `id`
     #[wasm_bindgen(js_name = "removeCluster")]
-    pub fn remove_cluster(&self, cluster_id: &str) -> Result<(), JsValue> {
-        let mut eng = self.engine.borrow_mut();
-        eng.remove_cluster_str(cluster_id);
-        Ok(())
+    pub fn remove_cluster(&self, cluster_id: &str) -> EmptyResult {
+        typescript_serde_result(|| {
+            let mut eng = self.engine.borrow_mut();
+            eng.remove_cluster_str(cluster_id);
+            Ok(())
+        })
     }
 
     /// Resets all the clusters in the processor to a new list.
     ///
     /// * `clusters` is a Cluster[]
     #[wasm_bindgen(js_name = "initClusters")]
-    pub fn init_clusters(&self, clusters: Box<[JsValue]>) -> Result<(), JsValue> {
-        let clusters: Vec<_> = utils::read_js_array(clusters)?;
-        self.engine.borrow_mut().init_clusters_str(clusters);
-        Ok(())
+    pub fn init_clusters(&self, clusters: Box<[JsValue]>) -> EmptyResult {
+        typescript_serde_result(|| {
+            let clusters: Vec<_> = utils::read_js_array_2(clusters)?;
+            self.engine.borrow_mut().init_clusters_str(clusters);
+            Ok(())
+        })
     }
 
     /// Returns the formatted citation cluster for `cluster_id`.
@@ -176,14 +236,14 @@ impl Driver {
     /// Prefer `batchedUpdates` to avoid serializing unchanged clusters on every edit. This is
     /// still useful for initialization.
     #[wasm_bindgen(js_name = "builtCluster")]
-    pub fn built_cluster(&self, id: &str) -> Result<JsValue, JsValue> {
-        let eng = self.engine.borrow();
-        let built = js_err!(eng.get_cluster_str(id).ok_or_else(|| anyhow::anyhow!(
-            "cluster {} either does not exist, or has not been assigned a position in the document",
-            id
-        )));
-        let js = js_err!(JsValue::from_serde(&built));
-        Ok(js)
+    pub fn built_cluster(&self, id: &str) -> StringResult {
+        typescript_serde_result(|| {
+            let eng = self.engine.borrow();
+            let built = eng
+                .get_cluster_str(id)
+                .ok_or_else(|| DriverError::NonExistentCluster(id.into()))?;
+            Ok(built)
+        })
     }
 
     /// Previews a formatted citation cluster, in a particular position.
@@ -200,35 +260,35 @@ impl Driver {
         cites: Box<[JsValue]>,
         positions: Box<[JsValue]>,
         format: &str,
-    ) -> Result<JsValue, JsValue> {
-        let cites: Vec<Cite<Markup>> = utils::read_js_array(cites)?;
-        let positions: Vec<string_id::ClusterPosition> = utils::read_js_array(positions)?;
-        let mut eng = self.engine.borrow_mut();
-        let preview = eng.preview_citation_cluster(
-            &cites,
-            PreviewPosition::MarkWithZeroStr(&positions),
-            SupportedFormat::from_str(format).ok(),
-        );
-        preview
-            .map_err(|e| JsError::new(&e.to_string()))
-            .and_then(|b| JsValue::from_serde(&b).map_err(|e| JsError::new(&e.to_string())))
-            .map_err(|e| e.into())
+    ) -> StringResult {
+        typescript_serde_result(|| {
+            let cites: Vec<Cite<Markup>> = utils::read_js_array_2(cites)?;
+            let positions: Vec<string_id::ClusterPosition> = utils::read_js_array_2(positions)?;
+            let mut eng = self.engine.borrow_mut();
+            let preview = eng.preview_citation_cluster(
+                &cites,
+                PreviewPosition::MarkWithZeroStr(&positions),
+                SupportedFormat::from_str(format).ok(),
+            );
+            Ok(preview?)
+        })
     }
 
     #[wasm_bindgen(js_name = "makeBibliography")]
-    pub fn make_bibliography(&self) -> Result<TBibEntries, JsValue> {
-        let eng = self.engine.borrow();
-        Ok(js_err!(
-            JsValue::from_serde(&eng.get_bibliography()).map(TBibEntries::from)
-        ))
+    pub fn make_bibliography(&self) -> BibEntriesResult {
+        typescript_serde_result(|| {
+            let eng = self.engine.borrow();
+            Ok(eng.get_bibliography())
+        })
     }
 
     #[wasm_bindgen(js_name = "bibliographyMeta")]
-    pub fn bibliography_meta(&self) -> Result<TBibliographyMeta, JsValue> {
-        let eng = self.engine.borrow();
-        Ok(js_err!(
-            JsValue::from_serde(&eng.get_bibliography_meta()).map(TBibliographyMeta::from)
-        ))
+    pub fn bibliography_meta(&self) -> BibliographyMetaResult {
+        typescript_serde_result(|| {
+            let eng = self.engine.borrow();
+            let meta = eng.get_bibliography_meta();
+            Ok(meta)
+        })
     }
 
     /// Specifies which clusters are actually considered to be in the document, and sets their
@@ -255,11 +315,13 @@ impl Driver {
     ///
     /// May error without having set_cluster_ids, but with some set_cluster_note_number-s executed.
     #[wasm_bindgen(js_name = "setClusterOrder")]
-    pub fn set_cluster_order(&self, positions: Box<[JsValue]>) -> Result<(), JsValue> {
-        let positions: Vec<string_id::ClusterPosition> = utils::read_js_array(positions)?;
-        let mut eng = self.engine.borrow_mut();
-        js_err!(eng.set_cluster_order_str(&positions));
-        Ok(())
+    pub fn set_cluster_order(&self, positions: Box<[JsValue]>) -> EmptyResult {
+        typescript_serde_result(|| {
+            let positions: Vec<string_id::ClusterPosition> = utils::read_js_array_2(positions)?;
+            let mut eng = self.engine.borrow_mut();
+            eng.set_cluster_order_str(&positions)?;
+            Ok(())
+        })
     }
 
     /// Retrieve any clusters that have been touched since last time `batchedUpdates` was
@@ -270,28 +332,30 @@ impl Driver {
     ///
     /// * returns an `UpdateSummary`
     #[wasm_bindgen(js_name = "batchedUpdates")]
-    pub fn batched_updates(&self) -> Result<TUpdateSummary, JsValue> {
-        let eng = self.engine.borrow();
-        let summary = eng.batched_updates_str();
-        Ok(js_err!(
-            JsValue::from_serde(&summary).map(TUpdateSummary::from)
-        ))
+    pub fn batched_updates(&self) -> UpdateSummaryResult {
+        typescript_serde_result(|| {
+            let eng = self.engine.borrow();
+            let summary = eng.batched_updates_str();
+            Ok(summary)
+        })
     }
 
     /// Returns all the clusters and bibliography entries in the document.
     /// Also drains the queue, just like batchedUpdates().
     /// Use this to rehydrate a document or run non-interactively.
     #[wasm_bindgen(js_name = "fullRender")]
-    pub fn full_render(&self) -> Result<TFullRender, JsValue> {
-        let mut eng = self.engine.borrow_mut();
-        let all_clusters = eng.all_clusters_str();
-        let bib_entries = eng.get_bibliography();
-        let all = string_id::FullRender {
-            all_clusters,
-            bib_entries,
-        };
-        eng.drain();
-        Ok(js_err!(JsValue::from_serde(&all).map(TFullRender::from)))
+    pub fn full_render(&self) -> FullRenderResult {
+        typescript_serde_result(|| {
+            let mut eng = self.engine.borrow_mut();
+            let all_clusters = eng.all_clusters_str();
+            let bib_entries = eng.get_bibliography();
+            let all = string_id::FullRender {
+                all_clusters,
+                bib_entries,
+            };
+            eng.drain();
+            Ok(all)
+        })
     }
 
     /// Drains the `batchedUpdates` queue manually.
@@ -306,27 +370,30 @@ impl Driver {
     #[wasm_bindgen(js_name = "fetchAll")]
     pub fn fetch_all(&self) -> Promise {
         let rc = self.engine.clone();
-        let fetcher = self.fetcher.clone();
-        let future = async move {
-            // Keep these two RefCell borrows short-lived. The { scope } ensures the first borrow
-            // ends before the JS code runs indefinitely. Just in case someone calls the Driver
-            // while a request is in-flight. The ultimate effect is that the RefCell is only
-            // borrowed for the time that the Rust code is in control.
-            let langs: Vec<Lang> = {
-                let eng = rc.borrow();
-                eng.get_langs_in_use()
-                    .iter()
-                    // we definitely have en-US, it's statically included
-                    .filter(|l| **l != Lang::en_us() && !eng.has_cached_locale(l))
-                    .cloned()
-                    .collect()
-            };
+        let langs: Vec<Lang> = {
+            let eng = rc.borrow();
+            eng.get_langs_in_use()
+                .iter()
+                // we definitely have en-US, it's statically included
+                .filter(|l| **l != Lang::en_us() && !eng.has_cached_locale(l))
+                .cloned()
+                .collect()
+        };
+        if langs.is_empty() {
+            return Promise::resolve(&JsValue::UNDEFINED);
+        }
+        let fetcher = if let Some(f) = self.fetcher.clone() {
+            f
+        } else {
+            log::warn!("citeproc-rs was initialized without a locale fetcher, but reqested to fetchAll() required locales {:?}, bailing out", langs);
+            return Promise::resolve(&JsValue::UNDEFINED);
+        };
+        future_to_promise(async move {
             let pairs = fetch_all(&fetcher, langs).await;
             let mut eng = rc.borrow_mut();
             eng.store_locales(pairs);
-            Ok(JsValue::null())
-        };
-        future_to_promise(future)
+            Ok(JsValue::UNDEFINED)
+        })
     }
 
     #[cfg(feature = "dot")]
@@ -356,11 +423,17 @@ extern "C" {
     fn log_js_error(val: JsValue);
 }
 
+// #[wasm_bindgen(module = "/src/include.js")]
+// extern "C" {
+//     #[wasm_bindgen(js_name = "noopLifecycle")]
+//     fn noop_lifecycle() -> Lifecycle;
+// }
+
 // TODO: include note about free()-ing the Driver before an async fetchLocale() call comes back (in
 // which case the Driver reference held to by the promise handler function is now a dangling
 // wasm-bindgen pointer).
 #[wasm_bindgen(typescript_custom_section)]
-const TS_APPEND_CONTENT: &'static str = r#"
+const TS_APPEND_CONTENT_1: &'static str = r#"
 
 /** This interface lets citeproc retrieve locales or modules asynchronously,
     according to which ones are needed. */
@@ -368,7 +441,10 @@ export interface Lifecycle {
     /** Return locale XML for a particular locale. */
     fetchLocale(lang: string): Promise<string>;
 }
+"#;
 
+#[wasm_bindgen(typescript_custom_section)]
+const TS_APPEND_CONTENT_2: &'static str = r#"
 export type DateLiteral = { "literal": string; };
 export type DateRaw = { "raw": string; };
 export type DatePartsDate = [number] | [number, number] | [number, number, number];
@@ -376,7 +452,10 @@ export type DatePartsSingle = { "date-parts": [DatePartsDate]; };
 export type DatePartsRange = { "date-parts": [DatePartsDate, DatePartsDate]; };
 export type DateParts = DatePartsSingle | DatePartsRange;
 export type DateOrRange = DateLiteral | DateRaw | DateParts;
+"#;
 
+#[wasm_bindgen(typescript_custom_section)]
+const TS_APPEND_CONTENT_3: &'static str = r#"
 /** Locator type, and a locator string */
 export type Locator = {
     label?: string;
@@ -409,7 +488,10 @@ export type ClusterPosition = {
     /** Leaving off this field means this cluster is in-text. */
     note?: number;
 }
+"#;
 
+#[wasm_bindgen(typescript_custom_section)]
+const TS_APPEND_CONTENT_4: &'static str = r#"
 export type Reference = {
     id: string;
     type: CslType;
@@ -417,9 +499,13 @@ export type Reference = {
 };
 
 export type CslType = "book" | "article" | "legal_case" | "article-journal";
+"#;
 
+// Bibliography handling
+#[wasm_bindgen(typescript_custom_section)]
+const TS_APPEND_CONTENT_4: &'static str = r#"
 export interface BibliographyUpdate {
-    updatedEntries: { [key: string]: string };
+    updatedEntries: Map<string, string>;
     entryIds?: string[];
 }
 
@@ -428,23 +514,6 @@ export type UpdateSummary<Output = string> = {
     bibliography?: BibliographyUpdate;
 };
 
-type InvalidCsl = {
-    severity: "Error" | "Warning";
-    range: {
-        start: number;
-        end: number;
-    };
-    message: string;
-    hint: string;
-};
-type ParseError = {
-    ParseError: string;
-};
-type Invalid = {
-    Invalid: InvalidCsl[];
-};
-type StyleError = Partial<ParseError & Invalid>;
-
 type IncludeUncited = "None" | "All" | { Specific: string[] };
 
 type BibEntry = {
@@ -455,15 +524,15 @@ type BibEntry = {
 type BibEntries = BibEntry[];
 
 type FullRender = {
-    allClusters: { [clusterId: string]: string },
+    allClusters: Map<string, string>,
     bibEntries: BibEntries,
 };
 
 type BibliographyMeta = {
-    max_offset: number;
-    entry_spacing: number;
-    line_spacing: number;
-    hanging_indent: boolean;
+    maxOffset: number;
+    entrySpacing: number;
+    lineSpacing: number;
+    hangingIndent: boolean;
     /** the second-field-align value of the CSL style */
     secondFieldAlign: null  | "flush" | "margin";
     /** Format-specific metadata */
@@ -471,16 +540,168 @@ type BibliographyMeta = {
 };
 "#;
 
+#[wasm_bindgen(typescript_custom_section)]
+const TS_APPEND_CONTENT_5: &'static str = r#"
+type Severity = "Error" | "Warning";
+interface InvalidCsl {
+    severity: Severity;
+    /** Relevant bytes in the provided XML */
+    range: {
+        start: number,
+        end: number,
+    };
+    message: string;
+    hint: string | undefined;
+};
+type StyleError = {
+    tag: "Invalid",
+    content: InvalidCsl[],
+} | {
+    tag: "ParseError",
+    content: string,
+} | {
+    /** Cannot use a dependent style to format citations, pass the parent style instead. */
+    tag: "DependentStyle",
+    content: {
+        requiredParent: string,
+    }
+};
+type DriverError = {
+    tag: "UnknownOutputFormat",
+    content: string,
+} | {
+    tag: "StyleError",
+    content: StyleError
+} | {
+    tag: "JsonError",
+} | {
+    tag: "GetLifecycleError",
+} | {
+    tag: "NonExistentCluster",
+    content: string,
+} | {
+    tag: "ReorderingError"
+} | {
+    tag: "ReorderingErrorNumericId"
+};
+
+/** Catch-all citeproc-rs Error subclass. */
+declare class CiteprocRsError extends Error {
+    constructor(message: string);
+}
+declare class CiteprocRsDriverError extends CiteprocRsError {
+    data: DriverError;
+    constructor(message: string, data: DriverError);
+}
+declare class CslStyleError extends CiteprocRsError {
+    data: StyleError;
+    constructor(message: string, data: StyleError);
+}
+"#;
+
+#[wasm_bindgen(module = "/src/include.js")]
+extern "C" {
+    pub type CiteprocRsError;
+    #[wasm_bindgen(constructor)]
+    fn new(msg: JsValue) -> CiteprocRsError;
+}
+
+#[wasm_bindgen(module = "/src/include.js")]
+extern "C" {
+    pub type CiteprocRsDriverError;
+    #[wasm_bindgen(constructor)]
+    fn new(msg: JsValue, data: JsValue) -> CiteprocRsDriverError;
+}
+
+#[wasm_bindgen(module = "/src/include.js")]
+extern "C" {
+    pub type CslStyleError;
+    #[wasm_bindgen(constructor)]
+    fn new(msg: JsValue, data: JsValue) -> CslStyleError;
+}
+
+#[wasm_bindgen(typescript_custom_section)]
+const TS_APPEND_CONTENT_5: &'static str = r#"
+interface IWasmResult<T> {
+    /** If this is an error, throws the error. */
+    unwrap(): T;
+    is_ok(): boolean;
+    is_err(): boolean;
+    /** If this is an error, returns the default value. */
+    unwrap_or(default: T): T;
+    /** If this is Ok, returns f(ok_val), else returns Err unmodified. */
+    map<R>(f: (t: T) => R): WasmResult<T>;
+    /** If this is Ok, returns f(ok_val), else returns the default value. */
+    map_or<R>(default: R, f: (t: T) => R): R;
+}
+type WasmResult<T> = ({ Ok: T } | { Err: Error }) & IWasmResult<T>;
+"#;
+
+#[wasm_bindgen(typescript_custom_section)]
+const TS_APPEND_CONTENT_5: &'static str = r#"
+type CitationFormat = "author-date" | "author" | "numeric" | "label" | "note";
+interface LocalizedString {
+    value: string,
+    lang?: string,
+}
+interface ParentLink {
+    href: string,
+    lang?: string,
+}
+interface Link {
+    href: string,
+    rel: "self" | "documentation" | "template",
+    lang?: string,
+}
+interface Rights {
+    value: string,
+    lang?: string,
+    license?: string,
+}
+interface StyleInfo {
+    id: string,
+    updated: string,
+    title: LocalizedString,
+    titleShort?: LocalizedString,
+    parent?: ParentLink,
+    links: Link[],
+    rights?: Rights,
+    citationFormat?: CitationFormat,
+    categories: string[],
+    issn?: string,
+    eissn?: string,
+    issnl?: string,
+}
+interface IndependentMeta {
+    /** A list of languages for which a locale override was specified.
+      * Does not include the language-less final override. */
+    localeOverrides: string[],
+    hasBibliography: bool,
+}
+interface StyleMeta {
+    info: StyleInfo,
+    features: { [feature: string]: bool },
+    defaultLocale: string,
+    /** May be absent on a dependent style */
+    class?: "in-text" | "note",
+    cslVersionRequired: string,
+    /** May be absent on a dependent style */
+    independent_meta?: IndependentMeta,
+};
+"#;
+
+result_type!(string_id::UpdateSummary, UpdateSummaryResult, "WasmResult<UpdateSummary>");
+result_type!(Vec<citeproc::BibEntry>, BibEntriesResult, "WasmResult<BibEntries>");
+result_type!(string_id::FullRender, FullRenderResult, "WasmResult<FullRender>");
+result_type!(Driver, DriverResult, "WasmResult<Driver>");
+result_type!(Option<citeproc::BibliographyMeta>, BibliographyMetaResult, "WasmResult<BibliographyMeta>");
+result_type!((), EmptyResult, "WasmResult<undefined>");
+result_type!(Arc<SmartString>, StringResult, "WasmResult<string>");
+result_type!(Vec<String>, StringArrayResult, "WasmResult<string[]>");
+result_type!(StyleMeta, StyleMetaResult, "WasmResult<StyleMeta>");
+
 #[wasm_bindgen]
 extern "C" {
-    #[wasm_bindgen(typescript_type = "UpdateSummary")]
-    pub type TUpdateSummary;
-    #[wasm_bindgen(typescript_type = "BibEntries")]
-    pub type TBibEntries;
-    #[wasm_bindgen(typescript_type = "FullRender")]
-    pub type TFullRender;
-    #[wasm_bindgen(typescript_type = "BibliographyMeta")]
-    pub type TBibliographyMeta;
     #[wasm_bindgen(typescript_type = "IncludeUncited")]
     pub type TIncludeUncited;
     #[wasm_bindgen(typescript_type = "Reference")]
diff --git a/crates/wasm/src/options.rs b/crates/wasm/src/options.rs
new file mode 100644
index 00000000..1e21d503
--- /dev/null
+++ b/crates/wasm/src/options.rs
@@ -0,0 +1,74 @@
+use serde::{Deserialize, de::{Deserializer as _, MapAccess, IgnoredAny}};
+use serde::de::Visitor;
+use wasm_bindgen::prelude::*;
+use citeproc::prelude::*;
+use csl::Lang;
+use crate::{Lifecycle, DriverError};
+
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct WasmInitOptions {
+    // Required
+    /// A full independent style.
+    pub style: String,
+
+    // Optional
+    #[serde(default)]
+    pub format: SupportedFormat,
+    /// You might get this from a dependent style via `StyleMeta::parse(dependent_xml_string)`
+    #[serde(default)]
+    pub locale_override: Option<Lang>,
+    /// Disables sorting on the bibliography
+    #[serde(default)]
+    pub bibliography_nosort: bool,
+}
+
+
+#[wasm_bindgen]
+extern "C" {
+    pub type Object;
+
+    #[wasm_bindgen(constructor)]
+    pub fn new() -> Object;
+
+    #[wasm_bindgen(method, indexing_getter)]
+    pub fn get(this: &Object, key: JsValue) -> JsValue;
+}
+
+#[derive(thiserror::Error, Debug, serde::Serialize)]
+#[serde(tag = "tag", content = "content")]
+pub enum GetLifecycleError {
+    #[error("lifecycle must be an object")]
+    NotAnObject,
+    #[error("lifecycle object must contain an `async fetchLocale(lang: string): string` function")]
+    MissingFetchLocale,
+}
+
+impl Lifecycle {
+    /// You can't deserialize a JsValue from a generic Deserialize impl, as that's meant to work
+    /// with any serialization format. So we pull this off the options object separately. Pass in a
+    /// JsValue with the structure `{ lifecycle?: Lifecycle }`. If it's missing the lifecycle
+    /// field, you get Ok(None).
+    pub fn from_options_object(options: &JsValue) -> Result<Option<Self>, GetLifecycleError> {
+        let object = Object::from(options.clone());
+        thread_local! {
+            static LIFECYCLE_FIELD: JsValue = JsValue::from_str("lifecycle");
+            static FETCH_LOCALE_FIELD: JsValue = JsValue::from_str("fetchLocale")
+        }
+        let jsvalue = LIFECYCLE_FIELD.with(|field| object.get(field.clone()));
+        let lifecycle_obj = Object::from(jsvalue.clone());
+        if jsvalue.is_undefined() {
+            return Ok(None);
+        }
+        if !jsvalue.is_object() {
+            return Err(GetLifecycleError::NotAnObject);
+        }
+        let fetch_locale = FETCH_LOCALE_FIELD.with(|f| lifecycle_obj.get(f.clone()));
+        if !fetch_locale.is_function() {
+            return Err(GetLifecycleError::MissingFetchLocale);
+        }
+        let lifecycle = Lifecycle::from(jsvalue);
+        Ok(Some(lifecycle))
+    }
+}
+
diff --git a/crates/wasm/src/typings.d.ts b/crates/wasm/src/typings.d.ts
new file mode 100644
index 00000000..b28b04f6
--- /dev/null
+++ b/crates/wasm/src/typings.d.ts
@@ -0,0 +1,3 @@
+
+
+
diff --git a/crates/wasm/src/utils.rs b/crates/wasm/src/utils.rs
index eb26ec83..a4afc454 100644
--- a/crates/wasm/src/utils.rs
+++ b/crates/wasm/src/utils.rs
@@ -56,25 +56,12 @@ cfg_if! {
     }
 }
 
-// https://github.com/rustwasm/wasm-bindgen/issues/1742
-macro_rules! js_err {
-    ($expression:expr) => {
-        match $expression {
-            Ok(a) => a,
-            Err(e) => {
-                return Err(js_sys::Error::new(&format!("{}", e)).into());
-            }
-        }
-    };
-}
-
 #[allow(clippy::boxed_local)]
-pub fn read_js_array<T>(js: Box<[JsValue]>) -> Result<Vec<T>, JsValue>
+pub fn read_js_array_2<T>(js: Box<[JsValue]>) -> serde_json::Result<Vec<T>>
 where
     T: DeserializeOwned,
 {
-    let xs: Result<Vec<T>, _> = js.iter().map(|x| x.into_serde()).collect();
-    Ok(js_err!(xs))
+    js.iter().map(|x| x.into_serde()).collect()
 }
 
 /// A `LocaleFetcher` that statically includes `en-US`, so it never has to be async-fetched, but
diff --git a/crates/wasm/src/wasm_result.rs b/crates/wasm/src/wasm_result.rs
new file mode 100644
index 00000000..29ce08b3
--- /dev/null
+++ b/crates/wasm/src/wasm_result.rs
@@ -0,0 +1,204 @@
+pub use helper::*;
+
+pub trait TypescriptResult: From<WasmResult> {
+    type RustType;
+}
+
+macro_rules! result_type {
+  ($ty:ty, $name:ident, $stringified:literal) => {
+    #[wasm_bindgen]
+    extern "C" {
+      #[wasm_bindgen(typescript_type = $stringified)]
+      pub type $name;
+    }
+    impl From<$crate::wasm_result::WasmResult> for $name {
+      fn from(other: $crate::wasm_result::WasmResult) -> Self {
+        let jsv: JsValue = other.into();
+        $name::from(jsv)
+      }
+    }
+    impl TypescriptResult for $name {
+        type RustType = $ty;
+    }
+  };
+}
+
+mod helper {
+    use wasm_bindgen::prelude::*;
+    use js_sys::Error as JsError;
+    use serde::Serialize;
+    use super::TypescriptResult;
+    use crate::{DriverError, CiteprocRsDriverError, CiteprocRsError, CslStyleError};
+    use csl::StyleError;
+
+    #[wasm_bindgen(module = "/src/include.js")]
+    extern "C" {
+        pub type WasmResult;
+        #[wasm_bindgen(constructor)]
+        fn new(value: JsValue) -> WasmResult;
+    }
+
+    pub fn js_value_err<V, E, F>(f: F) -> WasmResult
+    where
+        V: Into<JsValue>,
+        E: std::error::Error,
+        F: FnOnce() -> Result<V, E>,
+    {
+        let res = f();
+        let out = match res {
+            Ok(ok) => {
+                WasmResult::new(ok.into())
+            }
+            Err(e) => {
+                WasmResult::new(JsError::new(&e.to_string()).into())
+            }
+        };
+        out
+    }
+
+    fn style_error_to_js_err(se: &StyleError) -> JsValue {
+        let mut string = se.to_string();
+        let data = JsValue::from_serde(&se);
+        match data {
+            Ok(data) => CslStyleError::new(string.into(), data).into(),
+            Err(conv_err) => {
+                string.push_str(" (could not convert error data: ");
+                string.push_str(&conv_err.to_string());
+                string.push_str(") ");
+                CiteprocRsError::new(string.into()).into()
+            },
+        }
+    }
+
+    impl DriverError {
+        fn to_js_error(&self) -> JsValue {
+            match self {
+                DriverError::StyleError(se) => return style_error_to_js_err(se),
+                _ => {}
+            }
+            let mut string = self.to_string();
+            let data = JsValue::from_serde(&self);
+            match data {
+                Ok(data) => CiteprocRsDriverError::new(string.into(), data).into(),
+                Err(conv_err) => {
+                    string.push_str(" (could not convert error data: ");
+                    string.push_str(&conv_err.to_string());
+                    string.push_str(") ");
+                    CiteprocRsError::new(string.into()).into()
+                },
+            }
+        }
+    }
+
+    impl From<Result<JsValue, DriverError>> for WasmResult {
+        fn from(res: Result<JsValue, DriverError>) -> Self {
+            match res {
+                Ok(ok) => {
+                    WasmResult::new(ok.into())
+                }
+                Err(e) => {
+                    WasmResult::new(e.to_js_error())
+                }
+            }
+        }
+    }
+
+    pub fn js_driver_error<V, F>(f: F) -> WasmResult
+    where
+        V: Into<JsValue>,
+        F: FnOnce() -> Result<V, DriverError>,
+    {
+        f().map(|x| x.into()).into()
+    }
+
+    pub fn typescript_serde_result<R, F>(f: F) -> R
+    where
+        R: TypescriptResult,
+        R::RustType: Serialize,
+        F: FnOnce() -> Result<R::RustType, DriverError>,
+    {
+        let res = f()
+            .and_then(|rust| {
+                JsValue::from_serde(&rust)
+                    .map_err(DriverError::from)
+            });
+        let out: WasmResult = res.into();
+        out.into()
+    }
+
+}
+
+mod raw {
+    //! Alternative impl with no Javascript dependency but no methods available
+    //! on the returned objects.
+
+    use wasm_bindgen::prelude::*;
+    use js_sys::Error as JsError;
+    use serde::Serialize;
+
+    pub type WasmResult = JsValue;
+
+    // From serde_wasm_bindgen
+    /// Custom bindings to avoid using fallible `Reflect` for plain objects.
+    #[wasm_bindgen]
+    extern "C" {
+        pub type Object;
+
+        #[wasm_bindgen(constructor)]
+        pub fn new() -> Object;
+
+        #[wasm_bindgen(method, indexing_setter)]
+        pub fn set(this: &Object, key: JsValue, value: JsValue);
+    }
+
+    thread_local! {
+        pub static OK_FIELD: JsValue = JsValue::from_str("Ok");
+        pub static ERR_FIELD: JsValue = JsValue::from_str("Err");
+    }
+
+    pub fn js_value_err<E, F>(f: F) -> JsValue
+    where
+        E: std::error::Error,
+        F: FnOnce() -> Result<JsValue, E>,
+    {
+        let res = f();
+        let out = Object::new();
+        match res {
+            Ok(ok) => {
+                out.set(OK_FIELD.with(|f| f.clone()), ok);
+            }
+            Err(e) => {
+                out.set(
+                    ERR_FIELD.with(|f| f.clone()),
+                    JsError::new(&e.to_string()).into(),
+                );
+            }
+        }
+        out.into()
+    }
+
+    pub fn js_serde_err<T, E, F>(f: F) -> JsValue
+    where
+        T: Serialize,
+        E: std::error::Error,
+        F: FnOnce() -> Result<T, E>,
+    {
+        let res = f();
+        let out = Object::new();
+        match res {
+            Ok(ok) => {
+                let value = JsValue::from_serde(&ok)
+                    .expect("citeproc-wasm failed to serialize return value to JsValue");
+                out.set(OK_FIELD.with(|f| f.clone()), value);
+            }
+            Err(e) => {
+                out.set(
+                    ERR_FIELD.with(|f| f.clone()),
+                    JsError::new(&e.to_string()).into(),
+                );
+            }
+        }
+        out.into()
+    }
+}
+

From 5260266be12ce607bc67d2b2474568f8b17b03f9 Mon Sep 17 00:00:00 2001
From: Cormac Relf <web@cormacrelf.net>
Date: Fri, 20 Nov 2020 18:00:48 +1100
Subject: [PATCH 02/22] test fix: csl "rel-self" bug

---
 .../snapshots/csl__style__info__test__info_serialize-2.snap     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/csl/src/style/snapshots/csl__style__info__test__info_serialize-2.snap b/crates/csl/src/style/snapshots/csl__style__info__test__info_serialize-2.snap
index a113ef41..5eca92fd 100644
--- a/crates/csl/src/style/snapshots/csl__style__info__test__info_serialize-2.snap
+++ b/crates/csl/src/style/snapshots/csl__style__info__test__info_serialize-2.snap
@@ -26,7 +26,7 @@ expression: "parse_as::<Info>(indoc::indoc! {\n                     r#\"\n
   "links": [
     {
       "href": "https://example.com/self",
-      "rel": "rel-self",
+      "rel": "self",
       "lang": "en-AU"
     },
     {

From 80f6f068665e54842b45af4686903db2736f31fa Mon Sep 17 00:00:00 2001
From: Cormac Relf <web@cormacrelf.net>
Date: Fri, 20 Nov 2020 18:02:23 +1100
Subject: [PATCH 03/22] test fix: when csl stopped serializing empty error
 hints

---
 crates/csl/src/error.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/csl/src/error.rs b/crates/csl/src/error.rs
index ae86203b..ad72e3cb 100644
--- a/crates/csl/src/error.rs
+++ b/crates/csl/src/error.rs
@@ -100,7 +100,7 @@ pub struct InvalidCsl {
     // TODO: serialize_with or otherwise get this into the output
     pub range: Range<usize>,
     pub message: String,
-    #[serde(skip_serializing_if = "String::is_empty")]
+    #[cfg_attr(feature = "serde", serde(skip_serializing_if = "String::is_empty"))]
     pub hint: String,
 }
 

From 3db0b23303c05cb98eb544bdd9f75818dd0b7e7d Mon Sep 17 00:00:00 2001
From: Cormac Relf <web@cormacrelf.net>
Date: Fri, 13 Nov 2020 22:11:10 +1100
Subject: [PATCH 04/22] Less salsa caching of uncited items

---
 Cargo.lock                       |   2 +
 crates/citeproc/Cargo.toml       |   1 +
 crates/citeproc/src/processor.rs |  36 ++++-----
 crates/db/Cargo.toml             |   1 +
 crates/db/src/cite.rs            | 125 ++++++++++---------------------
 crates/proc/src/db.rs            |   1 +
 crates/proc/src/sort.rs          |  30 ++++----
 7 files changed, 75 insertions(+), 121 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fa832c22..3deea644 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -271,6 +271,7 @@ dependencies = [
  "dlmalloc",
  "env_logger",
  "fnv",
+ "indexmap",
  "insta",
  "jemallocator",
  "lazy_static",
@@ -306,6 +307,7 @@ dependencies = [
  "citeproc-io",
  "csl",
  "fnv",
+ "indexmap",
  "log",
  "salsa",
  "serde",
diff --git a/crates/citeproc/Cargo.toml b/crates/citeproc/Cargo.toml
index e7d9704b..154acc6b 100644
--- a/crates/citeproc/Cargo.toml
+++ b/crates/citeproc/Cargo.toml
@@ -50,6 +50,7 @@ thiserror = "1.0.20"
 string-interner = "0.12.0"
 parking_lot = "0.11.0"
 rand = "0.7.3"
+indexmap = "1.6.0"
 
 [dev-dependencies]
 test_utils = { path = "../test-utils" }
diff --git a/crates/citeproc/src/processor.rs b/crates/citeproc/src/processor.rs
index 9da382a2..b340bb72 100644
--- a/crates/citeproc/src/processor.rs
+++ b/crates/citeproc/src/processor.rs
@@ -20,13 +20,13 @@ use citeproc_db::{
     ClusterId as ClusterIdInternal,
     CiteData, CiteDatabaseStorage, HasFetcher, LocaleDatabaseStorage, StyleDatabaseStorage, Uncited,
 };
+use indexmap::set::IndexSet;
 use citeproc_proc::db::IrDatabaseStorage;
 use citeproc_proc::BibNumber;
 
-use salsa::Durability;
+use salsa::{Database, Durability, SweepStrategy};
 #[cfg(feature = "rayon")]
 use salsa::{ParallelDatabase, Snapshot};
-use std::collections::HashSet;
 use std::sync::Arc;
 use parking_lot::{RwLock, Mutex};
 
@@ -75,7 +75,7 @@ pub struct Processor {
     preview_cluster_id: ClusterId,
 }
 
-impl salsa::Database for Processor {}
+impl Database for Processor {}
 
 #[cfg(feature = "rayon")]
 impl ParallelDatabase for Processor {
@@ -229,18 +229,10 @@ impl Processor {
         let clusters = self.clusters_cites_sorted();
 
         #[cfg(feature = "rayon")]
-        {
+        let result = {
             use rayon::prelude::*;
             use std::ops::DerefMut;
 
-            // Prefetch the DFAs
-            let participants = self.disamb_participants();
-            participants
-                .par_iter()
-                .for_each_with(self.snap(), |snap, ref_id| {
-                    snap.0.ref_dfa(ref_id.clone());
-                });
-
             let cite_ids = self.all_cite_ids();
             // compute ir2s, so the first year_suffixes call doesn't trigger all ir2s on a
             // single rayon thread
@@ -259,9 +251,9 @@ impl Processor {
                 })
             .filter_map(|x| x)
                 .collect()
-        }
+        };
         #[cfg(not(feature = "rayon"))]
-        {
+        let result = {
             let mut into_hashmap = self.last_clusters.lock();
             clusters
                 .iter()
@@ -270,7 +262,11 @@ impl Processor {
                     upsert_diff(&mut into_hashmap, ClusterId::new(cluster.id), built)
                 })
             .collect()
-        }
+        };
+
+        // Run salsa GC.
+        self.sweep_all(SweepStrategy::discard_outdated());
+        result
     }
 
     pub fn batched_updates(&self) -> UpdateSummary {
@@ -301,7 +297,7 @@ impl Processor {
     }
 
     pub fn clear_references(&mut self) {
-        self.set_all_keys_with_durability(Arc::new(HashSet::new()), Durability::MEDIUM);
+        self.set_all_keys_with_durability(Arc::new(IndexSet::new()), Durability::MEDIUM);
     }
 
     fn intern_cluster_id(&self, string: impl AsRef<str>) -> ClusterId {
@@ -350,7 +346,7 @@ impl Processor {
     }
 
     pub fn reset_references(&mut self, refs: Vec<Reference>) {
-        let keys: HashSet<Atom> = refs.iter().map(|r| r.id.clone()).collect();
+        let keys: IndexSet<Atom> = refs.iter().map(|r| r.id.clone()).collect();
         for r in refs {
             self.set_reference_input_with_durability(r.id.clone(), Arc::new(r), Durability::MEDIUM);
         }
@@ -359,7 +355,7 @@ impl Processor {
 
     pub fn extend_references(&mut self, refs: Vec<Reference>) {
         let keys = self.all_keys();
-        let mut keys = HashSet::clone(&keys);
+        let mut keys = IndexSet::clone(&keys);
         for r in refs {
             keys.insert(r.id.clone());
             self.set_reference_input_with_durability(r.id.clone(), Arc::new(r), Durability::MEDIUM);
@@ -369,7 +365,7 @@ impl Processor {
 
     pub fn insert_reference(&mut self, refr: Reference) {
         let keys = self.all_keys();
-        let mut keys = HashSet::clone(&keys);
+        let mut keys = IndexSet::clone(&keys);
         keys.insert(refr.id.clone());
         self.set_reference_input_with_durability(refr.id.clone(), Arc::new(refr), Durability::MEDIUM);
         self.set_all_keys_with_durability(Arc::new(keys), Durability::MEDIUM);
@@ -377,7 +373,7 @@ impl Processor {
 
     pub fn remove_reference(&mut self, id: Atom) {
         let keys = self.all_keys();
-        let mut keys = HashSet::clone(&keys);
+        let mut keys = IndexSet::clone(&keys);
         keys.remove(&id);
         self.set_all_keys_with_durability(Arc::new(keys), Durability::MEDIUM);
     }
diff --git a/crates/db/Cargo.toml b/crates/db/Cargo.toml
index 086a8761..f9fbea4a 100644
--- a/crates/db/Cargo.toml
+++ b/crates/db/Cargo.toml
@@ -19,3 +19,4 @@ cfg-if = "0.1.10"
 string-interner = "0.12.0"
 serde_derive = "1.0.116"
 serde = "1.0.116"
+indexmap = "1.6.0"
diff --git a/crates/db/src/cite.rs b/crates/db/src/cite.rs
index 4ea35bb4..c6456c1e 100644
--- a/crates/db/src/cite.rs
+++ b/crates/db/src/cite.rs
@@ -4,8 +4,8 @@
 //
 // Copyright © 2019 Corporation for Digital Scholarship
 
-use super::xml::{LocaleDatabase, StyleDatabase};
 use super::cluster::*;
+use super::xml::{LocaleDatabase, StyleDatabase};
 
 use csl::Locale;
 use std::collections::HashSet;
@@ -15,6 +15,8 @@ use citeproc_io::output::markup::Markup;
 use citeproc_io::{Cite, Reference};
 use csl::Atom;
 
+use indexmap::set::IndexSet;
+
 #[salsa::query_group(CiteDatabaseStorage)]
 pub trait CiteDatabase: LocaleDatabase + StyleDatabase {
     #[salsa::input]
@@ -22,21 +24,11 @@ pub trait CiteDatabase: LocaleDatabase + StyleDatabase {
     fn reference(&self, key: Atom) -> Option<Arc<Reference>>;
 
     #[salsa::input]
-    fn all_keys(&self) -> Arc<HashSet<Atom>>;
+    fn all_keys(&self) -> Arc<IndexSet<Atom>>;
 
     #[salsa::input]
     fn all_uncited(&self) -> Arc<Uncited>;
-    fn uncited_ordered(&self) -> Arc<Vec<Atom>>;
-
-    /// Filters out keys not in the library
-    fn cited_keys(&self) -> Arc<HashSet<Atom>>;
-
-    /// Equal to `all.intersection(cited U uncited)`
-    /// Also represents "the refs that will be in the bibliography if we generate one"
-    fn disamb_participants(&self) -> Arc<HashSet<Atom>>;
-
-    /// All the names that may need to be disambiguated among themselves
-    fn names_to_disambiguate(&self) -> Arc<Vec<Name>>;
+    // fn uncited_ordered(&self) -> Arc<IndexSet<Atom>>;
 
     #[salsa::input]
     fn cluster_ids(&self) -> Arc<Vec<ClusterId>>;
@@ -44,18 +36,25 @@ pub trait CiteDatabase: LocaleDatabase + StyleDatabase {
     #[salsa::input]
     fn cluster_note_number(&self, key: ClusterId) -> Option<ClusterNumber>;
 
-    // All cite ids, in the order they are cited in the document
-    fn all_cite_ids(&self) -> Arc<Vec<CiteId>>;
+    #[salsa::input]
+    fn cluster_cites(&self, key: ClusterId) -> Arc<Vec<CiteId>>;
+
+    #[salsa::interned]
+    fn cite(&self, data: CiteData) -> CiteId;
 
     /// Create ghost cites for disambiguation only as needed.
     /// These are subsequently interned into CiteIds.
     fn ghost_cite(&self, ref_id: Atom) -> Arc<Cite<Markup>>;
 
-    #[salsa::interned]
-    fn cite(&self, data: CiteData) -> CiteId;
+    /// Filters out keys not in the library
+    fn cited_keys(&self) -> Arc<IndexSet<Atom>>;
 
-    #[salsa::input]
-    fn cluster_cites(&self, key: ClusterId) -> Arc<Vec<CiteId>>;
+    /// Equal to `all.intersection(cited U uncited)`
+    /// Also represents "the refs that will be in the bibliography if we generate one"
+    fn disamb_participants(&self) -> Arc<IndexSet<Atom>>;
+
+    // All cite ids, in the order they are cited in the document
+    fn all_cite_ids(&self) -> Arc<Vec<CiteId>>;
 
     fn clusters_sorted(&self) -> Arc<Vec<ClusterData>>;
 }
@@ -128,90 +127,53 @@ pub enum Uncited {
     All,
     /// A set of reference IDs, merged with the known references, to appear in the bibliography no
     /// matter what.
-    Enumerated(Vec<Atom>),
+    Enumerated(IndexSet<Atom>),
 }
 
 /// Default is to have no uncited references present in bibliography.
 impl Default for Uncited {
     fn default() -> Self {
-        Uncited::Enumerated(Vec::new())
+        Uncited::Enumerated(IndexSet::new())
     }
 }
 
-fn uncited_ordered(db: &dyn CiteDatabase) -> Arc<Vec<Atom>> {
+fn cited_keys(db: &dyn CiteDatabase) -> Arc<IndexSet<Atom>> {
     let all = db.all_keys();
-    let cited = db.cited_keys();
-    let uncited = db.all_uncited();
-    match &*uncited {
-        Uncited::All => {
-            // Determinism for year suffixes: sort by key id.
-            let remainder = all.difference(&cited).cloned();
-            let mut list: Vec<_> = remainder.collect();
-            list.sort();
-            Arc::new(list)
-        }
-        Uncited::Enumerated(list) => {
-            let list = list
-                .iter()
-                .filter(|&x| !cited.contains(x) && all.contains(x))
-                .cloned()
-                .collect();
-            Arc::new(list)
-        }
-    }
-}
-
-fn cited_keys(db: &dyn CiteDatabase) -> Arc<HashSet<Atom>> {
-    let all = db.all_keys();
-    let mut keys = HashSet::new();
+    let mut keys = IndexSet::new();
     let all_cite_ids = db.all_cite_ids();
     for &id in all_cite_ids.iter() {
-        keys.insert(id.lookup(db).ref_id.clone());
+        let ref_id = &id.lookup(db).ref_id;
+        // make sure there are no keys we wouldn't recognise
+        if all.contains(ref_id) {
+            keys.insert(ref_id.clone());
+        }
     }
-    // make sure there are no keys we wouldn't recognise
-    let merged = all.intersection(&keys).cloned().collect();
-    Arc::new(merged)
+    Arc::new(keys)
 }
 
-fn disamb_participants(db: &dyn CiteDatabase) -> Arc<HashSet<Atom>> {
+fn disamb_participants(db: &dyn CiteDatabase) -> Arc<IndexSet<Atom>> {
     let cited = db.cited_keys();
     let all = db.all_keys();
     let uncited = db.all_uncited();
     match &*uncited {
-        Uncited::All => all.clone(),
+        Uncited::All => Arc::new(cited.union(&all).cloned().collect()),
         Uncited::Enumerated(specific) => {
-            let mut merged = HashSet::with_capacity(cited.len() + specific.len());
+            let mut merged = IndexSet::with_capacity(cited.len() + specific.len());
             merged.extend(cited.iter().cloned());
-            for key in specific {
-                // make sure there are no keys we wouldn't recognise
-                if all.contains(key) {
-                    merged.insert(key.clone());
-                }
-            }
+            // make sure there are no keys we wouldn't recognise
+            merged.extend(specific.intersection(&all).cloned());
             Arc::new(merged)
         }
     }
 }
 
-use citeproc_io::Name;
-use csl::GivenNameDisambiguationRule;
-fn names_to_disambiguate(db: &dyn CiteDatabase) -> Arc<Vec<Name>> {
-    let style = db.style();
-    if GivenNameDisambiguationRule::ByCite == style.citation.givenname_disambiguation_rule {
-        return Arc::new(Vec::new());
-    }
-    let uncited = db.disamb_participants();
-    let mut v = Vec::new();
-    for atom in uncited.iter() {
-        if let Some(refr) = db.reference(atom.clone()) {
-            for (_var, names) in refr.name.iter() {
-                for name in names.iter() {
-                    v.push(name.clone());
-                }
-            }
-        }
+fn all_cite_ids(db: &dyn CiteDatabase) -> Arc<Vec<CiteId>> {
+    let clusters = db.clusters_sorted();
+    let mut ids = Vec::with_capacity(clusters.len());
+    for cluster in clusters.iter() {
+        ids.extend(cluster.cites.iter().cloned());
     }
-    Arc::new(v)
+    Arc::new(ids)
 }
 
 fn clusters_sorted(db: &dyn CiteDatabase) -> Arc<Vec<ClusterData>> {
@@ -226,15 +188,6 @@ fn clusters_sorted(db: &dyn CiteDatabase) -> Arc<Vec<ClusterData>> {
     Arc::new(clusters)
 }
 
-fn all_cite_ids(db: &dyn CiteDatabase) -> Arc<Vec<CiteId>> {
-    let clusters = db.clusters_sorted();
-    let mut ids = Vec::with_capacity(clusters.len());
-    for cluster in clusters.iter() {
-        ids.extend(cluster.cites.iter().cloned());
-    }
-    Arc::new(ids)
-}
-
 pub fn get_cluster_data(db: &dyn CiteDatabase, id: ClusterId) -> Option<ClusterData> {
     db.cluster_note_number(id).map(|number| ClusterData {
         id,
diff --git a/crates/proc/src/db.rs b/crates/proc/src/db.rs
index 1c99902c..b95b39eb 100644
--- a/crates/proc/src/db.rs
+++ b/crates/proc/src/db.rs
@@ -45,6 +45,7 @@ pub trait IrDatabase:
     CiteDatabase + LocaleDatabase + StyleDatabase + ImplementationDetails
 {
     fn ref_dfa(&self, key: Atom) -> Option<Arc<Dfa>>;
+    #[salsa::transparent]
     fn all_ref_dfas(&self) -> Arc<FnvHashMap<Atom, Arc<Dfa>>>;
 
     // TODO: cache this
diff --git a/crates/proc/src/sort.rs b/crates/proc/src/sort.rs
index 59a0719e..43b74d99 100644
--- a/crates/proc/src/sort.rs
+++ b/crates/proc/src/sort.rs
@@ -54,6 +54,7 @@ pub enum BibNumber {
     Cited(u32),
     Uncited(u32),
 }
+
 impl BibNumber {
     pub fn get(&self) -> u32 {
         match *self {
@@ -84,28 +85,27 @@ pub fn sorted_refs(db: &dyn IrDatabase) -> Arc<(Vec<Atom>, FnvHashMap<Atom, BibN
     // first, compute refs in the order that they are cited.
     // stable sorting will cause this to be the final tiebreaker.
     let all = db.all_keys();
-    let all_cite_ids = db.all_cite_ids();
-    let uncited_ordered = db.uncited_ordered();
+    let cited_keys = db.cited_keys();
+    let disamb_participants = db.disamb_participants();
+    let uncited_ordered = db.all_uncited();
     let mut preordered = Vec::with_capacity(all.len());
 
     // Put all the cited refs in
     let mut i = 1;
-    for &id in all_cite_ids.iter() {
-        let ref_id = &id.lookup(db).ref_id;
-        if all.contains(ref_id) && !citation_numbers.contains_key(ref_id) {
-            preordered.push(ref_id.clone());
-            citation_numbers.insert(ref_id.clone(), BibNumber::Cited(i as u32));
+    for id in cited_keys.iter() {
+        if !citation_numbers.contains_key(id) {
+            preordered.push(id.clone());
+            citation_numbers.insert(id.clone(), BibNumber::Cited(i as u32));
             i += 1;
         }
     }
-
-    // Then all the uncited ones
-    for id in uncited_ordered.iter() {
-        // guaranteed to be a valid reference id already.
-        // but may have duplicated an actual cite.
-        preordered.push(id.clone());
-        citation_numbers.insert(id.clone(), BibNumber::Uncited(i as u32));
-        i += 1;
+    // "The rest" ie the uncited items
+    for id in disamb_participants.difference(&cited_keys) {
+        if !citation_numbers.contains_key(id) {
+            preordered.push(id.clone());
+            citation_numbers.insert(id.clone(), BibNumber::Uncited(i as u32));
+            i += 1;
+        }
     }
 
     let max_cnum = preordered.len() as u32;

From f3f525f9b65caf7590685f1747ac545df55d4bec Mon Sep 17 00:00:00 2001
From: Cormac Relf <web@cormacrelf.net>
Date: Fri, 13 Nov 2020 22:11:40 +1100
Subject: [PATCH 05/22] wasm: Global export of include.js items in Node.js as
 well

---
 crates/wasm/src/include.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crates/wasm/src/include.js b/crates/wasm/src/include.js
index f29f27fa..81ab6dc6 100644
--- a/crates/wasm/src/include.js
+++ b/crates/wasm/src/include.js
@@ -67,9 +67,13 @@ export class CslStyleError extends CiteprocRsError {
 }
 
 // For use in no-modules builds for the browser, which have no linking
+// Also because wasm-bindgen is not yet capable of exporting JS items defined here
+// to the wasm library consumer.
 let env_global;
 if (typeof self !== "undefined") {
   env_global = self;
+} else if (typeof global !== "undefined") {
+  env_global = global;
 } else if (typeof window !== "undefined") {
   env_global = window;
 }

From efdb69b619df8f3b6d6ad48bd31c74f10e8118c0 Mon Sep 17 00:00:00 2001
From: Cormac Relf <web@cormacrelf.net>
Date: Mon, 30 Nov 2020 16:39:40 +1100
Subject: [PATCH 06/22] Rename interface Lifecycle -> Fetcher (TS breaker);
 better typescript

... for constructor (InitOptions) & setStyle
---
 crates/wasm/js-demo/js/CdnFetcher.ts  | 24 +++++++++
 crates/wasm/js-demo/js/useDocument.ts |  6 +--
 crates/wasm/src/lib.rs                | 75 +++++++++++++++++----------
 crates/wasm/src/options.rs            | 30 +++++------
 4 files changed, 90 insertions(+), 45 deletions(-)
 create mode 100644 crates/wasm/js-demo/js/CdnFetcher.ts

diff --git a/crates/wasm/js-demo/js/CdnFetcher.ts b/crates/wasm/js-demo/js/CdnFetcher.ts
new file mode 100644
index 00000000..127b6e26
--- /dev/null
+++ b/crates/wasm/js-demo/js/CdnFetcher.ts
@@ -0,0 +1,24 @@
+import { Fetcher } from '../../pkg';
+
+function sleep(ms: number) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+export class CdnFetcher implements Fetcher {
+    private cache: { [lang: string]: string } = {};
+    async fetchLocale(lang: string) {
+        if (typeof this.cache[lang] === 'string') {
+            return this.cache[lang];
+        }
+        // this works
+        // console.log(lang, "sleeping");
+        // await sleep(400);
+        // console.log(lang, "waking");
+        let res = await fetch(`https://cdn.rawgit.com/citation-style-language/locales/master/locales-${lang}.xml`);
+        if (res.ok) {
+            let text = await res.text();
+            this.cache[lang] = text;
+            return text;
+        }
+    }
+}
diff --git a/crates/wasm/js-demo/js/useDocument.ts b/crates/wasm/js-demo/js/useDocument.ts
index e7098dcb..a61a6534 100644
--- a/crates/wasm/js-demo/js/useDocument.ts
+++ b/crates/wasm/js-demo/js/useDocument.ts
@@ -2,10 +2,10 @@ import { useState, useRef, useEffect } from 'react';
 import { Result, Err, Ok, Option, Some, None } from 'safe-types';
 import { Driver, Reference, Cluster, Cite, Lifecycle, UpdateSummary } from '../../pkg';
 import { ClusterId, Document, RenderedDocument } from './Document';
-import { Fetcher } from './Fetcher';
+import { CdnFetcher } from './CdnFetcher';
 
 // Global for caching.
-const fetcher = new Fetcher();
+const fetcher = new CdnFetcher();
 
 /**
  * This keeps a Driver, a style, some References, and a Document in sync, i.e.:
@@ -50,7 +50,7 @@ export const useDocument = (initialStyle: string, initialReferences: Reference[]
             try {
                 let driver = CreateDriver.new({
                     style,
-                    lifecycle: fetcher,
+                    fetcher,
                     format: "html",
                     // localeOverride: "de-AT",
                 });
diff --git a/crates/wasm/src/lib.rs b/crates/wasm/src/lib.rs
index f86246df..dbed6fcf 100644
--- a/crates/wasm/src/lib.rs
+++ b/crates/wasm/src/lib.rs
@@ -10,13 +10,13 @@ mod utils;
 mod wasm_result;
 mod options;
 use wasm_result::*;
-use options::{WasmInitOptions, GetLifecycleError};
+use options::{WasmInitOptions, GetFetcherError};
 
 #[allow(unused_imports)]
 #[macro_use]
 extern crate log;
 
-use js_sys::{Error as JsError, Promise};
+use js_sys::Promise;
 use std::cell::RefCell;
 use std::rc::Rc;
 use std::str::FromStr;
@@ -39,7 +39,7 @@ pub fn parse_style_metadata(style: &str) -> StyleMetaResult {
 #[wasm_bindgen]
 pub struct Driver {
     engine: Rc<RefCell<Processor>>,
-    fetcher: Option<Lifecycle>,
+    fetcher: Option<Fetcher>,
 }
 
 #[derive(thiserror::Error, Debug, serde::Serialize)]
@@ -51,8 +51,8 @@ pub enum DriverError {
     StyleError(#[from] csl::StyleError),
     #[error("JSON Deserialization Error: {0}")]
     JsonError(#[from] #[serde(skip_serializing)] serde_json::Error),
-    #[error("Invalid lifecycle object: {0}")]
-    GetLifecycleError(#[from] GetLifecycleError),
+    #[error("Invalid fetcher object: {0}")]
+    GetFetcherError(#[from] GetFetcherError),
     #[error("Non-Existent Cluster id: {0}")]
     NonExistentCluster(String),
     #[error("Reordering error: {0}")]
@@ -68,19 +68,21 @@ impl Driver {
     /// Creates a new Driver.
     ///
     /// * `style` is a CSL style as a string. Independent styles only.
-    /// * `lifecycle` must implement the `Lifecycle` interface
+    /// * `fetcher` must implement the `Fetcher` interface
     /// * `format` is one of { "html", "rtf" }
     ///
     /// Throws an error if it cannot parse the style you gave it.
-    pub fn new(options_js: JsValue) -> DriverResult {
+    pub fn new(options: TInitOptions) -> DriverResult {
         utils::set_panic_hook();
         utils::init_log();
 
+        let options_js: JsValue = options.into();
+
         js_driver_error(|| {
             // The Processor gets a "only has en-US, otherwise empty" fetcher.
             let us_fetcher = Arc::new(utils::USFetcher);
             let options: WasmInitOptions = JsValue::into_serde(&options_js)?;
-            let lifecycle = Lifecycle::from_options_object(&options_js)?;
+            let fetcher = Fetcher::from_options_object(&options_js)?;
             let init = InitOptions {
                 style: options.style.as_ref(),
                 fetcher: Some(us_fetcher),
@@ -92,16 +94,16 @@ impl Driver {
             };
             let engine = Processor::new(init)?;
 
-            if engine.default_lang() != Lang::en_us() && lifecycle.is_none() {
+            if engine.default_lang() != Lang::en_us() && fetcher.is_none() {
                 log::warn!("citeproc-rs was initialized with a locale other than en-US, but without a locale fetcher, using built-in en-US instead.");
             }
 
             let engine = Rc::new(RefCell::new(engine));
-            // The Driver manually adds locales fetched via Lifecycle, which asks the consumer
+            // The Driver manually adds locales fetched via Fetcher, which asks the consumer
             // asynchronously.
             Ok(Driver {
                 engine,
-                fetcher: lifecycle,
+                fetcher,
             })
         })
         .into()
@@ -109,10 +111,10 @@ impl Driver {
 
     /// Sets the style (which will also cause everything to be recomputed)
     #[wasm_bindgen(js_name = "setStyle")]
-    pub fn set_style(&self, style_text: &str) -> WasmResult {
-        js_driver_error(|| {
+    pub fn set_style(&self, style_text: &str) -> EmptyResult {
+        typescript_serde_result(|| {
             let _ = self.engine.borrow_mut().set_style_text(style_text)?;
-            Ok(JsValue::UNDEFINED)
+            Ok(())
         })
     }
 
@@ -366,7 +368,7 @@ impl Driver {
     }
 
     /// Asynchronously fetches all the locales that may be required, and saves them into the
-    /// engine. Uses your provided `Lifecycle.fetchLocale` function.
+    /// engine. Uses your provided `Fetcher.fetchLocale` function.
     #[wasm_bindgen(js_name = "fetchAll")]
     pub fn fetch_all(&self) -> Promise {
         let rc = self.engine.clone();
@@ -413,31 +415,48 @@ impl Driver {
 #[wasm_bindgen]
 extern "C" {
     #[derive(Clone)]
-    #[wasm_bindgen(js_name = "Lifecycle")]
-    pub type Lifecycle;
+    #[wasm_bindgen(js_name = "Fetcher")]
+    pub type Fetcher;
 
     #[wasm_bindgen(method, js_name = "fetchLocale")]
-    fn fetch_locale(this: &Lifecycle, lang: &str) -> Promise;
+    fn fetch_locale(this: &Fetcher, lang: &str) -> Promise;
 
     #[wasm_bindgen(js_name = "error", js_namespace = console)]
     fn log_js_error(val: JsValue);
 }
 
-// #[wasm_bindgen(module = "/src/include.js")]
-// extern "C" {
-//     #[wasm_bindgen(js_name = "noopLifecycle")]
-//     fn noop_lifecycle() -> Lifecycle;
-// }
-
 // TODO: include note about free()-ing the Driver before an async fetchLocale() call comes back (in
 // which case the Driver reference held to by the promise handler function is now a dangling
 // wasm-bindgen pointer).
 #[wasm_bindgen(typescript_custom_section)]
 const TS_APPEND_CONTENT_1: &'static str = r#"
+interface InitOptions {
+    /** A CSL style as an XML string */
+    style: string,
+
+    /** A Fetcher implementation for fetching locales.
+      *
+      * If not provided, then no locales can be fetched, and default-locale and localeOverride will
+      * not be respected; the only locale used will be the bundled en-US. */
+    fetcher?: Fetcher,
+
+    /** The output format for this driver instance */
+    format: "html" | "rtf" | "plain",
+
+    /** A locale to use instead of the style's default-locale.
+      *
+      * For dependent styles, use parseStyleMetadata to find out which locale it prefers, and pass
+      * in the parent style with a localeOverride set to that value.
+      */
+    localeOverride?: string,
+
+    /** Disables sorting in the bibliography; items appear in cited order. */
+    bibliographyNosort?: bool,
+}
 
 /** This interface lets citeproc retrieve locales or modules asynchronously,
     according to which ones are needed. */
-export interface Lifecycle {
+export interface Fetcher {
     /** Return locale XML for a particular locale. */
     fetchLocale(lang: string): Promise<string>;
 }
@@ -575,7 +594,7 @@ type DriverError = {
 } | {
     tag: "JsonError",
 } | {
-    tag: "GetLifecycleError",
+    tag: "GetFetcherError",
 } | {
     tag: "NonExistentCluster",
     content: string,
@@ -706,10 +725,12 @@ extern "C" {
     pub type TIncludeUncited;
     #[wasm_bindgen(typescript_type = "Reference")]
     pub type TReference;
+    #[wasm_bindgen(typescript_type = "InitOptions")]
+    pub type TInitOptions;
 }
 
 /// Asks the JS side to fetch all of the locales that could be called by the style+refs.
-async fn fetch_all(inner: &Lifecycle, langs: Vec<Lang>) -> Vec<(Lang, String)> {
+async fn fetch_all(inner: &Fetcher, langs: Vec<Lang>) -> Vec<(Lang, String)> {
     // Promises are push-, not pull-based, so this kicks all of the requests off at once. If the JS
     // consumer is making HTTP requests for extra locales, they will run in parallel.
     let thunks: Vec<_> = langs
diff --git a/crates/wasm/src/options.rs b/crates/wasm/src/options.rs
index 1e21d503..c58b16ec 100644
--- a/crates/wasm/src/options.rs
+++ b/crates/wasm/src/options.rs
@@ -3,7 +3,7 @@ use serde::de::Visitor;
 use wasm_bindgen::prelude::*;
 use citeproc::prelude::*;
 use csl::Lang;
-use crate::{Lifecycle, DriverError};
+use crate::{Fetcher, DriverError};
 
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -37,38 +37,38 @@ extern "C" {
 
 #[derive(thiserror::Error, Debug, serde::Serialize)]
 #[serde(tag = "tag", content = "content")]
-pub enum GetLifecycleError {
-    #[error("lifecycle must be an object")]
+pub enum GetFetcherError {
+    #[error("fetcher must be an object")]
     NotAnObject,
-    #[error("lifecycle object must contain an `async fetchLocale(lang: string): string` function")]
+    #[error("fetcher object must contain an `async fetchLocale(lang: string): string` function")]
     MissingFetchLocale,
 }
 
-impl Lifecycle {
+impl Fetcher {
     /// You can't deserialize a JsValue from a generic Deserialize impl, as that's meant to work
     /// with any serialization format. So we pull this off the options object separately. Pass in a
-    /// JsValue with the structure `{ lifecycle?: Lifecycle }`. If it's missing the lifecycle
+    /// JsValue with the structure `{ fetcher?: Fetcher }`. If it's missing the fetcher
     /// field, you get Ok(None).
-    pub fn from_options_object(options: &JsValue) -> Result<Option<Self>, GetLifecycleError> {
+    pub fn from_options_object(options: &JsValue) -> Result<Option<Self>, GetFetcherError> {
         let object = Object::from(options.clone());
         thread_local! {
-            static LIFECYCLE_FIELD: JsValue = JsValue::from_str("lifecycle");
+            static FETCHER_FIELD: JsValue = JsValue::from_str("fetcher");
             static FETCH_LOCALE_FIELD: JsValue = JsValue::from_str("fetchLocale")
         }
-        let jsvalue = LIFECYCLE_FIELD.with(|field| object.get(field.clone()));
-        let lifecycle_obj = Object::from(jsvalue.clone());
+        let jsvalue = FETCHER_FIELD.with(|field| object.get(field.clone()));
+        let fetcher_obj = Object::from(jsvalue.clone());
         if jsvalue.is_undefined() {
             return Ok(None);
         }
         if !jsvalue.is_object() {
-            return Err(GetLifecycleError::NotAnObject);
+            return Err(GetFetcherError::NotAnObject);
         }
-        let fetch_locale = FETCH_LOCALE_FIELD.with(|f| lifecycle_obj.get(f.clone()));
+        let fetch_locale = FETCH_LOCALE_FIELD.with(|f| fetcher_obj.get(f.clone()));
         if !fetch_locale.is_function() {
-            return Err(GetLifecycleError::MissingFetchLocale);
+            return Err(GetFetcherError::MissingFetchLocale);
         }
-        let lifecycle = Lifecycle::from(jsvalue);
-        Ok(Some(lifecycle))
+        let fetcher = Fetcher::from(jsvalue);
+        Ok(Some(fetcher))
     }
 }
 

From 80aadc33b081c75bc720f8a92958af974eda24b3 Mon Sep 17 00:00:00 2001
From: Cormac Relf <web@cormacrelf.net>
Date: Mon, 30 Nov 2020 16:46:53 +1100
Subject: [PATCH 07/22] Produce a Zotero build using Zotero.CiteprocRs
 namespace

---
 Cargo.lock                            | 40 ++++++-----
 crates/wasm/Cargo.toml                |  4 +-
 crates/wasm/js-demo/js/Fetcher.ts     | 24 -------
 crates/wasm/scripts/npm-pkg-config.sh | 53 ++++++++++++---
 crates/wasm/src/include.js            | 98 ++++++++++++---------------
 crates/wasm/src/js/include.js         | 75 ++++++++++++++++++++
 crates/wasm/src/js/nomod.js           | 26 +++++++
 crates/wasm/src/js/zotero.js          | 21 ++++++
 crates/wasm/src/lib.rs                |  9 +--
 crates/wasm/src/utils.rs              | 60 ++++++++++++++++
 crates/wasm/src/wasm_result.rs        |  3 +-
 11 files changed, 299 insertions(+), 114 deletions(-)
 delete mode 100644 crates/wasm/js-demo/js/Fetcher.ts
 create mode 100644 crates/wasm/src/js/include.js
 create mode 100644 crates/wasm/src/js/nomod.js
 create mode 100644 crates/wasm/src/js/zotero.js

diff --git a/Cargo.lock b/Cargo.lock
index 3deea644..a7065854 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -87,7 +87,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec1931848a574faa8f7c71a12ea00453ff5effbb5f51afe7f77d7a48cace6ac1"
 dependencies = [
  "addr2line",
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "miniz_oxide",
  "object",
@@ -243,6 +243,12 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
 [[package]]
 name = "chrono"
 version = "0.4.19"
@@ -261,7 +267,7 @@ dependencies = [
 name = "citeproc"
 version = "0.0.1"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "citeproc-db",
  "citeproc-io",
  "citeproc-proc",
@@ -303,7 +309,7 @@ dependencies = [
 name = "citeproc-db"
 version = "0.1.0"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "citeproc-io",
  "csl",
  "fnv",
@@ -350,7 +356,7 @@ name = "citeproc-proc"
 version = "0.1.0"
 dependencies = [
  "bitflags",
- "cfg-if",
+ "cfg-if 0.1.10",
  "citeproc-db",
  "citeproc-io",
  "csl",
@@ -430,7 +436,7 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "wasm-bindgen",
 ]
 
@@ -514,7 +520,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
 dependencies = [
  "autocfg",
- "cfg-if",
+ "cfg-if 0.1.10",
  "crossbeam-utils",
  "lazy_static",
  "maybe-uninit",
@@ -529,7 +535,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
 dependencies = [
  "autocfg",
- "cfg-if",
+ "cfg-if 0.1.10",
  "lazy_static",
 ]
 
@@ -591,7 +597,7 @@ name = "datatest"
 version = "0.5.3-alpha.0"
 source = "git+https://github.com/cormacrelf/datatest?branch=test_type#e267a78dac1e863d5f539e7074fef81827727f74"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "ctor",
  "datatest-derive",
  "regex",
@@ -766,7 +772,7 @@ version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "libc",
  "wasi 0.9.0+wasi-snapshot-preview1",
  "wasm-bindgen",
@@ -918,7 +924,7 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "63312a18f7ea8760cdd0a7c5aac1a619752a246b833545e3e36d1f81f7cd9e66"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
 ]
 
 [[package]]
@@ -1086,7 +1092,7 @@ version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
 ]
 
 [[package]]
@@ -1310,7 +1316,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "cloudabi",
  "instant",
  "libc",
@@ -1894,7 +1900,7 @@ version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3354fc69125aba1f70fed5365f870d5b9bd2f41ec015232082abd4ce9ab795c"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "hashbrown 0.8.2",
  "serde",
 ]
@@ -2339,7 +2345,7 @@ version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ed178900cccc57f65a0f6515376b8673a2f165ddfa0b509c708c761a372b4b"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "v_escape",
 ]
 
@@ -2394,7 +2400,7 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 name = "wasm"
 version = "0.0.1"
 dependencies = [
- "cfg-if",
+ "cfg-if 1.0.0",
  "citeproc",
  "citeproc-io",
  "console_error_panic_hook",
@@ -2418,7 +2424,7 @@ version = "0.2.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3c7d40d09cdbf0f4895ae58cf57d92e1e57a9dd8ed2e8390514b54a47cc5551"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "serde",
  "serde_json",
  "wasm-bindgen-macro",
@@ -2445,7 +2451,7 @@ version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a369c5e1dfb7569e14d62af4da642a3cbc2f9a3652fe586e26ac22222aa4b04"
 dependencies = [
- "cfg-if",
+ "cfg-if 0.1.10",
  "js-sys",
  "wasm-bindgen",
  "web-sys",
diff --git a/crates/wasm/Cargo.toml b/crates/wasm/Cargo.toml
index e4bfbbbb..8adcad67 100644
--- a/crates/wasm/Cargo.toml
+++ b/crates/wasm/Cargo.toml
@@ -33,12 +33,14 @@ default = ["console"]
 console = ["console_error_panic_hook", "console_log", "fern"]
 # disable the source of js-demo's visualisation for the public API
 dot = []
+no-modules = []
+zotero = ["no-modules"]
 
 [dependencies]
 citeproc = { path = "../citeproc", default-features = false, features=[] }
 csl = { path = "../csl", features = ["serde1"] }
 citeproc-io = { path = "../io" }
-cfg-if = "0.1.10"
+cfg-if = "1.0.0"
 console_log = { version = "0.2.0", optional = true }
 fern = { version = "0.6.0", optional = true }
 
diff --git a/crates/wasm/js-demo/js/Fetcher.ts b/crates/wasm/js-demo/js/Fetcher.ts
deleted file mode 100644
index 24227ecc..00000000
--- a/crates/wasm/js-demo/js/Fetcher.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Lifecycle } from '../../pkg';
-
-function sleep(ms: number) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-}
-
-export class Fetcher implements Lifecycle {
-    private cache: { [lang: string]: string } = {};
-    async fetchLocale(lang: string) {
-        if (typeof this.cache[lang] === 'string') {
-            return this.cache[lang];
-        }
-        // this works
-        // console.log(lang, "sleeping");
-        // await sleep(400);
-        // console.log(lang, "waking");
-        let res = await fetch(`https://cdn.rawgit.com/citation-style-language/locales/master/locales-${lang}.xml`);
-        if (res.ok) {
-            let text = await res.text();
-            this.cache[lang] = text;
-            return text;
-        }
-    }
-}
diff --git a/crates/wasm/scripts/npm-pkg-config.sh b/crates/wasm/scripts/npm-pkg-config.sh
index 3069620a..ece6f1af 100755
--- a/crates/wasm/scripts/npm-pkg-config.sh
+++ b/crates/wasm/scripts/npm-pkg-config.sh
@@ -53,6 +53,12 @@ echo "Running: $0 --dest $DEST --cargo-version? ${USE_CARGO_VERSION:-false} --se
 # default destination location is called 'dist' i.e. distribution
 CARGO_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages  | .[] | select(.name=="wasm") | .version')
 
+bail() {
+  MESSAGE="$@"
+  echo -e "${RED}failed ${MESSAGE}${CLEAR}"
+  exit 1
+}
+
 # What's going on here?
 #
 # It's a replacement while we wait on https://github.com/rustwasm/wasm-pack/pull/705
@@ -78,10 +84,6 @@ CARGO_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages
 # The PR linked above uses different folder names, but these ones accurately
 # describe why we need different builds in different environments.
 
-if [ -n "$FEATURES" ]; then
-  FEATURES="--features $FEATURES"
-fi
-
 if [ -z "$PACKAGE_ONLY" ]; then
   mkdir -p pkg-scratch
   rm -rf $DEST
@@ -91,19 +93,49 @@ if [ -z "$PACKAGE_ONLY" ]; then
   target() {
     TARGET=$1
     OUT=$2
-    wasm-pack build --release --out-name citeproc_rs_wasm --scope citeproc-rs --target $TARGET --out-dir pkg-scratch/$TARGET -- $FEATURES
-    mkdir -p $DEST/$OUT
-    cp pkg-scratch/$TARGET/citeproc_rs_wasm* $DEST/$OUT/
+    EXTRA_FEATURES=$3
+    wasm-pack build --release \
+      --out-name citeproc_rs_wasm \
+      --scope citeproc-rs \
+      --target "$TARGET" \
+      --out-dir pkg-scratch/$OUT \
+      -- --features "$FEATURES$EXTRA_FEATURES" \
+      && mkdir -p "$DEST/$OUT" \
+      && cp pkg-scratch/$OUT/citeproc_rs_wasm* "$DEST/$OUT/" \
+      || bail "building target $TARGET -> $OUT --features \"$FEATURES$EXTRA_FEATURES\""
   }
 
   target nodejs _cjs
   target browser _esm
   target web _web
-  target no-modules _no_modules
+  target no-modules _no_modules ,no-modules
+  target no-modules _zotero ,zotero
+else
+  mkdir -p $DEST/_cjs $DEST/_esm $DEST/_web $DEST/_no_modules $DEST/_zotero
 fi
 
+ZOTERO_BINDGEN_SRC="pkg-scratch/_zotero/citeproc_rs_wasm.js"
+ZOTERO_BINDGEN="$DEST/_zotero/citeproc_rs_wasm.js"
+sed -e 's/CITEPROC_RS_ZOTERO_GLOBAL/Zotero.CiteprocRs/g' \
+  < $ZOTERO_BINDGEN_SRC \
+  > "$ZOTERO_BINDGEN" \
+  || bail "could not replace CITEPROC_RS_ZOTERO_GLOBAL"
+cat <<EOF >> "$ZOTERO_BINDGEN"
+module.exports = wasm_bindgen;
+if (typeof Zotero !== "undefined" && typeof Zotero.CiteprocRs !== "undefined") {
+  Object.assign(Zotero.CiteprocRs, wasm_bindgen)
+}
+EOF
+
+NOMOD_INCLUDE="$DEST/_no_modules/citeproc_rs_wasm_include.js"
+ZOTERO_INCLUDE="$DEST/_zotero/citeproc_rs_wasm_include.js"
+sed -e 's/export class/class/' < src/include.js \
+  | tee "$ZOTERO_INCLUDE"  > "$NOMOD_INCLUDE" \
+  || bail "could not write include.js for no-modules targets"
+cat src/js/nomod.js >> "$NOMOD_INCLUDE" || bail "failed writing $NOMOD_INCLUDE"
+cat src/js/zotero.js >> "$ZOTERO_INCLUDE" || bail "failed writing $ZOTERO_INCLUDE"
 
-cp README.md $DEST/
+cp README.md $DEST/ || bail "could not copy README"
 # cp scripts/model-package.json $DEST/package.json
 
 TARGET_VERSION=${SET_VERSION:-$CARGO_VERSION}
@@ -145,7 +177,8 @@ fi
 
 printf "Writing package.json with: $JQ_ARGS\n$JQ_FILTERS\n"
 
-jq $JQ_ARGS "$JQ_FILTERS" < scripts/model-package.json > $DEST/package.json
+jq $JQ_ARGS "$JQ_FILTERS" < scripts/model-package.json > $DEST/package.json \
+  || bail "writing $DEST/package.json using scripts/model-package.json and jq"
 
 # cat $DEST/package.json | jq
 
diff --git a/crates/wasm/src/include.js b/crates/wasm/src/include.js
index 81ab6dc6..c4a0050a 100644
--- a/crates/wasm/src/include.js
+++ b/crates/wasm/src/include.js
@@ -1,48 +1,48 @@
 export class WasmResult {
-  constructor(value) {
-    if (value instanceof Error) {
-      this.Err = value;
-    } else {
-      this.Ok = value;
+    constructor(value) {
+        if (value instanceof Error) {
+            this.Err = value;
+        } else {
+            this.Ok = value;
+        }
     }
-  }
-  is_some() {
-    if (this.hasOwnProperty("Err")) {
-      return false;
+    is_some() {
+        if (this.hasOwnProperty("Err")) {
+            return false;
+        }
+        return true;
     }
-    return true;
-  }
-  is_none() {
-    return !this.is_some();
-  }
-  unwrap() {
-    if (this.hasOwnProperty("Err")) {
-      throw this.Err;
-    } else {
-      return this.Ok
+    is_none() {
+        return !this.is_some();
     }
-  }
-  unwrap_or(otherwise) {
-    if (this.hasOwnProperty("Err")) {
-      return otherwise;
-    } else {
-      return this.Ok;
+    unwrap() {
+        if (this.hasOwnProperty("Err")) {
+            throw this.Err;
+        } else {
+            return this.Ok
+        }
     }
-  }
-  map(func) {
-    if (this.hasOwnProperty("Err")) {
-      return this;
-    } else {
-      return new WasmResult(func(this.Ok));
+    unwrap_or(otherwise) {
+        if (this.hasOwnProperty("Err")) {
+            return otherwise;
+        } else {
+            return this.Ok;
+        }
     }
-  }
-  map_or(otherwise, func) {
-    if (this.hasOwnProperty("Err")) {
-      return otherwise;
-    } else {
-      return func(this.Ok);
+    map(func) {
+        if (this.hasOwnProperty("Err")) {
+            return this;
+        } else {
+            return new WasmResult(func(this.Ok));
+        }
+    }
+    map_or(otherwise, func) {
+        if (this.hasOwnProperty("Err")) {
+            return otherwise;
+        } else {
+            return func(this.Ok);
+        }
     }
-  }
 }
 
 export class CiteprocRsError extends Error {
@@ -66,20 +66,10 @@ export class CslStyleError extends CiteprocRsError {
     }
 }
 
-// For use in no-modules builds for the browser, which have no linking
-// Also because wasm-bindgen is not yet capable of exporting JS items defined here
-// to the wasm library consumer.
-let env_global;
-if (typeof self !== "undefined") {
-  env_global = self;
-} else if (typeof global !== "undefined") {
-  env_global = global;
-} else if (typeof window !== "undefined") {
-  env_global = window;
-}
-if (typeof env_global !== "undefined") {
-  env_global.WasmResult = WasmResult;
-  env_global.CiteprocRsError = CiteprocRsError;
-  env_global.CslStyleError = CslStyleError;
-  env_global.CiteprocRsDriverError = CiteprocRsDriverError;
+function doExport(onto) {
+    onto.WasmResult = WasmResult;
+    onto.CiteprocRsError = CiteprocRsError;
+    onto.CslStyleError = CslStyleError;
+    onto.CiteprocRsDriverError = CiteprocRsDriverError;
 }
+
diff --git a/crates/wasm/src/js/include.js b/crates/wasm/src/js/include.js
new file mode 100644
index 00000000..c4a0050a
--- /dev/null
+++ b/crates/wasm/src/js/include.js
@@ -0,0 +1,75 @@
+export class WasmResult {
+    constructor(value) {
+        if (value instanceof Error) {
+            this.Err = value;
+        } else {
+            this.Ok = value;
+        }
+    }
+    is_some() {
+        if (this.hasOwnProperty("Err")) {
+            return false;
+        }
+        return true;
+    }
+    is_none() {
+        return !this.is_some();
+    }
+    unwrap() {
+        if (this.hasOwnProperty("Err")) {
+            throw this.Err;
+        } else {
+            return this.Ok
+        }
+    }
+    unwrap_or(otherwise) {
+        if (this.hasOwnProperty("Err")) {
+            return otherwise;
+        } else {
+            return this.Ok;
+        }
+    }
+    map(func) {
+        if (this.hasOwnProperty("Err")) {
+            return this;
+        } else {
+            return new WasmResult(func(this.Ok));
+        }
+    }
+    map_or(otherwise, func) {
+        if (this.hasOwnProperty("Err")) {
+            return otherwise;
+        } else {
+            return func(this.Ok);
+        }
+    }
+}
+
+export class CiteprocRsError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = "CiteprocRsError";
+    }
+}
+export class CiteprocRsDriverError extends CiteprocRsError {
+    constructor(message, data) {
+        super(message);
+        this.data = data;
+        this.name = "CiteprocRsDriverError";
+    }
+}
+export class CslStyleError extends CiteprocRsError {
+    constructor(message, data) {
+        super(message);
+        this.data = data;
+        this.name = "CslStyleError";
+    }
+}
+
+function doExport(onto) {
+    onto.WasmResult = WasmResult;
+    onto.CiteprocRsError = CiteprocRsError;
+    onto.CslStyleError = CslStyleError;
+    onto.CiteprocRsDriverError = CiteprocRsDriverError;
+}
+
diff --git a/crates/wasm/src/js/nomod.js b/crates/wasm/src/js/nomod.js
new file mode 100644
index 00000000..e6be7e84
--- /dev/null
+++ b/crates/wasm/src/js/nomod.js
@@ -0,0 +1,26 @@
+// We export to some global, because without linking, there is no way for the rust
+// code to find these items
+// For use in no-modules builds for the browser, which have no linking
+// Also because wasm-bindgen is not yet capable of exporting JS items defined here
+// to the wasm library consumer, so they also need a way to get at it to check if
+// an error is an instanceof CiteprocRsError (eg)
+
+// doExport defined in include.js
+
+let env_global;
+if (typeof self !== "undefined") {
+    env_global = self;
+} else if (typeof global !== "undefined") {
+    env_global = global;
+} else if (typeof window !== "undefined") {
+    env_global = window;
+}
+if (typeof env_global !== "undefined") {
+    doExport(env_global)
+}
+
+// Then we do one little commonjs hack
+if (typeof module !== "undefined") {
+    module.exports = {};
+    doExport(module.exports);
+}
diff --git a/crates/wasm/src/js/zotero.js b/crates/wasm/src/js/zotero.js
new file mode 100644
index 00000000..949a8980
--- /dev/null
+++ b/crates/wasm/src/js/zotero.js
@@ -0,0 +1,21 @@
+// We export to some global, because without linking, there is no way for the rust
+// code to find these items
+// For use in the _zotero output
+// Also because wasm-bindgen is not yet capable of exporting JS items defined here
+// to the wasm library consumer, so they also need a way to get at it to check if
+// an error is an instanceof CiteprocRsError (eg)
+//
+// Note that the generated glue code uses CITEPROC_RS_ZOTERO_GLOBAL, which
+// needs replacement in the Zotero build script to work.
+
+// doExport defined in include.js
+
+if (typeof Zotero !== "undefined" && typeof Zotero.CiteprocRs !== "undefined") {
+    doExport(Zotero.CiteprocRs)
+}
+
+// Then we do one little commonjs hack so const { CiteprocRsError } = require("...") works.
+if (typeof module !== "undefined") {
+    module.exports = {};
+    doExport(module.exports);
+}
diff --git a/crates/wasm/src/lib.rs b/crates/wasm/src/lib.rs
index dbed6fcf..89a53d0a 100644
--- a/crates/wasm/src/lib.rs
+++ b/crates/wasm/src/lib.rs
@@ -618,22 +618,19 @@ declare class CslStyleError extends CiteprocRsError {
 }
 "#;
 
-#[wasm_bindgen(module = "/src/include.js")]
-extern "C" {
+js_import_class_constructor! {
     pub type CiteprocRsError;
     #[wasm_bindgen(constructor)]
     fn new(msg: JsValue) -> CiteprocRsError;
 }
 
-#[wasm_bindgen(module = "/src/include.js")]
-extern "C" {
+js_import_class_constructor! {
     pub type CiteprocRsDriverError;
     #[wasm_bindgen(constructor)]
     fn new(msg: JsValue, data: JsValue) -> CiteprocRsDriverError;
 }
 
-#[wasm_bindgen(module = "/src/include.js")]
-extern "C" {
+js_import_class_constructor! {
     pub type CslStyleError;
     #[wasm_bindgen(constructor)]
     fn new(msg: JsValue, data: JsValue) -> CslStyleError;
diff --git a/crates/wasm/src/utils.rs b/crates/wasm/src/utils.rs
index a4afc454..d0f5cfac 100644
--- a/crates/wasm/src/utils.rs
+++ b/crates/wasm/src/utils.rs
@@ -56,6 +56,66 @@ cfg_if! {
     }
 }
 
+
+/// Import JS items
+/// 1. the global namespace, under no-modules
+/// 2. the src/js/include.js file itself as an ES module in the other setups
+#[macro_export]
+macro_rules! js_import {
+    {$($tt:tt)*} => {
+        cfg_if::cfg_if! {
+            if #[cfg(feature = "zotero")] {
+                compile_error!("Cannot use bare js_import for zotero output, it has to be namespaced")
+            } else if #[cfg(feature = "no-modules")] {
+                #[wasm_bindgen]
+                extern "C" {
+                    $($tt)*
+                }
+            } else {
+                #[wasm_bindgen(module = "/src/include.js")]
+                extern "C" {
+                    $($tt)*
+                }
+            }
+        }
+    };
+}
+
+/// Import a class with a constructor that's namespaced e.g. `new Zotero.CiteprocRs.WasmResult(...)`
+/// either from 
+/// 1. that namespace, under zotero
+/// 2. the global namespace, under no-modules
+/// 3. the src/js/include.js file itself as an ES module in the other setups
+#[macro_export]
+macro_rules! js_import_class_constructor {
+    {
+        pub type $name:ident;
+        #[wasm_bindgen(constructor)]
+        $constructor:item
+    } => {
+        cfg_if::cfg_if! {
+            // We'd rather use ["Zotero", "CiteprocRs"] but we're pinned to a wasm-bindgen that
+            // doesn't support that kind of multi-level namespace.
+            // So this has to be replaced in the wasm-bindgen glue file as it gets written to
+            // _zotero.
+            if #[cfg(feature = "zotero")] {
+                #[wasm_bindgen]
+                extern "C" {
+                    pub type $name;
+                    #[wasm_bindgen(constructor, js_namespace = CITEPROC_RS_ZOTERO_GLOBAL)]
+                    $constructor
+                }
+            } else {
+                js_import! {
+                    pub type $name;
+                    #[wasm_bindgen(constructor)]
+                    $constructor
+                }
+            }
+        }
+    };
+}
+
 #[allow(clippy::boxed_local)]
 pub fn read_js_array_2<T>(js: Box<[JsValue]>) -> serde_json::Result<Vec<T>>
 where
diff --git a/crates/wasm/src/wasm_result.rs b/crates/wasm/src/wasm_result.rs
index 29ce08b3..c43d063d 100644
--- a/crates/wasm/src/wasm_result.rs
+++ b/crates/wasm/src/wasm_result.rs
@@ -31,8 +31,7 @@ mod helper {
     use crate::{DriverError, CiteprocRsDriverError, CiteprocRsError, CslStyleError};
     use csl::StyleError;
 
-    #[wasm_bindgen(module = "/src/include.js")]
-    extern "C" {
+    crate::js_import_class_constructor! {
         pub type WasmResult;
         #[wasm_bindgen(constructor)]
         fn new(value: JsValue) -> WasmResult;

From 1a0bae81f5d2b1832d83935532607ddba4f23e62 Mon Sep 17 00:00:00 2001
From: Cormac Relf <web@cormacrelf.net>
Date: Mon, 30 Nov 2020 16:57:38 +1100
Subject: [PATCH 08/22] Render RTF links as RTF

Not sure if this is right, but ok
---
 crates/io/src/output/markup/rtf.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/crates/io/src/output/markup/rtf.rs b/crates/io/src/output/markup/rtf.rs
index 2df72533..29644463 100644
--- a/crates/io/src/output/markup/rtf.rs
+++ b/crates/io/src/output/markup/rtf.rs
@@ -101,13 +101,12 @@ impl<'a> MarkupWriter for RtfWriter<'a> {
                 self.write_escaped(localized.closing(*is_inner));
             }
             Anchor { url, content, .. } => {
-                // TODO: {\field{\*\fldinst{HYPERLINK "https://google.com"}}{\fldrslt whatever}}
-                // TODO: HTML-quoted-escape? the url?
-                self.dest.push_str(r#"<a href=""#);
+                // TODO: quoted-escape the url?
+                self.dest.push_str(r#"{\field{\*\fldinst HYPERLINK \""#);
                 self.dest.push_str(&url);
-                self.dest.push_str(r#"">"#);
+                self.dest.push_str(r#""}{\fldrslt "#);
                 self.write_inlines(content, true);
-                self.dest.push_str("</a>");
+                self.dest.push_str("}}");
             }
         }
     }

From 21b0cf5aea489ffd92b3b5ad34029781e2d2694b Mon Sep 17 00:00:00 2001
From: Cormac Relf <web@cormacrelf.net>
Date: Tue, 1 Dec 2020 01:21:32 +1100
Subject: [PATCH 09/22] js-demo: get rid of react-async-component

---
 crates/wasm/js-demo/js/App.tsx            | 197 +++-------------------
 crates/wasm/js-demo/js/Editor.tsx         | 140 +++++++++++++++
 crates/wasm/js-demo/js/initialClusters.ts |  52 ++++++
 crates/wasm/js-demo/package.json          |   1 -
 crates/wasm/js-demo/yarn.lock             |   5 -
 5 files changed, 219 insertions(+), 176 deletions(-)
 create mode 100644 crates/wasm/js-demo/js/Editor.tsx
 create mode 100644 crates/wasm/js-demo/js/initialClusters.ts

diff --git a/crates/wasm/js-demo/js/App.tsx b/crates/wasm/js-demo/js/App.tsx
index 5a66d418..cce19082 100644
--- a/crates/wasm/js-demo/js/App.tsx
+++ b/crates/wasm/js-demo/js/App.tsx
@@ -1,177 +1,39 @@
-import React, { Component, ChangeEvent, useEffect, useRef } from 'react';
-import { asyncComponent } from 'react-async-component';
-import { Reference, Cluster, Driver, StyleError, ParseError, Invalid } from '../../pkg';
-import { useState } from 'react';
-import { DocumentEditor } from './DocumentEditor';
-import { GraphViz } from './GraphViz';
-import { Result, Err, Ok, Option, Some, None } from 'safe-types';
-import { useDocument } from './useDocument';
+import React, { Component, Suspense } from 'react';
 
-import initialStyle from './style.csl';
-import { initialReferences } from './initialReferences';
 
-const initialClusters: Cluster[] = [
-    {
-        id: "cluster-1",
-        cites: [
-            { id: "citekey" }
-        ],
-    },
-    {
-        id: "cluster-2",
-        cites: [
-            { id: "citekey2" }
-        ],
-    },
-    {
-        id: "cluster-3",
-        cites: [
-            { id: "citekey", locator: "56" }
-        ],
-    },
-    {
-        id: "cluster-4",
-        cites: [
-            { id: "r1" }
-        ]
-    },
-    {
-        id: "cluster-5",
-        cites: [
-            { id: "ysuf1" }
-        ]
-    },
-    {
-        id: "cluster-6",
-        cites: [
-            { id: "ysuf2" }
-        ]
-    },
-    {
-        id: "cluster-7",
-        cites: [
-            { id: "ysuf1" }
-        ]
-    },
-    {
-        id: "cluster-8",
-        cites: [
-            { id: "r7" }
-        ]
-    },
-];
-
-const mono = {
-    width: '100%',
-    minHeight: '300px',
-    fontFamily: 'monospace',
-};
-
-async function loadEditor() {
+const AsyncEditor = React.lazy(async () => {
     // Load wasm before making it interactive.
     // Removes failed expectation of immediate response compared to lazily loading it.
     await import('../../pkg');
+    return await import('./Editor');
+})
 
-    const StyleEditor = ({style, setStyle, resetReferences} : {
-        inFlight: boolean,
-        style: string,
-        setStyle: React.Dispatch<string>,
-        resetReferences: (rs: Reference[]) => void;
-    }) => {
-        const [refsText, setRefsText] = useState(JSON.stringify(initialReferences, null, 2));
-
-        const parseRefs = () => {
-            try {
-                let refs = JSON.parse(refsText);
-                resetReferences(refs);
-            } catch (e) {
-                console.error("could not parse references json", e);
-            }
-        };
-
-        useEffect(parseRefs, [ refsText ]);
-
-        const firstRun = useRef(true);
-        if (firstRun.current) {
-            firstRun.current = false;
-            parseRefs();
-        }
-
-        let column = { width: '50%' };
-        return <div>
-            <div style={{display: 'flex'}}>
-                <div style={column}>
-                    <h3>Style</h3>
-                    <textarea defaultValue={style} onBlur={e => setStyle(e.target.value)} style={mono} />
-                </div>
-                <div style={column}>
-                    <h3>References</h3>
-                    <textarea defaultValue={refsText} onBlur={e => setRefsText(e.target.value)} style={mono} />
-                </div>
-            </div>
-        </div>;
+class ErrorBoundary extends Component<{}, { hasError: boolean, }> {
+    constructor(props: {}) {
+        super(props);
+        this.state = { hasError: false };
     }
 
-    return StyleEditor;
-}
-
-const AsyncEditor = asyncComponent({
-    resolve: loadEditor,
-    LoadingComponent: () => <div><i>(Loading editor)</i></div>, // Optional
-    ErrorComponent: ({ error }) => <pre>{JSON.stringify(error)}</pre> // Optional
-});
-
-const Results = ({ driver, style }: { driver: Result<Driver, any>, style: string }) => {
-    return driver.match({
-        Ok: d => <p>
-            locales in use:
-            <code>{JSON.stringify(d.toFetch().unwrap().sort())}</code>
-        </p>,
-        Err: e => <p style={{backgroundColor: '#ff00002b', marginBottom: '5px'}}>{e}</p>,
-    });
-};
-
+    static getDerivedStateFromError(error: any) {
+        // Update state so the next render will show the fallback UI.
+        return { hasError: true };
+    }
 
+    componentDidCatch(error: any, errorInfo: any) {
+        // You can also log the error to an error reporting service
+        // logErrorToMyService(error, errorInfo);
+    }
 
-const ErrorViewer = ({style, error}: { style: string, error: StyleError }) => {
-    if (error.ParseError) {
-        let e = error as ParseError;
-        return <p>{ e.ParseError }</p>
-    } else if (error.Invalid) {
-        let e = error as Invalid;
-        return <div>{ e.Invalid.map(i => {
-            let text = style.slice(i.range.start, i.range.end);
-            return <div key={i.range.start * style.length + i.range.end}
-                        style={{backgroundColor: '#ff00002b', marginBottom: '5px'}}>
-                <p>{ `${i.severity}: ${i.message}` }</p>
-                <pre style={{marginLeft: "2em" }}>{ text }</pre>
-                { i.hint && <p>{ i.hint } </p>}
-            </div>
-        }) } </div>
-    } else {
-        return null;
+    render() {
+        if (this.state.hasError) {
+            // You can render any custom fallback UI
+            return <h1>Something went wrong.</h1>;
+        }
+        return this.props.children; 
     }
 }
 
 const App = () => {
-    const {
-        document,
-        driver,
-        style,
-        setStyle,
-        inFlight,
-        setDocument,
-        references,
-        resetReferences,
-        updateReferences,
-    } = useDocument(initialStyle, initialReferences, initialClusters);
-
-    const docEditor = document.map(doc =>
-        <DocumentEditor
-            document={doc}
-            onChange={newDoc => setDocument(Some(newDoc))} />
-    ).unwrap_or(null);
-
     return (
         <div className="App">
             <header className="App-header">
@@ -184,16 +46,11 @@ const App = () => {
                     Test driver for <code>citeproc-wasm</code>
                 </a>
             </header>
-            <AsyncEditor style={style} setStyle={setStyle} inFlight={inFlight} resetReferences={resetReferences} />
-            <div  style={{display: 'flex'}}>
-                <section style={{flexGrow: 1}}>
-                    <Results style={style} driver={driver} />
-                    { docEditor }
-                </section>
-                <section style={{flexGrow: 1}}>
-                    <GraphViz references={references} driver={driver} />
-                </section>
-            </div>
+            <ErrorBoundary>
+                <Suspense fallback={<div>Loading...</div>}>
+                    <AsyncEditor />
+                </Suspense>
+            </ErrorBoundary>
         </div>
     );
 };
diff --git a/crates/wasm/js-demo/js/Editor.tsx b/crates/wasm/js-demo/js/Editor.tsx
new file mode 100644
index 00000000..54244470
--- /dev/null
+++ b/crates/wasm/js-demo/js/Editor.tsx
@@ -0,0 +1,140 @@
+import React, { Component, useState, useEffect, useRef } from 'react';
+import { Result, Err, Ok, Option, Some } from 'safe-types';
+
+import { Reference, Cluster, Driver, CslStyleError, StyleError, CiteprocRsError, CiteprocRsDriverError } from '../../pkg';
+import { GraphViz } from './GraphViz';
+import { DocumentEditor } from './DocumentEditor';
+import { useDocument } from './useDocument';
+
+import initialStyle from './style.csl';
+import { initialReferences } from './initialReferences';
+import { initialClusters } from './initialClusters';
+
+
+const mono = {
+    width: '100%',
+    minHeight: '300px',
+    fontFamily: 'monospace',
+};
+
+const StyleErrorViewer = ({style, message, error}: { style: string, message: string, error: StyleError }) => {
+    switch (error.tag) {
+        case "ParseError": 
+            return <p>{ message }</p>
+        case "DependentStyle":
+            return <p>{ message }</p>
+        case "Invalid":
+            return <div>{ error.content.map(i => {
+                let text = style.slice(i.range.start, i.range.end);
+            return <div key={i.range.start * style.length + i.range.end}
+            style={{backgroundColor: '#ff00002b', marginBottom: '5px'}}>
+            <p>{ `${i.severity}: ${i.message}` }</p>
+            <pre style={{marginLeft: "2em" }}>{ text }</pre>
+            { i.hint && <p>{ i.hint }</p> }
+            </div>;
+        }) } </div>
+        default: return null;
+    }
+}
+
+const ErrorViewer = ({style, error}: { style: string, error: CiteprocRsError }) => {
+    if (error instanceof CiteprocRsDriverError) {
+        let info = error.data;
+        switch (info.tag) {
+            case "StyleError": return <StyleErrorViewer style={style} message={error.message} error={info.content} />;
+            default: return <p>{ error.message }</p>;
+        }
+    } else {
+        return <p>{ error.message }</p>;
+    }
+}
+
+const Results = ({ driver, style }: { driver: Result<Driver, CiteprocRsError>, style: string }) => {
+    return driver.match({
+        Ok: d => <p>
+            locales in use:
+            <code>{JSON.stringify(d.toFetch().unwrap().sort())}</code>
+            </p>,
+        // Err: e => <p style={{backgroundColor: '#ff00002b', marginBottom: '5px'}}></p>,
+        Err: e => <ErrorViewer style={style} error={e} />
+    });
+};
+
+const StyleEditor = ({style, setStyle, resetReferences} : {
+    inFlight: boolean,
+    style: string,
+    setStyle: React.Dispatch<string>,
+    resetReferences: (rs: Reference[]) => void;
+}) => {
+    const [refsText, setRefsText] = useState(JSON.stringify(initialReferences, null, 2));
+
+    const parseRefs = () => {
+        try {
+            let refs = JSON.parse(refsText);
+            resetReferences(refs);
+        } catch (e) {
+            console.error("could not parse references json", e);
+        }
+    };
+
+    useEffect(parseRefs, [ refsText ]);
+
+    const firstRun = useRef(true);
+    if (firstRun.current) {
+        firstRun.current = false;
+        parseRefs();
+    }
+
+    let column = { width: '50%' };
+    return <div>
+        <div style={{display: 'flex'}}>
+            <div style={column}>
+                <h3>Style</h3>
+                <textarea value={style} onChange={e => setStyle(e.target.value)} style={mono} />
+            </div>
+            <div style={column}>
+                <h3>References</h3>
+                <textarea value={refsText} onChange={e => setRefsText(e.target.value)} style={mono} />
+            </div>
+        </div>
+        </div>;
+}
+
+const EditorAndResults = () => {
+    const {
+        document,
+        driver,
+        style,
+        setStyle,
+        inFlight,
+        setDocument,
+        references,
+        resetReferences,
+        // updateReferences,
+    } = useDocument(initialStyle, initialReferences, initialClusters);
+
+    const docEditor = document.map(doc =>
+        <DocumentEditor
+        document={doc}
+        onChange={newDoc => setDocument(Some(newDoc))} />
+    ).unwrap_or(null);
+
+    return <>
+        <StyleEditor
+            style={style}
+            setStyle={setStyle}
+            inFlight={inFlight}
+            resetReferences={resetReferences} />
+        <div style={{display: 'flex'}}>
+            <section style={{flexGrow: 1}}>
+                <Results style={style} driver={driver} />
+                { docEditor }
+            </section>
+            <section style={{flexGrow: 1}}>
+                <GraphViz references={references} driver={driver} />
+            </section>
+        </div>
+        </>;
+};
+
+export default EditorAndResults;
diff --git a/crates/wasm/js-demo/js/initialClusters.ts b/crates/wasm/js-demo/js/initialClusters.ts
new file mode 100644
index 00000000..e6ce423b
--- /dev/null
+++ b/crates/wasm/js-demo/js/initialClusters.ts
@@ -0,0 +1,52 @@
+import { Cluster } from '../../pkg';
+export const initialClusters: Cluster[] = [
+    {
+        id: "cluster-1",
+        cites: [
+            { id: "citekey" }
+        ],
+    },
+    {
+        id: "cluster-2",
+        cites: [
+            { id: "citekey2" }
+        ],
+    },
+    {
+        id: "cluster-3",
+        cites: [
+            { id: "citekey", locator: "56" }
+        ],
+    },
+    {
+        id: "cluster-4",
+        cites: [
+            { id: "r1" }
+        ]
+    },
+    {
+        id: "cluster-5",
+        cites: [
+            { id: "ysuf1" }
+        ]
+    },
+    {
+        id: "cluster-6",
+        cites: [
+            { id: "ysuf2" }
+        ]
+    },
+    {
+        id: "cluster-7",
+        cites: [
+            { id: "ysuf1" }
+        ]
+    },
+    {
+        id: "cluster-8",
+        cites: [
+            { id: "r7" }
+        ]
+    },
+];
+
diff --git a/crates/wasm/js-demo/package.json b/crates/wasm/js-demo/package.json
index 9a857410..70ccb7fd 100644
--- a/crates/wasm/js-demo/package.json
+++ b/crates/wasm/js-demo/package.json
@@ -43,7 +43,6 @@
     "graphlib-dot": "^0.6.2",
     "immer": "^3.1.3",
     "react": "^16.8.2",
-    "react-async-component": "^2.0.0",
     "react-dom": "^16.8.2",
     "react-select": "^3.0.4",
     "safe-types": "^4.20.0",
diff --git a/crates/wasm/js-demo/yarn.lock b/crates/wasm/js-demo/yarn.lock
index 670212a1..46a1ce2a 100644
--- a/crates/wasm/js-demo/yarn.lock
+++ b/crates/wasm/js-demo/yarn.lock
@@ -4758,11 +4758,6 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-async-component@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/react-async-component/-/react-async-component-2.0.0.tgz#a56c1278ac588291fce6cd5cf033eb97eb36483c"
-  integrity sha512-wefjuqJt5dYQC0y6v5uKqeDhigiVJQN3PO4L2/nF0/r3shtH52iRH3JvLP0UADhNsNnQmyORoqhVOJ59K7XQZA==
-
 react-dom@^16.8.2:
   version "16.9.0"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.9.0.tgz#5e65527a5e26f22ae3701131bcccaee9fb0d3962"

From f61b2496ad0baee5ccae5eec43c8b4ac31bcf864 Mon Sep 17 00:00:00 2001
From: Cormac Relf <web@cormacrelf.net>
Date: Tue, 1 Dec 2020 18:02:42 +1100
Subject: [PATCH 10/22] Improve the wasm demo, show style metadata & hide
 bibliography based on it

---
 crates/wasm/js-demo/js/App.tsx            |   1 -
 crates/wasm/js-demo/js/DocumentEditor.tsx |  28 +-
 crates/wasm/js-demo/js/Editor.tsx         |  72 ++-
 crates/wasm/js-demo/js/GraphViz.tsx       |   1 +
 crates/wasm/js-demo/js/useDocument.ts     |  13 +-
 crates/wasm/js-demo/package.json          |   1 +
 crates/wasm/js-demo/yarn.lock             | 580 ++++++++++++++--------
 7 files changed, 450 insertions(+), 246 deletions(-)

diff --git a/crates/wasm/js-demo/js/App.tsx b/crates/wasm/js-demo/js/App.tsx
index cce19082..ed1423af 100644
--- a/crates/wasm/js-demo/js/App.tsx
+++ b/crates/wasm/js-demo/js/App.tsx
@@ -1,6 +1,5 @@
 import React, { Component, Suspense } from 'react';
 
-
 const AsyncEditor = React.lazy(async () => {
     // Load wasm before making it interactive.
     // Removes failed expectation of immediate response compared to lazily loading it.
diff --git a/crates/wasm/js-demo/js/DocumentEditor.tsx b/crates/wasm/js-demo/js/DocumentEditor.tsx
index 32764dff..ea72804e 100644
--- a/crates/wasm/js-demo/js/DocumentEditor.tsx
+++ b/crates/wasm/js-demo/js/DocumentEditor.tsx
@@ -8,7 +8,7 @@ const btnStyle = {
     display: "inline"
 }
 
-export const DocumentEditor = ({document, onChange}: { document: Document; onChange: (d: Document) => void }) => {
+export const DocumentEditor = ({document, onChange, showBibliography}: { document: Document; onChange: (d: Document) => void, showBibliography: boolean }) => {
   let [csvIncl, setCsvIncl] = useState("");
     const insertCluster = (before: string) => {
         let neu = document.produce(draft => {
@@ -51,26 +51,32 @@ export const DocumentEditor = ({document, onChange}: { document: Document; onCha
                 setCsvIncl(joined);
               }} placeholder="None (default), All, or a comma-separated list of citekeys"/>
         </div>
-        <DocumentViewer renderedDocument={document.rendered} />
+        <DocumentViewer showBibliography={showBibliography} renderedDocument={document.rendered} />
     </>;
 };
 
-const DocumentViewer = React.memo(({renderedDocument}: {renderedDocument: RenderedDocument}) => {
+const DocumentViewer = React.memo(({renderedDocument, showBibliography}: {renderedDocument: RenderedDocument, showBibliography: boolean}) => {
     let clusters = renderedDocument.orderedClusterIds.map(c => {
         let html = renderedDocument.builtClusters[c.id];
         let touched = renderedDocument.updatedLastRevision[c.id];
         return <ClusterViewer key={c.id} note={c.note} html={html} touched={touched} />
     });
-    let bibs = renderedDocument.bibliographyIds.map((key, x) => {
-        let str = renderedDocument.bibliography[key];
-        return <div key={x} className="footnote csl-entry" dangerouslySetInnerHTML={{__html: str}}></div>;
-    });
+    let bib: JSX.Element | null = null;
+    if (showBibliography) {
+        let bibs = renderedDocument.bibliographyIds.map((key, x) => {
+            let str = renderedDocument.bibliography[key];
+            return <div key={x} className="footnote csl-entry" dangerouslySetInnerHTML={{__html: str}}></div>;
+        });
+        bib = <>
+            <h2>Bibliography</h2>
+            <div className="csl-bib-body">
+              {bibs}
+            </div>
+        </>;
+    }
     return <div>
         {clusters}
-        <h2>Bibliography</h2>
-        <div className="csl-bib-body">
-            {bibs}
-        </div>
+        {bib}
     </div>;
 });
 
diff --git a/crates/wasm/js-demo/js/Editor.tsx b/crates/wasm/js-demo/js/Editor.tsx
index 54244470..1b192f41 100644
--- a/crates/wasm/js-demo/js/Editor.tsx
+++ b/crates/wasm/js-demo/js/Editor.tsx
@@ -1,7 +1,8 @@
 import React, { Component, useState, useEffect, useRef } from 'react';
 import { Result, Err, Ok, Option, Some } from 'safe-types';
+import ReactJson from 'react-json-view';
 
-import { Reference, Cluster, Driver, CslStyleError, StyleError, CiteprocRsError, CiteprocRsDriverError } from '../../pkg';
+import { Reference, Cluster, Driver, StyleError, StyleMeta } from '../../pkg';
 import { GraphViz } from './GraphViz';
 import { DocumentEditor } from './DocumentEditor';
 import { useDocument } from './useDocument';
@@ -17,35 +18,41 @@ const mono = {
     fontFamily: 'monospace',
 };
 
+const errorStyle = {backgroundColor: '#ff00002b', marginBottom: '5px'};
+
 const StyleErrorViewer = ({style, message, error}: { style: string, message: string, error: StyleError }) => {
     switch (error.tag) {
-        case "ParseError": 
-            return <p>{ message }</p>
-        case "DependentStyle":
-            return <p>{ message }</p>
         case "Invalid":
-            return <div>{ error.content.map(i => {
-                let text = style.slice(i.range.start, i.range.end);
-            return <div key={i.range.start * style.length + i.range.end}
-            style={{backgroundColor: '#ff00002b', marginBottom: '5px'}}>
-            <p>{ `${i.severity}: ${i.message}` }</p>
-            <pre style={{marginLeft: "2em" }}>{ text }</pre>
-            { i.hint && <p>{ i.hint }</p> }
-            </div>;
-        }) } </div>
-        default: return null;
+            return <div>{
+                error.content.map(i => {
+                    let text = style.slice(i.range.start, i.range.end);
+                    return <div key={i.range.start * style.length + i.range.end}
+                        style={errorStyle}>
+                        <p>{ `${i.severity}: ${i.message}` }</p>
+                        <pre style={{marginLeft: "2em" }}>{ text }</pre>
+                        { i.hint && <p>{ i.hint }</p> }
+                    </div>;
+                })
+            } </div>;
+        default:
+            return <p style={errorStyle}>{ message }</p>
     }
 }
 
 const ErrorViewer = ({style, error}: { style: string, error: CiteprocRsError }) => {
-    if (error instanceof CiteprocRsDriverError) {
+    if (error instanceof CiteprocRsDriverError && error.data.tag == "StyleError") {
+        return <StyleErrorViewer
+                    style={style}
+                    message={error.message}
+                    error={error.data.content} />;
+    } else if (error instanceof CslStyleError) {
         let info = error.data;
-        switch (info.tag) {
-            case "StyleError": return <StyleErrorViewer style={style} message={error.message} error={info.content} />;
-            default: return <p>{ error.message }</p>;
-        }
+        return <StyleErrorViewer
+                    style={style}
+                    message={error.message}
+                    error={info} />;
     } else {
-        return <p>{ error.message }</p>;
+        return <p style={errorStyle}>{ error.message }</p>;
     }
 }
 
@@ -55,7 +62,6 @@ const Results = ({ driver, style }: { driver: Result<Driver, CiteprocRsError>, s
             locales in use:
             <code>{JSON.stringify(d.toFetch().unwrap().sort())}</code>
             </p>,
-        // Err: e => <p style={{backgroundColor: '#ff00002b', marginBottom: '5px'}}></p>,
         Err: e => <ErrorViewer style={style} error={e} />
     });
 };
@@ -90,11 +96,11 @@ const StyleEditor = ({style, setStyle, resetReferences} : {
         <div style={{display: 'flex'}}>
             <div style={column}>
                 <h3>Style</h3>
-                <textarea value={style} onChange={e => setStyle(e.target.value)} style={mono} />
+                <textarea defaultValue={style} onBlur={e => setStyle(e.target.value)} style={mono} />
             </div>
             <div style={column}>
                 <h3>References</h3>
-                <textarea value={refsText} onChange={e => setRefsText(e.target.value)} style={mono} />
+                <textarea defaultValue={refsText} onBlur={e => setRefsText(e.target.value)} style={mono} />
             </div>
         </div>
         </div>;
@@ -110,11 +116,22 @@ const EditorAndResults = () => {
         setDocument,
         references,
         resetReferences,
+        metadata,
         // updateReferences,
     } = useDocument(initialStyle, initialReferences, initialClusters);
 
+    let [hasBibliography, setHasBibliography] = useState(false);
+    useEffect(() => {
+        metadata.map(meta => {
+            if (meta.independentMeta) {
+                setHasBibliography(meta.independentMeta.hasBibliography);
+            }
+        })
+    }, [metadata]);
+
     const docEditor = document.map(doc =>
         <DocumentEditor
+        showBibliography={hasBibliography}
         document={doc}
         onChange={newDoc => setDocument(Some(newDoc))} />
     ).unwrap_or(null);
@@ -125,6 +142,13 @@ const EditorAndResults = () => {
             setStyle={setStyle}
             inFlight={inFlight}
             resetReferences={resetReferences} />
+        <section>
+          { metadata.map_or(null, meta => <details>
+              <summary>Style Metadata</summary>
+              <ReactJson name={false} src={meta}
+                enableClipboard={false} displayObjectSize={false} displayDataTypes={false} />
+            </details>) }
+        </section>
         <div style={{display: 'flex'}}>
             <section style={{flexGrow: 1}}>
                 <Results style={style} driver={driver} />
diff --git a/crates/wasm/js-demo/js/GraphViz.tsx b/crates/wasm/js-demo/js/GraphViz.tsx
index a43fc32a..02a9676e 100644
--- a/crates/wasm/js-demo/js/GraphViz.tsx
+++ b/crates/wasm/js-demo/js/GraphViz.tsx
@@ -70,6 +70,7 @@ export const Dot = ({ dotString }: { dotString: string }) => {
 
 export const GraphViz = ({driver, references}: { driver: Result<Driver, any>, references: Reference[] }) => {
     const ids = references.map(r => ({value: r.id, label: r.id}));
+    ids.splice(0, 0, { value: null, label: "None" });
     const [current, setCurrent] = useState<string>(null);
     const ref = references.find(r => r.id == current);
     return (
diff --git a/crates/wasm/js-demo/js/useDocument.ts b/crates/wasm/js-demo/js/useDocument.ts
index a61a6534..a279211d 100644
--- a/crates/wasm/js-demo/js/useDocument.ts
+++ b/crates/wasm/js-demo/js/useDocument.ts
@@ -1,6 +1,6 @@
 import { useState, useRef, useEffect } from 'react';
 import { Result, Err, Ok, Option, Some, None } from 'safe-types';
-import { Driver, Reference, Cluster, Cite, Lifecycle, UpdateSummary } from '../../pkg';
+import { parseStyleMetadata, Driver, Reference, Cluster, Cite, Lifecycle, UpdateSummary, StyleMeta } from '../../pkg';
 import { ClusterId, Document, RenderedDocument } from './Document';
 import { CdnFetcher } from './CdnFetcher';
 
@@ -32,7 +32,8 @@ export const useDocument = (initialStyle: string, initialReferences: Reference[]
     const [inFlight, setInFlight] = useState(false);
     const [driver, setDriver] = useState<Result<Driver, any>>(Err("uninitialized"));
     const [style, setStyle] = useState(initialStyle);
-    const [error, setError] = useState<Option<any>>(None());
+    const [metadata, setMetadata] = useState<Option<StyleMeta>>(None);
+    const [error, setError] = useState<Option<CiteprocRsError>>(None());
 
     const flightFetcher = async (driv: Driver) => {
         setInFlight(true);
@@ -56,9 +57,12 @@ export const useDocument = (initialStyle: string, initialReferences: Reference[]
                 });
                 let d = driver.unwrap();
                 d.resetReferences(references).unwrap();
+                let meta = parseStyleMetadata(style).unwrap();
+                setMetadata(Some(meta));
                 return d;
             } catch(e) {
                 console.error("caught in createDriver: ", e);
+                setError(Some(e));
             }
         });
         if (d.is_ok()) {
@@ -73,18 +77,18 @@ export const useDocument = (initialStyle: string, initialReferences: Reference[]
         if (driver.is_ok()) {
             let d = driver.unwrap();
             try {
-                const { parseStyleMetadata } = await import('../../pkg');
                 let meta = parseStyleMetadata(style).unwrap();
                 if (meta.info.parent != null) {
                     console.log("this is a dependent style!");
                 }
                 console.log(meta);
                 d.setStyle(style).unwrap();
+                setMetadata(Some(meta));
                 setError(None());
             } catch (e) {
                 console.error(e);
                 console.log(e.data);
-                setError(Some("" + e));
+                setError(Some(e));
             }
             await flightFetcher(d);
             setDocument(document.map(doc => doc.selfUpdate()));
@@ -154,6 +158,7 @@ export const useDocument = (initialStyle: string, initialReferences: Reference[]
         resetReferences,
         updateReferences,
         references,
+        metadata,
     };
 }
 
diff --git a/crates/wasm/js-demo/package.json b/crates/wasm/js-demo/package.json
index 70ccb7fd..3cc941c9 100644
--- a/crates/wasm/js-demo/package.json
+++ b/crates/wasm/js-demo/package.json
@@ -44,6 +44,7 @@
     "immer": "^3.1.3",
     "react": "^16.8.2",
     "react-dom": "^16.8.2",
+    "react-json-view": "^1.19.1",
     "react-select": "^3.0.4",
     "safe-types": "^4.20.0",
     "typescript": "^3.3.3333"
diff --git a/crates/wasm/js-demo/yarn.lock b/crates/wasm/js-demo/yarn.lock
index 46a1ce2a..6170ca4e 100644
--- a/crates/wasm/js-demo/yarn.lock
+++ b/crates/wasm/js-demo/yarn.lock
@@ -132,11 +132,11 @@
     "@babel/types" "^7.5.5"
 
 "@babel/helper-module-imports@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d"
-  integrity sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb"
+  integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
   dependencies:
-    "@babel/types" "^7.0.0"
+    "@babel/types" "^7.12.5"
 
 "@babel/helper-module-transforms@^7.1.0", "@babel/helper-module-transforms@^7.4.4":
   version "7.5.5"
@@ -205,6 +205,11 @@
   dependencies:
     "@babel/types" "^7.4.4"
 
+"@babel/helper-validator-identifier@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
+  integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
+
 "@babel/helper-wrap-function@^7.1.0":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz#c4e0012445769e2815b55296ead43a958549f6fa"
@@ -717,13 +722,20 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-transform-typescript" "^7.6.0"
 
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.2", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5":
+"@babel/runtime@^7.3.1":
   version "7.6.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.0.tgz#4fc1d642a9fd0299754e8b5de62c631cf5568205"
   integrity sha512-89eSBLJsxNxOERC0Op4vd+0Bqm6wRMqMbFtV3i0/fbaWw/mJ8Q3eBvgX0G4SyrOOLCtbu98HspF8o09MRT+KzQ==
   dependencies:
     regenerator-runtime "^0.13.2"
 
+"@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.7":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
+  integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
 "@babel/template@^7.1.0", "@babel/template@^7.4.4", "@babel/template@^7.6.0":
   version "7.6.0"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.6.0.tgz#7f0159c7f5012230dad64cca42ec9bdb5c9536e6"
@@ -748,7 +760,16 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.6.0":
+"@babel/types@^7.0.0", "@babel/types@^7.12.5":
+  version "7.12.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13"
+  integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.10.4"
+    lodash "^4.17.19"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@^7.2.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.6.0":
   version "7.6.1"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.6.1.tgz#53abf3308add3ac2a2884d539151c57c4b3ac648"
   integrity sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==
@@ -766,82 +787,82 @@
     lodash "^4.17.11"
     to-fast-properties "^2.0.0"
 
-"@emotion/cache@^10.0.17", "@emotion/cache@^10.0.9":
-  version "10.0.17"
-  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.17.tgz#3491a035f62f276620d586677bfc3d4fad0b8472"
-  integrity sha512-442/miwbuwIDfSzfMqZNxuzxSEbskcz/bZ86QBYzEjFrr/oq9w+y5kJY1BHbGhDtr91GO232PZ5NN9XYMwr/Qg==
+"@emotion/cache@^10.0.27", "@emotion/cache@^10.0.9":
+  version "10.0.29"
+  resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.29.tgz#87e7e64f412c060102d589fe7c6dc042e6f9d1e0"
+  integrity sha512-fU2VtSVlHiF27empSbxi1O2JFdNWZO+2NFHfwO0pxgTep6Xa3uGb+3pVKfLww2l/IBGLNEZl5Xf/++A4wAYDYQ==
   dependencies:
-    "@emotion/sheet" "0.9.3"
-    "@emotion/stylis" "0.8.4"
-    "@emotion/utils" "0.11.2"
-    "@emotion/weak-memoize" "0.2.3"
+    "@emotion/sheet" "0.9.4"
+    "@emotion/stylis" "0.8.5"
+    "@emotion/utils" "0.11.3"
+    "@emotion/weak-memoize" "0.2.5"
 
 "@emotion/core@^10.0.9":
-  version "10.0.17"
-  resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.0.17.tgz#3367376709721f4ee2068cff54ba581d362789d8"
-  integrity sha512-gykyjjr0sxzVuZBVTVK4dUmYsorc2qLhdYgSiOVK+m7WXgcYTKZevGWZ7TLAgTZvMelCTvhNq8xnf8FR1IdTbg==
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.1.1.tgz#c956c1365f2f2481960064bcb8c4732e5fb612c3"
+  integrity sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==
   dependencies:
     "@babel/runtime" "^7.5.5"
-    "@emotion/cache" "^10.0.17"
-    "@emotion/css" "^10.0.14"
-    "@emotion/serialize" "^0.11.10"
-    "@emotion/sheet" "0.9.3"
-    "@emotion/utils" "0.11.2"
-
-"@emotion/css@^10.0.14", "@emotion/css@^10.0.9":
-  version "10.0.14"
-  resolved "https://registry.yarnpkg.com/@emotion/css/-/css-10.0.14.tgz#95dacabdd0e22845d1a1b0b5968d9afa34011139"
-  integrity sha512-MozgPkBEWvorcdpqHZE5x1D/PLEHUitALQCQYt2wayf4UNhpgQs2tN0UwHYS4FMy5ROBH+0ALyCFVYJ/ywmwlg==
-  dependencies:
-    "@emotion/serialize" "^0.11.8"
-    "@emotion/utils" "0.11.2"
-    babel-plugin-emotion "^10.0.14"
-
-"@emotion/hash@0.7.2":
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.7.2.tgz#53211e564604beb9befa7a4400ebf8147473eeef"
-  integrity sha512-RMtr1i6E8MXaBWwhXL3yeOU8JXRnz8GNxHvaUfVvwxokvayUY0zoBeWbKw1S9XkufmGEEdQd228pSZXFkAln8Q==
-
-"@emotion/memoize@0.7.2":
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.2.tgz#7f4c71b7654068dfcccad29553520f984cc66b30"
-  integrity sha512-hnHhwQzvPCW1QjBWFyBtsETdllOM92BfrKWbUTmh9aeOlcVOiXvlPsK4104xH8NsaKfg86PTFsWkueQeUfMA/w==
-
-"@emotion/serialize@^0.11.10", "@emotion/serialize@^0.11.8":
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.10.tgz#53207dba7e28bd96928fc2a37e20b31b712bf9a2"
-  integrity sha512-04AB+wU00vv9jLgkWn13c/GJg2yXp3w7ZR3Q1O6mBSE6mbUmYeNX3OpBhfp//6r47lFyY0hBJJue+bA30iokHQ==
-  dependencies:
-    "@emotion/hash" "0.7.2"
-    "@emotion/memoize" "0.7.2"
-    "@emotion/unitless" "0.7.4"
-    "@emotion/utils" "0.11.2"
+    "@emotion/cache" "^10.0.27"
+    "@emotion/css" "^10.0.27"
+    "@emotion/serialize" "^0.11.15"
+    "@emotion/sheet" "0.9.4"
+    "@emotion/utils" "0.11.3"
+
+"@emotion/css@^10.0.27", "@emotion/css@^10.0.9":
+  version "10.0.27"
+  resolved "https://registry.yarnpkg.com/@emotion/css/-/css-10.0.27.tgz#3a7458198fbbebb53b01b2b87f64e5e21241e14c"
+  integrity sha512-6wZjsvYeBhyZQYNrGoR5yPMYbMBNEnanDrqmsqS1mzDm1cOTu12shvl2j4QHNS36UaTE0USIJawCH9C8oW34Zw==
+  dependencies:
+    "@emotion/serialize" "^0.11.15"
+    "@emotion/utils" "0.11.3"
+    babel-plugin-emotion "^10.0.27"
+
+"@emotion/hash@0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
+  integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
+
+"@emotion/memoize@0.7.4":
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb"
+  integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==
+
+"@emotion/serialize@^0.11.15", "@emotion/serialize@^0.11.16":
+  version "0.11.16"
+  resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.11.16.tgz#dee05f9e96ad2fb25a5206b6d759b2d1ed3379ad"
+  integrity sha512-G3J4o8by0VRrO+PFeSc3js2myYNOXVJ3Ya+RGVxnshRYgsvErfAOglKAiy1Eo1vhzxqtUvjCyS5gtewzkmvSSg==
+  dependencies:
+    "@emotion/hash" "0.8.0"
+    "@emotion/memoize" "0.7.4"
+    "@emotion/unitless" "0.7.5"
+    "@emotion/utils" "0.11.3"
     csstype "^2.5.7"
 
-"@emotion/sheet@0.9.3":
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.3.tgz#689f135ecf87d3c650ed0c4f5ddcbe579883564a"
-  integrity sha512-c3Q6V7Df7jfwSq5AzQWbXHa5soeE4F5cbqi40xn0CzXxWW9/6Mxq48WJEtqfWzbZtW9odZdnRAkwCQwN12ob4A==
+"@emotion/sheet@0.9.4":
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-0.9.4.tgz#894374bea39ec30f489bbfc3438192b9774d32e5"
+  integrity sha512-zM9PFmgVSqBw4zL101Q0HrBVTGmpAxFZH/pYx/cjJT5advXguvcgjHFTCaIO3enL/xr89vK2bh0Mfyj9aa0ANA==
 
-"@emotion/stylis@0.8.4":
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.4.tgz#6c51afdf1dd0d73666ba09d2eb6c25c220d6fe4c"
-  integrity sha512-TLmkCVm8f8gH0oLv+HWKiu7e8xmBIaokhxcEKPh1m8pXiV/akCiq50FvYgOwY42rjejck8nsdQxZlXZ7pmyBUQ==
+"@emotion/stylis@0.8.5":
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.5.tgz#deacb389bd6ee77d1e7fcaccce9e16c5c7e78e04"
+  integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==
 
-"@emotion/unitless@0.7.4":
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.4.tgz#a87b4b04e5ae14a88d48ebef15015f6b7d1f5677"
-  integrity sha512-kBa+cDHOR9jpRJ+kcGMsysrls0leukrm68DmFQoMIWQcXdr2cZvyvypWuGYT7U+9kAExUE7+T7r6G3C3A6L8MQ==
+"@emotion/unitless@0.7.5":
+  version "0.7.5"
+  resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed"
+  integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
 
-"@emotion/utils@0.11.2":
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.2.tgz#713056bfdffb396b0a14f1c8f18e7b4d0d200183"
-  integrity sha512-UHX2XklLl3sIaP6oiMmlVzT0J+2ATTVpf0dHQVyPJHTkOITvXfaSqnRk6mdDhV9pR8T/tHc3cex78IKXssmzrA==
+"@emotion/utils@0.11.3":
+  version "0.11.3"
+  resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.3.tgz#a759863867befa7e583400d322652a3f44820924"
+  integrity sha512-0o4l6pZC+hI88+bzuaX/6BgOvQVhbt2PfmxauVaYOGgbsAw14wdKyvMCZXnsnsHys94iadcF+RG/wZyx6+ZZBw==
 
-"@emotion/weak-memoize@0.2.3":
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.3.tgz#dfa0c92efe44a1d1a7974fb49ffeb40ef2da5a27"
-  integrity sha512-zVgvPwGK7c1aVdUVc9Qv7SqepOGRDrqCw7KZPSZziWGxSlbII3gmvGLPzLX4d0n0BMbamBacUrN22zOMyFFEkQ==
+"@emotion/weak-memoize@0.2.5":
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
+  integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
 
 "@types/events@*":
   version "3.0.0"
@@ -889,6 +910,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.20.tgz#da42fe93d6599f80b35ffeb5006f4c31f40d89ea"
   integrity sha512-JE0UpLWZTV1sGcaj0hN+Q0760OEjpgyFJ06DOMVW6qKBducKdJQaIw0TGL6ccj7VXRduIOHLWQi+tHwulZJHVQ==
 
+"@types/parse-json@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
+  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
+
 "@types/prop-types@*":
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.2.tgz#0e58ae66773d7fd7c372a493aff740878ec9ceaa"
@@ -1180,13 +1206,6 @@ are-we-there-yet@~1.1.2:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
 
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
@@ -1229,6 +1248,11 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
+asap@~2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
+
 asn1.js@^4.0.0:
   version "4.10.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
@@ -1288,15 +1312,15 @@ babel-plugin-dynamic-import-node@^2.3.0:
   dependencies:
     object.assign "^4.1.0"
 
-babel-plugin-emotion@^10.0.14:
-  version "10.0.17"
-  resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.0.17.tgz#5673fbed7b1ed61b4b98d5530f33c8a4d1b08484"
-  integrity sha512-KNuBadotqYWpQexHhHOu7M9EV1j2c+Oh/JJqBfEQDusD6mnORsCZKHkl+xYwK82CPQ/23wRrsBIEYnKjtbMQJw==
+babel-plugin-emotion@^10.0.27:
+  version "10.0.33"
+  resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.0.33.tgz#ce1155dcd1783bbb9286051efee53f4e2be63e03"
+  integrity sha512-bxZbTTGz0AJQDHm8k6Rf3RQJ8tX2scsfsRyKVgAbiUPUNIRtlK+7JxP+TAd1kRLABFxe0CFm2VdK4ePkoA9FxQ==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
-    "@emotion/hash" "0.7.2"
-    "@emotion/memoize" "0.7.2"
-    "@emotion/serialize" "^0.11.10"
+    "@emotion/hash" "0.8.0"
+    "@emotion/memoize" "0.7.4"
+    "@emotion/serialize" "^0.11.16"
     babel-plugin-macros "^2.0.0"
     babel-plugin-syntax-jsx "^6.18.0"
     convert-source-map "^1.5.0"
@@ -1305,13 +1329,13 @@ babel-plugin-emotion@^10.0.14:
     source-map "^0.5.7"
 
 babel-plugin-macros@^2.0.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.6.1.tgz#41f7ead616fc36f6a93180e89697f69f51671181"
-  integrity sha512-6W2nwiXme6j1n2erPOnmRiWfObUhWH7Qw1LMi9XZy8cj+KtESu3T6asZvtk5bMQQjX8te35o7CFueiSdL/2NmQ==
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138"
+  integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==
   dependencies:
-    "@babel/runtime" "^7.4.2"
-    cosmiconfig "^5.2.0"
-    resolve "^1.10.0"
+    "@babel/runtime" "^7.7.2"
+    cosmiconfig "^6.0.0"
+    resolve "^1.12.0"
 
 babel-plugin-syntax-jsx@^6.18.0:
   version "6.18.0"
@@ -1323,6 +1347,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
+base16@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/base16/-/base16-1.0.0.tgz#e297f60d7ec1014a7a971a39ebc8a98c0b681e70"
+  integrity sha1-4pf2DX7BAUp6lxo568ipjAtoHnA=
+
 base64-js@^1.0.2:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
@@ -1586,24 +1615,10 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
-caller-callsite@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
-  integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=
-  dependencies:
-    callsites "^2.0.0"
-
-caller-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
-  integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=
-  dependencies:
-    caller-callsite "^2.0.0"
-
-callsites@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
-  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
+callsites@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
 camelcase@^5.0.0, camelcase@^5.3.1:
   version "5.3.1"
@@ -1673,11 +1688,6 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-classnames@^2.2.5:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
-  integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==
-
 cliui@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
@@ -1810,13 +1820,20 @@ content-type@~1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-convert-source-map@^1.1.0, convert-source-map@^1.5.0:
+convert-source-map@^1.1.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
   integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
   dependencies:
     safe-buffer "~5.1.1"
 
+convert-source-map@^1.5.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
+  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
+  dependencies:
+    safe-buffer "~5.1.1"
+
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
@@ -1870,20 +1887,26 @@ core-js-compat@^3.1.1:
     browserslist "^4.6.6"
     semver "^6.3.0"
 
+core-js@^1.0.0:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
+  integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
+
 core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
-cosmiconfig@^5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
-  integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
+cosmiconfig@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"
+  integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==
   dependencies:
-    import-fresh "^2.0.0"
-    is-directory "^0.3.1"
-    js-yaml "^3.13.1"
-    parse-json "^4.0.0"
+    "@types/parse-json" "^4.0.0"
+    import-fresh "^3.1.0"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+    yaml "^1.7.2"
 
 create-ecdh@^4.0.0:
   version "4.0.3"
@@ -1967,11 +1990,21 @@ cssesc@^3.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-csstype@^2.2.0, csstype@^2.5.7:
+csstype@^2.2.0:
   version "2.6.6"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.6.tgz#c34f8226a94bbb10c32cc0d714afdf942291fc41"
   integrity sha512-RpFbQGUE74iyPgvr46U9t1xoQBM8T4BL8SxrN66Le2xYAPSaDJJKeztV3awugusb3g3G9iL8StmkBBXhcbbXhg==
 
+csstype@^2.5.7:
+  version "2.6.14"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.14.tgz#004822a4050345b55ad4dcc00be1d9cf2f4296de"
+  integrity sha512-2mSc+VEpGPblzAxyeR+vZhJKgYg0Og0nnRi7pmRXFYYxSfnOnW8A5wwQb4n4cE2nIOzqKOAzLCaEX6aBmNEv8A==
+
+csstype@^3.0.2:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.5.tgz#7fdec6a28a67ae18647c51668a9ff95bb2fa7bb8"
+  integrity sha512-uVDi8LpBUKQj6sdxNaTetL6FpeCqTjOvAQuQUa/qAqq8oOd4ivkbhgnqayl0dnPal8Tb/yB1tF+gOvCBiicaiQ==
+
 cyclist@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
@@ -2529,12 +2562,13 @@ dns-txt@^2.0.2:
   dependencies:
     buffer-indexof "^1.0.0"
 
-dom-helpers@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8"
-  integrity sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==
+dom-helpers@^5.0.1:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.0.tgz#57fd054c5f8f34c52a3eeffdb7e7e93cd357d95b"
+  integrity sha512-Ru5o9+V8CpunKnz5LGgWXkmrH/20cGKwcHwS4m73zIvs54CN9epEmT/HLqFJW3kXpakAFkEdzgy1hzlJe3E4OQ==
   dependencies:
-    "@babel/runtime" "^7.1.2"
+    "@babel/runtime" "^7.8.7"
+    csstype "^3.0.2"
 
 domain-browser@^1.1.1:
   version "1.2.0"
@@ -2594,6 +2628,13 @@ encodeurl@~1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
+encoding@^0.1.11:
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
+  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
+  dependencies:
+    iconv-lite "^0.6.2"
+
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
@@ -2642,11 +2683,6 @@ eslint-scope@^4.0.3:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-
 esrecurse@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
@@ -2826,6 +2862,26 @@ faye-websocket@~0.11.1:
   dependencies:
     websocket-driver ">=0.5.1"
 
+fbemitter@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/fbemitter/-/fbemitter-2.1.1.tgz#523e14fdaf5248805bb02f62efc33be703f51865"
+  integrity sha1-Uj4U/a9SSIBbsC9i78M75wP1GGU=
+  dependencies:
+    fbjs "^0.8.4"
+
+fbjs@^0.8.0, fbjs@^0.8.4:
+  version "0.8.17"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
+  integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=
+  dependencies:
+    core-js "^1.0.0"
+    isomorphic-fetch "^2.1.1"
+    loose-envify "^1.0.0"
+    object-assign "^4.1.0"
+    promise "^7.1.1"
+    setimmediate "^1.0.5"
+    ua-parser-js "^0.7.18"
+
 figgy-pudding@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
@@ -2893,6 +2949,14 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
+flux@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/flux/-/flux-3.1.3.tgz#d23bed515a79a22d933ab53ab4ada19d05b2f08a"
+  integrity sha1-0jvtUVp5oi2TOrU6tK2hnQWy8Io=
+  dependencies:
+    fbemitter "^2.0.0"
+    fbjs "^0.8.0"
+
 follow-redirects@^1.0.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.9.0.tgz#8d5bcdc65b7108fe1508649c79c12d732dcedb4f"
@@ -3163,7 +3227,7 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has@^1.0.1:
+has@^1.0.1, has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
   integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
@@ -3290,6 +3354,13 @@ iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.4:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
+iconv-lite@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"
+  integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
 icss-utils@^4.0.0, icss-utils@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467"
@@ -3324,13 +3395,13 @@ immer@^3.1.3:
   resolved "https://registry.yarnpkg.com/immer/-/immer-3.2.0.tgz#53686471e9dd2b070e0fb5500c6fdecd3a99375f"
   integrity sha512-+a2R8z9eELHst6aht++nzVzJ8LJ+Hsg49qttfg9Kc/vmoxEdPXw5/rV6+4DYWGgnq+B36KbLr4OTaGtS9mDjtg==
 
-import-fresh@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
-  integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY=
+import-fresh@^3.1.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz#fc129c160c5d68235507f4331a6baad186bdbc3e"
+  integrity sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==
   dependencies:
-    caller-path "^2.0.0"
-    resolve-from "^3.0.0"
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
 
 import-local@2.0.0, import-local@^2.0.0:
   version "2.0.0"
@@ -3469,6 +3540,13 @@ is-buffer@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
+is-core-module@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
+  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -3506,11 +3584,6 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
     is-data-descriptor "^1.0.0"
     kind-of "^6.0.2"
 
-is-directory@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
-  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
-
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -3594,7 +3667,7 @@ is-regex@^1.0.4:
   dependencies:
     has "^1.0.1"
 
-is-stream@^1.1.0:
+is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
@@ -3631,6 +3704,14 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
+isomorphic-fetch@^2.1.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
+  integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=
+  dependencies:
+    node-fetch "^1.0.1"
+    whatwg-fetch ">=0.10.0"
+
 js-levenshtein@^1.1.3:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
@@ -3641,14 +3722,6 @@ js-levenshtein@^1.1.3:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.13.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
@@ -3659,11 +3732,16 @@ jsesc@~0.5.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
-json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
+json-parse-better-errors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
+json-parse-even-better-errors@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
+
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -3731,6 +3809,11 @@ lcid@^2.0.0:
   dependencies:
     invert-kv "^2.0.0"
 
+lines-and-columns@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
+  integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
+
 loader-runner@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
@@ -3762,6 +3845,16 @@ locate-path@^3.0.0:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
+lodash.curry@^4.0.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lodash.curry/-/lodash.curry-4.1.1.tgz#248e36072ede906501d75966200a86dab8b23170"
+  integrity sha1-JI42By7ekGUB11lmIAqG2riyMXA=
+
+lodash.flow@^3.3.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.flow/-/lodash.flow-3.5.0.tgz#87bf40292b8cf83e4e8ce1a3ae4209e20071675a"
+  integrity sha1-h79AKSuM+D5OjOGjrkIJ4gBxZ1o=
+
 lodash@^2.4.1:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-2.4.2.tgz#fadd834b9683073da179b3eae6d9c0d15053f73e"
@@ -3772,11 +3865,16 @@ lodash@^3.10.0:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
   integrity sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=
 
-lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.4, lodash@^4.17.5:
+lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
+lodash@^4.17.13, lodash@^4.17.19:
+  version "4.17.20"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
+
 loglevel@^1.6.3:
   version "1.6.4"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.4.tgz#f408f4f006db8354d0577dcf6d33485b3cb90d56"
@@ -4097,6 +4195,14 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
+node-fetch@^1.0.1:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
+  integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==
+  dependencies:
+    encoding "^0.1.11"
+    is-stream "^1.0.1"
+
 node-forge@0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.8.2.tgz#b4bcc59fb12ce77a8825fc6a783dfe3182499c5a"
@@ -4387,6 +4493,13 @@ parallel-transform@^1.1.0:
     inherits "^2.0.3"
     readable-stream "^2.1.5"
 
+parent-module@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+  dependencies:
+    callsites "^3.0.0"
+
 parse-asn1@^5.0.0:
   version "5.1.4"
   resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.4.tgz#37f6628f823fbdeb2273b4d540434a22f3ef1fcc"
@@ -4399,13 +4512,15 @@ parse-asn1@^5.0.0:
     pbkdf2 "^3.0.3"
     safe-buffer "^5.1.1"
 
-parse-json@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
+parse-json@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646"
+  integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==
   dependencies:
+    "@babel/code-frame" "^7.0.0"
     error-ex "^1.3.1"
-    json-parse-better-errors "^1.0.1"
+    json-parse-even-better-errors "^2.3.0"
+    lines-and-columns "^1.1.6"
 
 parse-passwd@^1.0.0:
   version "1.0.0"
@@ -4469,6 +4584,11 @@ path-type@^3.0.0:
   dependencies:
     pify "^3.0.0"
 
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
 pbkdf2@^3.0.3:
   version "3.0.17"
   resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
@@ -4480,11 +4600,6 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-
 pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -4609,6 +4724,13 @@ promise-inflight@^1.0.1:
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
   integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
+promise@^7.1.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
+  dependencies:
+    asap "~2.0.3"
+
 prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
@@ -4683,6 +4805,11 @@ punycode@^2.1.0:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
+pure-color@^1.2.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/pure-color/-/pure-color-1.3.0.tgz#1fe064fb0ac851f0de61320a8bf796836422f33e"
+  integrity sha1-H+Bk+wrIUfDeYTIKi/eWg2Qi8z4=
+
 qs@6.7.0:
   version "6.7.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
@@ -4703,13 +4830,6 @@ querystringify@^2.1.1:
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
   integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
 
-raf@^3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
-  integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==
-  dependencies:
-    performance-now "^2.1.0"
-
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -4758,6 +4878,16 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
+react-base16-styling@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/react-base16-styling/-/react-base16-styling-0.6.0.tgz#ef2156d66cf4139695c8a167886cb69ea660792c"
+  integrity sha1-7yFW1mz0E5aVyKFniGy2nqZgeSw=
+  dependencies:
+    base16 "^1.0.0"
+    lodash.curry "^4.0.1"
+    lodash.flow "^3.3.0"
+    pure-color "^1.2.0"
+
 react-dom@^16.8.2:
   version "16.9.0"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.9.0.tgz#5e65527a5e26f22ae3701131bcccaee9fb0d3962"
@@ -4768,17 +4898,27 @@ react-dom@^16.8.2:
     prop-types "^15.6.2"
     scheduler "^0.15.0"
 
-react-input-autosize@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.2.1.tgz#ec428fa15b1592994fb5f9aa15bb1eb6baf420f8"
-  integrity sha512-3+K4CD13iE4lQQ2WlF8PuV5htfmTRLH6MDnfndHM6LuBRszuXnuyIfE7nhSKt8AzRBZ50bu0sAhkNMeS5pxQQA==
+react-input-autosize@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.2.2.tgz#fcaa7020568ec206bc04be36f4eb68e647c4d8c2"
+  integrity sha512-jQJgYCA3S0j+cuOwzuCd1OjmBmnZLdqQdiLKRYrsMMzbjUrVDS5RvJUDwJqA7sKuksDuzFtm6hZGKFu7Mjk5aw==
   dependencies:
     prop-types "^15.5.8"
 
 react-is@^16.8.1:
-  version "16.9.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.9.0.tgz#21ca9561399aad0ff1a7701c01683e8ca981edcb"
-  integrity sha512-tJBzzzIgnnRfEm046qRcURvwQnZVXmuCbscxUO5RWrGTXpon2d4c8mI0D8WE6ydVIm29JiLB6+RslkIvym9Rjw==
+  version "16.13.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
+  integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
+
+react-json-view@^1.19.1:
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/react-json-view/-/react-json-view-1.19.1.tgz#95d8e59e024f08a25e5dc8f076ae304eed97cf5c"
+  integrity sha512-u5e0XDLIs9Rj43vWkKvwL8G3JzvXSl6etuS5G42a8klMohZuYFQzSN6ri+/GiBptDqlrXPTdExJVU7x9rrlXhg==
+  dependencies:
+    flux "^3.1.3"
+    react-base16-styling "^0.6.0"
+    react-lifecycles-compat "^3.0.4"
+    react-textarea-autosize "^6.1.0"
 
 react-lifecycles-compat@^3.0.4:
   version "3.0.4"
@@ -4786,30 +4926,35 @@ react-lifecycles-compat@^3.0.4:
   integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
 
 react-select@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/react-select/-/react-select-3.0.4.tgz#16bde37c24fd4f6444914d4681e78f15ffbc86d3"
-  integrity sha512-fbVISKa/lSUlLsltuatfUiKcWCNvdLXxFFyrzVQCBUsjxJZH/m7UMPdw/ywmRixAmwXAP++MdbNNZypOsiDEfA==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/react-select/-/react-select-3.1.1.tgz#156a5b4a6c22b1e3d62a919cb1fd827adb4060bc"
+  integrity sha512-HjC6jT2BhUxbIbxMZWqVcDibrEpdUJCfGicN0MMV+BQyKtCaPTgFekKWiOizSCy4jdsLMGjLqcFGJMhVGWB0Dg==
   dependencies:
     "@babel/runtime" "^7.4.4"
     "@emotion/cache" "^10.0.9"
     "@emotion/core" "^10.0.9"
     "@emotion/css" "^10.0.9"
-    classnames "^2.2.5"
     memoize-one "^5.0.0"
     prop-types "^15.6.0"
-    raf "^3.4.0"
-    react-input-autosize "^2.2.1"
-    react-transition-group "^2.2.1"
+    react-input-autosize "^2.2.2"
+    react-transition-group "^4.3.0"
 
-react-transition-group@^2.2.1:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz#df9cdb025796211151a436c69a8f3b97b5b07c8d"
-  integrity sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==
+react-textarea-autosize@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-6.1.0.tgz#df91387f8a8f22020b77e3833c09829d706a09a5"
+  integrity sha512-F6bI1dgib6fSvG8so1HuArPUv+iVEfPliuLWusLF+gAKz0FbB4jLrWUrTAeq1afnPT2c9toEZYUdz/y1uKMy4A==
   dependencies:
-    dom-helpers "^3.4.0"
+    prop-types "^15.6.0"
+
+react-transition-group@^4.3.0:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz#63868f9325a38ea5ee9535d828327f85773345c9"
+  integrity sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    dom-helpers "^5.0.1"
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
-    react-lifecycles-compat "^3.0.4"
 
 react@^16.8.2:
   version "16.9.0"
@@ -4863,10 +5008,10 @@ regenerate@^1.4.0:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
   integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
 
-regenerator-runtime@^0.13.2:
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
-  integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==
+regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.4:
+  version "0.13.7"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
+  integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
 
 regenerator-transform@^0.14.0:
   version "0.14.1"
@@ -4974,12 +5119,25 @@ resolve-from@^3.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
   integrity sha1-six699nWiBvItuZTM17rywoYh0g=
 
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.10.0, resolve@^1.3.2, resolve@^1.8.1:
+resolve@^1.12.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
+  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
+  dependencies:
+    is-core-module "^2.1.0"
+    path-parse "^1.0.6"
+
+resolve@^1.3.2, resolve@^1.8.1:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"
   integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==
@@ -5045,7 +5203,7 @@ safe-types@^4.20.0:
   resolved "https://registry.yarnpkg.com/safe-types/-/safe-types-4.24.0.tgz#eb08ff73d42cae72becba303521fb45fc0c880da"
   integrity sha512-IfqLasbFdS5G28oO1kMfo4w0xBUCHEecPLu1CqerHgkZmMf1nugi6kZbY8o+1LOOma/88n3XRJJX9NOwa5hQzw==
 
-"safer-buffer@>= 2.1.2 < 3":
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -5173,7 +5331,7 @@ set-value@^2.0.0, set-value@^2.0.1:
     is-plain-object "^2.0.3"
     split-string "^3.0.1"
 
-setimmediate@^1.0.4:
+setimmediate@^1.0.4, setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
   integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
@@ -5337,11 +5495,6 @@ split-string@^3.0.1, split-string@^3.0.2:
   dependencies:
     extend-shallow "^3.0.0"
 
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
 ssri@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
@@ -5622,6 +5775,11 @@ typescript@^3.3.3333:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.6.2.tgz#105b0f1934119dde543ac8eb71af3a91009efe54"
   integrity sha512-lmQ4L+J6mnu3xweP8+rOrUwzmN+MRAj7TgtJtDaXE5PMyX2kCrklhg3rvOsOIfNeAWMQWO2F1GPc1kMD2vLAfw==
 
+ua-parser-js@^0.7.18:
+  version "0.7.22"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.22.tgz#960df60a5f911ea8f1c818f3747b99c6e177eae3"
+  integrity sha512-YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q==
+
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
@@ -5911,6 +6069,11 @@ websocket-extensions@>=0.1.1:
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
   integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
 
+whatwg-fetch@>=0.10.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz#605a2cd0a7146e5db141e29d1c62ab84c0c4c868"
+  integrity sha512-jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A==
+
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
@@ -5986,6 +6149,11 @@ yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
   integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
 
+yaml@^1.7.2:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
+  integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
+
 yargs-parser@^11.1.1:
   version "11.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"

From 5ad2a6ef20738de8cc7db64ddf496926c76e33c3 Mon Sep 17 00:00:00 2001
From: Cormac Relf <web@cormacrelf.net>
Date: Tue, 1 Dec 2020 23:18:57 +1100
Subject: [PATCH 11/22] Export WasmResult/*Errors to global always again

I remembered it was necessary in the browser/esm/node code as well.
At least now the TypeScript defines them as globals, so that mistake
is more obvious.
---
 crates/wasm/scripts/npm-pkg-config.sh |  2 +-
 crates/wasm/src/include.js            | 75 ---------------------------
 crates/wasm/src/js/include.js         | 14 +++++
 crates/wasm/src/js/nomod.js           | 12 -----
 crates/wasm/src/lib.rs                | 26 +++++-----
 crates/wasm/src/utils.rs              |  2 +-
 6 files changed, 30 insertions(+), 101 deletions(-)
 delete mode 100644 crates/wasm/src/include.js

diff --git a/crates/wasm/scripts/npm-pkg-config.sh b/crates/wasm/scripts/npm-pkg-config.sh
index ece6f1af..a5978390 100755
--- a/crates/wasm/scripts/npm-pkg-config.sh
+++ b/crates/wasm/scripts/npm-pkg-config.sh
@@ -129,7 +129,7 @@ EOF
 
 NOMOD_INCLUDE="$DEST/_no_modules/citeproc_rs_wasm_include.js"
 ZOTERO_INCLUDE="$DEST/_zotero/citeproc_rs_wasm_include.js"
-sed -e 's/export class/class/' < src/include.js \
+sed -e 's/export class/class/' < src/js/include.js \
   | tee "$ZOTERO_INCLUDE"  > "$NOMOD_INCLUDE" \
   || bail "could not write include.js for no-modules targets"
 cat src/js/nomod.js >> "$NOMOD_INCLUDE" || bail "failed writing $NOMOD_INCLUDE"
diff --git a/crates/wasm/src/include.js b/crates/wasm/src/include.js
deleted file mode 100644
index c4a0050a..00000000
--- a/crates/wasm/src/include.js
+++ /dev/null
@@ -1,75 +0,0 @@
-export class WasmResult {
-    constructor(value) {
-        if (value instanceof Error) {
-            this.Err = value;
-        } else {
-            this.Ok = value;
-        }
-    }
-    is_some() {
-        if (this.hasOwnProperty("Err")) {
-            return false;
-        }
-        return true;
-    }
-    is_none() {
-        return !this.is_some();
-    }
-    unwrap() {
-        if (this.hasOwnProperty("Err")) {
-            throw this.Err;
-        } else {
-            return this.Ok
-        }
-    }
-    unwrap_or(otherwise) {
-        if (this.hasOwnProperty("Err")) {
-            return otherwise;
-        } else {
-            return this.Ok;
-        }
-    }
-    map(func) {
-        if (this.hasOwnProperty("Err")) {
-            return this;
-        } else {
-            return new WasmResult(func(this.Ok));
-        }
-    }
-    map_or(otherwise, func) {
-        if (this.hasOwnProperty("Err")) {
-            return otherwise;
-        } else {
-            return func(this.Ok);
-        }
-    }
-}
-
-export class CiteprocRsError extends Error {
-    constructor(message) {
-        super(message);
-        this.name = "CiteprocRsError";
-    }
-}
-export class CiteprocRsDriverError extends CiteprocRsError {
-    constructor(message, data) {
-        super(message);
-        this.data = data;
-        this.name = "CiteprocRsDriverError";
-    }
-}
-export class CslStyleError extends CiteprocRsError {
-    constructor(message, data) {
-        super(message);
-        this.data = data;
-        this.name = "CslStyleError";
-    }
-}
-
-function doExport(onto) {
-    onto.WasmResult = WasmResult;
-    onto.CiteprocRsError = CiteprocRsError;
-    onto.CslStyleError = CslStyleError;
-    onto.CiteprocRsDriverError = CiteprocRsDriverError;
-}
-
diff --git a/crates/wasm/src/js/include.js b/crates/wasm/src/js/include.js
index c4a0050a..570ea77e 100644
--- a/crates/wasm/src/js/include.js
+++ b/crates/wasm/src/js/include.js
@@ -73,3 +73,17 @@ function doExport(onto) {
     onto.CiteprocRsDriverError = CiteprocRsDriverError;
 }
 
+// So there is no way to tell wasm-bindgen to re-export JS items.
+// So we have to export them onto a global, if possible, for consumers to use them eg with `instanceof`.
+// At the same time, the typescript declarations have to be in a `declare global { }` block.
+let env_global;
+if (typeof self !== "undefined") {
+    env_global = self;
+} else if (typeof global !== "undefined") {
+    env_global = global;
+} else if (typeof window !== "undefined") {
+    env_global = window;
+}
+if (typeof env_global !== "undefined") {
+    doExport(env_global)
+}
diff --git a/crates/wasm/src/js/nomod.js b/crates/wasm/src/js/nomod.js
index e6be7e84..ec7df6d4 100644
--- a/crates/wasm/src/js/nomod.js
+++ b/crates/wasm/src/js/nomod.js
@@ -7,18 +7,6 @@
 
 // doExport defined in include.js
 
-let env_global;
-if (typeof self !== "undefined") {
-    env_global = self;
-} else if (typeof global !== "undefined") {
-    env_global = global;
-} else if (typeof window !== "undefined") {
-    env_global = window;
-}
-if (typeof env_global !== "undefined") {
-    doExport(env_global)
-}
-
 // Then we do one little commonjs hack
 if (typeof module !== "undefined") {
     module.exports = {};
diff --git a/crates/wasm/src/lib.rs b/crates/wasm/src/lib.rs
index 89a53d0a..560cccfb 100644
--- a/crates/wasm/src/lib.rs
+++ b/crates/wasm/src/lib.rs
@@ -604,17 +604,19 @@ type DriverError = {
     tag: "ReorderingErrorNumericId"
 };
 
-/** Catch-all citeproc-rs Error subclass. */
-declare class CiteprocRsError extends Error {
-    constructor(message: string);
-}
-declare class CiteprocRsDriverError extends CiteprocRsError {
-    data: DriverError;
-    constructor(message: string, data: DriverError);
-}
-declare class CslStyleError extends CiteprocRsError {
-    data: StyleError;
-    constructor(message: string, data: StyleError);
+declare global {
+    /** Catch-all citeproc-rs Error subclass. */
+    declare class CiteprocRsError extends Error {
+        constructor(message: string);
+    }
+    declare class CiteprocRsDriverError extends CiteprocRsError {
+        data: DriverError;
+        constructor(message: string, data: DriverError);
+    }
+    declare class CslStyleError extends CiteprocRsError {
+        data: StyleError;
+        constructor(message: string, data: StyleError);
+    }
 }
 "#;
 
@@ -702,7 +704,7 @@ interface StyleMeta {
     class?: "in-text" | "note",
     cslVersionRequired: string,
     /** May be absent on a dependent style */
-    independent_meta?: IndependentMeta,
+    independentMeta?: IndependentMeta,
 };
 "#;
 
diff --git a/crates/wasm/src/utils.rs b/crates/wasm/src/utils.rs
index d0f5cfac..f6de2f19 100644
--- a/crates/wasm/src/utils.rs
+++ b/crates/wasm/src/utils.rs
@@ -72,7 +72,7 @@ macro_rules! js_import {
                     $($tt)*
                 }
             } else {
-                #[wasm_bindgen(module = "/src/include.js")]
+                #[wasm_bindgen(module = "/src/js/include.js")]
                 extern "C" {
                     $($tt)*
                 }

From 7c41ba2dd75ab6d6938913007e6c4006abb9b1d5 Mon Sep 17 00:00:00 2001
From: Cormac Relf <web@cormacrelf.net>
Date: Tue, 1 Dec 2020 23:19:50 +1100
Subject: [PATCH 12/22] Increase the wasm stack size to 8MB just because we can

Wasn't actually necessary to solve
https://github.com/cormacrelf/citeproc-rs/issues/78
But nevertheless.
---
 crates/wasm/.cargo/config | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/crates/wasm/.cargo/config b/crates/wasm/.cargo/config
index 5951e892..93f928b2 100644
--- a/crates/wasm/.cargo/config
+++ b/crates/wasm/.cargo/config
@@ -3,3 +3,9 @@ opt-level = "z" # otherwise the wasm binaries are too big to load quickly
 
 [profile.release]
 debug = 1
+
+# hardening for https://github.com/cormacrelf/citeproc-rs/issues/78
+[target.wasm32-unknown-unknown]
+rustflags = [
+  "-C", "link-args=-z stack-size=8388608", # 8 * 1048576 B = 8 MB
+]

From d733168fde39c0780294ceaf27e09a9ac699f33b Mon Sep 17 00:00:00 2001
From: Cormac Relf <web@cormacrelf.net>
Date: Wed, 2 Dec 2020 02:09:43 +1100
Subject: [PATCH 13/22] Make include.js' Node.js/_cjs output valid CommonJS

---
 crates/wasm/scripts/npm-pkg-config.sh               | 10 ++++++++--
 crates/wasm/src/js/{nomod.js => commonjs_export.js} |  0
 2 files changed, 8 insertions(+), 2 deletions(-)
 rename crates/wasm/src/js/{nomod.js => commonjs_export.js} (100%)

diff --git a/crates/wasm/scripts/npm-pkg-config.sh b/crates/wasm/scripts/npm-pkg-config.sh
index a5978390..431ea917 100755
--- a/crates/wasm/scripts/npm-pkg-config.sh
+++ b/crates/wasm/scripts/npm-pkg-config.sh
@@ -127,12 +127,18 @@ if (typeof Zotero !== "undefined" && typeof Zotero.CiteprocRs !== "undefined") {
 }
 EOF
 
+NODEJS_INCLUDE="$DEST/_cjs/citeproc_rs_wasm_include.js"
 NOMOD_INCLUDE="$DEST/_no_modules/citeproc_rs_wasm_include.js"
 ZOTERO_INCLUDE="$DEST/_zotero/citeproc_rs_wasm_include.js"
 sed -e 's/export class/class/' < src/js/include.js \
-  | tee "$ZOTERO_INCLUDE"  > "$NOMOD_INCLUDE" \
+  | tee "$ZOTERO_INCLUDE" \
+  | tee "$NODEJS_INCLUDE" \
+  > "$NOMOD_INCLUDE" \
   || bail "could not write include.js for no-modules targets"
-cat src/js/nomod.js >> "$NOMOD_INCLUDE" || bail "failed writing $NOMOD_INCLUDE"
+# We want the commonjs module.exports in both of these
+cat src/js/commonjs_export.js >> "$NOMOD_INCLUDE" || bail "failed writing $NOMOD_INCLUDE"
+cat src/js/commonjs_export.js >> "$NODEJS_INCLUDE" || bail "failed writing $NODEJS_INCLUDE"
+# zotero is weird
 cat src/js/zotero.js >> "$ZOTERO_INCLUDE" || bail "failed writing $ZOTERO_INCLUDE"
 
 cp README.md $DEST/ || bail "could not copy README"
diff --git a/crates/wasm/src/js/nomod.js b/crates/wasm/src/js/commonjs_export.js
similarity index 100%
rename from crates/wasm/src/js/nomod.js
rename to crates/wasm/src/js/commonjs_export.js

From 1608279fad3ad7384ae92478c4fe8102b6ed8c7b Mon Sep 17 00:00:00 2001
From: Cormac Relf <web@cormacrelf.net>
Date: Wed, 2 Dec 2020 02:10:16 +1100
Subject: [PATCH 14/22] Update test suite to use .unwrap(), test
 previewCitationCluster

---
 crates/wasm/js-tests/index.test.ts | 76 ++++++++++++++++++++++++------
 crates/wasm/js-tests/utils.ts      | 18 +++----
 2 files changed, 71 insertions(+), 23 deletions(-)

diff --git a/crates/wasm/js-tests/index.test.ts b/crates/wasm/js-tests/index.test.ts
index 8a8b4aac..6ff9f2e0 100644
--- a/crates/wasm/js-tests/index.test.ts
+++ b/crates/wasm/js-tests/index.test.ts
@@ -14,7 +14,7 @@ test('returns a single cluster, single cite, single ref', () => {
         driver.insertReference({ id: "citekey", type: "book", title: "TEST_TITLE" });
         driver.initClusters([{id: "one", cites: [{id: "citekey"}]}]);
         driver.setClusterOrder([{ id: "one" }]);
-        let res = driver.builtCluster("one");
+        let res = driver.builtCluster("one").unwrap();
         expect(res).toBe("TEST_TITLE");
     });
 });
@@ -22,10 +22,10 @@ test('returns a single cluster, single cite, single ref', () => {
 test('gets an update when ref changes', () => {
     withDriver({}, driver => {
         oneOneOne(driver);
-        let updates = driver.batchedUpdates();
+        let updates = driver.batchedUpdates().unwrap();
         expect(updates.clusters).toContainEqual(["one", "TEST_TITLE"]);
         driver.insertReference({ id: "citekey", type: "book", title: "TEST_TITLE_2" });
-        updates = driver.batchedUpdates();
+        updates = driver.batchedUpdates().unwrap();
         expect(updates.clusters).toContainEqual(["one", "TEST_TITLE_2"]);
     });
 });
@@ -42,7 +42,7 @@ let bibStyle = mkStyle(
 test('fullRender works', () => {
     withDriver({style: bibStyle}, driver => {
         oneOneOne(driver);
-        let full = driver.fullRender();
+        let full = driver.fullRender().unwrap();
         expect(full.allClusters).toHaveProperty("one", "TEST_TITLE");
         expect(full.bibEntries).toContainEqual({ id: "citekey", value: "TEST_TITLE" });
     })
@@ -53,45 +53,91 @@ test('update queue generally', () => {
         let once: UpdateSummary, twice: UpdateSummary;
 
         // Initially empty
-        checkUpdatesLen(driver.batchedUpdates(), 0, 0);
+        checkUpdatesLen(driver.batchedUpdates().unwrap(), 0, 0);
 
         // Add stuff, check it creates
         oneOneOne(driver);
-        checkUpdatesLen(driver.batchedUpdates(), 1, 1);
+        checkUpdatesLen(driver.batchedUpdates().unwrap(), 1, 1);
 
         // Now fullRender one should drain the queue.
         driver.fullRender();
-        checkUpdatesLen(driver.batchedUpdates(), 0, 0);
+        checkUpdatesLen(driver.batchedUpdates().unwrap(), 0, 0);
 
         // Edit a reference
         oneOneOne(driver, { title: "ALTERED" });
-        let up = driver.batchedUpdates();
+        let up = driver.batchedUpdates().unwrap();
         checkUpdatesLen(up, 1, 1);
         expect(up.bibliography?.entryIds).toEqual(null);
-        expect(driver.builtCluster("one")).toBe("ALTERED");
+        expect(driver.builtCluster("one").unwrap()).toBe("ALTERED");
 
         // Should have no updates, as we just called batchedUpdates.
-        once = driver.batchedUpdates(); twice = driver.batchedUpdates();
+        once = driver.batchedUpdates().unwrap(); twice = driver.batchedUpdates().unwrap();
         expect(once).toEqual(twice);
         expect(once.bibliography).toBeFalsy();
         checkUpdatesLen(once, 0, 0);
 
         // Only inserting a reference does nothing
         driver.insertReference({ id: "added", type: "book", title: "ADDED" });
-        once = driver.batchedUpdates(); twice = driver.batchedUpdates();
+        once = driver.batchedUpdates().unwrap(); twice = driver.batchedUpdates().unwrap();
         expect(once).toEqual(twice);
 
         // Only inserting a cluster not in the document does nothing
-        driver.insertCluster({ id: "123", cites: [{ id: "added" }] });
-        once = driver.batchedUpdates(); twice = driver.batchedUpdates();
+        driver.insertCluster({ id: "123", cites: [{ id: "added" }] }).unwrap();
+        once = driver.batchedUpdates().unwrap(); twice = driver.batchedUpdates().unwrap();
         expect(once).toEqual(twice); checkUpdatesLen(once, 0, 0);
 
         // Add it to the document, and it's a different story
-        driver.setClusterOrder([ {id:"one"},{id:"123"} ]);
-        once = driver.batchedUpdates(); twice = driver.batchedUpdates();
+        driver.setClusterOrder([ {id:"one"},{id:"123"} ]).unwrap();
+        once = driver.batchedUpdates().unwrap(); twice = driver.batchedUpdates().unwrap();
         expect(once).not.toEqual(twice); checkUpdatesLen(twice, 0, 0);
         expect(once.clusters).toContainEqual(["123", "ADDED"]);
         expect(once.bibliography?.entryIds).toEqual(["citekey", "added"]);
         expect(once.bibliography?.updatedEntries).toHaveProperty("added", "ADDED");
     })
+});
+
+let ibidStyle = mkStyle(
+    `
+    <choose>
+        <if position="ibid">
+            <text value="ibid" />
+        </if>
+        <else>
+            <text variable="title" />
+        </else>
+    </choose>
+    `,
+    ``,
+);
+
+// There are more extensive tests already in rust, so this is more of a smoke test.
+test("previewCitationCluster", () => {
+    withDriver({ style: ibidStyle }, driver => {
+        let one = "cluster-one";
+        let two = "cluster-two";
+        oneOneOne(driver, { title: "ONE", id: "r1" }, "cluster-one");
+        oneOneOne(driver, { title: "TWO", id: "r2" }, "cluster-two");
+        driver.setClusterOrder([{ id: one }, { id: two }]).unwrap();
+        // between the other two
+        let pcc = driver.previewCitationCluster(
+            [ { id: "r1" } ],
+            [{ id: one }, { }, { id: two }],
+            "plain"
+        ).unwrap();
+        expect(pcc).toEqual("ibid");
+        // replacing #1
+        pcc = driver.previewCitationCluster(
+            [ { id: "r1" } ],
+            [{ }, { id: two }],
+            "plain"
+        ).unwrap();
+        // replacing #1, with note numbers isntead
+        pcc = driver.previewCitationCluster(
+            [ { id: "r1" } ],
+            [{ note: 1, }, { id: two, note: 5 }],
+            "plain"
+        ).unwrap();
+        expect(pcc).toEqual("ONE");
+    })
 })
+
diff --git a/crates/wasm/js-tests/utils.ts b/crates/wasm/js-tests/utils.ts
index 4e9665b3..47776023 100644
--- a/crates/wasm/js-tests/utils.ts
+++ b/crates/wasm/js-tests/utils.ts
@@ -44,22 +44,24 @@ export const boringFetcher = new Fetcher(
 export const withDriver = (cfg: any, callback: (driver: Driver) => void) => {
     let style = cfg.style || mkStyle('<text variable="title" />');
     let fetcher = cfg.fetcher || boringFetcher;
-    let fmt = cfg.format || "plain";
-    let driver = Driver.new(style, fetcher, fmt);
+    let format = cfg.format || "plain";
+    let driver = Driver.new({ style, fetcher, format }).unwrap();
     callback(driver);
     driver.free();
 };
 
-export const oneOneOne = (driver: Driver, r?: any) => {
+export const oneOneOne = (driver: Driver, r?: any, cid?: string) => {
     let refr = {
         type: "book",
         title: "TEST_TITLE",
+        id: "citekey",
         ...r,
-        id: "citekey"
-    }
-    driver.insertReference(refr);
-    driver.insertCluster({id: "one", cites: [{id: "citekey"}]});
-    driver.setClusterOrder([{ id: "one" }]);
+    };
+    let id = refr.id;
+    cid = cid || "one";
+    driver.insertReference(refr).unwrap();
+    driver.insertCluster({id: cid, cites: [{ id }]}).unwrap();
+    driver.setClusterOrder([{ id: cid }]).unwrap();
 };
 
 export const checkUpdatesLen = (up: UpdateSummary, clusterCount: number, bibCount: number) => {

From b51a2222a840cdf4f953ed25fbc7a1683451949e Mon Sep 17 00:00:00 2001
From: Cormac Relf <web@cormacrelf.net>
Date: Wed, 2 Dec 2020 02:12:02 +1100
Subject: [PATCH 15/22] Fix WasmResult typescript mismatch, hide implementation
 detail from API

---
 crates/wasm/src/js/include.js | 40 +++++++++++++++++++----------------
 crates/wasm/src/lib.rs        |  5 +++--
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/crates/wasm/src/js/include.js b/crates/wasm/src/js/include.js
index 570ea77e..290f8a5f 100644
--- a/crates/wasm/src/js/include.js
+++ b/crates/wasm/src/js/include.js
@@ -6,41 +6,45 @@ export class WasmResult {
             this.Ok = value;
         }
     }
-    is_some() {
-        if (this.hasOwnProperty("Err")) {
-            return false;
-        }
-        return true;
+    is_err() {
+        return this.hasOwnProperty("Err");
     }
-    is_none() {
-        return !this.is_some();
+    is_ok() {
+        return !this.is_err();
     }
     unwrap() {
-        if (this.hasOwnProperty("Err")) {
+        if (this.is_ok()) {
+            return this.Ok;
+        } else {
             throw this.Err;
+        }
+    }
+    unwrap_err() {
+        if (this.is_ok()) {
+            throw new Error("Called unwrap_err on an Ok value");
         } else {
-            return this.Ok
+            return this.Err;
         }
     }
     unwrap_or(otherwise) {
-        if (this.hasOwnProperty("Err")) {
-            return otherwise;
-        } else {
+        if (this.is_ok()) {
             return this.Ok;
+        } else {
+            return otherwise;
         }
     }
     map(func) {
-        if (this.hasOwnProperty("Err")) {
-            return this;
-        } else {
+        if (this.is_ok()) {
             return new WasmResult(func(this.Ok));
+        } else {
+            return this;
         }
     }
     map_or(otherwise, func) {
-        if (this.hasOwnProperty("Err")) {
-            return otherwise;
-        } else {
+        if (this.is_ok()) {
             return func(this.Ok);
+        } else {
+            return otherwise;
         }
     }
 }
diff --git a/crates/wasm/src/lib.rs b/crates/wasm/src/lib.rs
index 560cccfb..c4705f98 100644
--- a/crates/wasm/src/lib.rs
+++ b/crates/wasm/src/lib.rs
@@ -640,9 +640,11 @@ js_import_class_constructor! {
 
 #[wasm_bindgen(typescript_custom_section)]
 const TS_APPEND_CONTENT_5: &'static str = r#"
-interface IWasmResult<T> {
+interface WasmResult<T> {
     /** If this is an error, throws the error. */
     unwrap(): T;
+    /** If this is an error, returns it, else throws. */
+    unwrap_err(): Error;
     is_ok(): boolean;
     is_err(): boolean;
     /** If this is an error, returns the default value. */
@@ -652,7 +654,6 @@ interface IWasmResult<T> {
     /** If this is Ok, returns f(ok_val), else returns the default value. */
     map_or<R>(default: R, f: (t: T) => R): R;
 }
-type WasmResult<T> = ({ Ok: T } | { Err: Error }) & IWasmResult<T>;
 "#;
 
 #[wasm_bindgen(typescript_custom_section)]

From 8958363f59be9ad4781f119e08620a4991ca6e3f Mon Sep 17 00:00:00 2001
From: Cormac Relf <web@cormacrelf.net>
Date: Wed, 2 Dec 2020 02:44:21 +1100
Subject: [PATCH 16/22] wasm docs: WasmResult, parseStyleMetadata, _include.js,
 Zotero

---
 crates/wasm/README.md                 | 249 +++++++++++++++++++++-----
 crates/wasm/js-demo/js/useDocument.ts |   8 +-
 crates/wasm/src/lib.rs                |   1 +
 3 files changed, 206 insertions(+), 52 deletions(-)

diff --git a/crates/wasm/README.md b/crates/wasm/README.md
index c7a9d16a..eca32f9f 100644
--- a/crates/wasm/README.md
+++ b/crates/wasm/README.md
@@ -46,6 +46,12 @@ import.
 const { Driver } = require("@citeproc-rs/wasm");
 ```
 
+##### Microsoft Edge
+
+Note the caveats in around Microsoft Edge's TextEncoder/TextDecoder support in 
+[the wasm-bindgen 
+tutorial](https://rustwasm.github.io/docs/wasm-bindgen/examples/hello-world.html).
+
 #### Using Webpack
 
 When loading on the web, for technical reasons and because the compiled 
@@ -72,16 +78,27 @@ the whole process very quick.
 You can use the regular-import Driver as a TypeScript type anywhere, just don't 
 use it to call `.new()`.
 
-Note the caveats in around Microsoft Edge's TextEncoder/TextDecoder support in 
-[the wasm-bindgen 
-tutorial](https://rustwasm.github.io/docs/wasm-bindgen/examples/hello-world.html).
+##### React
+
+If you're writing a React app, you may wish to use `React.lazy` like so:
 
 ```typescript
+// App.tsx
+import React, { Suspense } from "react";
+const AsyncCiteprocEnabledComponent = React.lazy(async () => {
+    await import("@citeproc-rs/wasm");
+    return await import("./CiteprocEnabledComponent");
+});
+const App = () => (
+    <Suspense
+        fallback={<div>Loading citation formatting engine...</div>}>
+        <AsyncCiteprocEnabledComponent />
+    </Suspense>
+);
+
+// CiteprocEnabledComponent
 import { Driver } from "@citeproc-rs/wasm";
-
-function doSomethingWithDriver(driver: Driver) {
-    // ...
-}
+// ...
 ```
 
 #### Importing it in a script tag (`web` target)
@@ -104,13 +121,20 @@ modules support, the procedure is different. You must:
 </script>
 ```
 
+**Careful**: This method does not ensure the package is loaded only once. If 
+you call init again, it will invalidate any previous Drivers you created.
+
 #### Importing it in a script tag (`no-modules` target)
 
-This replicates the [wasm-bindgen guide 
+This is *based on* the [wasm-bindgen guide 
 entry](https://rustwasm.github.io/docs/wasm-bindgen/examples/without-a-bundler.html?highlight=no-modules#using-the-older---target-no-modules), 
 noting the caveats. You will, similarly to the `web` target, need to make the 
 contents of the `_no_modules` subdirectory of the published NPM package 
-available on a webserver or via a CDN.
+available on a webserver or via a CDN. But it has **ONE ADDITIONAL FILE** to 
+import via a script tag.
+
+**Careful**: This method does not ensure the package is loaded only once. If 
+you call init again, it will invalidate any previous Drivers you created.
 
 ```
 <html>
@@ -118,7 +142,8 @@ available on a webserver or via a CDN.
     <meta content="text/html;charset=utf-8" http-equiv="Content-Type"/>
   </head>
   <body>
-    <!-- Include the JS generated by `wasm-pack build` -->
+    <!-- Include these TWO JS files -->
+    <script src='path/to/@citeproc-rs/wasm/_no_modules/citeproc_rs_wasm_include.js'></script>
     <script src='path/to/@citeproc-rs/wasm/_no_modules/citeproc_rs_wasm.js'></script>
 
     <script>
@@ -147,6 +172,46 @@ available on a webserver or via a CDN.
 </html>
 ```
 
+#### Usage in Zotero
+
+There is a special build for Zotero and the legacy Firefox ESR extensions API, 
+which wants a CommonJS module format but without the Node.js `fs` APIs, and 
+`no-modules`' loading mechanisms but without the use of `window` as a global as 
+it doesn't exist. The files are in the `_zotero` directory of the NPM package. 
+Usage is essentially the same as no-modules; you'll need all three files:
+
+* `@citeproc-rs/wasm/_zotero/citeproc_rs_wasm_include.js`
+* `@citeproc-rs/wasm/_zotero/citeproc_rs_wasm.js`
+* `@citeproc-rs/wasm/_zotero/citeproc_rs_wasm_bg.wasm`
+
+Apart from the CommonJS shims, the main difference is that the API will be 
+loaded onto the `Zotero.CiteprocRs` object, in order for it all to be linked 
+together.
+
+**Careful**: This method does not ensure the package is loaded only once. If 
+you call `initWasmModule` again, it will invalidate any previous Drivers you 
+created.
+
+
+```javascript
+require("citeproc_rs_wasm_include");
+const initWasmModule = require("citeproc_rs_wasm");
+const wasmBinaryPromise = Zotero.HTTP
+    .request('GET',
+             'resource://zotero/citeproc_rs_wasm_bg.wasm',
+             { responseType: "arraybuffer" })
+    .then(xhr => xhr.response);
+await initWasmModule(wasmBinaryPromise);
+
+let driver;
+try {
+    driver = Zotero.CiteprocRs.Driver.new({...}).unwrap();
+} catch (e) {
+    if (e instanceof Zotero.CiteprocRs.CslStyleError) {
+        // ...
+    }
+}
+```
 
 ## Usage
 
@@ -169,6 +234,39 @@ number of edits between each call.
 
 The API also allows for non-interactive use. See below.
 
+### Error handling
+
+To avoid [this issue][1963], almost every API wraps its return value in a 
+JavaScript object that contains either a successful result or an error, which 
+is a JavaScript Error object. This is called `WasmResult`, and it is modelled 
+on the Rust [`Result` type][rust-result]. If you just want your errors thrown, 
+simply tack `.unwrap()` onto nearly every API call. If you want to handle them 
+manually, you can, and this is mainly useful for showing style parse or 
+validation errors. Some error types have structured data attached to them.
+
+```typescript
+let result = Driver.new({ ... });
+if (result.is_err()) {
+    let error = result.unwrap_err();
+    if (error instanceof CslStyleError) {
+        console.warn("Could not parse CSL, error:", error);
+        // You can also
+        // throw error;
+    }
+} else {
+    let driver = result.unwrap();
+}
+// ...
+driver.free(); // No unwrap.
+```
+
+The error types must unfortunately be global exports, on window/global/self.
+
+In this document, `.unwrap()` used after an example means it returns a 
+WasmResult.
+
+[1963]: https://github.com/rustwasm/wasm-bindgen/issues/1963
+[rust-result]: https://doc.rust-lang.org/stable/std/result/enum.Result.html
 
 ### 1. Creating a driver instance
 
@@ -177,20 +275,29 @@ Driver when you are finished with it to deallocate its memory, but [there is a T
 proposal](https://rustwasm.github.io/docs/wasm-bindgen/reference/weak-references.html) 
 in the implementation phase that will make this unnecessary.
 
-A driver needs an XML style string, a fetcher (below), and an output format 
-(one of `"html"`, `"rtf"` or `"plain"`).
+A driver needs at least an XML style string, a fetcher (below), and an output 
+format (one of `"html"`, `"rtf"` or `"plain"`).
 
 ```javascript
-let driver = Driver.new(cslStyleTextAsXML, fetcher, "html");
+let fetcher =  ...;
+let driverResult = Driver.new({
+    style: "<style version=\"1.0\" class=\"note\" ... > ... </style>",
+    format: "html", // optional, html is the default
+    localeOverride: "de-DE", // optional, like setting default-locale on the style
+    fetcher,
+});
+// Throw any errors, get the inner Driver
+let driver = driverResult.unwrap();
+// Fetch the chain of locale files required to use the specified locale
+await driver.fetchAll();
 // ... use the driver ...
 driver.free()
 ```
 
 The library parses and validates the CSL style input. Any validation errors are 
-reported, with line/column positions, the text at that location, a descriptive 
-and useful message (only in English at the moment) and sometimes even a hint 
-for how to fix it. This is thrown as an error, which you can catch in a `try {} 
-catch (e) {}` block.
+reported, with byte offsets to find the CSL fragment responsible, a descriptive 
+and useful message (in English) and sometimes even a hint for how to fix it. 
+See [Error Handling](#error-handling) for how to access this.
 
 #### Fetcher
 
@@ -202,7 +309,7 @@ to it than this:
 ```javascript
 class Fetcher {
     async fetchLocale(lang) {
-        return fetch("https://some-cdn-with-locales.com/locales-${lang}.xml")
+        return await fetch("https://some-cdn-with-locales.com/locales-${lang}.xml")
             .then(res => res.text());
 
         // or just
@@ -214,15 +321,18 @@ class Fetcher {
     }
 }
 
-let fetcher = new Fetcher(); // Pass to Driver.new()
+let fetcher = new Fetcher();
+let driver = Driver.new({ ..., fetcher }).unwrap();
+await driver.fetchAll();
 ```
 
 Unless you don't have `async` syntax, in which case, return a `Promise` 
 directly, e.g. `return Promise.resolve("<locale> ... </locale>")`.
 
-### 2. Edit the references or the citation clusters
 
 
+### 2. Edit the references or the citation clusters
+
 #### References
 
 You can insert a reference like so. This is a [CSL-JSON][schema] object.
@@ -230,19 +340,10 @@ You can insert a reference like so. This is a [CSL-JSON][schema] object.
 [schema]: https://github.com/citation-style-language/schema
 
 ```javascript
-driver.insertReference({ id: "citekey", type: "book", title: "Title" });
-driver.insertReferences([ ... many references ... ]);
-driver.resetReferences([ ... deletes any others ... ]);
-driver.removeReference("citekey");
-```
-
-When you do insert a reference, it may have locale information in it. This 
-should be done after updating the references, so any new locales can be 
-fetched.
-
-```javascript
-// May call your Fetcher instance.
-await driver.fetchAll();
+driver.insertReference({ id: "citekey", type: "book", title: "Title" }).unwrap();
+driver.insertReferences([ ... many references ... ]).unwrap();
+driver.resetReferences([ ... deletes any others ... ]).unwrap();
+driver.removeReference("citekey").unwrap();
 ```
 
 #### Citation Clusters and their Cites
@@ -255,12 +356,12 @@ cluster has an `id`, which is any old string.
 driver.initClusters([
     { id: "one", cites: [ {id: "citekey"} ] },
     { id: "two", cites: [ {id: "citekey", locator: "56", label: "page" } ] },
-]);
+]).unwrap();
 // Update or insert any one of them like so
-driver.insertCluster({ id: "one", cites: [ { id: "updated_citekey" } ] });
+driver.insertCluster({ id: "one", cites: [ { id: "updated_citekey" } ] }).unwrap();
 // (You can use `driver.randomClusterId()` to generate a new one at random.)
 let three = driver.randomClusterId();
-driver.insertCluster({ id: three, cites: [ { id: "new_cluster_here" } ] });
+driver.insertCluster({ id: three, cites: [ { id: "new_cluster_here" } ] }).unwrap();
 ```
 
 These clusters do not contain position information, so reordering is a separate 
@@ -274,7 +375,7 @@ note numbers, which means there were non-citing footnotes in between. Omitting
 can have more than one cluster in the same footnote.
 
 ```javascript
-driver.setClusterOrder([ { id: "one", note: 1 }, { id: "two", note: 4 } ]);
+driver.setClusterOrder([ { id: "one", note: 1 }, { id: "two", note: 4 } ]).unwrap();
 ```
 
 You will notice that if an interactive user cuts and pastes a paragraph 
@@ -289,9 +390,9 @@ Sometimes a user wishes to include references in the bibliography even though
 they are not mentioned in a citation anywhere in the document.
 
 ```javascript
-driver.includeUncited("None"); // Default
-driver.includeUncited("All");
-driver.includeUncited({ Specific: ["citekeyA", "citekeyB"] });
+driver.includeUncited("None").unwrap(); // Default
+driver.includeUncited("All").unwrap();
+driver.includeUncited({ Specific: ["citekeyA", "citekeyB"] }).unwrap();
 ```
 
 The "All" is based on which references your driver knows about. If you have
@@ -309,9 +410,12 @@ that have changed, and bibliography entries that have changed.
 
 ```javascript
 // Get the diff since last time batchedUpdates, fullRender or drain was called.
-let diff = driver.batchedUpdates();
+let diff = driver.batchedUpdates().unwrap();
 
 // apply cluster changes to the UI.
+
+// ("myDocument" is an imaginary API.)
+
 for (let changedCluster of diff.clusters) {
     let [id, html] = changedCluster;
     myDocument.updateCluster(id, html);
@@ -345,10 +449,10 @@ producing a bibliography statically.
 ```javascript
 // returns BibliographyMeta, with information about how a library consumer should
 // lay out the bibliography. There is a similar API in citeproc-js.
-let meta = driver.bibliographyMeta();
+let meta = driver.bibliographyMeta().unwrap();
 
 // This is an array of BibEntry
-let bibliography = driver.makeBibliography();
+let bibliography = driver.makeBibliography().unwrap();
 for (let entry of bibliography) {
     console.log(entry.id, entry.value);
 }
@@ -362,7 +466,7 @@ it, before confirming the change.
 ```javascript
 let cites = [ { id: "citekey", locator: "45" }, { ... } ];
 let positions = [ ... before, { note: 34 }, ... after ];
-let preview = driver.previewCitationCluster(cites, positions, "html");
+let preview = driver.previewCitationCluster(cites, positions, "html").unwrap();
 ```
 
 The positions array is exactly like a call to `setClusterOrder`, except exactly 
@@ -394,14 +498,14 @@ let allNotes = myDocument.footnotes.map(fn => {
 
 // Re-hydrate the entire document based on the reference library and your
 // document's clusters
-driver.resetReferences(myDocument.allReferences);
-driver.initClusters(allNotes.map(fn => fn.cluster));
-driver.setClusterOrder(allNotes.map(fn => { id: fn.cluster.id, note: fn.number }));
+driver.resetReferences(myDocument.allReferences).unwrap();
+driver.initClusters(allNotes.map(fn => fn.cluster)).unwrap();
+driver.setClusterOrder(allNotes.map(fn => { id: fn.cluster.id, note: fn.number })).unwrap();
 
 // Render every cluster and bibliography item.
 // It then drains the update queue, leaving the diff empty for the next edit.
 // see the FullRender typescript type
-let render = driver.fullRender();
+let render = driver.fullRender().unwrap();
 
 // Write out the rendered clusters into the doc
 for (let fn of allNotes) {
@@ -418,3 +522,52 @@ for (let bibEntry of render.bibEntries) {
 updateUserInterface(allNotes, myDocument, whatever);
 ```
 
+### `parseStyleMetadata`
+
+Sometimes you want information about a CSL style without actually booting up a
+whole driver. One important use case is a dependent style, which can't be used
+with `Driver.new()` because it doesn't have the ability to render citations on
+its own, and is essentially just a container for three pieces of information:
+
+- A journal name
+- An independent parent style
+- A possible default-locale override
+
+`@citeproc-rs/wasm` provides an API for finding out what's in a CSL style file.
+
+```typescript
+let result = parseStyleMetadata("<style ...> ... </style>").unwrap();
+```
+
+The result could be a `CslStyleError`, but this is less likely than with
+Driver.new() as it will not actually attempt to parse and validate all the
+parts of a style.
+
+Here's how to use `parseStyleMetadata` to parse and use a dependent style.
+
+```typescript
+let dependentStyle = "<style ...> ... </style>";
+let meta = parseStyleMetadata(dependentStyle).unwrap();
+let isDependent = meta.info.parent != null;
+let parentStyleId = isDependent && meta.info.parent.href;
+let localeOverride = meta.defaultLocale;
+
+// ...
+let parentStyle = await downloadStyleWithId(parentStyleId);
+let driver = Driver.new({
+    style: parentStyle,
+    localeOverride,
+    ...
+}).unwrap();
+await driver.fetchAll();
+
+// Here you might also want to know if the style can render a bibliography or not
+let parentMeta = parseStyleMetadata(parentStyle).unwrap();
+if (parentMeta.independentMeta.hasBibliography) {
+    let bib = driver.makeBibliography().unwrap();
+    // ...
+}
+
+// ...
+driver.free();
+```
diff --git a/crates/wasm/js-demo/js/useDocument.ts b/crates/wasm/js-demo/js/useDocument.ts
index a279211d..1c4c6ed3 100644
--- a/crates/wasm/js-demo/js/useDocument.ts
+++ b/crates/wasm/js-demo/js/useDocument.ts
@@ -49,6 +49,8 @@ export const useDocument = (initialStyle: string, initialReferences: Reference[]
         const { Driver: CreateDriver } = await import('../../pkg');
         let d: Result<Driver, any> = Result.from(() => {
             try {
+                let meta = parseStyleMetadata(style).unwrap();
+                setMetadata(Some(meta));
                 let driver = CreateDriver.new({
                     style,
                     fetcher,
@@ -57,8 +59,6 @@ export const useDocument = (initialStyle: string, initialReferences: Reference[]
                 });
                 let d = driver.unwrap();
                 d.resetReferences(references).unwrap();
-                let meta = parseStyleMetadata(style).unwrap();
-                setMetadata(Some(meta));
                 return d;
             } catch(e) {
                 console.error("caught in createDriver: ", e);
@@ -80,10 +80,10 @@ export const useDocument = (initialStyle: string, initialReferences: Reference[]
                 let meta = parseStyleMetadata(style).unwrap();
                 if (meta.info.parent != null) {
                     console.log("this is a dependent style!");
+                    console.log(meta);
                 }
-                console.log(meta);
-                d.setStyle(style).unwrap();
                 setMetadata(Some(meta));
+                d.setStyle(style).unwrap();
                 setError(None());
             } catch (e) {
                 console.error(e);
diff --git a/crates/wasm/src/lib.rs b/crates/wasm/src/lib.rs
index c4705f98..285a1bf3 100644
--- a/crates/wasm/src/lib.rs
+++ b/crates/wasm/src/lib.rs
@@ -28,6 +28,7 @@ use citeproc::prelude::*;
 use citeproc::string_id;
 use csl::{Lang, StyleMeta};
 
+/// Parses a CSL style, either independent or dependent, and returns its metadata.
 #[wasm_bindgen(js_name = "parseStyleMetadata")]
 pub fn parse_style_metadata(style: &str) -> StyleMetaResult {
     typescript_serde_result(|| {

From c6e7549196b5158ad8a264fb093852bdea552c88 Mon Sep 17 00:00:00 2001
From: Cormac Relf <web@cormacrelf.net>
Date: Fri, 4 Dec 2020 00:59:38 +1100
Subject: [PATCH 17/22] rename bibliography_nosort/Nosort to no_sort/NoSort

---
 crates/citeproc/src/processor.rs |  6 +++---
 crates/proc/src/db.rs            |  4 ++--
 crates/proc/src/sort.rs          |  2 +-
 crates/test-utils/src/lib.rs     | 12 ++++++------
 crates/test-utils/src/yaml.rs    |  4 ++--
 crates/wasm/README.md            |  1 +
 crates/wasm/src/lib.rs           |  4 ++--
 crates/wasm/src/options.rs       |  7 +++----
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/crates/citeproc/src/processor.rs b/crates/citeproc/src/processor.rs
index b340bb72..8499e8ab 100644
--- a/crates/citeproc/src/processor.rs
+++ b/crates/citeproc/src/processor.rs
@@ -140,7 +140,7 @@ pub struct InitOptions<'a> {
     pub test_mode: bool,
 
     /// Disables sorting on the bibliography
-    pub bibliography_nosort: bool,
+    pub bibliography_no_sort: bool,
 
     #[doc(hidden)]
     pub use_default_default: (),
@@ -174,7 +174,7 @@ impl Processor {
             fetcher,
             format,
             test_mode,
-            bibliography_nosort,
+            bibliography_no_sort,
             use_default_default: _,
         } = options;
 
@@ -190,7 +190,7 @@ impl Processor {
         )?;
         db.set_style_with_durability(Arc::new(style), Durability::HIGH);
         db.set_default_lang_override_with_durability(locale_override, Durability::HIGH);
-        db.set_bibliography_nosort_with_durability(bibliography_nosort, Durability::HIGH);
+        db.set_bibliography_no_sort_with_durability(bibliography_no_sort, Durability::HIGH);
         Ok(db)
     }
 
diff --git a/crates/proc/src/db.rs b/crates/proc/src/db.rs
index b95b39eb..8f6131af 100644
--- a/crates/proc/src/db.rs
+++ b/crates/proc/src/db.rs
@@ -113,14 +113,14 @@ pub trait IrDatabase:
     #[salsa::invoke(crate::sort::sorted_refs)]
     fn sorted_refs(&self) -> Arc<(Vec<Atom>, FnvHashMap<Atom, BibNumber>)>;
     #[salsa::input]
-    fn bibliography_nosort(&self) -> bool;
+    fn bibliography_no_sort(&self) -> bool;
 
     #[salsa::invoke(crate::sort::bib_number)]
     fn bib_number(&self, id: CiteId) -> Option<BibNumber>;
 }
 
 pub fn safe_default(db: &mut dyn IrDatabase) {
-    db.set_bibliography_nosort_with_durability(false, salsa::Durability::HIGH);
+    db.set_bibliography_no_sort_with_durability(false, salsa::Durability::HIGH);
 }
 
 fn all_person_names(db: &dyn IrDatabase) -> Arc<Vec<DisambNameData>> {
diff --git a/crates/proc/src/sort.rs b/crates/proc/src/sort.rs
index 43b74d99..781eaa20 100644
--- a/crates/proc/src/sort.rs
+++ b/crates/proc/src/sort.rs
@@ -110,7 +110,7 @@ pub fn sorted_refs(db: &dyn IrDatabase) -> Arc<(Vec<Atom>, FnvHashMap<Atom, BibN
 
     let max_cnum = preordered.len() as u32;
     let mut reverse = false;
-    let now_sorted = if db.bibliography_nosort() {
+    let now_sorted = if db.bibliography_no_sort() {
         preordered
     } else if let Some(ref sort) = bib {
         preordered.sort_by_cached_key(|a| {
diff --git a/crates/test-utils/src/lib.rs b/crates/test-utils/src/lib.rs
index a9f1f818..b1c948f5 100644
--- a/crates/test-utils/src/lib.rs
+++ b/crates/test-utils/src/lib.rs
@@ -64,7 +64,7 @@ impl Default for Format {
 pub struct TestCase {
     pub mode: Mode,
     pub format: Format,
-    pub bibliography_nosort: bool,
+    pub bibliography_no_sort: bool,
     pub csl: String,
     pub input: Vec<Reference>,
     pub result: String,
@@ -82,7 +82,7 @@ impl Clone for TestCase {
                 fetcher: Some(fet),
                 format: self.format.0,
                 test_mode: true,
-                bibliography_nosort: self.bibliography_nosort,
+                bibliography_no_sort: self.bibliography_no_sort,
                 ..Default::default()
             })
             .expect("could not construct processor")
@@ -93,7 +93,7 @@ impl Clone for TestCase {
             processor,
             mode: self.mode.clone(),
             format: self.format.clone(),
-            bibliography_nosort: self.bibliography_nosort,
+            bibliography_no_sort: self.bibliography_no_sort,
             csl: self.csl.clone(),
             input: self.input.clone(),
             result: self.result.clone(),
@@ -107,7 +107,7 @@ impl TestCase {
     pub fn new(
         mode: Mode,
         format: Format,
-        bibliography_nosort: bool,
+        bibliography_no_sort: bool,
         csl: String,
         input: Vec<Reference>,
         result: String,
@@ -121,7 +121,7 @@ impl TestCase {
                 fetcher: Some(fet),
                 format: format.0,
                 test_mode: true,
-                bibliography_nosort,
+                bibliography_no_sort,
                 ..Default::default()
             })
             .expect("could not construct processor")
@@ -140,7 +140,7 @@ impl TestCase {
         TestCase {
             mode,
             format,
-            bibliography_nosort,
+            bibliography_no_sort,
             csl,
             input,
             result,
diff --git a/crates/test-utils/src/yaml.rs b/crates/test-utils/src/yaml.rs
index b1eed921..8db7593d 100644
--- a/crates/test-utils/src/yaml.rs
+++ b/crates/test-utils/src/yaml.rs
@@ -26,7 +26,7 @@ pub struct YamlTestCase {
     pub clusters: Option<Vec<CitationItem>>,
     pub process_citation_clusters: Option<Vec<CiteprocJsInstruction>>,
     #[serde(default)]
-    pub bibliography_nosort: bool,
+    pub bibliography_no_sort: bool,
 }
 
 impl From<YamlTestCase> for TestCase {
@@ -34,7 +34,7 @@ impl From<YamlTestCase> for TestCase {
         TestCase::new(
             yaml.mode,
             yaml.format,
-            yaml.bibliography_nosort,
+            yaml.bibliography_no_sort,
             yaml.csl,
             yaml.input,
             crate::normalise_html(&yaml.result),
diff --git a/crates/wasm/README.md b/crates/wasm/README.md
index eca32f9f..9a985827 100644
--- a/crates/wasm/README.md
+++ b/crates/wasm/README.md
@@ -284,6 +284,7 @@ let driverResult = Driver.new({
     style: "<style version=\"1.0\" class=\"note\" ... > ... </style>",
     format: "html", // optional, html is the default
     localeOverride: "de-DE", // optional, like setting default-locale on the style
+    // bibliographyNoSort: true // disables sorting on the bibliography
     fetcher,
 });
 // Throw any errors, get the inner Driver
diff --git a/crates/wasm/src/lib.rs b/crates/wasm/src/lib.rs
index 285a1bf3..278ba774 100644
--- a/crates/wasm/src/lib.rs
+++ b/crates/wasm/src/lib.rs
@@ -88,7 +88,7 @@ impl Driver {
                 style: options.style.as_ref(),
                 fetcher: Some(us_fetcher),
                 format: options.format,
-                bibliography_nosort: options.bibliography_nosort,
+                bibliography_no_sort: options.bibliography_no_sort,
                 locale_override: options.locale_override,
                 test_mode: false,
                 ..Default::default()
@@ -452,7 +452,7 @@ interface InitOptions {
     localeOverride?: string,
 
     /** Disables sorting in the bibliography; items appear in cited order. */
-    bibliographyNosort?: bool,
+    bibliographyNoSort?: bool,
 }
 
 /** This interface lets citeproc retrieve locales or modules asynchronously,
diff --git a/crates/wasm/src/options.rs b/crates/wasm/src/options.rs
index c58b16ec..61ec9a16 100644
--- a/crates/wasm/src/options.rs
+++ b/crates/wasm/src/options.rs
@@ -1,9 +1,8 @@
-use serde::{Deserialize, de::{Deserializer as _, MapAccess, IgnoredAny}};
-use serde::de::Visitor;
+use serde::Deserialize;
 use wasm_bindgen::prelude::*;
 use citeproc::prelude::*;
 use csl::Lang;
-use crate::{Fetcher, DriverError};
+use crate::Fetcher;
 
 #[derive(Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -20,7 +19,7 @@ pub struct WasmInitOptions {
     pub locale_override: Option<Lang>,
     /// Disables sorting on the bibliography
     #[serde(default)]
-    pub bibliography_nosort: bool,
+    pub bibliography_no_sort: bool,
 }
 
 

From 5ac6a14a013463e13505328092d966b6781e005b Mon Sep 17 00:00:00 2001
From: Cormac Relf <web@cormacrelf.net>
Date: Fri, 4 Dec 2020 01:07:19 +1100
Subject: [PATCH 18/22] Rename fetchAll -> fetchLocales (and document it
 better)

---
 crates/wasm/README.md                 | 21 ++++++++++++---------
 crates/wasm/index.html                |  2 +-
 crates/wasm/js-demo/js/useDocument.ts | 10 +++++-----
 crates/wasm/node-tryout/index.js      |  2 +-
 crates/wasm/src/lib.rs                |  6 +++---
 5 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/crates/wasm/README.md b/crates/wasm/README.md
index 9a985827..c87f6c4a 100644
--- a/crates/wasm/README.md
+++ b/crates/wasm/README.md
@@ -279,7 +279,7 @@ A driver needs at least an XML style string, a fetcher (below), and an output
 format (one of `"html"`, `"rtf"` or `"plain"`).
 
 ```javascript
-let fetcher =  ...;
+let fetcher =  ...; // see below
 let driverResult = Driver.new({
     style: "<style version=\"1.0\" class=\"note\" ... > ... </style>",
     format: "html", // optional, html is the default
@@ -290,7 +290,7 @@ let driverResult = Driver.new({
 // Throw any errors, get the inner Driver
 let driver = driverResult.unwrap();
 // Fetch the chain of locale files required to use the specified locale
-await driver.fetchAll();
+await driver.fetchLocales();
 // ... use the driver ...
 driver.free()
 ```
@@ -302,10 +302,10 @@ See [Error Handling](#error-handling) for how to access this.
 
 #### Fetcher
 
-There are hundreds of locales, and the locales you need change depending on the 
-references that are active in your document, so the procedure for retrieving 
-one is asynchronous to allow for fetching one over HTTP. There's not much more 
-to it than this:
+There are hundreds of locales, and the locales you need depend on the style
+default, any overrides and any fallback locales defined, so the procedure for
+retrieving one is asynchronous to allow for fetching one over HTTP. There's not
+much more to it than this:
 
 ```javascript
 class Fetcher {
@@ -324,13 +324,16 @@ class Fetcher {
 
 let fetcher = new Fetcher();
 let driver = Driver.new({ ..., fetcher }).unwrap();
-await driver.fetchAll();
+// Make sure you actually fetch them!
+await driver.fetchLocales();
 ```
 
 Unless you don't have `async` syntax, in which case, return a `Promise` 
 directly, e.g. `return Promise.resolve("<locale> ... </locale>")`.
 
-
+Declining to provide a locale fetcher in `Driver.new` or forgetting to call
+`await driver.fetchLocales()` results in use of the bundled `en-US` locale. You
+should also never attempt to use the driver instance while it is fetching locales.
 
 ### 2. Edit the references or the citation clusters
 
@@ -560,7 +563,7 @@ let driver = Driver.new({
     localeOverride,
     ...
 }).unwrap();
-await driver.fetchAll();
+await driver.fetchLocales();
 
 // Here you might also want to know if the style can render a bibliography or not
 let parentMeta = parseStyleMetadata(parentStyle).unwrap();
diff --git a/crates/wasm/index.html b/crates/wasm/index.html
index 01154265..0c384d9e 100644
--- a/crates/wasm/index.html
+++ b/crates/wasm/index.html
@@ -71,7 +71,7 @@
         driver.insertReferences([{id: "citekey", title: "Hello", language: 'fr-FR'}]);
         driver.initClusters([{id: 1, cites: [{id: "citekey"}]}]);
         driver.setClusterOrder([ {id: 1} ]);
-        await driver.fetchAll();
+        await driver.fetchLocales();
         let result = driver.builtCluster(1);
         console.log("Built a cite cluster:", result);
       }
diff --git a/crates/wasm/js-demo/js/useDocument.ts b/crates/wasm/js-demo/js/useDocument.ts
index 1c4c6ed3..4d174312 100644
--- a/crates/wasm/js-demo/js/useDocument.ts
+++ b/crates/wasm/js-demo/js/useDocument.ts
@@ -19,7 +19,7 @@ const fetcher = new CdnFetcher();
  *   `useEffect` hook.
  * 
  * You will typically want to update references if a user has edited them. This
- * makes sure to wait for fetchAll() when modifying references, as they might
+ * makes sure to wait for fetchLocales() when modifying references, as they might
  * have new locales. Any syncing of clusters back to the Driver is done by
  * Document.
  *
@@ -38,7 +38,7 @@ export const useDocument = (initialStyle: string, initialReferences: Reference[]
     const flightFetcher = async (driv: Driver) => {
         setInFlight(true);
         try {
-            await driv.fetchAll();
+            await driv.fetchLocales();
         } finally {
             setInFlight(false);
         }
@@ -200,7 +200,7 @@ class _ExampleManager implements Lifecycle {
         newDriver.resetReferences(this.references);
         newDriver.initClusters(this.clusters);
         // wait for any locales to come back
-        await newDriver.fetchAll();
+        await newDriver.fetchLocales();
         this.driver = newDriver;
         if (oldDriver) {
             oldDriver.free();
@@ -225,7 +225,7 @@ class _ExampleManager implements Lifecycle {
         this.references = refs;
         if (this.driver) {
             this.driver.resetReferences(refs).unwrap();
-            await this.driver.fetchAll();
+            await this.driver.fetchLocales();
             this.update();
         }
     }
@@ -250,7 +250,7 @@ class _ExampleManager implements Lifecycle {
         }
         this.references = neu;
         if (this.driver) {
-            await this.driver.fetchAll();
+            await this.driver.fetchLocales();
             this.update();
         }
     }
diff --git a/crates/wasm/node-tryout/index.js b/crates/wasm/node-tryout/index.js
index 6cbc94ba..52e1791e 100644
--- a/crates/wasm/node-tryout/index.js
+++ b/crates/wasm/node-tryout/index.js
@@ -54,7 +54,7 @@ let prom = async () => {
     driver.initClusters(initialClusters);
     driver.setClusterOrder([ {id: 1, note: 1}, {id: 2, note: 2}, {id: 3, note: 3} ])
     console.log(driver.toFetch());
-    await driver.fetchAll();
+    await driver.fetchLocales();
     let result = driver.builtCluster(3);
     console.log(result);
   } catch (e) {
diff --git a/crates/wasm/src/lib.rs b/crates/wasm/src/lib.rs
index 278ba774..0c247c2a 100644
--- a/crates/wasm/src/lib.rs
+++ b/crates/wasm/src/lib.rs
@@ -370,8 +370,8 @@ impl Driver {
 
     /// Asynchronously fetches all the locales that may be required, and saves them into the
     /// engine. Uses your provided `Fetcher.fetchLocale` function.
-    #[wasm_bindgen(js_name = "fetchAll")]
-    pub fn fetch_all(&self) -> Promise {
+    #[wasm_bindgen(js_name = "fetchLocales")]
+    pub fn fetch_locales(&self) -> Promise {
         let rc = self.engine.clone();
         let langs: Vec<Lang> = {
             let eng = rc.borrow();
@@ -388,7 +388,7 @@ impl Driver {
         let fetcher = if let Some(f) = self.fetcher.clone() {
             f
         } else {
-            log::warn!("citeproc-rs was initialized without a locale fetcher, but reqested to fetchAll() required locales {:?}, bailing out", langs);
+            log::warn!("citeproc-rs was initialized without a locale fetcher, but reqested to fetchLocales() required locales {:?}, bailing out", langs);
             return Promise::resolve(&JsValue::UNDEFINED);
         };
         future_to_promise(async move {

From bbae24210fcfa09696c76b94dded67dd2dae4ac1 Mon Sep 17 00:00:00 2001
From: Cormac Relf <web@cormacrelf.net>
Date: Fri, 4 Dec 2020 02:12:39 +1100
Subject: [PATCH 19/22] npm: Copy js snippets; --targets; fix commonjs output
 again

So this build script is getting a bit involved, but that's
the fragmented JS module ecosystem for you.
---
 crates/wasm/js-tests/package.json     |  2 +-
 crates/wasm/scripts/npm-pkg-config.sh | 93 ++++++++++++++++++---------
 2 files changed, 63 insertions(+), 32 deletions(-)

diff --git a/crates/wasm/js-tests/package.json b/crates/wasm/js-tests/package.json
index 4acb8f78..0b5cdddc 100644
--- a/crates/wasm/js-tests/package.json
+++ b/crates/wasm/js-tests/package.json
@@ -5,7 +5,7 @@
   "license": "MIT",
   "scripts": {
     "test": "jest",
-    "build": "wasm-pack build --target nodejs --out-dir pkg-node --scope citeproc-rs"
+    "build": "../scripts/npm-pkg-config.sh --targets nodejs --dest ../pkg-node"
   },
   "dependencies": {
     "@citeproc-rs/wasm": "../pkg-node",
diff --git a/crates/wasm/scripts/npm-pkg-config.sh b/crates/wasm/scripts/npm-pkg-config.sh
index 431ea917..03ff26d5 100755
--- a/crates/wasm/scripts/npm-pkg-config.sh
+++ b/crates/wasm/scripts/npm-pkg-config.sh
@@ -1,6 +1,12 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-# Run this script from the crates/wasm folder.
+set -euo pipefail
+shopt -s nullglob
+shopt -s extglob
+shopt -s globstar
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+DIR="$( cd .. && pwd )"
 
 CLEAR='\033[0m'
 RED='\033[0;31m'
@@ -19,6 +25,7 @@ function usage() {
   echo "  --package-only                         Don't rebuild, just rewrite the package.json"
   echo "  --github-packages @scope/repo/pkg-name Configure for publishing to GitHub packages, @scope/pkg-name in repo @scope/repo"
   echo "  --features                             List of cargo features to enable (comma-sep)"
+  echo "  --targets                              List of npm targets to build (comma-sep, default all)"
   echo
   exit 1
 }
@@ -31,6 +38,7 @@ PACKAGE_ONLY=
 GITHUB_PACKAGES_DEF=
 CANARY_SHA=
 FEATURES=
+TARGETS=
 
 # parse params
 while [[ "$#" > 0 ]]; do case $1 in
@@ -42,6 +50,7 @@ while [[ "$#" > 0 ]]; do case $1 in
   --package-only) PACKAGE_ONLY=true;shift;;
   --github-packages) GITHUB_PACKAGES_DEF="$2";shift;shift;;
   --features) FEATURES="$2";shift;shift;;
+  --targets) TARGETS="$2";shift;shift;;
   *) usage "Unknown parameter passed: $1"; shift; shift;;
 esac; done
 
@@ -84,65 +93,87 @@ bail() {
 # The PR linked above uses different folder names, but these ones accurately
 # describe why we need different builds in different environments.
 
+TARGETS_ALL="$TARGETS"
+if [ -z "$TARGETS_ALL" ]; then
+  TARGETS_ALL="nodejs,browser,web,no-modules,zotero"
+fi
+
 if [ -z "$PACKAGE_ONLY" ]; then
-  mkdir -p pkg-scratch
+  mkdir -p $DIR/pkg-scratch
   rm -rf $DEST
   mkdir -p $DEST
 
   ## e.g. build into pkg-scratch/target; move files to $DEST/_target/
   target() {
-    TARGET=$1
-    OUT=$2
-    EXTRA_FEATURES=$3
+    TARGET=${1:-}
+    OUT=${2:-}
+    EXTRA_FEATURES=${3:-}
+    SCRATCH="$DIR/pkg-scratch/$OUT"
     wasm-pack build --release \
       --out-name citeproc_rs_wasm \
       --scope citeproc-rs \
       --target "$TARGET" \
-      --out-dir pkg-scratch/$OUT \
+      --out-dir "$SCRATCH" \
       -- --features "$FEATURES$EXTRA_FEATURES" \
-      && mkdir -p "$DEST/$OUT" \
-      && cp pkg-scratch/$OUT/citeproc_rs_wasm* "$DEST/$OUT/" \
+      || bail "building target $TARGET -> $OUT --features \"$FEATURES$EXTRA_FEATURES\""
+
+    SNIPPETS="$DIR/pkg-scratch/$OUT/snippets"
+    mkdir -p "$DEST/$OUT" \
+      && ([[ -d "$SNIPPETS" ]] && cp -R "$SNIPPETS" "$DEST/$OUT" || true) \
+      && cp -R  $DIR/pkg-scratch/$OUT/citeproc_rs_wasm* "$DEST/$OUT/" \
+      && cp $DIR/pkg-scratch/$OUT/.gitignore "$DEST/" \
       || bail "building target $TARGET -> $OUT --features \"$FEATURES$EXTRA_FEATURES\""
   }
 
-  target nodejs _cjs
-  target browser _esm
-  target web _web
-  target no-modules _no_modules ,no-modules
-  target no-modules _zotero ,zotero
+  echo "$TARGETS_ALL" | sed -n 1'p' | tr ',' '\n' | while read TARGET; do
+      echo TARGET: $TARGET
+      if [ "$TARGET" == "nodejs" ]; then target nodejs _cjs; fi
+      if [ "$TARGET" == "browser" ]; then target browser _esm; fi
+      if [ "$TARGET" == "web" ]; then target web _web; fi
+      if [ "$TARGET" == "no-modules" ]; then target no-modules _no_modules ,no-modules; fi
+      if [ "$TARGET" == "zotero" ]; then target no-modules _zotero ,zotero; fi
+      echo TARGET DONE: $TARGET
+  done
+
 else
   mkdir -p $DEST/_cjs $DEST/_esm $DEST/_web $DEST/_no_modules $DEST/_zotero
 fi
 
-ZOTERO_BINDGEN_SRC="pkg-scratch/_zotero/citeproc_rs_wasm.js"
-ZOTERO_BINDGEN="$DEST/_zotero/citeproc_rs_wasm.js"
-sed -e 's/CITEPROC_RS_ZOTERO_GLOBAL/Zotero.CiteprocRs/g' \
-  < $ZOTERO_BINDGEN_SRC \
-  > "$ZOTERO_BINDGEN" \
-  || bail "could not replace CITEPROC_RS_ZOTERO_GLOBAL"
-cat <<EOF >> "$ZOTERO_BINDGEN"
+if [[ $TARGETS_ALL =~ "zotero" ]]; then
+  ZOTERO_BINDGEN_SRC="$DIR/pkg-scratch/_zotero/citeproc_rs_wasm.js"
+  ZOTERO_BINDGEN="$DEST/_zotero/citeproc_rs_wasm.js"
+  sed -e 's/CITEPROC_RS_ZOTERO_GLOBAL/Zotero.CiteprocRs/g' \
+    < $ZOTERO_BINDGEN_SRC \
+    > "$ZOTERO_BINDGEN" \
+    || bail "could not replace CITEPROC_RS_ZOTERO_GLOBAL"
+  cat <<EOF >> "$ZOTERO_BINDGEN"
 module.exports = wasm_bindgen;
 if (typeof Zotero !== "undefined" && typeof Zotero.CiteprocRs !== "undefined") {
   Object.assign(Zotero.CiteprocRs, wasm_bindgen)
 }
 EOF
+fi
+
+NODEJS_INCLUDE=/dev/null
+NOMOD_INCLUDE=/dev/null
+ZOTERO_INCLUDE=/dev/null
+if [[ "$TARGETS_ALL" == *"nodejs"* ]]; then NODEJS_INCLUDE=($DEST/_cjs/snippets/**/include.js); fi
+if [[ "$TARGETS_ALL" == *"no-modules"* ]]; then NOMOD_INCLUDE="$DEST/_no_modules/citeproc_rs_wasm_include.js"; fi
+if [[ "$TARGETS_ALL" == *"zotero"* ]]; then ZOTERO_INCLUDE="$DEST/_zotero/citeproc_rs_wasm_include.js"; fi
 
-NODEJS_INCLUDE="$DEST/_cjs/citeproc_rs_wasm_include.js"
-NOMOD_INCLUDE="$DEST/_no_modules/citeproc_rs_wasm_include.js"
-ZOTERO_INCLUDE="$DEST/_zotero/citeproc_rs_wasm_include.js"
-sed -e 's/export class/class/' < src/js/include.js \
+sed -e 's/export class/class/' < $DIR/src/js/include.js \
   | tee "$ZOTERO_INCLUDE" \
   | tee "$NODEJS_INCLUDE" \
   > "$NOMOD_INCLUDE" \
   || bail "could not write include.js for no-modules targets"
 # We want the commonjs module.exports in both of these
-cat src/js/commonjs_export.js >> "$NOMOD_INCLUDE" || bail "failed writing $NOMOD_INCLUDE"
-cat src/js/commonjs_export.js >> "$NODEJS_INCLUDE" || bail "failed writing $NODEJS_INCLUDE"
+cat $DIR/src/js/commonjs_export.js >> "$NOMOD_INCLUDE" || bail "failed writing $NOMOD_INCLUDE"
+cat $DIR/src/js/commonjs_export.js >> "$NODEJS_INCLUDE" || bail "failed writing $NODEJS_INCLUDE"
 # zotero is weird
-cat src/js/zotero.js >> "$ZOTERO_INCLUDE" || bail "failed writing $ZOTERO_INCLUDE"
+cat $DIR/src/js/zotero.js >> "$ZOTERO_INCLUDE" || bail "failed writing $ZOTERO_INCLUDE"
 
-cp README.md $DEST/ || bail "could not copy README"
-# cp scripts/model-package.json $DEST/package.json
+cp $DIR/README.md $DEST/ || bail "could not copy README"
+# cp $DIR/scripts/model-package.json $DEST/package.json
 
 TARGET_VERSION=${SET_VERSION:-$CARGO_VERSION}
 
@@ -183,7 +214,7 @@ fi
 
 printf "Writing package.json with: $JQ_ARGS\n$JQ_FILTERS\n"
 
-jq $JQ_ARGS "$JQ_FILTERS" < scripts/model-package.json > $DEST/package.json \
+jq $JQ_ARGS "$JQ_FILTERS" < $DIR/scripts/model-package.json > $DEST/package.json \
   || bail "writing $DEST/package.json using scripts/model-package.json and jq"
 
 # cat $DEST/package.json | jq

From f6aa6607013a384613a082b47483d1e118db0465 Mon Sep 17 00:00:00 2001
From: Cormac Relf <web@cormacrelf.net>
Date: Fri, 4 Dec 2020 03:06:05 +1100
Subject: [PATCH 20/22] Build nodejs package for js-tests in --dev mode

---
 .github/workflows/ci.yml              | 2 +-
 crates/wasm/js-tests/package.json     | 2 +-
 crates/wasm/scripts/npm-pkg-config.sh | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 14f13223..76f70cac 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -143,7 +143,7 @@ jobs:
 
       - name: Build WASM
         working-directory: crates/wasm
-        run: wasm-pack build --target nodejs --out-dir pkg-node --scope citeproc-rs --dev
+        run: yarn build
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
diff --git a/crates/wasm/js-tests/package.json b/crates/wasm/js-tests/package.json
index 0b5cdddc..54cbc9e2 100644
--- a/crates/wasm/js-tests/package.json
+++ b/crates/wasm/js-tests/package.json
@@ -5,7 +5,7 @@
   "license": "MIT",
   "scripts": {
     "test": "jest",
-    "build": "../scripts/npm-pkg-config.sh --targets nodejs --dest ../pkg-node"
+    "build": "../scripts/npm-pkg-config.sh --dev --targets nodejs --dest ../pkg-node"
   },
   "dependencies": {
     "@citeproc-rs/wasm": "../pkg-node",
diff --git a/crates/wasm/scripts/npm-pkg-config.sh b/crates/wasm/scripts/npm-pkg-config.sh
index 03ff26d5..56999566 100755
--- a/crates/wasm/scripts/npm-pkg-config.sh
+++ b/crates/wasm/scripts/npm-pkg-config.sh
@@ -26,6 +26,7 @@ function usage() {
   echo "  --github-packages @scope/repo/pkg-name Configure for publishing to GitHub packages, @scope/pkg-name in repo @scope/repo"
   echo "  --features                             List of cargo features to enable (comma-sep)"
   echo "  --targets                              List of npm targets to build (comma-sep, default all)"
+  echo "  --dev                                  Build in --dev mode"
   echo
   exit 1
 }
@@ -39,6 +40,7 @@ GITHUB_PACKAGES_DEF=
 CANARY_SHA=
 FEATURES=
 TARGETS=
+DEV_OR_RELEASE=--release
 
 # parse params
 while [[ "$#" > 0 ]]; do case $1 in
@@ -51,6 +53,7 @@ while [[ "$#" > 0 ]]; do case $1 in
   --github-packages) GITHUB_PACKAGES_DEF="$2";shift;shift;;
   --features) FEATURES="$2";shift;shift;;
   --targets) TARGETS="$2";shift;shift;;
+  --dev) DEV_OR_RELEASE="--dev";shift;;
   *) usage "Unknown parameter passed: $1"; shift; shift;;
 esac; done
 
@@ -109,7 +112,7 @@ if [ -z "$PACKAGE_ONLY" ]; then
     OUT=${2:-}
     EXTRA_FEATURES=${3:-}
     SCRATCH="$DIR/pkg-scratch/$OUT"
-    wasm-pack build --release \
+    wasm-pack build $DEV_OR_RELEASE \
       --out-name citeproc_rs_wasm \
       --scope citeproc-rs \
       --target "$TARGET" \

From af248cb0f8031625b5a0f136e07a31ab242f8ad8 Mon Sep 17 00:00:00 2001
From: Cormac Relf <web@cormacrelf.net>
Date: Fri, 4 Dec 2020 03:09:30 +1100
Subject: [PATCH 21/22] Slightly improve typescript for DriverError (doesn't
 include StyleError)

---
 crates/wasm/js-demo/js/useDocument.ts | 7 +++++--
 crates/wasm/src/lib.rs                | 4 +---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/crates/wasm/js-demo/js/useDocument.ts b/crates/wasm/js-demo/js/useDocument.ts
index 4d174312..fd79de61 100644
--- a/crates/wasm/js-demo/js/useDocument.ts
+++ b/crates/wasm/js-demo/js/useDocument.ts
@@ -61,8 +61,11 @@ export const useDocument = (initialStyle: string, initialReferences: Reference[]
                 d.resetReferences(references).unwrap();
                 return d;
             } catch(e) {
-                console.error("caught in createDriver: ", e);
-                setError(Some(e));
+                if (e instanceof CiteprocRsError) {
+                    setError(Some(e));
+                } else {
+                    throw e;
+                }
             }
         });
         if (d.is_ok()) {
diff --git a/crates/wasm/src/lib.rs b/crates/wasm/src/lib.rs
index 0c247c2a..c5ee82fe 100644
--- a/crates/wasm/src/lib.rs
+++ b/crates/wasm/src/lib.rs
@@ -48,6 +48,7 @@ pub struct Driver {
 pub enum DriverError {
     #[error("Unknown output format {0}")]
     UnknownOutputFormat(String),
+    /// Never serialized as a CiteprocRsDriverError, only serialized as a CslStyleError.
     #[error("Style error: {0}")]
     StyleError(#[from] csl::StyleError),
     #[error("JSON Deserialization Error: {0}")]
@@ -589,9 +590,6 @@ type StyleError = {
 type DriverError = {
     tag: "UnknownOutputFormat",
     content: string,
-} | {
-    tag: "StyleError",
-    content: StyleError
 } | {
     tag: "JsonError",
 } | {

From 0bae18763f72474fbdbf67dfe1248d62cd0c36fd Mon Sep 17 00:00:00 2001
From: Cormac Relf <web@cormacrelf.net>
Date: Fri, 4 Dec 2020 03:15:38 +1100
Subject: [PATCH 22/22] ci: Build js-tests package in correct path

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 76f70cac..14a4e16c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -142,7 +142,7 @@ jobs:
         run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh -s -- -f
 
       - name: Build WASM
-        working-directory: crates/wasm
+        working-directory: crates/wasm/js-tests
         run: yarn build
 
       - name: Get yarn cache directory path