automorph 0.2.0

Derive macros for bidirectional Automerge-Rust struct synchronization
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
//! Implementations for Option and Result types.

use automerge::{
    ChangeHash, ObjId, ObjType, Prop, ReadDoc, ScalarValue, Value, transaction::Transactable,
};

use crate::{Automorph, ChangeReport, Error, FieldCursor, OptionChanges, Result, ResultChanges, ScalarCursor};

// =============================================================================
// OptionCursor
// =============================================================================

/// Cursor for tracking `Option<T>` fields efficiently.
///
/// This cursor caches whether the Option was `Some` when last refreshed,
/// enabling O(1) detection of:
/// - `None` → `Some` transitions
/// - `Some` → `None` transitions
/// - Changes to the inner value when both are `Some`
///
/// # Type Parameters
///
/// - `C`: The cursor type for the inner `T` when `Option<T>` is `Some`
///
/// # Example
///
/// ```rust
/// use automorph::{Automorph, Tracked, ChangeReport};
/// use automerge::{AutoCommit, ROOT};
///
/// #[derive(Automorph, Clone, Debug, Default)]
/// struct Container {
///     value: Option<String>,
/// }
///
/// let mut doc = AutoCommit::new();
/// Container { value: Some("hello".to_string()) }
///     .save(&mut doc, &ROOT, "container").unwrap();
///
/// let mut tracked = Tracked::<Container>::load(&doc, &ROOT, "container").unwrap();
///
/// // Modify the value
/// Container { value: Some("world".to_string()) }
///     .save(&mut doc, &ROOT, "container").unwrap();
///
/// // Check for changes - has_structural_changes now works for Option fields
/// let changes = tracked.update(&doc).unwrap();
/// assert!(changes.any());
/// ```
///
/// # Thread Safety
///
/// `OptionCursor<C>` is `Send` and `Sync` when `C` is.
#[derive(Clone, Debug, Default)]
pub struct OptionCursor<C: FieldCursor> {
    /// Whether the option was Some when cached
    pub is_some: bool,
    /// Cached ObjId when Some (for value comparison)
    pub obj_id: Option<ObjId>,
    /// Inner cursor for when the value is Some
    pub inner_cursor: C,
}

impl<C: FieldCursor> FieldCursor for OptionCursor<C> {
    type Changes = OptionChanges<C::Changes>;

    fn diff<D: ReadDoc>(&self, doc: &D, obj: &ObjId) -> crate::Result<Self::Changes> {
        // Check current state in document
        let current = doc.get(obj, "")?;
        let current_is_some = current.is_some();

        match (self.is_some, current_is_some) {
            // Was None, still None - no change
            (false, false) => Ok(OptionChanges::Unchanged),
            // Was None, now Some
            (false, true) => Ok(OptionChanges::BecameSome),
            // Was Some, now None
            (true, false) => Ok(OptionChanges::BecameNone),
            // Was Some, still Some - check inner value
            (true, true) => {
                if let Some((_, current_id)) = current {
                    let inner_changes = self.inner_cursor.diff(doc, &current_id)?;
                    if inner_changes.any() {
                        Ok(OptionChanges::Inner(inner_changes))
                    } else {
                        Ok(OptionChanges::Unchanged)
                    }
                } else {
                    Ok(OptionChanges::BecameNone)
                }
            }
        }
    }

    fn refresh<D: ReadDoc>(&mut self, doc: &D, obj: &ObjId) -> crate::Result<()> {
        match doc.get(obj, "")? {
            Some((_, id)) => {
                self.is_some = true;
                self.obj_id = Some(id.clone());
                self.inner_cursor.refresh(doc, &id)?;
            }
            None => {
                self.is_some = false;
                self.obj_id = None;
                // inner_cursor stays at default since there's no value
            }
        }
        Ok(())
    }
}

