diff --git a/.prettierignore b/.prettierignore
index 598d2e35c..d7e6dbe51 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,14 +1,4 @@
 dist
 pages/generated
 pages/out
-type-definitions/ts-tests/*.ts
 type-definitions/flow-tests/
-
-!type-definitions/ts-tests/covariance.ts
-!type-definitions/ts-tests/deepCopy.ts
-!type-definitions/ts-tests/empty.ts
-!type-definitions/ts-tests/es6-collections.ts
-!type-definitions/ts-tests/exports.ts
-!type-definitions/ts-tests/from-js.ts
-!type-definitions/ts-tests/functional.ts
-!type-definitions/ts-tests/groupBy.ts
diff --git a/package-lock.json b/package-lock.json
index a87967ffc..49c8cc379 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,6 @@
         "benchmark": "2.1.4",
         "colors": "1.4.0",
         "cpy-cli": "3.1.1",
-        "dtslint": "^4.2.1",
         "eslint": "^8.56.0",
         "eslint-config-airbnb": "^19.0.4",
         "eslint-config-next": "^14.1.0",
@@ -53,7 +52,7 @@
         "rollup": "3.28.1",
         "size-limit": "^8.2.6",
         "transducers-js": "0.4.174",
-        "tstyche": "^1.0.0",
+        "tstyche": "^2.0.0-beta.0",
         "typescript": "5.1"
       },
       "engines": {
@@ -1037,39 +1036,6 @@
       "integrity": "sha512-N8uEMrMPL0cu/bdboEWpQYb/0i2K5Qn8eCsxzOmxSggJbbQte7ljMRoXm917AbntqTGOzdTu+vP3KOOzoC70HQ==",
       "dev": true
     },
-    "node_modules/@definitelytyped/header-parser": {
-      "version": "0.0.141",
-      "resolved": "https://registry.npmjs.org/@definitelytyped/header-parser/-/header-parser-0.0.141.tgz",
-      "integrity": "sha512-u7f/NnXJJMML86BBGwLaQwhxfvuEogJdRTUA8g2vOZ9UhGzAyLSX3njTp7lni7C7PGYp2/vV2B+YLBwujQzJ8Q==",
-      "dev": true,
-      "dependencies": {
-        "@definitelytyped/typescript-versions": "^0.0.141",
-        "@types/parsimmon": "^1.10.1",
-        "parsimmon": "^1.13.0"
-      }
-    },
-    "node_modules/@definitelytyped/typescript-versions": {
-      "version": "0.0.141",
-      "resolved": "https://registry.npmjs.org/@definitelytyped/typescript-versions/-/typescript-versions-0.0.141.tgz",
-      "integrity": "sha512-RHONSp0eGUccKcoiDJF25DVAUk6pNS79ie0/1T0fn/cDTrzhX14eo6Zcz7O9emqAI496pvsS7IhYctoFrZ/xzw==",
-      "dev": true
-    },
-    "node_modules/@definitelytyped/utils": {
-      "version": "0.0.141",
-      "resolved": "https://registry.npmjs.org/@definitelytyped/utils/-/utils-0.0.141.tgz",
-      "integrity": "sha512-4DneI5xY0KDSF0vNWiSwmDpxVR9E32oQPWFjv0PdEgGaZT1VS8E/LxSHVjwn2+MK3uuk4XK41S/R9IFvddu9Gw==",
-      "dev": true,
-      "dependencies": {
-        "@definitelytyped/typescript-versions": "^0.0.141",
-        "@qiwi/npm-registry-client": "^8.9.1",
-        "@types/node": "^14.14.35",
-        "charm": "^1.0.2",
-        "fs-extra": "^8.1.0",
-        "fstream": "^1.0.12",
-        "tar": "^6.1.11",
-        "tar-stream": "^2.1.4"
-      }
-    },
     "node_modules/@esbuild/android-arm": {
       "version": "0.18.20",
       "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz",
@@ -2423,43 +2389,6 @@
         "node": ">=14"
       }
     },
-    "node_modules/@qiwi/npm-registry-client": {
-      "version": "8.9.1",
-      "resolved": "https://registry.npmjs.org/@qiwi/npm-registry-client/-/npm-registry-client-8.9.1.tgz",
-      "integrity": "sha512-rZF+mG+NfijR0SHphhTLHRr4aM4gtfdwoAMY6we2VGQam8vkN1cxGG1Lg/Llrj8Dd0Mu6VjdFQRyMMRZxtZR2A==",
-      "dev": true,
-      "dependencies": {
-        "concat-stream": "^2.0.0",
-        "graceful-fs": "^4.2.4",
-        "normalize-package-data": "~1.0.1 || ^2.0.0 || ^3.0.0",
-        "npm-package-arg": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^8.0.0",
-        "once": "^1.4.0",
-        "request": "^2.88.2",
-        "retry": "^0.12.0",
-        "safe-buffer": "^5.2.1",
-        "semver": "2 >=2.2.1 || 3.x || 4 || 5 || 7",
-        "slide": "^1.1.6",
-        "ssri": "^8.0.0"
-      },
-      "optionalDependencies": {
-        "npmlog": "2 || ^3.1.0 || ^4.0.0"
-      }
-    },
-    "node_modules/@qiwi/npm-registry-client/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@rollup/plugin-buble": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-buble/-/plugin-buble-1.0.2.tgz",
@@ -3027,12 +2956,6 @@
       "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
       "dev": true
     },
-    "node_modules/@types/parsimmon": {
-      "version": "1.10.6",
-      "resolved": "https://registry.npmjs.org/@types/parsimmon/-/parsimmon-1.10.6.tgz",
-      "integrity": "sha512-FwAQwMRbkhx0J6YELkwIpciVzCcgEqXEbIrIn3a2P5d3kGEHQ3wVhlN3YdVepYP+bZzCYO6OjmD4o9TGOZ40rA==",
-      "dev": true
-    },
     "node_modules/@types/prismjs": {
       "version": "1.26.3",
       "resolved": "https://registry.npmjs.org/@types/prismjs/-/prismjs-1.26.3.tgz",
@@ -3656,24 +3579,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/are-we-there-yet": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
-      "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
-      }
-    },
     "node_modules/argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
@@ -3876,24 +3781,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
@@ -3948,21 +3835,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/aws4": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
-      "dev": true
-    },
     "node_modules/axe-core": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.0.tgz",
@@ -3981,87 +3853,6 @@
         "dequal": "^2.0.3"
       }
     },
-    "node_modules/babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
-      }
-    },
-    "node_modules/babel-code-frame/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-code-frame/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-code-frame/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-code-frame/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/babel-code-frame/node_modules/js-tokens": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-      "dev": true
-    },
-    "node_modules/babel-code-frame/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/babel-code-frame/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/babel-jest": {
       "version": "29.6.4",
       "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.6.4.tgz",
@@ -4227,35 +4018,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dev": true,
-      "dependencies": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
     "node_modules/benchmark": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/benchmark/-/benchmark-2.1.4.tgz",
@@ -4275,31 +4037,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dev": true,
-      "dependencies": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
-    "node_modules/bl/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -4331,51 +4068,12 @@
         "node-int64": "^0.4.0"
       }
     },
-    "node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
     "node_modules/buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
       "dev": true
     },
-    "node_modules/builtin-modules": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/builtins": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
-      "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=",
-      "dev": true
-    },
     "node_modules/busboy": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz",
@@ -4492,12 +4190,6 @@
         }
       ]
     },
-    "node_modules/caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "dev": true
-    },
     "node_modules/chalk": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
@@ -4523,15 +4215,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/charm": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/charm/-/charm-1.0.2.tgz",
-      "integrity": "sha1-it02cVOm2aWBMxBSxAkJkdqZXjU=",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.1"
-      }
-    },
     "node_modules/chokidar": {
       "version": "3.5.3",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
@@ -4559,15 +4242,6 @@
         "fsevents": "~2.3.2"
       }
     },
-    "node_modules/chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/ci-info": {
       "version": "3.8.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
@@ -4631,46 +4305,6 @@
       "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==",
       "dev": true
     },
-    "node_modules/cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "dev": true,
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
-      }
-    },
-    "node_modules/cliui/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/cliui/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cliui/node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -4681,16 +4315,6 @@
         "node": ">= 0.12.0"
       }
     },
-    "node_modules/code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/collect-v8-coverage": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
@@ -4749,12 +4373,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/command-exists": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
-      "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==",
-      "dev": true
-    },
     "node_modules/commander": {
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
@@ -4779,48 +4397,12 @@
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
       "dev": true
     },
-    "node_modules/concat-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
-      "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
-      "dev": true,
-      "engines": [
-        "node >= 6.0"
-      ],
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.0.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "node_modules/concat-stream/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/confusing-browser-globals": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
       "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
       "dev": true
     },
-    "node_modules/console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "dev": true,
-      "optional": true
-    },
     "node_modules/convert-source-map": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
@@ -4836,12 +4418,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
-    },
     "node_modules/cp-file": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-7.0.0.tgz",
@@ -5209,18 +4785,6 @@
       "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
       "dev": true
     },
-    "node_modules/dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dev": true,
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/data-urls": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
@@ -5419,13 +4983,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "dev": true,
-      "optional": true
-    },
     "node_modules/dequal": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
@@ -5489,214 +5046,12 @@
         "node": ">=12"
       }
     },
-    "node_modules/dts-critic": {
-      "version": "3.3.10",
-      "resolved": "https://registry.npmjs.org/dts-critic/-/dts-critic-3.3.10.tgz",
-      "integrity": "sha512-XvemZCSc05VIlYrd3SjIO/6OyA3SCXK2RIHEVIbAZjxD6/ptmQfwnrq7pWFxJ6raiD3Edh8PzCSy84QUuAzOTg==",
-      "dev": true,
-      "dependencies": {
-        "@definitelytyped/header-parser": "latest",
-        "command-exists": "^1.2.8",
-        "rimraf": "^3.0.2",
-        "semver": "^6.2.0",
-        "tmp": "^0.2.1",
-        "yargs": "^15.3.1"
-      },
-      "engines": {
-        "node": ">=10.17.0"
-      },
-      "peerDependencies": {
-        "typescript": "*"
-      }
-    },
-    "node_modules/dts-critic/node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/dtslint": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/dtslint/-/dtslint-4.2.1.tgz",
-      "integrity": "sha512-57mWY9osUEfS6k62ATS9RSgug1dZcuN4O31hO76u+iEexa6VUEbKoPGaA2mNtc0FQDcdTl0zEUtti79UQKSQyQ==",
-      "dev": true,
-      "dependencies": {
-        "@definitelytyped/header-parser": "latest",
-        "@definitelytyped/typescript-versions": "latest",
-        "@definitelytyped/utils": "latest",
-        "dts-critic": "latest",
-        "fs-extra": "^6.0.1",
-        "json-stable-stringify": "^1.0.1",
-        "strip-json-comments": "^2.0.1",
-        "tslint": "5.14.0",
-        "tsutils": "^2.29.0",
-        "yargs": "^15.1.0"
-      },
-      "bin": {
-        "dtslint": "bin/index.js"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "typescript": ">= 3.0.0-dev || >= 3.1.0-dev || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.7.0-dev || >= 3.8.0-dev || >= 3.9.0-dev || >= 4.0.0-dev"
-      }
-    },
-    "node_modules/dtslint/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/dtslint/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/dtslint/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/dtslint/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "node_modules/dtslint/node_modules/diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
-    "node_modules/dtslint/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/dtslint/node_modules/fs-extra": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
-      "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      }
-    },
-    "node_modules/dtslint/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/dtslint/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/dtslint/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/dtslint/node_modules/tslint": {
-      "version": "5.14.0",
-      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.14.0.tgz",
-      "integrity": "sha512-IUla/ieHVnB8Le7LdQFRGlVJid2T/gaJe5VkjzRVSRR6pA2ODYrnfR1hmxi+5+au9l50jBwpbBL34txgv4NnTQ==",
-      "dev": true,
-      "dependencies": {
-        "babel-code-frame": "^6.22.0",
-        "builtin-modules": "^1.1.1",
-        "chalk": "^2.3.0",
-        "commander": "^2.12.1",
-        "diff": "^3.2.0",
-        "glob": "^7.1.1",
-        "js-yaml": "^3.7.0",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.1",
-        "resolve": "^1.3.2",
-        "semver": "^5.3.0",
-        "tslib": "^1.8.0",
-        "tsutils": "^2.29.0"
-      },
-      "bin": {
-        "tslint": "bin/tslint"
-      },
-      "engines": {
-        "node": ">=4.8.0"
-      },
-      "peerDependencies": {
-        "typescript": ">=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev || >= 3.1.0-dev || >= 3.2.0-dev"
-      }
-    },
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
       "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
       "dev": true
     },
-    "node_modules/ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "dev": true,
-      "dependencies": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
     "node_modules/electron-to-chromium": {
       "version": "1.4.503",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.503.tgz",
@@ -5721,15 +5076,6 @@
       "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
       "dev": true
     },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.4.0"
-      }
-    },
     "node_modules/enhanced-resolve": {
       "version": "5.15.0",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
@@ -6770,12 +6116,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
     "node_modules/extend-shallow": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
@@ -6882,15 +6222,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ]
-    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -7081,29 +6412,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dev": true,
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 0.12"
-      }
-    },
     "node_modules/fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
@@ -7116,38 +6424,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true
-    },
-    "node_modules/fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=6 <7 || >=8"
-      }
-    },
-    "node_modules/fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -7168,21 +6444,6 @@
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
-    "node_modules/fstream": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
-      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
-      "dev": true,
-      "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "inherits": "~2.0.0",
-        "mkdirp": ">=0.5 0",
-        "rimraf": "2"
-      },
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -7219,46 +6480,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/gauge": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "aproba": "^1.0.3",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.0",
-        "object-assign": "^4.1.0",
-        "signal-exit": "^3.0.0",
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wide-align": "^1.1.0"
-      }
-    },
-    "node_modules/gauge/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/gauge/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -7350,15 +6571,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
-      "dependencies": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "node_modules/glob": {
       "version": "7.1.7",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
@@ -7474,29 +6686,6 @@
       "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
       "dev": true
     },
-    "node_modules/har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/har-validator": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-      "deprecated": "this library is no longer supported",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/hard-rejection": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
@@ -7506,27 +6695,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-ansi/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/has-bigints": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
@@ -7620,13 +6788,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "dev": true,
-      "optional": true
-    },
     "node_modules/has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
@@ -7763,21 +6924,6 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
-    "node_modules/http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dev": true,
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      },
-      "engines": {
-        "node": ">=0.8",
-        "npm": ">=1.3.7"
-      }
-    },
     "node_modules/https-proxy-agent": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
@@ -7835,30 +6981,10 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+    "node_modules/ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
       "dev": true,
       "engines": {
         "node": ">= 4"
@@ -8247,19 +7373,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "number-is-nan": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-generator-fn": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
@@ -8480,12 +7593,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
-    },
     "node_modules/is-weakmap": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
@@ -8562,12 +7669,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
-    },
     "node_modules/istanbul-lib-coverage": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
@@ -9592,12 +8693,6 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true
-    },
     "node_modules/jsdom": {
       "version": "20.0.3",
       "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz",
@@ -9726,39 +8821,18 @@
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
-    "node_modules/json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
-    },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
-    "node_modules/json-stable-stringify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-      "dev": true,
-      "dependencies": {
-        "jsonify": "~0.0.0"
-      }
-    },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
       "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
       "dev": true
     },
-    "node_modules/json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
-    },
     "node_modules/json5": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
@@ -9771,39 +8845,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "dev": true,
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/jsonify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "dependencies": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
     "node_modules/jsx-ast-utils": {
       "version": "3.3.5",
       "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
@@ -10382,31 +9423,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/minipass": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz",
-      "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/mixin-deep": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
@@ -10432,18 +9448,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
     "node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -10649,47 +9653,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/npm-package-arg": {
-      "version": "8.1.5",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz",
-      "integrity": "sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^4.0.1",
-        "semver": "^7.3.4",
-        "validate-npm-package-name": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/npm-package-arg/node_modules/hosted-git-info": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
-      "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/npm-package-arg/node_modules/semver": {
-      "version": "7.3.5",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/npm-run-all": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
@@ -10865,44 +9828,12 @@
         "node": ">=8"
       }
     },
-    "node_modules/npmlog": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "are-we-there-yet": "~1.1.2",
-        "console-control-strings": "~1.1.0",
-        "gauge": "~2.7.3",
-        "set-blocking": "~2.0.0"
-      }
-    },
-    "node_modules/number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/nwsapi": {
       "version": "2.2.7",
       "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
       "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==",
       "dev": true
     },
-    "node_modules/oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -11307,12 +10238,6 @@
         "url": "https://github.com/inikulin/parse5?sponsor=1"
       }
     },
-    "node_modules/parsimmon": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/parsimmon/-/parsimmon-1.18.0.tgz",
-      "integrity": "sha512-EtVsGuQfDgwGgXzsSDe+5egRPwbcgKRd/omQ1L3Oj2pHy0gYqd+Q7zrBIQ7P/BN6DWUP9vV45HIgZHCmssdzMg==",
-      "dev": true
-    },
     "node_modules/pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
@@ -11404,12 +10329,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
-    },
     "node_modules/picocolors": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
@@ -11575,13 +10494,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true,
-      "optional": true
-    },
     "node_modules/prompts": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
@@ -11628,15 +10540,6 @@
         }
       ]
     },
-    "node_modules/qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.6"
-      }
-    },
     "node_modules/querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
@@ -11738,39 +10641,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/readable-stream/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/readable-stream/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "node_modules/readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -11915,38 +10785,6 @@
         "node": ">=0.10"
       }
     },
-    "node_modules/request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
-      "dev": true,
-      "dependencies": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -11956,12 +10794,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
-    },
     "node_modules/requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
@@ -12045,15 +10877,6 @@
         "node": ">=0.12"
       }
     },
-    "node_modules/retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -12230,12 +11053,6 @@
         "randombytes": "^2.1.0"
       }
     },
-    "node_modules/set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
-    },
     "node_modules/set-function-length": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.0.tgz",
@@ -12375,15 +11192,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/slide": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
-      "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=",
-      "dev": true,
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/smob": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/smob/-/smob-1.4.0.tgz",
@@ -12633,43 +11441,6 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
-    "node_modules/sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "dev": true,
-      "dependencies": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      },
-      "bin": {
-        "sshpk-conv": "bin/sshpk-conv",
-        "sshpk-sign": "bin/sshpk-sign",
-        "sshpk-verify": "bin/sshpk-verify"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ssri": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
-      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
-      "dev": true,
-      "dependencies": {
-        "minipass": "^3.1.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/stack-utils": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
@@ -12725,15 +11496,6 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
     "node_modules/string-length": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
@@ -12747,21 +11509,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/string-width-cjs": {
       "name": "string-width",
       "version": "4.2.3",
@@ -12792,29 +11539,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/string-width/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true,
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/string-width/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/string.prototype.matchall": {
       "version": "4.0.10",
       "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz",
@@ -12952,15 +11676,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/styled-jsx": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.1.tgz",
@@ -13045,111 +11760,40 @@
         "node": ">=6"
       }
     },
-    "node_modules/tar": {
-      "version": "6.1.13",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz",
-      "integrity": "sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==",
+    "node_modules/terser": {
+      "version": "5.19.2",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz",
+      "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==",
       "dev": true,
       "dependencies": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^4.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
       },
       "engines": {
         "node": ">=10"
       }
     },
-    "node_modules/tar-stream": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+    "node_modules/terser/node_modules/acorn": {
+      "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
       "dev": true,
-      "dependencies": {
-        "bl": "^4.0.3",
-        "end-of-stream": "^1.4.1",
-        "fs-constants": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1"
+      "bin": {
+        "acorn": "bin/acorn"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/tar-stream/node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/tar/node_modules/minipass": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.0.0.tgz",
-      "integrity": "sha512-g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tar/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "dev": true,
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/terser": {
-      "version": "5.19.2",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz",
-      "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/source-map": "^0.3.3",
-        "acorn": "^8.8.2",
-        "commander": "^2.20.0",
-        "source-map-support": "~0.5.20"
-      },
-      "bin": {
-        "terser": "bin/terser"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/terser/node_modules/acorn": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/test-exclude": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+    "node_modules/test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
       "dev": true,
       "dependencies": {
         "@istanbuljs/schema": "^0.1.2",
@@ -13172,33 +11816,6 @@
       "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
       "dev": true
     },
-    "node_modules/tmp": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
-      "dev": true,
-      "dependencies": {
-        "rimraf": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8.17.0"
-      }
-    },
-    "node_modules/tmp/node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/tmpl": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
@@ -13265,28 +11882,6 @@
         "node": ">=8.0"
       }
     },
-    "node_modules/tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dev": true,
-      "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/tough-cookie/node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/tr46": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
@@ -13371,22 +11966,16 @@
         "node": ">=4"
       }
     },
-    "node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
     "node_modules/tstyche": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/tstyche/-/tstyche-1.0.0.tgz",
-      "integrity": "sha512-iIpktIBuWL0M+KgCO8TIgo+QGS+mD24ll+wAYCFsd8IkA3Lai0ETqGSilHo1PC59+2lf71qJmWShFZwMMH4i1g==",
+      "version": "2.0.0-beta.0",
+      "resolved": "https://registry.npmjs.org/tstyche/-/tstyche-2.0.0-beta.0.tgz",
+      "integrity": "sha512-ClReNZhXXMCi4MjgO9iQZ7w//jO19bRAPxzaRwufVJl7AvHq65kwcZnUkHL94F0bZ6OOBtBO6nPgKTenDi+X8g==",
       "dev": true,
       "bin": {
         "tstyche": "build/bin.js"
       },
       "engines": {
-        "node": "^16.14 || 18.x || >=20.x"
+        "node": ">=14.17"
       },
       "funding": {
         "url": "https://github.com/tstyche/tstyche?sponsor=1"
@@ -13400,36 +11989,6 @@
         }
       }
     },
-    "node_modules/tsutils": {
-      "version": "2.29.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
-      "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.8.1"
-      },
-      "peerDependencies": {
-        "typescript": ">=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >= 3.0.0-dev || >= 3.1.0-dev"
-      }
-    },
-    "node_modules/tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
-      "dependencies": {
-        "safe-buffer": "^5.0.1"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true
-    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -13528,12 +12087,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
-    },
     "node_modules/typescript": {
       "version": "5.1.6",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz",
@@ -13629,15 +12182,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
     "node_modules/unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
@@ -13730,22 +12274,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "dev": true,
-      "bin": {
-        "uuid": "bin/uuid"
-      }
-    },
     "node_modules/v8-to-istanbul": {
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz",
@@ -13770,29 +12298,6 @@
         "spdx-expression-parse": "^3.0.0"
       }
     },
-    "node_modules/validate-npm-package-name": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
-      "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
-      "dev": true,
-      "dependencies": {
-        "builtins": "^1.0.3"
-      }
-    },
-    "node_modules/verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "dependencies": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
     "node_modules/w3c-xmlserializer": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
@@ -13935,12 +12440,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
-    },
     "node_modules/which-typed-array": {
       "version": "1.1.13",
       "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz",
@@ -13960,30 +12459,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "string-width": "^1.0.2 || 2"
-      }
-    },
-    "node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/wrap-ansi-cjs": {
       "name": "wrap-ansi",
       "version": "7.0.0",
@@ -14031,35 +12506,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/wrap-ansi/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -14115,40 +12561,12 @@
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
       "dev": true
     },
-    "node_modules/y18n": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "dev": true
-    },
     "node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true
     },
-    "node_modules/yargs": {
-      "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
-      "dev": true,
-      "dependencies": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/yargs-parser": {
       "version": "18.1.3",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
@@ -14162,87 +12580,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/yargs/node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/yargs/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/yargs/node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/yargs/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/yargs/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/yargs/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/yargs/node_modules/string-width": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
@@ -14983,39 +13320,6 @@
       "integrity": "sha512-N8uEMrMPL0cu/bdboEWpQYb/0i2K5Qn8eCsxzOmxSggJbbQte7ljMRoXm917AbntqTGOzdTu+vP3KOOzoC70HQ==",
       "dev": true
     },
-    "@definitelytyped/header-parser": {
-      "version": "0.0.141",
-      "resolved": "https://registry.npmjs.org/@definitelytyped/header-parser/-/header-parser-0.0.141.tgz",
-      "integrity": "sha512-u7f/NnXJJMML86BBGwLaQwhxfvuEogJdRTUA8g2vOZ9UhGzAyLSX3njTp7lni7C7PGYp2/vV2B+YLBwujQzJ8Q==",
-      "dev": true,
-      "requires": {
-        "@definitelytyped/typescript-versions": "^0.0.141",
-        "@types/parsimmon": "^1.10.1",
-        "parsimmon": "^1.13.0"
-      }
-    },
-    "@definitelytyped/typescript-versions": {
-      "version": "0.0.141",
-      "resolved": "https://registry.npmjs.org/@definitelytyped/typescript-versions/-/typescript-versions-0.0.141.tgz",
-      "integrity": "sha512-RHONSp0eGUccKcoiDJF25DVAUk6pNS79ie0/1T0fn/cDTrzhX14eo6Zcz7O9emqAI496pvsS7IhYctoFrZ/xzw==",
-      "dev": true
-    },
-    "@definitelytyped/utils": {
-      "version": "0.0.141",
-      "resolved": "https://registry.npmjs.org/@definitelytyped/utils/-/utils-0.0.141.tgz",
-      "integrity": "sha512-4DneI5xY0KDSF0vNWiSwmDpxVR9E32oQPWFjv0PdEgGaZT1VS8E/LxSHVjwn2+MK3uuk4XK41S/R9IFvddu9Gw==",
-      "dev": true,
-      "requires": {
-        "@definitelytyped/typescript-versions": "^0.0.141",
-        "@qiwi/npm-registry-client": "^8.9.1",
-        "@types/node": "^14.14.35",
-        "charm": "^1.0.2",
-        "fs-extra": "^8.1.0",
-        "fstream": "^1.0.12",
-        "tar": "^6.1.11",
-        "tar-stream": "^2.1.4"
-      }
-    },
     "@esbuild/android-arm": {
       "version": "0.18.20",
       "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz",
@@ -15884,37 +14188,6 @@
       "dev": true,
       "optional": true
     },
-    "@qiwi/npm-registry-client": {
-      "version": "8.9.1",
-      "resolved": "https://registry.npmjs.org/@qiwi/npm-registry-client/-/npm-registry-client-8.9.1.tgz",
-      "integrity": "sha512-rZF+mG+NfijR0SHphhTLHRr4aM4gtfdwoAMY6we2VGQam8vkN1cxGG1Lg/Llrj8Dd0Mu6VjdFQRyMMRZxtZR2A==",
-      "dev": true,
-      "requires": {
-        "concat-stream": "^2.0.0",
-        "graceful-fs": "^4.2.4",
-        "normalize-package-data": "~1.0.1 || ^2.0.0 || ^3.0.0",
-        "npm-package-arg": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^8.0.0",
-        "npmlog": "2 || ^3.1.0 || ^4.0.0",
-        "once": "^1.4.0",
-        "request": "^2.88.2",
-        "retry": "^0.12.0",
-        "safe-buffer": "^5.2.1",
-        "semver": "2 >=2.2.1 || 3.x || 4 || 5 || 7",
-        "slide": "^1.1.6",
-        "ssri": "^8.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
     "@rollup/plugin-buble": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-buble/-/plugin-buble-1.0.2.tgz",
@@ -16374,12 +14647,6 @@
       "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
       "dev": true
     },
-    "@types/parsimmon": {
-      "version": "1.10.6",
-      "resolved": "https://registry.npmjs.org/@types/parsimmon/-/parsimmon-1.10.6.tgz",
-      "integrity": "sha512-FwAQwMRbkhx0J6YELkwIpciVzCcgEqXEbIrIn3a2P5d3kGEHQ3wVhlN3YdVepYP+bZzCYO6OjmD4o9TGOZ40rA==",
-      "dev": true
-    },
     "@types/prismjs": {
       "version": "1.26.3",
       "resolved": "https://registry.npmjs.org/@types/prismjs/-/prismjs-1.26.3.tgz",
@@ -16810,24 +15077,6 @@
         "picomatch": "^2.0.4"
       }
     },
-    "aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "dev": true,
-      "optional": true
-    },
-    "are-we-there-yet": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz",
-      "integrity": "sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
-      }
-    },
     "argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
@@ -16976,21 +15225,6 @@
       "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
       "dev": true
     },
-    "asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "dev": true,
-      "requires": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true
-    },
     "assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
@@ -17030,96 +15264,19 @@
       "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
       "dev": true
     },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true
-    },
-    "aws4": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
-      "dev": true
-    },
     "axe-core": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.0.tgz",
       "integrity": "sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ==",
       "dev": true
-    },
-    "axobject-query": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz",
-      "integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==",
-      "dev": true,
-      "requires": {
-        "dequal": "^2.0.3"
-      }
-    },
-    "babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-      "dev": true,
-      "requires": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-          "dev": true
-        },
-        "js-tokens": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
+    },
+    "axobject-query": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz",
+      "integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==",
+      "dev": true,
+      "requires": {
+        "dequal": "^2.0.3"
       }
     },
     "babel-jest": {
@@ -17253,21 +15410,6 @@
         }
       }
     },
-    "base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true
-    },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dev": true,
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
     "benchmark": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/benchmark/-/benchmark-2.1.4.tgz",
@@ -17284,30 +15426,6 @@
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "dev": true
     },
-    "bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dev": true,
-      "requires": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -17336,34 +15454,12 @@
         "node-int64": "^0.4.0"
       }
     },
-    "buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "dev": true,
-      "requires": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
     "buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
       "dev": true
     },
-    "builtin-modules": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-      "dev": true
-    },
-    "builtins": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
-      "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=",
-      "dev": true
-    },
     "busboy": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz",
@@ -17442,12 +15538,6 @@
       "integrity": "sha512-mtj5ur2FFPZcCEpXFy8ADXbDACuNFXg6mxVDqp7tqooX6l3zwm+d8EPoeOSIFRDvHs8qu7/SLFOGniULkcH2iA==",
       "dev": true
     },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "dev": true
-    },
     "chalk": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
@@ -17464,15 +15554,6 @@
       "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
       "dev": true
     },
-    "charm": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/charm/-/charm-1.0.2.tgz",
-      "integrity": "sha1-it02cVOm2aWBMxBSxAkJkdqZXjU=",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1"
-      }
-    },
     "chokidar": {
       "version": "3.5.3",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
@@ -17489,12 +15570,6 @@
         "readdirp": "~3.6.0"
       }
     },
-    "chownr": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-      "dev": true
-    },
     "ci-info": {
       "version": "3.8.0",
       "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
@@ -17542,55 +15617,12 @@
       "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==",
       "dev": true
     },
-    "cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "dev": true,
-      "requires": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        }
-      }
-    },
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
       "dev": true
     },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true,
-      "optional": true
-    },
     "collect-v8-coverage": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
@@ -17637,12 +15669,6 @@
         "delayed-stream": "~1.0.0"
       }
     },
-    "command-exists": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
-      "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==",
-      "dev": true
-    },
     "commander": {
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
@@ -17667,44 +15693,12 @@
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
       "dev": true
     },
-    "concat-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
-      "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.0.2",
-        "typedarray": "^0.0.6"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
     "confusing-browser-globals": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
       "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==",
       "dev": true
     },
-    "console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "dev": true,
-      "optional": true
-    },
     "convert-source-map": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
@@ -17717,12 +15711,6 @@
       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
       "dev": true
     },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
-    },
     "cp-file": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-7.0.0.tgz",
@@ -18023,15 +16011,6 @@
       "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==",
       "dev": true
     },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "data-urls": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
@@ -18176,225 +16155,63 @@
         }
       }
     },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true
-    },
-    "delegates": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "dev": true,
-      "optional": true
-    },
-    "dequal": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
-      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
-      "dev": true
-    },
-    "detect-newline": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-      "dev": true
-    },
-    "diff-sequences": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
-      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
-      "dev": true
-    },
-    "dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "requires": {
-        "path-type": "^4.0.0"
-      }
-    },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "requires": {
-        "esutils": "^2.0.2"
-      }
-    },
-    "domexception": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
-      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
-      "dev": true,
-      "requires": {
-        "webidl-conversions": "^7.0.0"
-      }
-    },
-    "dts-critic": {
-      "version": "3.3.10",
-      "resolved": "https://registry.npmjs.org/dts-critic/-/dts-critic-3.3.10.tgz",
-      "integrity": "sha512-XvemZCSc05VIlYrd3SjIO/6OyA3SCXK2RIHEVIbAZjxD6/ptmQfwnrq7pWFxJ6raiD3Edh8PzCSy84QUuAzOTg==",
-      "dev": true,
-      "requires": {
-        "@definitelytyped/header-parser": "latest",
-        "command-exists": "^1.2.8",
-        "rimraf": "^3.0.2",
-        "semver": "^6.2.0",
-        "tmp": "^0.2.1",
-        "yargs": "^15.3.1"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "dtslint": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/dtslint/-/dtslint-4.2.1.tgz",
-      "integrity": "sha512-57mWY9osUEfS6k62ATS9RSgug1dZcuN4O31hO76u+iEexa6VUEbKoPGaA2mNtc0FQDcdTl0zEUtti79UQKSQyQ==",
-      "dev": true,
-      "requires": {
-        "@definitelytyped/header-parser": "latest",
-        "@definitelytyped/typescript-versions": "latest",
-        "@definitelytyped/utils": "latest",
-        "dts-critic": "latest",
-        "fs-extra": "^6.0.1",
-        "json-stable-stringify": "^1.0.1",
-        "strip-json-comments": "^2.0.1",
-        "tslint": "5.14.0",
-        "tsutils": "^2.29.0",
-        "yargs": "^15.1.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "dev": true,
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-          "dev": true
-        },
-        "diff": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-          "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
-          "dev": true
-        },
-        "escape-string-regexp": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-          "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-          "dev": true
-        },
-        "fs-extra": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
-          "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        },
-        "tslint": {
-          "version": "5.14.0",
-          "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.14.0.tgz",
-          "integrity": "sha512-IUla/ieHVnB8Le7LdQFRGlVJid2T/gaJe5VkjzRVSRR6pA2ODYrnfR1hmxi+5+au9l50jBwpbBL34txgv4NnTQ==",
-          "dev": true,
-          "requires": {
-            "babel-code-frame": "^6.22.0",
-            "builtin-modules": "^1.1.1",
-            "chalk": "^2.3.0",
-            "commander": "^2.12.1",
-            "diff": "^3.2.0",
-            "glob": "^7.1.1",
-            "js-yaml": "^3.7.0",
-            "minimatch": "^3.0.4",
-            "mkdirp": "^0.5.1",
-            "resolve": "^1.3.2",
-            "semver": "^5.3.0",
-            "tslib": "^1.8.0",
-            "tsutils": "^2.29.0"
-          }
-        }
-      }
-    },
-    "eastasianwidth": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
       "dev": true
     },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+    "dequal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+      "dev": true
+    },
+    "detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+      "dev": true
+    },
+    "diff-sequences": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
+      "dev": true
+    },
+    "dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
+      "requires": {
+        "path-type": "^4.0.0"
+      }
+    },
+    "doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "domexception": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
+      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
       "dev": true,
       "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
+        "webidl-conversions": "^7.0.0"
       }
     },
+    "eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true
+    },
     "electron-to-chromium": {
       "version": "1.4.503",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.503.tgz",
@@ -18413,15 +16230,6 @@
       "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
       "dev": true
     },
-    "end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "requires": {
-        "once": "^1.4.0"
-      }
-    },
     "enhanced-resolve": {
       "version": "5.15.0",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
@@ -19201,12 +17009,6 @@
         "jest-util": "^29.6.3"
       }
     },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
     "extend-shallow": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
@@ -19293,12 +17095,6 @@
         }
       }
     },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
-    },
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -19448,23 +17244,6 @@
         }
       }
     },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true
-    },
-    "form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dev": true,
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      }
-    },
     "fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
@@ -19474,32 +17253,6 @@
         "map-cache": "^0.2.2"
       }
     },
-    "fs-constants": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-      "dev": true
-    },
-    "fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      }
-    },
-    "fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "dev": true,
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -19513,18 +17266,6 @@
       "dev": true,
       "optional": true
     },
-    "fstream": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
-      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "inherits": "~2.0.0",
-        "mkdirp": ">=0.5 0",
-        "rimraf": "2"
-      }
-    },
     "function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@@ -19549,42 +17290,6 @@
       "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
       "dev": true
     },
-    "gauge": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "aproba": "^1.0.3",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.0",
-        "object-assign": "^4.1.0",
-        "signal-exit": "^3.0.0",
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wide-align": "^1.1.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true,
-          "optional": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        }
-      }
-    },
     "gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -19646,15 +17351,6 @@
       "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
       "dev": true
     },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "glob": {
       "version": "7.1.7",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
@@ -19739,45 +17435,12 @@
       "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
       "dev": true
     },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true
-    },
-    "har-validator": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
-      }
-    },
     "hard-rejection": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
       "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
       "dev": true
     },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        }
-      }
-    },
     "has-bigints": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
@@ -19840,13 +17503,6 @@
         "has-symbols": "^1.0.2"
       }
     },
-    "has-unicode": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "dev": true,
-      "optional": true
-    },
     "has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
@@ -19957,17 +17613,6 @@
         }
       }
     },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      }
-    },
     "https-proxy-agent": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
@@ -20010,12 +17655,6 @@
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       }
     },
-    "ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true
-    },
     "ignore": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
@@ -20299,16 +17938,6 @@
         "call-bind": "^1.0.2"
       }
     },
-    "is-fullwidth-code-point": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "number-is-nan": "^1.0.0"
-      }
-    },
     "is-generator-fn": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
@@ -20454,12 +18083,6 @@
         "which-typed-array": "^1.1.11"
       }
     },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
-    },
     "is-weakmap": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz",
@@ -20518,12 +18141,6 @@
       "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
       "dev": true
     },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
-    },
     "istanbul-lib-coverage": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
@@ -21315,12 +18932,6 @@
         "esprima": "^4.0.0"
       }
     },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true
-    },
     "jsdom": {
       "version": "20.0.3",
       "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz",
@@ -21416,72 +19027,24 @@
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
-    },
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
-    "json-stable-stringify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-      "dev": true,
-      "requires": {
-        "jsonify": "~0.0.0"
-      }
-    },
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
       "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
       "dev": true
     },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
-    },
     "json5": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true
     },
-    "jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "jsonify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-      "dev": true
-    },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
     "jsx-ast-utils": {
       "version": "3.3.5",
       "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
@@ -21907,25 +19470,6 @@
         }
       }
     },
-    "minipass": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz",
-      "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==",
-      "dev": true,
-      "requires": {
-        "yallist": "^4.0.0"
-      }
-    },
-    "minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dev": true,
-      "requires": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      }
-    },
     "mixin-deep": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
@@ -21947,15 +19491,6 @@
         }
       }
     },
-    "mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.5"
-      }
-    },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -22102,37 +19637,6 @@
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "dev": true
     },
-    "npm-package-arg": {
-      "version": "8.1.5",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz",
-      "integrity": "sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==",
-      "dev": true,
-      "requires": {
-        "hosted-git-info": "^4.0.1",
-        "semver": "^7.3.4",
-        "validate-npm-package-name": "^3.0.0"
-      },
-      "dependencies": {
-        "hosted-git-info": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
-          "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
-      }
-    },
     "npm-run-all": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
@@ -22266,38 +19770,12 @@
         "path-key": "^3.0.0"
       }
     },
-    "npmlog": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "are-we-there-yet": "~1.1.2",
-        "console-control-strings": "~1.1.0",
-        "gauge": "~2.7.3",
-        "set-blocking": "~2.0.0"
-      }
-    },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true,
-      "optional": true
-    },
     "nwsapi": {
       "version": "2.2.7",
       "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
       "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==",
       "dev": true
     },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true
-    },
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -22594,12 +20072,6 @@
         "entities": "^4.4.0"
       }
     },
-    "parsimmon": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/parsimmon/-/parsimmon-1.18.0.tgz",
-      "integrity": "sha512-EtVsGuQfDgwGgXzsSDe+5egRPwbcgKRd/omQ1L3Oj2pHy0gYqd+Q7zrBIQ7P/BN6DWUP9vV45HIgZHCmssdzMg==",
-      "dev": true
-    },
     "pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
@@ -22666,12 +20138,6 @@
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true
     },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
-    },
     "picocolors": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
@@ -22777,13 +20243,6 @@
       "integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==",
       "dev": true
     },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true,
-      "optional": true
-    },
     "prompts": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
@@ -22817,12 +20276,6 @@
       "integrity": "sha512-6Yg0ekpKICSjPswYOuC5sku/TSWaRYlA0qsXqJgM/d/4pLPHPuTxK7Nbf7jFKzAeedUhR8C7K9Uv63FBsSo8xQ==",
       "dev": true
     },
-    "qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-      "dev": true
-    },
     "querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
@@ -22881,53 +20334,18 @@
       "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
       "dev": true,
       "requires": {
-        "load-json-file": "^4.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^3.0.0"
-      },
-      "dependencies": {
-        "path-type": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-          "dev": true,
-          "requires": {
-            "pify": "^3.0.0"
-          }
-        }
-      }
-    },
-    "readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
+        "load-json-file": "^4.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^3.0.0"
       },
       "dependencies": {
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true,
-          "optional": true
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+        "path-type": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+          "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "safe-buffer": "~5.1.0"
+            "pify": "^3.0.0"
           }
         }
       }
@@ -23042,46 +20460,12 @@
       "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
       "dev": true
     },
-    "request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "dev": true,
-      "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      }
-    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
       "dev": true
     },
-    "require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
-    },
     "requires-port": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
@@ -23145,12 +20529,6 @@
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
       "dev": true
     },
-    "retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
-      "dev": true
-    },
     "reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -23269,12 +20647,6 @@
         "randombytes": "^2.1.0"
       }
     },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
-    },
     "set-function-length": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.0.tgz",
@@ -23386,12 +20758,6 @@
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true
     },
-    "slide": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
-      "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=",
-      "dev": true
-    },
     "smob": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/smob/-/smob-1.4.0.tgz",
@@ -23605,32 +20971,6 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
-    "sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "dev": true,
-      "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      }
-    },
-    "ssri": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
-      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
-      "dev": true,
-      "requires": {
-        "minipass": "^3.1.1"
-      }
-    },
     "stack-utils": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
@@ -23675,15 +21015,6 @@
       "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==",
       "dev": true
     },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
     "string-length": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
@@ -23694,37 +21025,6 @@
         "strip-ansi": "^6.0.0"
       }
     },
-    "string-width": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "code-point-at": "^1.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
-        "strip-ansi": "^3.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true,
-          "optional": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        }
-      }
-    },
     "string-width-cjs": {
       "version": "npm:string-width@4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -23850,12 +21150,6 @@
         "min-indent": "^1.0.0"
       }
     },
-    "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "dev": true
-    },
     "styled-jsx": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.1.tgz",
@@ -23910,63 +21204,6 @@
       "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
       "dev": true
     },
-    "tar": {
-      "version": "6.1.13",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz",
-      "integrity": "sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==",
-      "dev": true,
-      "requires": {
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "minipass": "^4.0.0",
-        "minizlib": "^2.1.1",
-        "mkdirp": "^1.0.3",
-        "yallist": "^4.0.0"
-      },
-      "dependencies": {
-        "minipass": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.0.0.tgz",
-          "integrity": "sha512-g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw==",
-          "dev": true,
-          "requires": {
-            "yallist": "^4.0.0"
-          }
-        },
-        "mkdirp": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-          "dev": true
-        }
-      }
-    },
-    "tar-stream": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-      "dev": true,
-      "requires": {
-        "bl": "^4.0.3",
-        "end-of-stream": "^1.4.1",
-        "fs-constants": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^3.1.1"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
     "terser": {
       "version": "5.19.2",
       "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz",
@@ -24010,26 +21247,6 @@
       "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
       "dev": true
     },
-    "tmp": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
-      "dev": true,
-      "requires": {
-        "rimraf": "^3.0.0"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
     "tmpl": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
@@ -24083,24 +21300,6 @@
         "is-number": "^7.0.0"
       }
     },
-    "tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dev": true,
-      "requires": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-          "dev": true
-        }
-      }
-    },
     "tr46": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
@@ -24166,43 +21365,13 @@
         }
       }
     },
-    "tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
     "tstyche": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/tstyche/-/tstyche-1.0.0.tgz",
-      "integrity": "sha512-iIpktIBuWL0M+KgCO8TIgo+QGS+mD24ll+wAYCFsd8IkA3Lai0ETqGSilHo1PC59+2lf71qJmWShFZwMMH4i1g==",
+      "version": "2.0.0-beta.0",
+      "resolved": "https://registry.npmjs.org/tstyche/-/tstyche-2.0.0-beta.0.tgz",
+      "integrity": "sha512-ClReNZhXXMCi4MjgO9iQZ7w//jO19bRAPxzaRwufVJl7AvHq65kwcZnUkHL94F0bZ6OOBtBO6nPgKTenDi+X8g==",
       "dev": true,
       "requires": {}
     },
-    "tsutils": {
-      "version": "2.29.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
-      "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.8.1"
-      }
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true
-    },
     "type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -24271,12 +21440,6 @@
         "is-typed-array": "^1.1.9"
       }
     },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
-    },
     "typescript": {
       "version": "5.1.6",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz",
@@ -24344,12 +21507,6 @@
         "crypto-random-string": "^2.0.0"
       }
     },
-    "universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "dev": true
-    },
     "unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
@@ -24429,18 +21586,6 @@
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
       "dev": true
     },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "dev": true
-    },
     "v8-to-istanbul": {
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz",
@@ -24462,26 +21607,6 @@
         "spdx-expression-parse": "^3.0.0"
       }
     },
-    "validate-npm-package-name": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
-      "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
-      "dev": true,
-      "requires": {
-        "builtins": "^1.0.3"
-      }
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
     "w3c-xmlserializer": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
@@ -24593,12 +21718,6 @@
         "is-weakset": "^2.0.1"
       }
     },
-    "which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
-    },
     "which-typed-array": {
       "version": "1.1.13",
       "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz",
@@ -24612,52 +21731,6 @@
         "has-tostringtag": "^1.0.0"
       }
     },
-    "wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "string-width": "^1.0.2 || 2"
-      }
-    },
-    "wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        }
-      }
-    },
     "wrap-ansi-cjs": {
       "version": "npm:wrap-ansi@7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -24729,99 +21802,12 @@
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
       "dev": true
     },
-    "y18n": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "dev": true
-    },
     "yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true
     },
-    "yargs": {
-      "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
-      "dev": true,
-      "requires": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.2"
-      },
-      "dependencies": {
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "string-width": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
-          "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        }
-      }
-    },
     "yargs-parser": {
       "version": "18.1.3",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
diff --git a/package.json b/package.json
index 9f14d03f1..d197db694 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
     "lint:format": "prettier --check \"{__tests__,src,type-definitions,website/src,perf,resources}/**/*{.js,.ts,.tsx,.flow,.css}\"",
     "lint:js": "eslint \"{__tests__,src,type-definitions,website/src}/**/*.{js,ts,tsx}\"",
     "type-check": "run-s type-check:*",
