From 646f35744cf91a016afb7fdffa94de78fb87ba09 Mon Sep 17 00:00:00 2001 From: gcanti Date: Tue, 6 Dec 2022 19:39:56 +0100 Subject: [PATCH] fix no exported members --- packages/schema/src/Codec.ts | 16 ++++++++-------- packages/schema/src/Decoder.ts | 4 ++-- packages/schema/src/Schema.ts | 6 ++++-- packages/schema/src/internal/common.ts | 6 ++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/schema/src/Codec.ts b/packages/schema/src/Codec.ts index 78c8487d1a..c28bbfab48 100644 --- a/packages/schema/src/Codec.ts +++ b/packages/schema/src/Codec.ts @@ -40,7 +40,7 @@ export interface Codec /** * @since 1.0.0 */ -export type Infer> = I.Infer +export type Infer> = Parameters[0] // --------------------------------------------- // constructors @@ -222,7 +222,7 @@ export const int = (self: Schema): Codec => codecFor(S.i */ export const union = >>( ...members: Members -): Codec> => codecFor(S.union(...members)) +): Codec> => codecFor(S.union(...members)) /** * @since 1.0.0 @@ -234,7 +234,7 @@ export const keyof = (schema: Schema): Codec => codecFor(S.keyof( */ export const tuple = >>( ...components: Components -): Codec<{ readonly [K in keyof Components]: S.Infer }> => +): Codec<{ readonly [K in keyof Components]: Infer }> => codecFor(S.tuple(...components)) /** @@ -262,7 +262,7 @@ export const nonEmptyArray = ( export const struct: { >>( required: Required - ): Codec<{ readonly [K in keyof Required]: S.Infer }> + ): Codec<{ readonly [K in keyof Required]: Infer }> < Required extends Record>, Optional extends Record> @@ -271,8 +271,8 @@ export const struct: { optional: Optional ): Codec< S.Spread< - & { readonly [K in keyof Required]: S.Infer } - & { readonly [K in keyof Optional]?: S.Infer } + & { readonly [K in keyof Required]: Infer } + & { readonly [K in keyof Optional]?: Infer } > > } = < @@ -283,8 +283,8 @@ export const struct: { optional?: Optional ): Codec< S.Spread< - & { readonly [K in keyof Required]: S.Infer } - & { readonly [K in keyof Optional]?: S.Infer } + & { readonly [K in keyof Required]: Infer } + & { readonly [K in keyof Optional]?: Infer } > > => codecFor(S.struct(required, optional || {})) diff --git a/packages/schema/src/Decoder.ts b/packages/schema/src/Decoder.ts index bace79fe80..42d952049d 100644 --- a/packages/schema/src/Decoder.ts +++ b/packages/schema/src/Decoder.ts @@ -14,7 +14,7 @@ import * as DE from "@fp-ts/schema/DecodeError" import * as I from "@fp-ts/schema/internal/common" import type { Provider } from "@fp-ts/schema/Provider" import * as P from "@fp-ts/schema/Provider" -import type { Schema } from "@fp-ts/schema/Schema" +import type { Infer, Schema } from "@fp-ts/schema/Schema" /** * @since 1.0.0 @@ -295,7 +295,7 @@ export const _struct = ( export const _union = >>( ast: AST.Union, members: Members -): Decoder> => +): Decoder> => make(I.makeSchema(ast), (u) => { const es: Array = [] for (let i = 0; i < members.length; i++) { diff --git a/packages/schema/src/Schema.ts b/packages/schema/src/Schema.ts index 9e023c8f29..88a73d9996 100644 --- a/packages/schema/src/Schema.ts +++ b/packages/schema/src/Schema.ts @@ -54,7 +54,7 @@ export interface Schema { /** * @since 1.0.0 */ -export type Infer> = I.Infer +export type Infer> = Parameters[0] // --------------------------------------------- // constructors @@ -228,7 +228,9 @@ export const nonEmptyArray = ( /** * @since 1.0.0 */ -export type Spread = I.Spread +export type Spread = { + [K in keyof A]: A[K] +} extends infer B ? B : never /** * @since 1.0.0 diff --git a/packages/schema/src/internal/common.ts b/packages/schema/src/internal/common.ts index 7543080db5..c67d230c4d 100644 --- a/packages/schema/src/internal/common.ts +++ b/packages/schema/src/internal/common.ts @@ -207,16 +207,14 @@ export const literal = => a.length === 1 ? of(a[0]) : union(...a.map(of)) -/** @internal */ -export type Infer> = Parameters[0] +type Infer> = Parameters[0] /** @internal */ export const union = >>( ...members: Members ): Schema> => makeSchema(AST.union(members.map((m) => m.ast))) -/** @internal */ -export type Spread = { +type Spread = { [K in keyof A]: A[K] } extends infer B ? B : never