impl<C: FieldCursor> OptionCursor<C> {
    /// Compare this cursor against the current document state at a key.
    ///
    /// This is used internally by struct cursors to check Option fields.
    pub fn diff_at_key<D: ReadDoc>(
        &self,
        doc: &D,
        obj: &ObjId,
        key: &str,
    ) -> crate::Result<OptionChanges<C::Changes>> {
        // Check current state at the key
        let current = doc.get(obj, key)?;
        let current_is_some = current.is_some();

        match (self.is_some, current_is_some) {
            // Was None, still None - no change
            (false, false) => Ok(OptionChanges::Unchanged),
            // Was None, now Some
            (false, true) => Ok(OptionChanges::BecameSome),
            // Was Some, now None
            (true, false) => Ok(OptionChanges::BecameNone),
            // Was Some, still Some - check inner value using ObjId comparison
            (true, true) => {
                if let Some((_, current_id)) = current {
                    // For scalar types, compare ObjIds directly
                    // For object types, delegate to inner cursor
                    let inner_changes = self.inner_cursor.diff(doc, &current_id)?;
                    if inner_changes.any() {
                        Ok(OptionChanges::Inner(inner_changes))
                    } else {
                        Ok(OptionChanges::Unchanged)
                    }
                } else {
                    Ok(OptionChanges::BecameNone)
                }
            }
        }
    }

    /// Refresh this cursor from the current document state at a key.
    ///
    /// This is used internally by struct cursors to refresh Option fields.
    pub fn refresh_at_key<D: ReadDoc>(
        &mut self,
        doc: &D,
        obj: &ObjId,
        key: &str,
    ) -> crate::Result<()> {
        match doc.get(obj, key)? {
            Some((_, id)) => {
                self.is_some = true;
                self.obj_id = Some(id.clone());
                self.inner_cursor.refresh(doc, &id)?;
            }
            None => {
                self.is_some = false;
                self.obj_id = None;
                // inner_cursor stays at default since there's no value
            }
        }
        Ok(())
    }
}

// =============================================================================
// ResultCursor
// =============================================================================

/// Cursor for tracking `Result<T, E>` fields efficiently.
///
/// This cursor caches whether the Result was `Ok` or `Err` when last refreshed,
/// enabling O(1) detection of:
/// - `Err` → `Ok` transitions
/// - `Ok` → `Err` transitions
/// - Changes to the inner value when variant matches
///
/// # Type Parameters
///
/// - `OkC`: The cursor type for the inner `T` when `Result<T, E>` is `Ok`
/// - `ErrC`: The cursor type for the inner `E` when `Result<T, E>` is `Err`
///
/// # Thread Safety
///
/// `ResultCursor<OkC, ErrC>` is `Send` and `Sync` when both `OkC` and `ErrC` are.
#[derive(Clone, Debug, Default)]
pub struct ResultCursor<OkC: FieldCursor, ErrC: FieldCursor> {
    /// Whether the result was Ok (true), Err (false), or None (not set)
    pub is_ok: Option<bool>,
    /// Cached ObjId for the map containing Ok/Err
    pub map_id: Option<ObjId>,
    /// Cursor for Ok variant
    pub ok_cursor: OkC,
    /// Cursor for Err variant
    pub err_cursor: ErrC,
}

impl<OkC: FieldCursor, ErrC: FieldCursor> FieldCursor for ResultCursor<OkC, ErrC> {
    type Changes = ResultChanges<OkC::Changes, ErrC::Changes>;

