@greenlabs/ppx-spice 0.2.1 → 0.2.3

package/CHANGELOG.md

@@ -1,6 +1,15 @@
 # CHANGELOG
 
-## 0.2.2 (unreleased)
+## 0.2.4 (unreleased)
+
+## 0.2.3
+
+- Support the compiler v12-alpha.4 https://github.com/green-labs/ppx_spice/pull/82
+- Support bigint type https://github.com/green-labs/ppx_spice/pull/83
+
+## 0.2.2
+
+- Support Null https://github.com/green-labs/ppx_spice/pull/80
 
 ## 0.2.1
 

package/README.md

@@ -130,6 +130,7 @@ Read our [Guide with examples](docs/GUIDE.md)
 
 | Compiler | Ppx_spice      |
 | -------- | -------------- |
+| v12      | >= v0.2.3      |
 | v11      | >= v0.2.1-rc.1 |
 | v10      | ~<= v0.1.15    |
 
@@ -160,7 +161,7 @@ Make sure running the below commands in `/src`.
 1. Create a sandbox with opam
 
 ```
-opam switch create spice 4.12.1
+opam switch create spice 4.14.0
 ```
 
 2. Install dependencies
@@ -183,11 +184,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.3",
   "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/{bsconfig.json → rescript.json}

@@ -3,17 +3,20 @@
   "sources": [
     {
       "dir": "src",
-      "subdirs": ["rescript"]
+      "subdirs": [
+        "rescript"
+      ]
     },
     {
       "dir": "test",
       "type": "dev"
     }
   ],
-  "refmt": 3,
-  "ppx-flags": ["./ppx"],
+  "ppx-flags": [
+    "./ppx"
+  ],
   "warnings": {
     "number": "+A-9-40-42"
   },
-  "bsc-flags": ["-bs-super-errors"]
-}
+  "bsc-flags": []
+}

package/src/rescript/Spice.res

@@ -24,30 +24,22 @@ let stringFromJson = j =>
   | _ => Error({path: "", message: "Not a string", value: j})
   }
 
