refactor router

1 files changed, 41 insertions, 45 deletions

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cc9e8b1..242438d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -97,7 +97,7 @@ importers:
       typedoc: ^0.20.25
       typescript: ^4.1.3
       yup: ^0.32.8
-lockfileVersion: 5.1
+lockfileVersion: 5.2
 packages:
   /@babel/code-frame/7.12.11:
     dependencies:
@@ -1546,7 +1546,7 @@ packages:
       jest-haste-map: 26.6.2
       jest-message-util: 26.6.2
       jest-regex-util: 26.0.0
-      jest-resolve: 26.6.2_jest-resolve@26.6.2
+      jest-resolve: 26.6.2
       jest-resolve-dependencies: 26.6.3
       jest-runner: 26.6.3
       jest-runtime: 26.6.3
@@ -1616,7 +1616,7 @@ packages:
       istanbul-lib-source-maps: 4.0.0
       istanbul-reports: 3.0.2
       jest-haste-map: 26.6.2
-      jest-resolve: 26.6.2_jest-resolve@26.6.2
+      jest-resolve: 26.6.2
       jest-util: 26.6.2
       jest-worker: 26.6.2
       slash: 3.0.0
@@ -1833,7 +1833,7 @@ packages:
       '@prefresh/core': 0.8.1_preact@10.5.12
       '@prefresh/utils': 0.3.1
       preact: 10.5.12
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
     dev: true
     peerDependencies:
       preact: ^10.4.0
@@ -2536,7 +2536,7 @@ packages:
       unfetch: 4.2.0
       url-loader: 4.1.1_file-loader@6.2.0+webpack@4.46.0
       util-deprecate: 1.0.2
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
       webpack-dev-middleware: 3.7.3_webpack@4.46.0
       webpack-filter-warnings-plugin: 1.2.1_webpack@4.46.0
       webpack-hot-middleware: 2.25.0
@@ -2646,7 +2646,7 @@ packages:
       unfetch: 4.2.0
       url-loader: 4.1.1_file-loader@6.2.0+webpack@4.46.0
       util-deprecate: 1.0.2
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
       webpack-dev-middleware: 3.7.3_webpack@4.46.0
       webpack-filter-warnings-plugin: 1.2.1_webpack@4.46.0
       webpack-hot-middleware: 2.25.0
@@ -4150,7 +4150,7 @@ packages:
     dependencies:
       chalk: 2.4.1
       deepcopy: 1.0.0
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
     dev: true
     peerDependencies:
       webpack: ^4.28.4
@@ -4217,7 +4217,7 @@ packages:
       loader-utils: 1.4.0
       make-dir: 3.1.0
       schema-utils: 2.7.1
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
     dev: true
     engines:
       node: '>= 8.9'
@@ -5564,7 +5564,7 @@ packages:
       find-cache-dir: 3.3.1
       schema-utils: 2.7.1
       serialize-javascript: 4.0.0
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
       webpack-sources: 1.4.3
     dev: true
     engines:
@@ -5730,7 +5730,7 @@ packages:
       p-limit: 2.3.0
       schema-utils: 1.0.0
       serialize-javascript: 4.0.0
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
       webpack-log: 2.0.0
     dev: true
     engines:
@@ -5752,7 +5752,7 @@ packages:
     resolution:
       integrity: sha512-V5qQZVAr9K0xu7jXg1M7qTEwuxUgqr7dUOezGaNa7i+Xn9oXAU/d1fzqD9ObuwpVQOaorO5s70ckyi1woP9lVA==
   /core-js/2.6.12:
-    deprecated: 'core-js@<3 is no longer maintained and not recommended for usage due to the number of issues. Please, upgrade your dependencies to the actual version of core-js@3.'
+    deprecated: core-js@<3 is no longer maintained and not recommended for usage due to the number of issues. Please, upgrade your dependencies to the actual version of core-js@3.
     dev: true
     requiresBuild: true
     resolution:
@@ -5985,7 +5985,7 @@ packages:
       postcss-value-parser: 4.1.0
       schema-utils: 2.7.1
       semver: 6.3.0
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
     dev: true
     engines:
       node: '>= 8.9.0'
@@ -6676,7 +6676,7 @@ packages:
   /dotenv-webpack/1.8.0_webpack@4.46.0:
     dependencies:
       dotenv-defaults: 1.1.1
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
     dev: true
     peerDependencies:
       webpack: ^1 || ^2 || ^3 || ^4
