upgrade everything to decode API

Author: CrowdHailer

gleam.toml

@@ -1,5 +1,5 @@
 name = "midas_sdk"
-version = "0.4.2"
+version = "0.5.0"
 target = "javascript"
 
 description = "A bag of SDK's that can be used with midas."
@@ -9,10 +9,9 @@ links = [{ title = "midas", href = "https://github.com/midas-framework/midas" }]
 
 [dependencies]
 gleam_stdlib = ">= 0.34.0 and < 2.0.0"
-gleam_http = ">= 3.7.0 and < 4.0.0"
+gleam_http = ">= 3.7.0 and < 5.0.0"
 midas = ">= 1.0.0 and < 2.0.0"
-gleam_json = ">= 1.0.0 and < 3.0.0"
-decode = ">= 0.5.0 and < 1.0.0"
+gleam_json = ">= 1.0.0 and < 4.0.0"
 snag = ">= 1.1.0 and < 2.0.0"
 
 [dev-dependencies]

manifest.toml

@@ -2,20 +2,18 @@
 # You typically do not need to edit this file
 
 packages = [
-  { name = "decode", version = "0.5.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "decode", source = "hex", outer_checksum = "05E14DC95A550BA51B8774485B04894B87A898C588B9B1C920104B110AED218B" },
-  { name = "filepath", version = "1.1.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "filepath", source = "hex", outer_checksum = "67A6D15FB39EEB69DD31F8C145BB5A421790581BD6AA14B33D64D5A55DBD6587" },
-  { name = "gleam_http", version = "3.7.2", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_http", source = "hex", outer_checksum = "8A70D2F70BB7CFEB5DF048A2183FFBA91AF6D4CF5798504841744A16999E33D2" },
-  { name = "gleam_json", version = "2.3.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_json", source = "hex", outer_checksum = "C55C5C2B318533A8072D221C5E06E5A75711C129E420DD1CE463342106012E5D" },
-  { name = "gleam_stdlib", version = "0.59.0", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "F8FEE9B35797301994B81AF75508CF87C328FE1585558B0FFD188DC2B32EAA95" },
-  { name = "gleeunit", version = "1.2.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "F7A7228925D3EE7D0813C922E062BFD6D7E9310F0BEE585D3A42F3307E3CFD13" },
-  { name = "midas", version = "1.4.1", build_tools = ["gleam"], requirements = ["filepath", "gleam_http", "gleam_json", "gleam_stdlib", "snag"], otp_app = "midas", source = "hex", outer_checksum = "5D0C9F924D527DCA35D818A2D87A1ED0923FA3CAF59976F1A2D1C970A30C9C07" },
+  { name = "filepath", version = "1.1.2", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "filepath", source = "hex", outer_checksum = "B06A9AF0BF10E51401D64B98E4B627F1D2E48C154967DA7AF4D0914780A6D40A" },
+  { name = "gleam_http", version = "4.0.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_http", source = "hex", outer_checksum = "0A62451FC85B98062E0907659D92E6A89F5F3C0FBE4AB8046C99936BF6F91DBC" },
+  { name = "gleam_json", version = "3.0.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_json", source = "hex", outer_checksum = "5BA154440B22D9800955B1AB854282FA37B97F30F409D76B0824D0A60C934188" },
+  { name = "gleam_stdlib", version = "0.60.0", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "621D600BB134BC239CB2537630899817B1A42E60A1D46C5E9F3FAE39F88C800B" },
+  { name = "gleeunit", version = "1.3.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "A7DD6C07B7DA49A6E28796058AA89E651D233B357D5607006D70619CD89DAAAB" },
+  { name = "midas", version = "1.4.2", build_tools = ["gleam"], requirements = ["filepath", "gleam_http", "gleam_json", "gleam_stdlib", "snag"], otp_app = "midas", source = "hex", outer_checksum = "64EC3840E278DA0C3A3552D93A5E7B6932C94540FEEF96F578E27ED53E1D737E" },
   { name = "snag", version = "1.1.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "snag", source = "hex", outer_checksum = "7E9F06390040EB5FAB392CE642771484136F2EC103A92AE11BA898C8167E6E17" },
 ]
 
 [requirements]
-decode = { version = ">= 0.5.0 and < 1.0.0" }
-gleam_http = { version = ">= 3.7.0 and < 4.0.0" }
-gleam_json = { version = ">= 1.0.0 and < 3.0.0" }
+gleam_http = { version = ">= 3.7.0 and < 5.0.0" }
+gleam_json = { version = ">= 1.0.0 and < 4.0.0" }
 gleam_stdlib = { version = ">= 0.34.0 and < 2.0.0" }
 gleeunit = { version = ">= 1.0.0 and < 2.0.0" }
 midas = { version = ">= 1.0.0 and < 2.0.0" }

src/midas/sdk/accu_weather/forecast.gleam

@@ -1,5 +1,4 @@
-import gleam/bit_array
-import gleam/dynamic
+import gleam/dynamic/decode
 import gleam/http/request
 import gleam/http/response
 import gleam/json
@@ -31,14 +30,15 @@ pub fn five_day_forecast_request(api_key, location) {
 }
 
 pub fn five_day_forecast_response(response: response.Response(BitArray)) {
-  use json <- try(
-    bit_array.to_string(response.body)
-    |> result.replace_error(snag.new("not utf8 encoded")),
-  )
-  let decoder =
-    dynamic.field("DailyForecasts", dynamic.list(daily_forcast_decoder))
+  let decoder = {
+    use daily_forecasts <- decode.field(
+      "DailyForecasts",
+      decode.list(daily_forcast_decoder()),
+    )
+    decode.success(daily_forecasts)
+  }
   use message <- try(
-    json.decode_bits(response.body, decoder)
+    json.parse_bits(response.body, decoder)
     |> result.map_error(fn(reason) {
       snag.new(string.inspect(reason))
       |> snag.layer("failed to decode message")
@@ -59,23 +59,41 @@ pub type DailyForecast {
   )
 }
 
-pub fn daily_forcast_decoder(raw) {
-  dynamic.decode7(
-    DailyForecast,
-    dynamic.field("Date", dynamic.string),
-    dynamic.field("Sun", dynamic.field("Rise", dynamic.string)),
-    dynamic.field("Sun", dynamic.field("Set", dynamic.string)),
-    dynamic.field(
-      "Temperature",
-      dynamic.field("Minimum", dynamic.field("Value", dynamic.float)),
-    ),
-    dynamic.field(
-      "Temperature",
-      dynamic.field("Maximum", dynamic.field("Value", dynamic.float)),
-    ),
-    dynamic.field("Day", detail_decoder),
-    dynamic.field("Night", detail_decoder),
-  )(raw)
+pub fn daily_forcast_decoder() {
+  use date <- decode.field("Date", decode.string)
+  use sunrise <- decode.field("Sun", {
+    use sunrise <- decode.field("Rise", decode.string)
+    decode.success(sunrise)
+  })
+  use sunset <- decode.field("Sun", {
+    use sunrise <- decode.field("Set", decode.string)
+    decode.success(sunrise)
+  })
+  use minimum_temperature <- decode.field("Temperature", {
+    use minimum_temperature <- decode.field("Minimum", {
+      use minimum_temperature <- decode.field("Value", decode.float)
+      decode.success(minimum_temperature)
+    })
+    decode.success(minimum_temperature)
+  })
+  use maximum_temperature <- decode.field("Temperature", {
+    use minimum_temperature <- decode.field("Maximum", {
+      use minimum_temperature <- decode.field("Value", decode.float)
+      decode.success(minimum_temperature)
+    })
+    decode.success(minimum_temperature)
+  })
+  use day <- decode.field("Day", detail_decoder())
+  use night <- decode.field("Night", detail_decoder())
+  decode.success(DailyForecast(
+    date,
+    sunrise,
+    sunset,
+    minimum_temperature,
+    maximum_temperature,
+    day,
+    night,
+  ))
 }
 
 pub type Detail {
@@ -86,17 +104,24 @@ pub type Detail {
   )
 }
 
-fn detail_decoder(raw) {
-  dynamic.decode3(
-    Detail,
-    dynamic.field("PrecipitationProbability", dynamic.int),
-    dynamic.field(
-      "Wind",
-      dynamic.field("Speed", dynamic.field("Value", dynamic.float)),
-    ),
-    dynamic.field(
-      "Wind",
-      dynamic.field("Direction", dynamic.field("English", dynamic.string)),
-    ),
-  )(raw)
+fn detail_decoder() {
+  use precipitation_probability <- decode.field(
+    "PrecipitationProbability",
+    decode.int,
+  )
+  use wind_speed <- decode.field("Wind", {
+    use wind_speed <- decode.field("Speed", {
+      use wind_speed <- decode.field("Value", decode.float)
+      decode.success(wind_speed)
+    })
+    decode.success(wind_speed)
+  })
+  use wind_direction <- decode.field("Wind", {
+    use wind_direction <- decode.field("Direction", {
+      use wind_direction <- decode.field("English", decode.string)
+      decode.success(wind_direction)
+    })
+    decode.success(wind_direction)
+  })
+  decode.success(Detail(precipitation_probability, wind_speed, wind_direction))
 }

src/midas/sdk/bluesky.gleam

@@ -1,4 +1,4 @@
-import gleam/dynamic
+import gleam/dynamic/decode
 import gleam/http
 import gleam/http/request
 import gleam/json
@@ -22,11 +22,14 @@ pub fn create_session(handle, password) {
     |> request.set_body(<<json.to_string(body):utf8>>)
     |> request.prepend_header("content-type", "application/json")
   use response <- t.do(t.fetch(request))
-  let decoder = dynamic.field("accessJwt", dynamic.string)
+  let decoder = {
+    use jwt <- decode.field("accessJwt", decode.string)
+    decode.success(jwt)
+  }
 
   use token <- t.try(case response.status {
     200 ->
-      case json.decode_bits(response.body, decoder) {
+      case json.parse_bits(response.body, decoder) {
         Ok(token) -> Ok(token)
         Error(reason) ->
           Error(snag.new("failed to decode response " <> string.inspect(reason)))
@@ -58,10 +61,13 @@ pub fn create_post(access_token, handle, text, at) {
     |> request.prepend_header("content-type", "application/json")
     |> request.prepend_header("authorization", "Bearer " <> access_token)
   use response <- t.do(t.fetch(request))
-  let decoder = dynamic.field("uri", dynamic.string)
+  let decoder = {
+    use uri <- decode.field("uri", decode.string)
+    decode.success(uri)
+  }
   use uri <- t.try(case response.status {
     200 ->
-      case json.decode_bits(response.body, decoder) {
+      case json.parse_bits(response.body, decoder) {
         Ok(uri) -> Ok(uri)
         Error(reason) ->
           Error(snag.new("failed to decode response " <> string.inspect(reason)))

src/midas/sdk/google.gleam

@@ -1,5 +1,4 @@
-import gleam/bit_array
-import gleam/dynamic
+import gleam/dynamic/decode
 import gleam/http/request
 import gleam/http/response
 import gleam/int
@@ -94,17 +93,14 @@ pub fn userinfo_request(token) {
   |> request.set_body(<<>>)
 }
 
-pub fn userinfo_response(response: response.Response(BitArray)) {
-  use json <- try(
-    bit_array.to_string(response.body)
-    |> result.replace_error(snag.new("not utf8 encoded")),
-  )
-  use message <- try(
-    json.decode_bits(response.body, dynamic.field("email", dynamic.string))
-    |> result.map_error(fn(reason) {
-      snag.new(string.inspect(reason))
-      |> snag.layer("failed to decode message")
-    }),
-  )
-  Ok(message)
+pub fn userinfo_response(response) {
+  let response.Response(body:, ..) = response
+  json.parse_bits(body, {
+    use email <- decode.field("email", decode.string)
+    decode.success(email)
+  })
+  |> result.map_error(fn(reason) {
+    snag.new(string.inspect(reason))
+    |> snag.layer("failed to decode message")
+  })
 }

src/midas/sdk/google/calendar.gleam

@@ -1,10 +1,8 @@
-import gleam/bit_array
-import gleam/dynamic
-import gleam/http
+import gleam/dynamic/decode
 import gleam/http/request
 import gleam/http/response
 import gleam/json
-import gleam/option.{type Option}
+import gleam/option.{type Option, None, Some}
 import gleam/result.{try}
 import gleam/string
 import midas/task as t
@@ -24,13 +22,13 @@ fn get(token, path) {
   |> request.set_body(<<>>)
 }
 
-fn post(token, path, mime, content) {
-  base_request(token)
-  |> request.set_method(http.Post)
-  |> request.set_path(path)
-  |> request.prepend_header("content-type", mime)
-  |> request.set_body(content)
-}
+// fn post(token, path, mime, content) {
+//   base_request(token)
+//   |> request.set_method(http.Post)
+//   |> request.set_path(path)
+//   |> request.prepend_header("content-type", mime)
+//   |> request.set_body(content)
+// }
 
 // https://developers.google.com/calendar/api/v3/reference/events/list
 pub fn list_events(token, calendar_id, time_min) {
@@ -51,13 +49,12 @@ pub fn list_events_request(token, calendar_id, time_min) {
 }
 
 pub fn list_events_response(response: response.Response(BitArray)) {
-  use json <- try(
-    bit_array.to_string(response.body)
-    |> result.replace_error(snag.new("not utf8 encoded")),
-  )
-  let decoder = dynamic.field("items", dynamic.list(event_decoder))
+  let decoder = {
+    use items <- decode.field("items", decode.list(event_decoder()))
+    decode.success(items)
+  }
   use message <- try(
-    json.decode_bits(response.body, decoder)
+    json.parse_bits(response.body, decoder)
     |> result.map_error(fn(reason) {
       snag.new(string.inspect(reason))
       |> snag.layer("failed to decode message")
@@ -75,24 +72,34 @@ pub type Event {
   )
 }
 
-pub fn event_decoder(raw) {
-  dynamic.decode4(
-    Event,
-    dynamic.field("summary", dynamic.string),
-    dynamic.optional_field("location", dynamic.string),
-    dynamic.field("start", date_or_datetime_decoder),
-    dynamic.field("end", date_or_datetime_decoder),
-  )(raw)
+pub fn event_decoder() {
+  use summary <- decode.field("summary", decode.string)
+  use location <- decode.optional_field(
+    "location",
+    None,
+    decode.string |> decode.map(Some),
+  )
+  use start <- decode.field("start", date_or_datetime_decoder())
+  use end <- decode.field("end", date_or_datetime_decoder())
+  decode.success(Event(summary, location, start, end))
 }
 
 pub type DateOrDatetime {
   Date(String)
   Datetime(String)
 }
 
-pub fn date_or_datetime_decoder(raw) {
-  dynamic.any([
-    dynamic.decode1(Date, dynamic.field("date", dynamic.string)),
-    dynamic.decode1(Datetime, dynamic.field("dateTime", dynamic.string)),
-  ])(raw)
+pub fn date_or_datetime_decoder() {
+  decode.one_of(
+    {
+      use date <- decode.field("date", decode.string)
+      decode.success(Date(date))
+    },
+    [
+      {
+        use datetime <- decode.field("dateTime", decode.string)
+        decode.success(Datetime(datetime))
+      },
+    ],
+  )
 }