Fixes remainder of issues with serde + DocChars changes. Pinned to custom serde now.

Author: tcr

Cargo.lock

@@ -19,7 +19,7 @@ matches = "0.1.6"
 pulldown-cmark = "0.1.2"
 pulldown-cmark-to-cmark = "1.1.0"
 rand = "0.4"
-ron = "0.2"
+ron = "0.4"
 serde = "^1.0.27"
 serde_derive = "^1.0.27"
 serde_json = "^1.0.6"

edit-client/Cargo.toml

@@ -16,7 +16,7 @@ pulldown-cmark = "0.1.2"
 pulldown-cmark-to-cmark = "1.1.0"
 rand = "0.4"
 regex = "1"
-ron = "0.2"
+ron = "0.4"
 serde = "1.0.27"
 serde_derive = "1.0.27"
 serde_json = "1.0.6"

edit-common/Cargo.toml

@@ -18,13 +18,13 @@ md5 = "0.3.7"
 mime_guess = "1.8.4"
 pulldown-cmark = "0.1.2"
 pulldown-cmark-to-cmark = "1.1.0"
-quicli = "0.3"
+quicli = "0.4"
 r2d2 = "0.8.2"
 r2d2-diesel = "1.0.0"
 open = "1.2.2"
 rand = "0.4"
 reqwest = "0.8.5"
-ron = "0.2"
+ron = "0.4"
 libsqlite3-sys = { version = "*", features = ["bundled"] }
 serde = "1.0.27"
 serde_derive = "1.0.27"

edit-server/Cargo.toml

@@ -1,12 +1,8 @@
-#![feature(extern_in_paths)]
-
-#[macro_use]
-extern crate quicli;
-
 use serde_json;
-
+use failure::*;
 use edit_server::db::*;
-use quicli::prelude::*;
+use structopt::*;
+use diesel::connection::Connection;
 
 #[derive(Debug, StructOpt)]
 enum Cli {
@@ -20,8 +16,8 @@ enum Cli {
     Clear,
 }
 
-main!(|args: Cli| {
-    use diesel::connection::Connection;
+fn main() -> Result<(), Error> {
+    let args = Cli::from_args();
 
     let db = db_connection();
 
@@ -46,4 +42,6 @@ main!(|args: Cli| {
             }
         }
     }
-});
+
+    Ok(())
+}

edit-server/src/bin/edit-server-logs.rs