    fn diff<D: ReadDoc>(&self, doc: &D, obj: &ObjId) -> crate::Result<Self::Changes> {
        // Result is stored as a map with "Ok" or "Err" key
        let current = doc.get(obj, "")?;

        if let Some((_, map_id)) = current {
            let has_ok = doc.get(&map_id, "Ok")?.is_some();
            let has_err = doc.get(&map_id, "Err")?.is_some();

            match (self.is_ok, has_ok, has_err) {
                // No previous state - treat as new
                (None, true, false) => Ok(ResultChanges::BecameOk),
                (None, false, true) => Ok(ResultChanges::BecameErr),
                (None, _, _) => Ok(ResultChanges::Unchanged),

                // Was Ok, still Ok - check inner
                (Some(true), true, false) => {
                    if let Some((_, ok_id)) = doc.get(&map_id, "Ok")? {
                        let inner_changes = self.ok_cursor.diff(doc, &ok_id)?;
                        if inner_changes.any() {
                            Ok(ResultChanges::OkInner(inner_changes))
                        } else {
                            Ok(ResultChanges::Unchanged)
                        }
                    } else {
                        Ok(ResultChanges::BecameErr)
                    }
                }

                // Was Err, still Err - check inner
                (Some(false), false, true) => {
                    if let Some((_, err_id)) = doc.get(&map_id, "Err")? {
                        let inner_changes = self.err_cursor.diff(doc, &err_id)?;
                        if inner_changes.any() {
                            Ok(ResultChanges::ErrInner(inner_changes))
                        } else {
                            Ok(ResultChanges::Unchanged)
                        }
                    } else {
                        Ok(ResultChanges::BecameOk)
                    }
                }

                // Variant changes
                (Some(true), false, true) => Ok(ResultChanges::BecameErr),
                (Some(false), true, false) => Ok(ResultChanges::BecameOk),

                // Invalid states
                (_, true, true) => Err(Error::invalid_value(
                    "Result cannot have both 'Ok' and 'Err' keys",
                )),
                (_, false, false) => Ok(ResultChanges::Unchanged),
            }
        } else {
            // Result was deleted
            match self.is_ok {
                Some(_) => Ok(ResultChanges::Unchanged), // Changed to deleted
                None => Ok(ResultChanges::Unchanged),
            }
        }
    }

    fn refresh<D: ReadDoc>(&mut self, doc: &D, obj: &ObjId) -> crate::Result<()> {
        match doc.get(obj, "")? {
            Some((_, map_id)) => {
                self.map_id = Some(map_id.clone());

                let has_ok = doc.get(&map_id, "Ok")?.is_some();
                let has_err = doc.get(&map_id, "Err")?.is_some();

                if has_ok {
                    self.is_ok = Some(true);
                    if let Some((_, ok_id)) = doc.get(&map_id, "Ok")? {
                        self.ok_cursor.refresh(doc, &ok_id)?;
                    }
                } else if has_err {
                    self.is_ok = Some(false);
                    if let Some((_, err_id)) = doc.get(&map_id, "Err")? {
                        self.err_cursor.refresh(doc, &err_id)?;
                    }
                }
            }
            None => {
                self.is_ok = None;
                self.map_id = None;
            }
        }
        Ok(())
    }
}

impl<OkC: FieldCursor, ErrC: FieldCursor> ResultCursor<OkC, ErrC> {
    /// Compare this cursor against the current document state at a key.
    ///
    /// This is used internally by struct cursors to check Result fields.
    pub fn diff_at_key<D: ReadDoc>(
        &self,
        doc: &D,
        obj: &ObjId,
        key: &str,
    ) -> crate::Result<ResultChanges<OkC::Changes, ErrC::Changes>> {
        // Result is stored as a map with "Ok" or "Err" key at the field location
        match doc.get(obj, key)? {
            Some((_, map_id)) => {
                let has_ok = doc.get(&map_id, "Ok")?.is_some();
                let has_err = doc.get(&map_id, "Err")?.is_some();

                match (self.is_ok, has_ok, has_err) {
                    // No previous state - treat as new
                    (None, true, false) => Ok(ResultChanges::BecameOk),
                    (None, false, true) => Ok(ResultChanges::BecameErr),
                    (None, _, _) => Ok(ResultChanges::Unchanged),

                    // Was Ok, still Ok - check inner
                    (Some(true), true, false) => {
                        if let Some((_, ok_id)) = doc.get(&map_id, "Ok")? {
                            let inner_changes = self.ok_cursor.diff(doc, &ok_id)?;
                            if inner_changes.any() {
                                Ok(ResultChanges::OkInner(inner_changes))
                            } else {
                                Ok(ResultChanges::Unchanged)
                            }
                        } else {
                            Ok(ResultChanges::BecameErr)
                        }
                    }

                    // Was Err, still Err - check inner
                    (Some(false), false, true) => {
                        if let Some((_, err_id)) = doc.get(&map_id, "Err")? {
                            let inner_changes = self.err_cursor.diff(doc, &err_id)?;
                            if inner_changes.any() {
                                Ok(ResultChanges::ErrInner(inner_changes))
                            } else {
                                Ok(ResultChanges::Unchanged)
                            }
                        } else {
                            Ok(ResultChanges::BecameOk)
                        }
                    }

                    // Variant changes
                    (Some(true), false, true) => Ok(ResultChanges::BecameErr),
                    (Some(false), true, false) => Ok(ResultChanges::BecameOk),

                    // Invalid states
                    (_, true, true) => Err(Error::invalid_value(
                        "Result cannot have both 'Ok' and 'Err' keys",
                    )),
                    (_, false, false) => Ok(ResultChanges::Unchanged),
                }
            }
            None => {
                // Result was deleted
                match self.is_ok {
                    Some(_) => Ok(ResultChanges::Unchanged),
                    None => Ok(ResultChanges::Unchanged),
                }
            }
        }
    }

