Add support for named wildcards

README.md

@@ -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

src/url-pattern.coffee

@@ -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,
@@ -235,6 +244,7 @@
 
     U.token = P.lazy ->
       P.firstChoice(
+        U.namedWildcard
         U.wildcard
         U.optional
         U.named
@@ -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'
@@ -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)
 
@@ -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

test/ast.coffee

@@ -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)?$'
@@ -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 = {}

test/match-fixtures.coffee

@@ -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'
@@ -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'

test/parser.coffee

@@ -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:

test/stringify-fixtures.coffee

@@ -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'
@@ -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']