@kaiko.io/rescript-deser 4.0.0-rc.3 → 4.0.0-rc.5

package/lib/bs/.bsdeps

@@ -1,7 +1,8 @@
-11.0.0-rc.6
-/home/manu/src/merchise/web/photocuba/src/frontend/node_modules/@kaiko.io/rescript-deser
-1 -bs-package-output es6:lib/es6:.js4Automatic
-rescript.json	0x1.94b3a6a1d2ba4p+30
-src/	0x1.957e56214e505p+30
+11.0.0-rc.7
+/home/manu/src/kaiko/rescript-deser
+0
+rescript.json	0x1.95f132e38e01fp+30
+tests	0x1.93fb8b23e3f01p+30
+src/	0x1.95f132e38e01fp+30
 ===
-/home/manu/src/merchise/web/photocuba/src/frontend/node_modules/rescript/linux/rescript.exe	0x1.9578a22fcfdf4p+30
+/home/manu/src/kaiko/rescript-deser/node_modules/rescript/linux/rescript.exe	0x1.95f128136353bp+30

package/lib/bs/.compiler.log

@@ -1,2 +1,2 @@
-#Start(1700763106505)
-#Done(1700763106531)
+#Start(1702644950015)
+#Done(1702644950052)

package/lib/bs/.ninja_log

@@ -1,6 +1,19 @@
 # ninja log v6
-0	7	1700763106509919117	src/JSON.ast	3df97f11bfe4e9b4
-7	9	1700763106513252576	src/JSON.d	54f2190af6eab30f
-9	26	1700763106529919867	src/JSON.cmj	f5326fd4af8f39e2
-9	26	1700763106529919867	src/JSON.cmi	f5326fd4af8f39e2
-9	26	1700763106529919867	../es6/src/JSON.js	f5326fd4af8f39e2
+0	6	1702644950019435248	tests/QUnit.ast	7223a540e3832541
+1	6	1702644950019435248	tests/index.ast	c5f8a64ed4e3d886
+0	7	1702644950019435248	src/JSON.ast	e5463df0847655c1
+6	8	1702644950022768668	tests/QUnit.d	4a2631c992d93ce7
+6	9	1702644950022768668	tests/index.d	5a4db9cdecd186b3
+8	10	1702644950022768668	src/JSON.d	cd2d6773c781340f
+9	15	1702644950029435508	tests/QUnit.cmj	2795770c04d7b464
+9	15	1702644950029435508	tests/QUnit.cmi	2795770c04d7b464
+9	15	1702644950029435508	../es6/tests/QUnit.js	2795770c04d7b464
+9	15	1702644950029435508	../js/tests/QUnit.js	2795770c04d7b464
+10	27	1702644950039435767	src/JSON.cmj	7dad91a190b50ccb
+10	27	1702644950039435767	src/JSON.cmi	7dad91a190b50ccb
+10	27	1702644950039435767	../es6/src/JSON.js	7dad91a190b50ccb
+10	27	1702644950039435767	../js/src/JSON.js	7dad91a190b50ccb
+27	37	1702644950049436026	tests/index.cmj	df4ef497c56ee724
+27	37	1702644950049436026	tests/index.cmi	df4ef497c56ee724
+27	37	1702644950049436026	../es6/tests/index.js	df4ef497c56ee724
+27	37	1702644950049436026	../js/tests/index.js	df4ef497c56ee724

package/lib/bs/.sourcedirs.json

@@ -0,0 +1 @@
+{ "dirs" : [ "tests" , "src/" ] , "pkgs" : [ [ "@kaiko.io/rescript-prelude" , "/home/manu/src/kaiko/rescript-deser/node_modules/@kaiko.io/rescript-prelude" ] ] , "generated" : [] }

package/lib/bs/build.ninja

@@ -1,14 +1,27 @@
 rescript = 1