    /// Refresh this cursor from the current document state at a key.
    ///
    /// This is used internally by struct cursors to refresh Result fields.
    pub fn refresh_at_key<D: ReadDoc>(
        &mut self,
        doc: &D,
        obj: &ObjId,
        key: &str,
    ) -> crate::Result<()> {
        match doc.get(obj, key)? {
            Some((_, map_id)) => {
                self.map_id = Some(map_id.clone());

                let has_ok = doc.get(&map_id, "Ok")?.is_some();
                let has_err = doc.get(&map_id, "Err")?.is_some();

                if has_ok {
                    self.is_ok = Some(true);
                    if let Some((_, ok_id)) = doc.get(&map_id, "Ok")? {
                        self.ok_cursor.refresh(doc, &ok_id)?;
                    }
                } else if has_err {
                    self.is_ok = Some(false);
                    if let Some((_, err_id)) = doc.get(&map_id, "Err")? {
                        self.err_cursor.refresh(doc, &err_id)?;
                    }
                }
            }
            None => {
                self.is_ok = None;
                self.map_id = None;
            }
        }
        Ok(())
    }
}

impl<S: Automorph> Automorph for Option<S> {
    type Changes = OptionChanges<S::Changes>;
    type Cursor = ScalarCursor;

    fn save<D: Transactable + ReadDoc>(
        &self,
        doc: &mut D,
        obj: impl AsRef<ObjId>,
        prop: impl Into<Prop>,
    ) -> Result<()> {
        let prop: Prop = prop.into();
        let obj = obj.as_ref();
        let cur = doc.get(obj, prop.clone())?;

        match (self, &cur) {
            // Both None/Null - nothing to do
            (None, None) => {}
            (None, Some((Value::Scalar(v), _))) if v.is_null() => {}
            // Need to set to null
            (None, _) => match (&cur, &prop) {
                (None, Prop::Seq(s)) => {
                    doc.insert(obj, *s, ScalarValue::Null)?;
                }
                _ => {
                    doc.put(obj, prop, ScalarValue::Null)?;
                }
            },
            // Has a value - save it
            (Some(v), _) => {
                v.save(doc, obj, prop)?;
            }
        }
        Ok(())
    }

    fn load<D: ReadDoc>(doc: &D, obj: impl AsRef<ObjId>, prop: impl Into<Prop>) -> Result<Self> {
        let prop: Prop = prop.into();
        let obj = obj.as_ref();
        match doc.get(obj, prop.clone())? {
            None => Ok(None),
            Some((Value::Scalar(v), _)) if v.is_null() => Ok(None),
            Some(_) => {
                let value = S::load(doc, obj, prop)?;
                Ok(Some(value))
            }
        }
    }

    fn load_at<D: ReadDoc>(
        doc: &D,
        obj: impl AsRef<ObjId>,
        prop: impl Into<Prop>,
        heads: &[ChangeHash],
    ) -> Result<Self> {
        let prop: Prop = prop.into();
        let obj = obj.as_ref();
        match doc.get_at(obj, prop.clone(), heads)? {
            None => Ok(None),
            Some((Value::Scalar(v), _)) if v.is_null() => Ok(None),
            Some(_) => {
                let value = S::load_at(doc, obj, prop, heads)?;
                Ok(Some(value))
            }
        }
    }

