@kaiko.io/rescript-deser 4.0.0-beta.2 → 4.0.0-beta.4

package/lib/bs/.bsdeps

@@ -1,8 +1,8 @@
-11.0.0-beta.4
+11.0.0-rc.4
 /home/manu/src/kaiko/rescript-deser
 0
 bsconfig.json	0x1.92beacc6fcbbbp+30
-tests	0x1.92be24d20cc42p+30
-src/	0x1.92be2684bc9cdp+30
+tests	0x1.93fb8b23e3f01p+30
+src/	0x1.93fb8b23e3f01p+30
 ===
-/home/manu/src/kaiko/rescript-deser/node_modules/rescript/linux/rescript.exe	0x1.92e953b26353bp+30
+/home/manu/src/kaiko/rescript-deser/node_modules/rescript/linux/rescript.exe	0x1.94b388560105ep+30

package/lib/bs/.compiler.log

@@ -1,2 +1,2 @@
-#Start(1690474971872)
-#Done(1690474971872)
+#Start(1697442090837)
+#Done(1697442090837)

package/lib/bs/.ninja_log

@@ -1,31 +1,19 @@
 # ninja log v6
-0	6	1690472976980944692	tests/QUnit.ast	f5cbe90bf025978b
-0	7	1690472976980944692	tests/index.ast	af1b9dde75b669ce
-0	8	1690472976980944692	src/JSON.ast	ec417eedaf9813d7
-6	9	1690472976984278051	tests/QUnit.d	4a2631c992d93ce7
-7	9	1690472976984278051	tests/index.d	5a4db9cdecd186b3
-8	10	1690472976984278051	src/JSON.d	cd2d6773c781340f
-9	17	1690472976990944772	tests/QUnit.cmj	228de0204beccf77
-9	17	1690472976990944772	tests/QUnit.cmi	228de0204beccf77
-9	17	1690472976990944772	../es6/tests/QUnit.js	228de0204beccf77
-9	17	1690472976990944772	../js/tests/QUnit.js	228de0204beccf77
-10	30	1690472977004278213	src/JSON.cmj	cd7188cec2df38d4
-10	30	1690472977004278213	src/JSON.cmi	cd7188cec2df38d4
-10	30	1690472977004278213	../es6/src/JSON.js	cd7188cec2df38d4
-10	30	1690472977004278213	../js/src/JSON.js	cd7188cec2df38d4
-30	42	1690472977014278294	tests/index.cmj	bfa81ebb23ddb1d3
-30	42	1690472977014278294	tests/index.cmi	bfa81ebb23ddb1d3
-30	42	1690472977014278294	../es6/tests/index.js	bfa81ebb23ddb1d3
-30	42	1690472977014278294	../js/tests/index.js	bfa81ebb23ddb1d3
-0	8	1690472976984278051	tests/QUnit.cmj	2ec5fa040bfd2d9d
-0	8	1690472976984278051	tests/QUnit.cmi	2ec5fa040bfd2d9d
-0	8	1690472976984278051	../es6/tests/QUnit.js	2ec5fa040bfd2d9d
-0	8	1690472976984278051	../js/tests/QUnit.js	2ec5fa040bfd2d9d
-0	21	1690472976984278051	src/JSON.cmj	72e6767661d939a8
-0	21	1690472976984278051	src/JSON.cmi	72e6767661d939a8
-0	21	1690472976984278051	../es6/src/JSON.js	72e6767661d939a8
-0	21	1690472976984278051	../js/src/JSON.js	72e6767661d939a8
-21	34	1690472977004278213	tests/index.cmj	99dcd7620c5e344f
-21	34	1690472977004278213	tests/index.cmi	99dcd7620c5e344f
-21	34	1690472977004278213	../es6/tests/index.js	99dcd7620c5e344f
-21	34	1690472977004278213	../js/tests/index.js	99dcd7620c5e344f
+0	6	1697442041120968689	tests/QUnit.ast	67b6a0da460567c3
+0	7	1697442041120968689	tests/index.ast	5536aeeda222362c
+0	8	1697442041120968689	src/JSON.ast	b65d00b367d55de4
+6	9	1697442041124302115	tests/QUnit.d	4a2631c992d93ce7
+7	9	1697442041124302115	tests/index.d	5a4db9cdecd186b3
+8	10	1697442041124302115	src/JSON.d	cd2d6773c781340f
+9	16	1697442041130968965	tests/QUnit.cmj	11defb6b2e52acbf
+9	16	1697442041130968965	tests/QUnit.cmi	11defb6b2e52acbf
+9	16	1697442041130968965	../es6/tests/QUnit.js	11defb6b2e52acbf
+9	16	1697442041130968965	../js/tests/QUnit.js	11defb6b2e52acbf
+10	29	1697442041144302666	src/JSON.cmj	f85e720d809b7705
+10	29	1697442041144302666	src/JSON.cmi	f85e720d809b7705
+10	29	1697442041144302666	../es6/src/JSON.js	f85e720d809b7705
+10	29	1697442041144302666	../js/src/JSON.js	f85e720d809b7705
+29	41	1697442041154302941	tests/index.cmj	11fbdd4f70b0d5d2
+29	41	1697442041154302941	tests/index.cmi	11fbdd4f70b0d5d2
+29	41	1697442041154302941	../es6/tests/index.js	11fbdd4f70b0d5d2
+29	41	1697442041154302941	../js/tests/index.js	11fbdd4f70b0d5d2

