From 27a8fc1c9bddf212d7425b9d07ea3117d244fae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Mon, 18 Mar 2024 18:32:27 +0100
Subject: [PATCH] jsonifyOption work

---
 src/schema/jsonified/index.ts  |  2 ++
 src/schema/jsonified/option.ts | 17 ++++++++++-------
 src/tests.ts                   |  4 ++++
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/schema/jsonified/index.ts b/src/schema/jsonified/index.ts
index 6bff7ae..983b523 100644
--- a/src/schema/jsonified/index.ts
+++ b/src/schema/jsonified/index.ts
@@ -1,12 +1,14 @@
 import { dejsonifyBigIntSchema, jsonifyBigIntSchema } from "./bigint"
 import { dejsonifyDateSchema, jsonifyDateSchema } from "./date"
 import { dejsonifyDecimalSchema, jsonifyDecimalSchema } from "./decimal"
+import { jsonifyOption } from "./option"
 
 
 export const jsonify = {
     bigint:   jsonifyBigIntSchema,
     date:     jsonifyDateSchema,
     decimal:  jsonifyDecimalSchema,
+    option:   jsonifyOption,
 } as const
 
 export const dejsonify = {
diff --git a/src/schema/jsonified/option.ts b/src/schema/jsonified/option.ts
index 6bc1598..11c5500 100644
--- a/src/schema/jsonified/option.ts
+++ b/src/schema/jsonified/option.ts
@@ -1,16 +1,19 @@
 import { Option } from "effect"
-import { identity } from "lodash-es"
 import { z } from "zod"
+import { effect } from "../effect"
 
 
 export const jsonifyOption = {
-    option: <S extends z.ZodSchema>(schema: S) =>
-        z.union([option.some(schema), option.none(schema)]),
+    // option: <S extends z.ZodSchema>(schema: S) =>
+    //     z.union([option.some(schema), option.none(schema)]),
 
-    some: <S extends z.ZodSchema>(schema: S) => z
-        .custom<Option.Some<z.output<S>>>(v => Option.isOption(v) && Option.isSome(v), "Not an Option")
-        .pipe(z.object({ value: schema }).passthrough())
-        .transform<Option.Some<z.output<S>>>(identity),
+    some: <
+        S extends ReturnType<typeof effect.option.some<T>>,
+        T extends z.ZodSchema,
+    >(
+        schema: S | ReturnType<typeof effect.option.some<T>>
+    ) =>
+        (schema as S).transform(v => Option.getOrThrow(v)),
 
     none: <S extends z.ZodSchema | unknown = unknown>(_schema?: S) =>
         z.custom<Option.None<
diff --git a/src/tests.ts b/src/tests.ts
index edbf0c7..81b3fb1 100644
--- a/src/tests.ts
+++ b/src/tests.ts
@@ -30,6 +30,10 @@ const userInst = User.create({ id: Option.some(1n), name: "User" })
 const userInstEffect = User.createEffect({ id: Option.some(1n), name: "User" })
 
 
+const jsonifiedOption = jsonify.option.some(
+    effect.option.some(z.literal("prout"))
+).parse({})
+
 const jsonifiedUserExp = JsonifiedZodSchemaClass(User, {
     jsonifySchema: s => s.extend({
         id: jsonify.bigint(s.shape.id)