-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
URLPattern: Implement compareComponent() method.
This CL adds a prototype URLPattern.compareComponent() to provide a natural ordering to URLPattern pattern strings. This was based on feedback from routing framework authors and there is some discussion in: whatwg/urlpattern#61 The general algorithm is to compare the component patterns Part by Part. The PartType, Modifier, and text contents are compared for each Part, but group names are not considered. The end result is a mostly lexicographical ordering based on fixed text. Matching groups and modifiers are ordered such that more restrictive patterns are greater. Bug: 1232795 Change-Id: I8474cd7d7689e657c9c74c552ad630cdcdd86c95
- Loading branch information
1 parent
f93baa8
commit 5d0a922
Showing
4 changed files
with
146 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,116 @@ | ||
[ | ||
{ | ||
"component": "pathname", | ||
"left": { "pathname": "/foo/a" }, | ||
"right": { "pathname": "/foo/b" }, | ||
"expected": -1 | ||
}, | ||
{ | ||
"component": "pathname", | ||
"left": { "pathname": "/foo/b" }, | ||
"right": { "pathname": "/foo/bar" }, | ||
"expected": -1 | ||
}, | ||
{ | ||
"component": "pathname", | ||
"left": { "pathname": "/foo/bar" }, | ||
"right": { "pathname": "/foo/:bar" }, | ||
"expected": 1 | ||
}, | ||
{ | ||
"component": "pathname", | ||
"left": { "pathname": "/foo/" }, | ||
"right": { "pathname": "/foo/:bar" }, | ||
"expected": 1 | ||
}, | ||
{ | ||
"component": "pathname", | ||
"left": { "pathname": "/foo/:bar" }, | ||
"right": { "pathname": "/foo/*" }, | ||
"expected": 1 | ||
}, | ||
{ | ||
"component": "pathname", | ||
"left": { "pathname": "/foo/{bar}" }, | ||
"right": { "pathname": "/foo/(bar)" }, | ||
"expected": 1 | ||
}, | ||
{ | ||
"component": "pathname", | ||
"left": { "pathname": "/foo/{bar}" }, | ||
"right": { "pathname": "/foo/{bar}+" }, | ||
"expected": 1 | ||
}, | ||
{ | ||
"component": "pathname", | ||
"left": { "pathname": "/foo/{bar}+" }, | ||
"right": { "pathname": "/foo/{bar}?" }, | ||
"expected": 1 | ||
}, | ||
{ | ||
"component": "pathname", | ||
"left": { "pathname": "/foo/{bar}?" }, | ||
"right": { "pathname": "/foo/{bar}*" }, | ||
"expected": 1 | ||
}, | ||
{ | ||
"component": "pathname", | ||
"left": { "pathname": "/foo/(123)" }, | ||
"right": { "pathname": "/foo/(12)" }, | ||
"expected": 1 | ||
}, | ||
{ | ||
"component": "pathname", | ||
"left": { "pathname": "/foo/:b" }, | ||
"right": { "pathname": "/foo/:a" }, | ||
"expected": 0 | ||
}, | ||
{ | ||
"component": "pathname", | ||
"left": { "pathname": "*/foo" }, | ||
"right": { "pathname": "*" }, | ||
"expected": 1 | ||
}, | ||
{ | ||
"component": "port", | ||
"left": { "port": "9" }, | ||
"right": { "port": "100" }, | ||
"expected": 1 | ||
}, | ||
{ | ||
"component": "pathname", | ||
"left": { "pathname": "foo/:bar?/baz" }, | ||
"right": { "pathname": "foo/{:bar}?/baz" }, | ||
"expected": -1 | ||
}, | ||
{ | ||
"component": "pathname", | ||
"left": { "pathname": "foo/:bar?/baz" }, | ||
"right": { "pathname": "foo{/:bar}?/baz" }, | ||
"expected": 0 | ||
}, | ||
{ | ||
"component": "pathname", | ||
"left": { "pathname": "foo/:bar?/baz" }, | ||
"right": { "pathname": "fo{o/:bar}?/baz" }, | ||
"expected": 1 | ||
}, | ||
{ | ||
"component": "pathname", | ||
"left": { "pathname": "foo/:bar?/baz" }, | ||
"right": { "pathname": "foo{/:bar/}?baz" }, | ||
"expected": -1 | ||
}, | ||
{ | ||
"component": "pathname", | ||
"left": "https://a.example.com/b?a", | ||
"right": "https://b.example.com/a?b", | ||
"expected": 1 | ||
}, | ||
{ | ||
"component": "pathname", | ||
"left": { "pathname": "/foo/{bar}/baz" }, | ||
"right": { "pathname": "/foo/bar/baz" }, | ||
"expected": 0 | ||
} | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
function runTests(data) { | ||
for (let entry of data) { | ||
test(function() { | ||
const left = new URLPattern(entry.left); | ||
const right = new URLPattern(entry.right); | ||
|
||
assert_equals(URLPattern.compareComponent(entry.component, left, right), entry.expected); | ||
|
||
// We have to coerce to an integer here in order to avoid asserting | ||
// that `+0` is `-0`. | ||
const reverse_expected = ~~(entry.expected * -1); | ||
assert_equals(URLPattern.compareComponent(entry.component, right, left), reverse_expected, "reverse order"); | ||
|
||
assert_equals(URLPattern.compareComponent(entry.component, left, left), 0, "left equality"); | ||
assert_equals(URLPattern.compareComponent(entry.component, right, right), 0, "right equality"); | ||
}, `Component: ${entry.component} ` + | ||
`Left: ${JSON.stringify(entry.left)} ` + | ||
`Right: ${JSON.stringify(entry.right)}`); | ||
} | ||
} | ||
|
||
promise_test(async function() { | ||
const response = await fetch('resources/urlpattern-compare-test-data.json'); | ||
const data = await response.json(); | ||
runTests(data); | ||
}, 'Loading data...'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
// META: global=window,worker | ||
// META: script=resources/urlpattern-compare-tests.js |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
// META: global=window,worker | ||
// META: script=resources/urlpattern-compare-tests.js |