@@ -5,11 +5,11 @@ import { TestMessageValue } from '../message/TestMessageValue';
5
5
import { ObservableMarbleToken } from './ObservableMarbleToken' ;
6
6
import { SubscriptionMarbleToken } from './SubscriptionMarbleToken' ;
7
7
8
- interface TokenParseAccumulator < T > {
8
+ interface ObservableTokenParseAccumulator < T > {
9
9
/**
10
10
* Current virtual time passed
11
11
*/
12
- currentTimeframe : number ;
12
+ currentTimeFrame : number ;
13
13
/**
14
14
* Meta values emitted by marbles (value, error, complete)
15
15
*/
@@ -44,26 +44,26 @@ const getMarbleTokenValue = <T>(
44
44
return materializeInnerObservables && customValue instanceof ColdObservable ? customValue . messages : customValue ;
45
45
} ;
46
46
47
- const marbleTokenParseReducer = < T > (
47
+ const observableTokenParseReducer = < T > (
48
48
value ?: { [ key : string ] : T } | null ,
49
49
error ?: any ,
50
50
materializeInnerObservables : boolean = false ,
51
51
frameTimeFactor : number = 1
52
- ) => ( acc : TokenParseAccumulator < T > , token : any ) => {
52
+ ) => ( acc : ObservableTokenParseAccumulator < T > , token : any ) => {
53
53
let message : TestMessage < T | Array < TestMessage < T > > > | null = null ;
54
54
55
55
switch ( token ) {
56
56
case ObservableMarbleToken . TIMEFRAME :
57
57
if ( acc . expandingTokenCount > 0 || acc . simultaneousGrouped ) {
58
58
throw new Error ( 'Incorret timeframe specified' ) ;
59
59
}
60
- acc . currentTimeframe += 1 * frameTimeFactor ;
60
+ acc . currentTimeFrame += 1 * frameTimeFactor ;
61
61
break ;
62
62
case ObservableMarbleToken . ERROR :
63
- message = new TestMessageValue < T > ( acc . currentTimeframe , Notification . createError ( error || '#' ) ) ;
63
+ message = new TestMessageValue < T > ( acc . currentTimeFrame , Notification . createError ( error || '#' ) ) ;
64
64
break ;
65
65
case ObservableMarbleToken . COMPLETE :
66
- message = new TestMessageValue < T > ( acc . currentTimeframe , Notification . createComplete ( ) ) ;
66
+ message = new TestMessageValue < T > ( acc . currentTimeFrame , Notification . createComplete ( ) ) ;
67
67
break ;
68
68
case ObservableMarbleToken . TIMEFRAME_EXPAND :
69
69
acc . expandingTokenCount += 1 ;
@@ -80,7 +80,7 @@ const marbleTokenParseReducer = <T>(
80
80
throw new Error ( `There isn't value to expand timeframe` ) ;
81
81
}
82
82
const expandedFrame = parseInt ( acc . expandingValue . join ( '' ) , 10 ) ;
83
- acc . currentTimeframe += expandedFrame * frameTimeFactor ;
83
+ acc . currentTimeFrame += expandedFrame * frameTimeFactor ;
84
84
}
85
85
break ;
86
86
case ObservableMarbleToken . SIMULTANEOUS_START :
@@ -90,7 +90,7 @@ const marbleTokenParseReducer = <T>(
90
90
acc . simultaneousGrouped = true ;
91
91
break ;
92
92
case ObservableMarbleToken . SIMULTANEOUS_END :
93
- acc . currentTimeframe += 1 * frameTimeFactor ;
93
+ acc . currentTimeFrame += 1 * frameTimeFactor ;
94
94
acc . simultaneousGrouped = false ;
95
95
break ;
96
96
case SubscriptionMarbleToken . SUBSCRIBE :
@@ -101,7 +101,7 @@ const marbleTokenParseReducer = <T>(
101
101
} else {
102
102
const tokenValue = getMarbleTokenValue ( token , value , materializeInnerObservables ) ;
103
103
message = new TestMessageValue < T | Array < TestMessage < T > > > (
104
- acc . currentTimeframe ,
104
+ acc . currentTimeFrame ,
105
105
Notification . createNext < T | Array < TestMessage < T > > > ( tokenValue )
106
106
) ;
107
107
}
@@ -110,7 +110,7 @@ const marbleTokenParseReducer = <T>(
110
110
if ( ! ! message ) {
111
111
acc . messages . push ( message ) ;
112
112
if ( ! acc . simultaneousGrouped ) {
113
- acc . currentTimeframe += 1 * frameTimeFactor ;
113
+ acc . currentTimeFrame += 1 * frameTimeFactor ;
114
114
}
115
115
}
116
116
@@ -142,9 +142,9 @@ const parseObservableMarble = <T>(
142
142
143
143
const marbleTokenArray = Array . from ( marble ) . filter ( token => token !== ObservableMarbleToken . NOOP ) . slice ( frameOffset ) ;
144
144
const values = marbleTokenArray . reduce (
145
- marbleTokenParseReducer ( value , error , materializeInnerObservables , frameTimeFactor ) ,
145
+ observableTokenParseReducer ( value , error , materializeInnerObservables , frameTimeFactor ) ,
146
146
{
147
- currentTimeframe : frameOffset ,
147
+ currentTimeFrame : frameOffset ,
148
148
messages : [ ] ,
149
149
simultaneousGrouped : false ,
150
150
expandingTokenCount : 0 ,
0 commit comments