fix typescript@4.8 errors, closes #656, closes #647 (#657)

gcanti · Aug 29, 2022 · 9e8ef0e · 9e8ef0e
1 parent 63eea02
commit 9e8ef0e
Show file tree

Hide file tree

Showing 28 changed files with 11,233 additions and 165 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,11 @@
 **Note**: Gaps between patch versions are faulty/broken releases.
 **Note**: A feature tagged as Experimental is in a high state of flux, you're at risk of it changing without notice.
 
+# 2.2.18
+
+- **Bug Fix**
+  - fix `typescript@4.8` errors, closes #656, closes #647 (@gcanti)
+
 # 2.2.17
 
 - **Bug Fix**

diff --git a/docs/modules/Codec.ts.md b/docs/modules/Codec.ts.md
@@ -352,7 +352,7 @@ Added in v2.2.3
 **Signature**
 
 ```ts
-export declare function literal<A extends readonly [Literal, ...Array<Literal>]>(
+export declare function literal<A extends readonly [L, ...ReadonlyArray<L>], L extends S.Literal = S.Literal>(
   ...values: A
 ): Codec<unknown, A[number], A[number]>
 ```

diff --git a/docs/modules/Decoder.ts.md b/docs/modules/Decoder.ts.md
@@ -479,7 +479,7 @@ Added in v2.2.8
 **Signature**
 
 ```ts
-export declare const literal: <A extends readonly [S.Literal, ...S.Literal[]]>(
+export declare const literal: <A extends readonly [L, ...L[]], L extends S.Literal = S.Literal>(
   ...values: A
 ) => Decoder<unknown, A[number]>
 ```

diff --git a/docs/modules/Guard.ts.md b/docs/modules/Guard.ts.md
@@ -255,7 +255,9 @@ Added in v2.2.0
 **Signature**
 
 ```ts
-export declare const literal: <A extends readonly [Literal, ...Literal[]]>(...values: A) => Guard<unknown, A[number]>
+export declare const literal: <A extends readonly [L, ...L[]], L extends S.Literal = S.Literal>(
+  ...values: A
+) => Guard<unknown, A[number]>
 ```
 
 Added in v2.2.0
@@ -267,7 +269,7 @@ Added in v2.2.0
 **Signature**
 
 ```ts
-export declare const Schemable: Schemable1<'io-ts/Guard'>
+export declare const Schemable: S.Schemable1<'io-ts/Guard'>
 ```
 
 Added in v2.2.8
@@ -297,7 +299,7 @@ Added in v2.2.0
 **Signature**
 
 ```ts
-export declare const WithRefine: WithRefine1<'io-ts/Guard'>
+export declare const WithRefine: S.WithRefine1<'io-ts/Guard'>
 ```
 
 Added in v2.2.8
@@ -307,7 +309,7 @@ Added in v2.2.8
 **Signature**
 
 ```ts
-export declare const WithUnion: WithUnion1<'io-ts/Guard'>
+export declare const WithUnion: S.WithUnion1<'io-ts/Guard'>
 ```
 
 Added in v2.2.8
@@ -317,7 +319,7 @@ Added in v2.2.8
 **Signature**
 
 ```ts
-export declare const WithUnknownContainers: WithUnknownContainers1<'io-ts/Guard'>
+export declare const WithUnknownContainers: S.WithUnknownContainers1<'io-ts/Guard'>
 ```
 
 Added in v2.2.8

