fix(schema): struct optional property derivation

0x706b · May 20, 2024 · 6a8cea5 · 6a8cea5
1 parent eb93279
commit 6a8cea5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.changeset/breezy-moles-cough.md b/.changeset/breezy-moles-cough.md
@@ -0,0 +1,5 @@
+---
+"@fncts/schema": patch
+---
+
+fix: struct optional property derivation
diff --git a/packages/schema/src/Schema/api.ts b/packages/schema/src/Schema/api.ts
@@ -177,8 +177,8 @@ export const implicitDate: Schema<Date> = Schema.unknown.transformOrFail(
 );
 
 /**
- * @tsplus static fncts.schema.SchemaOps union
  * @tsplus derive fncts.schema.Schema<|> 30
+ * @tsplus static fncts.schema.SchemaOps union
  */
 export function union<A extends ReadonlyArray<unknown>>(
   ...members: {

diff --git a/packages/schema/src/Schema/derivations.ts b/packages/schema/src/Schema/derivations.ts
@@ -51,7 +51,7 @@ export function deriveStruct<A extends Record<string, any>>(
           ? [optionalFields: {}]
           : [
               optionalFields: {
-                [k in OptionalKeys<A>]: Schema<NonNullable<A[k]>>;
+                [k in OptionalKeys<A>]: Schema<A[k]>;
               },
             ]),
         ...([MaybeKeys<A>] extends [never]