Skip to content

add backtrace feature for splat matching #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dzyhenry wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add backtrace feature for splat matching #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@ function get(pathname) {
var pathSegments = pathname.split('/');

var hash = this._hash;
var parentNode = hash;
Copy link
Copy Markdown

@huguobo huguobo Sep 30, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess it is a rootNode, not a parentNode?

Copy link
Copy Markdown
Author

@dzyhenry dzyhenry Sep 30, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess it is a rootNode, not a parentNode?

rootNode is also a parentNode

var splat = null;
var params = {};
var variablePaths;
var i = 0;

for (var i = 0; i < pathSegments.length; i++) {
for (; i < pathSegments.length; i++) {
var segment = pathSegments[i];

if (!segment && !hash.isSplat) {
Expand All @@ -32,14 +34,17 @@ function get(pathname) {
) {
hash = hash.proto;
} else if (hash.staticPaths.hasOwnProperty(segment)) {
parentNode = hash;
hash = hash.staticPaths[segment];
} else if ((variablePaths = hash.variablePaths)) {
if (variablePaths.isSplat) {
splat = pathSegments.slice(i).join('/');
parentNode = hash;
hash = variablePaths;
break;
} else {
params[variablePaths.segment] = segment;
parentNode = hash;
hash = variablePaths;
}
} else {
Expand All @@ -48,6 +53,19 @@ function get(pathname) {
}
}

// backtrace
while (hash === null && parentNode && i >= 0) {
var parentVp = parentNode.variablePaths;
i -= 1;
if (parentVp && parentVp.isSplat) {
splat = pathSegments.slice(i).join('/');
hash = parentVp;
break;
} else {
parentNode = parentNode.parent;
}
}

// Match the empty splat
if (hash &&
hash.handler === null &&
Expand Down
26 changes: 26 additions & 0 deletions test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,32 @@ test('http hash inserts root', function (assert) {
assert.end();
});

test('http hash test priority of /a/b/c and /a/b/*', function (assert) {
// Arrange
function routeHandlerABC() {}
function routeHandlerABStar() {}

var hash = HttpHash();

// Act
hash.set('/a/b/c', routeHandlerABC);
hash.set('/a/b/*', routeHandlerABStar);

// get
var res1 = hash.get('/a/b/c');
var res2 = hash.get('/a/b/c/d');
var res3 = hash.get('/a/b/e');
var res4 = hash.get('/a/b');
var res5 = hash.get('/a/c');
// Assert
assert.strictEqual(res1.handler, routeHandlerABC);
assert.strictEqual(res2.handler, routeHandlerABStar);
assert.strictEqual(res3.handler, routeHandlerABStar);
assert.strictEqual(res4.handler, routeHandlerABStar);
assert.strictEqual(res5.handler, null);
assert.end();
});

test('http hash inserts fixed route', function (assert) {
// Arrange
function routeHandler() {}
Expand Down