-    "type-check:ts": "tsc --project type-definitions/tsconfig.json && tsc --project __tests__/tsconfig.json && dtslint type-definitions/ts-tests --localTs node_modules/typescript/lib",
+    "type-check:ts": "tsc --project type-definitions/tsconfig.json && tsc --project __tests__/tsconfig.json",
     "type-check:flow": "flow check type-definitions/flow-tests --include-warnings",
     "build": "run-s build:*",
     "build:clean": "rimraf dist",
@@ -98,7 +98,6 @@
     "benchmark": "2.1.4",
     "colors": "1.4.0",
     "cpy-cli": "3.1.1",
-    "dtslint": "^4.2.1",
     "eslint": "^8.56.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-next": "^14.1.0",
@@ -128,7 +127,7 @@
     "rollup": "3.28.1",
     "size-limit": "^8.2.6",
     "transducers-js": "0.4.174",
-    "tstyche": "^1.0.0",
+    "tstyche": "^2.0.0-beta.0",
     "typescript": "5.1"
   },
   "size-limit": [
diff --git a/tstyche.config.json b/tstyche.config.json
index 8ba7a2a9d..897c74449 100644
--- a/tstyche.config.json
+++ b/tstyche.config.json
@@ -1,13 +1,6 @@
 {
   "$schema": "https://tstyche.org/schemas/config.json",
   "testFileMatch": [
-    "**/type-definitions/ts-tests/covariance.ts",
-    "**/type-definitions/ts-tests/deepCopy.ts",
-    "**/type-definitions/ts-tests/empty.ts",
-    "**/type-definitions/ts-tests/es6-collections.ts",
-    "**/type-definitions/ts-tests/exports.ts",
-    "**/type-definitions/ts-tests/from-js.ts",
-    "**/type-definitions/ts-tests/functional.ts",
-    "**/type-definitions/ts-tests/groupBy.ts"
+    "**/type-definitions/ts-tests/*.ts"
   ]
 }
diff --git a/type-definitions/immutable.d.ts b/type-definitions/immutable.d.ts
index bbef59aa2..20fa922f7 100644
--- a/type-definitions/immutable.d.ts
+++ b/type-definitions/immutable.d.ts
@@ -855,7 +855,9 @@ declare namespace Immutable {
     get<K extends keyof R>(key: K, notSetValue?: unknown): R[K];
     get<NSV>(key: any, notSetValue: NSV): NSV;
 
-    // https://github.com/microsoft/TypeScript/pull/39094
+    // TODO `<const P extends ...>` can be used after dropping support for TypeScript 4.x
+    // reference: https://www.typescriptlang.org/docs/handbook/release-notes/typescript-5-0.html#const-type-parameters
+    // after this change, `as const` assertions can be remove from the type tests
     getIn<P extends ReadonlyArray<string | number | symbol>>(
       searchKeyPath: [...P],
       notSetValue?: unknown
diff --git a/type-definitions/ts-tests/covariance.ts b/type-definitions/ts-tests/covariance.ts
index c23cbb541..6b678d038 100644
--- a/type-definitions/ts-tests/covariance.ts
+++ b/type-definitions/ts-tests/covariance.ts
@@ -35,41 +35,43 @@ class C {
 }
 
 test('List covariance', () => {
-  expect<List<A>>().type.toBeAssignable(List<B>());
+  expect<List<A>>().type.toBeAssignableWith(List<B>());
 
-  expect(List([new B()])).type.toEqual<List<B>>();
+  expect(List([new B()])).type.toBe<List<B>>();
 
   expect<List<C>>().type.not.toBeAssignable(List<B>());
 });
 
 test('Map covariance', () => {
-  expect<Map<string, A>>().type.toBeAssignable<Map<string, B>>();
+  expect<Map<string, A>>().type.toBeAssignableWith<Map<string, B>>();
 
-  expect(Map({ b: new B() })).type.toEqual<MapOf<{ b: B }>>();
+  expect(Map({ b: new B() })).type.toBe<MapOf<{ b: B }>>();
 
   expect<Map<string, C>>().type.not.toBeAssignable<Map<string, B>>();
 });
 
 test('Set covariance', () => {
-  expect<Set<A>>().type.toBeAssignable<Set<B>>();
+  expect<Set<A>>().type.toBeAssignableWith<Set<B>>();
 
-  expect(Set([new B()])).type.toEqual<Set<B>>();
+  expect(Set([new B()])).type.toBe<Set<B>>();
 
   expect<Set<C>>().type.not.toBeAssignable<Set<B>>();
 });
 
 test('Stack covariance', () => {
-  expect<Stack<A>>().type.toBeAssignable<Stack<B>>();
+  expect<Stack<A>>().type.toBeAssignableWith<Stack<B>>();
 
-  expect(Stack([new B()])).type.toEqual<Stack<B>>();
+  expect(Stack([new B()])).type.toBe<Stack<B>>();
 
   expect<Stack<C>>().type.not.toBeAssignable<Stack<B>>();
 });
 
 test('OrderedMap covariance', () => {
-  expect<OrderedMap<string, A>>().type.toBeAssignable<OrderedMap<string, B>>();
+  expect<OrderedMap<string, A>>().type.toBeAssignableWith<
+    OrderedMap<string, B>
+  >();
 
-  expect(OrderedMap({ b: new B() })).type.toEqual<OrderedMap<string, B>>();
+  expect(OrderedMap({ b: new B() })).type.toBe<OrderedMap<string, B>>();
 
   expect<OrderedMap<string, C>>().type.not.toBeAssignable<
     OrderedMap<string, B>
@@ -77,9 +79,9 @@ test('OrderedMap covariance', () => {
 });
 
 test('OrderedSet covariance', () => {
-  expect<OrderedSet<A>>().type.toBeAssignable<OrderedSet<B>>();
+  expect<OrderedSet<A>>().type.toBeAssignableWith<OrderedSet<B>>();
 
-  expect(OrderedSet([new B()])).type.toEqual<OrderedSet<B>>();
+  expect(OrderedSet([new B()])).type.toBe<OrderedSet<B>>();
 
   expect<OrderedSet<C>>().type.not.toBeAssignable<OrderedSet<B>>();
 });
diff --git a/type-definitions/ts-tests/deepCopy.ts b/type-definitions/ts-tests/deepCopy.ts
index 668f00818..25e262fd8 100644
--- a/type-definitions/ts-tests/deepCopy.ts
+++ b/type-definitions/ts-tests/deepCopy.ts
@@ -8,55 +8,55 @@ describe('DeepCopy', () => {
         a: number;
         b: number;
       }>
-    >().type.toEqual<{
+    >().type.toBe<{
       a: number;
       b: number;
     }>();
   });
 
   test('iterables', () => {
-    expect<DeepCopy<string[]>>().type.toEqual<string[]>();
+    expect<DeepCopy<string[]>>().type.toBe<string[]>();
 
-    expect<DeepCopy<Collection.Indexed<number>>>().type.toEqual<number[]>();
+    expect<DeepCopy<Collection.Indexed<number>>>().type.toBe<number[]>();
   });
 
   test('immutable first-level types', () => {
-    expect<DeepCopy<Map<string, string>>>().type.toEqual<{
+    expect<DeepCopy<Map<string, string>>>().type.toBe<{
       [x: string]: string;
     }>();
 
     // should be `{ [x: string]: object }`, but there is an issue with circular references
-    expect<DeepCopy<Map<object, object>>>().type.toEqual<{
+    expect<DeepCopy<Map<object, object>>>().type.toBe<{
       [x: string]: unknown;
     }>();
 
     // should be `{ [x: string]: object; [x: number]: object }`, but there is an issue with circular references
-    expect<DeepCopy<Map<object | number, object>>>().type.toEqual<{
+    expect<DeepCopy<Map<object | number, object>>>().type.toBe<{
       [x: string]: unknown;
       [x: number]: unknown;
     }>();
 
-    expect<DeepCopy<List<string>>>().type.toEqual<string[]>();
+    expect<DeepCopy<List<string>>>().type.toBe<string[]>();
 
-    expect<DeepCopy<Set<string>>>().type.toEqual<string[]>();
+    expect<DeepCopy<Set<string>>>().type.toBe<string[]>();
   });
 
   test('keyed', () => {
-    expect<DeepCopy<Collection.Keyed<string, number>>>().type.toEqual<{
+    expect<DeepCopy<Collection.Keyed<string, number>>>().type.toBe<{
       [x: string]: number;
     }>();
 
-    expect<DeepCopy<Collection.Keyed<string | number, number>>>().type.toEqual<{
+    expect<DeepCopy<Collection.Keyed<string | number, number>>>().type.toBe<{
       [x: string]: number;
       [x: number]: number;
     }>();
 
-    expect<DeepCopy<Seq.Keyed<string | number, number>>>().type.toEqual<{
+    expect<DeepCopy<Seq.Keyed<string | number, number>>>().type.toBe<{
       [x: string]: number;
       [x: number]: number;
     }>();
 
-    expect<DeepCopy<Map<string | number, number>>>().type.toEqual<{
+    expect<DeepCopy<Map<string | number, number>>>().type.toBe<{
       [x: string]: number;
       [x: number]: number;
     }>();
@@ -70,10 +70,10 @@ describe('DeepCopy', () => {
         list: List<string>;
         set: Set<string>;
       }>
-    >().type.toEqual<{ map: unknown; list: unknown; set: unknown }>();
+    >().type.toBe<{ map: unknown; list: unknown; set: unknown }>();
 
     // should be `{ map: { [x: string]: string } }`, but there is an issue with circular references
-    expect<DeepCopy<Map<'map', Map<string, string>>>>().type.toEqual<{
+    expect<DeepCopy<Map<'map', Map<string, string>>>>().type.toBe<{
       map: unknown;
     }>();
   });
@@ -83,7 +83,7 @@ describe('DeepCopy', () => {
     type Tag = Record<{ name: string; article: Article }>;
 
     // should handle circular references here somehow
-    expect<DeepCopy<Article>>().type.toEqual<{ title: string; tag: unknown }>();
+    expect<DeepCopy<Article>>().type.toBe<{ title: string; tag: unknown }>();
   });
 
   test('circular references #1957', () => {
@@ -99,14 +99,14 @@ describe('DeepCopy', () => {
       foo: null,
     }) {}
 
-    expect<DeepCopy<Foo1>>().type.toEqual<{ foo: unknown }>();
-    expect<DeepCopy<Foo2>>().type.toEqual<{ foo?: unknown }>();
-    expect<DeepCopy<Foo3>>().type.toEqual<{ foo: unknown }>();
+    expect<DeepCopy<Foo1>>().type.toBe<{ foo: unknown }>();
+    expect<DeepCopy<Foo2>>().type.toBe<{ foo?: unknown }>();
+    expect<DeepCopy<Foo3>>().type.toBe<{ foo: unknown }>();
 
     class FooWithList extends Record<{ foo: undefined | List<FooWithList> }>({
       foo: undefined,
     }) {}
 
-    expect<DeepCopy<FooWithList>>().type.toEqual<{ foo: unknown }>();
+    expect<DeepCopy<FooWithList>>().type.toBe<{ foo: unknown }>();
   });
 });
diff --git a/type-definitions/ts-tests/empty.ts b/type-definitions/ts-tests/empty.ts
index f2065e147..e9425c6eb 100644
--- a/type-definitions/ts-tests/empty.ts
+++ b/type-definitions/ts-tests/empty.ts
@@ -2,43 +2,39 @@ import { expect, test } from 'tstyche';
 import { Seq, Collection } from 'immutable';
 
 test('typed empty Seq', () => {
-  expect(Seq()).type.toEqual<Seq<unknown, unknown>>();
+  expect(Seq()).type.toBe<Seq<unknown, unknown>>();
 
-  expect(Seq<number, string>()).type.toEqual<Seq<number, string>>();
+  expect(Seq<number, string>()).type.toBe<Seq<number, string>>();
 
-  expect(Seq.Indexed()).type.toEqual<Seq.Indexed<unknown>>();
+  expect(Seq.Indexed()).type.toBe<Seq.Indexed<unknown>>();
 
-  expect(Seq.Indexed<string>()).type.toEqual<Seq.Indexed<string>>();
+  expect(Seq.Indexed<string>()).type.toBe<Seq.Indexed<string>>();
 
-  expect(Seq.Keyed()).type.toEqual<Seq.Keyed<unknown, unknown>>();
+  expect(Seq.Keyed()).type.toBe<Seq.Keyed<unknown, unknown>>();
 
-  expect(Seq.Keyed<number, string>()).type.toEqual<Seq.Keyed<number, string>>();
+  expect(Seq.Keyed<number, string>()).type.toBe<Seq.Keyed<number, string>>();
 
-  expect(Seq.Set()).type.toEqual<Seq.Set<unknown>>();
+  expect(Seq.Set()).type.toBe<Seq.Set<unknown>>();
 
-  expect(Seq.Set<string>()).type.toEqual<Seq.Set<string>>();
+  expect(Seq.Set<string>()).type.toBe<Seq.Set<string>>();
 });
 
 test('typed empty Collection', () => {
-  expect(Collection()).type.toEqual<Collection<unknown, unknown>>();
+  expect(Collection()).type.toBe<Collection<unknown, unknown>>();
 
-  expect(Collection<number, string>()).type.toEqual<
-    Collection<number, string>
-  >();
+  expect(Collection<number, string>()).type.toBe<Collection<number, string>>();
 
-  expect(Collection.Indexed()).type.toEqual<Collection.Indexed<unknown>>();
+  expect(Collection.Indexed()).type.toBe<Collection.Indexed<unknown>>();
 
-  expect(Collection.Indexed<string>()).type.toEqual<
-    Collection.Indexed<string>
-  >();
+  expect(Collection.Indexed<string>()).type.toBe<Collection.Indexed<string>>();
 
-  expect(Collection.Keyed()).type.toEqual<Collection.Keyed<unknown, unknown>>();
+  expect(Collection.Keyed()).type.toBe<Collection.Keyed<unknown, unknown>>();
 
-  expect(Collection.Keyed<number, string>()).type.toEqual<
+  expect(Collection.Keyed<number, string>()).type.toBe<
     Collection.Keyed<number, string>
   >();
 
-  expect(Collection.Set()).type.toEqual<Collection.Set<unknown>>();
+  expect(Collection.Set()).type.toBe<Collection.Set<unknown>>();
 
-  expect(Collection.Set<string>()).type.toEqual<Collection.Set<string>>();
+  expect(Collection.Set<string>()).type.toBe<Collection.Set<string>>();
 });
diff --git a/type-definitions/ts-tests/es6-collections.ts b/type-definitions/ts-tests/es6-collections.ts
index 9fd6eb46b..790bc3cf2 100644
--- a/type-definitions/ts-tests/es6-collections.ts
+++ b/type-definitions/ts-tests/es6-collections.ts
@@ -8,16 +8,14 @@ test('immutable.js collections', () => {
   >();
   const setImmutable: ImmutableSet<string> = ImmutableSet<string>();
 
-  expect(mapImmutable.delete('foo')).type.toEqual<
-    ImmutableMap<string, number>
-  >();
-  expect(setImmutable.delete('bar')).type.toEqual<ImmutableSet<string>>();
+  expect(mapImmutable.delete('foo')).type.toBe<ImmutableMap<string, number>>();
+  expect(setImmutable.delete('bar')).type.toBe<ImmutableSet<string>>();
 });
 
 test('ES6 collections', () => {
   const mapES6: Map<string, number> = new Map<string, number>();
   const setES6: Set<string> = new Set<string>();
 
-  expect(mapES6.delete('foo')).type.toEqual<boolean>();
-  expect(setES6.delete('bar')).type.toEqual<boolean>();
+  expect(mapES6.delete('foo')).type.toBe<boolean>();
+  expect(setES6.delete('bar')).type.toBe<boolean>();
 });
diff --git a/type-definitions/ts-tests/exports.ts b/type-definitions/ts-tests/exports.ts
index 8c0f08b08..39f9d2fe4 100644
--- a/type-definitions/ts-tests/exports.ts
+++ b/type-definitions/ts-tests/exports.ts
@@ -16,15 +16,15 @@ import {
 } from 'immutable';
 
 test('named imports', () => {
-  expect(List).type.toEqual<typeof List>();
+  expect(List).type.toBe<typeof List>();
 
-  expect(Map).type.toEqual<typeof Map>();
+  expect(Map).type.toBe<typeof Map>();
 
-  expect(OrderedMap).type.toEqual<typeof OrderedMap>();
+  expect(OrderedMap).type.toBe<typeof OrderedMap>();
 
-  expect(OrderedSet).type.toEqual<typeof OrderedSet>();
+  expect(OrderedSet).type.toBe<typeof OrderedSet>();
 
-  expect(Range).type.toEqual<
+  expect(Range).type.toBe<
     (
       start: number,
       end: number,
@@ -32,30 +32,30 @@ test('named imports', () => {
     ) => Seq.Indexed<number>
   >();
 
-  expect(Repeat).type.toEqual<
+  expect(Repeat).type.toBe<
     <T>(value: T, times?: number | undefined) => Seq.Indexed<T>
   >();
 
-  expect(Seq).type.toEqual<typeof Seq>();
+  expect(Seq).type.toBe<typeof Seq>();
 
-  expect(Set).type.toEqual<typeof Set>();
+  expect(Set).type.toBe<typeof Set>();
 
-  expect(Stack).type.toEqual<typeof Stack>();
+  expect(Stack).type.toBe<typeof Stack>();
 
-  expect(Collection).type.toEqual<typeof Collection>();
+  expect(Collection).type.toBe<typeof Collection>();
 
-  expect(Collection.Set).type.toEqual<
+  expect(Collection.Set).type.toBe<
     <T>(
       collection?: Iterable<T> | ArrayLike<T> | undefined
     ) => Collection.Set<T>
   >();
 
-  expect(Collection.Keyed).type.toEqual<{
+  expect(Collection.Keyed).type.toBe<{
     <K, V>(collection?: Iterable<[K, V]> | undefined): Collection.Keyed<K, V>;
     <V>(obj: { [key: string]: V }): Collection.Keyed<string, V>;
   }>();
 
-  expect(Collection.Indexed).type.toEqual<
+  expect(Collection.Indexed).type.toBe<
     <T>(
       collection?: Iterable<T> | ArrayLike<T> | undefined
     ) => Collection.Indexed<T>
@@ -63,15 +63,15 @@ test('named imports', () => {
 });
 
 test('namespace import', () => {
-  expect(Immutable.List).type.toEqual<typeof Immutable.List>();
+  expect(Immutable.List).type.toBe<typeof Immutable.List>();
 
-  expect(Immutable.Map).type.toEqual<typeof Immutable.Map>();
+  expect(Immutable.Map).type.toBe<typeof Immutable.Map>();
 
-  expect(Immutable.OrderedMap).type.toEqual<typeof Immutable.OrderedMap>();
+  expect(Immutable.OrderedMap).type.toBe<typeof Immutable.OrderedMap>();
 
-  expect(Immutable.OrderedSet).type.toEqual<typeof Immutable.OrderedSet>();
+  expect(Immutable.OrderedSet).type.toBe<typeof Immutable.OrderedSet>();
 
-  expect(Immutable.Range).type.toEqual<
+  expect(Immutable.Range).type.toBe<
     (
       start: number,
       end: number,
@@ -79,32 +79,32 @@ test('namespace import', () => {
     ) => Immutable.Seq.Indexed<number>
   >();
 
-  expect(Immutable.Repeat).type.toEqual<
+  expect(Immutable.Repeat).type.toBe<
     <T>(value: T, times?: number | undefined) => Immutable.Seq.Indexed<T>
   >();
 
-  expect(Immutable.Seq).type.toEqual<typeof Immutable.Seq>();
+  expect(Immutable.Seq).type.toBe<typeof Immutable.Seq>();
 
-  expect(Immutable.Set).type.toEqual<typeof Immutable.Set>();
+  expect(Immutable.Set).type.toBe<typeof Immutable.Set>();
 
-  expect(Immutable.Stack).type.toEqual<typeof Immutable.Stack>();
+  expect(Immutable.Stack).type.toBe<typeof Immutable.Stack>();
 
-  expect(Immutable.Collection).type.toEqual<typeof Immutable.Collection>();
+  expect(Immutable.Collection).type.toBe<typeof Immutable.Collection>();
 
-  expect(Immutable.Collection.Set).type.toEqual<
+  expect(Immutable.Collection.Set).type.toBe<
     <T>(
       collection?: Iterable<T> | ArrayLike<T> | undefined
     ) => Immutable.Collection.Set<T>
   >();
 
-  expect(Immutable.Collection.Keyed).type.toEqual<{
+  expect(Immutable.Collection.Keyed).type.toBe<{
     <K, V>(
       collection?: Iterable<[K, V]> | undefined
     ): Immutable.Collection.Keyed<K, V>;
     <V>(obj: { [key: string]: V }): Immutable.Collection.Keyed<string, V>;
   }>();
 
-  expect(Immutable.Collection.Indexed).type.toEqual<
+  expect(Immutable.Collection.Indexed).type.toBe<
     <T>(
       collection?: Iterable<T> | ArrayLike<T> | undefined
     ) => Immutable.Collection.Indexed<T>
diff --git a/type-definitions/ts-tests/from-js.ts b/type-definitions/ts-tests/from-js.ts
index 14fb84194..b4903ebbc 100644
--- a/type-definitions/ts-tests/from-js.ts
+++ b/type-definitions/ts-tests/from-js.ts
@@ -2,31 +2,31 @@ import { expect, test } from 'tstyche';
 import { fromJS, Collection, List, Map, MapOf } from 'immutable';
 
 test('fromJS', () => {
-  expect(fromJS({}, (a: any, b: any) => b)).type.toEqual<
+  expect(fromJS({}, (a: any, b: any) => b)).type.toBe<
     Collection<unknown, unknown>
   >();
 
   expect(fromJS('abc')).type.toBeString();
 
-  expect(fromJS([0, 1, 2])).type.toEqual<List<number>>();
+  expect(fromJS([0, 1, 2])).type.toBe<List<number>>();
 
-  expect(fromJS(List([0, 1, 2]))).type.toEqual<List<number>>();
+  expect(fromJS(List([0, 1, 2]))).type.toBe<List<number>>();
 
-  expect(fromJS({ a: 0, b: 1, c: 2 })).type.toEqual<
+  expect(fromJS({ a: 0, b: 1, c: 2 })).type.toBe<
     Map<'b' | 'a' | 'c', number>
   >();
 
-  expect(fromJS(Map({ a: 0, b: 1, c: 2 }))).type.toEqual<
+  expect(fromJS(Map({ a: 0, b: 1, c: 2 }))).type.toBe<
     MapOf<{ a: number; b: number; c: number }>
   >();
 
-  expect(fromJS([{ a: 0 }])).type.toEqual<List<Map<'a', number>>>();
+  expect(fromJS([{ a: 0 }])).type.toBe<List<Map<'a', number>>>();
 
-  expect(fromJS({ a: [0] })).type.toEqual<Map<'a', List<number>>>();
+  expect(fromJS({ a: [0] })).type.toBe<Map<'a', List<number>>>();
 
-  expect(fromJS([[[0]]])).type.toEqual<List<List<List<number>>>>();
+  expect(fromJS([[[0]]])).type.toBe<List<List<List<number>>>>();
 
-  expect(fromJS({ a: { b: { c: 0 } } })).type.toEqual<
+  expect(fromJS({ a: { b: { c: 0 } } })).type.toBe<
     Map<'a', Map<'b', Map<'c', number>>>
   >();
 });
@@ -38,5 +38,5 @@ test('fromJS in an array of function', () => {
 
   const createConst = ([(data: any) => data, fromJS] as const)[1];
 
-  expect(createConst({ a: 'A' })).type.toEqual<Map<'a', string>>();
+  expect(createConst({ a: 'A' })).type.toBe<Map<'a', string>>();
 });
diff --git a/type-definitions/ts-tests/functional.ts b/type-definitions/ts-tests/functional.ts
index a2efc6a70..2705fb67a 100644
--- a/type-definitions/ts-tests/functional.ts
+++ b/type-definitions/ts-tests/functional.ts
@@ -2,15 +2,13 @@ import { expect, test } from 'tstyche';
 import { get, has, set, remove, update } from 'immutable';
 
 test('get', () => {
-  expect(get([1, 2, 3], 0)).type.toEqual<number | undefined>();
+  expect(get([1, 2, 3], 0)).type.toBe<number | undefined>();
 
-  expect(get([1, 2, 3], 0, 'a')).type.toEqual<number | 'a'>();
+  expect(get([1, 2, 3], 0, 'a')).type.toBe<number | 'a'>();
 
-  expect(get({ x: 10, y: 20 }, 'x')).type.toEqual<number | undefined>();
+  expect(get({ x: 10, y: 20 }, 'x')).type.toBe<number | undefined>();
 
-  expect(get({ x: 10, y: 20 }, 'z', 'missing')).type.toEqual<
-    number | 'missing'
-  >();
+  expect(get({ x: 10, y: 20 }, 'z', 'missing')).type.toBe<number | 'missing'>();
 });
 
 test('has', () => {
@@ -20,13 +18,13 @@ test('has', () => {
 });
 
 test('set', () => {
-  expect(set([1, 2, 3], 0, 10)).type.toEqual<number[]>();
+  expect(set([1, 2, 3], 0, 10)).type.toBe<number[]>();
 
   expect(set([1, 2, 3], 0, 'a')).type.toRaiseError();
 
   expect(set([1, 2, 3], 'a', 0)).type.toRaiseError();
 
-  expect(set({ x: 10, y: 20 }, 'x', 100)).type.toEqual<{
+  expect(set({ x: 10, y: 20 }, 'x', 100)).type.toBe<{
     x: number;
     y: number;
   }>();
@@ -35,16 +33,16 @@ test('set', () => {
 });
 
 test('remove', () => {
-  expect(remove([1, 2, 3], 0)).type.toEqual<number[]>();
+  expect(remove([1, 2, 3], 0)).type.toBe<number[]>();
 
-  expect(remove({ x: 10, y: 20 }, 'x')).type.toEqual<{
+  expect(remove({ x: 10, y: 20 }, 'x')).type.toBe<{
     x: number;
     y: number;
   }>();
 });
 
 test('update', () => {
-  expect(update([1, 2, 3], 0, (v: number) => v + 1)).type.toEqual<number[]>();
+  expect(update([1, 2, 3], 0, (v: number) => v + 1)).type.toBe<number[]>();
 
   expect(update([1, 2, 3], 0, 1)).type.toRaiseError();
 
@@ -52,7 +50,7 @@ test('update', () => {
 
   expect(update([1, 2, 3], 'a', (v: number) => v + 1)).type.toRaiseError();
 
-  expect(update({ x: 10, y: 20 }, 'x', (v: number) => v + 1)).type.toEqual<{
+  expect(update({ x: 10, y: 20 }, 'x', (v: number) => v + 1)).type.toBe<{
     x: number;
     y: number;
   }>();
diff --git a/type-definitions/ts-tests/groupBy.ts b/type-definitions/ts-tests/groupBy.ts
index 9f1147f88..e020ba7da 100644
--- a/type-definitions/ts-tests/groupBy.ts
+++ b/type-definitions/ts-tests/groupBy.ts
@@ -12,48 +12,48 @@ import {
 } from 'immutable';
 
 test('groupBy', () => {
-  expect(Collection(['a', 'b', 'c', 'a']).groupBy(v => v)).type.toEqual<
+  expect(Collection(['a', 'b', 'c', 'a']).groupBy(v => v)).type.toBe<
     Map<string, Collection.Indexed<string>>
   >();
 
   expect(
     Collection({ a: 1, b: 2, c: 3, d: 1 }).groupBy(v => `key-${v}`)
-  ).type.toEqual<Map<string, Collection.Keyed<string, number>>>();
+  ).type.toBe<Map<string, Collection.Keyed<string, number>>>();
 
-  expect(List(['a', 'b', 'c', 'a']).groupBy(v => v)).type.toEqual<
+  expect(List(['a', 'b', 'c', 'a']).groupBy(v => v)).type.toBe<
     Map<string, List<string>>
   >();
 
-  expect(Seq(['a', 'b', 'c', 'a']).groupBy(v => v)).type.toEqual<
+  expect(Seq(['a', 'b', 'c', 'a']).groupBy(v => v)).type.toBe<
     Map<string, Seq.Indexed<string>>
   >();
 
-  expect(Seq({ a: 1, b: 2, c: 3, d: 1 }).groupBy(v => `key-${v}`)).type.toEqual<
+  expect(Seq({ a: 1, b: 2, c: 3, d: 1 }).groupBy(v => `key-${v}`)).type.toBe<
     Map<string, Seq.Keyed<string, number>>
   >();
 
-  expect(Set(['a', 'b', 'c', 'a']).groupBy(v => v)).type.toEqual<
+  expect(Set(['a', 'b', 'c', 'a']).groupBy(v => v)).type.toBe<
     Map<string, Set<string>>
   >();
 
-  expect(Stack(['a', 'b', 'c', 'a']).groupBy(v => v)).type.toEqual<
+  expect(Stack(['a', 'b', 'c', 'a']).groupBy(v => v)).type.toBe<
     Map<string, Stack<string>>
   >();
 
-  expect(OrderedSet(['a', 'b', 'c', 'a']).groupBy(v => v)).type.toEqual<
+  expect(OrderedSet(['a', 'b', 'c', 'a']).groupBy(v => v)).type.toBe<
     Map<string, OrderedSet<string>>
   >();
 
   expect(
     Map<string, number>({ a: 1, b: 2, c: 3, d: 1 }).groupBy(v => `key-${v}`)
-  ).type.toEqual<Map<string, Map<string, number>>>();
+  ).type.toBe<Map<string, Map<string, number>>>();
 
   // type should be something like Map<string, MapOf<Partial{ a: number, b: number, c: number, d: number }>>> but groupBy returns a wrong type with `this`
-  expect(Map({ a: 1, b: 2, c: 3, d: 1 }).groupBy(v => `key-${v}`)).type.toEqual<
+  expect(Map({ a: 1, b: 2, c: 3, d: 1 }).groupBy(v => `key-${v}`)).type.toBe<
     Map<string, MapOf<{ a: number; b: number; c: number; d: number }>>
   >();
 
   expect(
     OrderedMap({ a: 1, b: 2, c: 3, d: 1 }).groupBy(v => `key-${v}`)
-  ).type.toEqual<Map<string, OrderedMap<string, number>>>();
+  ).type.toBe<Map<string, OrderedMap<string, number>>>();
 });
diff --git a/type-definitions/ts-tests/index.d.ts b/type-definitions/ts-tests/index.d.ts
deleted file mode 100644
index bd74d4c62..000000000
--- a/type-definitions/ts-tests/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-// Minimum TypeScript Version: 4.5
diff --git a/type-definitions/ts-tests/list.ts b/type-definitions/ts-tests/list.ts
index 1697d6204..e91ba9332 100644
--- a/type-definitions/ts-tests/list.ts
+++ b/type-definitions/ts-tests/list.ts
@@ -1,7 +1,7 @@
+import { expect, test } from 'tstyche';
 import {
   List,
   get,
-  has,
   set,
   remove,
   update,
@@ -11,457 +11,379 @@ import {
   merge,
 } from 'immutable';
 
-{
-  // #constructor
+test('#constructor', () => {
+  expect(List()).type.toBe<List<unknown>>();
 
-  // $ExpectType List<unknown>
-  List();
+  expect<List<number>>().type.toBeAssignableWith(List<number>());
 
-  const numberList: List<number> = List<number>();
-  const numberOrStringList: List<number | string> = List([1, 'a']);
+  expect<List<number | string>>().type.toBeAssignableWith(List([1, 'a']));
+  expect<List<number>>().type.not.toBeAssignable(List([1, 'a']));
+});
 
-  // $ExpectError
-  const invalidNumberList: List<number> = List([1, 'a']);
-}
+test('#size', () => {
+  expect(List().size).type.toBeNumber();
 
-{
-  // #size
+  expect(List()).type.toMatch<{ readonly size: number }>();
+});
 
-  // $ExpectType number
-  List().size;
+test('#setSize', () => {
+  expect(List<number>().setSize(10)).type.toBe<List<number>>();
 
-  // $ExpectError
-  List().size = 10;
-}
+  expect(List<number>().setSize('foo')).type.toRaiseError();
+});
 
-{
-  // #setSize
+test('.of', () => {
+  expect(List.of(1, 2, 3)).type.toBe<List<number>>();
 
-  // $ExpectType List<number>
-  List<number>().setSize(10);
+  expect(List.of<number>('a', 1)).type.toRaiseError();
 
-  // $ExpectError
-  List<number>().setSize('foo');
-}
+  expect(List.of<number | string>('a', 1)).type.toBe<List<string | number>>();
+});
 
-{
-  // .of
+test('#get', () => {
+  expect(List<number>().get(4)).type.toBe<number | undefined>();
 
-  // $ExpectType List<number>
-  List.of(1, 2, 3);
+  expect(List<number>().get(4, 'a')).type.toBe<number | 'a'>();
 
-  // $ExpectError
-  List.of<number>('a', 1);
+  expect(List<number>().get<number>(4, 'a')).type.toRaiseError();
 
-  // $ExpectType List<string | number>
-  List.of<number | string>('a', 1);
-}
+  expect(get(List<number>(), 4)).type.toBe<number | undefined>();
 
-{
-  // #get
+  expect(get(List<number>(), 4, 'a')).type.toBe<number | 'a'>();
+});
 
-  // $ExpectType number | undefined
-  List<number>().get(4);
+test('#set', () => {
+  expect(List<number>().set(0, 0)).type.toBe<List<number>>();
 
-  // $ExpectType number | "a"
-  List<number>().get(4, 'a');
+  expect(List<number>().set(1, 'a')).type.toRaiseError();
 
-  // $ExpectError
-  List<number>().get<number>(4, 'a');
+  expect(List<number>().set('a', 1)).type.toRaiseError();
 
-  // $ExpectType number | undefined
-  get(List<number>(), 4);
+  expect(List<number | string>().set(0, 1)).type.toBe<List<string | number>>();
 
-  // $ExpectType number | "a"
-  get(List<number>(), 4, 'a');
-}
+  expect(List<number | string>().set(0, 'a')).type.toBe<
+    List<string | number>
+  >();
 
-{
-  // #set
+  expect(set(List<number>(), 0, 0)).type.toBe<List<number>>();
 
-  // $ExpectType List<number>
-  List<number>().set(0, 0);
+  expect(set(List<number>(), 1, 'a')).type.toRaiseError();
 
-  // $ExpectError
-  List<number>().set(1, 'a');
+  expect(set(List<number>(), 'a', 1)).type.toRaiseError();
+});
 
-  // $ExpectError
-  List<number>().set('a', 1);
+test('#setIn', () => {
+  expect(List<number>().setIn([], 0)).type.toBe<List<number>>();
 
-  // $ExpectType List<string | number>
-  List<number | string>().set(0, 1);
+  expect(setIn(List<number>(), [], 0)).type.toBe<List<number>>();
+});
 
-  // $ExpectType List<string | number>
-  List<number | string>().set(0, 'a');
+test('#insert', () => {
+  expect(List<number>().insert(0, 0)).type.toBe<List<number>>();
 
-  // $ExpectType List<number>
-  set(List<number>(), 0, 0);
+  expect(List<number>().insert(1, 'a')).type.toRaiseError();
 
-  // $ExpectError
-  set(List<number>(), 1, 'a');
+  expect(List<number>().insert('a', 1)).type.toRaiseError();
 
-  // $ExpectError
-  set(List<number>(), 'a', 1);
-}
+  expect(List<number | string>().insert(0, 1)).type.toBe<
+    List<string | number>
+  >();
 
-{
-  // #setIn
+  expect(List<number | string>().insert(0, 'a')).type.toBe<
+    List<string | number>
+  >();
+});
 
-  // $ExpectType List<number>
-  List<number>().setIn([], 0);
+test('#push', () => {
+  expect(List<number>().push(0, 0)).type.toBe<List<number>>();
 
-  // $ExpectType List<number>
-  setIn(List<number>(), [], 0);
-}
+  expect(List<number>().push(1, 'a')).type.toRaiseError();
 
-{
-  // #insert
+  expect(List<number>().push('a', 1)).type.toRaiseError();
 
-  // $ExpectType List<number>
-  List<number>().insert(0, 0);
+  expect(List<number | string>().push(0, 1)).type.toBe<List<string | number>>();
 
-  // $ExpectError
-  List<number>().insert(1, 'a');
+  expect(List<number | string>().push(0, 'a')).type.toBe<
+    List<string | number>
+  >();
+});
 
-  // $ExpectError
-  List<number>().insert('a', 1);
+test('#unshift', () => {
+  expect(List<number>().unshift(0, 0)).type.toBe<List<number>>();
 
-  // $ExpectType List<string | number>
-  List<number | string>().insert(0, 1);
+  expect(List<number>().unshift(1, 'a')).type.toRaiseError();
 
-  // $ExpectType List<string | number>
-  List<number | string>().insert(0, 'a');
-}
+  expect(List<number>().unshift('a', 1)).type.toRaiseError();
 
-{
-  // #push
+  expect(List<number | string>().unshift(0, 1)).type.toBe<
+    List<string | number>
+  >();
 
-  // $ExpectType List<number>
-  List<number>().push(0, 0);
+  expect(List<number | string>().unshift(0, 'a')).type.toBe<
+    List<string | number>
+  >();
+});
 
-  // $ExpectError
-  List<number>().push(1, 'a');
+test('#delete', () => {
+  expect(List<number>().delete(0)).type.toBe<List<number>>();
 
-  // $ExpectError
-  List<number>().push('a', 1);
+  expect(List().delete('a')).type.toRaiseError();
+});
 
-  // $ExpectType List<string | number>
-  List<number | string>().push(0, 1);
+test('#deleteIn', () => {
+  expect(List<number>().deleteIn([])).type.toBe<List<number>>();
+});
 
-  // $ExpectType List<string | number>
-  List<number | string>().push(0, 'a');
-}
+test('#remove', () => {
+  expect(List<number>().remove(0)).type.toBe<List<number>>();
 
-{
-  // #unshift
+  expect(List().remove('a')).type.toRaiseError();
 
-  // $ExpectType List<number>
-  List<number>().unshift(0, 0);
+  expect(remove(List<number>(), 0)).type.toBe<List<number>>();
+});
 
-  // $ExpectError
-  List<number>().unshift(1, 'a');
+test('#removeIn', () => {
+  expect(List<number>().removeIn([])).type.toBe<List<number>>();
 
-  // $ExpectError
-  List<number>().unshift('a', 1);
+  expect(removeIn(List<number>(), [])).type.toBe<List<number>>();
+});
 
-  // $ExpectType List<string | number>
-  List<number | string>().unshift(0, 1);
+test('#clear', () => {
+  expect(List<number>().clear()).type.toBe<List<number>>();
 
-  // $ExpectType List<string | number>
-  List<number | string>().unshift(0, 'a');
-}
+  expect(List().clear(10)).type.toRaiseError();
+});
 
-{
-  // #delete
+test('#pop', () => {
+  expect(List<number>().pop()).type.toBe<List<number>>();
 
-  // $ExpectType List<number>
-  List<number>().delete(0);
+  expect(List().pop(10)).type.toRaiseError();
+});
 
-  // $ExpectError
-  List().delete('a');
-}
+test('#shift', () => {
+  expect(List<number>().shift()).type.toBe<List<number>>();
 
-{
-  // #deleteIn
+  expect(List().shift(10)).type.toRaiseError();
+});
 
-  // $ExpectType List<number>
-  List<number>().deleteIn([]);
-}
+test('#update', () => {
+  expect(List().update(v => 1)).type.toBeNumber();
 
-{
-  // #remove
+  expect(
+    List<number>().update((v: List<string> | undefined) => v)
+  ).type.toRaiseError();
 
-  // $ExpectType List<number>
-  List<number>().remove(0);
+  expect(List<number>().update(0, (v: number | undefined) => 0)).type.toBe<
+    List<number>
+  >();
 
-  // $ExpectError
-  List().remove('a');
+  expect(
+    List<number>().update(0, (v: number | undefined) => v + 'a')
+  ).type.toRaiseError();
 
-  // $ExpectType List<number>
-  remove(List<number>(), 0);
-}
+  expect(List<number>().update(1, 10, (v: number | undefined) => 0)).type.toBe<
+    List<number>
+  >();
 
-{
-  // #removeIn
+  expect(
+    List<number>().update(1, 'a', (v: number | undefined) => 0)
+  ).type.toRaiseError();
 
-  // $ExpectType List<number>
-  List<number>().removeIn([]);
+  expect(
+    List<number>().update(1, 10, (v: number | undefined) => v + 'a')
+  ).type.toRaiseError();
 
-  // $ExpectType List<number>
-  removeIn(List<number>(), []);
-}
+  expect(List<string>().update(1, v => v?.toUpperCase())).type.toBe<
+    List<string>
+  >();
 
-{
-  // #clear
+  expect(update(List<number>(), 0, (v: number | undefined) => 0)).type.toBe<
+    List<number>
+  >();
 
-  // $ExpectType List<number>
-  List<number>().clear();
-
-  // $ExpectError
-  List().clear(10);
-}
-
-{
-  // #pop
-
-  // $ExpectType List<number>
-  List<number>().pop();
-
-  // $ExpectError
-  List().pop(10);
-}
-
-{
-  // #shift
-
-  // $ExpectType List<number>
-  List<number>().shift();
-
-  // $ExpectError
-  List().shift(10);
-}
-
-{
-  // #update
-
-  // $ExpectType number
-  List().update((v) => 1);
-
-  // $ExpectError
-  List<number>().update((v: List<string> | undefined) => v);
-
-  // $ExpectType List<number>
-  List<number>().update(0, (v: number | undefined) => 0);
-
-  // $ExpectError
-  List<number>().update(0, (v: number | undefined) => v + 'a');
-
-  // $ExpectType List<number>
-  List<number>().update(1, 10, (v: number | undefined) => 0);
-
-  // $ExpectError
-  List<number>().update(1, 'a', (v: number | undefined) => 0);
-
-  // $ExpectError
-  List<number>().update(1, 10, (v: number | undefined) => v + 'a');
-
-  // $ExpectType List<string>
-  List<string>().update(1, (v) => v?.toUpperCase());
-
-  // $ExpectType List<number>
-  update(List<number>(), 0, (v: number | undefined) => 0);
-
-  // $ExpectError
-  update(List<number>(), 1, 10, (v: number) => v + 'a');
-}
-
-{
-  // #updateIn
-
-  // $ExpectType List<number>
-  List<number>().updateIn([], (v) => v);
-
-  // $ExpectError
-  List<number>().updateIn([], 10);
-
-  // $ExpectType List<number>
-  updateIn(List<number>(), [], (v) => v);
-}
-
-{
-  // #map
-
-  // $ExpectType List<number>
-  List<number>().map((value: number, key: number, iter: List<number>) => 1);
-
-  // $ExpectType List<string>
-  List<number>().map((value: number, key: number, iter: List<number>) => 'a');
-
-  // $ExpectType List<number>
-  List<number>().map<number>(
-    (value: number, key: number, iter: List<number>) => 1
-  );
-
-  List<number>().map<string>(
-    // $ExpectError
-    (value: number, key: number, iter: List<number>) => 1
-  );
-
-  List<number>().map<number>(
-    // $ExpectError
-    (value: string, key: number, iter: List<number>) => 1
-  );
-
-  List<number>().map<number>(
-    // $ExpectError
-    (value: number, key: string, iter: List<number>) => 1
-  );
-
-  List<number>().map<number>(
-    // $ExpectError
-    (value: number, key: number, iter: List<string>) => 1
-  );
-
-  List<number>().map<number>(
-    // $ExpectError
-    (value: number, key: number, iter: List<number>) => 'a'
-  );
-}
-
-{
-  // #flatMap
-
-  // $ExpectType List<number>
-  List<number>().flatMap((value: number, key: number, iter: List<number>) => [
-    1,
-  ]);
-
-  // $ExpectType List<string>
-  List<number>().flatMap((value: number, key: number, iter: List<number>) => [
-    'a',
-  ]);
-
-  // $ExpectType List<string>
-  List<List<string>>().flatMap((list) => list);
-
-  // $ExpectType List<number>
-  List<number>().flatMap<number>(
-    (value: number, key: number, iter: List<number>) => [1]
-  );
-
-  List<number>().flatMap<string>(
-    // $ExpectError
-    (value: number, key: number, iter: List<number>) => [1]
-  );
-
-  List<number>().flatMap<number>(
-    // $ExpectError
-    (value: string, key: number, iter: List<number>) => [1]
-  );
-
-  List<number>().flatMap<number>(
-    // $ExpectError
-    (value: number, key: string, iter: List<number>) => [1]
-  );
-
-  List<number>().flatMap<number>(
-    // $ExpectError
-    (value: number, key: number, iter: List<string>) => [1]
-  );
-
-  List<number>().flatMap<number>(
-    // $ExpectError
-    (value: number, key: number, iter: List<number>) => ['a']
-  );
-}
-
-{
-  // #merge
-
-  // $ExpectType List<number>
-  List<number>().merge(List<number>());
-
-  // $ExpectType List<string | number>
-  List<number>().merge(List<string>());
-
-  // $ExpectType List<string | number>
-  List<number | string>().merge(List<string>());
-
-  // $ExpectType List<string | number>
-  List<number | string>().merge(List<number>());
-
-  // $ExpectType List<number>
-  merge(List<number>(), List<number>());
-}
-
-{
-  // #mergeIn
-
-  // $ExpectType List<number>
-  List<number>().mergeIn([], []);
-}
-
-{
-  // #mergeDeepIn
-
-  // $ExpectType List<number>
-  List<number>().mergeDeepIn([], []);
-}
-
-{
-  // #flatten
-
-  // $ExpectType Collection<unknown, unknown>
-  List<number>().flatten();
-
-  // $ExpectType Collection<unknown, unknown>
-  List<number>().flatten(10);
-
-  // $ExpectType Collection<unknown, unknown>
-  List<number>().flatten(false);
-
-  // $ExpectError
-  List<number>().flatten('a');
-}
-
-{
-  // #withMutations
-
-  // $ExpectType List<number>
-  List<number>().withMutations((mutable) => mutable);
-
-  // $ExpectError
-  List<number>().withMutations((mutable: List<string>) => mutable);
-}
-
-{
-  // #asMutable
-
-  // $ExpectType List<number>
-  List<number>().asMutable();
-}
-
-{
-  // #asImmutable
-
-  // $ExpectType List<number>
-  List<number>().asImmutable();
-}
-
-{
-  // #toJS / #toJSON
-
-  // $ExpectType number[][]
-  List<List<number>>().toJS();
-
-  // $ExpectType List<number>[]
-  List<List<number>>().toJSON();
-}
-
-{
-  // # for of loops
+  expect(
+    update(List<number>(), 1, 10, (v: number) => v + 'a')
+  ).type.toRaiseError();
+});
+
+test('#updateIn', () => {
+  expect(List<number>().updateIn([], v => v)).type.toBe<List<number>>();
+
+  expect(List<number>().updateIn([], 10)).type.toRaiseError();
+
+  expect(updateIn(List<number>(), [], v => v)).type.toBe<List<number>>();
+});
+
+test('#map', () => {
+  expect(
+    List<number>().map((value: number, key: number, iter: List<number>) => 1)
+  ).type.toBe<List<number>>();
+
+  expect(
+    List<number>().map((value: number, key: number, iter: List<number>) => 'a')
+  ).type.toBe<List<string>>();
+
+  expect(
+    List<number>().map<number>(
+      (value: number, key: number, iter: List<number>) => 1
+    )
+  ).type.toBe<List<number>>();
+
+  expect(
+    List<number>().map<string>(
+      (value: number, key: number, iter: List<number>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    List<number>().map<number>(
+      (value: string, key: number, iter: List<number>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    List<number>().map<number>(
+      (value: number, key: string, iter: List<number>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    List<number>().map<number>(
+      (value: number, key: number, iter: List<string>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    List<number>().map<number>(
+      (value: number, key: number, iter: List<number>) => 'a'
+    )
+  ).type.toRaiseError();
+});
+
+test('#flatMap', () => {
+  expect(
+    List<number>().flatMap((value: number, key: number, iter: List<number>) => [
+      1,
+    ])
+  ).type.toBe<List<number>>();
+
+  expect(
+    List<number>().flatMap((value: number, key: number, iter: List<number>) => [
+      'a',
+    ])
+  ).type.toBe<List<string>>();
+
+  expect(List<List<string>>().flatMap(list => list)).type.toBe<List<string>>();
+
+  expect(
+    List<number>().flatMap<number>(
+      (value: number, key: number, iter: List<number>) => [1]
+    )
+  ).type.toBe<List<number>>();
+
+  expect(
+    List<number>().flatMap<string>(
+      (value: number, key: number, iter: List<number>) => [1]
+    )
+  ).type.toRaiseError();
+
+  expect(
+    List<number>().flatMap<number>(
+      (value: string, key: number, iter: List<number>) => [1]
+    )
+  ).type.toRaiseError();
+
+  expect(
+    List<number>().flatMap<number>(
+      (value: number, key: string, iter: List<number>) => [1]
+    )
+  ).type.toRaiseError();
+
+  expect(
+    List<number>().flatMap<number>(
+      (value: number, key: number, iter: List<string>) => [1]
+    )
+  ).type.toRaiseError();
+
+  expect(
+    List<number>().flatMap<number>(
+      (value: number, key: number, iter: List<number>) => ['a']
+    )
+  ).type.toRaiseError();
+});
+
+test('#merge', () => {
+  expect(List<number>().merge(List<number>())).type.toBe<List<number>>();
+
+  expect(List<number>().merge(List<string>())).type.toBe<
+    List<string | number>
+  >();
+
+  expect(List<number | string>().merge(List<string>())).type.toBe<
+    List<string | number>
+  >();
+
+  expect(List<number | string>().merge(List<number>())).type.toBe<
+    List<string | number>
+  >();
+
+  expect(merge(List<number>(), List<number>())).type.toBe<List<number>>();
+});
+
+test('#mergeIn', () => {
+  expect(List<number>().mergeIn([], [])).type.toBe<List<number>>();
+});
+
+test('#mergeDeepIn', () => {
+  expect(List<number>().mergeDeepIn([], [])).type.toBe<List<number>>();
+});
+
+test('#flatten', () => {
+  expect(List<number>().flatten()).type.toBe<
+    Immutable.Collection<unknown, unknown>
+  >();
+
+  expect(List<number>().flatten(10)).type.toBe<
+    Immutable.Collection<unknown, unknown>
+  >();
+
+  expect(List<number>().flatten(false)).type.toBe<
+    Immutable.Collection<unknown, unknown>
+  >();
+
+  expect(List<number>().flatten('a')).type.toRaiseError();
+});
+
+test('#withMutations', () => {
+  expect(List<number>().withMutations(mutable => mutable)).type.toBe<
+    List<number>
+  >();
+
+  expect(
+    List<number>().withMutations((mutable: List<string>) => mutable)
+  ).type.toRaiseError();
+});
+
+test('#asMutable', () => {
+  expect(List<number>().asMutable()).type.toBe<List<number>>();
+});
+
+test('#asImmutable', () => {
+  expect(List<number>().asImmutable()).type.toBe<List<number>>();
+});
+
+test('#toJS', () => {
+  expect(List<List<number>>().toJS()).type.toBe<number[][]>();
+});
+
+test('#toJSON', () => {
+  expect(List<List<number>>().toJSON()).type.toBe<List<number>[]>();
+});
+
+test('for of loops', () => {
   const list = List([1, 2, 3, 4]);
+
   for (const val of list) {
-    const v: number = val;
+    expect(val).type.toBeNumber();
   }
-}
+});
diff --git a/type-definitions/ts-tests/map.ts b/type-definitions/ts-tests/map.ts
index 39386f67b..249452bad 100644
--- a/type-definitions/ts-tests/map.ts
+++ b/type-definitions/ts-tests/map.ts
@@ -1,631 +1,641 @@
+import { expect, test } from 'tstyche';
 import { Map, List, MapOf } from 'immutable';
 
-{
-  // #constructor
+test('#constructor', () => {
+  expect(Map()).type.toBe<Map<unknown, unknown>>();
 
-  // $ExpectType Map<unknown, unknown>
-  Map();
+  expect(Map<number, number>()).type.toBe<Map<number, number>>();
 
-  // $ExpectType Map<number, number>
-  Map<number, number>();
+  expect(Map([[1, 'a']])).type.toBe<Map<number, string>>();
 
-  // $ExpectType Map<number, string>
-  Map([[1, 'a']]);
+  expect(Map([['a', 'a']])).type.toBe<Map<string, string>>();
 
-  // $ExpectType Map<string, string>
-  Map([['a', 'a']]);
+  expect(Map(List<[number, string]>([[1, 'a']]))).type.toBe<
+    Map<number, string>
+  >();
 
-  // $ExpectType Map<number, string>
-  Map(List<[number, string]>([[1, 'a']]));
+  expect(Map({ a: 1 })).type.toBe<MapOf<{ a: number }>>();
 
-  // $ExpectType MapOf<{ a: number; }>
-  Map({ a: 1 });
+  expect(Map({ a: 1, b: 'b' })).type.toBe<MapOf<{ a: number; b: string }>>();
 
-  // $ExpectType MapOf<{ a: number; b: string; }>
-  Map({ a: 1, b: 'b' });
+  expect(Map({ a: Map({ b: Map({ c: 3 }) }) })).type.toBe<
+    MapOf<{ a: MapOf<{ b: MapOf<{ c: number }> }> }>
+  >();
 
-  // $ExpectType MapOf<{ a: MapOf<{ b: MapOf<{ c: number; }>; }>; }>
-  Map({ a: Map({ b: Map({ c: 3 }) }) });
+  expect(Map<{ a: string }>({ a: 1 })).type.toRaiseError();
 
-  // $ExpectError
-  Map<{ a: string }>({ a: 1 });
+  expect(Map<{ a: string }>({ a: 'a', b: 'b' })).type.toRaiseError();
 
-  // $ExpectError
-  Map<{ a: string }>({ a: 'a', b: 'b' });
+  // TODO this type is really weird, it should be `Map<string, string>` or MapOf<{ a: string }> See https://github.com/immutable-js/immutable-js/pull/1991#discussion_r1510863932
+  expect(Map(List([List(['a', 'b'])]))).type.toBe<MapOf<List<List<string>>>>();
 
-  // No longer works in typescript@>=3.9
-  // // $ExpectError - TypeScript does not support Lists as tuples
-  // Map(List([List(['a', 'b'])]));
+  expect(Map([[1, 'a']])).type.not.toBeAssignableTo<Map<number, number>>();
 
-  // $ExpectType Map<number, number>
-  const numberMap: Map<number, number> = Map();
+  expect(Map<'status', string>({ status: 'paid' })).type.toBe<
+    Map<'status', string>
+  >();
 
-  // $ExpectType Map<"status", string>
-  Map<'status', string>({ status: 'paid' });
+  expect(Map<'status' | 'amount', string>({ status: 'paid' })).type.toBe<
+    Map<'status' | 'amount', string>
+  >();
 
-  // $ExpectType Map<"status" | "amount", string>
-  Map<'status' | 'amount', string>({ status: 'paid' });
+  expect(
+    Map<'status', string>({ status: 'paid', amount: 10 })
+  ).type.toRaiseError();
+});
 
-  // $ExpectError
-  Map<'status', string>({ status: 'paid', amount: 10 });
-}
+test('#size', () => {
+  expect(Map().size).type.toBeNumber();
 
-{
-  // #size
+  expect(Map()).type.toMatch<{ readonly size: number }>();
+});
 
-  // $ExpectType number
-  Map().size;
+test('#get', () => {
+  expect(Map<number, number>().get(4)).type.toBe<number | undefined>();
 
-  // $ExpectError
-  Map().size = 10;
-}
+  expect(Map<number, number>().get(4, 'a')).type.toBe<number | 'a'>();
 
-{
-  // #get
+  expect(Map<number, number>().get<number>(4, 'a')).type.toRaiseError();
 
-  // $ExpectType number | undefined
-  Map<number, number>().get(4);
+  expect(Map({ a: 4, b: true }).get('a')).type.toBeNumber();
 
-  // $ExpectType number | "a"
-  Map<number, number>().get(4, 'a');
+  expect(Map({ a: 4, b: true }).get('b')).type.toBeBoolean();
 
-  // $ExpectError
-  Map<number, number>().get<number>(4, 'a');
+  expect(
+    Map({ a: Map({ b: true }) })
+      .get('a')
+      .get('b')
+  ).type.toBeBoolean();
 
-  // $ExpectType number
-  Map({ a: 4, b: true }).get('a');
+  expect(Map({ a: 4 }).get('b')).type.toRaiseError();
 
-  // $ExpectType boolean
-  Map({ a: 4, b: true }).get('b');
+  expect(Map({ a: 4 }).get('b', undefined)).type.toBeUndefined();
 
-  // $ExpectType boolean
-  Map({ a: Map({ b: true }) })
-    .get('a')
-    .get('b');
+  expect(Map({ 1: 4 }).get(1)).type.toBeNumber();
 
-    // $ExpectError
-    Map({ a: 4 }).get('b');
+  expect(Map({ 1: 4 }).get(2)).type.toRaiseError();
 
-    // $ExpectType undefined
-    Map({ a: 4 }).get('b', undefined);
+  expect(Map({ 1: 4 }).get(2, 3)).type.toBe<3>();
 
-    // $ExpectType number
-    Map({ 1: 4 }).get(1);
+  const s1 = Symbol('s1');
 
-    // $ExpectError
-    Map({ 1: 4 }).get(2);
+  expect(Map({ [s1]: 4 }).get(s1)).type.toBeNumber();
 
-    // $ExpectType 3
-    Map({ 1: 4 }).get(2, 3);
+  const s2 = Symbol('s2');
 
-    const s = Symbol('s');
+  expect(Map({ [s2]: 4 }).get(s1)).type.toRaiseError();
+});
 
-    // $ExpectType number
-    Map({ [s]: 4 }).get(s);
+test('#getIn', () => {
+  const result = Map({ a: 4, b: true }).getIn(['a' as const]);
 
-    const s2 = Symbol('s2');
+  expect(result).type.toBeNumber();
 
-    // $ExpectError
-    Map({ [s2]: 4 }).get(s);
-}
+  expect(Map({ a: 4, b: true }).getIn(['a' as const])).type.toBeNumber();
 
-{
-  // Minimum TypeScript Version: 4.1
-  // #getIn
+  expect(
+    Map({ a: Map({ b: Map({ c: Map({ d: 4 }) }) }) }).getIn([
+      'a' as const,
+      'b' as const,
+      'c' as const,
+      'd' as const,
+    ])
+  ).type.toBeNumber();
 
-  // $ExpectType number
-  Map({ a: 4, b: true }).getIn(['a']);
+  // currently `RetrievePathReducer` does not work with anything else than `MapOf`
+  // TODO : fix this with a better type, it should be resolved to `number` (and not be marked as `fail`)
+  expect.fail(Map({ a: List([1]) }).getIn(['a' as const, 0])).type.toBeNumber();
+});
 
-  // $ExpectType number
-  Map({ a: Map({ b: Map({ c: Map({ d: 4 }) }) }) }).getIn(['a', 'b', 'c', 'd']);
+test('#set', () => {
+  expect(Map<number, number>().set(0, 0)).type.toBe<Map<number, number>>();
 
-  // with a better type, it should be resolved to `number` in the future. `RetrievePathReducer` does not work with anything else than MapOf
-  // $ExpectType never
-  Map({ a: List([ 1 ]) }).getIn(['a', 0]);
-}
+  expect(Map<number, number>().set(1, 'a')).type.toRaiseError();
 
-{
-  // #set
+  expect(Map<number, number>().set('a', 1)).type.toRaiseError();
 
-  // $ExpectType Map<number, number>
-  Map<number, number>().set(0, 0);
+  expect(Map<number, number | string>().set(0, 1)).type.toBe<
+    Map<number, string | number>
+  >();
 
-  // $ExpectError
-  Map<number, number>().set(1, 'a');
+  expect(Map<number, number | string>().set(0, 'a')).type.toBe<
+    Map<number, string | number>
+  >();
 
-  // $ExpectError
-  Map<number, number>().set('a', 1);
+  expect(Map({ a: 1 }).set('b', 'b')).type.toRaiseError();
 
-  // $ExpectType Map<number, string | number>
-  Map<number, number | string>().set(0, 1);
+  expect(Map<{ a: number; b?: string }>({ a: 1 }).set('b', 'b')).type.toBe<
+    MapOf<{ a: number; b?: string | undefined }>
+  >();
 
-  // $ExpectType Map<number, string | number>
-  Map<number, number | string>().set(0, 'a');
+  expect(
+    Map<{ a: number; b?: string }>({ a: 1 }).set('b', undefined)
+  ).type.toBe<MapOf<{ a: number; b?: string | undefined }>>();
 
-  // $ExpectError
-  Map({ a: 1 }).set('b', 'b');
+  expect(
+    Map<{ a: number; b?: string }>({ a: 1 }).set('b', 'b').get('a')
+  ).type.toBeNumber();
 
-  // $ExpectType MapOf<{ a: number; b?: string | undefined; }>
-  Map<{ a: number; b?: string; }>({ a: 1 }).set('b', 'b');
-
-  // $ExpectType MapOf<{ a: number; b?: string | undefined; }>
-  Map<{ a: number; b?: string; }>({ a: 1 }).set('b', undefined);
-
-  // $ExpectType number
-  Map<{ a: number; b?: string }>({ a: 1 }).set('b', 'b').get('a');
-
-  // $ExpectType string | undefined
-  Map<{ a: number; b?: string }>({ a: 1 }).set('b', 'b').get('b');
+  expect(
+    Map<{ a: number; b?: string }>({ a: 1 }).set('b', 'b').get('b')
+  ).type.toBe<string | undefined>();
 
   let customer = Map<{ phone: string | number }>({
     phone: 'bar',
   });
 
-  // $ExpectType MapOf<{ phone: string | number; }>
-  customer = customer.set('phone', 8);
-}
-
-{
-  // #setIn
-
-  // $ExpectType Map<number, number>
-  Map<number, number>().setIn([], 0);
-}
-
-{
-  // #delete
-
-  // $ExpectType Map<number, number>
-  Map<number, number>().delete(0);
-
-  // $ExpectError
-  Map<number, number>().delete('a');
-
-  // $ExpectType never
-  Map({ a: 1, b: 'b' }).delete('b');
-
-  // $ExpectType MapOf<{ a: number; b?: string | undefined; }>
-  Map<{ a: number; b?: string; }>({ a: 1, b: 'b' }).delete('b');
-
-  // $ExpectType MapOf<{ a?: number | undefined; b?: string | undefined; }>
-  Map<{ a?: number; b?: string; }>({ a: 1, b: 'b' }).remove('b').delete('a');
-
-  // $ExpectType number
-  Map<{ a: number; b?: string; }>({ a: 1, b: 'b' }).remove('b').get('a');
-
-  // $ExpectType: string | undefined
-  Map<{ a: number; b?: string; }>({ a: 1, b: 'b' }).remove('b').get('b');
-}
-
-{
-  // #deleteAll
-
-  // $ExpectType Map<number, number>
-  Map<number, number>().deleteAll([0]);
-
-  // $ExpectError
-  Map<number, number>().deleteAll([0, 'a']);
-}
-
-{
-  // #deleteIn
-
-  // $ExpectType Map<number, number>
-  Map<number, number>().deleteIn([]);
-}
-
-{
-  // #remove
-
-  // $ExpectType Map<number, number>
-  Map<number, number>().remove(0);
-
-  // $ExpectError
-  Map<number, number>().remove('a');
-}
-
-{
-  // #removeAll
-
-  // $ExpectType Map<number, number>
-  Map<number, number>().removeAll([0]);
-
-  // $ExpectError
-  Map<number, number>().removeAll([0, 'a']);
-}
-
-{
-  // #removeIn
-
-  // $ExpectType Map<number, number>
-  Map<number, number>().removeIn([]);
-}
-
-{
-  // #clear
-
-  // $ExpectType Map<number, number>
-  Map<number, number>().clear();
-
-  // $ExpectError
-  Map().clear(10);
-}
-
-{
-  // #update
-
-  // $ExpectType number
-  Map().update((v) => 1);
-
-  // $ExpectError
-  Map<number, number>().update((v: Map<string> | undefined) => v);
-
-  // $ExpectType Map<number, number>
-  Map<number, number>().update(0, (v: number | undefined) => 0);
-
-  // $ExpectError
-  Map<number, number>().update(0, (v: number | undefined) => v + 'a');
-
-  // $ExpectType Map<number, number>
-  Map<number, number>().update(1, 10, (v: number | undefined) => 0);
-
-  // $ExpectError
-  Map<number, number>().update(1, 'a', (v: number | undefined) => 0);
-
-  // $ExpectError
-  Map<number, number>().update(1, 10, (v: number | undefined) => v + 'a');
-
-  // $ExpectError
-  Map({ a: 1, b: 'b' }).update('c', (v) => v);
-
-  // $ExpectType MapOf<{ a: number; b: string; }>
-  Map({ a: 1, b: 'b' }).update('b', (v) => v.toUpperCase());
-
-  // $ExpectType MapOf<{ a: number; b: string; }>
-  Map({ a: 1, b: 'b' }).update('b', 'NSV', (v) => v.toUpperCase());
-
-  // $ExpectError
-  Map({ a: 1, b: 'b' }).update((v) => ({ a: 'a' }));
-
-  // $ExpectType MapOf<{ a: number; b: string; }>
-  Map({ a: 1, b: 'b' }).update((v) => v.set('a', 2).set('b', 'B'));
-
-  // $ExpectError
-  Map({ a: 1, b: 'b' }).update((v) => v.set('c', 'c'));
-
-  // $ExpectType Map<string, string>
-  Map<string, string>().update("noKey", ls => ls?.toUpperCase());
-}
-
-{
-  // #updateIn
-
-  // $ExpectType Map<number, number>
-  Map<number, number>().updateIn([], (v) => v);
-
-  // $ExpectError
-  Map<number, number>().updateIn([], 10);
-}
-
-{
-  // #map
-
-  // $ExpectType Map<number, number>
-  Map<number, number>().map(
-    (value: number, key: number, iter: Map<number, number>) => 1
-  );
-
-  // $ExpectType Map<number, string>
-  Map<number, number>().map(
-    (value: number, key: number, iter: Map<number, number>) => 'a'
-  );
-
-  // $ExpectType Map<number, number>
-  Map<number, number>().map<number>(
-    (value: number, key: number, iter: Map<number, number>) => 1
-  );
-
-  Map<number, number>().map<string>(
-    // $ExpectError
-    (value: number, key: number, iter: Map<number, number>) => 1
-  );
-
-  Map<number, number>().map<number>(
-    // $ExpectError
-    (value: string, key: number, iter: Map<number, number>) => 1
-  );
-
-  Map<number, number>().map<number>(
-    // $ExpectError
-    (value: number, key: string, iter: Map<number, number>) => 1
-  );
-
-  Map<number, number>().map<number>(
-    // $ExpectError
-    (value: number, key: number, iter: Map<number, string>) => 1
-  );
-
-  Map<number, number>().map<number>(
-    // $ExpectError
-    (value: number, key: number, iter: Map<number, number>) => 'a'
-  );
-}
-
-{
-  // #mapKeys
-
-  // $ExpectType Map<number, number>
-  Map<number, number>().mapKeys(
-    (value: number, key: number, iter: Map<number, number>) => 1
-  );
-
-  // $ExpectType Map<string, number>
-  Map<number, number>().mapKeys(
-    (value: number, key: number, iter: Map<number, number>) => 'a'
-  );
-
-  // $ExpectType Map<number, number>
-  Map<number, number>().mapKeys<number>(
-    (value: number, key: number, iter: Map<number, number>) => 1
-  );
-
-  Map<number, number>().mapKeys<string>(
-    // $ExpectError
-    (value: number, key: number, iter: Map<number, number>) => 1
-  );
-
-  Map<number, number>().mapKeys<number>(
-    // $ExpectError
-    (value: string, key: number, iter: Map<number, number>) => 1
-  );
-
-  Map<number, number>().mapKeys<number>(
-    // $ExpectError
-    (value: number, key: string, iter: Map<number, number>) => 1
-  );
-
-  Map<number, number>().mapKeys<number>(
-    // $ExpectError
-    (value: number, key: number, iter: Map<number, string>) => 1
-  );
-
-  Map<number, number>().mapKeys<number>(
-    // $ExpectError
-    (value: number, key: number, iter: Map<number, number>) => 'a'
-  );
-}
-
-{
-  // #flatMap
-
-  // $ExpectType Map<number, number>
-  Map<number, number>().flatMap(
-    (value: number, key: number, iter: Map<number, number>) => [[0, 1]]
-  );
-
-  // $ExpectType Map<string, string>
-  Map<number, number>().flatMap(
-    (value: number, key: number, iter: Map<number, number>) => [['a', 'b']]
-  );
-
-  // $ExpectType Map<number, number>
-  Map<number, number>().flatMap<number, number>(
-    (value: number, key: number, iter: Map<number, number>) => [[0, 1]]
-  );
-
-  Map<number, number>().flatMap<number, string>(
-    // $ExpectError
-    (value: number, key: number, iter: Map<number, number>) => [[0, 1]]
-  );
-
-  Map<number, number>().flatMap<number, number>(
-    // $ExpectError
-    (value: string, key: number, iter: Map<number, number>) => [[0, 1]]
-  );
-
-  Map<number, number>().flatMap<number, number>(
-    // $ExpectError
-    (value: number, key: string, iter: Map<number, number>) => [[0, 1]]
-  );
-
-  Map<number, number>().flatMap<number, number>(
-    // $ExpectError
-    (value: number, key: number, iter: Map<number, string>) => [[0, 1]]
-  );
-
-  Map<number, number>().flatMap<number, number>(
-    // $ExpectError
-    (value: number, key: number, iter: Map<number, number>) => [[0, 'a']]
-  );
-}
-
-{
-  // #merge
-
-  // $ExpectType Map<string, number>
-  Map<string, number>().merge({ a: 1 });
-
-  // $ExpectType Map<string, number | { b: number; }>
-  Map<string, number>().merge({ a: { b: 1 } });
-
-  // $ExpectType Map<number, number>
-  Map<number, number>().merge(Map<number, number>());
-
-  // $ExpectType Map<number, string | number>
-  Map<number, number>().merge(Map<number, string>());
-
-  // $ExpectType Map<number, string | number>
-  Map<number, number | string>().merge(Map<number, string>());
-
-  // $ExpectType Map<number, string | number>
-  Map<number, number | string>().merge(Map<number, number>());
-
-  // $ExpectType Map<"b" | "a", number>
-  Map({ a: 1 }).merge(Map({ b: 2 }));
-}
-
-{
-  // #mergeIn
-
-  // $ExpectType Map<number, number>
-  Map<number, number>().mergeIn([], []);
-}
-
-{
-  // #mergeWith
-
-  // $ExpectType Map<number, number>
-  Map<number, number>().mergeWith(
-    (prev: number, next: number, key: number) => 1,
-    Map<number, number>()
-  );
-
-  Map<number, number>().mergeWith(
-    // $ExpectError
-    (prev: string, next: number, key: number) => 1,
-    Map<number, number>()
-  );
-
-  // $ExpectError
-  Map<number, number>().mergeWith(
-    (prev: number, next: string, key: number) => 1,
-    Map<number, number>()
-  );
-
-  // $ExpectError
-  Map<number, number>().mergeWith(
-    (prev: number, next: number, key: string) => 1,
-    Map<number, number>()
-  );
-
-  // $ExpectType Map<number, string | number>
-  Map<number, number>().mergeWith(
-    (prev: number, next: number, key: number) => 'a',
-    Map<number, number>()
-  );
-
-  // $ExpectError
-  Map<number, number>().mergeWith(
-    (prev: number, next: number, key: number) => 1,
-    Map<number, string>()
-  );
-
-  // $ExpectType Map<string, number>
-  Map<string, number>().mergeWith(
-    (prev: number, next: number, key: string) => 1,
-    { a: 1 }
-  );
-
-  Map<string, number>().mergeWith(
-    (prev: number, next: number, key: string) => 1,
-    // $ExpectError
-    { a: 'a' }
-  );
-
-  // $ExpectType Map<string, string | number>
-  Map<string, number>().mergeWith(
-    (prev: number, next: number | string, key: string) => 1,
-    { a: 'a' }
-  );
-
-  // $ExpectType Map<number, string | number>
-  Map<number, number | string>().mergeWith((prev: number | string, next: number | string, key: number) => 1, Map<number, string>());
-}
-
-{
-  // #mergeDeep
-
-  // $ExpectType Map<string, number>
-  Map<string, number>().mergeDeep({ a: 1 });
-
-  // $ExpectType Map<string, number | { b: number; }>
-  Map<string, number>().mergeDeep({ a: { b: 1 } });
-
-  // $ExpectType Map<string, number | { b: number; }>
-  Map<string, number>().mergeDeep(Map({ a: { b: 1 } }));
-
-  // $ExpectType Map<number, number>
-  Map<number, number>().mergeDeep(Map<number, number>());
+  expect(customer).type.toBeAssignableWith(customer.set('phone', 8));
+});
 
-  // $ExpectType Map<number, string | number>
-  Map<number, number>().mergeDeep(Map<number, string>());
+test('#setIn', () => {
+  expect(Map<number, number>().setIn([], 0)).type.toBe<Map<number, number>>();
+});
 
-  // $ExpectType Map<number, string | number>
-  Map<number, number | string>().mergeDeep(Map<number, string>());
+test('#delete', () => {
+  expect(Map<number, number>().delete(0)).type.toBe<Map<number, number>>();
 
-  // $ExpectType Map<number, string | number>
-  Map<number, number | string>().mergeDeep(Map<number, number>());
-}
+  expect(Map<number, number>().delete('a')).type.toRaiseError();
 
-{
-  // #mergeDeepIn
+  expect(Map({ a: 1, b: 'b' }).delete('b')).type.toBeNever();
 
-  // $ExpectType Map<number, number>
-  Map<number, number>().mergeDeepIn([], []);
-}
+  expect(
+    Map<{ a: number; b?: string }>({ a: 1, b: 'b' }).delete('b')
+  ).type.toBe<MapOf<{ a: number; b?: string | undefined }>>();
 
-{
-  // #mergeDeepWith
+  expect(
+    Map<{ a?: number; b?: string }>({ a: 1, b: 'b' }).remove('b').delete('a')
+  ).type.toBe<MapOf<{ a?: number | undefined; b?: string | undefined }>>();
 
-  // $ExpectType Map<number, number>
-  Map<number, number>().mergeDeepWith((prev: unknown, next: unknown, key: unknown) => 1, Map<number, number>());
+  expect(
+    Map<{ a: number; b?: string }>({ a: 1, b: 'b' }).remove('b').get('a')
+  ).type.toBeNumber();
 
-  // $ExpectError
-  Map<number, number>().mergeDeepWith((prev: unknown, next: unknown, key: unknown) => 1, Map<number, string>());
+  expect(
+    Map<{ a: number; b?: string }>({ a: 1, b: 'b' }).remove('b').get('b')
+  ).type.toBe<string | undefined>();
+});
 
-  // $ExpectType Map<string, number>
-  Map<string, number>().mergeDeepWith((prev: unknown, next: unknown, key: unknown) => 1, { a: 1 });
+test('#deleteAll', () => {
+  expect(Map<number, number>().deleteAll([0])).type.toBe<Map<number, number>>();
 
-  // $ExpectError
-  Map<string, number>().mergeDeepWith((prev: unknown, next: unknown, key: unknown) => 1, { a: 'a' });
+  expect(Map<number, number>().deleteAll([0, 'a'])).type.toRaiseError();
+});
 
-  // $ExpectType Map<number, string | number>
-  Map<number, number | string>().mergeDeepWith((prev: unknown, next: unknown, key: unknown) => 1, Map<number, string>());
-}
+test('#deleteIn', () => {
+  expect(Map<number, number>().deleteIn([])).type.toBe<Map<number, number>>();
+});
 
-{
-  // #flip
+test('#remove', () => {
+  expect(Map<number, number>().remove(0)).type.toBe<Map<number, number>>();
 
-  // $ExpectType Map<string, number>
-  Map<number, string>().flip();
-}
+  expect(Map<number, number>().remove('a')).type.toRaiseError();
+});
 
-{
-  // #withMutations
+test('#removeAll', () => {
+  expect(Map<number, number>().removeAll([0])).type.toBe<Map<number, number>>();
 
-  // $ExpectType Map<number, number>
-  Map<number, number>().withMutations((mutable) => mutable);
+  expect(Map<number, number>().removeAll([0, 'a'])).type.toRaiseError();
+});
 
-  // $ExpectError
-  Map<number, number>().withMutations((mutable: Map<string>) => mutable);
-}
+test('#removeIn', () => {
+  expect(Map<number, number>().removeIn([])).type.toBe<Map<number, number>>();
+});
 
-{
-  // #asMutable
+test('#clear', () => {
+  expect(Map<number, number>().clear()).type.toBe<Map<number, number>>();
 
-  // $ExpectType Map<number, number>
-  Map<number, number>().asMutable();
-}
+  expect(Map().clear(10)).type.toRaiseError();
+});
 
-{
-  // #asImmutable
+test('#update', () => {
+  expect(Map().update(v => 1)).type.toBeNumber();
 
-  // $ExpectType Map<number, number>
-  Map<number, number>().asImmutable();
-}
+  expect(
+    Map<number, number>().update((v: Map<string> | undefined) => v)
+  ).type.toRaiseError();
 
-{
-  // #toJS / #toJSON
+  expect(
+    Map<number, number>().update(0, (v: number | undefined) => 0)
+  ).type.toBe<Map<number, number>>();
 
-  // $ExpectType { [x: string]: number; [x: number]: number; [x: symbol]: number; }
-  Map<number, number>().toJS();
+  expect(
+    Map<number, number>().update(0, (v: number | undefined) => v + 'a')
+  ).type.toRaiseError();
 
-  // $ExpectType { a: string; }
-  Map({ a: 'A' }).toJS();
+  expect(
+    Map<number, number>().update(1, 10, (v: number | undefined) => 0)
+  ).type.toBe<Map<number, number>>();
 
-  // $ExpectType { a: { b: string; }; }
-  Map({ a: Map({ b: 'b' }) }).toJS();
+  expect(
+    Map<number, number>().update(1, 'a', (v: number | undefined) => 0)
+  ).type.toRaiseError();
 
-  // $ExpectType { a: MapOf<{ b: string; }>; }
-  Map({ a: Map({ b: 'b' }) }).toJSON();
-}
+  expect(
+    Map<number, number>().update(1, 10, (v: number | undefined) => v + 'a')
+  ).type.toRaiseError();
+
+  expect(Map({ a: 1, b: 'b' }).update('c', v => v)).type.toRaiseError();
+
+  expect(Map({ a: 1, b: 'b' }).update('b', v => v.toUpperCase())).type.toBe<
+    MapOf<{ a: number; b: string }>
+  >();
+
+  expect(
+    Map({ a: 1, b: 'b' }).update('b', 'NSV', v => v.toUpperCase())
+  ).type.toBe<MapOf<{ a: number; b: string }>>();
+
+  expect(Map({ a: 1, b: 'b' }).update(v => ({ a: 'a' }))).type.toRaiseError();
+
+  expect(
+    Map({ a: 1, b: 'b' }).update(v => v.set('a', 2).set('b', 'B'))
+  ).type.toBe<MapOf<{ a: number; b: string }>>();
+
+  expect(
+    Map({ a: 1, b: 'b' }).update(v => v.set('c', 'c'))
+  ).type.toRaiseError();
+
+  expect(
+    Map<string, string>().update('noKey', ls => ls?.toUpperCase())
+  ).type.toBe<Map<string, string>>();
+});
+
+test('#updateIn', () => {
+  expect(Map<number, number>().updateIn([], v => v)).type.toBe<
+    Map<number, number>
+  >();
+
+  expect(Map<number, number>().updateIn([], 10)).type.toRaiseError();
+});
+
+test('#map', () => {
+  expect(
+    Map<number, number>().map(
+      (value: number, key: number, iter: Map<number, number>) => 1
+    )
+  ).type.toBe<Map<number, number>>();
+
+  expect(
+    Map<number, number>().map(
+      (value: number, key: number, iter: Map<number, number>) => 'a'
+    )
+  ).type.toBe<Map<number, string>>();
+
+  expect(
+    Map<number, number>().map<number>(
+      (value: number, key: number, iter: Map<number, number>) => 1
+    )
+  ).type.toBe<Map<number, number>>();
+
+  expect(
+    Map<number, number>().map<string>(
+      (value: number, key: number, iter: Map<number, number>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Map<number, number>().map<number>(
+      (value: string, key: number, iter: Map<number, number>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Map<number, number>().map<number>(
+      (value: number, key: string, iter: Map<number, number>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Map<number, number>().map<number>(
+      (value: number, key: number, iter: Map<number, string>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Map<number, number>().map<number>(
+      (value: number, key: number, iter: Map<number, number>) => 'a'
+    )
+  ).type.toRaiseError();
+});
+
+test('#mapKeys', () => {
+  expect(
+    Map<number, number>().mapKeys(
+      (value: number, key: number, iter: Map<number, number>) => 1
+    )
+  ).type.toBe<Map<number, number>>();
+
+  expect(
+    Map<number, number>().mapKeys(
+      (value: number, key: number, iter: Map<number, number>) => 'a'
+    )
+  ).type.toBe<Map<string, number>>();
+
+  expect(
+    Map<number, number>().mapKeys<number>(
+      (value: number, key: number, iter: Map<number, number>) => 1
+    )
+  ).type.toBe<Map<number, number>>();
+
+  expect(
+    Map<number, number>().mapKeys<string>(
+      (value: number, key: number, iter: Map<number, number>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Map<number, number>().mapKeys<number>(
+      (value: string, key: number, iter: Map<number, number>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Map<number, number>().mapKeys<number>(
+      (value: number, key: string, iter: Map<number, number>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Map<number, number>().mapKeys<number>(
+      (value: number, key: number, iter: Map<number, string>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Map<number, number>().mapKeys<number>(
+      (value: number, key: number, iter: Map<number, number>) => 'a'
+    )
+  ).type.toRaiseError();
+});
+
+test('#flatMap', () => {
+  expect(
+    Map<number, number>().flatMap(
+      (value: number, key: number, iter: Map<number, number>) => [[0, 1]]
+    )
+  ).type.toBe<Map<number, number>>();
+
+  expect(
+    Map<number, number>().flatMap(
+      (value: number, key: number, iter: Map<number, number>) => [['a', 'b']]
+    )
+  ).type.toBe<Map<string, string>>();
+
+  expect(
+    Map<number, number>().flatMap<number, number>(
+      (value: number, key: number, iter: Map<number, number>) => [[0, 1]]
+    )
+  ).type.toBe<Map<number, number>>();
+
+  expect(
+    Map<number, number>().flatMap<number, string>(
+      (value: number, key: number, iter: Map<number, number>) => [[0, 1]]
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Map<number, number>().flatMap<number, number>(
+      (value: string, key: number, iter: Map<number, number>) => [[0, 1]]
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Map<number, number>().flatMap<number, number>(
+      (value: number, key: string, iter: Map<number, number>) => [[0, 1]]
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Map<number, number>().flatMap<number, number>(
+      (value: number, key: number, iter: Map<number, string>) => [[0, 1]]
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Map<number, number>().flatMap<number, number>(
+      (value: number, key: number, iter: Map<number, number>) => [[0, 'a']]
+    )
+  ).type.toRaiseError();
+});
+
+test('#merge', () => {
+  expect(Map<string, number>().merge({ a: 1 })).type.toBe<
+    Map<string, number>
+  >();
+
+  expect(Map<string, number>().merge({ a: { b: 1 } })).type.toBe<
+    Map<string, number | { b: number }>
+  >();
+
+  expect(Map<number, number>().merge(Map<number, number>())).type.toBe<
+    Map<number, number>
+  >();
+
+  expect(Map<number, number>().merge(Map<number, string>())).type.toBe<
+    Map<number, string | number>
+  >();
+
+  expect(Map<number, number | string>().merge(Map<number, string>())).type.toBe<
+    Map<number, string | number>
+  >();
+
+  expect(Map<number, number | string>().merge(Map<number, number>())).type.toBe<
+    Map<number, string | number>
+  >();
+
+  expect(Map({ a: 1 }).merge(Map({ b: 2 }))).type.toBe<
+    Map<'b' | 'a', number>
+  >();
+});
+
+test('#mergeIn', () => {
+  expect(Map<number, number>().mergeIn([], [])).type.toBe<
+    Map<number, number>
+  >();
+});
+
+test('#mergeWith', () => {
+  expect(
+    Map<number, number>().mergeWith(
+      (prev: number, next: number, key: number) => 1,
+      Map<number, number>()
+    )
+  ).type.toBe<Map<number, number>>();
+
+  expect(
+    Map<number, number>().mergeWith(
+      (prev: string, next: number, key: number) => 1,
+      Map<number, number>()
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Map<number, number>().mergeWith(
+      (prev: number, next: string, key: number) => 1,
+      Map<number, number>()
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Map<number, number>().mergeWith(
+      (prev: number, next: number, key: string) => 1,
+      Map<number, number>()
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Map<number, number>().mergeWith(
+      (prev: number, next: number, key: number) => 'a',
+      Map<number, number>()
+    )
+  ).type.toBe<Map<number, string | number>>();
+
+  expect(
+    Map<number, number>().mergeWith(
+      (prev: number, next: number, key: number) => 1,
+      Map<number, string>()
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Map<string, number>().mergeWith(
+      (prev: number, next: number, key: string) => 1,
+      { a: 1 }
+    )
+  ).type.toBe<Map<string, number>>();
+
+  expect(
+    Map<string, number>().mergeWith(
+      (prev: number, next: number, key: string) => 1,
+      { a: 'a' }
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Map<string, number>().mergeWith(
+      (prev: number, next: number | string, key: string) => 1,
+      { a: 'a' }
+    )
+  ).type.toBe<Map<string, string | number>>();
+
+  expect(
+    Map<number, number | string>().mergeWith(
+      (prev: number | string, next: number | string, key: number) => 1,
+      Map<number, string>()
+    )
+  ).type.toBe<Map<number, string | number>>();
+});
+
+test('#mergeDeep', () => {
+  expect(Map<string, number>().mergeDeep({ a: 1 })).type.toBe<
+    Map<string, number>
+  >();
+
+  expect(Map<string, number>().mergeDeep({ a: { b: 1 } })).type.toBe<
+    Map<string, number | { b: number }>
+  >();
+
+  expect(Map<string, number>().mergeDeep(Map({ a: { b: 1 } }))).type.toBe<
+    Map<string, number | { b: number }>
+  >();
+
+  expect(Map<number, number>().mergeDeep(Map<number, number>())).type.toBe<
+    Map<number, number>
+  >();
+
+  expect(Map<number, number>().mergeDeep(Map<number, string>())).type.toBe<
+    Map<number, string | number>
+  >();
+
+  expect(
+    Map<number, number | string>().mergeDeep(Map<number, string>())
+  ).type.toBe<Map<number, string | number>>();
+
+  expect(
+    Map<number, number | string>().mergeDeep(Map<number, number>())
+  ).type.toBe<Map<number, string | number>>();
+});
+
+test('#mergeDeepIn', () => {
+  expect(Map<number, number>().mergeDeepIn([], [])).type.toBe<
+    Map<number, number>
+  >();
+});
+
+test('#mergeDeepWith', () => {
+  expect(
+    Map<number, number>().mergeDeepWith(
+      (prev: unknown, next: unknown, key: unknown) => 1,
+      Map<number, number>()
+    )
+  ).type.toBe<Map<number, number>>();
+
+  expect(
+    Map<number, number>().mergeDeepWith(
+      (prev: unknown, next: unknown, key: unknown) => 1,
+      Map<number, string>()
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Map<string, number>().mergeDeepWith(
+      (prev: unknown, next: unknown, key: unknown) => 1,
+      { a: 1 }
+    )
+  ).type.toBe<Map<string, number>>();
+
+  expect(
+    Map<string, number>().mergeDeepWith(
+      (prev: unknown, next: unknown, key: unknown) => 1,
+      { a: 'a' }
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Map<number, number | string>().mergeDeepWith(
+      (prev: unknown, next: unknown, key: unknown) => 1,
+      Map<number, string>()
+    )
+  ).type.toBe<Map<number, string | number>>();
+});
+
+test('#flip', () => {
+  expect(Map<number, string>().flip()).type.toBe<Map<string, number>>();
+});
+
+test('#withMutations', () => {
+  expect(Map<number, number>().withMutations(mutable => mutable)).type.toBe<
+    Map<number, number>
+  >();
+
+  expect(
+    Map<number, number>().withMutations((mutable: Map<string>) => mutable)
+  ).type.toRaiseError();
+});
+
+test('#asMutable', () => {
+  expect(Map<number, number>().asMutable()).type.toBe<Map<number, number>>();
+});
+
+test('#asImmutable', () => {
+  expect(Map<number, number>().asImmutable()).type.toBe<Map<number, number>>();
+});
+
+test('#toJS', () => {
+  expect(Map<number, number>().toJS()).type.toBe<{
+    [x: string]: number;
+    [x: number]: number;
+    [x: symbol]: number;
+  }>();
+
+  expect(Map({ a: 'A' }).toJS()).type.toBe<{ a: string }>();
+
+  expect(Map({ a: Map({ b: 'b' }) }).toJS()).type.toBe<{
+    a: { b: string };
+  }>();
+});
+
+test('#toJSON', () => {
+  expect(Map({ a: Map({ b: 'b' }) }).toJSON()).type.toBe<{
+    a: MapOf<{ b: string }>;
+  }>();
+});
diff --git a/type-definitions/ts-tests/ordered-map.ts b/type-definitions/ts-tests/ordered-map.ts
index a755593ad..35bd1fdc8 100644
--- a/type-definitions/ts-tests/ordered-map.ts
+++ b/type-definitions/ts-tests/ordered-map.ts
@@ -1,479 +1,506 @@
+import { expect, test } from 'tstyche';
 import { OrderedMap, List } from 'immutable';
 
-{
-  // #constructor
+test('#constructor', () => {
+  expect(OrderedMap()).type.toBe<OrderedMap<unknown, unknown>>();
 
-  // $ExpectType OrderedMap<unknown, unknown>
-  OrderedMap();
+  expect(OrderedMap<number, number>()).type.toBe<OrderedMap<number, number>>();
 
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>();
+  expect(OrderedMap([[1, 'a']])).type.toBe<OrderedMap<number, string>>();
 
-  // $ExpectType OrderedMap<number, string>
-  OrderedMap([[1, 'a']]);
+  expect(OrderedMap(List<[number, string]>([[1, 'a']]))).type.toBe<
+    OrderedMap<number, string>
+  >();
 
-  // $ExpectType OrderedMap<number, string>
-  OrderedMap(
-    List<[number, string]>([[1, 'a']])
-  );
-
-  // $ExpectType OrderedMap<string, number>
-  OrderedMap({ a: 1 });
+  expect(OrderedMap({ a: 1 })).type.toBe<OrderedMap<string, number>>();
 
   // No longer works in typescript@>=3.9
   // // $ExpectError - TypeScript does not support Lists as tuples
   // OrderedMap(List([List(['a', 'b'])]));
-}
-
-{
-  // #size
-
-  // $ExpectType number
-  OrderedMap().size;
-
-  // $ExpectError
-  OrderedMap().size = 10;
-}
-
-{
-  // #get
-
-  // $ExpectType number | undefined
-  OrderedMap<number, number>().get(4);
-
-  // $ExpectType number | "a"
-  OrderedMap<number, number>().get(4, 'a');
-
-  // $ExpectError
-  OrderedMap<number, number>().get<number>(4, 'a');
-}
-
-{
-  // #set
-
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().set(0, 0);
-
-  // $ExpectError
-  OrderedMap<number, number>().set(1, 'a');
-
-  // $ExpectError
-  OrderedMap<number, number>().set('a', 1);
-
-  // $ExpectType OrderedMap<number, string | number>
-  OrderedMap<number, number | string>().set(0, 1);
-
-  // $ExpectType OrderedMap<number, string | number>
-  OrderedMap<number, number | string>().set(0, 'a');
-}
-
-{
-  // #setIn
-
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().setIn([], 0);
-}
-
-{
-  // #delete
-
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().delete(0);
-
-  // $ExpectError
-  OrderedMap<number, number>().delete('a');
-}
-
-{
-  // #deleteAll
-
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().deleteAll([0]);
-
-  // $ExpectError
-  OrderedMap<number, number>().deleteAll([0, 'a']);
-}
-
-{
-  // #deleteIn
-
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().deleteIn([]);
-}
-
-{
-  // #remove
-
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().remove(0);
-
-  // $ExpectError
-  OrderedMap<number, number>().remove('a');
-}
-
-{
-  // #removeAll
-
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().removeAll([0]);
-
-  // $ExpectError
-  OrderedMap<number, number>().removeAll([0, 'a']);
-}
-
-{
-  // #removeIn
-
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().removeIn([]);
-}
-
-{
-  // #clear
-
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().clear();
-
-  // $ExpectError
-  OrderedMap().clear(10);
-}
-
-{
-  // #update
-
-  // $ExpectType number
-  OrderedMap().update((v) => 1);
-
-  // $ExpectError
-  OrderedMap<number, number>().update((v: OrderedMap<string> | undefined) => v);
-
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().update(0, (v: number | undefined) => 0);
-
-  // $ExpectError
-  OrderedMap<number, number>().update(0, (v: number | undefined) => v + 'a');
-
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().update(1, 10, (v: number | undefined) => 0);
-
-  // $ExpectError
-  OrderedMap<number, number>().update(1, 'a', (v: number | undefined) => 0);
-
-  // $ExpectError
-  OrderedMap<number, number>().update(1, 10, (v: number | undefined) => v + 'a');
-}
-
-{
-  // #updateIn
-
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().updateIn([], (v) => v);
-
-  // $ExpectError
-  OrderedMap<number, number>().updateIn([], 10);
-}
-
-{
-  // #map
-
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().map(
-    (value: number, key: number, iter: OrderedMap<number, number>) => 1
-  );
-
-  // $ExpectType OrderedMap<number, string>
-  OrderedMap<number, number>().map(
-    (value: number, key: number, iter: OrderedMap<number, number>) => 'a'
-  );
-
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().map<number>(
-    (value: number, key: number, iter: OrderedMap<number, number>) => 1
-  );
-
-  OrderedMap<number, number>().map<string>(
-    // $ExpectError
-    (value: number, key: number, iter: OrderedMap<number, number>) => 1
-  );
-
-  OrderedMap<number, number>().map<number>(
-    // $ExpectError
-    (value: string, key: number, iter: OrderedMap<number, number>) => 1
-  );
-
-  OrderedMap<number, number>().map<number>(
-    // $ExpectError
-    (value: number, key: string, iter: OrderedMap<number, number>) => 1
-  );
-
-  OrderedMap<number, number>().map<number>(
-    // $ExpectError
-    (value: number, key: number, iter: OrderedMap<number, string>) => 1
-  );
-
-  OrderedMap<number, number>().map<number>(
-    // $ExpectError
-    (value: number, key: number, iter: OrderedMap<number, number>) => 'a'
-  );
-}
-
-{
-  // #mapKeys
-
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().mapKeys(
-    (value: number, key: number, iter: OrderedMap<number, number>) => 1
-  );
-
-  // $ExpectType OrderedMap<string, number>
-  OrderedMap<number, number>().mapKeys(
-    (value: number, key: number, iter: OrderedMap<number, number>) => 'a'
-  );
-
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().mapKeys<number>(
-    (value: number, key: number, iter: OrderedMap<number, number>) => 1
-  );
-
-  OrderedMap<number, number>().mapKeys<string>(
-    // $ExpectError
-    (value: number, key: number, iter: OrderedMap<number, number>) => 1
-  );
-
-  OrderedMap<number, number>().mapKeys<number>(
-    // $ExpectError
-    (value: string, key: number, iter: OrderedMap<number, number>) => 1
-  );
-
-  OrderedMap<number, number>().mapKeys<number>(
-    // $ExpectError
-    (value: number, key: string, iter: OrderedMap<number, number>) => 1
-  );
-
-  OrderedMap<number, number>().mapKeys<number>(
-    // $ExpectError
-    (value: number, key: number, iter: OrderedMap<number, string>) => 1
-  );
-
-  OrderedMap<number, number>().mapKeys<number>(
-    // $ExpectError
-    (value: number, key: number, iter: OrderedMap<number, number>) => 'a'
-  );
-}
-
-{
-  // #flatMap
-
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<
-    number,
-    number
-  >().flatMap(
-    (value: number, key: number, iter: OrderedMap<number, number>) => [[0, 1]]
-  );
-
-  // $ExpectType OrderedMap<string, string>
-  OrderedMap<
-    number,
-    number
-  >().flatMap(
-    (value: number, key: number, iter: OrderedMap<number, number>) => [
-      ['a', 'b'],
-    ]
-  );
-
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().flatMap<number, number>(
-    (value: number, key: number, iter: OrderedMap<number, number>) => [[0, 1]]
-  );
-
-  OrderedMap<number, number>().flatMap<number, string>(
-    // $ExpectError
-    (value: number, key: number, iter: OrderedMap<number, number>) => [[0, 1]]
-  );
-
-  OrderedMap<number, number>().flatMap<number, number>(
-    // $ExpectError
-    (value: string, key: number, iter: OrderedMap<number, number>) => [[0, 1]]
-  );
-
-  OrderedMap<number, number>().flatMap<number, number>(
-    // $ExpectError
-    (value: number, key: string, iter: OrderedMap<number, number>) => [[0, 1]]
-  );
-
-  OrderedMap<number, number>().flatMap<number, number>(
-    // $ExpectError
-    (value: number, key: number, iter: OrderedMap<number, string>) => [[0, 1]]
-  );
-
-  OrderedMap<number, number>().flatMap<number, number>(
-    // $ExpectError
-    (value: number, key: number, iter: OrderedMap<number, number>) => [[0, 'a']]
-  );
-}
-
-{
-  // #merge
-
-  // $ExpectType OrderedMap<string, number>
-  OrderedMap<string, number>().merge({ a: 1 });
-
-  // $ExpectType OrderedMap<string, number | { b: number; }>
-  OrderedMap<string, number>().merge({ a: { b: 1 } });
-
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().merge(OrderedMap<number, number>());
-
-  // $ExpectType OrderedMap<number, string | number>
-  OrderedMap<number, number>().merge(OrderedMap<number, string>());
-
-  // $ExpectType OrderedMap<number, string | number>
-  OrderedMap<number, number | string>().merge(OrderedMap<number, string>());
-
-  // $ExpectType OrderedMap<number, string | number>
-  OrderedMap<number, number | string>().merge(OrderedMap<number, number>());
-}
-
-{
-  // #mergeIn
-
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().mergeIn([], []);
-}
-
-{
-  // #mergeWith
-
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().mergeWith(
-    (prev: number, next: number, key: number) => 1,
-    OrderedMap<number, number>()
-  );
-
-  OrderedMap<number, number>().mergeWith(
-    // $ExpectError
-    (prev: string, next: number, key: number) => 1,
-    OrderedMap<number, number>()
-  );
-
-  // $ExpectError
-  OrderedMap<number, number>().mergeWith(
-    (prev: number, next: string, key: number) => 1,
-    OrderedMap<number, number>()
-  );
-
-  // $ExpectError
-  OrderedMap<number, number>().mergeWith(
-    (prev: number, next: number, key: string) => 1,
-    OrderedMap<number, number>()
-  );
-
-  // $ExpectType OrderedMap<number, string | number>
-  OrderedMap<number, number>().mergeWith(
-    (prev: number, next: number, key: number) => 'a',
-    OrderedMap<number, number>()
-  );
-
-  // $ExpectError
-  OrderedMap<number, number>().mergeWith(
-    (prev: number, next: number, key: number) => 1,
-    OrderedMap<number, string>()
-  );
-
-  // $ExpectType OrderedMap<string, number>
-  OrderedMap<string, number>().mergeWith(
-    (prev: number, next: number, key: string) => 1,
-    { a: 1 }
-  );
-
-  OrderedMap<string, number>().mergeWith(
-    (prev: number, next: number, key: string) => 1,
-    // $ExpectError
-    { a: 'a' }
-  );
-
-  // $ExpectType OrderedMap<number, string | number>
-  OrderedMap<number, number | string>().mergeWith((prev: number | string, next: number | string, key: number) => 1, OrderedMap<number, string>());
-}
-
-{
-  // #mergeDeep
-
-  // $ExpectType OrderedMap<string, number>
-  OrderedMap<string, number>().mergeDeep({ a: 1 });
-
-  // $ExpectType OrderedMap<string, number | { b: number; }>
-  OrderedMap<string, number>().mergeDeep({ a: { b: 1 } });
-
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().mergeDeep(OrderedMap<number, number>());
-
-  // $ExpectType OrderedMap<number, string | number>
-  OrderedMap<number, number>().mergeDeep(OrderedMap<number, string>());
-
-  // $ExpectType OrderedMap<number, string | number>
-  OrderedMap<number, number | string>().mergeDeep(OrderedMap<number, string>());
-
-  // $ExpectType OrderedMap<number, string | number>
-  OrderedMap<number, number | string>().mergeDeep(OrderedMap<number, number>());
-}
-
-{
-  // #mergeDeepIn
-
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().mergeDeepIn([], []);
-}
-
-{
-  // #mergeDeepWith
-
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().mergeDeepWith((prev: unknown, next: unknown, key: unknown) => 1, OrderedMap<number, number>());
-
-  // $ExpectError
-  OrderedMap<number, number>().mergeDeepWith((prev: unknown, next: unknown, key: unknown) => 1, OrderedMap<number, string>());
-
-  // $ExpectType OrderedMap<string, number>
-  OrderedMap<string, number>().mergeDeepWith((prev: unknown, next: unknown, key: unknown) => 1, { a: 1 });
-
-  // $ExpectError
-  OrderedMap<string, number>().mergeDeepWith((prev: unknown, next: unknown, key: unknown) => 1, { a: 'a' });
-
-  // $ExpectType OrderedMap<number, string | number>
-  OrderedMap<number, number | string>().mergeDeepWith((prev: unknown, next: unknown, key: unknown) => 1, OrderedMap<number, string>());
-}
+});
 
-{
-  // #flip
+test('#size', () => {
+  expect(OrderedMap().size).type.toBeNumber();
 
-  // $ExpectType OrderedMap<string, number>
-  OrderedMap<number, string>().flip();
-}
+  expect(OrderedMap()).type.toMatch<{ readonly size: number }>();
+});
 
-{
-  // #withMutations
+test('#get', () => {
+  expect(OrderedMap<number, number>().get(4)).type.toBe<number | undefined>();
 
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().withMutations((mutable) => mutable);
+  expect(OrderedMap<number, number>().get(4, 'a')).type.toBe<number | 'a'>();
 
-  OrderedMap<number, number>().withMutations(
-    // $ExpectError
-    (mutable: OrderedMap<string>) => mutable
-  );
-}
+  expect(OrderedMap<number, number>().get<number>(4, 'a')).type.toRaiseError();
+});
 
-{
-  // #asMutable
+test('#set', () => {
+  expect(OrderedMap<number, number>().set(0, 0)).type.toBe<
+    OrderedMap<number, number>
+  >();
 
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().asMutable();
-}
+  expect(OrderedMap<number, number>().set(1, 'a')).type.toRaiseError();
 
-{
-  // #asImmutable
+  expect(OrderedMap<number, number>().set('a', 1)).type.toRaiseError();
+
+  expect(OrderedMap<number, number | string>().set(0, 1)).type.toBe<
+    OrderedMap<number, string | number>
+  >();
+
+  expect(OrderedMap<number, number | string>().set(0, 'a')).type.toBe<
+    OrderedMap<number, string | number>
+  >();
+});
 
-  // $ExpectType OrderedMap<number, number>
-  OrderedMap<number, number>().asImmutable();
-}
+test('#setIn', () => {
+  expect(OrderedMap<number, number>().setIn([], 0)).type.toBe<
+    OrderedMap<number, number>
+  >();
+});
+
+test('#delete', () => {
+  expect(OrderedMap<number, number>().delete(0)).type.toBe<
+    OrderedMap<number, number>
+  >();
+
+  expect(OrderedMap<number, number>().delete('a')).type.toRaiseError();
+});
+
+test('#deleteAll', () => {
+  expect(OrderedMap<number, number>().deleteAll([0])).type.toBe<
+    OrderedMap<number, number>
+  >();
+
+  expect(OrderedMap<number, number>().deleteAll([0, 'a'])).type.toRaiseError();
+});
+
+test('#deleteIn', () => {
+  expect(OrderedMap<number, number>().deleteIn([])).type.toBe<
+    OrderedMap<number, number>
+  >();
+});
+
+test('#remove', () => {
+  expect(OrderedMap<number, number>().remove(0)).type.toBe<
+    OrderedMap<number, number>
+  >();
+
+  expect(OrderedMap<number, number>().remove('a')).type.toRaiseError();
+});
+
+test('#removeAll', () => {
+  expect(OrderedMap<number, number>().removeAll([0])).type.toBe<
+    OrderedMap<number, number>
+  >();
+
+  expect(OrderedMap<number, number>().removeAll([0, 'a'])).type.toRaiseError();
+});
+
+test('#removeIn', () => {
+  expect(OrderedMap<number, number>().removeIn([])).type.toBe<
+    OrderedMap<number, number>
+  >();
+});
+
+test('#clear', () => {
+  expect(OrderedMap<number, number>().clear()).type.toBe<
+    OrderedMap<number, number>
+  >();
+
+  expect(OrderedMap().clear(10)).type.toRaiseError();
+});
+
+test('#update', () => {
+  expect(OrderedMap().update(v => 1)).type.toBeNumber();
+
+  expect(
+    OrderedMap<number, number>().update(
+      (v: OrderedMap<string> | undefined) => v
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedMap<number, number>().update(0, (v: number | undefined) => 0)
+  ).type.toBe<OrderedMap<number, number>>();
+
+  expect(
+    OrderedMap<number, number>().update(0, (v: number | undefined) => v + 'a')
+  ).type.toRaiseError();
+
+  expect(
+    OrderedMap<number, number>().update(1, 10, (v: number | undefined) => 0)
+  ).type.toBe<OrderedMap<number, number>>();
+
+  expect(
+    OrderedMap<number, number>().update(1, 'a', (v: number | undefined) => 0)
+  ).type.toRaiseError();
+
+  expect(
+    OrderedMap<number, number>().update(
+      1,
+      10,
+      (v: number | undefined) => v + 'a'
+    )
+  ).type.toRaiseError();
+});
+
+test('#updateIn', () => {
+  expect(OrderedMap<number, number>().updateIn([], v => v)).type.toBe<
+    OrderedMap<number, number>
+  >();
+
+  expect(OrderedMap<number, number>().updateIn([], 10)).type.toRaiseError();
+});
+
+test('#map', () => {
+  expect(
+    OrderedMap<number, number>().map(
+      (value: number, key: number, iter: OrderedMap<number, number>) => 1
+    )
+  ).type.toBe<OrderedMap<number, number>>();
+
+  expect(
+    OrderedMap<number, number>().map(
+      (value: number, key: number, iter: OrderedMap<number, number>) => 'a'
+    )
+  ).type.toBe<OrderedMap<number, string>>();
+
+  expect(
+    OrderedMap<number, number>().map<number>(
+      (value: number, key: number, iter: OrderedMap<number, number>) => 1
+    )
+  ).type.toBe<OrderedMap<number, number>>();
+
+  expect(
+    OrderedMap<number, number>().map<string>(
+      (value: number, key: number, iter: OrderedMap<number, number>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedMap<number, number>().map<number>(
+      (value: string, key: number, iter: OrderedMap<number, number>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedMap<number, number>().map<number>(
+      (value: number, key: string, iter: OrderedMap<number, number>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedMap<number, number>().map<number>(
+      (value: number, key: number, iter: OrderedMap<number, string>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedMap<number, number>().map<number>(
+      (value: number, key: number, iter: OrderedMap<number, number>) => 'a'
+    )
+  ).type.toRaiseError();
+});
+
+test('#mapKeys', () => {
+  expect(
+    OrderedMap<number, number>().mapKeys(
+      (value: number, key: number, iter: OrderedMap<number, number>) => 1
+    )
+  ).type.toBe<OrderedMap<number, number>>();
+
+  expect(
+    OrderedMap<number, number>().mapKeys(
+      (value: number, key: number, iter: OrderedMap<number, number>) => 'a'
+    )
+  ).type.toBe<OrderedMap<string, number>>();
+
+  expect(
+    OrderedMap<number, number>().mapKeys<number>(
+      (value: number, key: number, iter: OrderedMap<number, number>) => 1
+    )
+  ).type.toBe<OrderedMap<number, number>>();
+
+  expect(
+    OrderedMap<number, number>().mapKeys<string>(
+      (value: number, key: number, iter: OrderedMap<number, number>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedMap<number, number>().mapKeys<number>(
+      (value: string, key: number, iter: OrderedMap<number, number>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedMap<number, number>().mapKeys<number>(
+      (value: number, key: string, iter: OrderedMap<number, number>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedMap<number, number>().mapKeys<number>(
+      (value: number, key: number, iter: OrderedMap<number, string>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedMap<number, number>().mapKeys<number>(
+      (value: number, key: number, iter: OrderedMap<number, number>) => 'a'
+    )
+  ).type.toRaiseError();
+});
+
+test('#flatMap', () => {
+  expect(
+    OrderedMap<number, number>().flatMap(
+      (value: number, key: number, iter: OrderedMap<number, number>) => [[0, 1]]
+    )
+  ).type.toBe<OrderedMap<number, number>>();
+
+  expect(
+    OrderedMap<number, number>().flatMap(
+      (value: number, key: number, iter: OrderedMap<number, number>) => [
+        ['a', 'b'],
+      ]
+    )
+  ).type.toBe<OrderedMap<string, string>>();
+
+  expect(
+    OrderedMap<number, number>().flatMap<number, number>(
+      (value: number, key: number, iter: OrderedMap<number, number>) => [[0, 1]]
+    )
+  ).type.toBe<OrderedMap<number, number>>();
+
+  expect(
+    OrderedMap<number, number>().flatMap<number, string>(
+      (value: number, key: number, iter: OrderedMap<number, number>) => [[0, 1]]
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedMap<number, number>().flatMap<number, number>(
+      (value: string, key: number, iter: OrderedMap<number, number>) => [[0, 1]]
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedMap<number, number>().flatMap<number, number>(
+      (value: number, key: string, iter: OrderedMap<number, number>) => [[0, 1]]
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedMap<number, number>().flatMap<number, number>(
+      (value: number, key: number, iter: OrderedMap<number, string>) => [[0, 1]]
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedMap<number, number>().flatMap<number, number>(
+      (value: number, key: number, iter: OrderedMap<number, number>) => [
+        [0, 'a'],
+      ]
+    )
+  ).type.toRaiseError();
+});
+
+test('#merge', () => {
+  expect(OrderedMap<string, number>().merge({ a: 1 })).type.toBe<
+    OrderedMap<string, number>
+  >();
+
+  expect(OrderedMap<string, number>().merge({ a: { b: 1 } })).type.toBe<
+    OrderedMap<string, number | { b: number }>
+  >();
+
+  expect(
+    OrderedMap<number, number>().merge(OrderedMap<number, number>())
+  ).type.toBe<OrderedMap<number, number>>();
+
+  expect(
+    OrderedMap<number, number>().merge(OrderedMap<number, string>())
+  ).type.toBe<OrderedMap<number, string | number>>();
+
+  expect(
+    OrderedMap<number, number | string>().merge(OrderedMap<number, string>())
+  ).type.toBe<OrderedMap<number, string | number>>();
+
+  expect(
+    OrderedMap<number, number | string>().merge(OrderedMap<number, number>())
+  ).type.toBe<OrderedMap<number, string | number>>();
+});
+
+test('#mergeIn', () => {
+  expect(OrderedMap<number, number>().mergeIn([], [])).type.toBe<
+    OrderedMap<number, number>
+  >();
+});
+
+test('#mergeWith', () => {
+  expect(
+    OrderedMap<number, number>().mergeWith(
+      (prev: number, next: number, key: number) => 1,
+      OrderedMap<number, number>()
+    )
+  ).type.toBe<OrderedMap<number, number>>();
+
+  expect(
+    OrderedMap<number, number>().mergeWith(
+      (prev: string, next: number, key: number) => 1,
+      OrderedMap<number, number>()
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedMap<number, number>().mergeWith(
+      (prev: number, next: string, key: number) => 1,
+      OrderedMap<number, number>()
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedMap<number, number>().mergeWith(
+      (prev: number, next: number, key: string) => 1,
+      OrderedMap<number, number>()
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedMap<number, number>().mergeWith(
+      (prev: number, next: number, key: number) => 'a',
+      OrderedMap<number, number>()
+    )
+  ).type.toBe<OrderedMap<number, string | number>>();
+
+  expect(
+    OrderedMap<number, number>().mergeWith(
+      (prev: number, next: number, key: number) => 1,
+      OrderedMap<number, string>()
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedMap<string, number>().mergeWith(
+      (prev: number, next: number, key: string) => 1,
+      { a: 1 }
+    )
+  ).type.toBe<OrderedMap<string, number>>();
+
+  expect(
+    OrderedMap<string, number>().mergeWith(
+      (prev: number, next: number, key: string) => 1,
+      { a: 'a' }
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedMap<number, number | string>().mergeWith(
+      (prev: number | string, next: number | string, key: number) => 1,
+      OrderedMap<number, string>()
+    )
+  ).type.toBe<OrderedMap<number, string | number>>();
+});
+
+test('#mergeDeep', () => {
+  expect(OrderedMap<string, number>().mergeDeep({ a: 1 })).type.toBe<
+    OrderedMap<string, number>
+  >();
+
+  expect(OrderedMap<string, number>().mergeDeep({ a: { b: 1 } })).type.toBe<
+    OrderedMap<string, number | { b: number }>
+  >();
+
+  expect(
+    OrderedMap<number, number>().mergeDeep(OrderedMap<number, number>())
+  ).type.toBe<OrderedMap<number, number>>();
+
+  expect(
+    OrderedMap<number, number>().mergeDeep(OrderedMap<number, string>())
+  ).type.toBe<OrderedMap<number, string | number>>();
+
+  expect(
+    OrderedMap<number, number | string>().mergeDeep(
+      OrderedMap<number, string>()
+    )
+  ).type.toBe<OrderedMap<number, string | number>>();
+
+  expect(
+    OrderedMap<number, number | string>().mergeDeep(
+      OrderedMap<number, number>()
+    )
+  ).type.toBe<OrderedMap<number, string | number>>();
+});
+
+test('#mergeDeepIn', () => {
+  expect(OrderedMap<number, number>().mergeDeepIn([], [])).type.toBe<
+    OrderedMap<number, number>
+  >();
+});
+
+test('#mergeDeepWith', () => {
+  expect(
+    OrderedMap<number, number>().mergeDeepWith(
+      (prev: unknown, next: unknown, key: unknown) => 1,
+      OrderedMap<number, number>()
+    )
+  ).type.toBe<OrderedMap<number, number>>();
+
+  expect(
+    OrderedMap<number, number>().mergeDeepWith(
+      (prev: unknown, next: unknown, key: unknown) => 1,
+      OrderedMap<number, string>()
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedMap<string, number>().mergeDeepWith(
+      (prev: unknown, next: unknown, key: unknown) => 1,
+      { a: 1 }
+    )
+  ).type.toBe<OrderedMap<string, number>>();
+
+  expect(
+    OrderedMap<string, number>().mergeDeepWith(
+      (prev: unknown, next: unknown, key: unknown) => 1,
+      { a: 'a' }
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedMap<number, number | string>().mergeDeepWith(
+      (prev: unknown, next: unknown, key: unknown) => 1,
+      OrderedMap<number, string>()
+    )
+  ).type.toBe<OrderedMap<number, string | number>>();
+});
+
+test('#flip', () => {
+  expect(OrderedMap<number, string>().flip()).type.toBe<
+    OrderedMap<string, number>
+  >();
+});
+
+test('#withMutations', () => {
+  expect(
+    OrderedMap<number, number>().withMutations(mutable => mutable)
+  ).type.toBe<OrderedMap<number, number>>();
+
+  expect(
+    OrderedMap<number, number>().withMutations(
+      (mutable: OrderedMap<string>) => mutable
+    )
+  ).type.toRaiseError();
+});
+
+test('#asMutable', () => {
+  expect(OrderedMap<number, number>().asMutable()).type.toBe<
+    OrderedMap<number, number>
+  >();
+});
+
+test('#asImmutable', () => {
+  expect(OrderedMap<number, number>().asImmutable()).type.toBe<
+    OrderedMap<number, number>
+  >();
+});
diff --git a/type-definitions/ts-tests/ordered-set.ts b/type-definitions/ts-tests/ordered-set.ts
index 4d1a0a4b7..06081e3f3 100644
--- a/type-definitions/ts-tests/ordered-set.ts
+++ b/type-definitions/ts-tests/ordered-set.ts
@@ -1,293 +1,280 @@
-import { OrderedSet, Map } from 'immutable';
+import { expect, test } from 'tstyche';
+import { Collection, OrderedSet, Map } from 'immutable';
 
-{
-  // #constructor
+test('#constructor', () => {
+  expect(OrderedSet()).type.toBe<OrderedSet<unknown>>();
 
-  // $ExpectType OrderedSet<unknown>
-  OrderedSet();
+  expect(OrderedSet<number>()).type.toBe<OrderedSet<number>>();
 
-  const numberOrderedSet: OrderedSet<number> = OrderedSet<number>();
-  const numberOrStringOrderedSet: OrderedSet<number | string> = OrderedSet([
-    1,
-    'a',
-  ]);
+  expect(OrderedSet([1, 'a'])).type.toBe<OrderedSet<number | string>>();
 
-  // $ExpectError
-  const invalidNumberOrderedSet: OrderedSet<number> = OrderedSet([1, 'a']);
-}
+  expect(OrderedSet([1, 'a'])).type.not.toBeAssignableTo(OrderedSet<number>());
+});
 
-{
-  // #size
+test('#size', () => {
+  expect(OrderedSet().size).type.toBeNumber();
 
-  // $ExpectType number
-  OrderedSet().size;
+  expect(OrderedSet()).type.toMatch<{ readonly size: number }>();
+});
 
-  // $ExpectError
-  OrderedSet().size = 10;
-}
+test('.of', () => {
+  expect(OrderedSet.of(1, 2, 3)).type.toBe<OrderedSet<number>>();
 
-{
-  // .of
+  expect(OrderedSet.of<number>('a', 1)).type.toRaiseError();
 
-  // $ExpectType OrderedSet<number>
-  OrderedSet.of(1, 2, 3);
+  expect(OrderedSet.of<number | string>('a', 1)).type.toBe<
+    OrderedSet<string | number>
+  >();
+});
 
-  // $ExpectError
-  OrderedSet.of<number>('a', 1);
+test('.fromKeys', () => {
+  expect(OrderedSet.fromKeys(Map<number, string>())).type.toBe<
+    OrderedSet<number>
+  >();
 
-  // $ExpectType OrderedSet<string | number>
-  OrderedSet.of<number | string>('a', 1);
-}
+  expect(OrderedSet.fromKeys<number>(Map<number, string>())).type.toBe<
+    OrderedSet<number>
+  >();
 
-{
-  // .fromKeys
-
-  // $ExpectType OrderedSet<number>
-  OrderedSet.fromKeys(Map<number, string>());
-
-  // $ExpectType OrderedSet<number>
-  OrderedSet.fromKeys<number>(Map<number, string>());
-
-  // $ExpectType OrderedSet<string>
-  OrderedSet.fromKeys({ a: 1 });
-
-  // $ExpectError
-  OrderedSet.fromKeys<number>(Map<string, string>());
-
-  // $ExpectType OrderedSet<string | number>
-  OrderedSet.fromKeys<number | string>(Map<number | string, string>());
-}
-
-{
-  // #get
-
-  // $ExpectType number | undefined
-  OrderedSet<number>().get(4);
-
-  // $ExpectType number | "a"
-  OrderedSet<number>().get(4, 'a');
-
-  // $ExpectError
-  OrderedSet<number>().get<number>(4, 'a');
-}
-
-{
-  // #delete
-
-  // $ExpectType OrderedSet<number>
-  OrderedSet<number>().delete(0);
-
-  // $ExpectError
-  OrderedSet<number>().delete('a');
-}
-{
-  // #remove
-
-  // $ExpectType OrderedSet<number>
-  OrderedSet<number>().remove(0);
-
-  // $ExpectError
-  OrderedSet<number>().remove('a');
-}
-
-{
-  // #clear
-
-  // $ExpectType OrderedSet<number>
-  OrderedSet<number>().clear();
-
-  // $ExpectError
-  OrderedSet().clear(10);
-}
-
-{
-  // #map
-
-  // $ExpectType OrderedSet<number>
-  OrderedSet<number>().map(
-    (value: number, key: number, iter: OrderedSet<number>) => 1
-  );
-
-  // $ExpectType OrderedSet<string>
-  OrderedSet<number>().map(
-    (value: number, key: number, iter: OrderedSet<number>) => 'a'
-  );
-
-  // $ExpectType OrderedSet<number>
-  OrderedSet<number>().map<number>(
-    (value: number, key: number, iter: OrderedSet<number>) => 1
-  );
-
-  OrderedSet<number>().map<string>(
-    // $ExpectError
-    (value: number, key: number, iter: OrderedSet<number>) => 1
-  );
-
-  OrderedSet<number>().map<number>(
-    // $ExpectError
-    (value: string, key: number, iter: OrderedSet<number>) => 1
-  );
-
-  OrderedSet<number>().map<number>(
-    // $ExpectError
-    (value: number, key: string, iter: OrderedSet<number>) => 1
-  );
-
-  OrderedSet<number>().map<number>(
-    // $ExpectError
-    (value: number, key: number, iter: OrderedSet<string>) => 1
-  );
-
-  OrderedSet<number>().map<number>(
-    // $ExpectError
-    (value: number, key: number, iter: OrderedSet<number>) => 'a'
-  );
-}
-
-{
-  // #flatMap
-
-  // $ExpectType OrderedSet<number>
-  OrderedSet<
-    number
-  >().flatMap((value: number, key: number, iter: OrderedSet<number>) => [1]);
-
-  // $ExpectType OrderedSet<string>
-  OrderedSet<
-    number
-  >().flatMap((value: number, key: number, iter: OrderedSet<number>) => ['a']);
-
-  // $ExpectType OrderedSet<number>
-  OrderedSet<number>().flatMap<number>(
-    (value: number, key: number, iter: OrderedSet<number>) => [1]
-  );
-
-  OrderedSet<number>().flatMap<string>(
-    // $ExpectError
-    (value: number, key: number, iter: OrderedSet<number>) => [1]
-  );
-
-  OrderedSet<number>().flatMap<number>(
-    // $ExpectError
-    (value: string, key: number, iter: OrderedSet<number>) => [1]
-  );
-
-  OrderedSet<number>().flatMap<number>(
-    // $ExpectError
-    (value: number, key: string, iter: OrderedSet<number>) => [1]
-  );
-
-  OrderedSet<number>().flatMap<number>(
-    // $ExpectError
-    (value: number, key: number, iter: OrderedSet<string>) => [1]
-  );
-
-  OrderedSet<number>().flatMap<number>(
-    // $ExpectError
-    (value: number, key: number, iter: OrderedSet<number>) => ['a']
-  );
-}
-
-{
-  // #union
-
-  // $ExpectType OrderedSet<number>
-  OrderedSet<number>().union(OrderedSet<number>());
-
-  // $ExpectType OrderedSet<string | number>
-  OrderedSet<number>().union(OrderedSet<string>());
-
-  // $ExpectType OrderedSet<string | number>
-  OrderedSet<number | string>().union(OrderedSet<string>());
-
-  // $ExpectType OrderedSet<string | number>
-  OrderedSet<number | string>().union(OrderedSet<number>());
-}
-
-{
-  // #merge
-
-  // $ExpectType OrderedSet<number>
-  OrderedSet<number>().merge(OrderedSet<number>());
-
-  // $ExpectType OrderedSet<string | number>
-  OrderedSet<number>().merge(OrderedSet<string>());
-
-  // $ExpectType OrderedSet<string | number>
-  OrderedSet<number | string>().merge(OrderedSet<string>());
-
-  // $ExpectType OrderedSet<string | number>
-  OrderedSet<number | string>().merge(OrderedSet<number>());
-}
-
-{
-  // #intersect
-
-  // $ExpectType OrderedSet<number>
-  OrderedSet<number>().intersect(OrderedSet<number>());
-
-  // $ExpectError
-  OrderedSet<number>().intersect(OrderedSet<string>());
-
-  // $ExpectType OrderedSet<string | number>
-  OrderedSet<number | string>().intersect(OrderedSet<string>());
-
-  // $ExpectType OrderedSet<string | number>
-  OrderedSet<number | string>().intersect(OrderedSet<number>());
-}
-
-{
-  // #subtract
-
-  // $ExpectType OrderedSet<number>
-  OrderedSet<number>().subtract(OrderedSet<number>());
-
-  // $ExpectError
-  OrderedSet<number>().subtract(OrderedSet<string>());
-
-  // $ExpectType OrderedSet<string | number>
-  OrderedSet<number | string>().subtract(OrderedSet<string>());
-
-  // $ExpectType OrderedSet<string | number>
-  OrderedSet<number | string>().subtract(OrderedSet<number>());
-}
-
-{
-  // #flatten
-
-  // $ExpectType Collection<unknown, unknown>
-  OrderedSet<number>().flatten();
-
-  // $ExpectType Collection<unknown, unknown>
-  OrderedSet<number>().flatten(10);
-
-  // $ExpectType Collection<unknown, unknown>
-  OrderedSet<number>().flatten(false);
-
-  // $ExpectError
-  OrderedSet<number>().flatten('a');
-}
-
-{
-  // #withMutations
-
-  // $ExpectType OrderedSet<number>
-  OrderedSet<number>().withMutations((mutable) => mutable);
-
-  // $ExpectError
-  OrderedSet<number>().withMutations((mutable: OrderedSet<string>) => mutable);
-}
-
-{
-  // #asMutable
-
-  // $ExpectType OrderedSet<number>
-  OrderedSet<number>().asMutable();
-}
-
-{
-  // #asImmutable
-
-  // $ExpectType OrderedSet<number>
-  OrderedSet<number>().asImmutable();
-}
+  expect(OrderedSet.fromKeys({ a: 1 })).type.toBe<OrderedSet<string>>();
+
+  expect(
+    OrderedSet.fromKeys<number>(Map<string, string>())
+  ).type.toRaiseError();
+
+  expect(
+    OrderedSet.fromKeys<number | string>(Map<number | string, string>())
+  ).type.toBe<OrderedSet<string | number>>();
+});
+
+test('#get', () => {
+  expect(OrderedSet<number>().get(4)).type.toBe<number | undefined>();
+
+  expect(OrderedSet<number>().get(4, 'a')).type.toBe<number | 'a'>();
+
+  expect(OrderedSet<number>().get<number>(4, 'a')).type.toRaiseError();
+});
+
+test('#delete', () => {
+  expect(OrderedSet<number>().delete(0)).type.toBe<OrderedSet<number>>();
+
+  expect(OrderedSet<number>().delete('a')).type.toRaiseError();
+});
+
+test('#remove', () => {
+  expect(OrderedSet<number>().remove(0)).type.toBe<OrderedSet<number>>();
+
+  expect(OrderedSet<number>().remove('a')).type.toRaiseError();
+});
+
+test('#clear', () => {
+  expect(OrderedSet<number>().clear()).type.toBe<OrderedSet<number>>();
+
+  expect(OrderedSet().clear(10)).type.toRaiseError();
+});
+
+test('#map', () => {
+  expect(
+    OrderedSet<number>().map(
+      (value: number, key: number, iter: OrderedSet<number>) => 1
+    )
+  ).type.toBe<OrderedSet<number>>();
+
+  expect(
+    OrderedSet<number>().map(
+      (value: number, key: number, iter: OrderedSet<number>) => 'a'
+    )
+  ).type.toBe<OrderedSet<string>>();
+
+  expect(
+    OrderedSet<number>().map<number>(
+      (value: number, key: number, iter: OrderedSet<number>) => 1
+    )
+  ).type.toBe<OrderedSet<number>>();
+
+  expect(
+    OrderedSet<number>().map<string>(
+      (value: number, key: number, iter: OrderedSet<number>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedSet<number>().map<number>(
+      (value: string, key: number, iter: OrderedSet<number>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedSet<number>().map<number>(
+      (value: number, key: string, iter: OrderedSet<number>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedSet<number>().map<number>(
+      (value: number, key: number, iter: OrderedSet<string>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedSet<number>().map<number>(
+      (value: number, key: number, iter: OrderedSet<number>) => 'a'
+    )
+  ).type.toRaiseError();
+});
+
+test('#flatMap', () => {
+  expect(
+    OrderedSet<number>().flatMap(
+      (value: number, key: number, iter: OrderedSet<number>) => [1]
+    )
+  ).type.toBe<OrderedSet<number>>();
+
+  expect(
+    OrderedSet<number>().flatMap(
+      (value: number, key: number, iter: OrderedSet<number>) => ['a']
+    )
+  ).type.toBe<OrderedSet<string>>();
+
+  expect(
+    OrderedSet<number>().flatMap<number>(
+      (value: number, key: number, iter: OrderedSet<number>) => [1]
+    )
+  ).type.toBe<OrderedSet<number>>();
+
+  expect(
+    OrderedSet<number>().flatMap<string>(
+      (value: number, key: number, iter: OrderedSet<number>) => [1]
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedSet<number>().flatMap<number>(
+      (value: string, key: number, iter: OrderedSet<number>) => [1]
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedSet<number>().flatMap<number>(
+      (value: number, key: string, iter: OrderedSet<number>) => [1]
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedSet<number>().flatMap<number>(
+      (value: number, key: number, iter: OrderedSet<string>) => [1]
+    )
+  ).type.toRaiseError();
+
+  expect(
+    OrderedSet<number>().flatMap<number>(
+      (value: number, key: number, iter: OrderedSet<number>) => ['a']
+    )
+  ).type.toRaiseError();
+});
+
+test('#union', () => {
+  expect(OrderedSet<number>().union(OrderedSet<number>())).type.toBe<
+    OrderedSet<number>
+  >();
+
+  expect(OrderedSet<number>().union(OrderedSet<string>())).type.toBe<
+    OrderedSet<string | number>
+  >();
+
+  expect(OrderedSet<number | string>().union(OrderedSet<string>())).type.toBe<
+    OrderedSet<string | number>
+  >();
+
+  expect(OrderedSet<number | string>().union(OrderedSet<number>())).type.toBe<
+    OrderedSet<string | number>
+  >();
+});
+
+test('#merge', () => {
+  expect(OrderedSet<number>().merge(OrderedSet<number>())).type.toBe<
+    OrderedSet<number>
+  >();
+
+  expect(OrderedSet<number>().merge(OrderedSet<string>())).type.toBe<
+    OrderedSet<string | number>
+  >();
+
+  expect(OrderedSet<number | string>().merge(OrderedSet<string>())).type.toBe<
+    OrderedSet<string | number>
+  >();
+
+  expect(OrderedSet<number | string>().merge(OrderedSet<number>())).type.toBe<
+    OrderedSet<string | number>
+  >();
+});
+
+test('#intersect', () => {
+  expect(OrderedSet<number>().intersect(OrderedSet<number>())).type.toBe<
+    OrderedSet<number>
+  >();
+
+  expect(
+    OrderedSet<number>().intersect(OrderedSet<string>())
+  ).type.toRaiseError();
+
+  expect(
+    OrderedSet<number | string>().intersect(OrderedSet<string>())
+  ).type.toBe<OrderedSet<string | number>>();
+
+  expect(
+    OrderedSet<number | string>().intersect(OrderedSet<number>())
+  ).type.toBe<OrderedSet<string | number>>();
+});
+
+test('#subtract', () => {
+  expect(OrderedSet<number>().subtract(OrderedSet<number>())).type.toBe<
+    OrderedSet<number>
+  >();
+
+  expect(
+    OrderedSet<number>().subtract(OrderedSet<string>())
+  ).type.toRaiseError();
+
+  expect(
+    OrderedSet<number | string>().subtract(OrderedSet<string>())
+  ).type.toBe<OrderedSet<string | number>>();
+
+  expect(
+    OrderedSet<number | string>().subtract(OrderedSet<number>())
+  ).type.toBe<OrderedSet<string | number>>();
+});
+
+test('#flatten', () => {
+  expect(OrderedSet<number>().flatten()).type.toBe<
+    Collection<unknown, unknown>
+  >();
+
+  expect(OrderedSet<number>().flatten(10)).type.toBe<
+    Collection<unknown, unknown>
+  >();
+
+  expect(OrderedSet<number>().flatten(false)).type.toBe<
+    Collection<unknown, unknown>
+  >();
+
+  expect(OrderedSet<number>().flatten('a')).type.toRaiseError();
+});
+
+test('#withMutations', () => {
+  expect(OrderedSet<number>().withMutations(mutable => mutable)).type.toBe<
+    OrderedSet<number>
+  >();
+
+  expect(
+    OrderedSet<number>().withMutations((mutable: OrderedSet<string>) => mutable)
+  ).type.toRaiseError();
+});
+
+test('#asMutable', () => {
+  expect(OrderedSet<number>().asMutable()).type.toBe<OrderedSet<number>>();
+});
+
+test('#asImmutable', () => {
+  expect(OrderedSet<number>().asImmutable()).type.toBe<OrderedSet<number>>();
+});
diff --git a/type-definitions/ts-tests/partition.ts b/type-definitions/ts-tests/partition.ts
index 91233282f..f822a73d4 100644
--- a/type-definitions/ts-tests/partition.ts
+++ b/type-definitions/ts-tests/partition.ts
@@ -1,146 +1,183 @@
-import { Collection, List, Map, OrderedMap, OrderedSet, Seq, Set } from "immutable";
+import { expect, test } from 'tstyche';
+import {
+  Collection,
+  List,
+  Map,
+  OrderedMap,
+  OrderedSet,
+  Seq,
+  Set,
+} from 'immutable';
 
 abstract class A {}
 class B extends A {}
 
-{
-    type Indexed<T> = Collection.Indexed<T>;
-    type Keyed<K, V> = Collection.Keyed<K, V>;
-    type Set<T> = Collection.Set<T>;
-
-    (c: Collection<string, number>) => {
-        // $ExpectType [Collection<string, number>, Collection<string, number>]
-        c.partition((x) => x % 2);
-    };
-
-    (c: Collection<string, A>) => {
-        // $ExpectType [Collection<string, A>, Collection<string, B>]
-        c.partition((x): x is B => x instanceof B);
-    };
-
-    (c: Keyed<string, number>) => {
-        // $ExpectType [Keyed<string, number>, Keyed<string, number>]
-        c.partition((x) => x % 2);
-    };
-
-    (c: Keyed<string, A>) => {
-        // $ExpectType [Keyed<string, A>, Keyed<string, B>]
-        c.partition((x): x is B => x instanceof B);
-    };
-
-    (c: Indexed<number>) => {
-        // $ExpectType [Indexed<number>, Indexed<number>]
-        c.partition((x) => x % 2);
-    };
-
-    (c: Indexed<A>) => {
-        // $ExpectType [Indexed<A>, Indexed<B>]
-        c.partition((x): x is B => x instanceof B);
-    };
-
-    (c: Set<number>) => {
-        // $ExpectType [Set<number>, Set<number>]
-        c.partition((x) => x % 2);
-    };
-
-    (c: Set<A>) => {
-        // $ExpectType [Set<A>, Set<B>]
-        c.partition((x): x is B => x instanceof B);
-    };
-}
-
-{
-    type Indexed<T> = Seq.Indexed<T>;
-    type Keyed<K, V> = Seq.Keyed<K, V>;
-    type Set<T> = Seq.Set<T>;
-
-    (c: Seq<string, number>) => {
-        // $ExpectType [Seq<string, number>, Seq<string, number>]
-        c.partition((x) => x % 2);
-    };
-
-    (c: Seq<string, A>) => {
-        // $ExpectType [Seq<string, A>, Seq<string, B>]
-        c.partition((x): x is B => x instanceof B);
-    };
-
-    (c: Keyed<string, number>) => {
-        // $ExpectType [Keyed<string, number>, Keyed<string, number>]
-        c.partition((x) => x % 2);
-    };
-
-    (c: Keyed<string, A>) => {
-        // $ExpectType [Keyed<string, A>, Keyed<string, B>]
-        c.partition((x): x is B => x instanceof B);
-    };
-
-    (c: Indexed<number>) => {
-        // $ExpectType [Indexed<number>, Indexed<number>]
-        c.partition((x) => x % 2);
-    };
-
-    (c: Indexed<A>) => {
-        // $ExpectType [Indexed<A>, Indexed<B>]
-        c.partition((x): x is B => x instanceof B);
-    };
-
-    (c: Set<number>) => {
-        // $ExpectType [Set<number>, Set<number>]
-        c.partition((x) => x % 2);
-    };
-
-    (c: Set<A>) => {
-        // $ExpectType [Set<A>, Set<B>]
-        c.partition((x): x is B => x instanceof B);
-    };
-}
-
-(c: Map<string, number>) => {
-    // $ExpectType [Map<string, number>, Map<string, number>]
-    c.partition((x) => x % 2);
-};
-
-(c: Map<string, A>) => {
-    // $ExpectType [Map<string, A>, Map<string, B>]
-    c.partition((x): x is B => x instanceof B);
-};
-
-(c: OrderedMap<string, number>) => {
-    // $ExpectType [OrderedMap<string, number>, OrderedMap<string, number>]
-    c.partition((x) => x % 2);
-};
-
-(c: OrderedMap<string, A>) => {
-    // $ExpectType [OrderedMap<string, A>, OrderedMap<string, B>]
-    c.partition((x): x is B => x instanceof B);
-};
-
-(c: List<number>) => {
-    // $ExpectType [List<number>, List<number>]
-    c.partition((x) => x % 2);
-};
-
-(c: List<A>) => {
-    // $ExpectType [List<A>, List<B>]
-    c.partition((x): x is B => x instanceof B);
-};
-
-(c: Set<number>) => {
-    // $ExpectType [Set<number>, Set<number>]
-    c.partition((x) => x % 2);
-};
-
-(c: Set<A>) => {
-    // $ExpectType [Set<A>, Set<B>]
-    c.partition((x): x is B => x instanceof B);
-};
-
-(c: OrderedSet<number>) => {
-    // $ExpectType [OrderedSet<number>, OrderedSet<number>]
-    c.partition((x) => x % 2);
-};
-
-(c: OrderedSet<A>) => {
-    // $ExpectType [OrderedSet<A>, OrderedSet<B>]
-    c.partition((x): x is B => x instanceof B);
-};
+test('Collection', () => {
+  type Indexed<T> = Collection.Indexed<T>;
+  type Keyed<K, V> = Collection.Keyed<K, V>;
+  type Set<T> = Collection.Set<T>;
+
+  (c: Collection<string, number>) => {
+    expect(c.partition(x => x % 2)).type.toBe<
+      [Collection<string, number>, Collection<string, number>]
+    >();
+  };
+
+  (c: Collection<string, A>) => {
+    expect(c.partition((x): x is B => x instanceof B)).type.toBe<
+      [Collection<string, A>, Collection<string, B>]
+    >();
+  };
+
+  (c: Keyed<string, number>) => {
+    expect(c.partition(x => x % 2)).type.toBe<
+      [Keyed<string, number>, Keyed<string, number>]
+    >();
+  };
+
+  (c: Keyed<string, A>) => {
+    expect(c.partition((x): x is B => x instanceof B)).type.toBe<
+      [Keyed<string, A>, Keyed<string, B>]
+    >();
+  };
+
+  (c: Indexed<number>) => {
+    expect(c.partition(x => x % 2)).type.toBe<
+      [Indexed<number>, Indexed<number>]
+    >();
+  };
+
+  (c: Indexed<A>) => {
+    expect(c.partition((x): x is B => x instanceof B)).type.toBe<
+      [Indexed<A>, Indexed<B>]
+    >();
+  };
+
+  (c: Set<number>) => {
+    expect(c.partition(x => x % 2)).type.toBe<[Set<number>, Set<number>]>();
+  };
+
+  (c: Set<A>) => {
+    expect(c.partition((x): x is B => x instanceof B)).type.toBe<
+      [Set<A>, Set<B>]
+    >();
+  };
+});
+
+test('Seq', () => {
+  type Indexed<T> = Seq.Indexed<T>;
+  type Keyed<K, V> = Seq.Keyed<K, V>;
+  type Set<T> = Seq.Set<T>;
+
+  (c: Seq<string, number>) => {
+    expect(c.partition(x => x % 2)).type.toBe<
+      [Seq<string, number>, Seq<string, number>]
+    >();
+  };
+
+  (c: Seq<string, A>) => {
+    expect(c.partition((x): x is B => x instanceof B)).type.toBe<
+      [Seq<string, A>, Seq<string, B>]
+    >();
+  };
+
+  (c: Keyed<string, number>) => {
+    expect(c.partition(x => x % 2)).type.toBe<
+      [Keyed<string, number>, Keyed<string, number>]
+    >();
+  };
+
+  (c: Keyed<string, A>) => {
+    expect(c.partition((x): x is B => x instanceof B)).type.toBe<
+      [Keyed<string, A>, Keyed<string, B>]
+    >();
+  };
+
+  (c: Indexed<number>) => {
+    expect(c.partition(x => x % 2)).type.toBe<
+      [Indexed<number>, Indexed<number>]
+    >();
+  };
+
+  (c: Indexed<A>) => {
+    expect(c.partition((x): x is B => x instanceof B)).type.toBe<
+      [Indexed<A>, Indexed<B>]
+    >();
+  };
+
+  (c: Set<number>) => {
+    expect(c.partition(x => x % 2)).type.toBe<[Set<number>, Set<number>]>();
+  };
+
+  (c: Set<A>) => {
+    expect(c.partition((x): x is B => x instanceof B)).type.toBe<
+      [Set<A>, Set<B>]
+    >();
+  };
+});
+
+test('Map', () => {
+  (c: Map<string, number>) => {
+    expect(c.partition(x => x % 2)).type.toBe<
+      [Map<string, number>, Map<string, number>]
+    >();
+  };
+
+  (c: Map<string, A>) => {
+    expect(c.partition((x): x is B => x instanceof B)).type.toBe<
+      [Map<string, A>, Map<string, B>]
+    >();
+  };
+});
+
+test('OrderedMap', () => {
+  (c: OrderedMap<string, number>) => {
+    expect(c.partition(x => x % 2)).type.toBe<
+      [OrderedMap<string, number>, OrderedMap<string, number>]
+    >();
+  };
+
+  (c: OrderedMap<string, A>) => {
+    expect(c.partition((x): x is B => x instanceof B)).type.toBe<
+      [OrderedMap<string, A>, OrderedMap<string, B>]
+    >();
+  };
+});
+
+test('List', () => {
+  (c: List<number>) => {
+    expect(c.partition(x => x % 2)).type.toBe<[List<number>, List<number>]>();
+  };
+
+  (c: List<A>) => {
+    expect(c.partition((x): x is B => x instanceof B)).type.toBe<
+      [List<A>, List<B>]
+    >();
+  };
+});
+
+test('Set', () => {
+  (c: Set<number>) => {
+    expect(c.partition(x => x % 2)).type.toBe<[Set<number>, Set<number>]>();
+  };
+
+  (c: Set<A>) => {
+    expect(c.partition((x): x is B => x instanceof B)).type.toBe<
+      [Set<A>, Set<B>]
+    >();
+  };
+});
+
+test('OrderedSet', () => {
+  (c: OrderedSet<number>) => {
+    expect(c.partition(x => x % 2)).type.toBe<
+      [OrderedSet<number>, OrderedSet<number>]
+    >();
+  };
+
+  (c: OrderedSet<A>) => {
+    expect(c.partition((x): x is B => x instanceof B)).type.toBe<
+      [OrderedSet<A>, OrderedSet<B>]
+    >();
+  };
+});
diff --git a/type-definitions/ts-tests/range.ts b/type-definitions/ts-tests/range.ts
index 7429c44e7..79db18411 100644
--- a/type-definitions/ts-tests/range.ts
+++ b/type-definitions/ts-tests/range.ts
@@ -1,17 +1,12 @@
-import { Range } from 'immutable';
+import { expect, test } from 'tstyche';
+import { Range, Seq } from 'immutable';
 
-{
-  // #constructor
+test('#constructor', () => {
+  expect(Range(0, 0, 1)).type.toBe<Seq.Indexed<number>>();
 
-  // $ExpectType Indexed<number>
-  Range(0, 0, 1);
+  expect(Range('a', 0, 0)).type.toRaiseError();
 
-  // $ExpectError
-  Range('a', 0, 0);
+  expect(Range()).type.toRaiseError();
 
-  // $ExpectError
-  Range();
-
-  // $ExpectError
-  Range(1);
-}
+  expect(Range(1)).type.toRaiseError();
+});
diff --git a/type-definitions/ts-tests/record.ts b/type-definitions/ts-tests/record.ts
index 99723ad73..70a333604 100644
--- a/type-definitions/ts-tests/record.ts
+++ b/type-definitions/ts-tests/record.ts
@@ -1,34 +1,28 @@
-import { List, Map, Record, RecordOf, Set } from 'immutable';
+import { expect, test } from 'tstyche';
+import { List, Map, MapOf, Record, RecordOf, Set } from 'immutable';
 
-{
-  // Factory
+test('Factory', () => {
   const PointXY = Record({ x: 0, y: 0 });
 
-  // $ExpectType Factory<{ x: number; y: number; }>
-  PointXY;
+  expect(PointXY).type.toBe<Record.Factory<{ x: number; y: number }>>();
 
-  // $ExpectError
-  PointXY({ x: 'a' });
+  expect(PointXY({ x: 'a' })).type.toRaiseError();
 
   const pointXY = PointXY();
 
-  // $ExpectType Record<{ x: number; y: number; }> & Readonly<{ x: number; y: number; }>
-  pointXY;
+  expect(pointXY).type.toBe<
+    Record<{ x: number; y: number }> & Readonly<{ x: number; y: number }>
+  >();
 
-  // $ExpectType number
-  pointXY.x;
+  expect(pointXY.x).type.toBeNumber();
 
-  // $ExpectError
-  pointXY.x = 10;
+  expect(pointXY).type.toMatch<{ readonly x: number }>();
 
-  // $ExpectType number
-  pointXY.y;
+  expect(pointXY.y).type.toBeNumber();
 
-  // $ExpectError
-  pointXY.y = 10;
+  expect(pointXY).type.toMatch<{ readonly y: number }>();
 
-  // $ExpectType { x: number; y: number; }
-  pointXY.toJS();
+  expect(pointXY.toJS()).type.toBe<{ x: number; y: number }>();
 
   class PointClass extends PointXY {
     setX(x: number) {
@@ -42,41 +36,30 @@ import { List, Map, Record, RecordOf, Set } from 'immutable';
 
   const point = new PointClass();
 
-  // $ExpectType PointClass
-  point;
+  expect(point).type.toBe<PointClass>();
 
-  // $ExpectType number
-  point.x;
+  expect(point.x).type.toBeNumber();
 
-  // $ExpectType number
-  point.y;
+  expect(point.y).type.toBeNumber();
 
-  // $ExpectType PointClass
-  point.setX(10);
+  expect(point.setX(10)).type.toBe<PointClass>();
 
-  // $ExpectType PointClass
-  point.setY(10);
+  expect(point.setY(10)).type.toBe<PointClass>();
 
-  // $ExpectType { x: number; y: number; }
-  point.toJSON();
+  expect(point.toJSON()).type.toBe<{ x: number; y: number }>();
 
-  // $ExpectType { x: number; y: number; }
-  point.toJS();
-}
+  expect(point.toJS()).type.toBe<{ x: number; y: number }>();
+});
 
-{
-  // .getDescriptiveName
+test('.getDescriptiveName', () => {
   const PointXY = Record({ x: 0, y: 0 });
 
-  // $ExpectType string
-  Record.getDescriptiveName(PointXY());
+  expect(Record.getDescriptiveName(PointXY())).type.toBeString();
 
-  // $ExpectError
-  Record.getDescriptiveName({});
-}
+  expect(Record.getDescriptiveName({})).type.toRaiseError();
+});
 
-{
-  // Factory
+test('Factory', () => {
   const WithMap = Record({
     map: Map({ a: 'A' }),
     list: List(['a']),
@@ -85,36 +68,47 @@ import { List, Map, Record, RecordOf, Set } from 'immutable';
 
   const withMap = WithMap();
 
-  // $ExpectType { map: MapOf<{ a: string; }>; list: List<string>; set: Set<string>; }
-  withMap.toJSON();
+  expect(withMap.toJSON()).type.toBe<{
+    map: MapOf<{ a: string }>;
+    list: List<string>;
+    set: Set<string>;
+  }>();
 
   // should be `{ map: { a: string; }; list: string[]; set: string[]; }` but there is an issue with circular references
-  // $ExpectType { map: unknown; list: unknown; set: unknown; }
-  withMap.toJS();
-}
-
-{
-  // optional properties
-
-  interface Size { distance: string; }
+  expect(withMap.toJS()).type.toBe<{
+    map: unknown;
+    list: unknown;
+    set: unknown;
+  }>();
+});
+
+test('optional properties', () => {
+  interface Size {
+    distance: string;
+  }
 
-  const Line = Record<{ size?: Size, color?: string }>({ size: undefined, color: 'red' });
+  const Line = Record<{ size?: Size; color?: string }>({
+    size: undefined,
+    color: 'red',
+  });
 
   const line = Line({});
 
   // should be  { size?: { distance: string; } | undefined; color?: string | undefined; } but there is an issue with circular references
-  // $ExpectType { size?: unknown; color?: string | undefined; }
-  line.toJS();
-}
-
-{
-  // similar properties, but one is optional. See https://github.com/immutable-js/immutable-js/issues/1930
+  expect(line.toJS()).type.toBe<{
+    size?: unknown;
+    color?: string | undefined;
+  }>();
+});
 
-  interface Id { value: string; }
+test('similar properties, but one is optional', () => {
+  // see https://github.com/immutable-js/immutable-js/issues/1930
 
-  type A = RecordOf<{ id: Id }>;
-  type B = RecordOf<{ id?: Id }>;
+  interface Id {
+    value: string;
+  }
 
-  const a: A = null as any;
-  const b: B = a;
-}
+  expect<RecordOf<{ id?: Id }>>().type.toBeAssignableWith<
+    RecordOf<{ id: Id }>
+  >();
+});
diff --git a/type-definitions/ts-tests/repeat.ts b/type-definitions/ts-tests/repeat.ts
index 2a62f624d..9506b753f 100644
--- a/type-definitions/ts-tests/repeat.ts
+++ b/type-definitions/ts-tests/repeat.ts
@@ -1,14 +1,10 @@
-import { Repeat } from 'immutable';
+import { expect, test } from 'tstyche';
+import { Repeat, Seq } from 'immutable';
 
-{
-  // #constructor
+test('#constructor', () => {
+  expect(Repeat(0, 0)).type.toBe<Seq.Indexed<number>>();
 
-  // $ExpectType Indexed<number>
-  Repeat(0, 0);
+  expect(Repeat('a', 0)).type.toBe<Seq.Indexed<string>>();
 
-  // $ExpectType Indexed<string>
-  Repeat('a', 0);
-
-  // $ExpectError
-  Repeat('a', 'b');
-}
+  expect(Repeat('a', 'b')).type.toRaiseError();
+});
diff --git a/type-definitions/ts-tests/seq.ts b/type-definitions/ts-tests/seq.ts
index 60356e1bb..b2524b8ff 100644
--- a/type-definitions/ts-tests/seq.ts
+++ b/type-definitions/ts-tests/seq.ts
@@ -1,18 +1,12 @@
+import { expect, test } from 'tstyche';
 import { Seq } from 'immutable';
 
-{
-  // #constructor
+test('#constructor', () => {
+  expect(Seq([1, 2, 3])).type.toBe<Seq.Indexed<number>>();
+});
 
-  // $ExpectType Indexed<number>
-  Seq([1, 2, 3]);
-}
+test('#size', () => {
+  expect(Seq().size).type.toBe<number | undefined>();
 
-{
-  // #size
-
-  // $ExpectType number | undefined
-  Seq().size;
-
-  // $ExpectError
-  Seq().size = 10;
-}
+  expect(Seq()).type.toMatch<{ readonly size: number | undefined }>();
+});
diff --git a/type-definitions/ts-tests/set.ts b/type-definitions/ts-tests/set.ts
index 429be4168..8bd565e42 100644
--- a/type-definitions/ts-tests/set.ts
+++ b/type-definitions/ts-tests/set.ts
@@ -1,294 +1,256 @@
+import { expect, test } from 'tstyche';
 import { Set, Map, Collection } from 'immutable';
 
-{
-  // #constructor
+test('#constructor', () => {
+  expect(Set()).type.toBe<Set<unknown>>();
 
-  // $ExpectType Set<unknown>
-  Set();
+  expect(Set<number>()).type.toBe<Set<number>>();
 
-  const numberSet: Set<number> = Set<number>();
-  const numberOrStringSet: Set<number | string> = Set([1, 'a']);
+  expect(Set([1, 'a'])).type.toBe<Set<number | string>>();
 
-  // $ExpectError
-  const invalidNumberSet: Set<number> = Set([1, 'a']);
-}
+  expect<Set<number>>().type.not.toBeAssignableWith(Set([1, 'a']));
+});
 
-{
-  // #size
+test('#size', () => {
+  expect(Set().size).type.toBeNumber();
 
-  // $ExpectType number
-  Set().size;
+  expect(Set()).type.toMatch<{ readonly size: number }>();
+});
 
-  // $ExpectError
-  Set().size = 10;
-}
+test('.of', () => {
+  expect(Set.of(1, 2, 3)).type.toBe<Set<number>>();
 
-{
-  // .of
+  expect(Set.of<number>('a', 1)).type.toRaiseError();
 
-  // $ExpectType Set<number>
-  Set.of(1, 2, 3);
+  expect(Set.of<number | string>('a', 1)).type.toBe<Set<string | number>>();
+});
 
-  // $ExpectError
-  Set.of<number>('a', 1);
+test('.fromKeys', () => {
+  expect(Set.fromKeys(Map<number, string>())).type.toBe<Set<number>>();
 
-  // $ExpectType Set<string | number>
-  Set.of<number | string>('a', 1);
-}
+  expect(Set.fromKeys<number>(Map<number, string>())).type.toBe<Set<number>>();
 
-{
-  // .fromKeys
+  expect(Set.fromKeys({ a: 1 })).type.toBe<Set<string>>();
 
-  // $ExpectType Set<number>
-  Set.fromKeys(Map<number, string>());
+  expect(Set.fromKeys<number>(Map<string, string>())).type.toRaiseError();
 
-  // $ExpectType Set<number>
-  Set.fromKeys<number>(Map<number, string>());
+  expect(
+    Set.fromKeys<number | string>(Map<number | string, string>())
+  ).type.toBe<Set<string | number>>();
+});
 
-  // $ExpectType Set<string>
-  Set.fromKeys({ a: 1 });
+test('#get', () => {
+  expect(Set<number>().get(4)).type.toBe<number | undefined>();
 
-  // $ExpectError
-  Set.fromKeys<number>(Map<string, string>());
+  expect(Set<number>().get(4, 'a')).type.toBe<number | 'a'>();
 
-  // $ExpectType Set<string | number>
-  Set.fromKeys<number | string>(Map<number | string, string>());
-}
+  expect(Set<number>().get<number>(4, 'a')).type.toRaiseError();
+});
 
-{
-  // #get
+test('#delete', () => {
+  expect(Set<number>().delete(0)).type.toBe<Set<number>>();
 
-  // $ExpectType number | undefined
-  Set<number>().get(4);
+  expect(Set<number>().delete('a')).type.toRaiseError();
+});
 
-  // $ExpectType number | "a"
-  Set<number>().get(4, 'a');
+test('#remove', () => {
+  expect(Set<number>().remove(0)).type.toBe<Set<number>>();
 
-  // $ExpectError
-  Set<number>().get<number>(4, 'a');
-}
+  expect(Set<number>().remove('a')).type.toRaiseError();
+});
 
-{
-  // #delete
+test('#clear', () => {
+  expect(Set<number>().clear()).type.toBe<Set<number>>();
 
-  // $ExpectType Set<number>
-  Set<number>().delete(0);
+  expect(Set().clear(10)).type.toRaiseError();
+});
 
-  // $ExpectError
-  Set<number>().delete('a');
-}
-{
-  // #remove
+test('#map', () => {
+  expect(
+    Set<number>().map((value: number, key: number, iter: Set<number>) => 1)
+  ).type.toBe<Set<number>>();
 
-  // $ExpectType Set<number>
-  Set<number>().remove(0);
+  expect(
+    Set<number>().map((value: number, key: number, iter: Set<number>) => 'a')
+  ).type.toBe<Set<string>>();
 
-  // $ExpectError
-  Set<number>().remove('a');
-}
+  expect(
+    Set<number>().map<number>(
+      (value: number, key: number, iter: Set<number>) => 1
+    )
+  ).type.toBe<Set<number>>();
 
-{
-  // #clear
+  expect(
+    Set<number>().map<string>(
+      (value: number, key: number, iter: Set<number>) => 1
+    )
+  ).type.toRaiseError();
 
-  // $ExpectType Set<number>
-  Set<number>().clear();
+  expect(
+    Set<number>().map<number>(
+      (value: string, key: number, iter: Set<number>) => 1
+    )
+  ).type.toRaiseError();
 
-  // $ExpectError
-  Set().clear(10);
-}
+  expect(
+    Set<number>().map<number>(
+      (value: number, key: string, iter: Set<number>) => 1
+    )
+  ).type.toRaiseError();
 
-{
-  // #map
+  expect(
+    Set<number>().map<number>(
+      (value: number, key: number, iter: Set<string>) => 1
+    )
+  ).type.toRaiseError();
 
-  // $ExpectType Set<number>
-  Set<number>().map((value: number, key: number, iter: Set<number>) => 1);
+  expect(
+    Set<number>().map<number>(
+      (value: number, key: number, iter: Set<number>) => 'a'
+    )
+  ).type.toRaiseError();
+});
 
-  // $ExpectType Set<string>
-  Set<number>().map((value: number, key: number, iter: Set<number>) => 'a');
+test('#flatMap', () => {
+  expect(
+    Set<number>().flatMap((value: number, key: number, iter: Set<number>) => [
+      1,
+    ])
+  ).type.toBe<Set<number>>();
+
+  expect(
+    Set<number>().flatMap((value: number, key: number, iter: Set<number>) => [
+      'a',
+    ])
+  ).type.toBe<Set<string>>();
+
+  expect(
+    Set<number>().flatMap<number>(
+      (value: number, key: number, iter: Set<number>) => [1]
+    )
+  ).type.toBe<Set<number>>();
+
+  expect(
+    Set<number>().flatMap<string>(
+      (value: number, key: number, iter: Set<number>) => [1]
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Set<number>().flatMap<number>(
+      (value: string, key: number, iter: Set<number>) => [1]
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Set<number>().flatMap<number>(
+      (value: number, key: string, iter: Set<number>) => [1]
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Set<number>().flatMap<number>(
+      (value: number, key: number, iter: Set<string>) => [1]
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Set<number>().flatMap<number>(
+      (value: number, key: number, iter: Set<number>) => ['a']
+    )
+  ).type.toRaiseError();
+});
+
+test('#union', () => {
+  expect(Set<number>().union(Set<number>())).type.toBe<Set<number>>();
+
+  expect(Set<number>().union(Set<string>())).type.toBe<Set<string | number>>();
+
+  expect(Set<number | string>().union(Set<string>())).type.toBe<
+    Set<string | number>
+  >();
+
+  expect(Set<number | string>().union(Set<number>())).type.toBe<
+    Set<string | number>
+  >();
+});
+
+test('#merge', () => {
+  expect(Set<number>().merge(Set<number>())).type.toBe<Set<number>>();
+
+  expect(Set<number>().merge(Set<string>())).type.toBe<Set<string | number>>();
+
+  expect(Set<number | string>().merge(Set<string>())).type.toBe<
+    Set<string | number>
+  >();
+
+  expect(Set<number | string>().merge(Set<number>())).type.toBe<
+    Set<string | number>
+  >();
+});
+
+test('#intersect', () => {
+  expect(Set<number>().intersect(Set<number>())).type.toBe<Set<number>>();
+
+  expect(Set<number>().intersect(Set<string>())).type.toRaiseError();
+
+  expect(Set<number | string>().intersect(Set<string>())).type.toBe<
+    Set<string | number>
+  >();
+
+  expect(Set<number | string>().intersect(Set<number>())).type.toBe<
+    Set<string | number>
+  >();
+});
+
+test('#subtract', () => {
+  expect(Set<number>().subtract(Set<number>())).type.toBe<Set<number>>();
+
+  expect(Set<number>().subtract(Set<string>())).type.toRaiseError();
+
+  expect(Set<number | string>().subtract(Set<string>())).type.toBe<
+    Set<string | number>
+  >();
+
+  expect(Set<number | string>().subtract(Set<number>())).type.toBe<
+    Set<string | number>
+  >();
+});
+
+test('#flatten', () => {
+  expect(Set<number>().flatten()).type.toBe<Collection<unknown, unknown>>();
+
+  expect(Set<number>().flatten(10)).type.toBe<Collection<unknown, unknown>>();
+
+  expect(Set<number>().flatten(false)).type.toBe<
+    Collection<unknown, unknown>
+  >();
+
+  expect(Set<number>().flatten('a')).type.toRaiseError();
+});
 
-  // $ExpectType Set<number>
-  Set<number>().map<number>(
-    (value: number, key: number, iter: Set<number>) => 1
-  );
+test('#withMutations', () => {
+  expect(Set<number>().withMutations(mutable => mutable)).type.toBe<
+    Set<number>
+  >();
 
-  Set<number>().map<string>(
-    // $ExpectError
-    (value: number, key: number, iter: Set<number>) => 1
-  );
+  expect(
+    Set<number>().withMutations((mutable: Set<string>) => mutable)
+  ).type.toRaiseError();
+});
 
-  Set<number>().map<number>(
-    // $ExpectError
-    (value: string, key: number, iter: Set<number>) => 1
-  );
+test('#asMutable', () => {
+  expect(Set<number>().asMutable()).type.toBe<Set<number>>();
+});
 
-  Set<number>().map<number>(
-    // $ExpectError
-    (value: number, key: string, iter: Set<number>) => 1
-  );
+test('#asImmutable', () => {
+  expect(Set<number>().asImmutable()).type.toBe<Set<number>>();
+});
 
-  Set<number>().map<number>(
-    // $ExpectError
-    (value: number, key: number, iter: Set<string>) => 1
-  );
+test('#toJS', () => {
+  expect(Set<Set<number>>().toJS()).type.toBe<number[][]>();
+});
 
-  Set<number>().map<number>(
-    // $ExpectError
-    (value: number, key: number, iter: Set<number>) => 'a'
-  );
-}
-
-{
-  // #flatMap
-
-  // $ExpectType Set<number>
-  Set<number>().flatMap((value: number, key: number, iter: Set<number>) => [1]);
-
-  // $ExpectType Set<string>
-  Set<number>().flatMap((value: number, key: number, iter: Set<number>) => [
-    'a',
-  ]);
-
-  // $ExpectType Set<number>
-  Set<number>().flatMap<number>(
-    (value: number, key: number, iter: Set<number>) => [1]
-  );
-
-  Set<number>().flatMap<string>(
-    // $ExpectError
-    (value: number, key: number, iter: Set<number>) => [1]
-  );
-
-  Set<number>().flatMap<number>(
-    // $ExpectError
-    (value: string, key: number, iter: Set<number>) => [1]
-  );
-
-  Set<number>().flatMap<number>(
-    // $ExpectError
-    (value: number, key: string, iter: Set<number>) => [1]
-  );
-
-  Set<number>().flatMap<number>(
-    // $ExpectError
-    (value: number, key: number, iter: Set<string>) => [1]
-  );
-
-  Set<number>().flatMap<number>(
-    // $ExpectError
-    (value: number, key: number, iter: Set<number>) => ['a']
-  );
-}
-
-{
-  // #union
-
-  // $ExpectType Set<number>
-  Set<number>().union(Set<number>());
-
-  // $ExpectType Set<string | number>
-  Set<number>().union(Set<string>());
-
-  // $ExpectType Set<string | number>
-  Set<number | string>().union(Set<string>());
-
-  // $ExpectType Set<string | number>
-  Set<number | string>().union(Set<number>());
-}
-
-{
-  // #merge
-
-  // $ExpectType Set<number>
-  Set<number>().merge(Set<number>());
-
-  // $ExpectType Set<string | number>
-  Set<number>().merge(Set<string>());
-
-  // $ExpectType Set<string | number>
-  Set<number | string>().merge(Set<string>());
-
-  // $ExpectType Set<string | number>
-  Set<number | string>().merge(Set<number>());
-}
-
-{
-  // #intersect
-
-  // $ExpectType Set<number>
-  Set<number>().intersect(Set<number>());
-
-  // $ExpectError
-  Set<number>().intersect(Set<string>());
-
-  // $ExpectType Set<string | number>
-  Set<number | string>().intersect(Set<string>());
-
-  // $ExpectType Set<string | number>
-  Set<number | string>().intersect(Set<number>());
-}
-
-{
-  // #subtract
-
-  // $ExpectType Set<number>
-  Set<number>().subtract(Set<number>());
-
-  // $ExpectError
-  Set<number>().subtract(Set<string>());
-
-  // $ExpectType Set<string | number>
-  Set<number | string>().subtract(Set<string>());
-
-  // $ExpectType Set<string | number>
-  Set<number | string>().subtract(Set<number>());
-}
-
-{
-  // #flatten
-
-  // $ExpectType Collection<unknown, unknown>
-  Set<number>().flatten();
-
-  // $ExpectType Collection<unknown, unknown>
-  Set<number>().flatten(10);
-
-  // $ExpectType Collection<unknown, unknown>
-  Set<number>().flatten(false);
-
-  // $ExpectError
-  Set<number>().flatten('a');
-}
-
-{
-  // #withMutations
-
-  // $ExpectType Set<number>
-  Set<number>().withMutations((mutable) => mutable);
-
-  // $ExpectError
-  Set<number>().withMutations((mutable: Set<string>) => mutable);
-}
-
-{
-  // #asMutable
-
-  // $ExpectType Set<number>
-  Set<number>().asMutable();
-}
-
-{
-  // #asImmutable
-
-  // $ExpectType Set<number>
-  Set<number>().asImmutable();
-}
-
-{
-  // #toJS / #toJJSON
-
-  // $ExpectType number[][]
-  Set<Set<number>>().toJS();
-
-  // $ExpectType Set<number>[]
-  Set<Set<number>>().toJSON();
-}
+test('#toJSON', () => {
+  expect(Set<Set<number>>().toJSON()).type.toBe<Set<number>[]>();
+});
diff --git a/type-definitions/ts-tests/stack.ts b/type-definitions/ts-tests/stack.ts
index 5677e0808..5711cdb1a 100644
--- a/type-definitions/ts-tests/stack.ts
+++ b/type-definitions/ts-tests/stack.ts
@@ -1,262 +1,228 @@
-import { Stack } from 'immutable';
+import { expect, test } from 'tstyche';
+import { Collection, Stack } from 'immutable';
 
-{
-  // #constructor
+test('#constructor', () => {
+  expect(Stack()).type.toBe<Stack<unknown>>();
 
-  // $ExpectType Stack<unknown>
-  Stack();
+  expect(Stack<number>()).type.toBe<Stack<number>>();
 
-  const numberStack: Stack<number> = Stack<number>();
-  const numberOrStringStack: Stack<number | string> = Stack([1, 'a']);
+  expect(Stack([1, 'a'])).type.toBe<Stack<number | string>>();
+});
 
-  // $ExpectError
-  const invalidNumberStack: Stack<number> = Stack([1, 'a']);
-}
+test('#size', () => {
+  expect(Stack().size).type.toBeNumber();
 
-{
-  // #size
+  expect(Stack()).type.toMatch<{ readonly size: number }>();
+});
 
-  // $ExpectType number
-  Stack().size;
+test('.of', () => {
+  expect(Stack.of(1, 2, 3)).type.toBe<Stack<number>>();
 
-  // $ExpectError
-  Stack().size = 10;
-}
+  expect(Stack.of<number>('a', 1)).type.toRaiseError();
 
-{
-  // .of
+  expect(Stack.of<number | string>('a', 1)).type.toBe<Stack<string | number>>();
+});
 
-  // $ExpectType Stack<number>
-  Stack.of(1, 2, 3);
+test('#peek', () => {
+  expect(Stack<number>().peek()).type.toBe<number | undefined>();
+});
 
-  // $ExpectError
-  Stack.of<number>('a', 1);
+test('#push', () => {
+  expect(Stack<number>().push(0)).type.toBe<Stack<number>>();
 
-  // $ExpectType Stack<string | number>
-  Stack.of<number | string>('a', 1);
-}
+  expect(Stack<number>().push('a')).type.toRaiseError();
 
-{
-  // #peek
+  expect(Stack<number | string>().push(0)).type.toBe<Stack<string | number>>();
 
-  // $ExpectType number | undefined
-  Stack<number>().peek();
-}
+  expect(Stack<number | string>().push('a')).type.toBe<
+    Stack<string | number>
+  >();
+});
 
-{
-  // #push
+test('#pushAll', () => {
+  expect(Stack<number>().pushAll([0])).type.toBe<Stack<number>>();
 
-  // $ExpectType Stack<number>
-  Stack<number>().push(0);
+  expect(Stack<number>().pushAll(['a'])).type.toRaiseError();
 
-  // $ExpectError
-  Stack<number>().push('a');
+  expect(Stack<number | string>().pushAll([0])).type.toBe<
+    Stack<string | number>
+  >();
 
-  // $ExpectType Stack<string | number>
-  Stack<number | string>().push(0);
+  expect(Stack<number | string>().pushAll(['a'])).type.toBe<
+    Stack<string | number>
+  >();
+});
 
-  // $ExpectType Stack<string | number>
-  Stack<number | string>().push('a');
-}
+test('#unshift', () => {
+  expect(Stack<number>().unshift(0)).type.toBe<Stack<number>>();
 
-{
-  // #pushAll
+  expect(Stack<number>().unshift('a')).type.toRaiseError();
 
-  // $ExpectType Stack<number>
-  Stack<number>().pushAll([0]);
+  expect(Stack<number | string>().unshift(0)).type.toBe<
+    Stack<string | number>
+  >();
 
-  // $ExpectError
-  Stack<number>().pushAll(['a']);
+  expect(Stack<number | string>().unshift('a')).type.toBe<
+    Stack<string | number>
+  >();
+});
 
-  // $ExpectType Stack<string | number>
-  Stack<number | string>().pushAll([0]);
+test('#unshiftAll', () => {
+  expect(Stack<number>().unshiftAll([0])).type.toBe<Stack<number>>();
 
-  // $ExpectType Stack<string | number>
-  Stack<number | string>().pushAll(['a']);
-}
+  expect(Stack<number>().unshiftAll(['a'])).type.toRaiseError();
 
-{
-  // #unshift
+  expect(Stack<number | string>().unshiftAll([1])).type.toBe<
+    Stack<string | number>
+  >();
 
-  // $ExpectType Stack<number>
-  Stack<number>().unshift(0);
+  expect(Stack<number | string>().unshiftAll(['a'])).type.toBe<
+    Stack<string | number>
+  >();
+});
 
-  // $ExpectError
-  Stack<number>().unshift('a');
+test('#clear', () => {
+  expect(Stack<number>().clear()).type.toBe<Stack<number>>();
 
-  // $ExpectType Stack<string | number>
-  Stack<number | string>().unshift(0);
-
-  // $ExpectType Stack<string | number>
-  Stack<number | string>().unshift('a');
-}
-
-{
-  // #unshiftAll
-
-  // $ExpectType Stack<number>
-  Stack<number>().unshiftAll([0]);
-
-  // $ExpectError
-  Stack<number>().unshiftAll(['a']);
-
-  // $ExpectType Stack<string | number>
-  Stack<number | string>().unshiftAll([1]);
-
-  // $ExpectType Stack<string | number>
-  Stack<number | string>().unshiftAll(['a']);
-}
-
-{
-  // #clear
-
-  // $ExpectType Stack<number>
-  Stack<number>().clear();
-
-  // $ExpectError
-  Stack().clear(10);
-}
-
-{
-  // #pop
-
-  // $ExpectType Stack<number>
-  Stack<number>().pop();
-
-  // $ExpectError
-  Stack().pop(10);
-}
-
-{
-  // #shift
-
-  // $ExpectType Stack<number>
-  Stack<number>().shift();
-
-  // $ExpectError
-  Stack().shift(10);
-}
-
-{
-  // #map
-
-  // $ExpectType Stack<number>
-  Stack<number>().map((value: number, key: number, iter: Stack<number>) => 1);
-
-  // $ExpectType Stack<string>
-  Stack<number>().map((value: number, key: number, iter: Stack<number>) => 'a');
-
-  // $ExpectType Stack<number>
-  Stack<number>().map<number>(
-    (value: number, key: number, iter: Stack<number>) => 1
-  );
-
-  Stack<number>().map<string>(
-    // $ExpectError
-    (value: number, key: number, iter: Stack<number>) => 1
-  );
-
-  Stack<number>().map<number>(
-    // $ExpectError
-    (value: string, key: number, iter: Stack<number>) => 1
-  );
-
-  Stack<number>().map<number>(
-    // $ExpectError
-    (value: number, key: string, iter: Stack<number>) => 1
-  );
-
-  Stack<number>().map<number>(
-    // $ExpectError
-    (value: number, key: number, iter: Stack<string>) => 1
-  );
-
-  Stack<number>().map<number>(
-    // $ExpectError
-    (value: number, key: number, iter: Stack<number>) => 'a'
-  );
-}
-
-{
-  // #flatMap
-
-  // $ExpectType Stack<number>
-  Stack<number>().flatMap((value: number, key: number, iter: Stack<number>) => [
-    1,
-  ]);
-
-  // $ExpectType Stack<string>
-  Stack<number>().flatMap(
-    (value: number, key: number, iter: Stack<number>) => 'a'
-  );
-
-  // $ExpectType Stack<number>
-  Stack<number>().flatMap<number>(
-    (value: number, key: number, iter: Stack<number>) => [1]
-  );
-
-  Stack<number>().flatMap<string>(
-    // $ExpectError
-    (value: number, key: number, iter: Stack<number>) => 1
-  );
-
-  Stack<number>().flatMap<number>(
-    // $ExpectError
-    (value: string, key: number, iter: Stack<number>) => 1
-  );
-
-  Stack<number>().flatMap<number>(
-    // $ExpectError
-    (value: number, key: string, iter: Stack<number>) => 1
-  );
-
-  Stack<number>().flatMap<number>(
-    // $ExpectError
-    (value: number, key: number, iter: Stack<string>) => 1
-  );
-
-  Stack<number>().flatMap<number>(
-    // $ExpectError
-    (value: number, key: number, iter: Stack<number>) => 'a'
-  );
-}
-
-{
-  // #flatten
-
-  // $ExpectType Collection<unknown, unknown>
-  Stack<number>().flatten();
-
-  // $ExpectType Collection<unknown, unknown>
-  Stack<number>().flatten(10);
-
-  // $ExpectType Collection<unknown, unknown>
-  Stack<number>().flatten(false);
-
-  // $ExpectError
-  Stack<number>().flatten('a');
-}
-
-{
-  // #withMutations
-
-  // $ExpectType Stack<number>
-  Stack<number>().withMutations((mutable) => mutable);
-
-  // $ExpectError
-  Stack<number>().withMutations((mutable: Stack<string>) => mutable);
-}
-
-{
-  // #asMutable
-
-  // $ExpectType Stack<number>
-  Stack<number>().asMutable();
-}
-
-{
-  // #asImmutable
-
-  // $ExpectType Stack<number>
-  Stack<number>().asImmutable();
-}
+  expect(Stack().clear(10)).type.toRaiseError();
+});
+
+test('#pop', () => {
+  expect(Stack<number>().pop()).type.toBe<Stack<number>>();
+
+  expect(Stack().pop(10)).type.toRaiseError();
+});
+
+test('#shift', () => {
+  expect(Stack<number>().shift()).type.toBe<Stack<number>>();
+
+  expect(Stack().shift(10)).type.toRaiseError();
+});
+
+test('#map', () => {
+  expect(
+    Stack<number>().map((value: number, key: number, iter: Stack<number>) => 1)
+  ).type.toBe<Stack<number>>();
+
+  expect(
+    Stack<number>().map(
+      (value: number, key: number, iter: Stack<number>) => 'a'
+    )
+  ).type.toBe<Stack<string>>();
+
+  expect(
+    Stack<number>().map<number>(
+      (value: number, key: number, iter: Stack<number>) => 1
+    )
+  ).type.toBe<Stack<number>>();
+
+  expect(
+    Stack<number>().map<string>(
+      (value: number, key: number, iter: Stack<number>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Stack<number>().map<number>(
+      (value: string, key: number, iter: Stack<number>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Stack<number>().map<number>(
+      (value: number, key: string, iter: Stack<number>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Stack<number>().map<number>(
+      (value: number, key: number, iter: Stack<string>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Stack<number>().map<number>(
+      (value: number, key: number, iter: Stack<number>) => 'a'
+    )
+  ).type.toRaiseError();
+});
+
+test('#flatMap', () => {
+  expect(
+    Stack<number>().flatMap(
+      (value: number, key: number, iter: Stack<number>) => [1]
+    )
+  ).type.toBe<Stack<number>>();
+
+  expect(
+    Stack<number>().flatMap(
+      (value: number, key: number, iter: Stack<number>) => 'a'
+    )
+  ).type.toBe<Stack<string>>();
+
+  expect(
+    Stack<number>().flatMap<number>(
+      (value: number, key: number, iter: Stack<number>) => [1]
+    )
+  ).type.toBe<Stack<number>>();
+
+  expect(
+    Stack<number>().flatMap<string>(
+      (value: number, key: number, iter: Stack<number>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Stack<number>().flatMap<number>(
+      (value: string, key: number, iter: Stack<number>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Stack<number>().flatMap<number>(
+      (value: number, key: string, iter: Stack<number>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Stack<number>().flatMap<number>(
+      (value: number, key: number, iter: Stack<string>) => 1
+    )
+  ).type.toRaiseError();
+
+  expect(
+    Stack<number>().flatMap<number>(
+      (value: number, key: number, iter: Stack<number>) => 'a'
+    )
+  ).type.toRaiseError();
+});
+
+test('#flatten', () => {
+  expect(Stack<number>().flatten()).type.toBe<Collection<unknown, unknown>>();
+
+  expect(Stack<number>().flatten(10)).type.toBe<Collection<unknown, unknown>>();
+
+  expect(Stack<number>().flatten(false)).type.toBe<
+    Collection<unknown, unknown>
+  >();
+
+  expect(Stack<number>().flatten('a')).type.toRaiseError();
+});
+
+test('#withMutations', () => {
+  expect(Stack<number>().withMutations(mutable => mutable)).type.toBe<
+    Stack<number>
+  >();
+
+  expect(
+    Stack<number>().withMutations((mutable: Stack<string>) => mutable)
+  ).type.toRaiseError();
+});
+
+test('#asMutable', () => {
+  expect(Stack<number>().asMutable()).type.toBe<Stack<number>>();
+});
+
+test('#asImmutable', () => {
+  expect(Stack<number>().asImmutable()).type.toBe<Stack<number>>();
+});
diff --git a/type-definitions/ts-tests/tslint.json b/type-definitions/ts-tests/tslint.json
deleted file mode 100644
index 84b746b11..000000000
--- a/type-definitions/ts-tests/tslint.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "extends": "dtslint/dtslint.json",
-  "linterOptions": {
-    "exclude": [
-      "covariance.ts",
-      "deepCopy.ts",
-      "empty.ts",
-      "es6-collections.ts",
-      "exports.ts",
-      "from-js.ts",
-      "functional.ts",
-      "groupBy.ts"
-    ]
-  },
-  "rules": {
-    "no-var": false,
-    "prefer-const": false,
-    "no-useless-files": false,
-    "no-duplicate-imports": false,
-    "no-relative-import-in-test": false
-  }
-}