From 73ce4e11fff840d2106cd49d746230e80a84a684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Tue, 20 Feb 2024 01:19:51 +0100 Subject: [PATCH] Cleanup --- src/lib.ts | 1 + src/util/extend.ts | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/lib.ts b/src/lib.ts index e69de29..ea1ff40 100644 --- a/src/lib.ts +++ b/src/lib.ts @@ -0,0 +1 @@ +export { ExtendableZodSchemaObject } from "./traits/ExtendableZodSchemaObject" diff --git a/src/util/extend.ts b/src/util/extend.ts index 21aa4ab..baa104d 100644 --- a/src/util/extend.ts +++ b/src/util/extend.ts @@ -5,12 +5,12 @@ */ export type CommonKeys = Extract -/** - * Merges an inheritance tree defined by an array of types, considering overrides. - * @template T - An array of types representing the inheritance tree. - */ -export type Extend = ( - T extends [infer Super, infer Self, ...infer Rest] +export type Extend = ( + T extends [ + infer Super, + infer Self, + ...infer Rest extends object[], + ] ? Pick> extends Pick> ? Extend<[ Omit> & Self, @@ -19,7 +19,7 @@ export type Extend = ( : never : T extends [infer Self] ? Self - : void + : {} ) /**