File tree Expand file tree Collapse file tree 1 file changed +11
-1
lines changed Expand file tree Collapse file tree 1 file changed +11
-1
lines changed Original file line number Diff line number Diff line change @@ -7,8 +7,18 @@ function isPropertyValue(message: SenML | string[]): message is SenML {
7
7
return ! ! ( message as SenML ) . n ;
8
8
}
9
9
10
+ function isNil < T > ( v : T ) : boolean {
11
+ return v !== null && v !== undefined ;
12
+ }
13
+
14
+ function takeFrom ( ...values : CloudMessageValue [ ] ) : CloudMessageValue {
15
+ return values . find ( ( v ) => ! isNil ( v ) ) ;
16
+ }
17
+
10
18
function valueFrom ( message : SenML | string [ ] ) : CloudMessageValue {
11
- return isPropertyValue ( message ) ? message . v || message . vs || message . vb : message [ 2 ] || message [ 3 ] || message [ 4 ] ;
19
+ return isPropertyValue ( message )
20
+ ? takeFrom ( message . v , message . vs , message . vb )
21
+ : takeFrom ( message [ 2 ] , message [ 3 ] , message [ 4 ] ) ;
12
22
}
13
23
14
24
function nameFrom ( property : SenML | string [ ] ) : string {
You can’t perform that action at this time.
0 commit comments