@@ -4,14 +4,20 @@ var parser = function(val) {
4
4
parsedVal = JSON . parse ( val ) ;
5
5
if ( typeof val === typeof parsedVal ) {
6
6
val = parsedVal ;
7
- } else if ( val === parsedVal . toString ( ) ) {
7
+ }
8
+ else if ( val === parsedVal . toString ( ) ) {
8
9
val = parsedVal ;
9
- } else if ( Array . isArray ( parsedVal ) ) {
10
+ }
11
+ else if ( Array . isArray ( parsedVal ) ) {
10
12
val = parsedVal ;
11
- } else if ( typeof parsedVal === 'object' ) {
13
+ }
14
+ else if ( typeof parsedVal === 'object' ) {
12
15
val = parsedVal ;
13
16
}
14
- } catch ( error ) { }
17
+ }
18
+ catch ( error ) {
19
+ //ignored error
20
+ }
15
21
return val ;
16
22
} ;
17
23
@@ -47,7 +53,7 @@ const OVERRIDES = {
47
53
* @param {[type] } value [description]
48
54
* @return {[type] } [description]
49
55
*/
50
- function dig ( config , over , name , value ) {
56
+ function dig ( config , over , name , value ) {
51
57
let comps = name . split ( '_' ) ;
52
58
53
59
for ( let i = comps . length ; i > 0 ; i -- ) {
@@ -59,7 +65,8 @@ function dig (config, over, name, value) {
59
65
if ( typeof over [ n ] === 'string' ) {
60
66
sub = over [ n ] ;
61
67
over [ n ] = { } ;
62
- } else {
68
+ }
69
+ else {
63
70
sub = Object . keys ( config ) . filter ( k => k . toUpperCase ( ) === n ) [ 0 ] ;
64
71
}
65
72
@@ -72,14 +79,17 @@ function dig (config, over, name, value) {
72
79
73
80
if ( typeof config [ sub ] === 'object' ) {
74
81
return dig ( config [ sub ] , over [ n ] , name , value ) ;
75
- } else if ( sub ) {
82
+ }
83
+ else if ( sub ) {
76
84
config [ sub ] = { } ;
77
85
return dig ( config [ sub ] , over [ n ] , name , value ) ;
78
- } else {
86
+ }
87
+ else {
79
88
config [ n ] = { } ;
80
89
return dig ( config [ n ] , over [ n ] , name , value ) ;
81
90
}
82
- } else if ( n === over ) {
91
+ }
92
+ else if ( n === over ) {
83
93
name = over ;
84
94
config [ name ] = value ;
85
95
return true ;
@@ -89,38 +99,40 @@ function dig (config, over, name, value) {
89
99
for ( let i = 1 ; i <= comps . length ; i ++ ) {
90
100
let n = comps . slice ( 0 , i ) . join ( '_' ) ,
91
101
sub = Object . keys ( config ) . filter ( k => k . toUpperCase ( ) === n ) [ 0 ] ,
92
- name = comps . slice ( i ) . join ( '_' ) ;
93
-
102
+ name2 = comps . slice ( i ) . join ( '_' ) ;
103
+
94
104
if ( sub ) {
95
105
if ( comps . length === 1 ) {
96
106
config [ sub ] = value ;
97
107
return true ;
98
- } else {
108
+ }
109
+ else {
99
110
config [ sub ] = typeof config [ sub ] === 'object' ? config [ sub ] : { } ;
100
- return dig ( config [ sub ] , { } , name , value ) ;
111
+ return dig ( config [ sub ] , { } , name2 , value ) ;
101
112
}
102
113
}
103
114
}
104
115
105
116
comps . forEach ( ( c , i ) => {
106
117
if ( i === comps . length - 1 ) {
107
118
config [ c . toLowerCase ( ) ] = value ;
108
- } else {
119
+ }
120
+ else {
109
121
config = config [ c . toLowerCase ( ) ] = { } ;
110
122
}
111
- } )
123
+ } ) ;
112
124
113
125
return true ;
114
126
}
115
127
116
- module . exports = function ( mode , config , opts ) {
128
+ module . exports = function ( mode , config , opts ) {
117
129
// back compatibility
118
130
if ( typeof mode === 'object' ) {
119
131
config = mode ;
120
132
mode = 'API' ;
121
133
opts = process . env ;
122
134
}
123
-
135
+
124
136
if ( [ 'API' , 'FRONTEND' ] . indexOf ( mode ) === - 1 ) {
125
137
throw new Error ( 'Invalid config mode ' + mode ) ;
126
138
}
0 commit comments