    fn diff<D: ReadDoc>(
        &self,
        doc: &D,
        obj: impl AsRef<ObjId>,
        prop: impl Into<Prop>,
    ) -> Result<Self::Changes> {
        let prop: Prop = prop.into();
        let obj = obj.as_ref();
        match (self, doc.get(obj, prop.clone())?) {
            // Both None
            (None, None) => Ok(OptionChanges::Unchanged),
            (None, Some((Value::Scalar(v), _))) if v.is_null() => Ok(OptionChanges::Unchanged),
            // Self is None, doc has Some
            (None, Some(_)) => Ok(OptionChanges::BecameNone),
            // Self is Some, doc has None
            (Some(_), None) => Ok(OptionChanges::BecameSome),
            (Some(_), Some((Value::Scalar(v), _))) if v.is_null() => Ok(OptionChanges::BecameSome),
            // Both Some - delegate to inner type
            (Some(v), Some(_)) => {
                let inner_changes = v.diff(doc, obj, prop)?;
                Ok(OptionChanges::Inner(inner_changes))
            }
        }
    }

    fn diff_at<D: ReadDoc>(
        &self,
        doc: &D,
        obj: impl AsRef<ObjId>,
        prop: impl Into<Prop>,
        heads: &[ChangeHash],
    ) -> Result<Self::Changes> {
        let prop: Prop = prop.into();
        let obj = obj.as_ref();
        match (self, doc.get_at(obj, prop.clone(), heads)?) {
            // Both None
            (None, None) => Ok(OptionChanges::Unchanged),
            (None, Some((Value::Scalar(v), _))) if v.is_null() => Ok(OptionChanges::Unchanged),
            // Self is None, doc has Some
            (None, Some(_)) => Ok(OptionChanges::BecameNone),
            // Self is Some, doc has None
            (Some(_), None) => Ok(OptionChanges::BecameSome),
            (Some(_), Some((Value::Scalar(v), _))) if v.is_null() => Ok(OptionChanges::BecameSome),
            // Both Some - delegate to inner type
            (Some(v), Some(_)) => {
                let inner_changes = v.diff_at(doc, obj, prop, heads)?;
                Ok(OptionChanges::Inner(inner_changes))
            }
        }
    }

    fn update<D: ReadDoc>(
        &mut self,
        doc: &D,
        obj: impl AsRef<ObjId>,
        prop: impl Into<Prop>,
    ) -> Result<Self::Changes> {
        let prop: Prop = prop.into();
        let obj = obj.as_ref();
        match doc.get(obj, prop.clone())? {
            None => {
                let was_some = self.is_some();
                *self = None;
                Ok(if was_some {
                    OptionChanges::BecameNone
                } else {
                    OptionChanges::Unchanged
                })
            }
            Some((Value::Scalar(v), _)) if v.is_null() => {
                let was_some = self.is_some();
                *self = None;
                Ok(if was_some {
                    OptionChanges::BecameNone
                } else {
                    OptionChanges::Unchanged
                })
            }
            Some(_) => {
                match self {
                    Some(inner) => {
                        // Update existing inner value
                        let inner_changes = inner.update(doc, obj, prop)?;
                        Ok(OptionChanges::Inner(inner_changes))
                    }
                    None => {
                        // Load new value
                        let value = S::load(doc, obj, prop)?;
                        *self = Some(value);
                        Ok(OptionChanges::BecameSome)
                    }
                }
            }
        }
    }