-g_finger := /home/manu/src/merchise/web/photocuba/src/frontend/node_modules/@kaiko.io/rescript-deser/node_modules/@kaiko.io/rescript-prelude/lib/ocaml/install.stamp
+g_finger := /home/manu/src/kaiko/rescript-deser/node_modules/@kaiko.io/rescript-prelude/lib/ocaml/install.stamp
 rule astj
-  command = /home/manu/src/merchise/web/photocuba/src/frontend/node_modules/rescript/linux/bsc.exe  -w a -bs-v 11.0.0-rc.6 -bs-jsx 4 -bs-jsx-mode automatic  -absname -bs-ast -o $out $i
+  command = /home/manu/src/kaiko/rescript-deser/node_modules/rescript/linux/bsc.exe  -warn-error +8+11+26+27+33+56 -bs-v 11.0.0-rc.7 -uncurried  -absname -bs-ast -o $out $i
+o tests/index.ast : astj ../../tests/index.res
+rule deps_dev
+  command = /home/manu/src/kaiko/rescript-deser/node_modules/rescript/linux/bsb_helper.exe -g -hash 84aecc33f8594375b23a1a137b057f93 $in
+  restat = 1
+o tests/index.d : deps_dev tests/index.ast
+rule mij_dev
+  command = /home/manu/src/kaiko/rescript-deser/node_modules/rescript/linux/bsc.exe -I tests -I src/ -I /home/manu/src/kaiko/rescript-deser/node_modules/@kaiko.io/rescript-prelude/lib/ocaml    -warn-error +8+11+26+27+33+56 -uncurried -bs-package-name @kaiko.io/rescript-deser -bs-package-output commonjs:lib/js/$in_d:.js -bs-package-output es6:lib/es6/$in_d:.js -bs-v $g_finger $i
+  dyndep = 1
+  restat = 1
+o tests/index.cmj tests/index.cmi ../es6/tests/index.js ../js/tests/index.js : mij_dev tests/index.ast
+o tests/QUnit.ast : astj ../../tests/QUnit.res
+o tests/QUnit.d : deps_dev tests/QUnit.ast
+o tests/QUnit.cmj tests/QUnit.cmi ../es6/tests/QUnit.js ../js/tests/QUnit.js : mij_dev tests/QUnit.ast
 o src/JSON.ast : astj ../../src/JSON.res
 rule deps
-  command = /home/manu/src/merchise/web/photocuba/src/frontend/node_modules/rescript/linux/bsb_helper.exe -hash 7f20b6808a5e3c49da192de14dbbf393 $in
+  command = /home/manu/src/kaiko/rescript-deser/node_modules/rescript/linux/bsb_helper.exe -hash 84aecc33f8594375b23a1a137b057f93 $in
   restat = 1
 o src/JSON.d : deps src/JSON.ast
 rule mij
-  command = /home/manu/src/merchise/web/photocuba/src/frontend/node_modules/rescript/linux/bsc.exe -I src/ -I /home/manu/src/merchise/web/photocuba/src/frontend/node_modules/@kaiko.io/rescript-deser/node_modules/@kaiko.io/rescript-prelude/lib/ocaml   -w a -bs-package-name @kaiko.io/rescript-deser -bs-package-output es6:lib/es6/$in_d:.js -bs-v $g_finger $i
+  command = /home/manu/src/kaiko/rescript-deser/node_modules/rescript/linux/bsc.exe -I src/ -I /home/manu/src/kaiko/rescript-deser/node_modules/@kaiko.io/rescript-prelude/lib/ocaml   -warn-error +8+11+26+27+33+56 -uncurried -bs-package-name @kaiko.io/rescript-deser -bs-package-output commonjs:lib/js/$in_d:.js -bs-package-output es6:lib/es6/$in_d:.js -bs-v $g_finger $i
   dyndep = 1
   restat = 1
-o src/JSON.cmj src/JSON.cmi ../es6/src/JSON.js : mij src/JSON.ast
+o src/JSON.cmj src/JSON.cmi ../es6/src/JSON.js ../js/src/JSON.js : mij src/JSON.ast

