From 6a7746de7dfc1d1e98286aeeaabd674774453100 Mon Sep 17 00:00:00 2001
From: Yusuke Wada <yusuke@kamawada.com>
Date: Fri, 17 Jun 2022 18:02:13 +0900
Subject: [PATCH] refactor(trie-router): routes are returned in the
 registration order (#325)

---
 src/router/trie-router/node.test.ts | 26 ++++++++++++--------------
 src/router/trie-router/node.ts      | 13 +------------
 2 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/src/router/trie-router/node.test.ts b/src/router/trie-router/node.test.ts
index 9279e809..f4440a14 100644
--- a/src/router/trie-router/node.test.ts
+++ b/src/router/trie-router/node.test.ts
@@ -417,7 +417,7 @@ describe('Sort Order', () => {
     it('get /api/posts/123', () => {
       const res = node.search('get', '/api/posts/123')
       expect(res).not.toBeNull()
-      expect(res?.handlers).toEqual(['1st', '2nd', '4th', '3rd'])
+      expect(res?.handlers).toEqual(['1st', '2nd', '3rd', '4th'])
     })
   })
 
@@ -437,22 +437,20 @@ describe('Sort Order', () => {
 
   describe('Complex', () => {
     const node = new Node()
-    node.insert('get', '/api', 'x') // score 1.1
-    node.insert('get', '/api/*', 'c') // score 2.2
-    node.insert('get', '/api/:type', 'y') // score 2.3
-    node.insert('get', '/api/:type/:id', 'd') // score 3.4
-    node.insert('get', '/api/posts/:id', 'e') // score 3.5
-    node.insert('get', '/api/posts/123', 'f') // score 3.6
-    node.insert('get', '/*/*/:id', 'g') // score 3.7
-    node.insert('get', '/api/posts/*/comment', 'z') // score 4.8 - not match
-    node.insert('get', '*', 'a') // score 1.9
-    node.insert('get', '*', 'b') // score 1.10
+    node.insert('get', '/api', 'a') // not match
+    node.insert('get', '/api/*', 'b') // match
+    node.insert('get', '/api/:type', 'c') // not match
+    node.insert('get', '/api/:type/:id', 'd') // match
+    node.insert('get', '/api/posts/:id', 'e') // match
+    node.insert('get', '/api/posts/123', 'f') // match
+    node.insert('get', '/*/*/:id', 'g') // match
+    node.insert('get', '/api/posts/*/comment', 'h') // not match
+    node.insert('get', '*', 'i') // match
+    node.insert('get', '*', 'j') // match
 
     it('get /api/posts/123', () => {
       const res = node.search('get', '/api/posts/123')
-      // ---> will match => c, d, e, e, f, g, a, b
-      // ---> sort by score => a, b, c, d, e, f, g
-      expect(res?.handlers).toEqual(['a', 'b', 'c', 'd', 'e', 'f', 'g'])
+      expect(res?.handlers).toEqual(['b', 'd', 'e', 'f', 'g', 'i', 'j'])
     })
   })
 
diff --git a/src/router/trie-router/node.ts b/src/router/trie-router/node.ts
index f8638327..ca5649ec 100644
--- a/src/router/trie-router/node.ts
+++ b/src/router/trie-router/node.ts
@@ -91,21 +91,13 @@ export class Node<T> {
       curNode = curNode.children[p]
     }
 
-    let score = 1
-
-    if (path === '*') {
-      score = score + this.order * 0.01
-    } else {
-      score = parts.length + this.order * 0.01
-    }
-
     if (!curNode.methods.length) {
       curNode.methods = []
     }
 
     const m: Record<string, HandlerSet<T>> = {}
 
-    const handlerSet: HandlerSet<T> = { handler: handler, name: this.name, score: score }
+    const handlerSet: HandlerSet<T> = { handler: handler, name: this.name, score: this.order }
 
     m[method] = handlerSet
     curNode.methods.push(m)
@@ -120,9 +112,6 @@ export class Node<T> {
         const handlerSet = m[method] || m[METHOD_NAME_ALL]
         if (handlerSet !== undefined) {
           const hs = { ...handlerSet }
-          if (wildcard) {
-            hs.score = handlerSet.score - 1
-          }
           handlerSets.push(hs)
           return
         }