Add support for named wildcards#44

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
randomdevpete wants to merge 3 commits into
base:master
Choose a base branch
from
Open

Add support for named wildcards #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9a95dc
Add support for named wildcards
randomdevpete Dec 25, 2017
a8b46e6
Add yarn lockfile
randomdevpete Dec 25, 2017
366d32d
Document syntax for named wildcards
Jan 28, 2018
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
9 changes: 9 additions & 0 deletions README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -183,6 +183,15 @@ wildcard matches are collected in the `_` property:
if there is only one wildcard then `_` contains the matching string.
otherwise `_` contains an array of matching strings.

`*:` in a pattern is a named wildcard. the match will be
captured to the corresponding property instead of `_`:

```javascript
> var pattern = new UrlPattern('/search/*:term');
> pattern.match('/search/fruit');
{term: 'fruit'}
```

[look at the tests for additional examples of `.match`](test/match-fixtures.coffee)

## make pattern from regex
Expand Down
8 changes: 7 additions & 1 deletion lib/url-pattern.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 13 additions & 3 deletions src/url-pattern.coffee
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -204,6 +204,15 @@

U.name = P.regex new RegExp "^[#{options.segmentNameCharset}]+"

U.namedWildcard = P.tag(
'namedWildcard',
P.pick(2,
P.string(options.wildcardChar)
P.string(options.segmentNameStartChar)
P.lazy(-> U.name)
)
)

