@greenlabs/ppx-spice 0.1.6 → 0.1.7-rc2

package/test/__tests__/test_variants.js

@@ -20,13 +20,13 @@ Jest.describe("variants with @spice.as", (function (param) {
                             _0: /* One */0
                           }, Jest.Expect.expect(variantDecoded));
               }));
-        return Jest.test("decode 둘", (function (param) {
-                      var variantDecoded = Variants.t_decode("둘");
-                      return Jest.Expect.toEqual({
-                                  TAG: /* Ok */0,
-                                  _0: /* Two */1
-                                }, Jest.Expect.expect(variantDecoded));
-                    }));
+        Jest.test("decode 둘", (function (param) {
+                var variantDecoded = Variants.t_decode("둘");
+                return Jest.Expect.toEqual({
+                            TAG: /* Ok */0,
+                            _0: /* Two */1
+                          }, Jest.Expect.expect(variantDecoded));
+              }));
       }));
 
 Jest.describe("variants without @spice.as", (function (param) {
@@ -45,13 +45,13 @@ Jest.describe("variants without @spice.as", (function (param) {
                             _0: /* One1 */0
                           }, Jest.Expect.expect(variantDecoded));
               }));
-        return Jest.test("decode [\"Two1\"]", (function (param) {
-                      var variantDecoded = Variants.t1_decode(["Two1"]);
-                      return Jest.Expect.toEqual({
-                                  TAG: /* Ok */0,
-                                  _0: /* Two1 */1
-                                }, Jest.Expect.expect(variantDecoded));
-                    }));
+        Jest.test("decode [\"Two1\"]", (function (param) {
+                var variantDecoded = Variants.t1_decode(["Two1"]);
+                return Jest.Expect.toEqual({
+                            TAG: /* Ok */0,
+                            _0: /* Two1 */1
+                          }, Jest.Expect.expect(variantDecoded));
+              }));
       }));
 
 Jest.describe("unboxed variants with @spice.as", (function (param) {
@@ -59,13 +59,13 @@ Jest.describe("unboxed variants with @spice.as", (function (param) {
                 var variantEncoded = Variants.t2_encode(0);
                 return Jest.Expect.toEqual(0.0, Jest.Expect.expect(variantEncoded));
               }));
-        return Jest.test("decode 하나", (function (param) {
-                      var variantDecoded = Variants.t2_decode(0.0);
-                      return Jest.Expect.toEqual({
-                                  TAG: /* Ok */0,
-                                  _0: 0
-                                }, Jest.Expect.expect(variantDecoded));
-                    }));
+        Jest.test("decode 하나", (function (param) {
+                var variantDecoded = Variants.t2_decode(0.0);
+                return Jest.Expect.toEqual({
+                            TAG: /* Ok */0,
+                            _0: 0
+                          }, Jest.Expect.expect(variantDecoded));
+              }));
       }));
 
 Jest.describe("unboxed variants without @spice.as", (function (param) {
@@ -73,13 +73,13 @@ Jest.describe("unboxed variants without @spice.as", (function (param) {
                 var variantEncoded = Variants.t3_encode(0);
                 return Jest.Expect.toEqual(0.0, Jest.Expect.expect(variantEncoded));
               }));
-        return Jest.test("decode 0", (function (param) {
-                      var variantDecoded = Variants.t3_decode(0.0);
-                      return Jest.Expect.toEqual({
-                                  TAG: /* Ok */0,
-                                  _0: 0
-                                }, Jest.Expect.expect(variantDecoded));
-                    }));
+        Jest.test("decode 0", (function (param) {
+                var variantDecoded = Variants.t3_decode(0.0);
+                return Jest.Expect.toEqual({
+                            TAG: /* Ok */0,
+                            _0: 0
+                          }, Jest.Expect.expect(variantDecoded));
+              }));
       }));
 
 /*  Not a pure module */

package/test/package.json

