@kaiko.io/rescript-deser 5.0.0 → 6.0.0-alpha.1

package/README.md

@@ -1,7 +1,13 @@
-# bs-deser
+# Deser
 
 Simple JSON deserializer for ReScript.
 
+**Note**: In Rescript 12, this will be kind of useless.  So this will be
+likely be the last version series of Deser.
+
+You may want to watch the tests live here: https://kaiko-systems.gitlab.io/rescript-deser/
+
+
 ## Description
 
 This module allows you to create deserialize structures from JSON into an
@@ -12,7 +18,7 @@ type-correct.
 
 ## Usage
 
-You need to create a description of your data using ``JSON.Field.t``.
+You need to create a description of your data using ``Deser.Field.t``.
 
 ```rescript
 module MyData = {
@@ -25,9 +31,9 @@ module MyData = {
     }
 }
 
-module MyDataDeserializer = JSON.MakeDeserializer({
+module MyDataDeserializer = Deser.MakeDeserializer({
     type t = MyData.t
-    open JSON.Field
+    open Deser.Field
 
     let fields = Object([
         ("id", String),
@@ -74,43 +80,43 @@ module type Serializable = {
 - `Date`, parses either a string representation of a date (datetime) or a
   floating point representation of date (datetime) into `Js.Date.t`; we make
   sure the result is valid and won't return NaN afterwards.
-  
+
   This basically calls, `Js.Date.fromString` or `Js.Date.fromFloat`; and tests
   the resulting value.
-  
+
   `Datetime` is an alias for `Date`.
-  
+
 - `Optional(Field.t)`, allow the field to be missing from the JSON data in
   which case, return `None`; if the field is present and valid return
   `Some(value)`.
-  
+
 - `OptionalWithDefault(Field.t, FieldValue.t)`; same as optional but return a
   default value instead.  Notice, this is unsafe if the actual type of the
   default value does not match the expected type.
-  
+
 - `Tuple(array<Field.t>)`, parses a JSON list with an exact number of items of
   varying types.
 
 - `Object(array<(string, Field.t)>)`, parses a JSON object that should have
   exactly the fields described; missing items are not allowed unless they are
   `Optional`, `OptionalWithDefault`.
-  
+
 - `Mapping(Field.t)`, parses a JSON object with unknown keys (of type string)
   and a given type of value.  Valid values have the internal type
   `Prelude.Dict.t`.
-  
+
 - `Deserializer(module(Deserializer))`, parses an JSON object with the function
   `fromJSON` of another deserializer.  This allows the composition of
   deserializers.
-  
+
 - `Collection(module(Deserializer))`, parses a list of items with the function
-  `fromJSON` of another deserializer.  Invalid items are ignored.  
-  
+  `fromJSON` of another deserializer.  Invalid items are ignored.
+
   This is basically a shortcut to
   `Array(DefaultWhenInvalid(Optional(Deserializer(module(M))),
   FieldValue.null))`, with the additional post-processing to remove `None`
   values.
-  
+
 - `DefaultWhenInvalid(Field.t, FieldValue.t)`, if the JSON contains an invalid
   value, use a default instead.
 
@@ -151,4 +157,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-

package/lib/bs/.bsdeps

@@ -2,8 +2,8 @@
 /home/manu/src/kaiko/rescript-deser
 0
 0
-rescript.json	0x1.9683f1e3d1a58p+30
-tests	0x1.93fb8b23e3f01p+30
-src/	0x1.9683f1e026f57p+30
+rescript.json	0x1.9d272e38c4598p+30
+tests	0x1.9d272e38c7c35p+30
+src/	0x1.9d272e38c4598p+30
 ===
 /home/manu/src/kaiko/rescript-deser/node_modules/rescript/linux/rescript.exe	0x1.9bfaa0e1df3b2p+30

package/lib/bs/.compiler.log

@@ -1,2 +1,2 @@
-#Start(1730814547247)
-#Done(1730814547247)
+#Start(1732894204752)
+#Done(1732894204752)

package/lib/bs/.ninja_log

@@ -1,19 +1,31 @@
 # ninja log v6
-0	5	1730814327787200781	tests/QUnit.ast	57ee93358e339a9a
-0	5	1730814327787200781	tests/index.ast	dc1dfb2fd51740e6
-5	7	1730814327790534214	tests/QUnit.d	4a2631c992d93ce7
-5	7	1730814327790534214	tests/index.d	5a4db9cdecd186b3
-0	7	1730814327790534214	src/JSON.ast	649b5b6311a6b7e3
-7	9	1730814327790534214	src/JSON.d	cd2d6773c781340f
-7	14	1730814327797201080	tests/QUnit.cmj	e668f43fbb8ee318
-7	14	1730814327797201080	tests/QUnit.cmi	e668f43fbb8ee318
-7	14	1730814327797201080	../es6/tests/QUnit.js	e668f43fbb8ee318
-7	14	1730814327797201080	../js/tests/QUnit.js	e668f43fbb8ee318
-9	27	1730814327810534813	src/JSON.cmj	5528d45e9269dbc7
-9	27	1730814327810534813	src/JSON.cmi	5528d45e9269dbc7
-9	27	1730814327810534813	../es6/src/JSON.js	5528d45e9269dbc7
-9	27	1730814327810534813	../js/src/JSON.js	5528d45e9269dbc7
-27	40	1730814327823868546	tests/index.cmj	2318094a30b68775
-27	40	1730814327823868546	tests/index.cmi	2318094a30b68775
-27	40	1730814327823868546	../es6/tests/index.js	2318094a30b68775
-27	40	1730814327823868546	../js/tests/index.js	2318094a30b68775
+1	9	1732888969609093921	tests/index.ast	901a254e17150891
+0	9	1732888969605760485	tests/QUnit.ast	24679400da87e6b0
+0	11	1732888969609093921	src/Deser.ast	60777bbe51986b3b
+9	11	1732888969609093921	tests/QUnit.d	f74946ee3200f9fa
+9	12	1732888969609093921	tests/index.d	44655d60e4c70d26
+11	13	1732888969612427357	src/Deser.d	691c816990b589e8
+11	18	1732888969615760793	tests/QUnit.cmj	dfd5051a1aed6ad1
+11	18	1732888969615760793	tests/QUnit.cmi	dfd5051a1aed6ad1
+11	18	1732888969615760793	../es6/tests/QUnit.js	dfd5051a1aed6ad1
+11	18	1732888969615760793	../js/tests/QUnit.js	dfd5051a1aed6ad1
+14	36	1732888969635761410	src/Deser.cmj	59c93988df369be8
+14	36	1732888969635761410	src/Deser.cmi	59c93988df369be8
+14	36	1732888969635761410	../es6/src/Deser.js	59c93988df369be8
+14	36	1732888969635761410	../js/src/Deser.js	59c93988df369be8
+36	48	1732888969645761719	tests/index.cmj	1492142736e6fe59
+36	48	1732888969645761719	tests/index.cmi	1492142736e6fe59
+36	48	1732888969645761719	../es6/tests/index.js	1492142736e6fe59
+36	48	1732888969645761719	../js/tests/index.js	1492142736e6fe59
+1	7	1732889720608155890	tests/index.ast	901a254e17150891
+7	9	1732889720608155890	tests/index.d	44655d60e4c70d26
+1	9	1732889720611489309	src/Deser.ast	60777bbe51986b3b
+9	10	1732889720611489309	src/Deser.d	691c816990b589e8
+10	29	1732889720611489309	src/Deser.cmj	59c93988df369be8
+10	29	1732889720611489309	src/Deser.cmi	59c93988df369be8
+10	29	1732889720611489309	../es6/src/Deser.js	59c93988df369be8
+10	29	1732889720611489309	../js/src/Deser.js	59c93988df369be8
+29	43	1732889720608155890	tests/index.cmj	1492142736e6fe59
+29	43	1732889720608155890	tests/index.cmi	1492142736e6fe59
+29	43	1732889720608155890	../es6/tests/index.js	1492142736e6fe59
+29	43	1732889720608155890	../js/tests/index.js	1492142736e6fe59

package/lib/bs/.sourcedirs.json

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

package/lib/bs/build.ninja

@@ -1,27 +1,27 @@
 rescript = 1
-g_finger := /home/manu/src/kaiko/rescript-deser/node_modules/@kaiko.io/rescript-prelude/lib/ocaml/install.stamp
+g_finger := /home/manu/src/kaiko/rescript-deser/node_modules/@rescript/core/lib/ocaml/install.stamp
 rule astj
-  command = /home/manu/src/kaiko/rescript-deser/node_modules/rescript/linux/bsc.exe  -warn-error +8+11+26+27+33+56 -bs-v 11.1.4 -uncurried  -absname -bs-ast -o $out $i
+  command = /home/manu/src/kaiko/rescript-deser/node_modules/rescript/linux/bsc.exe  -warn-error +8+11+26+33+56 -bs-v 11.1.4 -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
+  command = /home/manu/src/kaiko/rescript-deser/node_modules/rescript/linux/bsb_helper.exe -g -hash 9a7a4be86983dcab705bb67a1ec483c7 $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 esmodule:lib/es6/$in_d:.js -bs-v $g_finger $i
+  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/@rescript/core/lib/ocaml    -warn-error +8+11+26+33+56 -uncurried -bs-package-name @kaiko.io/rescript-deser -bs-package-output commonjs:lib/js/$in_d:.js -bs-package-output esmodule: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
+o src/Deser.ast : astj ../../src/Deser.res
 rule deps
-  command = /home/manu/src/kaiko/rescript-deser/node_modules/rescript/linux/bsb_helper.exe -hash 84aecc33f8594375b23a1a137b057f93 $in
+  command = /home/manu/src/kaiko/rescript-deser/node_modules/rescript/linux/bsb_helper.exe -hash 9a7a4be86983dcab705bb67a1ec483c7 $in
   restat = 1
-o src/JSON.d : deps src/JSON.ast
+o src/Deser.d : deps src/Deser.ast
 rule mij
-  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 esmodule: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/@rescript/core/lib/ocaml   -warn-error +8+11+26+33+56 -uncurried -bs-package-name @kaiko.io/rescript-deser -bs-package-output commonjs:lib/js/$in_d:.js -bs-package-output esmodule: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 ../js/src/JSON.js : mij src/JSON.ast
+o src/Deser.cmj src/Deser.cmi ../es6/src/Deser.js ../js/src/Deser.js : mij src/Deser.ast

package/lib/bs/install.ninja

@@ -3,8 +3,8 @@ rule cp
   command = cp $i $out
 rule touch
  command = touch $out
-o JSON.cmi : cp ../bs/src/JSON.cmi
-o JSON.cmj : cp ../bs/src/JSON.cmj
-o JSON.cmt : cp ../bs/src/JSON.cmt
-o JSON.res : cp ../../src/JSON.res
-build install.stamp : touch JSON.cmi JSON.cmj 
+o Deser.cmi : cp ../bs/src/Deser.cmi
+o Deser.cmj : cp ../bs/src/Deser.cmj
+o Deser.cmt : cp ../bs/src/Deser.cmt
+o Deser.res : cp ../../src/Deser.res
+build install.stamp : touch Deser.cmi Deser.cmj 

package/lib/bs/tests/index.d

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

package/lib/es6/src/{JSON.js → Deser.js}

@@ -1,15 +1,18 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as Curry from "rescript/lib/es6/curry.js";
 import * as Js_json from "rescript/lib/es6/js_json.js";
-import * as Prelude from "@kaiko.io/rescript-prelude/lib/es6/src/Prelude.js";
+import * as Belt_Array from "rescript/lib/es6/belt_Array.js";
+import * as Core__Dict from "@rescript/core/lib/es6/src/Core__Dict.js";
 import * as Caml_option from "rescript/lib/es6/caml_option.js";
+import * as Core__Array from "@rescript/core/lib/es6/src/Core__Array.js";
+import * as Core__Option from "@rescript/core/lib/es6/src/Core__Option.js";
+import * as Core__Result from "@rescript/core/lib/es6/src/Core__Result.js";
 import * as Caml_exceptions from "rescript/lib/es6/caml_exceptions.js";
 import * as Caml_js_exceptions from "rescript/lib/es6/caml_js_exceptions.js";
 
 var FieldValue = {};
 
-var $$TypeError = /* @__PURE__ */Caml_exceptions.create("JSON.TypeError");
+var $$TypeError = /* @__PURE__ */Caml_exceptions.create("Deser.TypeError");
 
 function usingString(f) {
   return function (value) {
@@ -58,7 +61,7 @@ function variadicInt(hint, fromJs) {
               }
               throw {
                     RE_EXN_ID: $$TypeError,
-                    _1: "This Int(" + String(value) + ") not a valid value here. Hint: " + hint,
+                    _1: "This Int(" + value.toString() + ") not a valid value here. Hint: " + hint,
                     Error: new Error()
                   };
             })
@@ -150,18 +153,18 @@ function _taggedToString(tagged) {
       case "JSONString" :
           return "String(\"" + tagged._0 + "\")";
       case "JSONNumber" :
-          return "Number(" + String(tagged._0) + ")";
+          return "Number(" + tagged._0.toString() + ")";
       case "JSONObject" :
-          return "Object(" + Prelude.default(JSON.stringify(tagged._0), "...") + ")";
+          return "Object(" + Core__Option.getOr(JSON.stringify(tagged._0), "...") + ")";
       case "JSONArray" :
-          return "Array(" + Prelude.default(JSON.stringify(tagged._0), "...") + ")";
+          return "Array(" + Core__Option.getOr(JSON.stringify(tagged._0), "...") + ")";
       
     }
   }
 }
 
 function extractValue(values, field, shape, self) {
-  var value = Curry._2(Prelude.Dict.get, values, field);
+  var value = values[field];
   if (value !== undefined) {
     return fromUntagged(value, shape, self);
   }
@@ -325,13 +328,13 @@ function fromUntagged(untagged, _shape, self) {
                 var lenbases = bases.length;
                 var lenitems = items.length;
                 if (lenbases === lenitems) {
-                  return Curry._3(Prelude.$$Array.zipBy, items, bases, (function (i, b) {
+                  return Belt_Array.zipBy(items, bases, (function (i, b) {
                                 return fromUntagged(i, b, self);
                               }));
                 }
                 throw {
                       RE_EXN_ID: $$TypeError,
-                      _1: "Expecting " + String(lenbases) + " items, got " + String(lenitems),
+                      _1: "Expecting " + lenbases.toString() + " items, got " + lenitems.toString(),
                       Error: new Error()
                     };
               }
@@ -344,7 +347,7 @@ function fromUntagged(untagged, _shape, self) {
             } else {
               if (match.TAG === "JSONObject") {
                 var values = match._0;
-                return Curry._1(Prelude.Dict.fromArray, shape._0.map((function(values){
+                return Object.fromEntries(shape._0.map((function(values){
                               return function (param) {
                                 var field = param[0];
                                 var value;
@@ -402,7 +405,7 @@ function fromUntagged(untagged, _shape, self) {
             } else {
               if (match.TAG === "JSONObject") {
                 var f$1 = shape._0;
-                return Prelude.Dict.mapValues(match._0, (function(f$1){
+                return Core__Dict.mapValues(match._0, (function(f$1){
                           return function (v) {
                             return fromUntagged(v, f$1, self);
                           }
@@ -426,7 +429,9 @@ function fromUntagged(untagged, _shape, self) {
               exit = 1;
             } else {
               if (match.TAG === "JSONArray") {
-                return Prelude.$$Array.keepSome(match._0.map(shape._0.fromJSON).map(Prelude.Result.warn)).map(function (prim) {
+                return match._0.map(shape._0.fromJSON).filter(function (x) {
+                              return Core__Result.isOk(x);
+                            }).map(function (prim) {
                             return prim;
                           });
               }
@@ -510,17 +515,26 @@ function checkFieldsSanity(name, _fields, _optional) {
     } else {
       switch (fields.TAG) {
         case "Tuple" :
-            return Curry._2(Prelude.ManyResults.map, Prelude.ManyResults.bailU(fields._0.map((function(optional){
+            return Core__Result.map(Core__Array.reduce(fields._0.map((function(optional){
                               return function (field, index) {
                                 return function () {
-                                  return checkFieldsSanity(name + "[" + String(index) + "]", field, optional);
+                                  return checkFieldsSanity(name + "[" + index.toString() + "]", field, optional);
                                 };
                               }
-                              }(optional)))), (function (param) {
+                              }(optional))), {
+                            TAG: "Ok",
+                            _0: []
+                          }, (function (res, nextitem) {
+                              return Core__Result.flatMap(res, (function (arr) {
+                                            return Core__Result.map(nextitem(), (function (i) {
+                                                          return arr.concat([i]);
+                                                        }));
+                                          }));
+                            })), (function (param) {
                           
                         }));
         case "Object" :
-            return Curry._2(Prelude.ManyResults.map, Prelude.ManyResults.bailU(fields._0.map((function(optional){
+            return Core__Result.map(Core__Array.reduce(fields._0.map((function(optional){
                               return function (param) {
                                 var field = param[1];
                                 var fieldName = param[0];
@@ -528,7 +542,16 @@ function checkFieldsSanity(name, _fields, _optional) {
                                   return checkFieldsSanity(name + "::" + fieldName, field, optional);
                                 };
                               }
-                              }(optional)))), (function (param) {
+                              }(optional))), {
+                            TAG: "Ok",
+                            _0: []
+                          }, (function (res, nextitem) {
+                              return Core__Result.flatMap(res, (function (arr) {
+                                            return Core__Result.map(nextitem(), (function (i) {
+                                                          return arr.concat([i]);
+                                                        }));
+                                          }));
+                            })), (function (param) {
                           
                         }));
         case "Array" :
@@ -593,7 +616,7 @@ var Field = {
 
 function MakeDeserializer(S) {
   var fields = S.fields;
-  var name = "Deserializer " + "JSON" + ", " + "File \"JSON.res\", line 319, characters 39-47";
+  var name = "Deserializer " + "Deser" + ", " + "File \"Deser.res\", line 322, characters 39-47";
   var checkFieldsSanity$1 = function () {
     return checkFieldsSanity(name, fields, false);
   };

package/lib/es6/tests/index.js

@@ -1,9 +1,8 @@
 // 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 Deser from "../src/Deser.js";
 import * as Qunit from "qunit";
-import * as Prelude from "@kaiko.io/rescript-prelude/lib/es6/src/Prelude.js";
+import * as Core__Result from "@rescript/core/lib/es6/src/Core__Result.js";
 
 var fields = {
   TAG: "Object",
@@ -26,7 +25,7 @@ var fields = {
   ]
 };
 
-var Deserializer = $$JSON.MakeDeserializer({
+var Deserializer = Deser.MakeDeserializer({
       fields: fields
     });
 
@@ -59,16 +58,16 @@ Qunit.module("Basic deserializer", (function (param) {
         ];
         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);
-                      }));
+                valid.forEach(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",
@@ -76,17 +75,17 @@ Qunit.module("Basic deserializer", (function (param) {
           ]];
         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);
-                      }));
+                invalid.forEach(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);
+                    });
               }));
       }));
 
@@ -107,13 +106,13 @@ Qunit.module("Recursive deserializer", (function (param) {
             ]
           ]
         };
-        var DeserializerImpl = $$JSON.MakeDeserializer({
+        var DeserializerImpl = Deser.MakeDeserializer({
               fields: fields
             });
         var checkFieldsSanity = DeserializerImpl.checkFieldsSanity;
         var fromJSON = function (data) {
-          return Curry._2(Prelude.Result.map, DeserializerImpl.fromJSON(data), (function (prim) {
-                        return prim;
+          return Core__Result.map(DeserializerImpl.fromJSON(data), (function (x) {
+                        return x;
                       }));
         };
         var valid = [[
@@ -162,11 +161,11 @@ Qunit.module("Recursive deserializer", (function (param) {
                     ]
                   ]
                 };
-                var InfiniteList = $$JSON.MakeDeserializer({
+                var InfiniteList = Deser.MakeDeserializer({
                       fields: fields
                     });
                 qunit.expect(1);
-                qunit.deepEqual(Curry._1(Prelude.Result.isError, InfiniteList.checkFieldsSanity()), true, "Ok");
+                qunit.deepEqual(Core__Result.isError(InfiniteList.checkFieldsSanity()), true, "Ok");
               }));
         Qunit.test("Finite list", (function (qunit) {
                 var fields = {
@@ -185,7 +184,7 @@ Qunit.module("Recursive deserializer", (function (param) {
                     ]
                   ]
                 };
-                var List = $$JSON.MakeDeserializer({
+                var List = Deser.MakeDeserializer({
                       fields: fields
                     });
                 qunit.expect(1);
@@ -196,16 +195,16 @@ Qunit.module("Recursive deserializer", (function (param) {
               }));
         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);
-                      }));
+                valid.forEach(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 = {
@@ -224,7 +223,7 @@ Qunit.module("Recursive deserializer", (function (param) {
                     ]
                   ]
                 };
-                var List = $$JSON.MakeDeserializer({
+                var List = Deser.MakeDeserializer({
                       fields: fields
                     });
                 var fields$1 = {
@@ -246,7 +245,7 @@ Qunit.module("Recursive deserializer", (function (param) {
                     ]
                   ]
                 };
-                var Ledger = $$JSON.MakeDeserializer({
+                var Ledger = Deser.MakeDeserializer({
                       fields: fields$1
                     });
                 var data = {"records": {"head": "A", "tail": {"head": "B"}},

package/lib/js/src/{JSON.js → Deser.js}

@@ -1,16 +1,19 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 'use strict';
 
-var Curry = require("rescript/lib/js/curry.js");
 var Js_json = require("rescript/lib/js/js_json.js");
-var Prelude = require("@kaiko.io/rescript-prelude/lib/js/src/Prelude.js");
+var Belt_Array = require("rescript/lib/js/belt_Array.js");
+var Core__Dict = require("@rescript/core/lib/js/src/Core__Dict.js");
 var Caml_option = require("rescript/lib/js/caml_option.js");
+var Core__Array = require("@rescript/core/lib/js/src/Core__Array.js");
+var Core__Option = require("@rescript/core/lib/js/src/Core__Option.js");
+var Core__Result = require("@rescript/core/lib/js/src/Core__Result.js");
 var Caml_exceptions = require("rescript/lib/js/caml_exceptions.js");
 var Caml_js_exceptions = require("rescript/lib/js/caml_js_exceptions.js");
 
 var FieldValue = {};
 
-var $$TypeError = /* @__PURE__ */Caml_exceptions.create("JSON.TypeError");
+var $$TypeError = /* @__PURE__ */Caml_exceptions.create("Deser.TypeError");
 
 function usingString(f) {
   return function (value) {
@@ -59,7 +62,7 @@ function variadicInt(hint, fromJs) {
               }
               throw {
                     RE_EXN_ID: $$TypeError,
-                    _1: "This Int(" + String(value) + ") not a valid value here. Hint: " + hint,
+                    _1: "This Int(" + value.toString() + ") not a valid value here. Hint: " + hint,
                     Error: new Error()
                   };
             })
@@ -151,18 +154,18 @@ function _taggedToString(tagged) {
       case "JSONString" :
           return "String(\"" + tagged._0 + "\")";
       case "JSONNumber" :
-          return "Number(" + String(tagged._0) + ")";
+          return "Number(" + tagged._0.toString() + ")";
       case "JSONObject" :
-          return "Object(" + Prelude.default(JSON.stringify(tagged._0), "...") + ")";
+          return "Object(" + Core__Option.getOr(JSON.stringify(tagged._0), "...") + ")";
       case "JSONArray" :
-          return "Array(" + Prelude.default(JSON.stringify(tagged._0), "...") + ")";
+          return "Array(" + Core__Option.getOr(JSON.stringify(tagged._0), "...") + ")";
       
     }
   }
 }
 
 function extractValue(values, field, shape, self) {
-  var value = Curry._2(Prelude.Dict.get, values, field);
+  var value = values[field];
   if (value !== undefined) {
     return fromUntagged(value, shape, self);
   }
@@ -326,13 +329,13 @@ function fromUntagged(untagged, _shape, self) {
                 var lenbases = bases.length;
                 var lenitems = items.length;
                 if (lenbases === lenitems) {
-                  return Curry._3(Prelude.$$Array.zipBy, items, bases, (function (i, b) {
+                  return Belt_Array.zipBy(items, bases, (function (i, b) {
                                 return fromUntagged(i, b, self);
                               }));
                 }
                 throw {
                       RE_EXN_ID: $$TypeError,
-                      _1: "Expecting " + String(lenbases) + " items, got " + String(lenitems),
+                      _1: "Expecting " + lenbases.toString() + " items, got " + lenitems.toString(),
                       Error: new Error()
                     };
               }
@@ -345,7 +348,7 @@ function fromUntagged(untagged, _shape, self) {
             } else {
               if (match.TAG === "JSONObject") {
                 var values = match._0;
-                return Curry._1(Prelude.Dict.fromArray, shape._0.map((function(values){
+                return Object.fromEntries(shape._0.map((function(values){
                               return function (param) {
                                 var field = param[0];
                                 var value;
@@ -403,7 +406,7 @@ function fromUntagged(untagged, _shape, self) {
             } else {
               if (match.TAG === "JSONObject") {
                 var f$1 = shape._0;
-                return Prelude.Dict.mapValues(match._0, (function(f$1){
+                return Core__Dict.mapValues(match._0, (function(f$1){
                           return function (v) {
                             return fromUntagged(v, f$1, self);
                           }
@@ -427,7 +430,9 @@ function fromUntagged(untagged, _shape, self) {
               exit = 1;
             } else {
               if (match.TAG === "JSONArray") {
-                return Prelude.$$Array.keepSome(match._0.map(shape._0.fromJSON).map(Prelude.Result.warn)).map(function (prim) {
+                return match._0.map(shape._0.fromJSON).filter(function (x) {
+                              return Core__Result.isOk(x);
+                            }).map(function (prim) {
                             return prim;
                           });
               }
@@ -511,17 +516,26 @@ function checkFieldsSanity(name, _fields, _optional) {
     } else {
       switch (fields.TAG) {
         case "Tuple" :
-            return Curry._2(Prelude.ManyResults.map, Prelude.ManyResults.bailU(fields._0.map((function(optional){
+            return Core__Result.map(Core__Array.reduce(fields._0.map((function(optional){
                               return function (field, index) {
                                 return function () {
-                                  return checkFieldsSanity(name + "[" + String(index) + "]", field, optional);
+                                  return checkFieldsSanity(name + "[" + index.toString() + "]", field, optional);
                                 };
                               }
-                              }(optional)))), (function (param) {
+                              }(optional))), {
+                            TAG: "Ok",
+                            _0: []
+                          }, (function (res, nextitem) {
+                              return Core__Result.flatMap(res, (function (arr) {
+                                            return Core__Result.map(nextitem(), (function (i) {
+                                                          return arr.concat([i]);
+                                                        }));
+                                          }));
+                            })), (function (param) {
                           
                         }));
         case "Object" :
-            return Curry._2(Prelude.ManyResults.map, Prelude.ManyResults.bailU(fields._0.map((function(optional){
+            return Core__Result.map(Core__Array.reduce(fields._0.map((function(optional){
                               return function (param) {
                                 var field = param[1];
                                 var fieldName = param[0];
@@ -529,7 +543,16 @@ function checkFieldsSanity(name, _fields, _optional) {
                                   return checkFieldsSanity(name + "::" + fieldName, field, optional);
                                 };
                               }
-                              }(optional)))), (function (param) {
+                              }(optional))), {
+                            TAG: "Ok",
+                            _0: []
+                          }, (function (res, nextitem) {
+                              return Core__Result.flatMap(res, (function (arr) {
+                                            return Core__Result.map(nextitem(), (function (i) {
+                                                          return arr.concat([i]);
+                                                        }));
+                                          }));
+                            })), (function (param) {
                           
                         }));
         case "Array" :
@@ -594,7 +617,7 @@ var Field = {
 
 function MakeDeserializer(S) {
   var fields = S.fields;
-  var name = "Deserializer " + "JSON" + ", " + "File \"JSON.res\", line 319, characters 39-47";
+  var name = "Deserializer " + "Deser" + ", " + "File \"Deser.res\", line 322, characters 39-47";
   var checkFieldsSanity$1 = function () {
     return checkFieldsSanity(name, fields, false);
   };

package/lib/js/tests/index.js

@@ -1,10 +1,9 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 'use strict';
 
-var $$JSON = require("../src/JSON.js");
-var Curry = require("rescript/lib/js/curry.js");
+var Deser = require("../src/Deser.js");
 var Qunit = require("qunit");
-var Prelude = require("@kaiko.io/rescript-prelude/lib/js/src/Prelude.js");
+var Core__Result = require("@rescript/core/lib/js/src/Core__Result.js");
 
 var fields = {
   TAG: "Object",
@@ -27,7 +26,7 @@ var fields = {
   ]
 };
 
-var Deserializer = $$JSON.MakeDeserializer({
+var Deserializer = Deser.MakeDeserializer({
       fields: fields
     });
 
@@ -60,16 +59,16 @@ Qunit.module("Basic deserializer", (function (param) {
         ];
         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);
-                      }));
+                valid.forEach(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",
@@ -77,17 +76,17 @@ Qunit.module("Basic deserializer", (function (param) {
           ]];
         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);
-                      }));
+                invalid.forEach(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);
+                    });
               }));
       }));
 
@@ -108,13 +107,13 @@ Qunit.module("Recursive deserializer", (function (param) {
             ]
           ]
         };
-        var DeserializerImpl = $$JSON.MakeDeserializer({
+        var DeserializerImpl = Deser.MakeDeserializer({
               fields: fields
             });
         var checkFieldsSanity = DeserializerImpl.checkFieldsSanity;
         var fromJSON = function (data) {
-          return Curry._2(Prelude.Result.map, DeserializerImpl.fromJSON(data), (function (prim) {
-                        return prim;
+          return Core__Result.map(DeserializerImpl.fromJSON(data), (function (x) {
+                        return x;
                       }));
         };
         var valid = [[
@@ -163,11 +162,11 @@ Qunit.module("Recursive deserializer", (function (param) {
                     ]
                   ]
                 };
-                var InfiniteList = $$JSON.MakeDeserializer({
+                var InfiniteList = Deser.MakeDeserializer({
                       fields: fields
                     });
                 qunit.expect(1);
-                qunit.deepEqual(Curry._1(Prelude.Result.isError, InfiniteList.checkFieldsSanity()), true, "Ok");
+                qunit.deepEqual(Core__Result.isError(InfiniteList.checkFieldsSanity()), true, "Ok");
               }));
         Qunit.test("Finite list", (function (qunit) {
                 var fields = {
@@ -186,7 +185,7 @@ Qunit.module("Recursive deserializer", (function (param) {
                     ]
                   ]
                 };
-                var List = $$JSON.MakeDeserializer({
+                var List = Deser.MakeDeserializer({
                       fields: fields
                     });
                 qunit.expect(1);
@@ -197,16 +196,16 @@ Qunit.module("Recursive deserializer", (function (param) {
               }));
         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);
-                      }));
+                valid.forEach(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 = {
@@ -225,7 +224,7 @@ Qunit.module("Recursive deserializer", (function (param) {
                     ]
                   ]
                 };
-                var List = $$JSON.MakeDeserializer({
+                var List = Deser.MakeDeserializer({
                       fields: fields
                     });
                 var fields$1 = {
@@ -247,7 +246,7 @@ Qunit.module("Recursive deserializer", (function (param) {
                     ]
                   ]
                 };
-                var Ledger = $$JSON.MakeDeserializer({
+                var Ledger = Deser.MakeDeserializer({
                       fields: fields$1
                     });
                 var data = {"records": {"head": "A", "tail": {"head": "B"}},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaiko.io/rescript-deser",
-  "version": "5.0.0",
+  "version": "6.0.0-alpha.1",
   "keywords": [
     "json",
     "deserializer",
@@ -15,18 +15,20 @@
     "lib",
     "src",
     "tests",
-    "www",
     "rescript.json",
     "README.md"
   ],
   "peerDependencies": {
-    "@kaiko.io/rescript-prelude": ">=7.2.0",
-    "rescript": ">=11.1.0"
+    "rescript": ">=11.1.0",
+    "@rescript/core": ">=1.6"
   },
   "devDependencies": {
-    "@kaiko.io/rescript-prelude": "7.2.0",
-    "esbuild": "0.15.7",
-    "qunit": "2.16.0",
-    "rescript": "11.1.4"
+    "@jihchi/vite-plugin-rescript": "^6.0",
+    "qunit": "^2.16.0",
+    "vite": "^5.4.0",
+    "@babel/code-frame": "7.18.6",
+    "@rescript/tools": "0.6.4",
+    "rescript": "^11.1.0",
+    "@rescript/core": "^1.6.0"
   }
 }

package/rescript.json

@@ -10,20 +10,19 @@
       "type": "dev"
     }
   ],
-  "suffix": ".js",
   "bs-dependencies": [
-    "@kaiko.io/rescript-prelude"
+    "@rescript/core"
   ],
   "uncurried": true,
   "package-specs": [
     {
-      "module": "es6"
+      "module": "esmodule"
     },
     {
       "module": "commonjs"
     }
   ],
   "warnings": {
-    "error": "+8+11+26+27+33+56"
+    "error": "+8+11+26+33+56"
   }
 }

package/src/{JSON.res → Deser.res}

@@ -1,4 +1,4 @@
-open Prelude
+open RescriptCore
 
 module FieldValue = {
   type t
@@ -142,8 +142,8 @@ module Field = {
     | Js.Json.JSONNull => "Null"
     | Js.Json.JSONString(text) => `String("${text}")`
     | Js.Json.JSONNumber(number) => `Number(${number->Float.toString})`
-    | Js.Json.JSONObject(obj) => `Object(${obj->Js.Json.stringifyAny->default("...")})`
-    | Js.Json.JSONArray(array) => `Array(${array->Js.Json.stringifyAny->default("...")})`
+    | Js.Json.JSONObject(obj) => `Object(${obj->Js.Json.stringifyAny->Option.getOr("...")})`
+    | Js.Json.JSONArray(array) => `Array(${array->Js.Json.stringifyAny->Option.getOr("...")})`
     }
   }
 
@@ -182,7 +182,7 @@ module Field = {
         let lenbases = bases->Array.length
         let lenitems = items->Array.length
         if lenbases == lenitems {
-          let values = Array.zipBy(items, bases, (i, b) => fromUntagged(i, b, self))
+          let values = Belt.Array.zipBy(items, bases, (i, b) => fromUntagged(i, b, self))
           values->FieldValue.array
         } else {
           raise(
@@ -236,8 +236,7 @@ module Field = {
         module M = unpack(m: Deserializer)
         items
         ->Array.map(M.fromJSON)
-        ->Array.map(Result.warn)
-        ->Array.keepSome
+        ->Array.filter(x => x->Result.isOk)
         ->Array.map(FieldValue.any)
         ->FieldValue.array
       }
@@ -292,8 +291,10 @@ module Field = {
       fields
       ->Array.map(((fieldName, field)) => () =>
         checkFieldsSanity(`${name}::${fieldName}`, field, optional))
-      ->ManyResults.bailU
-      ->ManyResults.map(_ => ())
+      ->Array.reduce(Ok([]), (res, nextitem) =>
+        res->Result.flatMap(arr => nextitem()->Result.map(i => arr->Array.concat([i])))
+      )
+      ->Result.map(_ => ())
 
     /// Mappings and arrays can be empty, so their payloads are
     /// automatically optional.
@@ -303,8 +304,10 @@ module Field = {
       fields
       ->Array.mapWithIndex((field, index) => () =>
         checkFieldsSanity(`${name}[${index->Int.toString}]`, field, optional))
-      ->ManyResults.bailU
-      ->ManyResults.map(_ => ())
+      ->Array.reduce(Ok([]), (res, nextitem) =>
+        res->Result.flatMap(arr => nextitem()->Result.map(i => arr->Array.concat([i])))
+      )
+      ->Result.map(_ => ())
     }
 }
 

package/tests/index.res

@@ -1,8 +1,5 @@
-open JSON
 open QUnit
-open Prelude
-
-%%private(external cast: 'a => 'b = "%identity")
+open RescriptCore
 
 module Appointment = {
   type t = {
@@ -10,9 +7,9 @@ module Appointment = {
     date: Js.Date.t,
     extra: option<string>,
   }
-  module Deserializer = MakeDeserializer({
+  module Deserializer = Deser.MakeDeserializer({
     type t = t
-    open JSON.Field
+    open Deser.Field
 
     let fields = Object([("note", String), ("date", Date), ("extra", Optional(String))])
   })
@@ -86,13 +83,13 @@ module_("Recursive deserializer", _ => {
       children: array<t<'a>>,
     }
 
-    module DeserializerImpl = MakeDeserializer({
+    module DeserializerImpl = Deser.MakeDeserializer({
       type payload
       type rec t = {
         data: payload,
         children: array<t>,
       }
-      open JSON.Field
+      open Deser.Field
 
       let fields = Object([("data", Any), ("children", Array(Self))])
     })
@@ -100,7 +97,7 @@ module_("Recursive deserializer", _ => {
     module Deserializer = {
       include DeserializerImpl
 
-      let fromJSON = data => data->DeserializerImpl.fromJSON->Result.map(cast)
+      let fromJSON = data => data->DeserializerImpl.fromJSON->Result.map(x => x->Obj.magic)
     }
   }
 
@@ -123,8 +120,8 @@ module_("Recursive deserializer", _ => {
   })
 
   test("Infinite list", qunit => {
-    module InfiniteList = MakeDeserializer({
-      open JSON.Field
+    module InfiniteList = Deser.MakeDeserializer({
+      open Deser.Field
 
       type t
       let fields = Object([("head", String), ("tail", Self)])
@@ -135,8 +132,8 @@ module_("Recursive deserializer", _ => {
   })
 
   test("Finite list", qunit => {
-    module List = MakeDeserializer({
-      open JSON.Field
+    module List = Deser.MakeDeserializer({
+      open Deser.Field
 
       type t
       let fields = Object([("head", String), ("tail", Optional(Self))])
@@ -160,15 +157,15 @@ module_("Recursive deserializer", _ => {
   })
 
   test("Recursion in sub-deserializer", qunit => {
-    module List = MakeDeserializer({
-      open JSON.Field
+    module List = Deser.MakeDeserializer({
+      open Deser.Field
 
       type t
       let fields = Object([("head", String), ("tail", Optional(Self))])
     })
 
-    module Ledger = MakeDeserializer({
-      open JSON.Field
+    module Ledger = Deser.MakeDeserializer({
+      open Deser.Field
 
       type t
       let fields = Object([("records", Deserializer(module(List))), ("next", Optional(Self))])
@@ -187,6 +184,6 @@ module_("Recursive deserializer", _ => {
     }
 
     qunit->expect(1)
-    qunit->deepEqual(data->Ledger.fromJSON->cast, Ok(expected), "nice ledger")
+    qunit->deepEqual(data->Ledger.fromJSON->Obj.magic, Ok(expected), "nice ledger")
   })
 })

package/www/index.html

@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <meta charset="UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="shortcut icon" href="#" />
-  <link rel="stylesheet" href="https://code.jquery.com/qunit/qunit-2.16.0.css" type="text/css" media="screen" />
-  <title>Document</title>
-</head>
-
-<script type="module" defer src="index.js"></script>
-
-<body>
-  <div id="qunit"></div>
-  <div id="qunit-fixture"></div>
-</body>
-
-</html>