package/lib/bs/tests/index.d

@@ -0,0 +1 @@
+tests/index.cmj : src/JSON.cmj src/JSON.cmi tests/QUnit.cmj tests/QUnit.cmi

package/lib/es6/src/JSON.js

@@ -110,11 +110,11 @@ function toString(type_) {
       case "Array" :
           return "Array of " + toString(type_._0);
       case "Tuple" :
-          return "Tuple of (" + Prelude.$$Array.map(type_._0, toString).join(", ") + ")";
+          return "Tuple of (" + type_._0.map(toString).join(", ") + ")";
       case "Object" :
-          var desc = Prelude.$$Array.map(type_._0, (function (param) {
-                    return param[0] + ": " + toString(param[1]);
-                  })).join(", ");
+          var desc = type_._0.map(function (param) {
+                  return param[0] + ": " + toString(param[1]);
+                }).join(", ");
           return "Object of {" + desc + "}";
       case "Optional" :
       case "OptionalWithDefault" :
@@ -306,7 +306,7 @@ function fromUntagged(untagged, _shape, self) {
             } else {
               if (match.TAG === "JSONArray") {
                 var shape$1 = shape._0;
-                return Prelude.$$Array.map(match._0, (function(shape$1){
+                return match._0.map((function(shape$1){
                           return function (item) {
                             return fromUntagged(item, shape$1, self);
                           }
@@ -344,7 +344,7 @@ function fromUntagged(untagged, _shape, self) {
             } else {
               if (match.TAG === "JSONObject") {
                 var values = match._0;
-                return Curry._1(Prelude.Dict.fromArray, Prelude.$$Array.map(shape._0, (function(values){
+                return Curry._1(Prelude.Dict.fromArray, shape._0.map((function(values){
                               return function (param) {
                                 var field = param[0];
                                 var value;
@@ -426,9 +426,13 @@ function fromUntagged(untagged, _shape, self) {
               exit = 1;
             } else {
               if (match.TAG === "JSONArray") {
-                return Prelude.$$Array.map(Prelude.$$Array.keepSome(Prelude.$$Array.map(Prelude.$$Array.map(match._0, shape._0.fromJSON), Prelude.Result.warn)), (function (prim) {
-                              return prim;
-                            }));
+                return Prelude.$$Array.keepSome(match._0.map((function(shape){
+                                  return function (param) {
+                                    return Curry._1(shape._0.fromJSON, param);
+                                  }
+                                  }(shape))).map(Prelude.Result.warn)).map(function (prim) {
+                            return prim;
+                          });
               }
               exit = 1;
             }
@@ -518,7 +522,7 @@ function checkFieldsSanity(name, _fields, _optional) {
     } else {
       switch (fields.TAG) {
         case "Tuple" :
-            return Curry._2(Prelude.ManyResults.map, Prelude.ManyResults.bailU(Prelude.$$Array.mapWithIndex(fields._0, (function(optional){
+            return Curry._2(Prelude.ManyResults.map, Prelude.ManyResults.bailU(fields._0.map((function(optional){
                               return function (field, index) {
                                 return function () {
                                   return checkFieldsSanity(name + "[" + String(index) + "]", field, optional);
@@ -528,7 +532,7 @@ function checkFieldsSanity(name, _fields, _optional) {
                           
                         }));
         case "Object" :
-            return Curry._2(Prelude.ManyResults.map, Prelude.ManyResults.bailU(Prelude.$$Array.map(fields._0, (function(optional){
+            return Curry._2(Prelude.ManyResults.map, Prelude.ManyResults.bailU(fields._0.map((function(optional){
                               return function (param) {
                                 var field = param[1];
                                 var fieldName = param[0];

package/lib/es6/tests/QUnit.js

@@ -0,0 +1,2 @@
+// Generated by ReScript, PLEASE EDIT WITH CARE
+/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */

package/lib/es6/tests/index.js

@@ -0,0 +1,284 @@
+// Generated by ReScript, PLEASE EDIT WITH CARE
+
+import * as $$JSON from "../src/JSON.js";
+import * as Curry from "rescript/lib/es6/curry.js";
+import * as Qunit from "qunit";
+import * as Prelude from "@kaiko.io/rescript-prelude/lib/es6/src/Prelude.js";
+
+var fields = {
+  TAG: "Object",
+  _0: [
+    [
+      "note",
+      "String"
+    ],
+    [
+      "date",
+      "Date"
+    ],
+    [
+      "extra",
+      {
+        TAG: "Optional",
+        _0: "String"
+      }
+    ]
+  ]
+};
+
+var Deserializer = $$JSON.MakeDeserializer({
+      fields: fields
+    });
+
+var Appointment = {
+  Deserializer: Deserializer
+};
+
+Qunit.module("Basic deserializer", (function (param) {
+        var valid = [
+          [
+            {"note": "Bicentennial doctor's appointment", "date": "2100-01-01"},
+            {
+              note: "Bicentennial doctor's appointment",
+              date: new Date("2100-01-01"),
+              extra: undefined
+            }
+          ],
+          [
+            {
+      "note": "Bicentennial doctor's appointment",
+      "date": "2100-01-01",
+      "extra": "Don't take your stop-aging pills the night before the appointment",
+    },
+            {
+              note: "Bicentennial doctor's appointment",
+              date: new Date("2100-01-01"),
+              extra: "Don't take your stop-aging pills the night before the appointment"
+            }
+          ]
+        ];
+        Qunit.test("Correctly deserializes data", (function (qunit) {
+                qunit.expect(valid.length);
+                Curry._2(Prelude.$$Array.forEach, valid, (function (param) {
+                        var data = param[0];
+                        console.log("Running sample", data);
+                        var result = Deserializer.fromJSON(data);
+                        if (result.TAG === "Ok") {
+                          qunit.deepEqual(result._0, param[1], "result == expected");
+                          return ;
+                        }
+                        console.error(result._0);
+                      }));
+              }));
+        var invalid = [[
+            "Missing non-optional field",
+            {"extra": "Bicentennial doctor's appointment", "date": "2100-01-01"}
+          ]];
+        Qunit.test("Correctly catches invalid data", (function (qunit) {
+                qunit.expect(invalid.length);
+                Curry._2(Prelude.$$Array.forEach, invalid, (function (param) {
+                        var data = param[1];
+                        console.log("Running sample", param[0], data);
+                        var result = Deserializer.fromJSON(data);
+                        if (result.TAG === "Ok") {
+                          console.error("Invalid being accepted: ", result._0);
+                          return ;
+                        }
+                        console.log("Correctly detected:", result._0);
+                        qunit.ok(true, true);
+                      }));
+              }));
+      }));
+
+Qunit.module("Recursive deserializer", (function (param) {
+        var fields = {
+          TAG: "Object",
+          _0: [
+            [
+              "data",
+              "Any"
+            ],
+            [
+              "children",
+              {
+                TAG: "Array",
+                _0: "Self"
+              }
+            ]
+          ]
+        };
+        var DeserializerImpl = $$JSON.MakeDeserializer({
+              fields: fields
+            });
+        var checkFieldsSanity = DeserializerImpl.checkFieldsSanity;
+        var fromJSON = function (data) {
+          return Curry._2(Prelude.Result.map, DeserializerImpl.fromJSON(data), (function (prim) {
+                        return prim;
+                      }));
+        };
+        var valid = [[
+            {"data": "A", "children": [{"data": "A1", "children": []}, {"data": "B", "children": [{"data": "C", "children": []}, {"data": "D", "children": []}]}]},
+            {
+              data: "A",
+              children: [
+                {
+                  data: "A1",
+                  children: []
+                },
+                {
+                  data: "B",
+                  children: [
+                    {
+                      data: "C",
+                      children: []
+                    },
+                    {
+                      data: "D",
+                      children: []
+                    }
+                  ]
+                }
+              ]
+            }
+          ]];
+        Qunit.test("Trivial recursion detection: Ok", (function (qunit) {
+                qunit.expect(1);
+                qunit.deepEqual(checkFieldsSanity(), {
+                      TAG: "Ok",
+                      _0: undefined
+                    }, "Ok");
+              }));
+        Qunit.test("Infinite list", (function (qunit) {
+                var fields = {
+                  TAG: "Object",
+                  _0: [
+                    [
+                      "head",
+                      "String"
+                    ],
+                    [
+                      "tail",
+                      "Self"
+                    ]
+                  ]
+                };
+                var InfiniteList = $$JSON.MakeDeserializer({
+                      fields: fields
+                    });
+                qunit.expect(1);
+                qunit.deepEqual(Curry._1(Prelude.Result.isError, InfiniteList.checkFieldsSanity()), true, "Ok");
+              }));
+        Qunit.test("Finite list", (function (qunit) {
+                var fields = {
+                  TAG: "Object",
+                  _0: [
+                    [
+                      "head",
+                      "String"
+                    ],
+                    [
+                      "tail",
+                      {
+                        TAG: "Optional",
+                        _0: "Self"
+                      }
+                    ]
+                  ]
+                };
+                var List = $$JSON.MakeDeserializer({
+                      fields: fields
+                    });
+                qunit.expect(1);
+                qunit.deepEqual(List.checkFieldsSanity(), {
+                      TAG: "Ok",
+                      _0: undefined
+                    }, "Ok");
+              }));
+        Qunit.test("Correctly deserializes recursive data", (function (qunit) {
+                qunit.expect(valid.length);
+                Curry._2(Prelude.$$Array.forEach, valid, (function (param) {
+                        var data = param[0];
+                        console.log("Running sample", data);
+                        var result = fromJSON(data);
+                        if (result.TAG === "Ok") {
+                          qunit.deepEqual(result._0, param[1], "result == expected");
+                          return ;
+                        }
+                        console.error(result._0);
+                      }));
+              }));
+        Qunit.test("Recursion in sub-deserializer", (function (qunit) {
+                var fields = {
+                  TAG: "Object",
+                  _0: [
+                    [
+                      "head",
+                      "String"
+                    ],
+                    [
+                      "tail",
+                      {
+                        TAG: "Optional",
+                        _0: "Self"
+                      }
+                    ]
+                  ]
+                };
+                var List = $$JSON.MakeDeserializer({
+                      fields: fields
+                    });
+                var fields$1 = {
+                  TAG: "Object",
+                  _0: [
+                    [
+                      "records",
+                      {
+                        TAG: "Deserializer",
+                        _0: List
+                      }
+                    ],
+                    [
+                      "next",
+                      {
+                        TAG: "Optional",
+                        _0: "Self"
+                      }
+                    ]
+                  ]
+                };
+                var Ledger = $$JSON.MakeDeserializer({
+                      fields: fields$1
+                    });
+                var data = {"records": {"head": "A", "tail": {"head": "B"}},
+        "next": {"records": {"head": "A", "tail": {"head": "B"}}}};
+                var expected = {
+                  records: {
+                    head: "A",
+                    tail: {
+                      head: "B",
+                      tail: undefined
+                    }
+                  },
+                  next: {
+                    records: {
+                      head: "A",
+                      tail: {
+                        head: "B",
+                        tail: undefined
+                      }
+                    },
+                    next: undefined
+                  }
+                };
+                qunit.expect(1);
+                qunit.deepEqual(Ledger.fromJSON(data), {
+                      TAG: "Ok",
+                      _0: expected
+                    }, "nice ledger");
+              }));
+      }));
+
+export {
+  Appointment ,
+}
+/* Deserializer Not a pure module */