@@ -385,7 +385,7 @@ fn run_http_server(port: u16, client_proxy: bool) {
                     &get_or_create_page_graphql(
                         &id,
                         &Doc(doc_span![DocGroup({"tag": "h1"}, [DocChars(&id)])]),
-                    ).unwrap().0
+                    ).expect("Received malformed content from db, aborting").0
                 ).unwrap();
 
                 let payload = reg.render_template(&template, &json!({

edit-server/src/bin/edit-server.rs

@@ -14,9 +14,9 @@ failure = "0.1.1"
 log = "0.3.1"
 maplit = "1.0.0"
 regex = "0.2.10"
-ron = "0.2.0"
-serde = "1.0"
-serde_derive = "1.0"
+ron = "0.4"
+serde = "^1.0.82"
+serde_derive = "1"
 serde_json = "1.0"
 term-painter = "0.2.2"
 yansi = "0.3.4"

oatie/Cargo.toml

@@ -2,6 +2,7 @@
 
 use super::doc::*;
 use crate::stepper::*;
+use crate::style::*;
 
 fn apply_add_inner<M: DocMutator>(
     bc: &mut M,
@@ -53,7 +54,7 @@ fn apply_add_inner<M: DocMutator>(
                         d = AddStyles(count - value.char_len(), styles.clone());
                         chars_styles.extend(&styles);
                         bc.delete(1);
-                        bc.InsertDocString(value.clone());
+                        bc.InsertDocString(value.clone(), OpaqueStyleMap::from(styles.clone()));
                         // partial = false;
                         res.place(&DocChars(value, chars_styles));
                         nextdel = false;
@@ -62,15 +63,15 @@ fn apply_add_inner<M: DocMutator>(
                         let mut left_styles = chars_styles.clone();
                         left_styles.extend(&styles);
                         bc.delete(1);
-                        bc.InsertDocString(left.clone());
+                        bc.InsertDocString(left.clone(), OpaqueStyleMap::from(styles.clone()));
                         // partial = false;
                         res.place(&DocChars(left, left_styles));
                         first = Some(DocChars(right, chars_styles));
                         nextfirst = false;
                     } else {
                         chars_styles.extend(&styles);
                         bc.delete(1);
-                        bc.InsertDocString(value.clone());
+                        bc.InsertDocString(value.clone(), OpaqueStyleMap::from(styles.clone()));
                         // partial = false;
                         res.place(&DocChars(value, chars_styles));
                     }
@@ -121,7 +122,7 @@ fn apply_add_inner<M: DocMutator>(
             AddChars(value, styles) => {
                 // TODO where do you skip anything, exactly
                 // need to manifest the place issue externally as well
-                bc.InsertDocString(value.clone());
+                bc.InsertDocString(value.clone(), styles.clone());
                 res.place(&DocChars(value, styles));
                 nextfirst = false;
             }
@@ -261,22 +262,22 @@ fn apply_del_inner<M: DocMutator>(bc: &mut M, spanvec: &DocSpan, addvec: &DelSpa
                         d = DelStyles(count - value.char_len(), styles.clone());
                         chars_styles.remove(&styles);
                         bc.delete(1);
-                        bc.InsertDocString(value.clone());
+                        bc.InsertDocString(value.clone(), chars_styles.clone());
                         res.place(&DocChars(value, chars_styles));
                         nextdel = false;
                     } else if value.char_len() > count {
                         let (left, right) = value.split_at(count);
                         let mut left_styles = chars_styles.clone();
                         left_styles.remove(&styles);
                         bc.delete(1);
-                        bc.InsertDocString(left.clone());
+                        bc.InsertDocString(left.clone(), chars_styles.clone());
                         res.place(&DocChars(left, chars_styles.clone()));
                         first = DocChars(right, chars_styles);
                         nextfirst = false;
                     } else {
                         chars_styles.remove(&styles);
                         bc.delete(1);
-                        bc.InsertDocString(value.clone());
+                        bc.InsertDocString(value.clone(), chars_styles.clone());
                         res.place(&DocChars(value, chars_styles));
                     }
                 }

oatie/src/core/apply.rs

@@ -20,23 +20,14 @@ pub type CurSpan = Vec<CurElement>;
 
 pub type Op = (DelSpan, AddSpan);
 
-fn style_map_is_empty(map: &OpaqueStyleMap) -> bool {
+/// Returns true if the style map can be omitted.
+fn is_stylemap_empty(map: &OpaqueStyleMap) -> bool {
     map.iter().count() == 0
 }
 
-// fn docchars_deserialize<'de, D>(mut d: D) -> Result<(DocString, OpaqueStyleMap), D::Error>
-//     where D: Deserializer<'de> + Clone
-// {
-//     <(DocString, OpaqueStyleMap) as Deserialize>::deserialize(d)
-//         .or_else(|_| <DocString as Deserialize>::deserialize(d).map(|string| (string, OpaqueStyleMap::new())))
-// }
-
-use serde::de::Deserializer;
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub enum DocElement {
-    // #[serde(deserialize_with = "docchars_deserialize")]
-    DocChars(DocString, #[serde(skip_serializing_if = "style_map_is_empty", skip_deserializing)] OpaqueStyleMap),
+    DocChars(DocString, #[serde(default, skip_serializing_if = "is_stylemap_empty")] OpaqueStyleMap),
     DocGroup(Attrs, DocSpan),
 }
 
@@ -45,6 +36,10 @@ pub use self::DocElement::*;
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct Doc(pub Vec<DocElement>);
 
+
+
+// [DocChars("birds snakes and aeroplanes",[Bold,],),]
+
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub enum DelElement {
     DelSkip(usize),
@@ -65,8 +60,7 @@ pub use self::DelElement::*;
 pub enum AddElement {
     AddSkip(usize),
     AddWithGroup(AddSpan),
-    // #[serde(deserialize_with = "docchars_deserialize")]
-    AddChars(DocString, #[serde(skip_serializing_if = "style_map_is_empty", skip_deserializing)] OpaqueStyleMap),
+    AddChars(DocString, #[serde(default, skip_serializing_if = "is_stylemap_empty")] OpaqueStyleMap),
     AddGroup(Attrs, AddSpan),
     AddStyles(usize, StyleMap),
 }

oatie/src/core/doc.rs

@@ -52,7 +52,7 @@ impl<'de> Deserialize<'de> for OpaqueStyleMap {
     where
         D: Deserializer<'de>,
     {
-        Ok(OpaqueStyleMap::from(StyleMap::deserialize(deserializer)?))
+        Ok(OpaqueStyleMap::from(StyleSet::deserialize(deserializer)?.into_iter().map(|k| (k, None)).collect()))
     }
 }
 

oatie/src/core/style.rs

@@ -1,5 +1,6 @@
 use super::*;
 use wasm_bindgen::prelude::*;
+use crate::style::*;
 
 impl Program {
     pub fn new() -> Program {
@@ -64,7 +65,7 @@ pub trait DocMutator {
         unimplemented!();
     }
 
-    fn InsertDocString(&mut self, _docstring: DocString) {
+    fn InsertDocString(&mut self, _docstring: DocString, _styles: OpaqueStyleMap) {
         unimplemented!();
     }
 
@@ -105,7 +106,7 @@ impl DocMutator for NullDocMutator {
         // no-op
     }
 
-    fn InsertDocString(&mut self, _docstring: DocString) {
+    fn InsertDocString(&mut self, _docstring: DocString, _style: OpaqueStyleMap) {
         // no-op
     }
 
@@ -129,7 +130,7 @@ pub enum Bytecode {
     Exit,
     AdvanceElements(usize),
     DeleteElements(usize),
-    InsertDocString(DocString),
+    InsertDocString(DocString, OpaqueStyleMap),
     WrapPrevious(usize, Attrs),
     UnwrapSelf,
     JoinTextLeft,
@@ -172,12 +173,14 @@ impl<'a> RecordingDocMutator<'a> {
                 // Partial string.
                 let partial = self.stepper.char_cursor_expect().right().expect("hey now");
                 // console_log!("🏟 {:?}", partial);
-                self.bc.place(Bytecode::InsertDocString(partial.clone()));
-                unimplemented!();
-                // FIXME this is broken
-                // self.writer.place(&DocChars(partial.clone()));
-                // self.stepper.next();
-                // return true;
+                if let Some(&DocChars(ref text, ref styles)) = self.stepper.head_raw() {
+                    self.bc.place(Bytecode::InsertDocString(partial.clone(), styles.clone()));
+                    self.writer.place(&DocChars(partial.clone(), styles.clone()));
+                } else {
+                    unreachable!();
+                }
+                self.stepper.next();
+                return true;
             } else if let (Some(ref previous), Some(ref head)) =
                 (self.writer.past.last(), self.stepper.head())
             {
@@ -269,13 +272,12 @@ impl<'a> DocMutator for RecordingDocMutator<'a> {
         }
     }
 
-    fn InsertDocString(&mut self, docstring: DocString) {
-        self.bc.place(Bytecode::InsertDocString(docstring.clone()));
+    fn InsertDocString(&mut self, docstring: DocString, styles: OpaqueStyleMap) {
+        self.bc.place(Bytecode::InsertDocString(docstring.clone(), styles.clone()));
 
         // No-op stepper
 
-        // FIXME 
-        // self.writer.place(&DocChars(docstring));
+        self.writer.place(&DocChars(docstring, styles));
     }
 
     fn UnwrapSelf(&mut self) {
@@ -320,7 +322,11 @@ impl<'a> DocMutator for RecordingDocMutator<'a> {
                 if let Some(left) = cursor.left() {
                     if left.char_len() == count {
                         self.bc.place(Bytecode::DeleteElements(1)); // It's over, delete time
-                        self.InsertDocString(left.clone()); // Insert the left part of string
+                        if let Some(&DocChars(_, ref styles)) = self.stepper.head_raw() {
+                            self.InsertDocString(left.clone(), styles.to_owned()); // Insert the left part of string
+                        } else {
+                            unreachable!();
+                        }
                                                             // The right part of the string is added WHEN
                         return;
                     } else {
@@ -331,7 +337,11 @@ impl<'a> DocMutator for RecordingDocMutator<'a> {
                             text.seek_start_forward(count);
                         }
                         // console_log!("\n\n\nPARTIAL ADVANEMENET {:?}\n\n\n", text);
-                        self.InsertDocString(text);
+                        if let Some(&DocChars(_, ref styles)) = self.stepper.head_raw() {
+                            self.InsertDocString(text, styles.clone());
+                        } else {
+                            unreachable!();
+                        }
                     }
                 }
             }

oatie/src/stepper/docmutator.rs

@@ -1,5 +1,4 @@
 use crate::stepper::*;
-use crate::style::OpaqueStyleMap;
 
 // DocStepper
 
@@ -36,7 +35,6 @@ impl<'a> DocStepper<'a> {
     /// If head is a group, clear the char_cursor.
     // TODO rename char_cursor_reset ?
     // TODO Make this pub(crate) once walkers.rs doesn't repend on it.
-    #[inline(never)]
     pub fn char_cursor_update(&mut self) {
         self.char_cursor = if let Some(&DocChars(ref text, ref styles)) = self.head_raw() {
             Some(CharCursor::from_docstring(text, styles.to_owned()))
@@ -316,6 +314,7 @@ impl<'a> DocStepper<'a> {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::style::*;
 
     fn test_doc_0() -> DocSpan {
         doc_span![

oatie/src/stepper/docstepper.rs

@@ -4,7 +4,6 @@ use serde::de::{
     Visitor,
 };
 use serde::{
-    ser::SerializeSeq,
     Deserialize,
     Deserializer,
     Serialize,
@@ -125,14 +124,11 @@ impl PartialEq for DocString {
 impl Eq for DocString {}
 
 impl Serialize for DocString {
-    #[inline(never)]
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
         S: Serializer,
     {
-        let mut s = serializer.serialize_seq(Some(1))?;
-        s.serialize_element(self.as_str())?;
-        s.end()
+        serializer.serialize_str(self.as_str())
     }
 }
 
@@ -150,26 +146,26 @@ impl<'de> Deserialize<'de> for DocString {
                 formatter.write_str("docstring")
             }
 
-            fn visit_str<E>(self, value: &str) -> Result<DocString, E>
+            fn visit_seq<V>(self, mut seq: V) -> Result<Self::Value, V::Error>
             where
-                E: de::Error,
+                V: SeqAccess<'de>,
             {
-                Ok(DocString::from_str(value))
+                // Deserialize the one we care about.
+                let ret: String = seq.next_element()?
+                            .ok_or_else(|| de::Error::invalid_length(1, &self))?;
+                
+
+                Ok(DocString::from_string(ret))
             }
 
-            fn visit_seq<A>(self, mut seq: A) -> Result<DocString, A::Error>
+            fn visit_str<E>(self, value: &str) -> Result<DocString, E>
             where
-                A: SeqAccess<'de>,
+                E: de::Error,
             {
-                if let Some(inner) = seq.next_element::<String>()? {
-                    Ok(DocString::from_string(inner))
-                } else {
-                    Err(de::Error::unknown_field("0", FIELDS))
-                }
+                Ok(DocString::from_str(value))
             }
         }
 
-        const FIELDS: &'static [&'static str] = &["docstring"];
         deserializer.deserialize_any(FieldVisitor)
     }
 }