route-trie - npm Package Compare versions

Comparing version 2.1.0 to 2.2.0

index.es6.js

@@ -7,5 +7,5 @@ // **Github:** https://github.com/zensh/route-trie
 const wordReg = /^\w+$/
-const doubleColonReg = /::\w*$/
+const suffixReg = /\+[A-Za-z0-9!$%&'*+,-.:;=@_~]*$/
+const doubleColonReg = /::[A-Za-z0-9!$%&'*+,-.:;=@_~]*$/
 const trimSlashReg = /^\//
-const multiSlashReg = /\/{2,}/
 const fixMultiSlashReg = /\/{2,}/g
@@ -39,3 +39,3 @@
     if (typeof pattern !== 'string') throw new TypeError('Pattern must be string.')
-    if (multiSlashReg.test(pattern)) throw new Error('Multi-slash existhis.')
+    if (pattern.includes('//')) throw new Error('Multi-slash existhis.')
     let _pattern = pattern.replace(trimSlashReg, '')
@@ -62,3 +62,3 @@ let node = defineNode(this.root, _pattern.split('/'), this.ignoreCase)
     let end = path.length
-    let res = new Matched()
+    let matched = new Matched()
     let parent = this.root
@@ -76,9 +76,9 @@ for (let i = 1; i <= end; i++) {
         if (this.tsr && frag === '' && i === end && parent.endpoint) {
-          res.tsr = path.slice(0, end - 1)
+          matched.tsr = path.slice(0, end - 1)
           if (this.fpr && fixedLen > 0) {
-            res.fpr = res.tsr
-            res.tsr = ''
+            matched.fpr = matched.tsr
+            matched.tsr = ''
           }
         }
-        return res
+        return matched
       }
@@ -89,6 +89,9 @@
         if (parent.wildcard) {
-          res.params[parent.name] = path.slice(start, end)
+          matched.params[parent.name] = path.slice(start, end)
           break
         } else {
-          res.params[parent.name] = frag
+          if (parent.suffix !== '') {
+            frag = frag.slice(0, frag.length - parent.suffix.length)
+          }
+          matched.params[parent.name] = frag
         }
@@ -100,16 +103,16 @@ }
     if (parent.endpoint) {
-      res.node = parent
+      matched.node = parent
       if (this.fpr && fixedLen > 0) {
-        res.fpr = path
-        res.node = null
+        matched.fpr = path
+        matched.node = null
       }
     } else if (this.tsr && parent.children[''] != null) {
       // TrailingSlashRedirect: /acb/efg -> /acb/efg/
-      res.tsr = path + '/'
+      matched.tsr = path + '/'
       if (this.fpr && fixedLen > 0) {
-        res.fpr = res.tsr
-        res.tsr = ''
+        matched.fpr = matched.tsr
+        matched.tsr = ''
       }
     }
-    return res
+    return matched
   }
@@ -137,6 +140,8 @@ }
     this.pattern = ''
+    this.frag = ''
+    this.suffix = ''
     this.regex = null
     this.endpoint = false
     this.wildcard = false
-    this.varyChild = null
+    this.varyChildren = []
     this.parent = parent
@@ -169,2 +174,10 @@ this.children = Object.create(null)
   }
+
+  getFrags () {
+    let frags = this.frag
+    if (this.parent != null) {
+      frags = this.parent.getFrags() + '/' + frags
+    }
+    return frags
+  }
 }