    fn update_at<D: ReadDoc>(
        &mut self,
        doc: &D,
        obj: impl AsRef<ObjId>,
        prop: impl Into<Prop>,
        heads: &[ChangeHash],
    ) -> Result<Self::Changes> {
        let prop: Prop = prop.into();
        let obj = obj.as_ref();
        match doc.get_at(obj, prop.clone(), heads)? {
            None => {
                let was_some = self.is_some();
                *self = None;
                Ok(if was_some {
                    OptionChanges::BecameNone
                } else {
                    OptionChanges::Unchanged
                })
            }
            Some((Value::Scalar(v), _)) if v.is_null() => {
                let was_some = self.is_some();
                *self = None;
                Ok(if was_some {
                    OptionChanges::BecameNone
                } else {
                    OptionChanges::Unchanged
                })
            }
            Some(_) => {
                match self {
                    Some(inner) => {
                        // Update existing inner value
                        let inner_changes = inner.update_at(doc, obj, prop, heads)?;
                        Ok(OptionChanges::Inner(inner_changes))
                    }
                    None => {
                        // Load new value
                        let value = S::load_at(doc, obj, prop, heads)?;
                        *self = Some(value);
                        Ok(OptionChanges::BecameSome)
                    }
                }
            }
        }
    }
}

impl<O: Automorph, E: Automorph> Automorph for std::result::Result<O, E> {
    type Changes = ResultChanges<O::Changes, E::Changes>;
    type Cursor = ScalarCursor;

    fn save<D: Transactable + ReadDoc>(
        &self,
        doc: &mut D,
        obj: impl AsRef<ObjId>,
        prop: impl Into<Prop>,
    ) -> Result<()> {
        let prop: Prop = prop.into();
        let obj = obj.as_ref();
        let cur = doc.get(obj, prop.clone())?;

        // Result is stored as a map with either "Ok" or "Err" key
        let map_id = match cur {
            Some((Value::Object(ObjType::Map), id)) => {
                // Clean up old keys if variant changed
                let keys: Vec<String> = doc.keys(&id).collect();
                for k in keys {
                    let should_delete = match self {
                        Ok(_) => k != "Ok",
                        Err(_) => k != "Err",
                    };
                    if should_delete {
                        doc.delete(&id, &k)?;
                    }
                }
                id
            }
            _ => doc.put_object(obj, prop, ObjType::Map)?,
        };

        match self {
            Ok(v) => v.save(doc, &map_id, "Ok")?,
            Err(e) => e.save(doc, &map_id, "Err")?,
        }

        Ok(())
    }

    fn load<D: ReadDoc>(doc: &D, obj: impl AsRef<ObjId>, prop: impl Into<Prop>) -> Result<Self> {
        let prop: Prop = prop.into();
        let obj = obj.as_ref();
        match doc.get(obj, prop)? {
            Some((Value::Object(ObjType::Map), id)) => {
                if doc.get(&id, "Ok")?.is_some() {
                    let value = O::load(doc, &id, "Ok").map_err(|e| e.with_field("Ok"))?;
                    Ok(Ok(value))
                } else if doc.get(&id, "Err")?.is_some() {
                    let value = E::load(doc, &id, "Err").map_err(|e| e.with_field("Err"))?;
                    Ok(Err(value))
                } else {
                    Err(Error::invalid_value("Result must have 'Ok' or 'Err' key"))
                }
            }
            Some((v, _)) => Err(Error::type_mismatch(
                "Result (Map)",
                Some(format!("{:?}", v)),
            )),
            None => Err(Error::missing_value()),
        }
    }

    fn load_at<D: ReadDoc>(
        doc: &D,
        obj: impl AsRef<ObjId>,
        prop: impl Into<Prop>,
        heads: &[ChangeHash],
    ) -> Result<Self> {
        let prop: Prop = prop.into();
        let obj = obj.as_ref();
        match doc.get_at(obj, prop, heads)? {
            Some((Value::Object(ObjType::Map), id)) => {
                if doc.get_at(&id, "Ok", heads)?.is_some() {
                    let value =
                        O::load_at(doc, &id, "Ok", heads).map_err(|e| e.with_field("Ok"))?;
                    Ok(Ok(value))
                } else if doc.get_at(&id, "Err", heads)?.is_some() {
                    let value =
                        E::load_at(doc, &id, "Err", heads).map_err(|e| e.with_field("Err"))?;
                    Ok(Err(value))
                } else {
                    Err(Error::invalid_value("Result must have 'Ok' or 'Err' key"))
                }
            }
            Some((v, _)) => Err(Error::type_mismatch(
                "Result (Map)",
                Some(format!("{:?}", v)),
            )),
            None => Err(Error::missing_value()),
        }
    }

