unit test cleanup

Author: Sheraff

packages/router-core/tests/new-process-route-tree.test.ts

@@ -2,11 +2,6 @@ import { describe, expect, it } from 'vitest'
 import { findRouteMatch, processRouteTree } from '../src/new-process-route-tree'
 import type { AnyRoute, RouteMask } from '../src'
 
-// import { createLRUCache } from '../src/lru-cache'
-// import { processRouteTree as oldProcessRouteTree } from './old-process-route-tree'
-// import { matchPathname } from './old-path'
-// import big from '../src/Untitled-4.json'
-
 function makeTree(routes: Array<string>) {
   return processRouteTree({
     id: '__root__',

packages/router-core/tests/optional-path-params-clean.test.ts

@@ -1,13 +1,13 @@
 import { describe, expect, it } from 'vitest'
 import { interpolatePath } from '../src/path'
 import {
+  SEGMENT_TYPE_OPTIONAL_PARAM,
+  SEGMENT_TYPE_PATHNAME,
   findSingleMatch,
   parseSegment,
   processRouteTree,
-  SEGMENT_TYPE_OPTIONAL_PARAM,
-  SEGMENT_TYPE_PATHNAME,
-  type SegmentKind,
 } from '../src/new-process-route-tree'
+import type { SegmentKind } from '../src/new-process-route-tree'
 
 describe('Optional Path Parameters - Clean Comprehensive Tests', () => {
   describe('Optional Dynamic Parameters {-$param}', () => {
@@ -23,18 +23,18 @@ describe('Optional Path Parameters - Clean Comprehensive Tests', () => {
 
       const parsePathname = (to: string | undefined) => {
         let cursor = 0
-        const data = new Uint16Array(6)
+        let data
         const path = to ?? ''
         const segments: Array<PathSegment> = []
         while (cursor < path.length) {
           const start = cursor
-          parseSegment(path, start, data)
-          const end = data[5]!
+          data = parseSegment(path, start, data)
+          const end = data[5]
           cursor = end + 1
-          const type = data[0] as SegmentKind
-          const value = path.substring(data[2]!, data[3])
+          const type = data[0]
+          const value = path.substring(data[2], data[3])
           const prefix = path.substring(start, data[1])
-          const suffix = path.substring(data[4]!, end)
+          const suffix = path.substring(data[4], end)
           const segment: PathSegment = {
             type,
             value,

packages/router-core/tests/optional-path-params.test.ts

@@ -1,47 +1,44 @@
 import { describe, expect, it } from 'vitest'
 import { interpolatePath } from '../src/path'
 import {
-  findSingleMatch,
-  parseSegment,
-  processRouteTree,
   SEGMENT_TYPE_OPTIONAL_PARAM,
   SEGMENT_TYPE_PARAM,
   SEGMENT_TYPE_PATHNAME,
   SEGMENT_TYPE_WILDCARD,
-  type SegmentKind,
+  findSingleMatch,
+  parseSegment,
+  processRouteTree,
 } from '../src/new-process-route-tree'
+import type { SegmentKind } from '../src/new-process-route-tree'
 
 describe('Optional Path Parameters', () => {
+  type PathSegment = {
+    type: SegmentKind
+    value: string
+    prefixSegment?: string
+    suffixSegment?: string
+  }
   type ParsePathnameTestScheme = Array<{
     name: string
     to: string | undefined
-    expected: Array<any>
+    expected: Array<PathSegment>
   }>
 
   describe('parsePathname with optional params', () => {
-    type PathSegment = {
-      type: SegmentKind
-      value: string
-      prefixSegment?: string
-      suffixSegment?: string
-      // Indicates if there is a static segment after this required/optional param
-      hasStaticAfter?: boolean
-    }
-
     const parsePathname = (to: string | undefined) => {
       let cursor = 0
-      const data = new Uint16Array(6)
+      let data
       const path = to ?? ''
       const segments: Array<PathSegment> = []
       while (cursor < path.length) {
         const start = cursor
-        parseSegment(path, start, data)
-        const end = data[5]!
+        data = parseSegment(path, start, data)
+        const end = data[5]
         cursor = end + 1
-        const type = data[0] as SegmentKind
-        const value = path.substring(data[2]!, data[3])
+        const type = data[0]
+        const value = path.substring(data[2], data[3])
         const prefix = path.substring(start, data[1])
-        const suffix = path.substring(data[4]!, end)
+        const suffix = path.substring(data[4], end)
         const segment: PathSegment = {
           type,
           value,

packages/router-core/tests/path.test.ts

@@ -7,15 +7,14 @@ import {
   trimPathLeft,
 } from '../src/path'
 import {
-  findSingleMatch,
-  parseSegment,
-  processRouteTree,
-  SEGMENT_TYPE_OPTIONAL_PARAM,
   SEGMENT_TYPE_PARAM,
   SEGMENT_TYPE_PATHNAME,
   SEGMENT_TYPE_WILDCARD,
-  type SegmentKind,
+  findSingleMatch,
+  parseSegment,
+  processRouteTree,
 } from '../src/new-process-route-tree'
+import type { SegmentKind } from '../src/new-process-route-tree'
 
 describe.each([{ basepath: '/' }, { basepath: '/app' }, { basepath: '/app/' }])(
   'removeTrailingSlash with basepath $basepath',
@@ -823,24 +822,22 @@ describe('parsePathname', () => {
     value: string
     prefixSegment?: string
     suffixSegment?: string
-    // Indicates if there is a static segment after this required/optional param
-    hasStaticAfter?: boolean
   }
 
   const parsePathname = (to: string | undefined) => {
     let cursor = 0
-    const data = new Uint16Array(6)
+    let data
     const path = to ?? ''
     const segments: Array<PathSegment> = []
     while (cursor < path.length) {
       const start = cursor
-      parseSegment(path, start, data)
-      const end = data[5]!
+      data = parseSegment(path, start, data)
+      const end = data[5]
       cursor = end + 1
-      const type = data[0] as SegmentKind
-      const value = path.substring(data[2]!, data[3])
+      const type = data[0]
+      const value = path.substring(data[2], data[3])
       const prefix = path.substring(start, data[1])
-      const suffix = path.substring(data[4]!, end)
+      const suffix = path.substring(data[4], end)
       const segment: PathSegment = {
         type,
         value,