@pikku/core 0.12.107 → 0.12.111

package/src/wirings/http/routers/path-to-regex.test.ts

@@ -1,306 +0,0 @@
-import { test, describe, beforeEach } from 'node:test'
-import * as assert from 'node:assert/strict'
-import { PathToRegexRouter } from './path-to-regex.js'
-import { resetPikkuState, pikkuState } from '../../../pikku-state.js'
-import type { HTTPMethod } from '../http.types.js'
-
-describe('PathToRegexRouter', () => {
-  let router: PathToRegexRouter
-
-  const mockRoute = (route: string) => ({
-    route,
-    method: 'get' as HTTPMethod,
-    func: (() => {}) as any,
-  })
-
-  beforeEach(() => {
-    resetPikkuState()
-    router = new PathToRegexRouter()
-  })
-
-  describe('Static Route Optimization', () => {
-    test('should correctly identify static routes', () => {
-      pikkuState(
-        null,
-        'http',
-        'routes',
-        new Map([
-          [
-            'get',
-            new Map([
-              ['/static', mockRoute('/static')],
-              ['/api/about', mockRoute('/api/about')],
-              ['/health', mockRoute('/health')],
-            ]),
-          ],
-        ])
-      )
-      pikkuState(null, 'http', 'middleware', new Map())
-      pikkuState(null, 'channel', 'channels', new Map())
-
-      router.initialize()
-
-      const staticResult = router.match('get', '/static')
-      assert.ok(staticResult, 'Static route should match')
-      assert.strictEqual(staticResult.route, '/static')
-      assert.deepStrictEqual(staticResult.params, {})
-
-      const aboutResult = router.match('get', '/api/about')
-      assert.ok(aboutResult, 'Static route /api/about should match')
-      assert.strictEqual(aboutResult.route, '/api/about')
-      assert.deepStrictEqual(aboutResult.params, {})
-    })
-
-    test('should handle dynamic routes with parameters', () => {
-      pikkuState(
-        null,
-        'http',
-        'routes',
-        new Map([
-          [
-            'get',
-            new Map([
-              ['/api/users/:id', mockRoute('/api/users/:id')],
-              [
-                '/posts/:slug/comments/:commentId',
-                mockRoute('/posts/:slug/comments/:commentId'),
-              ],
-            ]),
-          ],
-        ])
-      )
-      pikkuState(null, 'http', 'middleware', new Map())
-      pikkuState(null, 'channel', 'channels', new Map())
-
-      router.initialize()
-
-      const userResult = router.match('get', '/api/users/123')
-      assert.ok(userResult, 'Dynamic route should match')
-      assert.strictEqual(userResult.route, '/api/users/:id')
-      assert.strictEqual(userResult.params.id, '123')
-
-      const commentResult = router.match(
-        'get',
-        '/posts/hello-world/comments/456'
-      )
-      assert.ok(commentResult, 'Complex dynamic route should match')
-      assert.strictEqual(
-        commentResult.route,
-        '/posts/:slug/comments/:commentId'
-      )
-      assert.strictEqual(commentResult.params.slug, 'hello-world')
-      assert.strictEqual(commentResult.params.commentId, '456')
-    })
-
-    test('should handle multi-parameter routes', () => {
-      pikkuState(
-        null,
-        'http',
-        'routes',
-        new Map([
-          [
-            'get',
-            new Map([
-              [
-                '/api/:version/users/:userId',
-                mockRoute('/api/:version/users/:userId'),
-              ],
-              [
-                '/blog/:year/:month/:slug',
-                mockRoute('/blog/:year/:month/:slug'),
-              ],
-            ]),
-          ],
-        ])
-      )
-      pikkuState(null, 'http', 'middleware', new Map())
-      pikkuState(null, 'channel', 'channels', new Map())
-
-      router.initialize()
-
-      const apiResult = router.match('get', '/api/v2/users/456')
-      assert.ok(apiResult, 'Multi-parameter route should match')
-      assert.strictEqual(apiResult.route, '/api/:version/users/:userId')
-      assert.strictEqual(apiResult.params.version, 'v2')
-      assert.strictEqual(apiResult.params.userId, '456')
-
-      const blogResult = router.match('get', '/blog/2024/03/hello-world')
-      assert.ok(blogResult, 'Deep multi-parameter route should match')
-      assert.strictEqual(blogResult.route, '/blog/:year/:month/:slug')
-      assert.strictEqual(blogResult.params.year, '2024')
-      assert.strictEqual(blogResult.params.month, '03')
-      assert.strictEqual(blogResult.params.slug, 'hello-world')
-    })
-
-    test('should prioritize static routes over dynamic routes for performance', () => {
-      pikkuState(
-        null,
-        'http',
-        'routes',
-        new Map([
-          [
-            'get',
-            new Map([
-              ['/api/users', mockRoute('/api/users')],
-              ['/api/:resource', mockRoute('/api/:resource')],
-            ]),
-          ],
-        ])
-      )
-      pikkuState(null, 'http', 'middleware', new Map())
-      pikkuState(null, 'channel', 'channels', new Map())
-
-      router.initialize()
-
-      const result = router.match('get', '/api/users')
-      assert.ok(result, 'Route should match')
-      assert.strictEqual(result.route, '/api/users')
-      assert.deepStrictEqual(result.params, {})
-    })
-  })
-
-  describe('Path Normalization', () => {
-    test('should normalize paths without leading slash', () => {
-      pikkuState(
-        null,
-        'http',
-        'routes',
-        new Map([
-          [
-            'get',
-            new Map([
-              ['test', mockRoute('test')],
-              ['api/health', mockRoute('api/health')],
-            ]),
-          ],
-        ])
-      )
-      pikkuState(null, 'http', 'middleware', new Map())
-      pikkuState(null, 'channel', 'channels', new Map())
-
-      router.initialize()
-
-      const result1 = router.match('get', '/test')
-      assert.ok(result1, 'Should match /test')
-      assert.strictEqual(result1.route, 'test')
-
-      const result2 = router.match('get', 'test')
-      assert.ok(result2, 'Should match test')
-      assert.strictEqual(result2.route, 'test')
-
-      const result3 = router.match('get', '/api/health')
-      assert.ok(result3, 'Should match /api/health')
-      assert.strictEqual(result3.route, 'api/health')
-    })
-  })
-
-  describe('Channel Routes Integration', () => {
-    test('should handle channel routes as GET routes', () => {
-      pikkuState(null, 'http', 'routes', new Map())
-      pikkuState(null, 'http', 'middleware', new Map())
-      pikkuState(
-        null,
-        'channel',
-        'channels',
-        new Map([
-          ['websocket-test', { name: 'websocket-test', route: '/ws/test' }],
-          ['chat', { name: 'chat', route: '/chat/:room' }],
-        ])
-      )
-
-      router.initialize()
-
-      const wsResult = router.match('get', '/ws/test')
-      assert.ok(wsResult, 'Static channel route should match')
-      assert.strictEqual(wsResult.route, '/ws/test')
-      assert.deepStrictEqual(wsResult.params, {})
-
-      const chatResult = router.match('get', '/chat/general')
-      assert.ok(chatResult, 'Dynamic channel route should match')
-      assert.strictEqual(chatResult.route, '/chat/:room')
-      assert.strictEqual(chatResult.params.room, 'general')
-    })
-  })
-
-  describe('Middleware Integration', () => {
-    test('should match route without returning middleware', () => {
-      const globalMiddleware = [async () => {}]
-      const routeMiddleware = [async () => {}]
-
-      pikkuState(
-        null,
-        'http',
-        'routes',
-        new Map([['get', new Map([['/api/test', mockRoute('/api/test')]])]])
-      )
-      pikkuState(
-        null,
-        'http',
-        'middleware',
-        new Map([
-          ['*', globalMiddleware],
-          ['/api/test', routeMiddleware],
-        ])
-      )
-      pikkuState(null, 'channel', 'channels', new Map())
-
-      router.initialize()
-
-      const result = router.match('get', '/api/test')
-      assert.ok(result, 'Route should match')
-      assert.strictEqual(result.route, '/api/test')
-      assert.deepStrictEqual(result.params, {})
-    })
-  })
-
-  describe('No Match Scenarios', () => {
-    test('should return null for non-existent routes', () => {
-      pikkuState(
-        null,
-        'http',
-        'routes',
-        new Map([['get', new Map([['/existing', mockRoute('/existing')]])]])
-      )
-      pikkuState(null, 'http', 'middleware', new Map())
-      pikkuState(null, 'channel', 'channels', new Map())
-
-      router.initialize()
-
-      const result = router.match('get', '/non-existent')
-      assert.strictEqual(result, null)
-    })
-
-    test('should return null for unsupported HTTP methods', () => {
-      pikkuState(
-        null,
-        'http',
-        'routes',
-        new Map([['get', new Map([['/test', mockRoute('/test')]])]])
-      )
-      pikkuState(null, 'http', 'middleware', new Map())
-      pikkuState(null, 'channel', 'channels', new Map())
-
-      router.initialize()
-
-      const result = router.match('post', '/test')
-      assert.strictEqual(result, null)
-    })
-  })
-
-  describe('Lazy Initialization', () => {
-    test('should initialize automatically on first match call', () => {
-      pikkuState(
-        null,
-        'http',
-        'routes',
-        new Map([['get', new Map([['/test', mockRoute('/test')]])]])
-      )
-      pikkuState(null, 'http', 'middleware', new Map())
-      pikkuState(null, 'channel', 'channels', new Map())
-
-      const result = router.match('get', '/test')
-      assert.ok(result, 'Should auto-initialize and match')
-      assert.strictEqual(result.route, '/test')
-    })
-  })
-})

