wayfarer - npm Package Compare versions
Comparing version 4.0.0 to 4.0.1
62
index.js
@@ -29,6 +29,3 @@ const routington = require('routington') | ||
| path = sanitizeUri(path) || '' | ||
| if (cb[sym]) return mount(path, cb) | ||
| const node = router.define(path)[0] | ||
| const node = cb[sym] ? mounts.define(path)[0] : router.define(path)[0] | ||
| node.cb = cb | ||
@@ -44,31 +41,40 @@ return emit | ||
| const mountPath = mountMatch(path) | ||
| if (mountPath) { | ||
| const nw = path.split('/') | ||
| nw.shift() | ||
| path = nw.join('/') | ||
| } | ||
| const sub = matchSub(path) | ||
| if (sub) path = sub.path | ||
| const mch = mountPath ? mountPath : router.match(path) || router.match(dft) | ||
| assert.ok(mch, 'path ' + path + ' did not match') | ||
| params = xtend(params, mch.param) | ||
| const match = sub ? sub.match : router.match(path) || router.match(dft) | ||
| assert.ok(match, 'path ' + path + ' did not match') | ||
| params = xtend(params, match.param) | ||
| // only nested routers need a path | ||
| mountPath ? mch.node.cb(path, params) : mch.node.cb(params) | ||
| sub ? match.node.cb(path, params) : match.node.cb(params) | ||
| } | ||
| // mount a subrouter | ||
| // str -> null | ||
| function mount (path, cb) { | ||
| path = path.split('/')[0] | ||
| const node = mounts.define(path)[0] | ||
| node.cb = cb | ||
| return emit | ||
| } | ||
| // match a mounted router | ||
| // str -> obj|null | ||
| function matchSub (path) { | ||
| var match = null | ||
| var count = 0 | ||
| const split = path.split('/') | ||
| // match a mounted router | ||
| // str -> str|bool | ||
| function mountMatch (path) { | ||
| const nw = path.split('/')[0] | ||
| const matched = mounts.match(nw) | ||
| return matched | ||
| var n = 0 | ||
| while (n < split.length) { | ||
| var ln = split.length - n | ||
| var cnt = -1 | ||
| var nw = '' | ||
| while (++cnt < ln) nw = nw ? nw.concat('/', split[cnt]) : split[cnt] | ||
| var imatch = mounts.match(nw) | ||
| if (imatch) { | ||
| match = imatch | ||
| count += n | ||
| break | ||
| } | ||
| n++ | ||
| } | ||
| if (!match) return | ||
| while (count--) split.shift() | ||
| path = split.join('/') | ||
| return { match: match, path: path } | ||
| } | ||
@@ -75,0 +81,0 @@ } |
| { | ||
| "name": "wayfarer", | ||
| "version": "4.0.0", | ||
| "version": "4.0.1", | ||
| "description": "Composable trie based router", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
New alerts
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Fixed alerts
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Improved metrics
- Total package byte prevSize
- increased by2.53%
6685
- Lines of code
- increased by7.58%
71
No dependency changes