-let intToJson = (i): Js.Json.t => Js.Json.Number(float_of_int(i))
+let intToJson = (i): Js.Json.t => Js.Json.Number(Float.fromInt(i))
 let intFromJson = j =>
   switch (j: Js.Json.t) {
   | Js.Json.Number(f) =>
-    float_of_int(Js.Math.floor(f)) == f
+    Float.fromInt(Js.Math.floor(f)) == f
       ? Ok(Js.Math.floor(f))
       : Error({path: "", message: "Not an integer", 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 bigintToJson = (i): Js.Json.t => Js.Json.Number(BigInt.toFloat(i))
 
-let int64FromJson = j =>
+let bigintFromJson = j =>
   switch (j: Js.Json.t) {
-  | Js.Json.Number(n) => Ok(Int64.bits_of_float(n))
-  | _ => error("Not a number", j)
-  }
-
-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) => Ok(Int64.of_float(n))
+  | Js.Json.Number(n) => Ok(BigInt.fromFloat(n))
   | _ => error("Not a number", j)
   }
 
@@ -82,7 +74,7 @@ let arrayFromJson = (decoder, json) =>
       | (Error(_), _) => acc
 
       | (_, Error({path} as error)) =>
-        Error({...error, path: "[" ++ (string_of_int(i) ++ ("]" ++ path))})
+        Error({...error, path: "[" ++ (Int.toString(i) ++ ("]" ++ path))})
 
       | (Ok(prev), Ok(newVal)) =>
         Ok(Js.Array.concat([newVal], prev))
@@ -98,15 +90,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 +107,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)]
@@ -166,7 +170,7 @@ module Codecs = {
   include Spice_Codecs
   let string = (stringToJson, stringFromJson)
   let int = (intToJson, intFromJson)
-  let int64Unsafe = (int64ToJsonUnsafe, int64FromJsonUnsafe)
+  let bigint = (bigintToJson, bigintFromJson)
   let float = (floatToJson, floatFromJson)
   let bool = (boolToJson, boolFromJson)
   let array = (arrayToJson, arrayFromJson)

package/src/rescript/Spice.js

@@ -1,446 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Js_dict = require("rescript/lib/js/js_dict.js");
-var Js_json = require("rescript/lib/js/js_json.js");
-var Js_math = require("rescript/lib/js/js_math.js");
-var Caml_obj = require("rescript/lib/js/caml_obj.js");
-var Js_array = require("rescript/lib/js/js_array.js");
-var Belt_List = require("rescript/lib/js/belt_List.js");
-var Belt_Array = require("rescript/lib/js/belt_Array.js");
-var Caml_int64 = require("rescript/lib/js/caml_int64.js");
-var Belt_Result = require("rescript/lib/js/belt_Result.js");
-var Caml_option = require("rescript/lib/js/caml_option.js");
-var Spice_Codecs = require("./Spice_Codecs.js");
-
-function error(path, message, value) {
-  var path$1 = path !== undefined ? path : "";
-  return {
-          TAG: "Error",
-          _0: {
-            path: path$1,
-            message: message,
-            value: value
-          }
-        };
-}
-
-function stringToJson(s) {
-  return s;
-}
-
-function stringFromJson(j) {
-  var s = Js_json.decodeString(j);
-  if (s !== undefined) {
-    return {
-            TAG: "Ok",
-            _0: s
-          };
-  } else {
-    return {
-            TAG: "Error",
-            _0: {
-              path: "",
-              message: "Not a string",
-              value: j
-            }
-          };
-  }
-}
-
-function intToJson(i) {
-  return i;
-}
-
-function intFromJson(j) {
-  var f = Js_json.decodeNumber(j);
-  if (f !== undefined) {
-    if (Js_math.floor(f) === f) {
-      return {
-              TAG: "Ok",
-              _0: Js_math.floor(f)
-            };
-    } else {
-      return {
-              TAG: "Error",
-              _0: {
-                path: "",
-                message: "Not an integer",
-                value: j
-              }
-            };
-    }
-  } else {
-    return {
-            TAG: "Error",
-            _0: {
-              path: "",
-              message: "Not a number",
-              value: j
-            }
-          };
-  }
-}
-
-var int64ToJson = Caml_int64.float_of_bits;
-
-function int64FromJson(j) {
-  var n = Js_json.decodeNumber(j);
-  if (n !== undefined) {
-    return {
-            TAG: "Ok",
-            _0: Caml_int64.bits_of_float(n)
-          };
-  } else {
-    return error(undefined, "Not a number", j);
-  }
-}
-
-var int64ToJsonUnsafe = Caml_int64.to_float;
-
-function int64FromJsonUnsafe(j) {
-  var n = Js_json.decodeNumber(j);
-  if (n !== undefined) {
-    return {
-            TAG: "Ok",
-            _0: Caml_int64.of_float(n)
-          };
-  } else {
-    return error(undefined, "Not a number", j);
-  }
-}
-
-function floatToJson(v) {
-  return v;
-}
-
-function floatFromJson(j) {
-  var f = Js_json.decodeNumber(j);
-  if (f !== undefined) {
-    return {
-            TAG: "Ok",
-            _0: f
-          };
-  } else {
-    return {
-            TAG: "Error",
-            _0: {
-              path: "",
-              message: "Not a number",
-              value: j
-            }
-          };
-  }
-}
-
-function boolToJson(v) {
-  return v;
-}
-
-function boolFromJson(j) {
-  var b = Js_json.decodeBoolean(j);
-  if (b !== undefined) {
-    return {
-            TAG: "Ok",
-            _0: b
-          };
-  } else {
-    return {
-            TAG: "Error",
-            _0: {
-              path: "",
-              message: "Not a boolean",
-              value: j
-            }
-          };
-  }
-}
-
-function unitToJson() {
-  return 0.0;
-}
-
-function unitFromJson(param) {
-  return {
-          TAG: "Ok",
-          _0: undefined
-        };
-}
-
-var arrayToJson = Js_array.map;
-
-function arrayFromJson(decoder, json) {
-  var arr = Js_json.decodeArray(json);
-  if (arr !== undefined) {
-    return Js_array.reducei((function (acc, jsonI, i) {
-                  var match = decoder(jsonI);
-                  if (acc.TAG !== "Ok") {
-                    return acc;
-                  }
-                  if (match.TAG === "Ok") {
-                    return {
-                            TAG: "Ok",
-                            _0: Js_array.concat([match._0], acc._0)
-                          };
-                  }
-                  var error = match._0;
-                  return {
-                          TAG: "Error",
-                          _0: {
-                            path: "[" + (String(i) + ("]" + error.path)),
-                            message: error.message,
-                            value: error.value
-                          }
-                        };
-                }), {
-                TAG: "Ok",
-                _0: []
-              }, arr);
-  } else {
-    return {
-            TAG: "Error",
-            _0: {
-              path: "",
-              message: "Not an array",
-              value: json
-            }
-          };
-  }
-}
-
-function listToJson(encoder, list) {
-  return Js_array.map(encoder, Belt_List.toArray(list));
-}
-
-function listFromJson(decoder, json) {
-  return Belt_Result.map(arrayFromJson(decoder, json), Belt_List.fromArray);
-}
-
-function filterOptional(arr) {
-  return Belt_Array.map(Belt_Array.keep(arr, (function (param) {
-                    return !(param[1] && Caml_obj.equal(param[2], null));
-                  })), (function (param) {
-                return [
-                        param[0],
-                        param[2]
-                      ];
-              }));
-}
-
-function optionToJson(encoder, opt) {
-  if (opt !== undefined) {
-    return encoder(Caml_option.valFromOption(opt));
-  } else {
-    return null;
-  }
-}
-
-function optionFromJson(decoder, json) {
-  var match = Js_json.decodeNull(json);
-  if (match !== undefined) {
-    return {
-            TAG: "Ok",
-            _0: undefined
-          };
-  } else {
-    return Belt_Result.map(decoder(json), (function (v) {
-                  return Caml_option.some(v);
-                }));
-  }
-}
-
-function resultToJson(okEncoder, errorEncoder, result) {
-  if (result.TAG === "Ok") {
-    return [
-            "Ok",
-            okEncoder(result._0)
-          ];
-  } else {
-    return [
-            "Error",
-            errorEncoder(result._0)
-          ];
-  }
-}
-
-function resultFromJson(okDecoder, errorDecoder, json) {
-  var match = Js_json.decodeArray(json);
-  if (match === undefined) {
-    return error(undefined, "Not an array", json);
-  }
-  if (match.length !== 2) {
-    return error(undefined, "Expected exactly 2 values in array", json);
-  }
-  var variantConstructorId = match[0];
-  var payload = match[1];
-  var match$1 = Js_json.decodeString(variantConstructorId);
-  if (match$1 === undefined) {
-    return error(undefined, "Not a string", variantConstructorId);
-  }
-  switch (match$1) {
-    case "Error" :
-        var v = errorDecoder(payload);
-        if (v.TAG === "Ok") {
-          return {
-                  TAG: "Ok",
-                  _0: {
-                    TAG: "Error",
-                    _0: v._0
-                  }
-                };
-        } else {
-          return {
-                  TAG: "Error",
-                  _0: v._0
-                };
-        }
-    case "Ok" :
-        return Belt_Result.map(okDecoder(payload), (function (v) {
-                      return {
-                              TAG: "Ok",
-                              _0: v
-                            };
-                    }));
-    default:
-      return error(undefined, "Expected either \"Ok\" or \"Error\"", variantConstructorId);
-  }
-}
-
-function dictToJson(encoder, dict) {
-  return Js_dict.map((function (a) {
-                return encoder(a);
-              }), dict);
-}
-
-function dictFromJson(decoder, json) {
-  var dict = Js_json.decodeObject(json);
-  if (dict !== undefined) {
-    return Belt_Array.reduce(Js_dict.entries(Caml_option.valFromOption(dict)), {
-                TAG: "Ok",
-                _0: {}
-              }, (function (acc, param) {
-                  var key = param[0];
-                  var match = decoder(param[1]);
-                  if (acc.TAG !== "Ok") {
-                    return acc;
-                  }
-                  var prev = acc._0;
-                  if (match.TAG === "Ok") {
-                    prev[key] = match._0;
-                    return {
-                            TAG: "Ok",
-                            _0: prev
-                          };
-                  }
-                  var error = match._0;
-                  return {
-                          TAG: "Error",
-                          _0: {
-                            path: "." + (key + error.path),
-                            message: error.message,
-                            value: error.value
-                          }
-                        };
-                }));
-  } else {
-    return {
-            TAG: "Error",
-            _0: {
-              path: "",
-              message: "Not a dict",
-              value: json
-            }
-          };
-  }
-}
-
-var string = [
-  stringToJson,
-  stringFromJson
-];
-
-var $$int = [
-  intToJson,
-  intFromJson
-];
-
-var int64Unsafe = [
-  int64ToJsonUnsafe,
-  int64FromJsonUnsafe
-];
-
-var $$float = [
-  floatToJson,
-  floatFromJson
-];
-
-var bool = [
-  boolToJson,
-  boolFromJson
-];
-
-var array = [
-  arrayToJson,
-  arrayFromJson
-];
-
-var list = [
-  listToJson,
-  listFromJson
-];
-
-var option = [
-  optionToJson,
-  optionFromJson
-];
-
-var unit = [
-  unitToJson,
-  unitFromJson
-];
-
-var Codecs = {
-  falseableEncode: Spice_Codecs.falseableEncode,
-  falseableDecode: Spice_Codecs.falseableDecode,
-  falseable: Spice_Codecs.falseable,
-  magicDecode: Spice_Codecs.magicDecode,
-  magic: Spice_Codecs.magic,
-  string: string,
-  $$int: $$int,
-  int64Unsafe: int64Unsafe,
-  $$float: $$float,
-  bool: bool,
-  array: array,
-  list: list,
-  option: option,
-  unit: unit
-};
-
-exports.error = error;
-exports.stringToJson = stringToJson;
-exports.stringFromJson = stringFromJson;
-exports.intToJson = intToJson;
-exports.intFromJson = intFromJson;
-exports.int64ToJson = int64ToJson;
-exports.int64FromJson = int64FromJson;
-exports.int64ToJsonUnsafe = int64ToJsonUnsafe;
-exports.int64FromJsonUnsafe = int64FromJsonUnsafe;
-exports.floatToJson = floatToJson;
-exports.floatFromJson = floatFromJson;
-exports.boolToJson = boolToJson;
-exports.boolFromJson = boolFromJson;
-exports.unitToJson = unitToJson;
-exports.unitFromJson = unitFromJson;
-exports.arrayToJson = arrayToJson;
-exports.arrayFromJson = arrayFromJson;
-exports.listToJson = listToJson;
-exports.listFromJson = listFromJson;
-exports.filterOptional = filterOptional;
-exports.optionToJson = optionToJson;
-exports.optionFromJson = optionFromJson;
-exports.resultToJson = resultToJson;
-exports.resultFromJson = resultFromJson;
-exports.dictToJson = dictToJson;
-exports.dictFromJson = dictFromJson;
-exports.Codecs = Codecs;
-/* No side effect */

package/src/rescript/Spice_Codecs.js

@@ -1,55 +0,0 @@
-// Generated by ReScript, PLEASE EDIT WITH CARE
-'use strict';
-
-var Js_json = require("rescript/lib/js/js_json.js");
-var Belt_Result = require("rescript/lib/js/belt_Result.js");
-var Caml_option = require("rescript/lib/js/caml_option.js");
-
-function falseableEncode(encoder, opt) {
-  if (opt !== undefined) {
-    return encoder(Caml_option.valFromOption(opt));
-  } else {
-    return false;
-  }
-}
-
-function falseableDecode(decoder, json) {
-  var match = Js_json.decodeBoolean(json);
-  if (match !== undefined && !match) {
-    return {
-            TAG: "Ok",
-            _0: undefined
-          };
-  }
-  return Belt_Result.map(decoder(json), (function (v) {
-                return Caml_option.some(v);
-              }));
-}
-
-var falseable = [
-  falseableEncode,
-  falseableDecode
-];
-
-function magicDecode(j) {
-  return {
-          TAG: "Ok",
-          _0: j
-        };
-}
-
-function magic_0(prim) {
-  return prim;
-}
-
-var magic = [
-  magic_0,
-  magicDecode
-];
-
-exports.falseableEncode = falseableEncode;
-exports.falseableDecode = falseableDecode;
-exports.falseable = falseable;
-exports.magicDecode = magicDecode;
-exports.magic = magic;
-/* No side effect */