Merge pull request #2 from sisou/master

Modernize: update dependencies and `dynamic/decode` module for decoding

Author: drowrin

README.md

@@ -29,7 +29,7 @@ Further documentation can be found at <https://hexdocs.pm/fiber>.
 ## Client Example
 
 ```gleam
-import gleam/dynamic
+import gleam/dynamic/decode
 import gleam/json
 import gleeunit/should
 
@@ -45,7 +45,7 @@ fn start_client(fiber) {
 fn ping() {
   request.new(method: "ping")
   // We expect "pong" from this, so we can decode the result into a string.
-  |> request.with_decoder(dynamic.string)
+  |> request.with_decoder(decode.string)
 }
 
 fn file_updated(file_name) {

birdie_snapshots/invalid_request_error_message.accepted

@@ -1,7 +1,7 @@
 ---
-version: 1.2.3
+version: 1.2.6
 title: invalid request error message
 file: ./test/message_test.gleam
 test_name: invalid_message_test
 ---
-UnexpectedFormat([DecodeError("another type", "Dict", [])])
+UnableToDecode([DecodeError("Message", "Dict", [])])

manifest.toml

@@ -3,22 +3,24 @@
 
 packages = [
   { name = "argv", version = "1.0.2", build_tools = ["gleam"], requirements = [], otp_app = "argv", source = "hex", outer_checksum = "BA1FF0929525DEBA1CE67256E5ADF77A7CDDFE729E3E3F57A5BDCAA031DED09D" },
-  { name = "birdie", version = "1.2.3", build_tools = ["gleam"], requirements = ["argv", "edit_distance", "filepath", "glance", "gleam_community_ansi", "gleam_erlang", "gleam_stdlib", "justin", "rank", "simplifile", "trie_again"], otp_app = "birdie", source = "hex", outer_checksum = "AE1207210E9CC8F4170BCE3FB3C23932F314C352C3FD1BCEA44CF4BF8CF60F93" },
+  { name = "birdie", version = "1.2.6", build_tools = ["gleam"], requirements = ["argv", "edit_distance", "filepath", "glance", "gleam_community_ansi", "gleam_erlang", "gleam_stdlib", "justin", "rank", "simplifile", "term_size", "trie_again"], otp_app = "birdie", source = "hex", outer_checksum = "1363F4C7E7433A4A8350CC682BCDDBA5BBC6F66C94EFC63BC43025F796C4F6D0" },
   { name = "edit_distance", version = "2.0.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "edit_distance", source = "hex", outer_checksum = "A1E485C69A70210223E46E63985FA1008B8B2DDA9848B7897469171B29020C05" },
-  { name = "filepath", version = "1.0.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "filepath", source = "hex", outer_checksum = "EFB6FF65C98B2A16378ABC3EE2B14124168C0CE5201553DE652E2644DCFDB594" },
-  { name = "glance", version = "0.11.0", build_tools = ["gleam"], requirements = ["gleam_stdlib", "glexer"], otp_app = "glance", source = "hex", outer_checksum = "8F3314D27773B7C3B9FB58D8C02C634290422CE531988C0394FA0DF8676B964D" },
-  { name = "gleam_community_ansi", version = "1.4.1", build_tools = ["gleam"], requirements = ["gleam_community_colour", "gleam_stdlib"], otp_app = "gleam_community_ansi", source = "hex", outer_checksum = "4CD513FC62523053E62ED7BAC2F36136EC17D6A8942728250A9A00A15E340E4B" },
-  { name = "gleam_community_colour", version = "1.3.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_community_colour", source = "hex", outer_checksum = "A49A5E3AE8B637A5ACBA80ECB9B1AFE89FD3D5351FF6410A42B84F666D40D7D5" },
-  { name = "gleam_crypto", version = "1.3.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_crypto", source = "hex", outer_checksum = "ADD058DEDE8F0341F1ADE3AAC492A224F15700829D9A3A3F9ADF370F875C51B7" },
-  { name = "gleam_erlang", version = "0.26.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_erlang", source = "hex", outer_checksum = "3DF72F95F4716883FA51396FB0C550ED3D55195B541568CAF09745984FD37AD1" },
-  { name = "gleam_json", version = "2.0.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_json", source = "hex", outer_checksum = "CB10B0E7BF44282FB25162F1A24C1A025F6B93E777CCF238C4017E4EEF2CDE97" },
-  { name = "gleam_otp", version = "0.12.0", build_tools = ["gleam"], requirements = ["gleam_erlang", "gleam_stdlib"], otp_app = "gleam_otp", source = "hex", outer_checksum = "CD5FC777E99673BDB390092DF85E34EAA6B8EE1882147496290AB3F45A4960B1" },
-  { name = "gleam_stdlib", version = "0.40.0", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "86606B75A600BBD05E539EB59FABC6E307EEEA7B1E5865AFB6D980A93BCB2181" },
-  { name = "gleeunit", version = "1.2.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "F7A7228925D3EE7D0813C922E062BFD6D7E9310F0BEE585D3A42F3307E3CFD13" },
-  { name = "glexer", version = "1.0.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "glexer", source = "hex", outer_checksum = "BD477AD657C2B637FEF75F2405FAEFFA533F277A74EF1A5E17B55B1178C228FB" },
+  { name = "filepath", version = "1.1.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "filepath", source = "hex", outer_checksum = "67A6D15FB39EEB69DD31F8C145BB5A421790581BD6AA14B33D64D5A55DBD6587" },
+  { name = "glance", version = "2.0.1", build_tools = ["gleam"], requirements = ["gleam_stdlib", "glexer"], otp_app = "glance", source = "hex", outer_checksum = "106111453AE9BA959184302B7DADF2E8CF322B27A7CB68EE78F3EE43FEACCE2C" },
+  { name = "gleam_community_ansi", version = "1.4.2", build_tools = ["gleam"], requirements = ["gleam_community_colour", "gleam_regexp", "gleam_stdlib"], otp_app = "gleam_community_ansi", source = "hex", outer_checksum = "479DEDC748D08B310C9FEB9C4CBEC46B95C874F7F4F2844304D6D20CA78A8BB5" },
+  { name = "gleam_community_colour", version = "1.4.1", build_tools = ["gleam"], requirements = ["gleam_json", "gleam_stdlib"], otp_app = "gleam_community_colour", source = "hex", outer_checksum = "386CB9B01B33371538672EEA8A6375A0A0ADEF41F17C86DDCB81C92AD00DA610" },
+  { name = "gleam_crypto", version = "1.4.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_crypto", source = "hex", outer_checksum = "8AE56026B3E05EBB1F076778478A762E9EB62B31AEEB4285755452F397029D22" },
+  { name = "gleam_erlang", version = "0.34.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_erlang", source = "hex", outer_checksum = "0C38F2A128BAA0CEF17C3000BD2097EB80634E239CE31A86400C4416A5D0FDCC" },
+  { name = "gleam_json", version = "2.3.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_json", source = "hex", outer_checksum = "C55C5C2B318533A8072D221C5E06E5A75711C129E420DD1CE463342106012E5D" },
+  { name = "gleam_otp", version = "0.16.1", build_tools = ["gleam"], requirements = ["gleam_erlang", "gleam_stdlib"], otp_app = "gleam_otp", source = "hex", outer_checksum = "50DA1539FC8E8FA09924EB36A67A2BBB0AD6B27BCDED5A7EF627057CF69D035E" },
+  { name = "gleam_regexp", version = "1.1.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_regexp", source = "hex", outer_checksum = "7F5E0C0BBEB3C58E57C9CB05FA9002F970C85AD4A63BA1E55CBCB35C15809179" },
+  { name = "gleam_stdlib", version = "0.55.0", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "32D8F4AE03771516950047813A9E359249BD9FBA5C33463FDB7B953D6F8E896B" },
+  { name = "gleeunit", version = "1.3.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "0E6C83834BA65EDCAAF4FE4FB94AC697D9262D83E6F58A750D63C9F6C8A9D9FF" },
+  { name = "glexer", version = "2.1.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "glexer", source = "hex", outer_checksum = "F74FB4F78C3C1E158DF15A7226F33A662672F58EEF1DFE6593B7FCDA38B0A0EB" },
   { name = "justin", version = "1.0.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "justin", source = "hex", outer_checksum = "7FA0C6DB78640C6DC5FBFD59BF3456009F3F8B485BF6825E97E1EB44E9A1E2CD" },
   { name = "rank", version = "1.0.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "rank", source = "hex", outer_checksum = "5660E361F0E49CBB714CC57CC4C89C63415D8986F05B2DA0C719D5642FAD91C9" },
-  { name = "simplifile", version = "2.1.0", build_tools = ["gleam"], requirements = ["filepath", "gleam_stdlib"], otp_app = "simplifile", source = "hex", outer_checksum = "BDD04F5D31D6D34E2EDFAEF0B68A6297AEC939888C3BFCE61133DE13857F6DA2" },
+  { name = "simplifile", version = "2.2.0", build_tools = ["gleam"], requirements = ["filepath", "gleam_stdlib"], otp_app = "simplifile", source = "hex", outer_checksum = "0DFABEF7DC7A9E2FF4BB27B108034E60C81BEBFCB7AB816B9E7E18ED4503ACD8" },
+  { name = "term_size", version = "1.0.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "term_size", source = "hex", outer_checksum = "D00BD2BC8FB3EBB7E6AE076F3F1FF2AC9D5ED1805F004D0896C784D06C6645F1" },
   { name = "trie_again", version = "1.1.2", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "trie_again", source = "hex", outer_checksum = "5B19176F52B1BD98831B57FDC97BD1F88C8A403D6D8C63471407E78598E27184" },
   { name = "youid", version = "1.2.0", build_tools = ["gleam"], requirements = ["gleam_crypto", "gleam_erlang", "gleam_stdlib"], otp_app = "youid", source = "hex", outer_checksum = "EF0F693004E221155EE5909C6D3C945DD14F7117DBA882887CF5F45BE399B8CA" },
 ]

src/fiber.gleam

@@ -1,5 +1,6 @@
 import gleam/dict
 import gleam/dynamic.{type Dynamic}
+import gleam/dynamic/decode
 import gleam/erlang/process
 import gleam/list
 import gleam/option
@@ -64,7 +65,7 @@ pub fn server_only(builder: backend.FiberBuilder) -> backend.FiberBuilder {
 
 pub type RequestError(a) {
   ReturnedError(message.ErrorData(Dynamic))
-  DecodeError(dynamic.DecodeErrors)
+  DecodeError(List(decode.DecodeError))
   CallError(process.CallError(a))
 }
 
@@ -85,7 +86,7 @@ pub fn call(
     |> result.map(fn(call_result) {
       call_result
       |> result.map(fn(data) {
-        request.decoder(data)
+        decode.run(data, request.decoder)
         |> result.map_error(DecodeError)
       })
       |> result.map_error(ReturnedError)

src/fiber/backend.gleam

@@ -254,6 +254,12 @@ pub fn handle_text(
             message: "Invalid Request",
             data: option.None,
           )
+        json.UnableToDecode(_) ->
+          message.ErrorData(
+            code: -32_600,
+            message: "Invalid Request",
+            data: option.None,
+          )
         json.UnexpectedByte(byte) ->
           message.ErrorData(
             code: -32_700,

src/fiber/message.gleam

@@ -1,4 +1,5 @@
 import gleam/dynamic.{type Dynamic}
+import gleam/dynamic/decode
 import gleam/json.{type Json}
 import gleam/option.{type Option}
 import gleam/pair
@@ -35,87 +36,91 @@ pub type Message(dyn) {
   BatchResponseMessage(List(Response(dyn)))
 }
 
-fn id_decoder() {
-  dynamic.any([
-    fn(data) { dynamic.int(data) |> result.map(IntId) },
-    fn(data) { dynamic.string(data) |> result.map(StringId) },
+fn id_decoder() -> decode.Decoder(Id) {
+  decode.one_of(decode.int |> decode.map(IntId), [
+    decode.string |> decode.map(StringId),
   ])
+  |> decode.collapse_errors("Id")
 }
 
-fn error_data_decoder() {
-  dynamic.any([
-    fn(v) { dynamic.string(v) |> result.map(ErrorString) },
-    dynamic.decode3(
-      ErrorData,
-      dynamic.optional_field("data", dynamic.dynamic),
-      dynamic.field("code", dynamic.int),
-      dynamic.field("message", dynamic.string),
-    ),
-  ])
-}
-
-fn request_decoder() {
-  dynamic.any([
-    dynamic.decode3(
-      Request,
-      dynamic.optional_field("params", dynamic.dynamic),
-      dynamic.field("method", dynamic.string),
-      dynamic.field("id", id_decoder()),
-    ),
-    dynamic.decode2(
-      Notification,
-      dynamic.optional_field("params", dynamic.dynamic),
-      dynamic.field("method", dynamic.string),
-    ),
-  ])
-}
-
-fn response_decoder() {
-  dynamic.any([
-    dynamic.decode2(
-      SuccessResponse,
-      dynamic.field("result", dynamic.dynamic),
-      dynamic.field("id", id_decoder()),
-    ),
-    dynamic.decode2(
-      ErrorResponse,
-      dynamic.field("error", error_data_decoder()),
-      dynamic.field("id", id_decoder()),
-    ),
+fn error_data_decoder() -> decode.Decoder(ErrorData(Dynamic)) {
+  decode.one_of(decode.string |> decode.map(ErrorString), [
+    {
+      use data <- decode.optional_field(
+        "data",
+        option.None,
+        decode.optional(decode.dynamic),
+      )
+      use code <- decode.field("code", decode.int)
+      use message <- decode.field("message", decode.string)
+      decode.success(ErrorData(data, code, message))
+    },
   ])
+  |> decode.collapse_errors("ErrorData")
 }
 
-fn error_decoder() {
-  dynamic.field("error", error_data_decoder())
-}
-
-fn message_decoder() {
-  dynamic.any([
-    fn(d) {
-      response_decoder()(d)
-      |> result.map(ResponseMessage)
-    },
-    fn(d) {
-      request_decoder()(d)
-      |> result.map(RequestMessage)
-    },
-    fn(d) {
-      error_decoder()(d)
-      |> result.map(ErrorMessage)
-    },
-    fn(d) {
-      dynamic.list(request_decoder())(d)
-      |> result.map(BatchRequestMessage)
+fn request_decoder() -> decode.Decoder(Request(Dynamic)) {
+  decode.one_of(
+    {
+      use params <- decode.optional_field(
+        "params",
+        option.None,
+        decode.optional(decode.dynamic),
+      )
+      use method <- decode.field("method", decode.string)
+      use id <- decode.field("id", id_decoder())
+      decode.success(Request(params, method, id))
     },
-    fn(d) {
-      dynamic.list(response_decoder())(d)
-      |> result.map(BatchResponseMessage)
+    [
+      {
+        use params <- decode.optional_field(
+          "params",
+          option.None,
+          decode.optional(decode.dynamic),
+        )
+        use method <- decode.field("method", decode.string)
+        decode.success(Notification(params, method))
+      },
+    ],
+  )
+  |> decode.collapse_errors("Request")
+}
+
+fn response_decoder() -> decode.Decoder(Response(Dynamic)) {
+  decode.one_of(
+    {
+      use result <- decode.field("result", decode.dynamic)
+      use id <- decode.field("id", id_decoder())
+      decode.success(SuccessResponse(result, id))
     },
+    [
+      {
+        use error <- decode.field("error", error_data_decoder())
+        use id <- decode.field("id", id_decoder())
+        decode.success(ErrorResponse(error, id))
+      },
+    ],
+  )
+  |> decode.collapse_errors("Response")
+}
+
+fn error_decoder() -> decode.Decoder(ErrorData(Dynamic)) {
+  use error <- decode.field("error", error_data_decoder())
+  decode.success(error)
+}
+
+fn message_decoder() -> decode.Decoder(Message(Dynamic)) {
+  decode.one_of(response_decoder() |> decode.map(ResponseMessage), [
+    request_decoder() |> decode.map(RequestMessage),
+    error_decoder() |> decode.map(ErrorMessage),
+    decode.list(request_decoder()) |> decode.map(BatchRequestMessage),
+    decode.list(response_decoder()) |> decode.map(BatchResponseMessage),
   ])
+  |> decode.collapse_errors("Message")
 }
 
 pub fn decode(text: String) -> Result(Message(Dynamic), json.DecodeError) {
-  json.decode(text, message_decoder())
+  json.parse(text, message_decoder())
 }
 
 pub fn from_json(text: String) -> Result(Message(Dynamic), json.DecodeError) {

src/fiber/request.gleam

@@ -1,4 +1,5 @@
 import gleam/dynamic.{type Dynamic}
+import gleam/dynamic/decode
 import gleam/json.{type Json}
 import gleam/option.{type Option}
 import youid/uuid
@@ -9,7 +10,7 @@ pub type Request(return) {
   Request(
     method: String,
     params: Option(Json),
-    decoder: dynamic.Decoder(return),
+    decoder: decode.Decoder(return),
     id: Option(message.Id),
   )
 }
@@ -18,7 +19,7 @@ pub fn new(method method: String) -> Request(Dynamic) {
   Request(
     method:,
     params: option.None,
-    decoder: dynamic.dynamic,
+    decoder: decode.dynamic,
     id: option.None,
   )
 }
@@ -29,7 +30,7 @@ pub fn with_params(request: Request(a), params: Json) -> Request(a) {
 
 pub fn with_decoder(
   request: Request(a),
-  decoder decoder: dynamic.Decoder(b),
+  decoder decoder: decode.Decoder(b),
 ) -> Request(b) {
   Request(
     method: request.method,