feat(optimized matcher): Handle custom regexp options as dynamic routes.

Author: iurisilvio

src/create-matcher.js

@@ -225,9 +225,13 @@ function resolveRecordPath (path: string, record: RouteRecord): string {
   return resolvePath(path, record.parent ? record.parent.path : '/', true)
 }
 
-function isStaticPath (path) {
-  // Dynamic paths have /:placeholder or anonymous placeholder /(.+) or wildcard *.
-  return !/[:(*]/.exec(path)
+function isStatic (route) {
+  return (
+    // Custom regex options are dynamic.
+    Object.keys(route.pathToRegexpOptions).length === 0 &&
+    // Dynamic paths have /:placeholder or anonymous placeholder /(.+) or wildcard *.
+    !/[:(*]/.exec(route.path)
+  )
 }
 
 function optimizedMatcher (
@@ -239,7 +243,7 @@ function optimizedMatcher (
 
   pathList.forEach((path, index) => {
     const route = pathMap[path]
-    if (isStaticPath(path)) {
+    if (isStatic(route)) {
       staticMap[path] = { index, route }
       if (route.regex.ignoreCase) {
         staticMap[path.toLowerCase()] = { index, route }

src/create-route-map.js

@@ -92,6 +92,7 @@ function addRouteRecord (
   const record: RouteRecord = {
     path: normalizedPath,
     regex: compileRouteRegex(normalizedPath, pathToRegexpOptions),
+    pathToRegexpOptions,
     components: route.components || { default: route.component },
     alias: route.alias
       ? typeof route.alias === 'string'

test/unit/specs/create-matcher.spec.js

@@ -174,7 +174,7 @@ describe('Creating Matcher', function () {
     expect(matcher.match('/p/staticafter').name).toBe('dynamic')
   })
 
-  it('static can be sensitive', function () {
+  it('static can use sensitive flag', function () {
     const matcher = createMatcher([
       {
         path: '/p/sensitive',
@@ -197,4 +197,52 @@ describe('Creating Matcher', function () {
     expect(matcher.match('/p/SENSITIVE').name).toBe('not-found')
     expect(matcher.match('/p/INSENSITIVE').name).toBe('insensitive')
   })
+
+  it('static can use strict flag', function () {
+    const matcher = createMatcher([
+      {
+        path: '/p/strict',
+        name: 'strict',
+        pathToRegexpOptions: {
+          strict: true
+        },
+        component: { name: 'strict' }
+      },
+      {
+        path: '/p/unstrict',
+        name: 'unstrict',
+        component: { name: 'unstrict' }
+      },
+      {
+        path: '*', name: 'not-found', component: { name: 'not-found ' }
+      }
+    ])
+
+    expect(matcher.match('/p/strict/').name).toBe('not-found')
+    expect(matcher.match('/p/unstrict/').name).toBe('unstrict')
+  })
+
+  it('static can use end flag', function () {
+    const matcher = createMatcher([
+      {
+        path: '/p/end',
+        name: 'end',
+        component: { name: 'end' }
+      },
+      {
+        path: '/p/not-end',
+        name: 'not-end',
+        pathToRegexpOptions: {
+          end: false
+        },
+        component: { name: 'not-end' }
+      },
+      {
+        path: '*', name: 'not-found', component: { name: 'not-found ' }
+      }
+    ])
+
+    expect(matcher.match('/p/end/foo').name).toBe('not-found')
+    expect(matcher.match('/p/not-end/foo').name).toBe('not-end')
+  })
 })

types/router.d.ts

@@ -147,6 +147,7 @@ export type RouteConfig = RouteConfigSingleView | RouteConfigMultipleViews
 export interface RouteRecord {
   path: string
   regex: RegExp
+  pathToRegexpOptions: PathToRegexpOptions
   components: Dictionary<Component>
   instances: Dictionary<Vue>
   name?: string