Skip to content

Commit cb988ba

Browse files
blakeembreyblakeembrey
committed
Clean up code style.
1 parent efa1e59 commit cb988ba

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

‎index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ function pathtoRegexp(path, keys, options) {
3535
.replace(/\/\(/g, '/(?:')
3636
.replace(/([\/\.])/g, '\\$1')
3737
.replace(/(\\\/)?(\\\.)?:(\w+)(\(.*?\))?(\*)?(\?)?/g, function (match, slash, format, key, capture, star, optional) {
38-
slash = slash || '';
39-
format = format || '';
40-
capture = capture || '([^/' + format + ']+?)';
38+
slash = slash || '';
39+
format = format || '';
40+
capture = capture || '([^/' + format + ']+?)';
4141
optional = optional || '';
4242

4343
keys.push({ name: key, optional: !!optional });

‎test.js

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
var pathToRegExp = require('./');
2-
var assert = require('assert');
2+
var assert = require('assert');
33

44
describe('path-to-regexp', function () {
55
describe('strings', function () {
66
it('should match simple paths', function () {
77
var params = [];
8-
var m = pathToRegExp('/test', params).exec('/test');
8+
var m = pathToRegExp('/test', params).exec('/test');
99

1010
assert.equal(params.length, 0);
1111

@@ -15,7 +15,7 @@ describe('path-to-regexp', function () {
1515

1616
it('should match express format params', function () {
1717
var params = [];
18-
var m = pathToRegExp('/:test', params).exec('/pathname');
18+
var m = pathToRegExp('/:test', params).exec('/pathname');
1919

2020
assert.equal(params.length, 1);
2121
assert.equal(params[0].name, 'test');
@@ -28,7 +28,7 @@ describe('path-to-regexp', function () {
2828

2929
it('should do strict matches', function () {
3030
var params = [];
31-
var re = pathToRegExp('/:test', params, { strict: true });
31+
var re = pathToRegExp('/:test', params, { strict: true });
3232
var m;
3333

3434
assert.equal(params.length, 1);
@@ -48,7 +48,7 @@ describe('path-to-regexp', function () {
4848

4949
it('should allow optional express format params', function () {
5050
var params = [];
51-
var re = pathToRegExp('/:test?', params);
51+
var re = pathToRegExp('/:test?', params);
5252
var m;
5353

5454
assert.equal(params.length, 1);
@@ -70,7 +70,7 @@ describe('path-to-regexp', function () {
7070

7171
it('should allow express format param regexps', function () {
7272
var params = [];
73-
var m = pathToRegExp('/:page(\\d+)', params).exec('/56');
73+
var m = pathToRegExp('/:page(\\d+)', params).exec('/56');
7474

7575
assert.equal(params.length, 1);
7676
assert.equal(params[0].name, 'page');
@@ -83,7 +83,7 @@ describe('path-to-regexp', function () {
8383

8484
it('should match without a prefixed slash', function () {
8585
var params = [];
86-
var m = pathToRegExp(':test', params).exec('string');
86+
var m = pathToRegExp(':test', params).exec('string');
8787

8888
assert.equal(params.length, 1);
8989
assert.equal(params[0].name, 'test');
@@ -96,7 +96,7 @@ describe('path-to-regexp', function () {
9696

9797
it('should not match format parts', function () {
9898
var params = [];
99-
var m = pathToRegExp('/:test.json', params).exec('/route.json');
99+
var m = pathToRegExp('/:test.json', params).exec('/route.json');
100100

101101
assert.equal(params.length, 1);
102102
assert.equal(params[0].name, 'test');
@@ -109,7 +109,7 @@ describe('path-to-regexp', function () {
109109

110110
it('should match format parts', function () {
111111
var params = [];
112-
var re = pathToRegExp('/:test.:format', params);
112+
var re = pathToRegExp('/:test.:format', params);
113113
var m;
114114

115115
assert.equal(params.length, 2);
@@ -132,7 +132,7 @@ describe('path-to-regexp', function () {
132132

133133
it('should match route parts with a trailing format', function () {
134134
var params = [];
135-
var m = pathToRegExp('/:test.json', params).exec('/route.json');
135+
var m = pathToRegExp('/:test.json', params).exec('/route.json');
136136

137137
assert.equal(params.length, 1);
138138
assert.equal(params[0].name, 'test');
@@ -145,7 +145,7 @@ describe('path-to-regexp', function () {
145145

146146
it('should match optional trailing routes', function () {
147147
var params = [];
148-
var m = pathToRegExp('/test*', params).exec('/test/route');
148+
var m = pathToRegExp('/test*', params).exec('/test/route');
149149

150150
assert.equal(params.length, 0);
151151

@@ -156,7 +156,7 @@ describe('path-to-regexp', function () {
156156

157157
it('should match optional trailing routes after a param', function () {
158158
var params = [];
159-
var re = pathToRegExp('/:test*', params);
159+
var re = pathToRegExp('/:test*', params);
160160
var m;
161161

162162
assert.equal(params.length, 1);
@@ -178,9 +178,9 @@ describe('path-to-regexp', function () {
178178
assert.equal(m[2], '');
179179
});
180180

181-
it('should match optional trailing routes before formats', function () {
181+
it('should match optional trailing routes before a format', function () {
182182
var params = [];
183-
var re = pathToRegExp('/test*.json', params);
183+
var re = pathToRegExp('/test*.json', params);
184184
var m;
185185

186186
assert.equal(params.length, 0);
@@ -204,9 +204,9 @@ describe('path-to-regexp', function () {
204204
assert.equal(m[1], '/route');
205205
});
206206

207-
it('should match optional trailing routes before format', function () {
207+
it('should match optional trailing routes after a param and before a format', function () {
208208
var params = [];
209-
var re = pathToRegExp('/:test*.json', params);
209+
var re = pathToRegExp('/:test*.json', params);
210210
var m;
211211

212212
assert.equal(params.length, 1);
@@ -232,9 +232,9 @@ describe('path-to-regexp', function () {
232232
assert.ok(!m);
233233
});
234234

235-
it('should match optional trailing routes before format', function () {
235+
it('should match optional trailing routes between a normal param and a format param', function () {
236236
var params = [];
237-
var re = pathToRegExp('/:test*.:format', params);
237+
var re = pathToRegExp('/:test*.:format', params);
238238
var m;
239239

240240
assert.equal(params.length, 2);
@@ -268,9 +268,9 @@ describe('path-to-regexp', function () {
268268
assert.ok(!m);
269269
});
270270

271-
it('should match optional trailing routes before optional format', function () {
271+
it('should match optional trailing routes after a param and before an optional format param', function () {
272272
var params = [];
273-
var re = pathToRegExp('/:test*.:format?', params);
273+
var re = pathToRegExp('/:test*.:format?', params);
274274
var m;
275275

276276
assert.equal(params.length, 2);
@@ -310,7 +310,7 @@ describe('path-to-regexp', function () {
310310

311311
it('should match optional trailing routes inside optional express param', function () {
312312
var params = [];
313-
var re = pathToRegExp('/:test*?', params);
313+
var re = pathToRegExp('/:test*?', params);
314314
var m;
315315

316316
assert.equal(params.length, 1);
@@ -361,7 +361,7 @@ describe('path-to-regexp', function () {
361361

362362
it('should do non-ending matches', function () {
363363
var params = [];
364-
var m = pathToRegExp('/:test', params, { end: false }).exec('/test/route');
364+
var m = pathToRegExp('/:test', params, { end: false }).exec('/test/route');
365365

366366
assert.equal(params.length, 1);
367367
assert.equal(params[0].name, 'test');
@@ -374,7 +374,7 @@ describe('path-to-regexp', function () {
374374

375375
it('should match trailing slashes in non-ending non-strict mode', function () {
376376
var params = [];
377-
var re = pathToRegExp('/:test', params, { end: false });
377+
var re = pathToRegExp('/:test', params, { end: false });
378378
var m;
379379

380380
assert.equal(params.length, 1);
@@ -390,7 +390,7 @@ describe('path-to-regexp', function () {
390390

391391
it('should not match trailing slashes in non-ending strict mode', function () {
392392
var params = [];
393-
var re = pathToRegExp('/:test', params, { end: false, strict: true });
393+
var re = pathToRegExp('/:test', params, { end: false, strict: true });
394394

395395
assert.equal(params.length, 1);
396396
assert.equal(params[0].name, 'test');
@@ -405,7 +405,7 @@ describe('path-to-regexp', function () {
405405

406406
it('should match text after an express param', function () {
407407
var params = [];
408-
var re = pathToRegExp('/(:test)route', params);
408+
var re = pathToRegExp('/(:test)route', params);
409409

410410
assert.equal(params.length, 1);
411411
assert.equal(params[0].name, 'test');
@@ -428,7 +428,7 @@ describe('path-to-regexp', function () {
428428

429429
it('should match text after an optional express param', function () {
430430
var params = [];
431-
var re = pathToRegExp('/(:test?)route', params);
431+
var re = pathToRegExp('/(:test?)route', params);
432432
var m;
433433

434434
assert.equal(params.length, 1);
@@ -454,7 +454,7 @@ describe('path-to-regexp', function () {
454454

455455
it('should match optional formats', function () {
456456
var params = [];
457-
var re = pathToRegExp('/:test.:format?', params);
457+
var re = pathToRegExp('/:test.:format?', params);
458458
var m;
459459

460460
assert.equal(params.length, 2);
@@ -480,7 +480,7 @@ describe('path-to-regexp', function () {
480480

481481
it('should match full paths with format by default', function () {
482482
var params = [];
483-
var m = pathToRegExp('/:test', params).exec('/test.json');
483+
var m = pathToRegExp('/:test', params).exec('/test.json');
484484

485485
assert.equal(params.length, 1);
486486
assert.equal(params[0].name, 'test');

0 commit comments

Comments
 (0)