    fn diff<D: ReadDoc>(
        &self,
        doc: &D,
        obj: impl AsRef<ObjId>,
        prop: impl Into<Prop>,
    ) -> Result<Self::Changes> {
        let prop: Prop = prop.into();
        let obj = obj.as_ref();
        match doc.get(obj, prop)? {
            Some((Value::Object(ObjType::Map), id)) => {
                let has_ok = doc.get(&id, "Ok")?.is_some();
                let has_err = doc.get(&id, "Err")?.is_some();

                match (self, has_ok, has_err) {
                    (Ok(v), true, false) => {
                        let inner_changes = v.diff(doc, &id, "Ok")?;
                        Ok(ResultChanges::OkInner(inner_changes))
                    }
                    (Err(e), false, true) => {
                        let inner_changes = e.diff(doc, &id, "Err")?;
                        Ok(ResultChanges::ErrInner(inner_changes))
                    }
                    // Variant mismatch - self is Ok, doc has Err
                    (Ok(_), false, true) => Ok(ResultChanges::BecameOk),
                    // Variant mismatch - self is Err, doc has Ok
                    (Err(_), true, false) => Ok(ResultChanges::BecameErr),
                    // Both keys present - invalid state
                    (_, true, true) => Err(Error::invalid_value(
                        "Result cannot have both 'Ok' and 'Err' keys",
                    )),
                    // Neither key present - invalid
                    (_, false, false) => {
                        Err(Error::invalid_value("Result must have 'Ok' or 'Err' key"))
                    }
                }
            }
            Some((v, _)) => Err(Error::type_mismatch(
                "Result (Map)",
                Some(format!("{:?}", v)),
            )),
            None => Err(Error::missing_value()),
        }
    }

    fn diff_at<D: ReadDoc>(
        &self,
        doc: &D,
        obj: impl AsRef<ObjId>,
        prop: impl Into<Prop>,
        heads: &[ChangeHash],
    ) -> Result<Self::Changes> {
        let prop: Prop = prop.into();
        let obj = obj.as_ref();
        match doc.get_at(obj, prop, heads)? {
            Some((Value::Object(ObjType::Map), id)) => {
                let has_ok = doc.get_at(&id, "Ok", heads)?.is_some();
                let has_err = doc.get_at(&id, "Err", heads)?.is_some();

                match (self, has_ok, has_err) {
                    (Ok(v), true, false) => {
                        let inner_changes = v.diff_at(doc, &id, "Ok", heads)?;
                        Ok(ResultChanges::OkInner(inner_changes))
                    }
                    (Err(e), false, true) => {
                        let inner_changes = e.diff_at(doc, &id, "Err", heads)?;
                        Ok(ResultChanges::ErrInner(inner_changes))
                    }
                    // Variant mismatch - self is Ok, doc has Err
                    (Ok(_), false, true) => Ok(ResultChanges::BecameOk),
                    // Variant mismatch - self is Err, doc has Ok
                    (Err(_), true, false) => Ok(ResultChanges::BecameErr),
                    // Both keys present - invalid state
                    (_, true, true) => Err(Error::invalid_value(
                        "Result cannot have both 'Ok' and 'Err' keys",
                    )),
                    // Neither key present - invalid
                    (_, false, false) => {
                        Err(Error::invalid_value("Result must have 'Ok' or 'Err' key"))
                    }
                }
            }
            Some((v, _)) => Err(Error::type_mismatch(
                "Result (Map)",
                Some(format!("{:?}", v)),
            )),
            None => Err(Error::missing_value()),
        }
    }

