matchPath - Improved matching with ending wildcard

CHANGELOG.md

@@ -1,8 +1,12 @@
 ## [Unreleased]
 
+## v1.30.7 - (2024-11-05)
+
+- matchPath - Improved matching with ending wildcard (#674)
+
 ## v1.30.6 - (2024-11-01)
 
-- Further improved path matching (#672)
+- matchPath - Further improved path matching (#672)
 
 ## v1.30.5 - (2024-11-01)
 

src/utils/matchPath.test.ts

@@ -96,4 +96,22 @@ describe('matchPath', () => {
     const operationPath = '/messages/123/'
     expect(matchPath(targetPath, operationPath)).toBe(true)
   })
+
+  it('should match paths with ending wildcards', () => {
+    const targetPath = '/messages*'
+    const operationPath = '/messages/{licenseKey}'
+    expect(matchPath(targetPath, operationPath)).toBe(true)
+  })
+
+  it('should not match paths with ending wildcards', () => {
+    const targetPath = '/messages*'
+    const operationPath = '/foo/{licenseKey}'
+    expect(matchPath(targetPath, operationPath)).toBe(false)
+  })
+
+  it('should match similar paths with ending wildcards', () => {
+    const targetPath = '/messages*'
+    const operationPath = '/messageses/{licenseKey}'
+    expect(matchPath(targetPath, operationPath)).toBe(true)
+  })
 })

src/utils/matchPath.ts

@@ -30,6 +30,16 @@ export const matchPath = (targetPath: string | RegExp, operationPath: string): b
       }
     }
 
+    // Check if targetPath ends with a wildcard (*) and handle it accordingly
+    if (typeof targetPath === 'string' && targetPath.endsWith('*')) {
+      // Remove the ending '*' from targetPath
+      const basePath = targetPath.slice(0, -1)
+      // Check if operationPath starts with basePath (prefix match)
+      if (operationPath.startsWith(basePath)) {
+        return true
+      }
+    }
+
     // If the lengths of the paths don't match and there is no wildcard, return false
     if (targetSegments.length !== operationSegments.length) {
       return false