@@ -7603,7 +7603,7 @@ packages:
     dependencies:
       loader-utils: 2.0.0
       schema-utils: 3.0.0
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
     dev: true
     engines:
       node: '>= 10.13.0'
@@ -8679,7 +8679,7 @@ packages:
       tapable: 1.1.3
       toposort: 1.0.7
       util.promisify: 1.0.0
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
     dev: true
     engines:
       node: '>=6.9'
@@ -8698,7 +8698,7 @@ packages:
       pretty-error: 2.1.2
       tapable: 1.1.3
       util.promisify: 1.0.0
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
     dev: true
     engines:
       node: '>=6.9'
@@ -9801,7 +9801,7 @@ packages:
       jest-get-type: 26.3.0
       jest-jasmine2: 26.6.3
       jest-regex-util: 26.0.0
-      jest-resolve: 26.6.2_jest-resolve@26.6.2
+      jest-resolve: 26.6.2
       jest-util: 26.6.2
       jest-validate: 26.6.2
       micromatch: 4.0.2
@@ -9974,7 +9974,7 @@ packages:
       integrity: sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==
   /jest-pnp-resolver/1.2.2_jest-resolve@26.6.2:
     dependencies:
-      jest-resolve: 26.6.2_jest-resolve@26.6.2
+      jest-resolve: 26.6.2
     dev: true
     engines:
       node: '>=6'
@@ -10022,7 +10022,7 @@ packages:
       node: '>= 10.14.2'
     resolution:
       integrity: sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==
-  /jest-resolve/26.6.2_jest-resolve@26.6.2:
+  /jest-resolve/26.6.2:
     dependencies:
       '@jest/types': 26.6.2
       chalk: 4.1.0
@@ -10035,8 +10035,6 @@ packages:
     dev: true
     engines:
       node: '>= 10.14.2'
-    peerDependencies:
-      jest-resolve: '*'
     resolution:
       integrity: sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==
   /jest-runner/26.6.3:
@@ -10055,7 +10053,7 @@ packages:
       jest-haste-map: 26.6.2
       jest-leak-detector: 26.6.2
       jest-message-util: 26.6.2
-      jest-resolve: 26.6.2_jest-resolve@26.6.2
+      jest-resolve: 26.6.2
       jest-runtime: 26.6.3
       jest-util: 26.6.2
       jest-worker: 26.6.2
@@ -10088,7 +10086,7 @@ packages:
       jest-message-util: 26.6.2
       jest-mock: 26.6.2
       jest-regex-util: 26.0.0
-      jest-resolve: 26.6.2_jest-resolve@26.6.2
+      jest-resolve: 26.6.2
       jest-snapshot: 26.6.2
       jest-util: 26.6.2
       jest-validate: 26.6.2
@@ -10124,7 +10122,7 @@ packages:
       jest-haste-map: 26.6.2
       jest-matcher-utils: 26.6.2
       jest-message-util: 26.6.2
-      jest-resolve: 26.6.2_jest-resolve@26.6.2
+      jest-resolve: 26.6.2
       natural-compare: 1.4.0
       pretty-format: 26.6.2
       semver: 7.3.4
@@ -11132,7 +11130,7 @@ packages:
       loader-utils: 1.4.0
       normalize-url: 1.9.1
       schema-utils: 1.0.0
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
       webpack-sources: 1.4.3
     dev: true
     engines:
@@ -11795,7 +11793,7 @@ packages:
     dependencies:
       cssnano: 4.1.10
       last-call-webpack-plugin: 3.0.0
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
     dev: true
     peerDependencies:
       webpack: ^4.0.0
@@ -12803,7 +12801,7 @@ packages:
       update-notifier: 4.1.3
       url-loader: 4.1.1_file-loader@6.2.0+webpack@4.46.0
       validate-npm-package-name: 3.0.0
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
       webpack-bundle-analyzer: 3.9.0
       webpack-dev-server: 3.11.2_webpack@4.46.0
       webpack-fix-style-only-entries: 0.5.2
@@ -12962,7 +12960,7 @@ packages:
     dependencies:
       chalk: 3.0.0
       progress: 2.0.3
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
     dev: true
     peerDependencies:
       webpack: ^1.3.0 || ^2 || ^3 || ^4 || ^5
@@ -13225,7 +13223,7 @@ packages:
     dependencies:
       loader-utils: 2.0.0
       schema-utils: 3.0.0
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
     dev: true
     engines:
       node: '>= 10.13.0'
@@ -13873,7 +13871,7 @@ packages:
       request-promise-core: 1.1.4_request@2.88.2
       stealthy-require: 1.1.1
       tough-cookie: 2.5.0
