@greenlabs/ppx-spice 0.2.0 → 0.2.1-rc.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.2.1 (unreleased)
+
+- a190663 Utilize Js.Json.Boolean(bool) instead oif Js.Json.True, False https://github.com/green-labs/ppx_spice/pull/58
+- a190663 Add support of uncurried mode for interface(*.resi) https://github.com/green-labs/ppx_spice/pull/58
+- Support the compiler v11-rc.5 https://github.com/green-labs/ppx_spice/pull/61
+
 ## 0.2.0
 
 ### Minor Changes

package/README.md

@@ -92,7 +92,7 @@ let t_decode = ...
 
 let encoded = One->t_encode // Js.Json.string(`하나`)
 
-let decoded = Js.Json.string(`second`)->t_decode // Belt.Result.Ok(Two)
+let decoded = Js.Json.string(`second`)->t_decode // Ok(Two)
 ```
 
 2. Record
@@ -117,7 +117,7 @@ let sampleRecord: t = {
 
 let encoded = sampleRecord->Records.t_encode // sampleJson
 
-let decoded = sampleJson->Records.t_decode // Belt.Result.Ok(sampleRecord)
+let decoded = sampleJson->Records.t_decode // Ok(sampleRecord)
 ```
 
 ## Getting Started
@@ -126,6 +126,13 @@ Read our [Guide with examples](docs/GUIDE.md)
 
 ## Install
 
+### Versions
+
+|Compiler|Ppx_spice  |
+|--------|-----------|
+|v10     |~<= v0.1.15|
+|v11     |>= v0.2.0  |
+
 ```sh
 yarn add -D @greenlabs/ppx-spice
 ```

package/docs/GUIDE.md

@@ -26,7 +26,7 @@ type user = {
   nickname?: string,
 }
 