package/lib/bs/build.ninja

@@ -1,7 +1,7 @@
 rescript = 1
 g_finger := /home/manu/src/kaiko/rescript-deser/node_modules/@kaiko.io/rescript-prelude/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.0.0-beta.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+27+33+56 -bs-v 11.0.0-rc.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

package/lib/es6/src/JSON.js

@@ -110,9 +110,9 @@ function toString(type_) {
       case "Array" :
           return "Array of " + toString(type_._0);
       case "Tuple" :
-          return "Tuple of (" + Curry._2(Prelude.$$Array.map, type_._0, toString).join(", ") + ")";
+          return "Tuple of (" + Prelude.$$Array.map(type_._0, toString).join(", ") + ")";
       case "Object" :
-          var desc = Curry._2(Prelude.$$Array.map, type_._0, (function (param) {
+          var desc = Prelude.$$Array.map(type_._0, (function (param) {
                     return param[0] + ": " + toString(param[1]);
                   })).join(", ");
           return "Object of {" + desc + "}";
@@ -152,9 +152,9 @@ function _taggedToString(tagged) {
       case "JSONNumber" :
           return "Number(" + String(tagged._0) + ")";
       case "JSONObject" :
-          return "Object(" + Prelude.$$default(JSON.stringify(tagged._0), "...") + ")";
+          return "Object(" + Prelude.default(JSON.stringify(tagged._0), "...") + ")";
       case "JSONArray" :
-          return "Array(" + Prelude.$$default(JSON.stringify(tagged._0), "...") + ")";
+          return "Array(" + Prelude.default(JSON.stringify(tagged._0), "...") + ")";
       
     }
   }
@@ -306,7 +306,7 @@ function fromUntagged(untagged, _shape, self) {
             } else {
               if (match.TAG === "JSONArray") {
                 var shape$1 = shape._0;
-                return Curry._2(Prelude.$$Array.map, match._0, (function(shape$1){
+                return Prelude.$$Array.map(match._0, (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, Curry._2(Prelude.$$Array.map, shape._0, (function(values){
+                return Curry._1(Prelude.Dict.fromArray, Prelude.$$Array.map(shape._0, (function(values){
                               return function (param) {
                                 var field = param[0];
                                 var value;
@@ -426,7 +426,7 @@ function fromUntagged(untagged, _shape, self) {
               exit = 1;
             } else {
               if (match.TAG === "JSONArray") {
-                return Curry._2(Prelude.$$Array.map, Prelude.$$Array.keepSome(Curry._2(Prelude.$$Array.map, Curry._2(Prelude.$$Array.map, match._0, shape._0.fromJSON), Prelude.Result.warn)), (function (prim) {
+                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;
                             }));
               }
@@ -518,8 +518,8 @@ function checkFieldsSanity(name, _fields, _optional) {
     } else {
       switch (fields.TAG) {
         case "Tuple" :
-            return Curry._2(Prelude.ManyResults.map, Prelude.ManyResults.bailU(Curry._2(Prelude.$$Array.mapWithIndex, fields._0, (function(optional){
-                              return function (index, field) {
+            return Curry._2(Prelude.ManyResults.map, Prelude.ManyResults.bailU(Prelude.$$Array.mapWithIndex(fields._0, (function(optional){
+                              return function (field, index) {
                                 return function () {
                                   return checkFieldsSanity(name + "[" + String(index) + "]", field, optional);
                                 };
@@ -528,7 +528,7 @@ function checkFieldsSanity(name, _fields, _optional) {
                           
                         }));
         case "Object" :
-            return Curry._2(Prelude.ManyResults.map, Prelude.ManyResults.bailU(Curry._2(Prelude.$$Array.map, fields._0, (function(optional){
+            return Curry._2(Prelude.ManyResults.map, Prelude.ManyResults.bailU(Prelude.$$Array.map(fields._0, (function(optional){
                               return function (param) {
                                 var field = param[1];
                                 var fieldName = param[0];
@@ -606,7 +606,7 @@ var Field = {
 
 function MakeDeserializer(S) {
   var fields = S.fields;
-  var name = "Deserializer " + "JSON" + ", " + "File \"JSON.res\", line 320, characters 39-47";
+  var name = "Deserializer " + "JSON" + ", " + "File \"JSON.res\", line 329, characters 39-47";
   var checkFieldsSanity$1 = function () {
     return checkFieldsSanity(name, fields, false);
   };
@@ -630,9 +630,35 @@ function MakeDeserializer(S) {
             _0: res
           };
   };
+  var fromAny = function (any) {
+    var match = typeof any;
+    if (match === "string") {
+      var parsed;
+      try {
+        parsed = JSON.parse(any);
+      }
+      catch (exn){
+        return {
+                TAG: "Error",
+                _0: "Could parse string as JSON"
+              };
+      }
+      return fromJSON(parsed);
+    }
+    try {
+      return fromJSON(any);
+    }
+    catch (exn$1){
+      return {
+              TAG: "Error",
+              _0: "Could not deserialize the data"
+            };
+    }
+  };
   return {
           name: name,
           fromJSON: fromJSON,
+          fromAny: fromAny,
           checkFieldsSanity: checkFieldsSanity$1
         };
 }

package/lib/es6/tests/index.js

@@ -234,7 +234,11 @@ Qunit.module("Recursive deserializer", (function (param) {
                       "records",
                       {
                         TAG: "Deserializer",
-                        _0: List
+                        _0: {
+                          name: List.name,
+                          fromJSON: List.fromJSON,
+                          checkFieldsSanity: List.checkFieldsSanity
+                        }
                       }
                     ],
                     [

package/lib/js/src/JSON.js

@@ -111,9 +111,9 @@ function toString(type_) {
       case "Array" :
           return "Array of " + toString(type_._0);
       case "Tuple" :
-          return "Tuple of (" + Curry._2(Prelude.$$Array.map, type_._0, toString).join(", ") + ")";
+          return "Tuple of (" + Prelude.$$Array.map(type_._0, toString).join(", ") + ")";
       case "Object" :
-          var desc = Curry._2(Prelude.$$Array.map, type_._0, (function (param) {
+          var desc = Prelude.$$Array.map(type_._0, (function (param) {
                     return param[0] + ": " + toString(param[1]);
                   })).join(", ");
           return "Object of {" + desc + "}";
@@ -153,9 +153,9 @@ function _taggedToString(tagged) {
       case "JSONNumber" :
           return "Number(" + String(tagged._0) + ")";
       case "JSONObject" :
-          return "Object(" + Prelude.$$default(JSON.stringify(tagged._0), "...") + ")";
+          return "Object(" + Prelude.default(JSON.stringify(tagged._0), "...") + ")";
       case "JSONArray" :
-          return "Array(" + Prelude.$$default(JSON.stringify(tagged._0), "...") + ")";
+          return "Array(" + Prelude.default(JSON.stringify(tagged._0), "...") + ")";
       
     }
   }
@@ -307,7 +307,7 @@ function fromUntagged(untagged, _shape, self) {
             } else {
               if (match.TAG === "JSONArray") {
                 var shape$1 = shape._0;
-                return Curry._2(Prelude.$$Array.map, match._0, (function(shape$1){
+                return Prelude.$$Array.map(match._0, (function(shape$1){
                           return function (item) {
                             return fromUntagged(item, shape$1, self);
                           }
@@ -345,7 +345,7 @@ function fromUntagged(untagged, _shape, self) {
             } else {
               if (match.TAG === "JSONObject") {
                 var values = match._0;
-                return Curry._1(Prelude.Dict.fromArray, Curry._2(Prelude.$$Array.map, shape._0, (function(values){
+                return Curry._1(Prelude.Dict.fromArray, Prelude.$$Array.map(shape._0, (function(values){
                               return function (param) {
                                 var field = param[0];
                                 var value;
@@ -427,7 +427,7 @@ function fromUntagged(untagged, _shape, self) {
               exit = 1;
             } else {
               if (match.TAG === "JSONArray") {
-                return Curry._2(Prelude.$$Array.map, Prelude.$$Array.keepSome(Curry._2(Prelude.$$Array.map, Curry._2(Prelude.$$Array.map, match._0, shape._0.fromJSON), Prelude.Result.warn)), (function (prim) {
+                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;
                             }));
               }
@@ -519,8 +519,8 @@ function checkFieldsSanity(name, _fields, _optional) {
     } else {
       switch (fields.TAG) {
         case "Tuple" :
-            return Curry._2(Prelude.ManyResults.map, Prelude.ManyResults.bailU(Curry._2(Prelude.$$Array.mapWithIndex, fields._0, (function(optional){
-                              return function (index, field) {
+            return Curry._2(Prelude.ManyResults.map, Prelude.ManyResults.bailU(Prelude.$$Array.mapWithIndex(fields._0, (function(optional){
+                              return function (field, index) {
                                 return function () {
                                   return checkFieldsSanity(name + "[" + String(index) + "]", field, optional);
                                 };
@@ -529,7 +529,7 @@ function checkFieldsSanity(name, _fields, _optional) {
                           
                         }));
         case "Object" :
-            return Curry._2(Prelude.ManyResults.map, Prelude.ManyResults.bailU(Curry._2(Prelude.$$Array.map, fields._0, (function(optional){
+            return Curry._2(Prelude.ManyResults.map, Prelude.ManyResults.bailU(Prelude.$$Array.map(fields._0, (function(optional){
                               return function (param) {
                                 var field = param[1];
                                 var fieldName = param[0];
@@ -607,7 +607,7 @@ var Field = {
 
 function MakeDeserializer(S) {
   var fields = S.fields;
-  var name = "Deserializer " + "JSON" + ", " + "File \"JSON.res\", line 320, characters 39-47";
+  var name = "Deserializer " + "JSON" + ", " + "File \"JSON.res\", line 329, characters 39-47";
   var checkFieldsSanity$1 = function () {
     return checkFieldsSanity(name, fields, false);
   };
@@ -631,9 +631,35 @@ function MakeDeserializer(S) {
             _0: res
           };
   };
+  var fromAny = function (any) {
+    var match = typeof any;
+    if (match === "string") {
+      var parsed;
+      try {
+        parsed = JSON.parse(any);
+      }
+      catch (exn){
+        return {
+                TAG: "Error",
+                _0: "Could parse string as JSON"
+              };
+      }
+      return fromJSON(parsed);
+    }
+    try {
+      return fromJSON(any);
+    }
+    catch (exn$1){
+      return {
+              TAG: "Error",
+              _0: "Could not deserialize the data"
+            };
+    }
+  };
   return {
           name: name,
           fromJSON: fromJSON,
+          fromAny: fromAny,
           checkFieldsSanity: checkFieldsSanity$1
         };
 }

package/lib/js/tests/index.js

@@ -235,7 +235,11 @@ Qunit.module("Recursive deserializer", (function (param) {
                       "records",
                       {
                         TAG: "Deserializer",
-                        _0: List
+                        _0: {
+                          name: List.name,
+                          fromJSON: List.fromJSON,
+                          checkFieldsSanity: List.checkFieldsSanity
+                        }
                       }
                     ],
                     [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaiko.io/rescript-deser",
-  "version": "4.0.0-beta.2",
+  "version": "4.0.0-beta.4",
   "keywords": [
     "json",
     "deserializer",
@@ -20,8 +20,8 @@
     "README.md"
   ],
   "dependencies": {
-    "@kaiko.io/rescript-prelude": "7.0.0-beta.1",
-    "rescript": "11.0.0-beta.4"
+    "@kaiko.io/rescript-prelude": "7.0.0-beta.2",
+    "rescript": "11.0.0-rc.4"
   },
   "devDependencies": {
     "esbuild": "^0.15.7",

package/src/JSON.res

@@ -23,11 +23,20 @@ module FieldValue = {
 
 exception TypeError(string)
 
-@doc("The module type of a built deserializer which is suitable to add as a subparser.")
+@doc("The module type of a deserializer which is suitable to add as a subparser.")
+module type ArgDeserializer = {
+  type t
+  let name: string
+  let fromJSON: Js.Json.t => result<t, string>
+  let checkFieldsSanity: unit => result<unit, string>
+}
+
+@doc("The module type of a built deserializer.")
 module type Deserializer = {
   type t
   let name: string
   let fromJSON: Js.Json.t => result<t, string>
+  let fromAny: 'a => result<t, string>
   let checkFieldsSanity: unit => result<unit, string>
 }
 
@@ -57,13 +66,13 @@ module Field = {
     /// expected entries.
     | Mapping(t)
 
-    | Deserializer(module(Deserializer))
+    | Deserializer(module(ArgDeserializer))
 
     /// A specialized Array of deserialized items that ignores unparsable
     /// items and returns the valid collection.  This saves the user from
     /// writing 'Array(DefaultWhenInvalid(Optional(Deserializer(module(M)))))'
     /// and then post-process the list of items with 'Array.keepSome'
-    | Collection(module(Deserializer))
+    | Collection(module(ArgDeserializer))
     | DefaultWhenInvalid(t, FieldValue.t)
 
     // FIXME: this is used to add additional restrictions like variadictInt or
@@ -112,7 +121,7 @@ module Field = {
     | Date => "Date"
     | Self => "Self (recursive)"
     | Collection(m) => {
-        module M = unpack(m: Deserializer)
+        module M = unpack(m: ArgDeserializer)
         "Collection of " ++ M.name
       }
 
@@ -129,7 +138,7 @@ module Field = {
     | Mapping(t) => `Mapping of ${t->toString}`
     | Morphism(t, _) => t->toString ++ " to apply a morphism"
     | Deserializer(m) => {
-        module M = unpack(m: Deserializer)
+        module M = unpack(m: ArgDeserializer)
         M.name
       }
 
@@ -234,7 +243,7 @@ module Field = {
     | (Morphism(shape, f), _) => untagged->fromUntagged(shape, self)->f->FieldValue.any
 
     | (Collection(m), Js.Json.JSONArray(items)) => {
-        module M = unpack(m: Deserializer)
+        module M = unpack(m: ArgDeserializer)
         items
         ->Array.map(M.fromJSON)
         ->Array.map(Result.warn)
@@ -244,7 +253,7 @@ module Field = {
       }
 
     | (Deserializer(m), _) => {
-        module M = unpack(m: Deserializer)
+        module M = unpack(m: ArgDeserializer)
         switch untagged->M.fromJSON {
         | Ok(res) => res->FieldValue.any
         | Error(msg) => raise(TypeError(msg))
@@ -277,7 +286,7 @@ module Field = {
 
     | (Collection(mod), _)
     | (Deserializer(mod), _) => {
-        module M = unpack(mod: Deserializer)
+        module M = unpack(mod: ArgDeserializer)
         switch M.checkFieldsSanity() {
         | Ok() => Ok()
         | Error(msg) => Error(`${name}/ ${msg}`)
@@ -302,7 +311,7 @@ module Field = {
 
     | (Tuple(fields), optional) =>
       fields
-      ->Array.mapWithIndex((index, field) => () =>
+      ->Array.mapWithIndex((field, index) => () =>
         checkFieldsSanity(`${name}[${index->Int.toString}]`, field, optional))
       ->ManyResults.bailU
       ->ManyResults.map(_ => ())
@@ -320,7 +329,10 @@ module MakeDeserializer = (S: Serializable): (Deserializer with type t = S.t) =>
   %%private(let (loc, _f) = __LOC_OF__(module(S: Serializable)))
   let name = `Deserializer ${__MODULE__}, ${loc}`
 
-  %%private(external _toNativeType: FieldValue.t => t = "%identity")
+  %%private(
+    external _toNativeType: FieldValue.t => t = "%identity"
+    external cast: 'a => 'b = "%identity"
+  )
 
   @doc("Checks for trivial infinite-recursion in the fields of the module.
 
@@ -340,4 +352,20 @@ module MakeDeserializer = (S: Serializable): (Deserializer with type t = S.t) =>
     | exception TypeError(e) => Error(e)
     }
   }
+
+  @doc("Try to parse anything")
+  let fromAny = any => {
+    switch Js.typeof(any) {
+    | "string" =>
+      switch any->cast->Js.Json.parseExn {
+      | parsed => fromJSON(parsed)
+      | exception _ => Error("Could parse string as JSON")
+      }
+    | _ =>
+      switch any->cast->fromJSON {
+      | result => result
+      | exception _ => Error("Could not deserialize the data")
+      }
+    }
+  }
 }