-    deprecated: 'request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142'
+    deprecated: request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142
     dev: true
     engines:
       node: '>=0.12.0'
@@ -13903,7 +13901,7 @@ packages:
       tough-cookie: 2.5.0
       tunnel-agent: 0.6.0
       uuid: 3.4.0
-    deprecated: 'request has been deprecated, see https://github.com/request/request/issues/3142'
+    deprecated: request has been deprecated, see https://github.com/request/request/issues/3142
     dev: true
     engines:
       node: '>= 6'
@@ -13968,7 +13966,7 @@ packages:
     resolution:
       integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
   /resolve-url/0.2.1:
-    deprecated: 'https://github.com/lydell/resolve-url#deprecated'
+    deprecated: https://github.com/lydell/resolve-url#deprecated
     dev: true
     resolution:
       integrity: sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
@@ -14552,7 +14550,7 @@ packages:
       minimatch: 3.0.4
       pretty-bytes: 5.5.0
       util.promisify: 1.1.1
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
     dev: true
     peerDependencies:
       webpack: '*'
@@ -15099,7 +15097,7 @@ packages:
     dependencies:
       loader-utils: 2.0.0
       schema-utils: 2.7.1
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
     dev: true
     engines:
       node: '>= 8.9.0'
@@ -15321,7 +15319,7 @@ packages:
       serialize-javascript: 4.0.0
       source-map: 0.6.1
       terser: 4.8.0
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
       webpack-sources: 1.4.3
       worker-farm: 1.7.0
     dev: true
@@ -15341,7 +15339,7 @@ packages:
       serialize-javascript: 4.0.0
       source-map: 0.6.1
       terser: 4.8.0
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
       webpack-sources: 1.4.3
     dev: true
     engines:
@@ -16015,7 +16013,7 @@ packages:
     resolution:
       integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   /urix/0.1.0:
-    deprecated: 'Please see https://github.com/lydell/urix#deprecated'
+    deprecated: Please see https://github.com/lydell/urix#deprecated
     dev: true
     resolution:
       integrity: sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
@@ -16025,7 +16023,7 @@ packages:
       loader-utils: 2.0.0
       mime-types: 2.1.29
       schema-utils: 3.0.0
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
     dev: true
     engines:
       node: '>= 10.13.0'
@@ -16368,7 +16366,7 @@ packages:
       mime: 2.5.2
       mkdirp: 0.5.5
       range-parser: 1.2.1
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
       webpack-log: 2.0.0
     dev: true
     engines:
@@ -16408,7 +16406,7 @@ packages:
       strip-ansi: 3.0.1
       supports-color: 6.1.0
       url: 0.11.0
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
       webpack-dev-middleware: 3.7.3_webpack@4.46.0
       webpack-log: 2.0.0
       ws: 6.2.1
@@ -16427,7 +16425,7 @@ packages:
       integrity: sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ==
   /webpack-filter-warnings-plugin/1.2.1_webpack@4.46.0:
     dependencies:
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
     dev: true
     engines:
       node: '>= 4.3 < 5.0.0 || >= 5.10'
@@ -16482,7 +16480,7 @@ packages:
     dev: true
     resolution:
       integrity: sha512-kDUmfm3BZrei0y+1NTHJInejzxfhtU8eDj2M7OKb2IWrPFAeO1SOH2KuQ68MSZu9IGEHcxbkKKR1v18FrUSOmA==
-  /webpack/4.46.0_webpack@4.46.0:
+  /webpack/4.46.0:
     dependencies:
       '@webassemblyjs/ast': 1.9.0
       '@webassemblyjs/helper-module-context': 1.9.0
@@ -16506,14 +16504,12 @@ packages:
       tapable: 1.1.3
       terser-webpack-plugin: 1.4.5_webpack@4.46.0
       watchpack: 1.7.5
-      webpack: 4.46.0_webpack@4.46.0
       webpack-sources: 1.4.3
     dev: true
     engines:
       node: '>=6.11.5'
     hasBin: true
     peerDependencies:
-      webpack: '*'
       webpack-cli: '*'
       webpack-command: '*'
     peerDependenciesMeta:
@@ -16745,7 +16741,7 @@ packages:
       fast-json-stable-stringify: 2.1.0
       source-map-url: 0.4.1
       upath: 1.2.0
-      webpack: 4.46.0_webpack@4.46.0
+      webpack: 4.46.0
       webpack-sources: 1.4.3
       workbox-build: 5.1.4
     dev: true