fix dependency

Author: Bessonov

.travis.yml

@@ -10,12 +10,12 @@ install:
 - pnpm install
 
 script:
-- |
-  pnpm run test && pnpm run lint && pnpm run build
+- pnpm run precommit
 
 deploy:
 - provider: npm
   edge: true
+  # leave dist directory
   skip_cleanup: true
   api_key:
     secure: GuZ4V8x2m2GtduukJh3rpaezIplvjOcsUy14fui1XrC3tQy5w52cQvl/04tqWyWNCdxTTQttENaH4POY6hG/5192BhPFNkzBW8k6luL2ktWt+DWMWMwtdnt9ex0X+LDHKNyoMZ+YgrOwPaV4UcxTDG8K7+0Q3yDrIJaN4VQJNLm1iT4CRJUibHf6fhHXYbCk0Tr1niy1tNPog1kkFUEr3D4hy86WbuuBdp3m4QhEaqKZkbfyjZoSKlCAZtBL5bjbTLA7h5GZQFqsT2vR9quUwFy7Xo/3wFWEfdJyoxgrlnU1QZt1WVfDx6iMRImOA0O9u3mm0FMm4J9yAUdzuZq+47iapJSpyC2ctzEIrLdrgnXUrklLVl10xEMEGHtdPKJ5a31KG3iXfO7ENfLRNXY+1IqTKaLCjMjpCR0TRO5zvL3K5Zn4tHaU343FKowKmnhKWBFveGb66dmSM2QslaULYvB1AWLDsc2fwrbsSocpjmK3Ab5RzU1PG73Yv65i6u70tpTFDAj3+uICEjzbreMhvzl6QSOdFBGrCRn7R6/zaRL4pNX/H2AZlTIDP9D2XaFQC0B02H1+1u34ybFogR624UXFK8i28Cu/ei6tgjrFZjcJBl+LVfBiA0N56cnYpU3yqO/jat89f6vunwMPCYC7kb6cI90Cx3GoUOQtzJvNL/I=

README.md

@@ -20,6 +20,34 @@ This router is intended to be used with native node http interface. Features:
 - Can be used with [path-to-regexp](https://github.com/pillarjs/path-to-regexp).
 - Work with another servers? Tell it me!
 
+First example with micro
+------------------------
+```typescript
+// specify default handler
+const router = new Router((req, res) => sendError(req, res, { statusCode: 404 }))
+
+router.addRoute({
+	matcher: new ExactUrlPathnameMatcher(['/hello']),
+	handler: () => 'Hello kitty!',
+})
+
+
+const [address, port] = ['localhost', 8080]
+http.createServer(micro(router.serve)).listen(port, address)
+```
+
+
+Installation
+------------
+
+Choose for one of your favourite package manager:
+
+```bash
+pnpm install @bessonovs/node-http-router
+npm install @bessonovs/node-http-router
+yarn add @bessonovs/node-http-router
+```
+
 License
 -------
 

package.json

@@ -29,10 +29,12 @@
 		"lint": "eslint . --ext .ts,.js",
 		"build": "tsc",
 		"example-node-start": "tsc && node dist/examples/node.js",
-		"example-micro-start": "tsc && node dist/examples/micro.js"
+		"example-micro-start": "tsc && node dist/examples/micro.js",
+		"precommit": "$_ run test && $_ run lint && $_ run build"
 	},
 	"dependencies": {
-		"fast-url-parser": "1.1.3"
+		"fast-url-parser": "1.1.3",
+		"ts-toolbelt": "4.8.19"
 	},
 	"devDependencies": {
 		"@types/express": "4.17.1",
@@ -50,7 +52,6 @@
 		"node-mocks-http": "1.8.0",
 		"path-to-regexp": "3.1.0",
 		"ts-jest": "24.1.0",
-		"ts-toolbelt": "4.8.19",
 		"typescript": "3.6.4"
 	},
 	"publishConfig": {

src/examples/micro.ts

@@ -1,5 +1,5 @@
 import http from 'http'
-import micro from 'micro'
+import micro, { sendError } from 'micro'
 import { Router } from '../router'
 import { EndpointMatcher } from '../matchers/EndpointMatcher'
 import { ExactUrlPathnameMatcher } from '../matchers'
@@ -16,7 +16,7 @@ yarn example-micro-start
 
 */
 
-const router = new Router(() => 'not found')
+const router = new Router((req, res) => sendError(req, res, { statusCode: 404 }))
 
 const [address, port] = ['localhost', 8080]
 

src/examples/node.ts

@@ -16,7 +16,7 @@ yarn example-node-start
 */
 
 const router = new Router((req, res) => {
-	res.write('not found')
+	res.statusCode = 404
 	res.end()
 })
 

src/matchers/__tests__/AndMatcher.test.ts

@@ -7,9 +7,9 @@ import {
 it('none match', () => {
 	const result = new AndMatcher([
 		new MethodMatcher(['POST']),
-		new MethodMatcher(['POST']),
-	])
-		.match(httpMocks.createRequest(), httpMocks.createResponse())
+		new ExactUrlPathnameMatcher(['/test']),
+	]).match(httpMocks.createRequest(), httpMocks.createResponse())
+
 	expect(result).toStrictEqual({
 		matched: false,
 	})
@@ -20,6 +20,7 @@ it('first match, second not', () => {
 		new MethodMatcher(['GET']),
 		new ExactUrlPathnameMatcher(['/test']),
 	]).match(httpMocks.createRequest(), httpMocks.createResponse())
+
 	expect(result).toStrictEqual({
 		matched: false,
 	})
@@ -35,6 +36,7 @@ it('first not match, but second', () => {
 		new MethodMatcher(['GET']),
 		new ExactUrlPathnameMatcher(['/test']),
 	]).match(request, httpMocks.createResponse())
+
 	expect(result).toStrictEqual({
 		matched: false,
 	})
@@ -49,6 +51,7 @@ it('both match', () => {
 		new MethodMatcher(['GET']),
 		new ExactUrlPathnameMatcher(['/test']),
 	]).match(request, httpMocks.createResponse())
+
 	expect(result).toStrictEqual({
 		matched: true,
 		and: [