@@ -120,57 +120,56 @@ function tokensToFunction (tokens) {
120
120
121
121
return function ( obj ) {
122
122
var path = ''
123
-
124
- obj = obj || { }
123
+ var data = obj || { }
125
124
126
125
for ( var i = 0 ; i < tokens . length ; i ++ ) {
127
- var key = tokens [ i ]
126
+ var token = tokens [ i ]
128
127
129
- if ( typeof key === 'string' ) {
130
- path += key
128
+ if ( typeof token === 'string' ) {
129
+ path += token
131
130
132
131
continue
133
132
}
134
133
135
- var value = obj [ key . name ]
134
+ var value = data [ token . name ]
136
135
137
136
if ( value == null ) {
138
- if ( key . optional ) {
137
+ if ( token . optional ) {
139
138
continue
140
139
} else {
141
- throw new TypeError ( 'Expected "' + key . name + '" to be defined' )
140
+ throw new TypeError ( 'Expected "' + token . name + '" to be defined' )
142
141
}
143
142
}
144
143
145
144
if ( isarray ( value ) ) {
146
- if ( ! key . repeat ) {
147
- throw new TypeError ( 'Expected "' + key . name + '" to not repeat' )
145
+ if ( ! token . repeat ) {
146
+ throw new TypeError ( 'Expected "' + token . name + '" to not repeat' )
148
147
}
149
148
150
149
if ( value . length === 0 ) {
151
- if ( key . optional ) {
150
+ if ( token . optional ) {
152
151
continue
153
152
} else {
154
- throw new TypeError ( 'Expected "' + key . name + '" to not be empty' )
153
+ throw new TypeError ( 'Expected "' + token . name + '" to not be empty' )
155
154
}
156
155
}
157
156
158
157
for ( var j = 0 ; j < value . length ; j ++ ) {
159
158
if ( ! matches [ i ] . test ( value [ j ] ) ) {
160
- throw new TypeError ( 'Expected all "' + key . name + '" to match "' + key . pattern + '"' )
159
+ throw new TypeError ( 'Expected all "' + token . name + '" to match "' + token . pattern + '"' )
161
160
}
162
161
163
- path += ( j === 0 ? key . prefix : key . delimiter ) + encodeURIComponent ( value [ j ] )
162
+ path += ( j === 0 ? token . prefix : token . delimiter ) + encodeURIComponent ( value [ j ] )
164
163
}
165
164
166
165
continue
167
166
}
168
167
169
168
if ( ! matches [ i ] . test ( value ) ) {
170
- throw new TypeError ( 'Expected "' + key . name + '" to match "' + key . pattern + '"' )
169
+ throw new TypeError ( 'Expected "' + token . name + '" to match "' + token . pattern + '"' )
171
170
}
172
171
173
- path += key . prefix + encodeURIComponent ( value )
172
+ path += token . prefix + encodeURIComponent ( value )
174
173
}
175
174
176
175
return path
0 commit comments