@greenlabs/ppx-spice 0.1.15 → 0.2.0-next.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.2.0-next.0
+
+### Minor Changes
+
+- Compat the untagged variant
+
 ## 0.1.15
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@greenlabs/ppx-spice",
-  "version": "0.1.15",
+  "version": "0.2.0-next.0",
   "description": "ReScript PPX which generate JSON (de)serializer",
   "license": "MIT",
   "author": "Greenlabs Dev <developer@greenlabs.co.kr>",
@@ -18,7 +18,7 @@
   "scripts": {
     "postinstall": "node ./postInstall.js"
   },
-  "dependencies": {
+  "devDependencies": {
     "@changesets/cli": "^2.26.2"
   }
 }

package/src/rescript/Spice.res

@@ -17,17 +17,17 @@ let error = (~path=?, message, value) => {
   Belt.Result.Error({path, message, value})
 }
 
-let stringToJson = s => Js.Json.string(s)
+let stringToJson = (s): Js.Json.t => Js.Json.String(s)
 let stringFromJson = j =>
-  switch Js.Json.decodeString(j) {
-  | Some(s) => Belt.Result.Ok(s)
-  | None => Belt.Result.Error({path: "", message: "Not a string", value: j})
+  switch (j: Js.Json.t) {
+  | Js.Json.String(s) => Belt.Result.Ok(s)
+  | _ => Belt.Result.Error({path: "", message: "Not a string", value: j})
   }
 
-let intToJson = i => Js.Json.number(float_of_int(i))
+let intToJson = (i): Js.Json.t => Js.Json.Number(float_of_int(i))
 let intFromJson = j =>
-  switch Js.Json.decodeNumber(j) {
-  | Some(f) =>
+  switch (j: Js.Json.t) {
+  | Js.Json.Number(f) =>
     float_of_int(Js.Math.floor(f)) == f
       ? Belt.Result.Ok(Js.Math.floor(f))
       : Belt.Result.Error({path: "", message: "Not an integer", value: j})
@@ -35,44 +35,49 @@ let intFromJson = j =>
   | _ => Belt.Result.Error({path: "", message: "Not a number", value: j})
   }
 
-let int64ToJson = i => Js.Json.number(Int64.float_of_bits(i))
+let int64ToJson = (i): Js.Json.t => Js.Json.Number(Int64.float_of_bits(i))
 
 let int64FromJson = j =>
-  switch Js.Json.decodeNumber(j) {
-  | Some(n) => Belt.Result.Ok(Int64.bits_of_float(n))
-  | None => error("Not a number", j)
+  switch (j: Js.Json.t) {
+  | Js.Json.Number(n) => Belt.Result.Ok(Int64.bits_of_float(n))
+  | _ => error("Not a number", j)
   }
 
-let int64ToJsonUnsafe = i => Js.Json.number(Int64.to_float(i))
+let int64ToJsonUnsafe = (i): Js.Json.t => Js.Json.number(Int64.to_float(i))
 
 let int64FromJsonUnsafe = j =>
-  switch Js.Json.decodeNumber(j) {
-  | Some(n) => Belt.Result.Ok(Int64.of_float(n))
-  | None => error("Not a number", j)
+  switch (j: Js.Json.t) {
+  | Js.Json.Number(n) => Belt.Result.Ok(Int64.of_float(n))
+  | _ => error("Not a number", j)
   }
 
-let floatToJson = v => Js.Json.number(v)
+let floatToJson = (v): Js.Json.t => Js.Json.Number(v)
 let floatFromJson = j =>
-  switch Js.Json.decodeNumber(j) {
-  | Some(f) => Belt.Result.Ok(f)
-  | None => Belt.Result.Error({path: "", message: "Not a number", value: j})
+  switch (j: Js.Json.t) {
+  | Js.Json.Number(f) => Belt.Result.Ok(f)
+  | _ => Belt.Result.Error({path: "", message: "Not a number", value: j})
   }
 
-let boolToJson = v => Js.Json.boolean(v)
+let boolToJson = (v): Js.Json.t =>
+  switch v {
+  | true => Js.Json.True
+  | false => Js.Json.False
+  }
 let boolFromJson = j =>
-  switch Js.Json.decodeBoolean(j) {
-  | Some(b) => Belt.Result.Ok(b)
-  | None => Belt.Result.Error({path: "", message: "Not a boolean", value: j})
+  switch (j: Js.Json.t) {
+  | Js.Json.True => Belt.Result.Ok(true)
+  | Js.Json.False => Belt.Result.Ok(false)
+  | _ => Belt.Result.Error({path: "", message: "Not a boolean", value: j})
   }
 
-let unitToJson = () => Js.Json.number(0.0)
+let unitToJson = (): Js.Json.t => Js.Json.Number(0.0)
 let unitFromJson = _ => Belt.Result.Ok()
 
-let arrayToJson = (encoder, arr) => Js.Json.array(Js.Array.map(encoder, arr))
+let arrayToJson = (encoder, arr): Js.Json.t => Js.Json.Array(Js.Array.map(encoder, arr))
 
 let arrayFromJson = (decoder, json) =>
-  switch Js.Json.decodeArray(json) {
-  | Some(arr) => Js.Array.reducei((acc, jsonI, i) =>
+  switch (json: Js.Json.t) {
+  | Js.Json.Array(arr) => Js.Array.reducei((acc, jsonI, i) =>
       switch (acc, decoder(jsonI)) {
       | (Belt.Result.Error(_), _) => acc
 
@@ -84,7 +89,7 @@ let arrayFromJson = (decoder, json) =>
       }
     , Belt.Result.Ok([]), arr)
 
-  | None => Belt.Result.Error({path: "", message: "Not an array", value: json})
+  | _ => Belt.Result.Error({path: "", message: "Not an array", value: json})
   }
 
 let listToJson = (encoder, list) => arrayToJson(encoder, Belt.List.toArray(list))
@@ -98,50 +103,49 @@ let filterOptional = arr =>
     ((k, _, v)) => (k, v),
   )
 
-let optionToJson = (encoder, opt) =>
+let optionToJson = (encoder, opt): Js.Json.t =>
   switch opt {
   | Some(x) => encoder(x)
-  | None => Js.Json.null
+  | None => Js.Json.Null
   }
 
 let optionFromJson = (decoder, json) =>
-  switch Js.Json.decodeNull(json) {
-  | Some(_) => Belt.Result.Ok(None)
-  | None => Belt.Result.map(decoder(json), v => Some(v))
+  switch (json: Js.Json.t) {
+  | Js.Json.Null => Belt.Result.Ok(None)
+  | _ => Belt.Result.map(decoder(json), v => Some(v))
   }
 
-let resultToJson = (okEncoder, errorEncoder, result) =>
-  Js.Json.array(
-    switch result {
-    | Belt.Result.Ok(v) => [Js.Json.string("Ok"), okEncoder(v)]
-    | Belt.Result.Error(e) => [Js.Json.string("Error"), errorEncoder(e)]
-    },
-  )
+let resultToJson = (okEncoder, errorEncoder, result): Js.Json.t => Js.Json.Array(
+  switch result {
+  | Belt.Result.Ok(v) => [Js.Json.String("Ok"), okEncoder(v)]
+  | Belt.Result.Error(e) => [Js.Json.String("Error"), errorEncoder(e)]
+  },
+)
 
 let resultFromJson = (okDecoder, errorDecoder, json) =>
-  switch Js.Json.decodeArray(json) {
-  | Some([variantConstructorId, payload]) =>
-    switch Js.Json.decodeString(variantConstructorId) {
-    | Some("Ok") => okDecoder(payload)->Belt.Result.map(v => Belt.Result.Ok(v))
+  switch (json: Js.Json.t) {
+  | Js.Json.Array([variantConstructorId, payload]) =>
+    switch variantConstructorId {
+    | Js.Json.String("Ok") => okDecoder(payload)->Belt.Result.map(v => Belt.Result.Ok(v))
 
-    | Some("Error") =>
+    | Js.Json.String("Error") =>
       switch errorDecoder(payload) {
       | Belt.Result.Ok(v) => Belt.Result.Ok(Belt.Result.Error(v))
       | Belt.Result.Error(e) => Belt.Result.Error(e)
       }
 
-    | Some(_) => error("Expected either \"Ok\" or \"Error\"", variantConstructorId)
-    | None => error("Not a string", variantConstructorId)
+    | Js.Json.String(_) => error("Expected either \"Ok\" or \"Error\"", variantConstructorId)
+    | _ => error("Not a string", variantConstructorId)
     }
-  | Some(_) => error("Expected exactly 2 values in array", json)
-  | None => error("Not an array", json)
+  | Js.Json.Array(_) => error("Expected exactly 2 values in array", json)
+  | _ => error("Not an array", json)
   }
 
-let dictToJson = (encoder, dict) => Js.Json.object_(Js.Dict.map(a => encoder(a), dict))
+let dictToJson = (encoder, dict): Js.Json.t => Js.Json.Object(Js.Dict.map((. a) => encoder(a), dict))
 
 let dictFromJson = (decoder, json) =>
-  switch Js.Json.decodeObject(json) {
-  | Some(dict) =>
+  switch (json: Js.Json.t) {
+  | Js.Json.Object(dict) =>
     dict
     ->Js.Dict.entries
     ->Belt.Array.reduce(Ok(Js.Dict.empty()), (acc, (key, value)) =>
@@ -155,7 +159,7 @@ let dictFromJson = (decoder, json) =>
         Ok(prev)
       }
     )
-  | None => Error({path: "", message: "Not a dict", value: json})
+  | _ => Error({path: "", message: "Not a dict", value: json})
   }
 
 module Codecs = {

package/src/rescript/Spice_Codecs.res

@@ -1,11 +1,11 @@
 let falseableEncode = (encoder, opt) =>
   switch opt {
-  | None => Js.Json.boolean(false)
+  | None => Js.Json.False
   | Some(v) => encoder(v)
   }
 let falseableDecode = (decoder, json) =>
-  switch Js.Json.decodeBoolean(json) {
-  | Some(false) => Belt.Result.Ok(None)
+  switch json {
+  | Js.Json.False => Belt.Result.Ok(None)
   | _ => Belt.Result.map(decoder(json), v => Some(v))
   }
 let falseable = (falseableEncode, falseableDecode)

package/.changeset/README.md

@@ -1,8 +0,0 @@
-# Changesets
-
-Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
-with multi-package repos, or single-package repos to help you version and publish your code. You can
-find the full documentation for it [in our repository](https://github.com/changesets/changesets)
-
-We have a quick list of common questions to get you started engaging with this project in
-[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)

package/.changeset/config.json

@@ -1,11 +0,0 @@
-{
-  "$schema": "https://unpkg.com/@changesets/config@2.3.1/schema.json",
-  "changelog": "@changesets/cli/changelog",
-  "commit": false,
-  "fixed": [],
-  "linked": [],
-  "access": "restricted",
-  "baseBranch": "main",
-  "updateInternalDependencies": "patch",
-  "ignore": []
-}