U.named = P.tag(
'named',
P.pick(1,
Expand DownExpand Up@@ -235,6 +244,7 @@

U.token = P.lazy ->
P.firstChoice(
U.namedWildcard
U.wildcard
U.optional
U.named
Expand DownExpand Up@@ -266,7 +276,7 @@
baseAstNodeToRegexString(node, segmentValueCharset)

switch astNode.tag
when 'wildcard' then '(.*?)'
when 'wildcard', 'namedWildcard' then '(.*?)'
when 'named' then "([#{segmentValueCharset}]+)"
when 'static' then escapeForRegex(astNode.value)
when 'optional'
Expand All@@ -281,7 +291,7 @@

switch astNode.tag
when 'wildcard' then ['_']
when 'named' then [astNode.value]
when 'namedWildcard', 'named' then [astNode.value]
when 'static' then []
when 'optional' then astNodeToNames(astNode.value)

Expand DownExpand Up@@ -330,7 +340,7 @@

switch astNode.tag
when 'wildcard' then getParam params, '_', nextIndexes, true
when 'named' then getParam params, astNode.value, nextIndexes, true
when 'named', 'namedWildcard' then getParam params, astNode.value, nextIndexes, true
when 'static' then astNode.value
when 'optional'
if astNodeContainsSegmentsForProvidedParams astNode.value, params, nextIndexes
Expand Down
12 changes: 12 additions & 0 deletions test/ast.coffee
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,12 @@ test 'astNodeToRegexString and astNodeToNames', (t) ->
t.deepEqual astNodeToNames(parsed.value), ['_']
t.end()

t.test 'just named wildcard', (t) ->
parsed = parse '*:variable'
t.equal astNodeToRegexString(parsed.value), '^(.*?)$'
t.deepEqual astNodeToNames(parsed.value), ['variable']
t.end()

t.test 'just optional static', (t) ->
parsed = parse '(foo)'
t.equal astNodeToRegexString(parsed.value), '^(?:foo)?$'
Expand All@@ -58,6 +64,12 @@ test 'astNodeToRegexString and astNodeToNames', (t) ->
t.deepEqual astNodeToNames(parsed.value), ['_']
t.end()

t.test 'just optional named wildcard', (t) ->
parsed = parse '(*:foo)'
t.equal astNodeToRegexString(parsed.value), '^(?:(.*?))?$'
t.deepEqual astNodeToNames(parsed.value), ['foo']
t.end()

test 'getParam', (t) ->
t.test 'no side effects', (t) ->
next = {}
Expand Down
9 changes: 9 additions & 0 deletions test/match-fixtures.coffee
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,11 @@ test 'match', (t) ->
_: '/school/10',
userId: '10'

pattern = new UrlPattern '*:root/user/:userId'
t.deepEqual pattern.match('/school/10/user/10'),
root: '/school/10',
userId: '10'

pattern = new UrlPattern '*-user-:userId'
t.deepEqual pattern.match('-school-10-user-10'),
_: '-school-10'
Expand All@@ -53,6 +58,10 @@ test 'match', (t) ->
t.deepEqual pattern.match('/admin/school/10/user/10'),
_: '/school/10/user/10'

pattern = new UrlPattern '/admin*:tail'
t.deepEqual pattern.match('/admin/school/10/user/10'),
tail: '/school/10/user/10'

pattern = new UrlPattern '#admin*'
t.deepEqual pattern.match('#admin#school#10#user#10'),
_: '#school#10#user#10'
Expand Down
30 changes: 30 additions & 0 deletions test/parser.coffee
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,36 @@ test 'named', (t) ->
t.equal U.named('abc'), undefined
t.end()


test 'namedWildcard', (t) ->
t.deepEqual U.namedWildcard('*:a'),
value:
tag: 'namedWildcard'
value: 'a'
rest: ''
t.deepEqual U.namedWildcard('*:ab96c'),
value:
tag: 'namedWildcard'
value: 'ab96c'
rest: ''
t.deepEqual U.namedWildcard('*:ab96c.'),
value:
tag: 'namedWildcard'
value: 'ab96c'
rest: '.'
t.deepEqual U.namedWildcard('*:96c-:ab'),
value:
tag: 'namedWildcard'
value: '96c'
rest: '-:ab'
t.equal U.namedWildcard(':'), undefined
t.equal U.namedWildcard('*:'), undefined
t.equal U.namedWildcard('*'), undefined
t.equal U.namedWildcard(''), undefined
t.equal U.namedWildcard('a'), undefined
t.equal U.namedWildcard('abc'), undefined
t.end()

test 'static', (t) ->
t.deepEqual U.static('a'),
value:
Expand Down
9 changes: 9 additions & 0 deletions test/stringify-fixtures.coffee
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,11 @@ test 'stringify', (t) ->
_: '/school/10',
userId: '10'

pattern = new UrlPattern '*:root/user/:userId'
t.equal '/school/10/user/10', pattern.stringify
root: '/school/10',
userId: '10'

pattern = new UrlPattern '*-user-:userId'
t.equal '-school-10-user-10', pattern.stringify
_: '-school-10'
Expand All@@ -35,6 +40,10 @@ test 'stringify', (t) ->
t.equal '/admin/school/10/user/10', pattern.stringify
_: '/school/10/user/10'

pattern = new UrlPattern '/admin*:tail'
t.equal '/admin/school/10/user/10', pattern.stringify
tail: '/school/10/user/10'

pattern = new UrlPattern '/admin/*/user/*/tail'
t.equal '/admin/school/10/user/10/12/tail', pattern.stringify
_: ['school/10', '10/12']
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add support for named wildcards#44

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

randomdevpete
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


Add support for named wildcards
#44
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b9a95dc

Add support for named wildcards


randomdevpete Dec 25, 2017
a8b46e6

Add yarn lockfile


randomdevpete Dec 25, 2017
366d32d

Document syntax for named wildcards

Jan 28, 2018

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


9 changes: 9 additions & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,6 +183,15 @@ wildcard matches are collected in the `_` property:
if there is only one wildcard then `_` contains the matching string.
otherwise `_` contains an array of matching strings.

`*:` in a pattern is a named wildcard. the match will be
captured to the corresponding property instead of `_`:

```javascript
> var pattern = new UrlPattern('/search/*:term');
> pattern.match('/search/fruit');
{term: 'fruit'}
```

[look at the tests for additional examples of `.match`](test/match-fixtures.coffee)

## make pattern from regex
Expand Down

8 changes: 7 additions & 1 deletion
lib/url-pattern.js

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


16 changes: 13 additions & 3 deletions
src/url-pattern.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,6 +204,15 @@

 U.name = P.regex new RegExp "^[#{options.segmentNameCharset}]+"

 U.namedWildcard = P.tag(
 'namedWildcard',
 P.pick(2,
 P.string(options.wildcardChar)
 P.string(options.segmentNameStartChar)
 P.lazy(-> U.name)
 )
 )

 U.named = P.tag(
 'named',
 P.pick(1,
Expand DownExpand Up@@ -235,6 +244,7 @@

 U.token = P.lazy ->
 P.firstChoice(
 U.namedWildcard
 U.wildcard
 U.optional
 U.named
Expand DownExpand Up@@ -266,7 +276,7 @@
 baseAstNodeToRegexString(node, segmentValueCharset)

 switch astNode.tag
 when 'wildcard' then '(.*?)'
 when 'wildcard', 'namedWildcard' then '(.*?)'
 when 'named' then "([#{segmentValueCharset}]+)"
 when 'static' then escapeForRegex(astNode.value)
 when 'optional'
Expand All@@ -281,7 +291,7 @@

 switch astNode.tag
 when 'wildcard' then ['_']
 when 'named' then [astNode.value]
 when 'namedWildcard', 'named' then [astNode.value]
 when 'static' then []
 when 'optional' then astNodeToNames(astNode.value)

Expand DownExpand Up@@ -330,7 +340,7 @@

 switch astNode.tag
 when 'wildcard' then getParam params, '_', nextIndexes, true
 when 'named' then getParam params, astNode.value, nextIndexes, true
 when 'named', 'namedWildcard' then getParam params, astNode.value, nextIndexes, true
 when 'static' then astNode.value
 when 'optional'
 if astNodeContainsSegmentsForProvidedParams astNode.value, params, nextIndexes
Expand Down

12 changes: 12 additions & 0 deletions
test/ast.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,12 @@ test 'astNodeToRegexString and astNodeToNames', (t) ->
 t.deepEqual astNodeToNames(parsed.value), ['_']
 t.end()

 t.test 'just named wildcard', (t) ->
 parsed = parse '*:variable'
 t.equal astNodeToRegexString(parsed.value), '^(.*?)$'
 t.deepEqual astNodeToNames(parsed.value), ['variable']
 t.end()

 t.test 'just optional static', (t) ->
 parsed = parse '(foo)'
 t.equal astNodeToRegexString(parsed.value), '^(?:foo)?$'
Expand All@@ -58,6 +64,12 @@ test 'astNodeToRegexString and astNodeToNames', (t) ->
 t.deepEqual astNodeToNames(parsed.value), ['_']
 t.end()

 t.test 'just optional named wildcard', (t) ->
 parsed = parse '(*:foo)'
 t.equal astNodeToRegexString(parsed.value), '^(?:(.*?))?$'
 t.deepEqual astNodeToNames(parsed.value), ['foo']
 t.end()

test 'getParam', (t) ->
 t.test 'no side effects', (t) ->
 next = {}
Expand Down

9 changes: 9 additions & 0 deletions
test/match-fixtures.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,11 @@ test 'match', (t) ->
 _: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*:root/user/:userId'
 t.deepEqual pattern.match('/school/10/user/10'),
 root: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*-user-:userId'
 t.deepEqual pattern.match('-school-10-user-10'),
 _: '-school-10'
Expand All@@ -53,6 +58,10 @@ test 'match', (t) ->
 t.deepEqual pattern.match('/admin/school/10/user/10'),
 _: '/school/10/user/10'

 pattern = new UrlPattern '/admin*:tail'
 t.deepEqual pattern.match('/admin/school/10/user/10'),
 tail: '/school/10/user/10'

 pattern = new UrlPattern '#admin*'
 t.deepEqual pattern.match('#admin#school#10#user#10'),
 _: '#school#10#user#10'
Expand Down

30 changes: 30 additions & 0 deletions
test/parser.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,36 @@ test 'named', (t) ->
 t.equal U.named('abc'), undefined
 t.end()


test 'namedWildcard', (t) ->
 t.deepEqual U.namedWildcard('*:a'),
 value:
 tag: 'namedWildcard'
 value: 'a'
 rest: ''
 t.deepEqual U.namedWildcard('*:ab96c'),
 value:
 tag: 'namedWildcard'
 value: 'ab96c'
 rest: ''
 t.deepEqual U.namedWildcard('*:ab96c.'),
 value:
 tag: 'namedWildcard'
 value: 'ab96c'
 rest: '.'
 t.deepEqual U.namedWildcard('*:96c-:ab'),
 value:
 tag: 'namedWildcard'
 value: '96c'
 rest: '-:ab'
 t.equal U.namedWildcard(':'), undefined
 t.equal U.namedWildcard('*:'), undefined
 t.equal U.namedWildcard('*'), undefined
 t.equal U.namedWildcard(''), undefined
 t.equal U.namedWildcard('a'), undefined
 t.equal U.namedWildcard('abc'), undefined
 t.end()

test 'static', (t) ->
 t.deepEqual U.static('a'),
 value:
Expand Down

9 changes: 9 additions & 0 deletions
test/stringify-fixtures.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,11 @@ test 'stringify', (t) ->
 _: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*:root/user/:userId'
 t.equal '/school/10/user/10', pattern.stringify
 root: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*-user-:userId'
 t.equal '-school-10-user-10', pattern.stringify
 _: '-school-10'
Expand All@@ -35,6 +40,10 @@ test 'stringify', (t) ->
 t.equal '/admin/school/10/user/10', pattern.stringify
 _: '/school/10/user/10'

 pattern = new UrlPattern '/admin*:tail'
 t.equal '/admin/school/10/user/10', pattern.stringify
 tail: '/school/10/user/10'

 pattern = new UrlPattern '/admin/*/user/*/tail'
 t.equal '/admin/school/10/user/10/12/tail', pattern.stringify
 _: ['school/10', '10/12']
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add support for named wildcards#44

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

randomdevpete
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


Add support for named wildcards
#44
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b9a95dc

Add support for named wildcards


randomdevpete Dec 25, 2017
a8b46e6

Add yarn lockfile


randomdevpete Dec 25, 2017
366d32d

Document syntax for named wildcards

Jan 28, 2018

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


9 changes: 9 additions & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,6 +183,15 @@ wildcard matches are collected in the `_` property:
if there is only one wildcard then `_` contains the matching string.
otherwise `_` contains an array of matching strings.

`*:` in a pattern is a named wildcard. the match will be
captured to the corresponding property instead of `_`:

```javascript
> var pattern = new UrlPattern('/search/*:term');
> pattern.match('/search/fruit');
{term: 'fruit'}
```

[look at the tests for additional examples of `.match`](test/match-fixtures.coffee)

## make pattern from regex
Expand Down

8 changes: 7 additions & 1 deletion
lib/url-pattern.js

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


16 changes: 13 additions & 3 deletions
src/url-pattern.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,6 +204,15 @@

 U.name = P.regex new RegExp "^[#{options.segmentNameCharset}]+"

 U.namedWildcard = P.tag(
 'namedWildcard',
 P.pick(2,
 P.string(options.wildcardChar)
 P.string(options.segmentNameStartChar)
 P.lazy(-> U.name)
 )
 )

 U.named = P.tag(
 'named',
 P.pick(1,
Expand DownExpand Up@@ -235,6 +244,7 @@

 U.token = P.lazy ->
 P.firstChoice(
 U.namedWildcard
 U.wildcard
 U.optional
 U.named
Expand DownExpand Up@@ -266,7 +276,7 @@
 baseAstNodeToRegexString(node, segmentValueCharset)

 switch astNode.tag
 when 'wildcard' then '(.*?)'
 when 'wildcard', 'namedWildcard' then '(.*?)'
 when 'named' then "([#{segmentValueCharset}]+)"
 when 'static' then escapeForRegex(astNode.value)
 when 'optional'
Expand All@@ -281,7 +291,7 @@

 switch astNode.tag
 when 'wildcard' then ['_']
 when 'named' then [astNode.value]
 when 'namedWildcard', 'named' then [astNode.value]
 when 'static' then []
 when 'optional' then astNodeToNames(astNode.value)

Expand DownExpand Up@@ -330,7 +340,7 @@

 switch astNode.tag
 when 'wildcard' then getParam params, '_', nextIndexes, true
 when 'named' then getParam params, astNode.value, nextIndexes, true
 when 'named', 'namedWildcard' then getParam params, astNode.value, nextIndexes, true
 when 'static' then astNode.value
 when 'optional'
 if astNodeContainsSegmentsForProvidedParams astNode.value, params, nextIndexes
Expand Down

12 changes: 12 additions & 0 deletions
test/ast.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,12 @@ test 'astNodeToRegexString and astNodeToNames', (t) ->
 t.deepEqual astNodeToNames(parsed.value), ['_']
 t.end()

 t.test 'just named wildcard', (t) ->
 parsed = parse '*:variable'
 t.equal astNodeToRegexString(parsed.value), '^(.*?)$'
 t.deepEqual astNodeToNames(parsed.value), ['variable']
 t.end()

 t.test 'just optional static', (t) ->
 parsed = parse '(foo)'
 t.equal astNodeToRegexString(parsed.value), '^(?:foo)?$'
Expand All@@ -58,6 +64,12 @@ test 'astNodeToRegexString and astNodeToNames', (t) ->
 t.deepEqual astNodeToNames(parsed.value), ['_']
 t.end()

 t.test 'just optional named wildcard', (t) ->
 parsed = parse '(*:foo)'
 t.equal astNodeToRegexString(parsed.value), '^(?:(.*?))?$'
 t.deepEqual astNodeToNames(parsed.value), ['foo']
 t.end()

test 'getParam', (t) ->
 t.test 'no side effects', (t) ->
 next = {}
Expand Down

9 changes: 9 additions & 0 deletions
test/match-fixtures.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,11 @@ test 'match', (t) ->
 _: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*:root/user/:userId'
 t.deepEqual pattern.match('/school/10/user/10'),
 root: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*-user-:userId'
 t.deepEqual pattern.match('-school-10-user-10'),
 _: '-school-10'
Expand All@@ -53,6 +58,10 @@ test 'match', (t) ->
 t.deepEqual pattern.match('/admin/school/10/user/10'),
 _: '/school/10/user/10'

 pattern = new UrlPattern '/admin*:tail'
 t.deepEqual pattern.match('/admin/school/10/user/10'),
 tail: '/school/10/user/10'

 pattern = new UrlPattern '#admin*'
 t.deepEqual pattern.match('#admin#school#10#user#10'),
 _: '#school#10#user#10'
Expand Down

30 changes: 30 additions & 0 deletions
test/parser.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,36 @@ test 'named', (t) ->
 t.equal U.named('abc'), undefined
 t.end()


test 'namedWildcard', (t) ->
 t.deepEqual U.namedWildcard('*:a'),
 value:
 tag: 'namedWildcard'
 value: 'a'
 rest: ''
 t.deepEqual U.namedWildcard('*:ab96c'),
 value:
 tag: 'namedWildcard'
 value: 'ab96c'
 rest: ''
 t.deepEqual U.namedWildcard('*:ab96c.'),
 value:
 tag: 'namedWildcard'
 value: 'ab96c'
 rest: '.'
 t.deepEqual U.namedWildcard('*:96c-:ab'),
 value:
 tag: 'namedWildcard'
 value: '96c'
 rest: '-:ab'
 t.equal U.namedWildcard(':'), undefined
 t.equal U.namedWildcard('*:'), undefined
 t.equal U.namedWildcard('*'), undefined
 t.equal U.namedWildcard(''), undefined
 t.equal U.namedWildcard('a'), undefined
 t.equal U.namedWildcard('abc'), undefined
 t.end()

test 'static', (t) ->
 t.deepEqual U.static('a'),
 value:
Expand Down

9 changes: 9 additions & 0 deletions
test/stringify-fixtures.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,11 @@ test 'stringify', (t) ->
 _: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*:root/user/:userId'
 t.equal '/school/10/user/10', pattern.stringify
 root: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*-user-:userId'
 t.equal '-school-10-user-10', pattern.stringify
 _: '-school-10'
Expand All@@ -35,6 +40,10 @@ test 'stringify', (t) ->
 t.equal '/admin/school/10/user/10', pattern.stringify
 _: '/school/10/user/10'

 pattern = new UrlPattern '/admin*:tail'
 t.equal '/admin/school/10/user/10', pattern.stringify
 tail: '/school/10/user/10'

 pattern = new UrlPattern '/admin/*/user/*/tail'
 t.equal '/admin/school/10/user/10/12/tail', pattern.stringify
 _: ['school/10', '10/12']
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add support for named wildcards#44

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

randomdevpete
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


Add support for named wildcards
#44
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b9a95dc

Add support for named wildcards


randomdevpete Dec 25, 2017
a8b46e6

Add yarn lockfile


randomdevpete Dec 25, 2017
366d32d

Document syntax for named wildcards

Jan 28, 2018

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


9 changes: 9 additions & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,6 +183,15 @@ wildcard matches are collected in the `_` property:
if there is only one wildcard then `_` contains the matching string.
otherwise `_` contains an array of matching strings.

`*:` in a pattern is a named wildcard. the match will be
captured to the corresponding property instead of `_`:

```javascript
> var pattern = new UrlPattern('/search/*:term');
> pattern.match('/search/fruit');
{term: 'fruit'}
```

[look at the tests for additional examples of `.match`](test/match-fixtures.coffee)

## make pattern from regex
Expand Down

8 changes: 7 additions & 1 deletion
lib/url-pattern.js

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


16 changes: 13 additions & 3 deletions
src/url-pattern.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,6 +204,15 @@

 U.name = P.regex new RegExp "^[#{options.segmentNameCharset}]+"

 U.namedWildcard = P.tag(
 'namedWildcard',
 P.pick(2,
 P.string(options.wildcardChar)
 P.string(options.segmentNameStartChar)
 P.lazy(-> U.name)
 )
 )

 U.named = P.tag(
 'named',
 P.pick(1,
Expand DownExpand Up@@ -235,6 +244,7 @@

 U.token = P.lazy ->
 P.firstChoice(
 U.namedWildcard
 U.wildcard
 U.optional
 U.named
Expand DownExpand Up@@ -266,7 +276,7 @@
 baseAstNodeToRegexString(node, segmentValueCharset)

 switch astNode.tag
 when 'wildcard' then '(.*?)'
 when 'wildcard', 'namedWildcard' then '(.*?)'
 when 'named' then "([#{segmentValueCharset}]+)"
 when 'static' then escapeForRegex(astNode.value)
 when 'optional'
Expand All@@ -281,7 +291,7 @@

 switch astNode.tag
 when 'wildcard' then ['_']
 when 'named' then [astNode.value]
 when 'namedWildcard', 'named' then [astNode.value]
 when 'static' then []
 when 'optional' then astNodeToNames(astNode.value)

Expand DownExpand Up@@ -330,7 +340,7 @@

 switch astNode.tag
 when 'wildcard' then getParam params, '_', nextIndexes, true
 when 'named' then getParam params, astNode.value, nextIndexes, true
 when 'named', 'namedWildcard' then getParam params, astNode.value, nextIndexes, true
 when 'static' then astNode.value
 when 'optional'
 if astNodeContainsSegmentsForProvidedParams astNode.value, params, nextIndexes
Expand Down

12 changes: 12 additions & 0 deletions
test/ast.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,12 @@ test 'astNodeToRegexString and astNodeToNames', (t) ->
 t.deepEqual astNodeToNames(parsed.value), ['_']
 t.end()

 t.test 'just named wildcard', (t) ->
 parsed = parse '*:variable'
 t.equal astNodeToRegexString(parsed.value), '^(.*?)$'
 t.deepEqual astNodeToNames(parsed.value), ['variable']
 t.end()

 t.test 'just optional static', (t) ->
 parsed = parse '(foo)'
 t.equal astNodeToRegexString(parsed.value), '^(?:foo)?$'
Expand All@@ -58,6 +64,12 @@ test 'astNodeToRegexString and astNodeToNames', (t) ->
 t.deepEqual astNodeToNames(parsed.value), ['_']
 t.end()

 t.test 'just optional named wildcard', (t) ->
 parsed = parse '(*:foo)'
 t.equal astNodeToRegexString(parsed.value), '^(?:(.*?))?$'
 t.deepEqual astNodeToNames(parsed.value), ['foo']
 t.end()

test 'getParam', (t) ->
 t.test 'no side effects', (t) ->
 next = {}
Expand Down

9 changes: 9 additions & 0 deletions
test/match-fixtures.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,11 @@ test 'match', (t) ->
 _: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*:root/user/:userId'
 t.deepEqual pattern.match('/school/10/user/10'),
 root: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*-user-:userId'
 t.deepEqual pattern.match('-school-10-user-10'),
 _: '-school-10'
Expand All@@ -53,6 +58,10 @@ test 'match', (t) ->
 t.deepEqual pattern.match('/admin/school/10/user/10'),
 _: '/school/10/user/10'

 pattern = new UrlPattern '/admin*:tail'
 t.deepEqual pattern.match('/admin/school/10/user/10'),
 tail: '/school/10/user/10'

 pattern = new UrlPattern '#admin*'
 t.deepEqual pattern.match('#admin#school#10#user#10'),
 _: '#school#10#user#10'
Expand Down

30 changes: 30 additions & 0 deletions
test/parser.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,36 @@ test 'named', (t) ->
 t.equal U.named('abc'), undefined
 t.end()


test 'namedWildcard', (t) ->
 t.deepEqual U.namedWildcard('*:a'),
 value:
 tag: 'namedWildcard'
 value: 'a'
 rest: ''
 t.deepEqual U.namedWildcard('*:ab96c'),
 value:
 tag: 'namedWildcard'
 value: 'ab96c'
 rest: ''
 t.deepEqual U.namedWildcard('*:ab96c.'),
 value:
 tag: 'namedWildcard'
 value: 'ab96c'
 rest: '.'
 t.deepEqual U.namedWildcard('*:96c-:ab'),
 value:
 tag: 'namedWildcard'
 value: '96c'
 rest: '-:ab'
 t.equal U.namedWildcard(':'), undefined
 t.equal U.namedWildcard('*:'), undefined
 t.equal U.namedWildcard('*'), undefined
 t.equal U.namedWildcard(''), undefined
 t.equal U.namedWildcard('a'), undefined
 t.equal U.namedWildcard('abc'), undefined
 t.end()

test 'static', (t) ->
 t.deepEqual U.static('a'),
 value:
Expand Down

9 changes: 9 additions & 0 deletions
test/stringify-fixtures.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,11 @@ test 'stringify', (t) ->
 _: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*:root/user/:userId'
 t.equal '/school/10/user/10', pattern.stringify
 root: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*-user-:userId'
 t.equal '-school-10-user-10', pattern.stringify
 _: '-school-10'
Expand All@@ -35,6 +40,10 @@ test 'stringify', (t) ->
 t.equal '/admin/school/10/user/10', pattern.stringify
 _: '/school/10/user/10'

 pattern = new UrlPattern '/admin*:tail'
 t.equal '/admin/school/10/user/10', pattern.stringify
 tail: '/school/10/user/10'

 pattern = new UrlPattern '/admin/*/user/*/tail'
 t.equal '/admin/school/10/user/10/12/tail', pattern.stringify
 _: ['school/10', '10/12']
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add support for named wildcards#44

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

randomdevpete
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


Add support for named wildcards
#44
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b9a95dc

Add support for named wildcards


randomdevpete Dec 25, 2017
a8b46e6

Add yarn lockfile


randomdevpete Dec 25, 2017
366d32d

Document syntax for named wildcards

Jan 28, 2018

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


9 changes: 9 additions & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,6 +183,15 @@ wildcard matches are collected in the `_` property:
if there is only one wildcard then `_` contains the matching string.
otherwise `_` contains an array of matching strings.

`*:` in a pattern is a named wildcard. the match will be
captured to the corresponding property instead of `_`:

```javascript
> var pattern = new UrlPattern('/search/*:term');
> pattern.match('/search/fruit');
{term: 'fruit'}
```

[look at the tests for additional examples of `.match`](test/match-fixtures.coffee)

## make pattern from regex
Expand Down

8 changes: 7 additions & 1 deletion
lib/url-pattern.js

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


16 changes: 13 additions & 3 deletions
src/url-pattern.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,6 +204,15 @@

 U.name = P.regex new RegExp "^[#{options.segmentNameCharset}]+"

 U.namedWildcard = P.tag(
 'namedWildcard',
 P.pick(2,
 P.string(options.wildcardChar)
 P.string(options.segmentNameStartChar)
 P.lazy(-> U.name)
 )
 )

 U.named = P.tag(
 'named',
 P.pick(1,
Expand DownExpand Up@@ -235,6 +244,7 @@

 U.token = P.lazy ->
 P.firstChoice(
 U.namedWildcard
 U.wildcard
 U.optional
 U.named
Expand DownExpand Up@@ -266,7 +276,7 @@
 baseAstNodeToRegexString(node, segmentValueCharset)

 switch astNode.tag
 when 'wildcard' then '(.*?)'
 when 'wildcard', 'namedWildcard' then '(.*?)'
 when 'named' then "([#{segmentValueCharset}]+)"
 when 'static' then escapeForRegex(astNode.value)
 when 'optional'
Expand All@@ -281,7 +291,7 @@

 switch astNode.tag
 when 'wildcard' then ['_']
 when 'named' then [astNode.value]
 when 'namedWildcard', 'named' then [astNode.value]
 when 'static' then []
 when 'optional' then astNodeToNames(astNode.value)

Expand DownExpand Up@@ -330,7 +340,7 @@

 switch astNode.tag
 when 'wildcard' then getParam params, '_', nextIndexes, true
 when 'named' then getParam params, astNode.value, nextIndexes, true
 when 'named', 'namedWildcard' then getParam params, astNode.value, nextIndexes, true
 when 'static' then astNode.value
 when 'optional'
 if astNodeContainsSegmentsForProvidedParams astNode.value, params, nextIndexes
Expand Down

12 changes: 12 additions & 0 deletions
test/ast.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,12 @@ test 'astNodeToRegexString and astNodeToNames', (t) ->
 t.deepEqual astNodeToNames(parsed.value), ['_']
 t.end()

 t.test 'just named wildcard', (t) ->
 parsed = parse '*:variable'
 t.equal astNodeToRegexString(parsed.value), '^(.*?)$'
 t.deepEqual astNodeToNames(parsed.value), ['variable']
 t.end()

 t.test 'just optional static', (t) ->
 parsed = parse '(foo)'
 t.equal astNodeToRegexString(parsed.value), '^(?:foo)?$'
Expand All@@ -58,6 +64,12 @@ test 'astNodeToRegexString and astNodeToNames', (t) ->
 t.deepEqual astNodeToNames(parsed.value), ['_']
 t.end()

 t.test 'just optional named wildcard', (t) ->
 parsed = parse '(*:foo)'
 t.equal astNodeToRegexString(parsed.value), '^(?:(.*?))?$'
 t.deepEqual astNodeToNames(parsed.value), ['foo']
 t.end()

test 'getParam', (t) ->
 t.test 'no side effects', (t) ->
 next = {}
Expand Down

9 changes: 9 additions & 0 deletions
test/match-fixtures.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,11 @@ test 'match', (t) ->
 _: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*:root/user/:userId'
 t.deepEqual pattern.match('/school/10/user/10'),
 root: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*-user-:userId'
 t.deepEqual pattern.match('-school-10-user-10'),
 _: '-school-10'
Expand All@@ -53,6 +58,10 @@ test 'match', (t) ->
 t.deepEqual pattern.match('/admin/school/10/user/10'),
 _: '/school/10/user/10'

 pattern = new UrlPattern '/admin*:tail'
 t.deepEqual pattern.match('/admin/school/10/user/10'),
 tail: '/school/10/user/10'

 pattern = new UrlPattern '#admin*'
 t.deepEqual pattern.match('#admin#school#10#user#10'),
 _: '#school#10#user#10'
Expand Down

30 changes: 30 additions & 0 deletions
test/parser.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,36 @@ test 'named', (t) ->
 t.equal U.named('abc'), undefined
 t.end()


test 'namedWildcard', (t) ->
 t.deepEqual U.namedWildcard('*:a'),
 value:
 tag: 'namedWildcard'
 value: 'a'
 rest: ''
 t.deepEqual U.namedWildcard('*:ab96c'),
 value:
 tag: 'namedWildcard'
 value: 'ab96c'
 rest: ''
 t.deepEqual U.namedWildcard('*:ab96c.'),
 value:
 tag: 'namedWildcard'
 value: 'ab96c'
 rest: '.'
 t.deepEqual U.namedWildcard('*:96c-:ab'),
 value:
 tag: 'namedWildcard'
 value: '96c'
 rest: '-:ab'
 t.equal U.namedWildcard(':'), undefined
 t.equal U.namedWildcard('*:'), undefined
 t.equal U.namedWildcard('*'), undefined
 t.equal U.namedWildcard(''), undefined
 t.equal U.namedWildcard('a'), undefined
 t.equal U.namedWildcard('abc'), undefined
 t.end()

test 'static', (t) ->
 t.deepEqual U.static('a'),
 value:
Expand Down

9 changes: 9 additions & 0 deletions
test/stringify-fixtures.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,11 @@ test 'stringify', (t) ->
 _: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*:root/user/:userId'
 t.equal '/school/10/user/10', pattern.stringify
 root: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*-user-:userId'
 t.equal '-school-10-user-10', pattern.stringify
 _: '-school-10'
Expand All@@ -35,6 +40,10 @@ test 'stringify', (t) ->
 t.equal '/admin/school/10/user/10', pattern.stringify
 _: '/school/10/user/10'

 pattern = new UrlPattern '/admin*:tail'
 t.equal '/admin/school/10/user/10', pattern.stringify
 tail: '/school/10/user/10'

 pattern = new UrlPattern '/admin/*/user/*/tail'
 t.equal '/admin/school/10/user/10/12/tail', pattern.stringify
 _: ['school/10', '10/12']
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add support for named wildcards#44

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

randomdevpete
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


Add support for named wildcards
#44
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b9a95dc

Add support for named wildcards


randomdevpete Dec 25, 2017
a8b46e6

Add yarn lockfile


randomdevpete Dec 25, 2017
366d32d

Document syntax for named wildcards

Jan 28, 2018

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


9 changes: 9 additions & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,6 +183,15 @@ wildcard matches are collected in the `_` property:
if there is only one wildcard then `_` contains the matching string.
otherwise `_` contains an array of matching strings.

`*:` in a pattern is a named wildcard. the match will be
captured to the corresponding property instead of `_`:

```javascript
> var pattern = new UrlPattern('/search/*:term');
> pattern.match('/search/fruit');
{term: 'fruit'}
```

[look at the tests for additional examples of `.match`](test/match-fixtures.coffee)

## make pattern from regex
Expand Down

8 changes: 7 additions & 1 deletion
lib/url-pattern.js

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


16 changes: 13 additions & 3 deletions
src/url-pattern.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,6 +204,15 @@

 U.name = P.regex new RegExp "^[#{options.segmentNameCharset}]+"

 U.namedWildcard = P.tag(
 'namedWildcard',
 P.pick(2,
 P.string(options.wildcardChar)
 P.string(options.segmentNameStartChar)
 P.lazy(-> U.name)
 )
 )

 U.named = P.tag(
 'named',
 P.pick(1,
Expand DownExpand Up@@ -235,6 +244,7 @@

 U.token = P.lazy ->
 P.firstChoice(
 U.namedWildcard
 U.wildcard
 U.optional
 U.named
Expand DownExpand Up@@ -266,7 +276,7 @@
 baseAstNodeToRegexString(node, segmentValueCharset)

 switch astNode.tag
 when 'wildcard' then '(.*?)'
 when 'wildcard', 'namedWildcard' then '(.*?)'
 when 'named' then "([#{segmentValueCharset}]+)"
 when 'static' then escapeForRegex(astNode.value)
 when 'optional'
Expand All@@ -281,7 +291,7 @@

 switch astNode.tag
 when 'wildcard' then ['_']
 when 'named' then [astNode.value]
 when 'namedWildcard', 'named' then [astNode.value]
 when 'static' then []
 when 'optional' then astNodeToNames(astNode.value)

Expand DownExpand Up@@ -330,7 +340,7 @@

 switch astNode.tag
 when 'wildcard' then getParam params, '_', nextIndexes, true
 when 'named' then getParam params, astNode.value, nextIndexes, true
 when 'named', 'namedWildcard' then getParam params, astNode.value, nextIndexes, true
 when 'static' then astNode.value
 when 'optional'
 if astNodeContainsSegmentsForProvidedParams astNode.value, params, nextIndexes
Expand Down

12 changes: 12 additions & 0 deletions
test/ast.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,12 @@ test 'astNodeToRegexString and astNodeToNames', (t) ->
 t.deepEqual astNodeToNames(parsed.value), ['_']
 t.end()

 t.test 'just named wildcard', (t) ->
 parsed = parse '*:variable'
 t.equal astNodeToRegexString(parsed.value), '^(.*?)$'
 t.deepEqual astNodeToNames(parsed.value), ['variable']
 t.end()

 t.test 'just optional static', (t) ->
 parsed = parse '(foo)'
 t.equal astNodeToRegexString(parsed.value), '^(?:foo)?$'
Expand All@@ -58,6 +64,12 @@ test 'astNodeToRegexString and astNodeToNames', (t) ->
 t.deepEqual astNodeToNames(parsed.value), ['_']
 t.end()

 t.test 'just optional named wildcard', (t) ->
 parsed = parse '(*:foo)'
 t.equal astNodeToRegexString(parsed.value), '^(?:(.*?))?$'
 t.deepEqual astNodeToNames(parsed.value), ['foo']
 t.end()

test 'getParam', (t) ->
 t.test 'no side effects', (t) ->
 next = {}
Expand Down

9 changes: 9 additions & 0 deletions
test/match-fixtures.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,11 @@ test 'match', (t) ->
 _: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*:root/user/:userId'
 t.deepEqual pattern.match('/school/10/user/10'),
 root: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*-user-:userId'
 t.deepEqual pattern.match('-school-10-user-10'),
 _: '-school-10'
Expand All@@ -53,6 +58,10 @@ test 'match', (t) ->
 t.deepEqual pattern.match('/admin/school/10/user/10'),
 _: '/school/10/user/10'

 pattern = new UrlPattern '/admin*:tail'
 t.deepEqual pattern.match('/admin/school/10/user/10'),
 tail: '/school/10/user/10'

 pattern = new UrlPattern '#admin*'
 t.deepEqual pattern.match('#admin#school#10#user#10'),
 _: '#school#10#user#10'
Expand Down

30 changes: 30 additions & 0 deletions
test/parser.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,36 @@ test 'named', (t) ->
 t.equal U.named('abc'), undefined
 t.end()


test 'namedWildcard', (t) ->
 t.deepEqual U.namedWildcard('*:a'),
 value:
 tag: 'namedWildcard'
 value: 'a'
 rest: ''
 t.deepEqual U.namedWildcard('*:ab96c'),
 value:
 tag: 'namedWildcard'
 value: 'ab96c'
 rest: ''
 t.deepEqual U.namedWildcard('*:ab96c.'),
 value:
 tag: 'namedWildcard'
 value: 'ab96c'
 rest: '.'
 t.deepEqual U.namedWildcard('*:96c-:ab'),
 value:
 tag: 'namedWildcard'
 value: '96c'
 rest: '-:ab'
 t.equal U.namedWildcard(':'), undefined
 t.equal U.namedWildcard('*:'), undefined
 t.equal U.namedWildcard('*'), undefined
 t.equal U.namedWildcard(''), undefined
 t.equal U.namedWildcard('a'), undefined
 t.equal U.namedWildcard('abc'), undefined
 t.end()

test 'static', (t) ->
 t.deepEqual U.static('a'),
 value:
Expand Down

9 changes: 9 additions & 0 deletions
test/stringify-fixtures.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,11 @@ test 'stringify', (t) ->
 _: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*:root/user/:userId'
 t.equal '/school/10/user/10', pattern.stringify
 root: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*-user-:userId'
 t.equal '-school-10-user-10', pattern.stringify
 _: '-school-10'
Expand All@@ -35,6 +40,10 @@ test 'stringify', (t) ->
 t.equal '/admin/school/10/user/10', pattern.stringify
 _: '/school/10/user/10'

 pattern = new UrlPattern '/admin*:tail'
 t.equal '/admin/school/10/user/10', pattern.stringify
 tail: '/school/10/user/10'

 pattern = new UrlPattern '/admin/*/user/*/tail'
 t.equal '/admin/school/10/user/10/12/tail', pattern.stringify
 _: ['school/10', '10/12']
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add support for named wildcards#44

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

randomdevpete
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


Add support for named wildcards
#44
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b9a95dc

Add support for named wildcards


randomdevpete Dec 25, 2017
a8b46e6

Add yarn lockfile


randomdevpete Dec 25, 2017
366d32d

Document syntax for named wildcards

Jan 28, 2018

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


9 changes: 9 additions & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,6 +183,15 @@ wildcard matches are collected in the `_` property:
if there is only one wildcard then `_` contains the matching string.
otherwise `_` contains an array of matching strings.

`*:` in a pattern is a named wildcard. the match will be
captured to the corresponding property instead of `_`:

```javascript
> var pattern = new UrlPattern('/search/*:term');
> pattern.match('/search/fruit');
{term: 'fruit'}
```

[look at the tests for additional examples of `.match`](test/match-fixtures.coffee)

## make pattern from regex
Expand Down

8 changes: 7 additions & 1 deletion
lib/url-pattern.js

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


16 changes: 13 additions & 3 deletions
src/url-pattern.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,6 +204,15 @@

 U.name = P.regex new RegExp "^[#{options.segmentNameCharset}]+"

 U.namedWildcard = P.tag(
 'namedWildcard',
 P.pick(2,
 P.string(options.wildcardChar)
 P.string(options.segmentNameStartChar)
 P.lazy(-> U.name)
 )
 )

 U.named = P.tag(
 'named',
 P.pick(1,
Expand DownExpand Up@@ -235,6 +244,7 @@

 U.token = P.lazy ->
 P.firstChoice(
 U.namedWildcard
 U.wildcard
 U.optional
 U.named
Expand DownExpand Up@@ -266,7 +276,7 @@
 baseAstNodeToRegexString(node, segmentValueCharset)

 switch astNode.tag
 when 'wildcard' then '(.*?)'
 when 'wildcard', 'namedWildcard' then '(.*?)'
 when 'named' then "([#{segmentValueCharset}]+)"
 when 'static' then escapeForRegex(astNode.value)
 when 'optional'
Expand All@@ -281,7 +291,7 @@

 switch astNode.tag
 when 'wildcard' then ['_']
 when 'named' then [astNode.value]
 when 'namedWildcard', 'named' then [astNode.value]
 when 'static' then []
 when 'optional' then astNodeToNames(astNode.value)

Expand DownExpand Up@@ -330,7 +340,7 @@

 switch astNode.tag
 when 'wildcard' then getParam params, '_', nextIndexes, true
 when 'named' then getParam params, astNode.value, nextIndexes, true
 when 'named', 'namedWildcard' then getParam params, astNode.value, nextIndexes, true
 when 'static' then astNode.value
 when 'optional'
 if astNodeContainsSegmentsForProvidedParams astNode.value, params, nextIndexes
Expand Down

12 changes: 12 additions & 0 deletions
test/ast.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,12 @@ test 'astNodeToRegexString and astNodeToNames', (t) ->
 t.deepEqual astNodeToNames(parsed.value), ['_']
 t.end()

 t.test 'just named wildcard', (t) ->
 parsed = parse '*:variable'
 t.equal astNodeToRegexString(parsed.value), '^(.*?)$'
 t.deepEqual astNodeToNames(parsed.value), ['variable']
 t.end()

 t.test 'just optional static', (t) ->
 parsed = parse '(foo)'
 t.equal astNodeToRegexString(parsed.value), '^(?:foo)?$'
Expand All@@ -58,6 +64,12 @@ test 'astNodeToRegexString and astNodeToNames', (t) ->
 t.deepEqual astNodeToNames(parsed.value), ['_']
 t.end()

 t.test 'just optional named wildcard', (t) ->
 parsed = parse '(*:foo)'
 t.equal astNodeToRegexString(parsed.value), '^(?:(.*?))?$'
 t.deepEqual astNodeToNames(parsed.value), ['foo']
 t.end()

test 'getParam', (t) ->
 t.test 'no side effects', (t) ->
 next = {}
Expand Down

9 changes: 9 additions & 0 deletions
test/match-fixtures.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,11 @@ test 'match', (t) ->
 _: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*:root/user/:userId'
 t.deepEqual pattern.match('/school/10/user/10'),
 root: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*-user-:userId'
 t.deepEqual pattern.match('-school-10-user-10'),
 _: '-school-10'
Expand All@@ -53,6 +58,10 @@ test 'match', (t) ->
 t.deepEqual pattern.match('/admin/school/10/user/10'),
 _: '/school/10/user/10'

 pattern = new UrlPattern '/admin*:tail'
 t.deepEqual pattern.match('/admin/school/10/user/10'),
 tail: '/school/10/user/10'

 pattern = new UrlPattern '#admin*'
 t.deepEqual pattern.match('#admin#school#10#user#10'),
 _: '#school#10#user#10'
Expand Down

30 changes: 30 additions & 0 deletions
test/parser.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,36 @@ test 'named', (t) ->
 t.equal U.named('abc'), undefined
 t.end()


test 'namedWildcard', (t) ->
 t.deepEqual U.namedWildcard('*:a'),
 value:
 tag: 'namedWildcard'
 value: 'a'
 rest: ''
 t.deepEqual U.namedWildcard('*:ab96c'),
 value:
 tag: 'namedWildcard'
 value: 'ab96c'
 rest: ''
 t.deepEqual U.namedWildcard('*:ab96c.'),
 value:
 tag: 'namedWildcard'
 value: 'ab96c'
 rest: '.'
 t.deepEqual U.namedWildcard('*:96c-:ab'),
 value:
 tag: 'namedWildcard'
 value: '96c'
 rest: '-:ab'
 t.equal U.namedWildcard(':'), undefined
 t.equal U.namedWildcard('*:'), undefined
 t.equal U.namedWildcard('*'), undefined
 t.equal U.namedWildcard(''), undefined
 t.equal U.namedWildcard('a'), undefined
 t.equal U.namedWildcard('abc'), undefined
 t.end()

test 'static', (t) ->
 t.deepEqual U.static('a'),
 value:
Expand Down

9 changes: 9 additions & 0 deletions
test/stringify-fixtures.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,11 @@ test 'stringify', (t) ->
 _: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*:root/user/:userId'
 t.equal '/school/10/user/10', pattern.stringify
 root: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*-user-:userId'
 t.equal '-school-10-user-10', pattern.stringify
 _: '-school-10'
Expand All@@ -35,6 +40,10 @@ test 'stringify', (t) ->
 t.equal '/admin/school/10/user/10', pattern.stringify
 _: '/school/10/user/10'

 pattern = new UrlPattern '/admin*:tail'
 t.equal '/admin/school/10/user/10', pattern.stringify
 tail: '/school/10/user/10'

 pattern = new UrlPattern '/admin/*/user/*/tail'
 t.equal '/admin/school/10/user/10/12/tail', pattern.stringify
 _: ['school/10', '10/12']
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add support for named wildcards#44

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

randomdevpete
wants to merge
3
commits into

base:master
Choose a base branch

from

 Open


Add support for named wildcards
#44
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b9a95dc

Add support for named wildcards


randomdevpete Dec 25, 2017
a8b46e6

Add yarn lockfile


randomdevpete Dec 25, 2017
366d32d

Document syntax for named wildcards

Jan 28, 2018

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


9 changes: 9 additions & 0 deletions
README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -183,6 +183,15 @@ wildcard matches are collected in the `_` property:
if there is only one wildcard then `_` contains the matching string.
otherwise `_` contains an array of matching strings.

`*:` in a pattern is a named wildcard. the match will be
captured to the corresponding property instead of `_`:

```javascript
> var pattern = new UrlPattern('/search/*:term');
> pattern.match('/search/fruit');
{term: 'fruit'}
```

[look at the tests for additional examples of `.match`](test/match-fixtures.coffee)

## make pattern from regex
Expand Down

8 changes: 7 additions & 1 deletion
lib/url-pattern.js

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


16 changes: 13 additions & 3 deletions
src/url-pattern.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -204,6 +204,15 @@

 U.name = P.regex new RegExp "^[#{options.segmentNameCharset}]+"

 U.namedWildcard = P.tag(
 'namedWildcard',
 P.pick(2,
 P.string(options.wildcardChar)
 P.string(options.segmentNameStartChar)
 P.lazy(-> U.name)
 )
 )

 U.named = P.tag(
 'named',
 P.pick(1,
Expand DownExpand Up@@ -235,6 +244,7 @@

 U.token = P.lazy ->
 P.firstChoice(
 U.namedWildcard
 U.wildcard
 U.optional
 U.named
Expand DownExpand Up@@ -266,7 +276,7 @@
 baseAstNodeToRegexString(node, segmentValueCharset)

 switch astNode.tag
 when 'wildcard' then '(.*?)'
 when 'wildcard', 'namedWildcard' then '(.*?)'
 when 'named' then "([#{segmentValueCharset}]+)"
 when 'static' then escapeForRegex(astNode.value)
 when 'optional'
Expand All@@ -281,7 +291,7 @@

 switch astNode.tag
 when 'wildcard' then ['_']
 when 'named' then [astNode.value]
 when 'namedWildcard', 'named' then [astNode.value]
 when 'static' then []
 when 'optional' then astNodeToNames(astNode.value)

Expand DownExpand Up@@ -330,7 +340,7 @@

 switch astNode.tag
 when 'wildcard' then getParam params, '_', nextIndexes, true
 when 'named' then getParam params, astNode.value, nextIndexes, true
 when 'named', 'namedWildcard' then getParam params, astNode.value, nextIndexes, true
 when 'static' then astNode.value
 when 'optional'
 if astNodeContainsSegmentsForProvidedParams astNode.value, params, nextIndexes
Expand Down

12 changes: 12 additions & 0 deletions
test/ast.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,12 @@ test 'astNodeToRegexString and astNodeToNames', (t) ->
 t.deepEqual astNodeToNames(parsed.value), ['_']
 t.end()

 t.test 'just named wildcard', (t) ->
 parsed = parse '*:variable'
 t.equal astNodeToRegexString(parsed.value), '^(.*?)$'
 t.deepEqual astNodeToNames(parsed.value), ['variable']
 t.end()

 t.test 'just optional static', (t) ->
 parsed = parse '(foo)'
 t.equal astNodeToRegexString(parsed.value), '^(?:foo)?$'
Expand All@@ -58,6 +64,12 @@ test 'astNodeToRegexString and astNodeToNames', (t) ->
 t.deepEqual astNodeToNames(parsed.value), ['_']
 t.end()

 t.test 'just optional named wildcard', (t) ->
 parsed = parse '(*:foo)'
 t.equal astNodeToRegexString(parsed.value), '^(?:(.*?))?$'
 t.deepEqual astNodeToNames(parsed.value), ['foo']
 t.end()

test 'getParam', (t) ->
 t.test 'no side effects', (t) ->
 next = {}
Expand Down

9 changes: 9 additions & 0 deletions
test/match-fixtures.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,11 @@ test 'match', (t) ->
 _: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*:root/user/:userId'
 t.deepEqual pattern.match('/school/10/user/10'),
 root: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*-user-:userId'
 t.deepEqual pattern.match('-school-10-user-10'),
 _: '-school-10'
Expand All@@ -53,6 +58,10 @@ test 'match', (t) ->
 t.deepEqual pattern.match('/admin/school/10/user/10'),
 _: '/school/10/user/10'

 pattern = new UrlPattern '/admin*:tail'
 t.deepEqual pattern.match('/admin/school/10/user/10'),
 tail: '/school/10/user/10'

 pattern = new UrlPattern '#admin*'
 t.deepEqual pattern.match('#admin#school#10#user#10'),
 _: '#school#10#user#10'
Expand Down

30 changes: 30 additions & 0 deletions
test/parser.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,36 @@ test 'named', (t) ->
 t.equal U.named('abc'), undefined
 t.end()


test 'namedWildcard', (t) ->
 t.deepEqual U.namedWildcard('*:a'),
 value:
 tag: 'namedWildcard'
 value: 'a'
 rest: ''
 t.deepEqual U.namedWildcard('*:ab96c'),
 value:
 tag: 'namedWildcard'
 value: 'ab96c'
 rest: ''
 t.deepEqual U.namedWildcard('*:ab96c.'),
 value:
 tag: 'namedWildcard'
 value: 'ab96c'
 rest: '.'
 t.deepEqual U.namedWildcard('*:96c-:ab'),
 value:
 tag: 'namedWildcard'
 value: '96c'
 rest: '-:ab'
 t.equal U.namedWildcard(':'), undefined
 t.equal U.namedWildcard('*:'), undefined
 t.equal U.namedWildcard('*'), undefined
 t.equal U.namedWildcard(''), undefined
 t.equal U.namedWildcard('a'), undefined
 t.equal U.namedWildcard('abc'), undefined
 t.end()

test 'static', (t) ->
 t.deepEqual U.static('a'),
 value:
Expand Down

9 changes: 9 additions & 0 deletions
test/stringify-fixtures.coffee

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,11 @@ test 'stringify', (t) ->
 _: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*:root/user/:userId'
 t.equal '/school/10/user/10', pattern.stringify
 root: '/school/10',
 userId: '10'

 pattern = new UrlPattern '*-user-:userId'
 t.equal '-school-10-user-10', pattern.stringify
 _: '-school-10'
Expand All@@ -35,6 +40,10 @@ test 'stringify', (t) ->
 t.equal '/admin/school/10/user/10', pattern.stringify
 _: '/school/10/user/10'

 pattern = new UrlPattern '/admin*:tail'
 t.equal '/admin/school/10/user/10', pattern.stringify
 tail: '/school/10/user/10'

 pattern = new UrlPattern '/admin/*/user/*/tail'
 t.equal '/admin/school/10/user/10/12/tail', pattern.stringify
 _: ['school/10', '10/12']
Expand Down
Loading