package/src/wirings/http/routers/path-to-regex.ts

@@ -1,115 +0,0 @@
-import type { MatchFunction } from 'path-to-regexp'
-import { match } from 'path-to-regexp'
-import type { MatchResult, Router } from './http-router.js'
-import type { HTTPMethod } from '../http.types.js'
-import { pikkuState } from '../../../pikku-state.js'
-
-interface CompiledRoute {
-  matcher: MatchFunction<Partial<Record<string, string | string[]>>>
-  route: string
-}
-
-interface StaticRoute {
-  route: string
-}
-
-export class PathToRegexRouter implements Router {
-  private compiledRoutes: Map<HTTPMethod, Map<string, CompiledRoute>> =
-    new Map()
-  private staticRoutes: Map<HTTPMethod, Map<string, StaticRoute>> = new Map()
-  private isInitialized = false
-
-  public reset() {
-    this.compiledRoutes = new Map()
-    this.staticRoutes = new Map()
-    this.isInitialized = false
-  }
-
-  public initialize() {
-    const routes = pikkuState(null, 'http', 'routes')
-    const channelRoutes = pikkuState(null, 'channel', 'channels')
-
-    const compileRoutesForMethod = (
-      method: HTTPMethod,
-      routeEntries: Iterable<[string, any]>
-    ) => {
-      const methodCompiledRoutes =
-        this.compiledRoutes.get(method) || new Map<string, CompiledRoute>()
-      const methodStaticRoutes =
-        this.staticRoutes.get(method) || new Map<string, StaticRoute>()
-
-      for (const [routePath] of routeEntries) {
-        const normalizedRoutePath = routePath.startsWith('/')
-          ? routePath
-          : `/${routePath}`
-
-        const isStaticRoute = !/\*|:/.test(normalizedRoutePath)
-
-        if (isStaticRoute) {
-          methodStaticRoutes.set(normalizedRoutePath, {
-            route: routePath,
-          })
-        } else {
-          const matcher = match(normalizedRoutePath, {
-            decode: decodeURIComponent,
-          })
-
-          methodCompiledRoutes.set(normalizedRoutePath, {
-            matcher,
-            route: routePath,
-          })
-        }
-      }
-
-      this.compiledRoutes.set(method, methodCompiledRoutes)
-      this.staticRoutes.set(method, methodStaticRoutes)
-    }
-
-    for (const [method, routeMap] of routes.entries()) {
-      compileRoutesForMethod(method, routeMap.entries())
-    }
-
-    const channelRoutesArray: Array<[string, any]> = Array.from(
-      channelRoutes.entries()
-    ).map(([, channel]) => [channel.route, channel])
-    compileRoutesForMethod('get', channelRoutesArray)
-
-    this.isInitialized = true
-  }
-
-  match(method: HTTPMethod, path: string): MatchResult {
-    if (!this.isInitialized) {
-      this.initialize()
-    }
-
-    const normalizedPath = path.startsWith('/') ? path : `/${path}`
-
-    const methodStaticRoutes = this.staticRoutes.get(method)
-    if (methodStaticRoutes) {
-      const staticRoute = methodStaticRoutes.get(normalizedPath)
-      if (staticRoute) {
-        return {
-          route: staticRoute.route,
-          params: {},
-        }
-      }
-    }
-
-    const methodRoutes = this.compiledRoutes.get(method)
-    if (!methodRoutes) {
-      return null
-    }
-
-    for (const [, compiledRoute] of methodRoutes.entries()) {
-      const result = compiledRoute.matcher(normalizedPath)
-      if (result) {
-        return {
-          route: compiledRoute.route,
-          params: result.params,
-        }
-      }
-    }
-
-    return null
-  }
-}