@kaiko.io/rescript-deser 4.0.0-beta.1 → 4.0.0-beta.3

package/lib/bs/.bsdeps

@@ -2,7 +2,7 @@
 /home/manu/src/kaiko/rescript-deser
 0
 bsconfig.json	0x1.92beacc6fcbbbp+30
-tests	0x1.92be24d20cc42p+30
-src/	0x1.92be2684bc9cdp+30
+tests	0x1.936c441d4e1fap+30
+src/	0x1.936c42e78597ap+30
 ===
 /home/manu/src/kaiko/rescript-deser/node_modules/rescript/linux/rescript.exe	0x1.92e953b26353bp+30

package/lib/bs/.compiler.log

@@ -1,2 +1,2 @@
-#Start(1690472987373)
-#Done(1690472987373)
+#Start(1692078836285)
+#Done(1692078836285)

package/lib/bs/.ninja_log

@@ -17,3 +17,67 @@
 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
+1	8	1692077881863146346	src/JSON.ast	ec417eedaf9813d7
+8	14	1692077881863146346	src/JSON.d	cd2d6773c781340f
+0	9	1692077894949942101	src/JSON.ast	ec417eedaf9813d7
+9	11	1692077894949942101	src/JSON.d	cd2d6773c781340f
+0	8	1692078180322757231	src/JSON.ast	ec417eedaf9813d7
+8	10	1692078180322757231	src/JSON.d	cd2d6773c781340f
+0	7	1692078195156236902	src/JSON.ast	ec417eedaf9813d7
+7	10	1692078195156236902	src/JSON.d	cd2d6773c781340f
+10	35	1692078195156236902	src/JSON.cmj	72e6767661d939a8
+10	35	1692078195156236902	src/JSON.cmi	72e6767661d939a8
+10	35	1692078195156236902	../es6/src/JSON.js	72e6767661d939a8
+10	35	1692078195156236902	../js/src/JSON.js	72e6767661d939a8
+35	50	1692078195176237099	tests/index.cmj	99dcd7620c5e344f
+35	50	1692078195176237099	tests/index.cmi	99dcd7620c5e344f
+35	50	1692078195176237099	../es6/tests/index.js	99dcd7620c5e344f
+35	50	1692078195176237099	../js/tests/index.js	99dcd7620c5e344f
+0	7	1692078280717274299	src/JSON.ast	ec417eedaf9813d7
+7	9	1692078280717274299	src/JSON.d	cd2d6773c781340f
+9	30	1692078280717274299	src/JSON.cmj	72e6767661d939a8
+9	30	1692078280717274299	src/JSON.cmi	72e6767661d939a8
+9	30	1692078280717274299	../es6/src/JSON.js	72e6767661d939a8
+9	30	1692078280717274299	../js/src/JSON.js	72e6767661d939a8
+30	42	1692078280733941130	tests/index.cmj	99dcd7620c5e344f
+30	42	1692078280733941130	tests/index.cmi	99dcd7620c5e344f
+30	42	1692078280733941130	../es6/tests/index.js	99dcd7620c5e344f
+30	42	1692078280733941130	../js/tests/index.js	99dcd7620c5e344f
+0	6	1692078378979358674	tests/index.ast	af1b9dde75b669ce
+6	7	1692078378979358674	tests/index.d	5a4db9cdecd186b3
+8	20	1692078378979358674	tests/index.cmj	99dcd7620c5e344f
+8	20	1692078378979358674	tests/index.cmi	99dcd7620c5e344f
+8	20	1692078378979358674	../es6/tests/index.js	99dcd7620c5e344f
+8	20	1692078378979358674	../js/tests/index.js	99dcd7620c5e344f
+0	8	1692078483192900791	src/JSON.ast	ec417eedaf9813d7
+8	10	1692078483192900791	src/JSON.d	cd2d6773c781340f
+0	7	1692078491420312038	src/JSON.ast	ec417eedaf9813d7
+7	10	1692078491420312038	src/JSON.d	cd2d6773c781340f
+0	7	1692078495960690503	src/JSON.ast	ec417eedaf9813d7
+7	10	1692078495960690503	src/JSON.d	cd2d6773c781340f
+0	7	1692078499500970674	src/JSON.ast	ec417eedaf9813d7
+7	9	1692078499500970674	src/JSON.d	cd2d6773c781340f
+0	8	1692078506824846034	src/JSON.ast	ec417eedaf9813d7
+8	10	1692078506824846034	src/JSON.d	cd2d6773c781340f
+0	8	1692078511601840838	src/JSON.ast	ec417eedaf9813d7
+8	10	1692078511601840838	src/JSON.d	cd2d6773c781340f
+10	30	1692078511601840838	src/JSON.cmj	72e6767661d939a8
+10	30	1692078511601840838	src/JSON.cmi	72e6767661d939a8
+10	30	1692078511601840838	../es6/src/JSON.js	72e6767661d939a8
+10	30	1692078511601840838	../js/src/JSON.js	72e6767661d939a8
+30	43	1692078511615175063	tests/index.cmj	99dcd7620c5e344f
+30	43	1692078511615175063	tests/index.cmi	99dcd7620c5e344f
+30	43	1692078511615175063	../es6/tests/index.js	99dcd7620c5e344f
+30	43	1692078511615175063	../js/tests/index.js	99dcd7620c5e344f

package/lib/es6/src/JSON.js

@@ -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

@@ -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.1",
+  "version": "4.0.0-beta.3",
   "keywords": [
     "json",
     "deserializer",
@@ -20,7 +20,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@kaiko.io/rescript-prelude": "7.0.0-alpha.3",
+    "@kaiko.io/rescript-prelude": "7.0.0-beta.1",
     "rescript": "11.0.0-beta.4"
   },
   "devDependencies": {

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}`)
@@ -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")
+      }
+    }
+  }
 }