Fix matching empty string with end: false

pillarjs · Apr 22, 2018 · bb72b60 · bb72b60
1 parent 761c721
commit bb72b60
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -305,7 +305,7 @@ function tokensToRegExp (tokens, keys, options) {
   var delimiters = options.delimiters || DEFAULT_DELIMITERS
   var endsWith = [].concat(options.endsWith || []).map(escapeString).concat('$').join('|')
   var route = ''
-  var isEndDelimited = false
+  var isEndDelimited = tokens.length === 0
 
   // Iterate over the tokens and create our regexp string.
   for (var i = 0; i < tokens.length; i++) {

diff --git a/test.ts b/test.ts
@@ -237,6 +237,23 @@ var TESTS: Test[] = [
       [{ test: 'abc' }, '/abc/']
     ]
   ],
+  [
+    '',
+    {
+      end: false
+    },
+    [],
+    [
+      ['', ['']],
+      ['/', ['/']],
+      ['route', ['']],
+      ['/route', ['']],
+      ['/route/', ['']]
+    ],
+    [
+      [null, '']
+    ]
+  ],
 
   /**
    * Combine modes.