@greenlabs/ppx-spice 0.2.1 → 0.2.2

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # CHANGELOG
 
-## 0.2.2 (unreleased)
+## 0.2.3 (unreleased)
+
+## 0.2.2
+
+- Support Null https://github.com/green-labs/ppx_spice/pull/80
 
 ## 0.2.1
 

package/README.md

@@ -183,11 +183,11 @@ Make sure running tests in `/test`
 cd test
 
 (install dependencies)
-yarn
+pnpm install
 
 (build --watch)
-yarn res:clean && yarn res:watch
+pnpm res:clean && pnpm res:watch
 
 (run test --watch)
-yarn test:watch
+pnpm test:watch
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@greenlabs/ppx-spice",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "ReScript PPX which generate JSON (de)serializer",
   "license": "MIT",
   "author": "Greenlabs Dev <developer@greenlabs.co.kr>",

package/src/rescript/Spice.res

@@ -98,15 +98,15 @@ let listFromJson = (decoder, json) =>
   Belt.Result.map(arrayFromJson(decoder, json), Belt.List.fromArray)
 
 let filterOptional = arr =>
-  Belt.Array.map(
-    Belt.Array.keep(arr, ((_, isOptional, x)) => !(isOptional && x == Js.Json.null)),
-    ((k, _, v)) => (k, v),
-  )
+  Belt.Array.keepMap(arr, ((k, v)) => switch v {
+    | Some(v) => Some(k, v)
+    | None => None
+  })
 
-let optionToJson = (encoder, opt): Js.Json.t =>
+let optionToJson = (encoder, opt): option<Js.Json.t> =>
   switch opt {
-  | Some(x) => encoder(x)
-  | None => Js.Json.Null
+  | Some(x) => Some(encoder(x))
+  | None => None
   }
 
 let optionFromJson = (decoder, json) =>
@@ -115,6 +115,18 @@ let optionFromJson = (decoder, json) =>
   | _ => Belt.Result.map(decoder(json), v => Some(v))
   }
 
+let nullToJson = (encoder, opt): Js.Json.t =>
+  switch opt {
+  | Js.Null.Value(x) => encoder(x)
+  | Null => Js.Json.Null
+  }
+
+let nullFromJson = (decoder, json) =>
+  switch (json: Js.Json.t) {
+  | Js.Json.Null => Ok(Js.Null.Null)
+  | _ => Belt.Result.map(decoder(json), v => Js.Null.Value(v))
+  }
+
 let resultToJson = (okEncoder, errorEncoder, result): Js.Json.t => Js.Json.Array(
   switch result {
   | Ok(v) => [Js.Json.String("Ok"), okEncoder(v)]