com.fofx.observething 1.0.0 → 1.1.0

package/Runtime/Observables/CastObservable.cs

@@ -1,128 +1,128 @@
-using System;
-
-namespace ObserveThing
-{
-    public class CastValueObservable<T> : IDisposable
-    {
-        private ObservableValue<T> _operand;
-        private IDisposable _subscription;
-
-        public CastValueObservable(IValueObservable source, ObservableValue<T> operand)
-        {
-            _operand = operand;
-            _subscription = source.Subscribe(
-                onNext: x => operand.value = (T)x,
-                onError: operand.OnError,
-                onDispose: Dispose,
-                immediate: true
-            );
-        }
-
-        public void Dispose()
-        {
-            _subscription?.Dispose();
-            _subscription = null;
-            _operand.Dispose();
-        }
-    }
-
-    public class CastCollectionObservable<T> : IDisposable
-    {
-        private ObservableCollection<T> _operand;
-        private IDisposable _subscription;
-
-        public CastCollectionObservable(ICollectionObservable source, ObservableCollection<T> operand)
-        {
-            _operand = operand;
-            _subscription = source.SubscribeWithId(
-                onAdd: (id, x) => operand.Add(id, (T)x),
-                onRemove: (id, _) => operand.Remove(id),
-                onError: operand.OnError,
-                onDispose: Dispose,
-                immediate: true
-            );
-        }
-
-        public void Dispose()
-        {
-            _subscription?.Dispose();
-            _subscription = null;
-            _operand.Dispose();
-        }
-    }
-
-    public class CastListObservable<T> : IDisposable
-    {
-        private ObservableList<T> _operand;
-        private IDisposable _subscription;
-
-        public CastListObservable(IListObservable source, ObservableList<T> operand)
-        {
-            _operand = operand;
-            _subscription = source.Subscribe(
-                onAdd: (index, x) => operand.Insert(index, (T)x),
-                onRemove: (index, _) => operand.RemoveAt(index),
-                onError: operand.OnError,
-                onDispose: Dispose,
-                immediate: true
-            );
-        }
-
-        public void Dispose()
-        {
-            _subscription?.Dispose();
-            _subscription = null;
-            _operand.Dispose();
-        }
-    }
-
-    public class CastSetObservable<T> : IDisposable
-    {
-        private ObservableSet<T> _operand;
-        private IDisposable _subscription;
-
-        public CastSetObservable(ISetObservable source, ObservableSet<T> operand)
-        {
-            _operand = operand;
-            _subscription = source.Subscribe(
-                onAdd: x => operand.Add((T)x),
-                onRemove: x => operand.Remove((T)x),
-                onError: operand.OnError,
-                onDispose: Dispose,
-                immediate: true
-            );
-        }
-
-        public void Dispose()
-        {
-            _subscription?.Dispose();
-            _subscription = null;
-            _operand.Dispose();
-        }
-    }
-
-    public class CastDictionaryObservable<TKey, TValue> : IDisposable
-    {
-        private ObservableDictionary<TKey, TValue> _operand;
-        private IDisposable _subscription;
-
-        public CastDictionaryObservable(IDictionaryObservable source, ObservableDictionary<TKey, TValue> operand)
-        {
-            _operand = operand;
-            _subscription = source.Subscribe(
-                onAdd: x => operand.Add((TKey)x.Key, (TValue)x.Value),
-                onRemove: x => operand.Remove((TKey)x.Key),
-                onError: operand.OnError,
-                onDispose: Dispose,
-                immediate: true
-            );
-        }
-
-        public void Dispose()
-        {
-            _subscription?.Dispose();
-            _subscription = null;
-            _operand.Dispose();
-        }
-    }
+using System;
+
+namespace ObserveThing
+{
+    public class CastValueObservable<T> : IDisposable
+    {
+        private ObservableValue<T> _operand;
+        private IDisposable _subscription;
+
+        public CastValueObservable(IValueObservable source, ObservableValue<T> operand)
+        {
+            _operand = operand;
+            _subscription = source.Subscribe(
+                onNext: x => operand.value = (T)x,
+                onError: operand.OnError,
+                onDispose: Dispose,
+                immediate: true
+            );
+        }
+
+        public void Dispose()
+        {
+            _subscription?.Dispose();
+            _subscription = null;
+            _operand.Dispose();
+        }
+    }
+
+    public class CastCollectionObservable<T> : IDisposable
+    {
+        private ObservableCollection<T> _operand;
+        private IDisposable _subscription;
+
+        public CastCollectionObservable(ICollectionObservable source, ObservableCollection<T> operand)
+        {
+            _operand = operand;
+            _subscription = source.SubscribeWithId(
+                onAdd: (id, x) => operand.Add(id, (T)x),
+                onRemove: (id, _) => operand.Remove(id),
+                onError: operand.OnError,
+                onDispose: Dispose,
+                immediate: true
+            );
+        }
+
+        public void Dispose()
+        {
+            _subscription?.Dispose();
+            _subscription = null;
+            _operand.Dispose();
+        }
+    }
+
+    public class CastListObservable<T> : IDisposable
+    {
+        private ObservableList<T> _operand;
+        private IDisposable _subscription;
+
+        public CastListObservable(IListObservable source, ObservableList<T> operand)
+        {
+            _operand = operand;
+            _subscription = source.Subscribe(
+                onAdd: (index, x) => operand.Insert(index, (T)x),
+                onRemove: (index, _) => operand.RemoveAt(index),
+                onError: operand.OnError,
+                onDispose: Dispose,
+                immediate: true
+            );
+        }
+
+        public void Dispose()
+        {
+            _subscription?.Dispose();
+            _subscription = null;
+            _operand.Dispose();
+        }
+    }
+
+    public class CastSetObservable<T> : IDisposable
+    {
+        private ObservableSet<T> _operand;
+        private IDisposable _subscription;
+
+        public CastSetObservable(ISetObservable source, ObservableSet<T> operand)
+        {
+            _operand = operand;
+            _subscription = source.Subscribe(
+                onAdd: x => operand.Add((T)x),
+                onRemove: x => operand.Remove((T)x),
+                onError: operand.OnError,
+                onDispose: Dispose,
+                immediate: true
+            );
+        }
+
+        public void Dispose()
+        {
+            _subscription?.Dispose();
+            _subscription = null;
+            _operand.Dispose();
+        }
+    }
+
+    public class CastDictionaryObservable<TKey, TValue> : IDisposable
+    {
+        private ObservableDictionary<TKey, TValue> _operand;
+        private IDisposable _subscription;
+
+        public CastDictionaryObservable(IDictionaryObservable source, ObservableDictionary<TKey, TValue> operand)
+        {
+            _operand = operand;
+            _subscription = source.Subscribe(
+                onAdd: x => operand.Add((TKey)x.Key, (TValue)x.Value),
+                onRemove: x => operand.Remove((TKey)x.Key),
+                onError: operand.OnError,
+                onDispose: Dispose,
+                immediate: true
+            );
+        }
+
+        public void Dispose()
+        {
+            _subscription?.Dispose();
+            _subscription = null;
+            _operand.Dispose();
+        }
+    }
 }

package/Runtime/Observables/CastObservable.cs.meta

@@ -1,2 +1,2 @@
-fileFormatVersion: 2
+fileFormatVersion: 2
 guid: b01a22250763ab34aa632028afe67ef7

package/Runtime/Observables/CombineObservable.cs

@@ -1,96 +1,96 @@
-using System;
-using System.Collections.Generic;
-
-namespace ObserveThing
-{
-    public class CombineObservable<T> : IInitializationOperationsProvider<T> where T : IOperation
-    {
-        private ISetObservable<IObservable<T>> _source;
-        private Observable<T> _operand;
-        private bool _disposeOnSourceEmpty;
-        private uint _elementPriority;
-        private Dictionary<IObservable<T>, IDisposable> _observables = new Dictionary<IObservable<T>, IDisposable>();
-        private IDisposable _subscriptions;
-        private bool _disposed;
-
-        public CombineObservable(ISetObservable<IObservable<T>> source, Observable<T> operand, bool disposeOnSourceEmpty = false)
-        {
-            _source = source;
-            _operand = operand;
-            _disposeOnSourceEmpty = disposeOnSourceEmpty;
-            _elementPriority = _source.context.AllocateObserverPriority();
-            _subscriptions = _source.Subscribe(new SetObserver<IObservable<T>>(
-                onAdd: HandleElementAdded,
-                onRemove: HandleElementRemoved,
-                onError: _operand.OnError,
-                onDispose: Dispose
-            ), immediate: true);
-        }
-
-        public IEnumerable<T> GetInitializationOperations()
-        {
-            List<T> initOps = new List<T>();
-
-            foreach (var element in _observables.Keys)
-            {
-                var subscription = element.Subscribe(new Observer<T>(x => initOps.Add(x)));
-                subscription.Dispose();
-            }
-
-            foreach (var op in initOps)
-                yield return op;
-        }
-
-        private void HandleElementAdded(uint _, IObservable<T> observable)
-        {
-            _observables.Add(
-                observable,
-                observable.Subscribe(new Observer<T>(
-                    onNext: HandleElementChanged,
-                    onError: _operand.OnError,
-                    onDispose: () =>
-                    {
-                        if (_disposed)
-                            return;
-
-                        HandleElementRemoved(0, observable);
-                    }
-                ), immediate: true, priority: _elementPriority)
-            );
-        }
-
-        private void HandleElementRemoved(uint _, IObservable<T> observable)
-        {
-            if (!_observables.TryGetValue(observable, out var subscription))
-                return;
-
-            _observables.Remove(observable);
-            subscription.Dispose();
-
-            if (_disposeOnSourceEmpty && _observables.Count == 0)
-                Dispose();
-        }
-
-        protected void HandleElementChanged(T operation)
-        {
-            _operand.EnqueueOperation(operation);
-        }
-
-        public void Dispose()
-        {
-            if (_disposed)
-                return;
-
-            _disposed = true;
-
-            _source.context.DeallocateObserverPriority(_elementPriority);
-
-            foreach (var subscription in _observables.Values)
-                subscription.Dispose();
-
-            _subscriptions?.Dispose();
-            _subscriptions = null;
-            _operand.Dispose();
-        }
-    }
+using System;
+using System.Collections.Generic;
+
+namespace ObserveThing
+{
+    public class CombineObservable<T> : IInitializationOperationsProvider<T> where T : IOperation
+    {
+        private ISetObservable<IObservable<T>> _source;
+        private Observable<T> _operand;
+        private bool _disposeOnSourceEmpty;
+        private uint _elementPriority;
+        private Dictionary<IObservable<T>, IDisposable> _observables = new Dictionary<IObservable<T>, IDisposable>();
+        private IDisposable _subscriptions;
+        private bool _disposed;
+
+        public CombineObservable(ISetObservable<IObservable<T>> source, Observable<T> operand, bool disposeOnSourceEmpty = false)
+        {
+            _source = source;
+            _operand = operand;
+            _disposeOnSourceEmpty = disposeOnSourceEmpty;
+            _elementPriority = _source.context.AllocateObserverPriority();
+            _subscriptions = _source.Subscribe(new SetObserver<IObservable<T>>(
+                onAdd: HandleElementAdded,
+                onRemove: HandleElementRemoved,
+                onError: _operand.OnError,
+                onDispose: Dispose
+            ), immediate: true);
+        }
+
+        public IEnumerable<T> GetInitializationOperations()
+        {
+            List<T> initOps = new List<T>();
+
+            foreach (var element in _observables.Keys)
+            {
+                var subscription = element.Subscribe(new Observer<T>(x => initOps.Add(x)));
+                subscription.Dispose();
+            }
+
+            foreach (var op in initOps)
+                yield return op;
+        }
+
+        private void HandleElementAdded(uint _, IObservable<T> observable)
+        {
+            _observables.Add(
+                observable,
+                observable.Subscribe(new Observer<T>(
+                    onNext: HandleElementChanged,
+                    onError: _operand.OnError,
+                    onDispose: () =>
+                    {
+                        if (_disposed)
+                            return;
+
+                        HandleElementRemoved(0, observable);
+                    }
+                ), immediate: true, priority: _elementPriority)
+            );
+        }
+
+        private void HandleElementRemoved(uint _, IObservable<T> observable)
+        {
+            if (!_observables.TryGetValue(observable, out var subscription))
+                return;
+
+            _observables.Remove(observable);
+            subscription.Dispose();
+
+            if (_disposeOnSourceEmpty && _observables.Count == 0)
+                Dispose();
+        }
+
+        protected void HandleElementChanged(T operation)
+        {
+            _operand.EnqueueOperation(operation);
+        }
+
+        public void Dispose()
+        {
+            if (_disposed)
+                return;
+
+            _disposed = true;
+
+            _source.context.DeallocateObserverPriority(_elementPriority);
+
+            foreach (var subscription in _observables.Values)
+                subscription.Dispose();
+
+            _subscriptions?.Dispose();
+            _subscriptions = null;
+            _operand.Dispose();
+        }
+    }
 }

package/Runtime/Observables/CombineObservable.cs.meta

@@ -1,2 +1,2 @@
-fileFormatVersion: 2
+fileFormatVersion: 2
 guid: df42ce7c86dad2e42966e8238165aa40