Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rename CombineObservable to ObservableCombine etc. #73

Merged
merged 1 commit into from
Jul 11, 2022
Merged

rename CombineObservable to ObservableCombine etc. #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 16 additions & 16 deletions lib/src/observables/observables/observable.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import 'package:typedef_equals/typedef_equals.dart';
import '../observers/observer.dart';
import '../subjects/subject.dart';
import '../subjects/replay_subject.dart';
import 'create_observable.dart';
import 'cast_observable.dart';
import 'combine_observable.dart';
import 'distinct_observable.dart';
import 'map_observable.dart';
import 'multicast_observable.dart';
import 'skip_observable.dart';
import 'where_observable.dart';
import 'observable_create.dart';
import 'observable_cast.dart';
import 'observable_combine.dart';
import 'observable_distinct.dart';
import 'observable_map.dart';
import 'observable_multicast.dart';
import 'observable_skip.dart';
import 'observable_where.dart';

typedef Observe<T> = Disposable Function(OnData<T> onData);

Expand All @@ -22,12 +22,12 @@ abstract class Observable<T> {

const factory Observable(
Observe<T> observe
) = CreateObservable;
) = ObservableCreate;

static Observable<R> combine<T, R>({
required List<Observable<T>> children,
required R Function(List<T> items) combiner,
}) => CombineObservable(
}) => ObservableCombine(
children: children,
combiner: combiner,
);
Expand Down Expand Up @@ -59,27 +59,27 @@ abstract class Observable<T> {
extension ObservableX<T> on Observable<T> {

Observable<R> map<R>(R Function(T) convert) {
return MapObservable<T, R>(
return ObservableMap<T, R>(
convert: convert,
child: this,
);
}

Observable<T> where(bool Function(T) test) {
return WhereObservable<T>(
return ObservableWhere<T>(
test: test,
child: this,
);
}

Observable<R> cast<R>() {
return CastObservable<T, R>(
return ObservableCast<T, R>(
child: this,
);
}

Observable<T> distinct([Equals<T>? equals]) {
return DistinctObservable<T>(
return ObservableDistinct<T>(
equals: equals,
child: this,
);
Expand All @@ -92,7 +92,7 @@ extension ObservableX<T> on Observable<T> {
.distinct(equals);

Observable<T> skip(int n) {
return SkipObservable(
return ObservableSkip(
n: n,
child: this,
);
Expand All @@ -101,7 +101,7 @@ extension ObservableX<T> on Observable<T> {
Observable<T> multicast({
Subject<T> Function()? createSubject,
}) {
return MulticastObservable<T>(
return ObservableMulticast<T>(
createSubject: createSubject,
child: this,
);
Expand Down
4 changes: 2 additions & 2 deletions ...ervables/observables/cast_observable.dart → ...ervables/observables/observable_cast.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import '../observers/observer.dart';
import 'observable.dart';

@internal
class CastObservable<T, R> implements Observable<R> {
class ObservableCast<T, R> implements Observable<R> {

const CastObservable({
const ObservableCast({
required Observable<T> child,
}): _child = child;

Expand Down
8 changes: 4 additions & 4 deletions ...ables/observables/combine_observable.dart → ...ables/observables/observable_combine.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import '../observers/observer.dart';
import 'observable.dart';

@internal
class CombineObservable<T, R> implements Observable<R> {
class ObservableCombine<T, R> implements Observable<R> {

const CombineObservable({
const ObservableCombine({
required List<Observable<T>> children,
required R Function(List<T> items) combiner,
}): _children = children,
Expand Down Expand Up @@ -52,7 +52,7 @@ class CombineObservable<T, R> implements Observable<R> {
}

@internal
class CombineObservable2<T1, T2, R> extends CombineObservable<Object?, R> {
class CombineObservable2<T1, T2, R> extends ObservableCombine<Object?, R> {

CombineObservable2({
required Observable<T1> child1,
Expand All @@ -71,7 +71,7 @@ class CombineObservable2<T1, T2, R> extends CombineObservable<Object?, R> {
}

@internal
class CombineObservable3<T1, T2, T3, R> extends CombineObservable<Object?, R> {
class CombineObservable3<T1, T2, T3, R> extends ObservableCombine<Object?, R> {

CombineObservable3({
required Observable<T1> child1,
Expand Down
4 changes: 2 additions & 2 deletions ...vables/observables/create_observable.dart → ...vables/observables/observable_create.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import 'observable.dart';
import '../observers/observer.dart';

@internal
class CreateObservable<T> implements Observable<T> {
class ObservableCreate<T> implements Observable<T> {

const CreateObservable(this._observe);
const ObservableCreate(this._observe);

final Observe<T> _observe;

Expand Down
4 changes: 2 additions & 2 deletions ...bles/observables/distinct_observable.dart → ...bles/observables/observable_distinct.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import '../observers/observer.dart';
import 'observable.dart';

@internal
class DistinctObservable<T> implements Observable<T> {
const DistinctObservable({
class ObservableDistinct<T> implements Observable<T> {
const ObservableDistinct({
required Equals<T>? equals,
required Observable<T> child,
}): _equals = equals ?? defaultEquals,
Expand Down
4 changes: 2 additions & 2 deletions ...servables/observables/map_observable.dart → ...servables/observables/observable_map.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import 'observable.dart';
import '../observers/observer.dart';

@internal
class MapObservable<T, R> implements Observable<R> {
class ObservableMap<T, R> implements Observable<R> {

const MapObservable({
const ObservableMap({
required R Function(T) convert,
required Observable<T> child,
}): _convert = convert,
Expand Down
4 changes: 2 additions & 2 deletions ...les/observables/multicast_observable.dart → ...les/observables/observable_multicast.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import '../subjects/subject.dart';
import '../subjects/publish_subject.dart';

@internal
class MulticastObservable<T> implements Observable<T> {
class ObservableMulticast<T> implements Observable<T> {

MulticastObservable({
ObservableMulticast({
Subject<T> Function()? createSubject,
required Observable<T> child,
}): _createSubject = createSubject ?? _defaultCreateSubject,
Expand Down
4 changes: 2 additions & 2 deletions ...ervables/observables/skip_observable.dart → ...ervables/observables/observable_skip.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import 'observable.dart';
import '../observers/observer.dart';

@internal
class SkipObservable<T> implements Observable<T> {
class ObservableSkip<T> implements Observable<T> {

const SkipObservable({
const ObservableSkip({
required int n,
required Observable<T> child,
}): _n = n,
Expand Down
4 changes: 2 additions & 2 deletions ...rvables/observables/where_observable.dart → ...rvables/observables/observable_where.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import '../observers/observer.dart';
import 'observable.dart';

@internal
class WhereObservable<T> implements Observable<T> {
class ObservableWhere<T> implements Observable<T> {

const WhereObservable({
const ObservableWhere({
required bool Function(T) test,
required Observable<T> child,
}): _test = test,
Expand Down