@@ -187,10 +200,19 @@
 function matchNode (parent, frag) {
-  let child = parent.children[frag]
-  if (child == null) {
-    child = parent.varyChild
-    if (child != null && child.regex != null && !child.regex.test(frag)) {
-      child = null
+  if (parent.children[frag] != null) {
+    return parent.children[frag]
+  }
+  for (let child of parent.varyChildren) {
+    let _frag = frag
+    if (child.suffix !== '') {
+      if (frag === child.suffix || !frag.endsWith(child.suffix)) {
+        continue
+      }
+      _frag = frag.slice(0, frag.length - child.suffix.length)
     }
+    if (child.regex != null && !child.regex.test(_frag)) {
+      continue
+    }
+    return child
   }
-  return child
+  return null
 }
@@ -219,39 +241,74 @@
   } else if (frag[0] === ':') {
-    let regex
     let name = frag.slice(1)
-    let trailing = name[name.length - 1]
-    if (trailing === ')') {
-      let index = name.indexOf('(')
-      if (index > 0) {
-        regex = name.slice(index + 1, name.length - 1)
-        if (regex.length > 0) {
-          name = name.slice(0, index)
-          node.regex = new RegExp(regex)
-        } else {
-          throw new Error(`Invalid pattern: "${frag}"`)
+
+    switch (name[name.length - 1]) {
+      case '*':
+        name = name.slice(0, name.length - 1)
+        node.wildcard = true
+        break
+      default:
+        let i = name.search(suffixReg)
+        if (i >= 0) {
+          node.suffix = name.slice(i + 1)
+          name = name.slice(0, i)
+          if (node.suffix === '') {
+            throw new Error(`invalid pattern: "${node.getFrags()}"`)
+          }
         }
-      }
-    } else if (trailing === '*') {
-      name = name.slice(0, name.length - 1)
-      node.wildcard = true
+
+        if (name[name.length - 1] === ')') {
+          let i = name.indexOf('(')
+          if (i > 0) {
+            let regex = name.slice(i + 1, name.length - 1)
+            if (regex.length > 0) {
+              name = name.slice(0, i)
+              node.regex = new RegExp(regex)
+            } else {
+              throw new Error(`Invalid pattern: "${node.getFrags()}"`)
+            }
+          }
+        }
     }
+
     // name must be word characters `[0-9A-Za-z_]`
     if (!wordReg.test(name)) {
-      throw new Error(`Invalid pattern: "${frag}"`)
+      throw new Error(`Invalid pattern: "${node.getFrags()}"`)
     }
     node.name = name
-    let child = parent.varyChild
-    if (child != null) {
-      if (child.name !== name || child.wildcard !== node.wildcard) {
-        throw new Error(`Invalid pattern: "${frag}"`)
+
+    for (let child of parent.varyChildren) {
+      if (child.wildcard) {
+        if (!node.wildcard) {
+          throw new Error(`can't define "${node.getFrags()}" after "${child.getFrags()}"`)
+        }
+        if (child.name !== node.name) {
+          throw new Error(`invalid pattern name "${node.name}", as prev defined "${child.getFrags()}"`)
+        }
+        return child
       }
-      if (child.regex != null && child.regex.toString() !== node.regex.toString()) {
-        throw new Error(`Invalid pattern: "${frag}"`)
+
+      if (child.suffix !== node.suffix) {
+        continue
       }
-      return child
+
+      if (!node.wildcard && ((child.regex == null && node.regex == null) ||
+        (child.regex != null && node.regex != null && child.regex.toString() === node.regex.toString()))) {
+        if (child.name !== node.name) {
+          throw new Error(`invalid pattern name "${node.name}", as prev defined "${child.getFrags()}"`)
+        }
+        return child
+      }
     }
 
-    parent.varyChild = node
+    parent.varyChildren.push(node)
+    if (parent.varyChildren.length > 1) {
+      parent.varyChildren.sort((a, b) => {
+        if (a.suffix !== '' && b.suffix === '') return 0
+        if (a.suffix === '' && b.suffix !== '') return 1
+        if (a.regex == null && b.regex != null) return 1
+        return 0
+      })
+    }
   } else if (frag[0] === '*' || frag[0] === '(' || frag[0] === ')') {
-    throw new Error(`Invalid pattern: "${frag}"`)
+    throw new Error(`Invalid pattern: "${node.getFrags()}"`)
   } else {
@@ -264,3 +321,3 @@ parent.children[_frag] = node
 Trie.NAME = 'Trie'
-Trie.VERSION = 'v2.0.2'
+Trie.VERSION = 'v2.2.0'
 Trie.Node = Node
@@ -267,0 +324,0 @@ Trie.Matched = Matched

index.js

@@ -270,5 +270,2 @@ // **Github:** https://github.com/zensh/route-trie
     for (let child of parent.varyChildren) {
-      if (child.name !== node.name) {
-        throw new Error(`invalid pattern: "${node.getFrags()}"`)
-      }
       if (child.wildcard) {
@@ -278,17 +275,18 @@ if (!node.wildcard) {
         }
+        if (child.name !== node.name) {
+          throw new Error(`invalid pattern name "${node.name}", as prev defined "${child.getFrags()}"`)
+        }
         return child
       }
-      if (child.suffix === '' && child.regex == null && (node.suffix !== '' || node.regex != null)) {
-        throw new Error(`can't define "${node.getFrags()}" after "${child.getFrags()}"`)
+
+      if (child.suffix !== node.suffix) {
+        continue
       }
-      if (child.suffix === node.suffix) {
-        if (child.regex == null && node.regex == null) {
-          return child
+
+      if (!node.wildcard && ((child.regex == null && node.regex == null) ||
+        (child.regex != null && node.regex != null && child.regex.toString() === node.regex.toString()))) {
+        if (child.name !== node.name) {
+          throw new Error(`invalid pattern name "${node.name}", as prev defined "${child.getFrags()}"`)
         }
-        if (child.regex != null && node.regex != null && child.regex.toString() === node.regex.toString()) {
-          return child
-        }
-        if (child.regex == null && node.regex != null) {
-          throw new Error(`invalid pattern: "${node.getFrags()}"`)
-        }
+        return child
       }
@@ -298,2 +296,10 @@ }
     parent.varyChildren.push(node)
+    if (parent.varyChildren.length > 1) {
+      parent.varyChildren.sort((a, b) => {
+        if (a.suffix !== '' && b.suffix === '') return 0
+        if (a.suffix === '' && b.suffix !== '') return 1
+        if (a.regex == null && b.regex != null) return 1
+        return 0
+      })
+    }
   } else if (frag[0] === '*' || frag[0] === '(' || frag[0] === ')') {
@@ -308,5 +314,5 @@ throw new Error(`Invalid pattern: "${node.getFrags()}"`)
 Trie.NAME = 'Trie'
-Trie.VERSION = 'v2.1.0'
+Trie.VERSION = 'v2.2.0'
 Trie.Node = Node
 Trie.Matched = Matched
 module.exports = Trie.Trie = Trie

package.json

@@ -7,3 +7,3 @@ {
   ],
-  "version": "2.1.0",
+  "version": "2.2.0",
   "license": "MIT",
@@ -17,3 +17,3 @@ "main": "index.js",
   "engines": {
-    "node": ">= 4.0.0"
+    "node": ">= 4.5.0"
   },
@@ -32,4 +32,4 @@ "homepage": "https://github.com/zensh/route-trie",
   "devDependencies": {
-    "standard": "^9.0.2",
-    "tman": "^1.6.6",
+    "standard": "^10.0.2",
+    "tman": "^1.6.7",
     "istanbul": "^0.4.5"
@@ -36,0 +36,0 @@ },

README.md

@@ -132,6 +132,6 @@ # route-trie
 
-The value of parameters is saved on the `Matched.Params`. Retrieve the value of a parameter by name:
+The value of parameters is saved on the `matched.params`. Retrieve the value of a parameter by name:
 ```
-type := matched.Params("type")
-id   := matched.Params("ID")
+let type = matched.params['type']
+let id   = matched.params['ID']
 ```
@@ -138,0 +138,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

28051

increased by7.39%

Lines of code

564

increased by10.59%

No dependency changes