    fn update<D: ReadDoc>(
        &mut self,
        doc: &D,
        obj: impl AsRef<ObjId>,
        prop: impl Into<Prop>,
    ) -> Result<Self::Changes> {
        let prop: Prop = prop.into();
        let obj = obj.as_ref();
        match doc.get(obj, prop)? {
            Some((Value::Object(ObjType::Map), id)) => {
                let has_ok = doc.get(&id, "Ok")?.is_some();
                let has_err = doc.get(&id, "Err")?.is_some();

                match (self, has_ok, has_err) {
                    // Both have Ok
                    (Ok(v), true, false) => {
                        let inner_changes =
                            v.update(doc, &id, "Ok").map_err(|e| e.with_field("Ok"))?;
                        Ok(ResultChanges::OkInner(inner_changes))
                    }
                    // Both have Err
                    (Err(e), false, true) => {
                        let inner_changes = e
                            .update(doc, &id, "Err")
                            .map_err(|err| err.with_field("Err"))?;
                        Ok(ResultChanges::ErrInner(inner_changes))
                    }
                    // Variant changed from Err to Ok
                    (s @ Err(_), true, false) => {
                        let value = O::load(doc, &id, "Ok").map_err(|e| e.with_field("Ok"))?;
                        *s = Ok(value);
                        Ok(ResultChanges::BecameOk)
                    }
                    // Variant changed from Ok to Err
                    (s @ Ok(_), false, true) => {
                        let value = E::load(doc, &id, "Err").map_err(|e| e.with_field("Err"))?;
                        *s = Err(value);
                        Ok(ResultChanges::BecameErr)
                    }
                    // Both keys present - invalid state
                    (_, true, true) => Err(Error::invalid_value(
                        "Result cannot have both 'Ok' and 'Err' keys",
                    )),
                    // Neither key present - invalid state
                    (_, false, false) => {
                        Err(Error::invalid_value("Result must have 'Ok' or 'Err' key"))
                    }
                }
            }
            Some((v, _)) => Err(Error::type_mismatch(
                "Result (Map)",
                Some(format!("{:?}", v)),
            )),
            None => Err(Error::missing_value()),
        }
    }

    fn update_at<D: ReadDoc>(
        &mut self,
        doc: &D,
        obj: impl AsRef<ObjId>,
        prop: impl Into<Prop>,
        heads: &[ChangeHash],
    ) -> Result<Self::Changes> {
        let prop: Prop = prop.into();
        let obj = obj.as_ref();
        match doc.get_at(obj, prop, heads)? {
            Some((Value::Object(ObjType::Map), id)) => {
                let has_ok = doc.get_at(&id, "Ok", heads)?.is_some();
                let has_err = doc.get_at(&id, "Err", heads)?.is_some();

                match (self, has_ok, has_err) {
                    // Both have Ok
                    (Ok(v), true, false) => {
                        let inner_changes = v
                            .update_at(doc, &id, "Ok", heads)
                            .map_err(|e| e.with_field("Ok"))?;
                        Ok(ResultChanges::OkInner(inner_changes))
                    }
                    // Both have Err
                    (Err(e), false, true) => {
                        let inner_changes = e
                            .update_at(doc, &id, "Err", heads)
                            .map_err(|err| err.with_field("Err"))?;
                        Ok(ResultChanges::ErrInner(inner_changes))
                    }
                    // Variant changed from Err to Ok
                    (s @ Err(_), true, false) => {
                        let value =
                            O::load_at(doc, &id, "Ok", heads).map_err(|e| e.with_field("Ok"))?;
                        *s = Ok(value);
                        Ok(ResultChanges::BecameOk)
                    }
                    // Variant changed from Ok to Err
                    (s @ Ok(_), false, true) => {
                        let value =
                            E::load_at(doc, &id, "Err", heads).map_err(|e| e.with_field("Err"))?;
                        *s = Err(value);
                        Ok(ResultChanges::BecameErr)
                    }
                    // Both keys present - invalid state
                    (_, true, true) => Err(Error::invalid_value(
                        "Result cannot have both 'Ok' and 'Err' keys",
                    )),
                    // Neither key present - invalid state
                    (_, false, false) => {
                        Err(Error::invalid_value("Result must have 'Ok' or 'Err' key"))
                    }
                }
            }
            Some((v, _)) => Err(Error::type_mismatch(
                "Result (Map)",
                Some(format!("{:?}", v)),
            )),
            None => Err(Error::missing_value()),
        }
    }
}