Merge pull request #313 from jacob-alford/ja/fix-ts-4.5

Fix: restore TS 4.5 compatibility

docs/schemata/index.md

@@ -85,23 +85,23 @@ has_children: true
 
 ### String (17)
 
-* Ascii ([docs](https://jacob-alford.github.io/schemata-ts/schemata/Ascii.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/Ascii.ts)) (e.g:  `~J ~q`, `~J,wz`, `PqDBBprF`)
-* Base64 ([docs](https://jacob-alford.github.io/schemata-ts/schemata/Base64.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/Base64.ts)) (e.g:  `2+080/==`, `/+9WA++5r/Dh5/m/d+++cy/L7+M+b/c/+em=`, `+8hfcw9/vp/69B/+/L5+Q/Vst0+6/t8AXt/9l+2/+3+=`)
-* Base64Url ([docs](https://jacob-alford.github.io/schemata-ts/schemata/Base64Url.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/Base64Url.ts)) (e.g:  `___o-r`, `aBQ0-vH8b2`, `_5__-cy`)
-* BitcoinAddress ([docs](https://jacob-alford.github.io/schemata-ts/schemata/BitcoinAddress.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/BitcoinAddress.ts)) (e.g:  `bc136563gz8vhr460d9v74798t4zxs`, `3HiWCyLk8KJLCXsYpENHMVZJ6T`, `bc10unz1312w32060aeb08nb3a70`)
+* Ascii ([docs](https://jacob-alford.github.io/schemata-ts/schemata/Ascii.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/Ascii.ts)) (e.g:  `U/%dL*`, `w0kXhQk`, `qMU6/kj$`)
+* Base64 ([docs](https://jacob-alford.github.io/schemata-ts/schemata/Base64.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/Base64.ts)) (e.g:  `/3+Oif4L+++71dY=`, `Dd//F8==`, `xL9//+D+CpbB//+sEakb28/UT12z/Bk1vER/`)
+* Base64Url ([docs](https://jacob-alford.github.io/schemata-ts/schemata/Base64Url.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/Base64Url.ts)) (e.g:  `C--t_--h-`, `A4V-H8`, `k-N-_Pbj_o`)
+* BitcoinAddress ([docs](https://jacob-alford.github.io/schemata-ts/schemata/BitcoinAddress.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/BitcoinAddress.ts)) (e.g:  `bc1kcy66x86g607p30l81a2uuu84`, `1F8RM7QYELRSHQLHjCWNQ4tL5JJ1`, `2K4B79LsUcQqPqHSVF4XrPpMLWaLkpsMK4PzKn`)
 * CamelCaseString ([docs](https://jacob-alford.github.io/schemata-ts/schemata/CamelCaseString.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/CamelCaseString.ts)) (e.g:  `Camel_case-string` → `camelCaseString`)
-* CreditCard ([docs](https://jacob-alford.github.io/schemata-ts/schemata/CreditCard.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/CreditCard.ts)) (e.g:  `50833732708233743`, `6284192379929747`, `8213170281778594`)
-* EmailAddress ([docs](https://jacob-alford.github.io/schemata-ts/schemata/EmailAddress.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/EmailAddress.ts)) (e.g:  `"㛯఍"@D.43-8yBgu.d--m-070..QiR`, `"팎埤��锹䳵쟏֓徘괐"@[95.8.51.68]`, `%#?={04*t.?{$|{.J@7-C-0LYB.sExzK`)
-* EthereumAddress ([docs](https://jacob-alford.github.io/schemata-ts/schemata/EthereumAddress.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/EthereumAddress.ts)) (e.g:  `0xA930Fbad182eAFAC68b0bef73cB023CFaBacC1dC`, `0xCBa601eAE7CEA92A5bD5CcaBb7DbedCFaE1AD248`, `0x0BB326BA8C4ABBaa0cdF4CBBC3B6cAEA012aF19a`)
-* HexColor ([docs](https://jacob-alford.github.io/schemata-ts/schemata/HexColor.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/HexColor.ts)) (e.g:  `3Da0Af`, `#cedF0A`, `#9A6Cb71b`)
-* Hexadecimal ([docs](https://jacob-alford.github.io/schemata-ts/schemata/Hexadecimal.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/Hexadecimal.ts)) (e.g:  `1DdEC1`, `deA3c5E8`, `701BFcb`)
-* HslColor ([docs](https://jacob-alford.github.io/schemata-ts/schemata/HslColor.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/HslColor.ts)) (e.g:  `hsl(.18105356775e4812rad+00000.818%+000.3e+72800620%)`, `hsl(94726650.16679e-68643098000100.000e-97964241525%00000000039e+4400%)`, `hsl(-307.001grad+000100%000100e8595%/38.7)`)
-* Jwt ([docs](https://jacob-alford.github.io/schemata-ts/schemata/Jwt.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/Jwt.ts)) (e.g:  `667.f3_7_Q-4_3`, `d_6-iq.._j-_4--`, `i8.-_-`)
-* LatLong ([docs](https://jacob-alford.github.io/schemata-ts/schemata/LatLong.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/LatLong.ts)) (e.g:  `(80,180.0000)`, `(-87.37622985102,172)`, `(90,+101)`)
-* NonEmptyString ([docs](https://jacob-alford.github.io/schemata-ts/schemata/NonEmptyString.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/NonEmptyString.ts)) (e.g:  `WDr/Da==`, `AentoS==`, `%|^k1b'MmGT`)
-* RGB ([docs](https://jacob-alford.github.io/schemata-ts/schemata/RGB.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/RGB.ts)) (e.g:  `rgba(100%,96%,94%,.356669793547)`, `rgba(100%,92%,100%,1)`, `rgb(98,252,250)`)
+* CreditCard ([docs](https://jacob-alford.github.io/schemata-ts/schemata/CreditCard.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/CreditCard.ts)) (e.g:  `6229236020562382716`, `35286124590113741`, `50819672519200226`)
+* EmailAddress ([docs](https://jacob-alford.github.io/schemata-ts/schemata/EmailAddress.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/EmailAddress.ts)) (e.g:  `"ꙵ︘ꈶ펴홙Ӈ쎶獙鼫"@[8.7.3.973]`, `~K~_'!*+!+?P@[0.13.2.06]`, `"謁"@6Y.--0-02Zp.oC-..rIvj`)
+* EthereumAddress ([docs](https://jacob-alford.github.io/schemata-ts/schemata/EthereumAddress.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/EthereumAddress.ts)) (e.g:  `0xEC6Efcbb09dfb09EeCCe0C4bC1104dfCcdAdAc9E`, `0xAfFF2ecE0ac2a6c80B0AEC3EEECd7Ee1f1d2D060`, `0xcFcD6fBCb2A8Ab2fbcC4ea72BB1f8Aebb8B63D2C`)
+* HexColor ([docs](https://jacob-alford.github.io/schemata-ts/schemata/HexColor.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/HexColor.ts)) (e.g:  `5aFCa33b`, `#a6de6cAb`, `AE88a9`)
+* Hexadecimal ([docs](https://jacob-alford.github.io/schemata-ts/schemata/Hexadecimal.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/Hexadecimal.ts)) (e.g:  `0HB311cAfADd`, `bc0AF1`, `ce1Cef8`)
+* HslColor ([docs](https://jacob-alford.github.io/schemata-ts/schemata/HslColor.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/HslColor.ts)) (e.g:  `hsla(+334831139turn,+00000.462796354%,+000000.01302e57509%)`, `hsl(103026e-570028333020,000000000.06488404874%,+0000000.24%,814772300%)`, `hsla(.960226,00.1071%,+0016.091933309e+39598640%,.0)`)
+* Jwt ([docs](https://jacob-alford.github.io/schemata-ts/schemata/Jwt.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/Jwt.ts)) (e.g:  `_._u0P_a--06.CPaK-k_X`, `-z--0NX.`, `G_V__d8-.-._`)
+* LatLong ([docs](https://jacob-alford.github.io/schemata-ts/schemata/LatLong.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/LatLong.ts)) (e.g:  `(90.000000000,180.0)`, `89.575329827,180`, `90.0000,+91.83121`)
+* NonEmptyString ([docs](https://jacob-alford.github.io/schemata-ts/schemata/NonEmptyString.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/NonEmptyString.ts)) (e.g:  `e1450d`, `n*%=88{8`, `>M@zv`)
+* RGB ([docs](https://jacob-alford.github.io/schemata-ts/schemata/RGB.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/RGB.ts)) (e.g:  `rgba(100%,2%,100%,0.182734573211)`, `rgba(30,94,99,1.0)`, `rgba(100%,2%,50%,.9899791962)`)
 * String ([docs](https://jacob-alford.github.io/schemata-ts/schemata/String.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/String.ts))
-* UUID ([docs](https://jacob-alford.github.io/schemata-ts/schemata/UUID.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/UUID.ts)) (e.g:  `7eBBfc14-faEA-2cCA-7DFA-dFcaeC6Be8fb`, `EEdAF38D-dbad-CBac-9b3F-EFd6CA6e51A0`, `80c98c06-B15C-Cca1-F0dC-7a4BBFbe6231`)
+* UUID ([docs](https://jacob-alford.github.io/schemata-ts/schemata/UUID.html)) ([source](https://github.com/jacob-alford/schemata-ts/tree/main/src/schemata/UUID.ts)) (e.g:  `Ac9eA23B-D14f-35bA-93Dd-bAcFbfbfd1Ee`, `24D4FaC9-dE13-E6AB-1aEF-61aAecaAAD61`, `1cBBA1FD-1EF8-91eB-aca7-2b82C02FdC2C`)
 
 ### Unit (1)
 

jest.config.js

@@ -1,5 +1,11 @@
 module.exports = {
-  collectCoverageFrom: ['src/**', '!src/schemata.ts'],
+  collectCoverageFrom: [
+    'src/**',
+    '!src/schemata.ts',
+    '!src/internal/either.ts',
+    '!src/internal/option.ts',
+    '!src/internal/task-either.ts',
+  ],
   preset: 'ts-jest',
   testEnvironment: 'node',
   testMatch: ['<rootDir>/tests/**/*.ts'],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "schemata-ts",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "An all-inclusive schema engine featuring schemata inspired by io-ts and validators.js.  Written for TypeScript with fp-ts",
   "homepage": "https://jacob-alford.github.io/schemata-ts/",
   "repository": {

src/internal/either.ts

@@ -1 +1 @@
-export type * from 'fp-ts/Either'
+export * from 'fp-ts/Either'

src/internal/option.ts

@@ -1 +1 @@
-export type * from 'fp-ts/Option'
+export * from 'fp-ts/Option'

src/internal/task-either.ts

@@ -1 +1 @@
-export type * from 'fp-ts/TaskEither'
+export * from 'fp-ts/TaskEither'