diff --git a/docs/modules/Kleisli.ts.md b/docs/modules/Kleisli.ts.md
@@ -314,8 +314,10 @@ Added in v2.2.7
 export declare function literal<M extends URIS2, E>(
   M: MonadThrow2C<M, E>
 ): <I>(
-  onError: (i: I, values: readonly [Literal, ...Array<Literal>]) => E
-) => <A extends readonly [Literal, ...Array<Literal>]>(...values: A) => Kleisli<M, I, E, A[number]>
+  onError: (i: I, values: readonly [S.Literal, ...ReadonlyArray<S.Literal>]) => E
+) => <A extends readonly [L, ...ReadonlyArray<L>], L extends S.Literal = S.Literal>(
+  ...values: A
+) => Kleisli<M, I, E, A[number]>
 ```
 
 Added in v2.2.7

diff --git a/docs/modules/Schemable.ts.md b/docs/modules/Schemable.ts.md
@@ -56,7 +56,9 @@ Added in v2.2.0
 ```ts
 export interface Schemable<S> {
   readonly URI: S
-  readonly literal: <A extends readonly [Literal, ...Array<Literal>]>(...values: A) => HKT<S, A[number]>
+  readonly literal: <A extends readonly [L, ...ReadonlyArray<L>], L extends Literal = Literal>(
+    ...values: A
+  ) => HKT<S, A[number]>
   readonly string: HKT<S, string>
   readonly number: HKT<S, number>
   readonly boolean: HKT<S, boolean>
@@ -86,7 +88,9 @@ Added in v2.2.3
 ```ts
 export interface Schemable1<S extends URIS> {
   readonly URI: S
-  readonly literal: <A extends readonly [Literal, ...Array<Literal>]>(...values: A) => Kind<S, A[number]>
+  readonly literal: <A extends readonly [L, ...ReadonlyArray<L>], L extends Literal = Literal>(
+    ...values: A
+  ) => Kind<S, A[number]>
   readonly string: Kind<S, string>
   readonly number: Kind<S, number>
   readonly boolean: Kind<S, boolean>
@@ -116,7 +120,9 @@ Added in v2.2.3
 ```ts
 export interface Schemable2C<S extends URIS2, E> {
   readonly URI: S
-  readonly literal: <A extends readonly [Literal, ...Array<Literal>]>(...values: A) => Kind2<S, E, A[number]>
+  readonly literal: <A extends readonly [L, ...ReadonlyArray<L>], L extends Literal = Literal>(
+    ...values: A
+  ) => Kind2<S, E, A[number]>
   readonly string: Kind2<S, E, string>
   readonly number: Kind2<S, E, number>
   readonly boolean: Kind2<S, E, boolean>

diff --git a/docs/modules/TaskDecoder.ts.md b/docs/modules/TaskDecoder.ts.md
@@ -495,7 +495,7 @@ Added in v2.2.8
 **Signature**
 
 ```ts
-export declare const literal: <A extends readonly [S.Literal, ...S.Literal[]]>(
+export declare const literal: <A extends readonly [L, ...L[]], L extends S.Literal = S.Literal>(
   ...values: A
 ) => TaskDecoder<unknown, A[number]>
 ```

diff --git a/docs/modules/Type.ts.md b/docs/modules/Type.ts.md
@@ -198,7 +198,9 @@ Added in v2.2.3
 **Signature**
 
 ```ts
-export declare const literal: <A extends readonly [S.Literal, ...S.Literal[]]>(...values: A) => Type<A[number]>
+export declare const literal: <A extends readonly [L, ...L[]], L extends S.Literal = S.Literal>(
+  ...values: A
+) => Type<A[number]>
 ```
 
 Added in v2.2.3

diff --git a/docs/modules/index.ts.md b/docs/modules/index.ts.md
@@ -650,39 +650,15 @@ Keeps the codec "kind".
 ```ts
 export declare function alias<A, O, P, I>(
   codec: PartialType<P, A, O, I>
-): <
-  // tslint:disable-next-line: deprecation
-  AA extends Exact<A, AA>,
-  // tslint:disable-next-line: deprecation
-  OO extends Exact<O, OO> = O,
-  // tslint:disable-next-line: deprecation
-  PP extends Exact<P, PP> = P,
-  II extends I = I
->() => PartialType<PP, AA, OO, II>
+): <AA extends A, OO extends O = O, PP extends P = P, II extends I = I>() => PartialType<PP, AA, OO, II>
 export declare function alias<A, O, P, I>(
   // tslint:disable-next-line: deprecation
   codec: StrictType<P, A, O, I>
-): <
-  // tslint:disable-next-line: deprecation
-  AA extends Exact<A, AA>,
-  // tslint:disable-next-line: deprecation
-  OO extends Exact<O, OO> = O,
-  // tslint:disable-next-line: deprecation
-  PP extends Exact<P, PP> = P,
-  II extends I = I
->() => // tslint:disable-next-line: deprecation
+): <AA extends A, OO extends O = O, PP extends P = P, II extends I = I>() => // tslint:disable-next-line: deprecation
 StrictType<PP, AA, OO, II>
 export declare function alias<A, O, P, I>(
   codec: InterfaceType<P, A, O, I>
-): <
-  // tslint:disable-next-line: deprecation
-  AA extends Exact<A, AA>,
-  // tslint:disable-next-line: deprecation
-  OO extends Exact<O, OO> = O,
-  // tslint:disable-next-line: deprecation
-  PP extends Exact<P, PP> = P,
-  II extends I = I
->() => InterfaceType<PP, AA, OO, II>
+): <AA extends A, OO extends O = O, PP extends P = P, II extends I = I>() => InterfaceType<PP, AA, OO, II>
 ```
 
 Added in v1.1.0

diff --git a/dtslint/ts3.5/Decoder.ts b/dtslint/ts3.5/Decoder.ts
@@ -19,6 +19,48 @@ export type TypeOfNumberFromString = _.TypeOf<typeof NumberFromString>
 // $ExpectType string
 export type InputOfNumberFromString = _.InputOf<typeof NumberFromString>
 
+//
+// literal
+//
+
+// $ExpectType Decoder<unknown, "A">
+_.literal('A')
+
+// $ExpectType Decoder<unknown, "A" | "B">
+_.literal('A', 'B')
+
+// $ExpectType Decoder<unknown, "A">
+_.union(_.literal('A'))
+
+// $ExpectType Decoder<unknown, "A" | "B">
+_.union(_.literal('A'), _.literal('B'))
+
+// $ExpectType Decoder<unknown, { a: "A"; }>
+_.struct({
+  a: _.literal('A')
+})
+
+// $ExpectType Decoder<unknown, { a: "A"; } & { b: "B"; }>
+pipe(
+  _.struct({
+    a: _.literal('A')
+  }),
+  _.intersect(
+    _.struct({
+      b: _.literal('B')
+    })
+  )
+)
+
+import * as S from '../../src/Schemable'
+declare const literal: <A extends readonly [L, ...ReadonlyArray<L>], L extends S.Literal = S.Literal>(
+  ...values: A
+) => _.Decoder<unknown, A[number]>
+// $ExpectType Decoder<unknown, { a: "A"; }>
+_.struct({
+  a: literal('A')
+})
+
 //
 // fromStruct
 //

diff --git a/dtslint/ts3.5/Schema.ts b/dtslint/ts3.5/Schema.ts
@@ -27,6 +27,7 @@ export type OfTest = TypeOf<typeof OfTest> // $ExpectType { a: string; b: { c: n
 make((S) => S.literal())
 make((S) => S.literal('a')) // $ExpectType Schema<"a">
 make((S) => S.literal('a', 'b', null)) // $ExpectType Schema<"a" | "b" | null>
+make((S) => S.literal<['a']>('a')) // $ExpectType Schema<"a">
 
 //
 // string
@@ -57,6 +58,7 @@ make((S) => S.nullable(S.string)) // $ExpectType Schema<string | null>
 //
 
 make((S) => S.struct({ a: S.string, b: S.struct({ c: S.number }) })) // $ExpectType Schema<{ a: string; b: { c: number; }; }>
+make((S) => S.struct({ a: S.literal('a') })) // $ExpectType Schema<{ a: "a"; }>
 
 //
 // partial

diff --git a/dtslint/ts3.5/index.ts b/dtslint/ts3.5/index.ts
@@ -387,8 +387,8 @@ type AliasTest2 = t.OutputOf<typeof C5>['a'] // $ExpectType string
 type AliasTest3 = t.OutputOf<typeof C5>['b'] // $ExpectType string
 // $ExpectError
 const C6 = t.alias(C1)<C1, C1>()
-// $ExpectError
-const C7 = t.alias(C1)<C1WithAdditionalProp, C1O>()
+// // $ExpectError
+// bug fix: 647 const C7 = t.alias(C1)<C1WithAdditionalProp, C1O>()
 const C8 = t.alias(C1)<C1, C1O>()
 type AliasTest4 = t.TypeOf<typeof C8> // $ExpectType C1
 type AliasTest5 = t.OutputOf<typeof C8> // $ExpectType C1O