From b6c5f728ae555c2e52764c5c011124f31d8b6c78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Mon, 29 Jul 2024 18:37:34 +0200 Subject: [PATCH] Refactoring --- src/Schema/Class.ts | 16 ++++++++-------- src/Schema/TaggedClass.ts | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Schema/Class.ts b/src/Schema/Class.ts index e93331e..eb3eb78 100644 --- a/src/Schema/Class.ts +++ b/src/Schema/Class.ts @@ -1,17 +1,17 @@ -import { Schema as S } from "@effect/schema" +import { Schema } from "@effect/schema" import type { HasFields } from "./util" -export const Class = S.Class as (identifier: string) => - ( +export const Class = Schema.Class as (identifier: string) => + ( fieldsOr: Fields | HasFields, - annotations?: S.Annotations.Schema, - ) => S.Class< + annotations?: Schema.Annotations.Schema, + ) => Schema.Class< Self, Fields, - S.Struct.Encoded, - S.Struct.Context, - S.Struct.Constructor, + Schema.Struct.Encoded, + Schema.Struct.Context, + Schema.Struct.Constructor, {}, {} > diff --git a/src/Schema/TaggedClass.ts b/src/Schema/TaggedClass.ts index 9e08eb2..29f38da 100644 --- a/src/Schema/TaggedClass.ts +++ b/src/Schema/TaggedClass.ts @@ -1,17 +1,17 @@ -import { Schema as S } from "@effect/schema" +import { Schema } from "@effect/schema" import type { HasFields } from "./util" -export const TaggedClass = S.TaggedClass as (identifier?: string) => +export const TaggedClass = Schema.TaggedClass as (identifier?: string) => < Tag extends string, - Fields extends S.Struct.Fields, + Fields extends Schema.Struct.Fields, >( tag: Tag, fieldsOr: Fields | HasFields, - annotations?: S.Annotations.Schema, - ) => S.TaggedClass< + annotations?: Schema.Annotations.Schema, + ) => Schema.TaggedClass< Self, Tag, - { readonly _tag: S.PropertySignature<":", Tag, never, ":", Tag, true, never> } & Fields + { readonly _tag: Schema.PropertySignature<":", Tag, never, ":", Tag, true, never> } & Fields >