@@ -6,7 +6,7 @@
   "devDependencies": {
     "@glennsl/bs-jest": "^0.7.0",
     "jest": "^27.3.1",
-    "rescript": "^9.1.4"
+    "rescript": "^10.0.1"
   },
   "scripts": {
     "res:build": "rescript",

package/test/src/Polyvariants.js

@@ -3,6 +3,7 @@
 
 var Spice = require("./Spice.js");
 var Js_json = require("rescript/lib/js/js_json.js");
+var Js_array = require("rescript/lib/js/js_array.js");
 var Belt_Array = require("rescript/lib/js/belt_Array.js");
 
 function t_encode(v) {
@@ -57,7 +58,7 @@ function t1_decode(v) {
   if (json_arr$1.length === 0) {
     return Spice.error(undefined, "Expected polyvariant, found empty array", v);
   }
-  var tagged = json_arr$1.map(Js_json.classify);
+  var tagged = Js_array.map(Js_json.classify, json_arr$1);
   var match = Belt_Array.getExn(tagged, 0);
   if (typeof match !== "number" && match.TAG === /* JSONString */0) {
     switch (match._0) {

package/test/src/Records.js

@@ -7,16 +7,18 @@ var Js_json = require("rescript/lib/js/js_json.js");
 var Belt_Option = require("rescript/lib/js/belt_Option.js");
 
 function t_encode(v) {
-  return Js_dict.fromArray([
-              [
-                "spice-label",
-                Spice.stringToJson(v.label)
-              ],
-              [
-                "spice-value",
-                Spice.intToJson(v.value)
-              ]
-            ]);
+  return Js_dict.fromArray(Spice.filterOptional([
+                  [
+                    "spice-label",
+                    false,
+                    Spice.stringToJson(v.label)
+                  ],
+                  [
+                    "spice-value",
+                    false,
+                    Spice.intToJson(v.value)
+                  ]
+                ]));
 }
 
 function t_decode(v) {
@@ -62,16 +64,18 @@ function t_decode(v) {
 }
 
 function t1_encode(v) {
-  return Js_dict.fromArray([
-              [
-                "label",
-                Spice.stringToJson(v.label)
-              ],
-              [
-                "value",
-                Spice.intToJson(v.value)
-              ]
-            ]);
+  return Js_dict.fromArray(Spice.filterOptional([
+                  [
+                    "label",
+                    false,
+                    Spice.stringToJson(v.label)
+                  ],
+                  [
+                    "value",
+                    false,
+                    Spice.intToJson(v.value)
+                  ]
+                ]));
 }
 
 function t1_decode(v) {
@@ -116,8 +120,67 @@ function t1_decode(v) {
         };
 }
 
+function tOp_encode(v) {
+  return Js_dict.fromArray(Spice.filterOptional([
+                  [
+                    "label",
+                    false,
+                    Spice.optionToJson(Spice.stringToJson, v.label)
+                  ],
+                  [
+                    "value",
+                    true,
+                    Spice.optionToJson(Spice.intToJson, v.value)
+                  ]
+                ]));
+}
+
+function tOp_decode(v) {
+  var dict = Js_json.classify(v);
+  if (typeof dict === "number") {
+    return Spice.error(undefined, "Not an object", v);
+  }
+  if (dict.TAG !== /* JSONObject */2) {
+    return Spice.error(undefined, "Not an object", v);
+  }
+  var dict$1 = dict._0;
+  var label = Spice.optionFromJson(Spice.stringFromJson, Belt_Option.getWithDefault(Js_dict.get(dict$1, "label"), null));
+  if (label.TAG === /* Ok */0) {
+    var value = Spice.optionFromJson(Spice.intFromJson, Belt_Option.getWithDefault(Js_dict.get(dict$1, "value"), null));
+    if (value.TAG === /* Ok */0) {
+      return {
+              TAG: /* Ok */0,
+              _0: {
+                label: label._0,
+                value: value._0
+              }
+            };
+    }
+    var e = value._0;
+    return {
+            TAG: /* Error */1,
+            _0: {
+              path: ".value" + e.path,
+              message: e.message,
+              value: e.value
+            }
+          };
+  }
+  var e$1 = label._0;
+  return {
+          TAG: /* Error */1,
+          _0: {
+            path: ".label" + e$1.path,
+            message: e$1.message,
+            value: e$1.value
+          }
+        };
+}
+
 exports.t_encode = t_encode;
 exports.t_decode = t_decode;
 exports.t1_encode = t1_encode;
 exports.t1_decode = t1_decode;
+exports.tOp_encode = tOp_encode;
+exports.tOp_decode = tOp_decode;
 /* No side effect */

package/test/src/Records.res

@@ -9,3 +9,9 @@ type t1 = {
   label: string,
   value: int,
 }
+
+@spice
+type tOp = {
+  label: option<string>,
+  value?: int,
+}

package/test/src/Records.resi

@@ -9,3 +9,9 @@ type t1 = {
   label: string,
   value: int,
 }
+
+@spice
+type tOp = {
+  label: option<string>,
+  value?: int,
+}

package/test/src/Spice.js

@@ -6,6 +6,8 @@ var Curry = require("rescript/lib/js/curry.js");
 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_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");
@@ -166,14 +168,12 @@ function unitFromJson(param) {
         };
 }
 
-function arrayToJson(encoder, arr) {
-  return arr.map(Curry.__1(encoder));
-}
+var arrayToJson = Js_array.map;
 
 function arrayFromJson(decoder, json) {
   var arr = Js_json.decodeArray(json);
   if (arr !== undefined) {
-    return arr.reduce((function (acc, jsonI, i) {
+    return Js_array.reducei((function (acc, jsonI, i) {
                   var match = Curry._1(decoder, jsonI);
                   if (acc.TAG !== /* Ok */0) {
                     return acc;
@@ -181,7 +181,7 @@ function arrayFromJson(decoder, json) {
                   if (match.TAG === /* Ok */0) {
                     return {
                             TAG: /* Ok */0,
-                            _0: acc._0.concat([match._0])
+                            _0: Js_array.concat([match._0], acc._0)
                           };
                   }
                   var error = match._0;
@@ -196,7 +196,7 @@ function arrayFromJson(decoder, json) {
                 }), {
                 TAG: /* Ok */0,
                 _0: []
-              });
+              }, arr);
   } else {
     return {
             TAG: /* Error */1,
@@ -211,7 +211,7 @@ function arrayFromJson(decoder, json) {
 
 function listToJson(encoder, list) {
   var arr = $$Array.of_list(list);
-  return arr.map(Curry.__1(encoder));
+  return Js_array.map(encoder, arr);
 }
 
 function listFromJson(decoder, json) {
@@ -227,6 +227,18 @@ function optionToJson(encoder, opt) {
   }
 }
 
+function filterOptional(arr) {
+  var __x = Belt_Array.keep(arr, (function (param) {
+          return !(param[1] && Caml_obj.equal(param[2], null));
+        }));
+  return Belt_Array.map(__x, (function (param) {
+                return [
+                        param[0],
+                        param[2]
+                      ];
+              }));
+}
+
 function optionFromJson(decoder, json) {
   var match = Js_json.decodeNull(json);
   if (match !== undefined) {
@@ -426,6 +438,7 @@ exports.arrayFromJson = arrayFromJson;
 exports.listToJson = listToJson;
 exports.listFromJson = listFromJson;
 exports.optionToJson = optionToJson;
+exports.filterOptional = filterOptional;
 exports.optionFromJson = optionFromJson;
 exports.resultToJson = resultToJson;
 exports.resultFromJson = resultFromJson;

package/test/src/Variants.js

@@ -3,6 +3,7 @@
 
 var Spice = require("./Spice.js");
 var Js_json = require("rescript/lib/js/js_json.js");
+var Js_array = require("rescript/lib/js/js_array.js");
 var Belt_Array = require("rescript/lib/js/belt_Array.js");
 var Belt_Result = require("rescript/lib/js/belt_Result.js");
 
@@ -58,7 +59,7 @@ function t1_decode(v) {
   if (json_arr$1.length === 0) {
     return Spice.error(undefined, "Expected variant, found empty array", v);
   }
-  var tagged = json_arr$1.map(Js_json.classify);
+  var tagged = Js_array.map(Js_json.classify, json_arr$1);
   var match = Belt_Array.getExn(tagged, 0);
   if (typeof match !== "number" && match.TAG === /* JSONString */0) {
     switch (match._0) {

package/test/yarn.lock

@@ -3466,10 +3466,10 @@ require-main-filename@^2.0.0:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
-rescript@^9.1.4:
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/rescript/-/rescript-9.1.4.tgz#1eb126f98d6c16942c0bf0df67c050198e580515"
-  integrity sha512-aXANK4IqecJzdnDpJUsU6pxMViCR5ogAxzuqS0mOr8TloMnzAjJFu63fjD6LCkWrKAhlMkFFzQvVQYaAaVkFXw==
+rescript@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/rescript/-/rescript-10.0.1.tgz#5b2da8a8bcfb994bed1eb24820bf10cfb9d8c440"
+  integrity sha512-XwO1GPDtoEU4H03xQE5bp0/qtSVR6YLaJRPxWKrfFgKc+LI36ODOCie7o9UJfgzQdoMYkkZyiTGZ4N9OQEaiUw==
 
 resolve-cwd@^3.0.0:
   version "3.0.0"

package/src/esy.json

@@ -1,21 +0,0 @@
-{
-  "name": "ppx_spice",
-  "description": "OCaml/ReasonML ppx that generate parse/stringify function",
-  "scripts": {
-    "format": "dune build @fmt --auto-promote",
-    "release-static": "dune build --root . --only-packages '#{self.name}' --ignore-promoted-rules --no-config --profile release-static"
-  },
-  "esy": {
-    "build": "dune build -p #{self.name}",
-    "buildsInSource": "_build"
-  },
-  "dependencies": {
-    "@opam/dune": "*",
-    "@opam/ppxlib": "0.23.0",
-    "ocaml": "4.12.x"
-  },
-  "devDependencies": {
-    "@opam/ocaml-lsp-server": "1.8.3",
-    "@opam/ocamlformat": "0.19.0"
-  }
-}

package/src/ppx_spice.install

@@ -1,43 +0,0 @@
-lib: [
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/META"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/dune-package"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/opam"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/polyvariants.ml"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice.a"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice.cma"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice.cmi"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice.cmt"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice.cmx"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice.cmxa"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice.ml"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice__.cmi"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice__.cmt"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice__.cmx"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice__.ml"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice__Polyvariants.cmi"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice__Polyvariants.cmt"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice__Polyvariants.cmx"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice__Signature.cmi"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice__Signature.cmt"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice__Signature.cmx"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice__Structure.cmi"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice__Structure.cmt"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice__Structure.cmx"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice__Utils.cmi"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice__Utils.cmt"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice__Utils.cmx"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice__Variants.cmi"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice__Variants.cmt"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice__Variants.cmx"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/signature.ml"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/structure.ml"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/utils.ml"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/variants.ml"
-]
-libexec: [
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx.exe"
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/lib/ppx_spice/ppx_spice.cmxs"
-]
-bin: [
-  "/Users/woonki/Documents/projects/ppx_spice/src/_esy/default/store/b/ppx__spice-dc255e86/install/default/bin/ppx_spice"
-]