Merge pull request #2 from Bessonov/remove-ts-toolbelt

remove ts-toolbelt

Author: Bessonov

.eslintrc.js

@@ -1,5 +1,6 @@
 module.exports = {
 	root: true,
+	reportUnusedDisableDirectives: true,
 	env: {
 		node: true,
 		jest: true,
@@ -14,6 +15,14 @@ module.exports = {
 		'@bessonovs/eslint-config/typescript',
 	],
 	parser: '@typescript-eslint/parser',
+	parserOptions: {
+		project: [
+			'./tsconfig.json',
+		],
+	},
+	ignorePatterns: [
+		'.eslintrc.js',
+	],
 	rules: {
 		'arrow-body-style': 'off',
 		'lines-between-class-members': 'off',

.github/release-drafter.yml

@@ -0,0 +1,17 @@
+# https://github.com/release-drafter/release-drafter/blob/v5.3.1/.github/release-drafter.yml
+name-template: "v$NEXT_PATCH_VERSION"
+tag-template: "v$NEXT_PATCH_VERSION"
+template: |
+  # What's Changed
+
+  $CHANGES
+categories:
+  - title: "🚀 Features"
+    labels:
+      - add
+  - title: "🐛 Bug Fixes"
+    labels:
+      - fix
+  - title: "♻️ Maintenance"
+    labels:
+      - update

.github/workflows/on-commit.yml

@@ -0,0 +1,21 @@
+name: On commit hook
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    name: test
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/[email protected]
+      - name: Read .nvmrc
+        id: nvm
+        run: echo ::set-output name=NVMRC::$(cat .nvmrc)
+      - name: Setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '${{ steps.nvm.outputs.NVMRC }}'
+      - name: prepare dependencies
+        run: npm install
+      - name: test
+        run: npm run precommit

.github/workflows/publish.yml

@@ -0,0 +1,33 @@
+name: Publish to npm
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  publish:
+    name: publish
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/[email protected]
+      - name: Read .nvmrc
+        id: nvm
+        run: echo ::set-output name=NVMRC::$(cat .nvmrc)
+      - name: Setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '${{ steps.nvm.outputs.NVMRC }}'
+      - name: prepare dependencies
+        run: npm install
+      - name: test
+        run: npm run precommit
+      - name: publish
+        run: |
+          echo '//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}' >> .npmrc
+          echo 'registry=https://registry.npmjs.org/' >> .npmrc
+          echo 'always-auth=true' >> .npmrc
+          npm publish
+        env:
+          CI: true
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

.github/workflows/release-drafter.yml

@@ -0,0 +1,16 @@
+# https://github.com/marketplace/actions/release-drafter
+name: Release Drafter
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-20.04
+    steps:
+      # Drafts your next Release notes as Pull Requests are merged into "master"
+      - uses: release-drafter/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.travis.yml

@@ -16,7 +16,7 @@
 		"http",
 		"server"
 	],
-	"version": "0.0.5",
+	"version": "0.0.6",
 	"author": "Anton Bessonov",
 	"license": "MIT",
 	"repository": "bessonov/node-http-router",
@@ -33,27 +33,26 @@
 		"precommit": "$_ run test && $_ run lint && $_ run build"
 	},
 	"dependencies": {
-		"fast-url-parser": "1.1.3",
-		"ts-toolbelt": "6.7.7"
+		"fast-url-parser": "1.1.3"
 	},
 	"devDependencies": {
-		"@bessonovs/eslint-config": "0.0.6",
-		"@types/express": "4.17.6",
+		"@bessonovs/eslint-config": "0.0.7",
+		"@types/express": "4.17.12",
 		"@types/jest": "25.2.2",
 		"@types/node": "14.0.1",
-		"@typescript-eslint/eslint-plugin": "2.33.0",
-		"@typescript-eslint/parser": "2.33.0",
-		"eslint": "7.0.0",
-		"eslint-config-airbnb": "18.1.0",
-		"eslint-plugin-import": "2.20.2",
-		"eslint-plugin-jsx-a11y": "6.2.3",
-		"eslint-plugin-react": "7.20.0",
-		"jest": "26.0.1",
+		"@typescript-eslint/eslint-plugin": "4.28.1",
+		"@typescript-eslint/parser": "4.28.1",
+		"eslint": "7.29.0",
+		"eslint-config-airbnb": "18.2.1",
+		"eslint-plugin-import": "2.23.4",
+		"eslint-plugin-jsx-a11y": "6.4.1",
+		"eslint-plugin-react": "7.24.0",
+		"jest": "27.0.6",
 		"micro": "9.3.5-canary.3",
-		"node-mocks-http": "1.8.1",
-		"path-to-regexp": "6.1.0",
-		"ts-jest": "26.0.0",
-		"typescript": "3.9.2"
+		"node-mocks-http": "1.10.1",
+		"path-to-regexp": "6.2.0",
+		"ts-jest": "27.0.3",
+		"typescript": "4.3.4"
 	},
 	"publishConfig": {
 		"access": "public"

package.json

@@ -15,7 +15,6 @@ import {
 	MethodMatcher,
 } from '../matchers'
 
-
 let router: Router
 
 beforeEach(() => {

src/__tests__/router.test.ts

@@ -44,7 +44,6 @@ implements Matcher<ExactQueryMatchResult<U>> {
 				params = query.split(/&/).reduce((acc, parts) => {
 					const part = parts.split(/=/)
 					const [key, value] = part
-					// eslint-disable-next-line @typescript-eslint/ban-ts-ignore
 					// @ts-ignore
 					acc[key] = value
 					return acc

src/matchers/ExactQueryMatcher.ts

@@ -1,5 +1,3 @@
-import { U } from 'ts-toolbelt'
-
 type MatchedResult = {
 	matched: true
 }
@@ -8,12 +6,12 @@ type UnmatchedResult = {
 	matched: false
 }
 
-export type MatchResult<T = {}> = UnmatchedResult | MatchedResult & T
+export type MatchResult<T = Record<string, unknown>> = UnmatchedResult | MatchedResult & T
 
 /**
  * reperesent matcher result which is matched
  */
-export type Matched<MR extends MatchResult> = U.Select<MR, MatchedResult>
+export type Matched<MR extends MatchResult> = Extract<MR, MatchedResult>
 
 /**
  * check for matched result