Skip to content

Commit da6ff75

Browse files
committed
refactor(parseobservablemarble): refactor internal names for clarity
1 parent 773f2d3 commit da6ff75

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

src/marbles/parseObservableMarble.ts

+13-13
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import { TestMessageValue } from '../message/TestMessageValue';
55
import { ObservableMarbleToken } from './ObservableMarbleToken';
66
import { SubscriptionMarbleToken } from './SubscriptionMarbleToken';
77

8-
interface TokenParseAccumulator<T> {
8+
interface ObservableTokenParseAccumulator<T> {
99
/**
1010
* Current virtual time passed
1111
*/
12-
currentTimeframe: number;
12+
currentTimeFrame: number;
1313
/**
1414
* Meta values emitted by marbles (value, error, complete)
1515
*/
@@ -44,26 +44,26 @@ const getMarbleTokenValue = <T>(
4444
return materializeInnerObservables && customValue instanceof ColdObservable ? customValue.messages : customValue;
4545
};
4646

47-
const marbleTokenParseReducer = <T>(
47+
const observableTokenParseReducer = <T>(
4848
value?: { [key: string]: T } | null,
4949
error?: any,
5050
materializeInnerObservables: boolean = false,
5151
frameTimeFactor: number = 1
52-
) => (acc: TokenParseAccumulator<T>, token: any) => {
52+
) => (acc: ObservableTokenParseAccumulator<T>, token: any) => {
5353
let message: TestMessage<T | Array<TestMessage<T>>> | null = null;
5454

5555
switch (token) {
5656
case ObservableMarbleToken.TIMEFRAME:
5757
if (acc.expandingTokenCount > 0 || acc.simultaneousGrouped) {
5858
throw new Error('Incorret timeframe specified');
5959
}
60-
acc.currentTimeframe += 1 * frameTimeFactor;
60+
acc.currentTimeFrame += 1 * frameTimeFactor;
6161
break;
6262
case ObservableMarbleToken.ERROR:
63-
message = new TestMessageValue<T>(acc.currentTimeframe, Notification.createError(error || '#'));
63+
message = new TestMessageValue<T>(acc.currentTimeFrame, Notification.createError(error || '#'));
6464
break;
6565
case ObservableMarbleToken.COMPLETE:
66-
message = new TestMessageValue<T>(acc.currentTimeframe, Notification.createComplete());
66+
message = new TestMessageValue<T>(acc.currentTimeFrame, Notification.createComplete());
6767
break;
6868
case ObservableMarbleToken.TIMEFRAME_EXPAND:
6969
acc.expandingTokenCount += 1;
@@ -80,7 +80,7 @@ const marbleTokenParseReducer = <T>(
8080
throw new Error(`There isn't value to expand timeframe`);
8181
}
8282
const expandedFrame = parseInt(acc.expandingValue.join(''), 10);
83-
acc.currentTimeframe += expandedFrame * frameTimeFactor;
83+
acc.currentTimeFrame += expandedFrame * frameTimeFactor;
8484
}
8585
break;
8686
case ObservableMarbleToken.SIMULTANEOUS_START:
@@ -90,7 +90,7 @@ const marbleTokenParseReducer = <T>(
9090
acc.simultaneousGrouped = true;
9191
break;
9292
case ObservableMarbleToken.SIMULTANEOUS_END:
93-
acc.currentTimeframe += 1 * frameTimeFactor;
93+
acc.currentTimeFrame += 1 * frameTimeFactor;
9494
acc.simultaneousGrouped = false;
9595
break;
9696
case SubscriptionMarbleToken.SUBSCRIBE:
@@ -101,7 +101,7 @@ const marbleTokenParseReducer = <T>(
101101
} else {
102102
const tokenValue = getMarbleTokenValue(token, value, materializeInnerObservables);
103103
message = new TestMessageValue<T | Array<TestMessage<T>>>(
104-
acc.currentTimeframe,
104+
acc.currentTimeFrame,
105105
Notification.createNext<T | Array<TestMessage<T>>>(tokenValue)
106106
);
107107
}
@@ -110,7 +110,7 @@ const marbleTokenParseReducer = <T>(
110110
if (!!message) {
111111
acc.messages.push(message);
112112
if (!acc.simultaneousGrouped) {
113-
acc.currentTimeframe += 1 * frameTimeFactor;
113+
acc.currentTimeFrame += 1 * frameTimeFactor;
114114
}
115115
}
116116

@@ -142,9 +142,9 @@ const parseObservableMarble = <T>(
142142

143143
const marbleTokenArray = Array.from(marble).filter(token => token !== ObservableMarbleToken.NOOP).slice(frameOffset);
144144
const values = marbleTokenArray.reduce(
145-
marbleTokenParseReducer(value, error, materializeInnerObservables, frameTimeFactor),
145+
observableTokenParseReducer(value, error, materializeInnerObservables, frameTimeFactor),
146146
{
147-
currentTimeframe: frameOffset,
147+
currentTimeFrame: frameOffset,
148148
messages: [],
149149
simultaneousGrouped: false,
150150
expandingTokenCount: 0,

0 commit comments

Comments
 (0)