com.fofx.observething 1.1.0 → 1.1.1-dev.161

package/Runtime/{Observables/WhereObservable.cs → Operators/WhereOperator.cs}

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace ObserveThing
 {
-    public class WhereObservable<T> : IDisposable
+    public class WhereOperator<T> : IDisposable
     {
         private ObservableCollection<T> _operand;
         private Func<T, IValueObservable<bool>> _where;
@@ -18,7 +18,7 @@ namespace ObserveThing
             public IDisposable subscription;
         }
 
-        public WhereObservable(ICollectionObservable<T> source, Func<T, IValueObservable<bool>> where, ObservableCollection<T> operand)
+        public WhereOperator(ICollectionObservable<T> source, Func<T, IValueObservable<bool>> where, ObservableCollection<T> operand)
         {
             _operand = operand;
             _where = where;

package/Runtime/{Observables/WithPreviousObservable.cs → Operators/WithPreviousOperator.cs}

@@ -2,13 +2,13 @@ using System;
 
 namespace ObserveThing
 {
-    public class WithPreviousObservable<T> : IDisposable
+    public class WithPreviousOperator<T> : IDisposable
     {
         private ObservableValue<(T previous, T current)> _operand;
         private T _previousValue;
         private IDisposable _subscriptions;
 
-        public WithPreviousObservable(IValueObservable<T> source, ObservableValue<(T previous, T current)> operand)
+        public WithPreviousOperator(IValueObservable<T> source, ObservableValue<(T previous, T current)> operand)
         {
             _operand = operand;
             _subscriptions = source.Subscribe(

package/Tests/CollectionObservableTests.cs

@@ -11,7 +11,7 @@ namespace ObserveThing.Tests
         [SetUp]
         public void SetUp()
         {
-            Settings.DefaultExceptionHandler = UnityEngine.Debug.LogException;
+            ObservationDefaults.DefaultExceptionHandler = UnityEngine.Debug.LogException;
         }
 
         private T Peek<T>(IValueObservable<T> observable)

package/Tests/DictionaryObservableTests.cs

@@ -10,7 +10,7 @@ namespace ObserveThing.Tests
         [SetUp]
         public void SetUp()
         {
-            Settings.DefaultExceptionHandler = UnityEngine.Debug.LogException;
+            ObservationDefaults.DefaultExceptionHandler = UnityEngine.Debug.LogException;
         }
 
         [Test]

package/Tests/ListObservableTests.cs

@@ -10,7 +10,7 @@ namespace ObserveThing.Tests
         [SetUp]
         public void SetUp()
         {
-            Settings.DefaultExceptionHandler = UnityEngine.Debug.LogException;
+            ObservationDefaults.DefaultExceptionHandler = UnityEngine.Debug.LogException;
         }
 
         [Test]

package/Tests/ObservationContextTests.cs

@@ -10,6 +10,26 @@ namespace ObserveThing.Tests
 {
     public class ObservationContextTests
     {
+        public struct TestValueOperation
+        {
+            public IObservable source;
+            public object value;
+        }
+
+        public struct TestValueSubscriptionOperation
+        {
+            public int source;
+            public object value;
+        }
+
+        public struct TestCollectionOperation
+        {
+            public IObservable source;
+            public int index;
+            public object value;
+            public bool isRemove;
+        }
+
         [Test]
         public void TestOperationOrder()
         {
@@ -17,24 +37,27 @@ namespace ObserveThing.Tests
 
             ObservableValue<int> intObservable = new ObservableValue<int>(context, 100);
             ObservableValue<string> stringObservable = new ObservableValue<string>(context, "200");
-            List<(object source, object value)> operations = new List<(object source, object value)>();
+            List<TestValueOperation> operations = new List<TestValueOperation>();
 
             int callCount = 0;
 
-            var stream = Observables.ObservableCombine(intObservable, stringObservable).Subscribe(
+            var stream = Operators.ObservableCombine(
+                intObservable.ObservableEventStream(x => new TestValueOperation() { source = intObservable, value = x }),
+                stringObservable.ObservableEventStream(x => new TestValueOperation() { source = stringObservable, value = x })
+            ).Subscribe(
                 onNext: op =>
                 {
                     callCount++;
-                    operations.Add(new(op.source, ((IValueOp)op).value));
+                    operations.Add(op);
                 }
             );
 
             Assert.AreEqual(2, callCount);
             Assert.AreEqual(
-                new List<(object, object)>
+                new List<TestValueOperation>
                 {
-                    new(intObservable, 100),
-                    new(stringObservable, "200")
+                    new() { source = intObservable, value = 100 },
+                    new() { source = stringObservable, value = "200" }
                 },
                 operations
             );
@@ -53,13 +76,13 @@ namespace ObserveThing.Tests
 
             Assert.AreEqual(5, callCount);
             Assert.AreEqual(
-                new List<(object, object)>
+                new List<TestValueOperation>
                 {
-                    new(intObservable, 1),
-                    new(stringObservable, "2"),
-                    new(intObservable, 3),
-                    new(intObservable, 4),
-                    new(stringObservable, "5"),
+                    new() { source = intObservable, value = 1 },
+                    new() { source = stringObservable, value = "2" },
+                    new() { source = intObservable, value = 3 },
+                    new() { source = intObservable, value = 4 },
+                    new() { source = stringObservable, value = "5" },
                 },
                 operations
             );
@@ -72,7 +95,7 @@ namespace ObserveThing.Tests
 
             ObservableValue<int> intObservable = new ObservableValue<int>(context);
 
-            List<(int observer, int value)> observerCallOrder = new List<(int observer, int value)>();
+            List<TestValueSubscriptionOperation> observerCallOrder = new List<TestValueSubscriptionOperation>();
 
             IDisposable subscription1 = default;
             IDisposable subscription2 = default;
@@ -81,13 +104,13 @@ namespace ObserveThing.Tests
             IDisposable subscription5 = default;
 
             subscription1 = intObservable.Subscribe(
-                onNext: value => observerCallOrder.Add(new(1, value))
+                onNext: value => observerCallOrder.Add(new() { source = 1, value = value })
             );
 
             subscription2 = intObservable.Subscribe(
                 onNext: value =>
                 {
-                    observerCallOrder.Add(new(2, value));
+                    observerCallOrder.Add(new() { source = 2, value = value });
 
                     if (value == 1)
                         intObservable.value = 2;
@@ -97,7 +120,7 @@ namespace ObserveThing.Tests
             subscription3 = intObservable.Subscribe(
                 onNext: value =>
                 {
-                    observerCallOrder.Add(new(3, value));
+                    observerCallOrder.Add(new() { source = 3, value = value });
 
                     if (value == 2)
                     {
@@ -108,11 +131,11 @@ namespace ObserveThing.Tests
             );
 
             subscription4 = intObservable.Subscribe(
-                onNext: value => observerCallOrder.Add(new(4, value))
+                onNext: value => observerCallOrder.Add(new() { source = 4, value = value })
             );
 
             subscription5 = intObservable.Subscribe(
-                onNext: value => observerCallOrder.Add(new(5, value))
+                onNext: value => observerCallOrder.Add(new() { source = 5, value = value })
             );
 
             intObservable.value = 1;
@@ -120,26 +143,26 @@ namespace ObserveThing.Tests
             Assert.AreEqual(3, intObservable.value);
 
             Assert.AreEqual(
-                new List<(int observer, int value)>()
+                new List<TestValueSubscriptionOperation>()
                 {
-                    new (1, 0), //init observer1
-                    new (2, 0), //init observer2
-                    new (3, 0), //init observer3
-                    new (4, 0), //init observer4
-                    new (5, 0), //init observer5
-                    new (1, 1), //observer1 observes external setting intObservable to 1
-                    new (2, 1), //observer2 observes external setting intObservable to 1
-                    new (1, 2), //observer1 observes observer2 setting intObservable to 2
-                    new (2, 2), //observer2 observes observer2 setting intObservable to 2
-                    new (3, 1), //observer3 observes external setting intObservable to 1
-                    new (3, 2), //observer3 observes observer2 setting intObservable to 2
+                    new () { source = 1, value = 0}, //init observer1
+                    new () { source = 2, value = 0}, //init observer2
+                    new () { source = 3, value = 0}, //init observer3
+                    new () { source = 4, value = 0}, //init observer4
+                    new () { source = 5, value = 0}, //init observer5
+                    new () { source = 1, value = 1}, //observer1 observes external setting intObservable to 1
+                    new () { source = 2, value = 1}, //observer2 observes external setting intObservable to 1
+                    new () { source = 1, value = 2}, //observer1 observes observer2 setting intObservable to 2
+                    new () { source = 2, value = 2}, //observer2 observes observer2 setting intObservable to 2
+                    new () { source = 3, value = 1}, //observer3 observes external setting intObservable to 1
+                    new () { source = 3, value = 2}, //observer3 observes observer2 setting intObservable to 2
                     //4, //observer4 is never called past the init because it gets unsubscribed by observer3
-                    new (1, 3), //observer1 observes observer3 setting intObservable to 3
-                    new (2, 3), //observer2 observes observer3 setting intObservable to 3
-                    new (3, 3), //observer3 observes observer3 setting intObservable to 3
-                    new (5, 1), //observer5 observes external setting intObservable to 1
-                    new (5, 2), //observer5 observes observer2 setting intObservable to 2
-                    new (5, 3) //observer5 observes observer3 setting intObservable to 3
+                    new () { source = 1, value = 3}, //observer1 observes observer3 setting intObservable to 3
+                    new () { source = 2, value = 3}, //observer2 observes observer3 setting intObservable to 3
+                    new () { source = 3, value = 3}, //observer3 observes observer3 setting intObservable to 3
+                    new () { source = 5, value = 1}, //observer5 observes external setting intObservable to 1
+                    new () { source = 5, value = 2}, //observer5 observes observer2 setting intObservable to 2
+                    new () { source = 5, value = 3} //observer5 observes observer3 setting intObservable to 3
                 },
                 observerCallOrder
             );
@@ -153,14 +176,17 @@ namespace ObserveThing.Tests
             ObservableValue<int> intObservable = new ObservableValue<int>(context);
             ObservableValue<string> stringObservable = new ObservableValue<string>(context);
 
-            var query = Observables.ObservableCombine(intObservable, stringObservable);
+            var query = Operators.ObservableCombine(
+                intObservable.ObservableEventStream(x => new TestValueOperation() { source = intObservable, value = x }),
+                stringObservable.ObservableEventStream(x => new TestValueOperation() { source = stringObservable, value = x })
+            );
 
-            List<(object source, object value)> observerCallOrder = new List<(object source, object value)>();
+            List<TestValueOperation> observerCallOrder = new List<TestValueOperation>();
 
             IDisposable subscription = query.Subscribe(
                 onNext: op =>
                 {
-                    observerCallOrder.Add(new(op.source, ((IValueOp)op).value));
+                    observerCallOrder.Add(op);
 
                     if (intObservable.value == 2)
                     {
@@ -181,21 +207,21 @@ namespace ObserveThing.Tests
             intObservable.value = 4;
 
             Assert.AreEqual(
-                new List<(object source, object value)>()
+                new List<TestValueOperation>()
                 {
-                    new(intObservable, 0),
-                    new(stringObservable, null),
-                    new(intObservable, 1),
-                    new(stringObservable, "cat"),
-                    new(stringObservable, "dog"),
-                    new(intObservable, 2),
-                    new(intObservable, 6),
-                    new(intObservable, 7),
-                    new(intObservable, 8),
-                    new(stringObservable, "mouse"),
-                    new(stringObservable, "frog"),
-                    new(intObservable, 3),
-                    new(intObservable, 4),
+                    new() { source = intObservable, value = 0},
+                    new() { source = stringObservable, value = null},
+                    new() { source = intObservable, value = 1},
+                    new() { source = stringObservable, value = "cat"},
+                    new() { source = stringObservable, value = "dog"},
+                    new() { source = intObservable, value = 2},
+                    new() { source = intObservable, value = 6},
+                    new() { source = intObservable, value = 7},
+                    new() { source = intObservable, value = 8},
+                    new() { source = stringObservable, value = "mouse"},
+                    new() { source = stringObservable, value = "frog"},
+                    new() { source = intObservable, value = 3},
+                    new() { source = intObservable, value = 4},
                 },
                 observerCallOrder
             );
@@ -210,7 +236,10 @@ namespace ObserveThing.Tests
             var disposeCallCount = 0;
             var disposed = false;
 
-            var query = Observables.ObservableCombine(observable1, observable2);
+            var query = Operators.ObservableCombine(
+                observable1.ObservableCast<object>().ObservableEventStream(),
+                observable2.ObservableCast<object>().ObservableEventStream()
+            );
 
             var stream = query.Subscribe(
                 onDispose: () =>
@@ -296,22 +325,21 @@ namespace ObserveThing.Tests
             dictionary.Add("dog", 2);
             dictionary.Add("frog", 3);
 
-            var initOps = new List<(object source, object value, bool isRemove)>();
+            var initOps = new List<TestCollectionOperation>();
 
-            Observables.ObservableCombine(dictionary).Subscribe(onNext: op =>
+            Operators.ObservableCombine(dictionary.ObservableEventStream()).Subscribe(onNext: op =>
             {
-                var args = (DictionaryOp<string, int>)op;
-                initOps.Add(new(op.source, new KeyValuePair<string, int>(args.key, args.value), args.isRemove));
+                initOps.Add(new() { source = op.source, value = new KeyValuePair<string, int>(op.key, op.value), isRemove = op.isRemove });
             });
 
             Assert.That(
                 initOps,
                 Is.EqualTo(
-                    new List<(object source, object value, bool isRemove)>()
+                    new List<TestCollectionOperation>()
                     {
-                        new(dictionary, KeyValuePair.Create("cat", 1), false),
-                        new(dictionary, KeyValuePair.Create("dog", 2), false),
-                        new(dictionary, KeyValuePair.Create("frog", 3), false)
+                        new TestCollectionOperation() { source = dictionary, value=  KeyValuePair.Create("cat", 1), isRemove = false},
+                        new TestCollectionOperation() { source = dictionary, value = KeyValuePair.Create("dog", 2), isRemove = false },
+                        new TestCollectionOperation() { source = dictionary, value = KeyValuePair.Create("frog", 3), isRemove = false }
                     }
                 )
             );
@@ -325,32 +353,30 @@ namespace ObserveThing.Tests
             list.Add(-1000f);
             list.Insert(1, 50f);
 
-            var subscription = Observables.ObservableCombine(dictionary, list).Subscribe(onNext: op =>
-            {
-                if (op.source == dictionary)
-                {
-                    var args = (DictionaryOp<string, int>)op;
-                    initOps.Add(new(op.source, new KeyValuePair<string, int>(args.key, args.value), args.isRemove));
-                }
-                else
-                {
-                    var args = (ListOp<float>)op;
-                    initOps.Add(new(op.source, args.element, args.isRemove));
-                }
-            });
+            var subscription = Operators.ObservableCombine(
+                false,
+                dictionary.ObservableEventStream(
+                    (id, kvp) => new TestCollectionOperation() { source = dictionary, value = kvp, isRemove = false },
+                    (id, kvp) => new TestCollectionOperation() { source = dictionary, value = kvp, isRemove = true }
+                ),
+                list.ObservableEventStream(
+                    (id, index, element) => new TestCollectionOperation() { source = list, index = index, value = element, isRemove = false },
+                    (id, index, element) => new TestCollectionOperation() { source = list, index = index, value = element, isRemove = true }
+                )
+            ).Subscribe(onNext: op => initOps.Add(op));
 
             Assert.That(
                 initOps,
                 Is.EqualTo(
-                    new List<(object source, object value, bool isRemove)>()
+                    new List<TestCollectionOperation>()
                     {
-                        new(dictionary, KeyValuePair.Create("cat", 1), false),
-                        new(dictionary, KeyValuePair.Create("dog", 2), false),
-                        new(dictionary, KeyValuePair.Create("frog", 3), false),
-                        new(list, 0.22f, false),
-                        new(list, 50f, false),
-                        new(list, 0.11f, false),
-                        new(list, -1000f, false)
+                        new () { source = dictionary, value = KeyValuePair.Create("cat", 1), isRemove = false },
+                        new () { source = dictionary, value = KeyValuePair.Create("dog", 2), isRemove = false },
+                        new () { source = dictionary, value = KeyValuePair.Create("frog", 3), isRemove = false },
+                        new () { source = list, index = 0, value = 0.22f, isRemove = false },
+                        new () { source = list, index = 1, value = 50f, isRemove = false },
+                        new () { source = list, index = 2, value = 0.11f, isRemove = false },
+                        new () { source = list, index = 3, value = -1000f, isRemove = false }
                     }
                 )
             );

package/Tests/ValueObservableTests.cs

@@ -12,7 +12,7 @@ namespace ObserveThing.Tests
         [SetUp]
         public void SetUp()
         {
-            Settings.DefaultExceptionHandler = UnityEngine.Debug.LogException;
+            ObservationDefaults.DefaultExceptionHandler = UnityEngine.Debug.LogException;
         }
 
         [Test]

package/package.json

@@ -1,6 +1,7 @@
 {
+  "version": "1.1.1-dev.161",
+  "dependencies": {},
   "name": "com.fofx.observething",
-  "version": "1.1.0",
   "description": "An observable event stream library.",
   "keywords": [
     "observability",
@@ -9,13 +10,13 @@
     "C#",
     "csharp"
   ],
-  "homepage": "https://github.com/outernet-foundation/ObserveThing#readme",
+  "homepage": "https://github.com/FofX-Games/ObserveThing#readme",
   "bugs": {
-    "url": "https://github.com/outernet-foundation/ObserveThing/issues"
+    "url": "https://github.com/FofX-Games/ObserveThing/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/outernet-foundation/ObserveThing.git"
+    "url": "https://github.com/FofX-Games/ObserveThing"
   },
   "license": "MIT",
   "author": "Elliot Pjecha <epjecha@gmail.com>",

package/Runtime/Observables/BatchObservable.cs

@@ -1,72 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace ObserveThing
-{
-    public class BatchObservable<T> : IInitializationOperationsProvider<BatchOp<T>>, IPendingObserver where T : IOperation
-    {
-        public bool immediate { get; } = false;
-        public uint priority { get; private set; }
-        public bool disposed { get; private set; }
-
-        private IObservable<T> _source;
-        private Observable<BatchOp<T>> _operand;
-        private IDisposable _subscriptions;
-        private bool _pending;
-
-        private List<T> _batchedOperations = new List<T>();
-
-        public BatchObservable(IObservable<T> source, Observable<BatchOp<T>> operand)
-        {
-            priority = source.context.AllocateObserverPriority();
-
-            _source = source;
-            _operand = operand;
-
-            _subscriptions = source.Subscribe(new Observer<T>(
-                onNext: HandleSourceOperation,
-                onError: operand.OnError,
-                onDispose: Dispose
-            ), immediate: true);
-        }
-
-        private void HandleSourceOperation(T operation)
-        {
-            _batchedOperations.Add(operation);
-
-            if (_pending)
-                return;
-
-            _pending = true;
-            _source.context.RegisterPendingObserver(this);
-            _source.context.NotifyPendingObserversIfNecessary();
-        }
-
-        public IEnumerable<BatchOp<T>> GetInitializationOperations()
-        {
-            List<T> initOps = new List<T>();
-            var subscription = _source.Subscribe(new Observer<T>(x => initOps.Add(x)));
-            subscription.Dispose();
-            yield return new BatchOp<T>() { source = _source, operations = initOps };
-        }
-
-        public void SendNext()
-        {
-            _pending = false;
-
-            var batch = _batchedOperations.ToArray();
-            _batchedOperations.Clear();
-
-            _operand.EnqueueOperation(new BatchOp<T>() { source = _source, operations = batch });
-        }
-
-        public void Dispose()
-        {
-            disposed = true;
-            _source.context.DeallocateObserverPriority(priority);
-            _subscriptions?.Dispose();
-            _subscriptions = null;
-            _operand.Dispose();
-        }
-    }
-}

package/Runtime/Observables/BatchObservable.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: d36db333036392248810c9ce317875ec

package/Runtime/Observables/ContainsObservable.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 8007fd4897c313b408cb6a42f4583fe8