Merge pull request #4 from Bessonov/fix-export-type

Fix export type

Author: Bessonov

src/examples/micro.ts

@@ -29,7 +29,7 @@ server.once('listening', () => {
 
 router.addRoute({
 	// it's not necessary to type the matcher, but it give you a confidence
-	matcher: new EndpointMatcher<{groups: {name: string}}>('GET', /^\/hello\/(?<name>[^/]+)$/),
+	matcher: new EndpointMatcher<{name: string}>('GET', /^\/hello\/(?<name>[^/]+)$/),
 	handler: (req, res, match) => {
 		return `Hello ${match.match.groups.name}!`
 	},

src/examples/node.ts

@@ -1,7 +1,8 @@
 import http from 'http'
 import { Router } from '../router'
 import {
-	EndpointMatcher, ExactUrlPathnameMatcher,
+	EndpointMatcher,
+	ExactUrlPathnameMatcher,
 } from '../matchers'
 
 /*
@@ -31,7 +32,7 @@ server.once('listening', () => {
 
 router.addRoute({
 	// it's not necessary to type the matcher, but it give you a confidence
-	matcher: new EndpointMatcher<{groups: {name: string}}>('GET', /^\/hello\/(?<name>[^/]+)$/),
+	matcher: new EndpointMatcher<{ name: string }>('GET', /^\/hello\/(?<name>[^/]+)$/),
 	handler: (req, res, match) => {
 		res.write(`Hello ${match.match.groups.name}!`)
 		res.end()

src/index.ts

@@ -1,2 +1,3 @@
 export * from './matchers'
-export type { Route, Router, MatchedHandler } from './router'
+export type { Route, MatchedHandler } from './router'
+export { Router } from './router'

src/matchers/EndpointMatcher.ts

@@ -1,38 +1,43 @@
 import {
-	IncomingMessage, ServerResponse,
+	IncomingMessage,
+	ServerResponse,
 } from 'http'
 import { Matcher } from './Matcher'
 import { MatchResult } from './MatchResult'
 import {
-	Method, MethodMatchResult, MethodMatcher,
+	Method,
+	MethodMatchResult,
+	MethodMatcher,
 } from './MethodMatcher'
 import { AndMatcher } from './AndMatcher'
 import {
-	RegExpUrlMatchResult, RegExpUrlMatcher,
+	RegExpExecGroupArray,
+	RegExpUrlMatchResult,
+	RegExpUrlMatcher,
 } from './RegExpUrlMatcher'
 
 // waiting for
 // https://github.com/microsoft/TypeScript/issues/10571
 // https://github.com/microsoft/TypeScript/pull/26349
 // to resolve http method
 
-export type EndpointMatchResult<R extends Partial<RegExpExecArray>> =
+export type EndpointMatchResult<R extends object> =
 MatchResult<{
 	method: Method
-	match: RegExpExecArray & R
+	match: RegExpExecGroupArray<R>
 }>
 
 /**
  * higher order matcher which is combine matching of method
  * with regular expression
  */
-export class EndpointMatcher<R extends Partial<RegExpExecArray>>
+export class EndpointMatcher<R extends object>
 implements Matcher<EndpointMatchResult<R>> {
 	private readonly matcher: AndMatcher<MethodMatchResult<[Method]>, RegExpUrlMatchResult<R>>
 	constructor(method: Method, url: RegExp) {
 		this.matcher = new AndMatcher([
 			new MethodMatcher([method]),
-			new RegExpUrlMatcher([url]),
+			new RegExpUrlMatcher<R>([url]),
 		])
 	}
 

src/matchers/RegExpUrlMatcher.ts

@@ -2,19 +2,27 @@ import { IncomingMessage } from 'http'
 import { Matcher } from './Matcher'
 import { MatchResult } from './MatchResult'
 
-export type RegExpUrlMatchResult<R extends Partial<RegExpExecArray>> = MatchResult<{
-	match: RegExpExecArray & R
+export interface RegExpExecGroupArray<
+	T extends object
+> extends Array<string> {
+	index: number
+	input: string
+	groups: T
+}
+
+export type RegExpUrlMatchResult<R extends object> = MatchResult<{
+	match: RegExpExecGroupArray<R>
 }>
 
-export class RegExpUrlMatcher<R extends Partial<RegExpExecArray>>
+export class RegExpUrlMatcher<R extends object>
 implements Matcher<RegExpUrlMatchResult<R>> {
 	constructor(private readonly urls: [RegExp, ...RegExp[]]) {
 	}
 
 	match(req: IncomingMessage): RegExpUrlMatchResult<R> {
 		if (req.url) {
 			for (const url of this.urls) {
-				const result = url.exec(req.url) as never as RegExpExecArray & R
+				const result = url.exec(req.url) as never as RegExpExecGroupArray<R>
 				if (result !== null) {
 					return {
 						matched: true,

src/matchers/__tests__/RegExpUrlMatcher.test.ts

@@ -43,7 +43,7 @@ it('match second', () => {
 })
 
 it('match group', () => {
-	const result = new RegExpUrlMatcher<{groups: {groupId: string}}>([/^\/group\/(?<groupId>[^/]+)$/])
+	const result = new RegExpUrlMatcher<{ groupId: string }>([/^\/group\/(?<groupId>[^/]+)$/])
 		.match(httpMocks.createRequest({
 			url: '/group/123',
 		}))