-let user: Belt.Result.t<user, Spice.decodeError> = data->user_decode // user_decode is generated by ppx_spice
+let user: result<user, Spice.decodeError> = data->user_decode // user_decode is generated by ppx_spice
 
 let json: Js.Json.t = user->Belt.Result.getExn->user_encode // user_encode is generated by ppx_spice
 ```
@@ -58,7 +58,7 @@ type user = {
   language: language,
 }
 
-let user: Belt.Result.t<user, Spice.decodeError> = json->user_decode
+let user: result<user, Spice.decodeError> = json->user_decode
 
 let json: Js.Json.t = user->Result.getExn->user_encode
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@greenlabs/ppx-spice",
-  "version": "0.2.0",
+  "version": "0.2.1-rc.1",
   "description": "ReScript PPX which generate JSON (de)serializer",
   "license": "MIT",
   "author": "Greenlabs Dev <developer@greenlabs.co.kr>",
@@ -21,4 +21,4 @@
   "devDependencies": {
     "@changesets/cli": "^2.26.2"
   }
-}
+}

package/src/rescript/Spice.res

@@ -4,7 +4,7 @@ type decodeError = {
   value: Js.Json.t,
 }
 
-type result<'a> = Belt.Result.t<'a, decodeError>
+type result<'a> = result<'a, decodeError>
 type decoder<'a> = Js.Json.t => result<'a>
 type encoder<'a> = 'a => Js.Json.t
 type codec<'a> = (encoder<'a>, decoder<'a>)
@@ -14,14 +14,14 @@ let error = (~path=?, message, value) => {
   | None => ""
   | Some(s) => s
   }
-  Belt.Result.Error({path, message, value})
+  Error({path, message, value})
 }
 
 let stringToJson = (s): Js.Json.t => Js.Json.String(s)
 let stringFromJson = j =>
   switch (j: Js.Json.t) {
-  | Js.Json.String(s) => Belt.Result.Ok(s)
-  | _ => Belt.Result.Error({path: "", message: "Not a string", value: j})
+  | Js.Json.String(s) => Ok(s)
+  | _ => Error({path: "", message: "Not a string", value: j})
   }
 
 let intToJson = (i): Js.Json.t => Js.Json.Number(float_of_int(i))
@@ -29,17 +29,17 @@ let intFromJson = j =>
   switch (j: Js.Json.t) {
   | Js.Json.Number(f) =>
     float_of_int(Js.Math.floor(f)) == f
-      ? Belt.Result.Ok(Js.Math.floor(f))
-      : Belt.Result.Error({path: "", message: "Not an integer", value: j})
+      ? Ok(Js.Math.floor(f))
+      : Error({path: "", message: "Not an integer", value: j})
 
-  | _ => Belt.Result.Error({path: "", message: "Not a number", value: j})
+  | _ => Error({path: "", message: "Not a number", value: j})
   }
 
 let int64ToJson = (i): Js.Json.t => Js.Json.Number(Int64.float_of_bits(i))
 
 let int64FromJson = j =>
   switch (j: Js.Json.t) {
-  | Js.Json.Number(n) => Belt.Result.Ok(Int64.bits_of_float(n))
+  | Js.Json.Number(n) => Ok(Int64.bits_of_float(n))
   | _ => error("Not a number", j)
   }
 
@@ -47,31 +47,31 @@ let int64ToJsonUnsafe = (i): Js.Json.t => Js.Json.number(Int64.to_float(i))
 
 let int64FromJsonUnsafe = j =>
   switch (j: Js.Json.t) {
-  | Js.Json.Number(n) => Belt.Result.Ok(Int64.of_float(n))
+  | Js.Json.Number(n) => Ok(Int64.of_float(n))
   | _ => error("Not a number", j)
   }
 
 let floatToJson = (v): Js.Json.t => Js.Json.Number(v)
 let floatFromJson = j =>
   switch (j: Js.Json.t) {
-  | Js.Json.Number(f) => Belt.Result.Ok(f)
-  | _ => Belt.Result.Error({path: "", message: "Not a number", value: j})
+  | Js.Json.Number(f) => Ok(f)
+  | _ => Error({path: "", message: "Not a number", value: j})
   }
 
 let boolToJson = (v): Js.Json.t =>
   switch v {
-  | true => Js.Json.True
-  | false => Js.Json.False
+  | true => Js.Json.Boolean(true)
+  | false => Js.Json.Boolean(false)
   }
 let boolFromJson = j =>
   switch (j: Js.Json.t) {
-  | Js.Json.True => Belt.Result.Ok(true)
-  | Js.Json.False => Belt.Result.Ok(false)
-  | _ => Belt.Result.Error({path: "", message: "Not a boolean", value: j})
+  | Js.Json.Boolean(true) => Ok(true)
+  | Js.Json.Boolean(false) => Ok(false)
+  | _ => Error({path: "", message: "Not a boolean", value: j})
   }
 
 let unitToJson = (): Js.Json.t => Js.Json.Number(0.0)
-let unitFromJson = _ => Belt.Result.Ok()
+let unitFromJson = _ => Ok()
 
 let arrayToJson = (encoder, arr): Js.Json.t => Js.Json.Array(Js.Array.map(encoder, arr))
 
@@ -79,17 +79,17 @@ let arrayFromJson = (decoder, json) =>
   switch (json: Js.Json.t) {
   | Js.Json.Array(arr) => Js.Array.reducei((acc, jsonI, i) =>
       switch (acc, decoder(jsonI)) {
-      | (Belt.Result.Error(_), _) => acc
+      | (Error(_), _) => acc
 
-      | (_, Belt.Result.Error({path} as error)) =>
-        Belt.Result.Error({...error, path: "[" ++ (string_of_int(i) ++ ("]" ++ path))})
+      | (_, Error({path} as error)) =>
+        Error({...error, path: "[" ++ (string_of_int(i) ++ ("]" ++ path))})
 
-      | (Belt.Result.Ok(prev), Belt.Result.Ok(newVal)) =>
-        Belt.Result.Ok(Js.Array.concat([newVal], prev))
+      | (Ok(prev), Ok(newVal)) =>
+        Ok(Js.Array.concat([newVal], prev))
       }
-    , Belt.Result.Ok([]), arr)
+    , Ok([]), arr)
 
-  | _ => Belt.Result.Error({path: "", message: "Not an array", value: json})
+  | _ => Error({path: "", message: "Not an array", value: json})
   }
 
 let listToJson = (encoder, list) => arrayToJson(encoder, Belt.List.toArray(list))
@@ -111,14 +111,14 @@ let optionToJson = (encoder, opt): Js.Json.t =>
 
 let optionFromJson = (decoder, json) =>
   switch (json: Js.Json.t) {
-  | Js.Json.Null => Belt.Result.Ok(None)
+  | Js.Json.Null => Ok(None)
   | _ => Belt.Result.map(decoder(json), v => Some(v))
   }
 
 let resultToJson = (okEncoder, errorEncoder, result): Js.Json.t => Js.Json.Array(
   switch result {
-  | Belt.Result.Ok(v) => [Js.Json.String("Ok"), okEncoder(v)]
-  | Belt.Result.Error(e) => [Js.Json.String("Error"), errorEncoder(e)]
+  | Ok(v) => [Js.Json.String("Ok"), okEncoder(v)]
+  | Error(e) => [Js.Json.String("Error"), errorEncoder(e)]
   },
 )
 
@@ -126,12 +126,12 @@ let resultFromJson = (okDecoder, errorDecoder, json) =>
   switch (json: Js.Json.t) {
   | Js.Json.Array([variantConstructorId, payload]) =>
     switch variantConstructorId {
-    | Js.Json.String("Ok") => okDecoder(payload)->Belt.Result.map(v => Belt.Result.Ok(v))
+    | Js.Json.String("Ok") => okDecoder(payload)->Belt.Result.map(v => Ok(v))
 
     | Js.Json.String("Error") =>
       switch errorDecoder(payload) {
-      | Belt.Result.Ok(v) => Belt.Result.Ok(Belt.Result.Error(v))
-      | Belt.Result.Error(e) => Belt.Result.Error(e)
+      | Ok(v) => Ok(Error(v))
+      | Error(e) => Error(e)
       }
 
     | Js.Json.String(_) => error("Expected either \"Ok\" or \"Error\"", variantConstructorId)

package/src/rescript/Spice_Codecs.res

@@ -1,14 +1,14 @@
 let falseableEncode = (encoder, opt) =>
   switch opt {
-  | None => Js.Json.False
+  | None => Js.Json.Boolean(false)
   | Some(v) => encoder(v)
   }
 let falseableDecode = (decoder, json) =>
   switch json {
-  | Js.Json.False => Belt.Result.Ok(None)
+  | Js.Json.Boolean(false) => Ok(None)
   | _ => Belt.Result.map(decoder(json), v => Some(v))
   }
 let falseable = (falseableEncode, falseableDecode)
 
-let magicDecode = j => Belt.Result.Ok(Obj.magic(j))
+let magicDecode = j => Ok(Obj.magic(j))
 let magic = (Obj.magic, magicDecode)