feat: Refactor ctx_utils

Olian04 · Jul 10, 2024 · b325c7c · b325c7c
1 parent afef3b8
commit b325c7c
Showing 1 changed file with 34 additions and 30 deletions.
diff --git a/src/handles/internal/ctx_utils.gleam b/src/handles/internal/ctx_utils.gleam
@@ -5,25 +5,30 @@ import gleam/result
 import handles/ctx
 import handles/error
 
+type DrillError {
+  UnknownProperty
+  UnexpectedType(String)
+}
+
 fn drill_ctx(
   path: List(String),
   ctx: ctx.Value,
-) -> Result(ctx.Value, error.RuntimeError) {
+) -> Result(ctx.Value, DrillError) {
   case path {
     [] -> Ok(ctx)
     [key, ..rest] ->
       case ctx {
         ctx.Dict(arr) -> {
           case list.find(arr, fn(it) { it.key == key }) {
             Ok(ctx.Prop(_, value)) -> drill_ctx(rest, value)
-            Error(_) -> Error(error.UnknownProperty(0, []))
+            Error(_) -> Error(UnknownProperty)
           }
         }
-        ctx.List(_) -> Error(error.UnexpectedType(0, [], "List", ["Dict"]))
-        ctx.Str(_) -> Error(error.UnexpectedType(0, [], "Str", ["Dict"]))
-        ctx.Int(_) -> Error(error.UnexpectedType(0, [], "Int", ["Dict"]))
-        ctx.Float(_) -> Error(error.UnexpectedType(0, [], "Float", ["Dict"]))
-        ctx.Bool(_) -> Error(error.UnexpectedType(0, [], "Bool", ["Dict"]))
+        ctx.List(_) -> Error(UnexpectedType("List"))
+        ctx.Str(_) -> Error(UnexpectedType("Str"))
+        ctx.Int(_) -> Error(UnexpectedType("Int"))
+        ctx.Float(_) -> Error(UnexpectedType("Float"))
+        ctx.Bool(_) -> Error(UnexpectedType("Bool"))
       }
   }
 }
@@ -32,10 +37,8 @@ pub fn get(path: List(String), ctx: ctx.Value, index: Int) {
   drill_ctx(path, ctx)
   |> result.map_error(fn(err) {
     case err {
-      error.UnexpectedType(_, _, got, expected) ->
-        error.UnexpectedType(index, path, got, expected)
-      error.UnknownProperty(_, _) -> error.UnknownProperty(index, path)
-      err -> err
+      UnexpectedType(got) -> error.UnexpectedType(index, path, got, ["Dict"])
+      UnknownProperty -> error.UnknownProperty(index, path)
     }
   })
 }
@@ -52,17 +55,14 @@ pub fn get_property(
       ctx.Int(value) -> value |> int.to_string |> Ok
       ctx.Float(value) -> value |> float.to_string |> Ok
       ctx.List(_) ->
-        Error(
-          error.UnexpectedType(index, path, "List", ["Str", "Int", "Float"]),
-        )
+        error.UnexpectedType(index, path, "List", ["Str", "Int", "Float"])
+        |> Error
       ctx.Dict(_) ->
-        Error(
-          error.UnexpectedType(index, path, "Dict", ["Str", "Int", "Float"]),
-        )
+        error.UnexpectedType(index, path, "Dict", ["Str", "Int", "Float"])
+        |> Error
       ctx.Bool(_) ->
-        Error(
-          error.UnexpectedType(index, path, "Bool", ["Str", "Int", "Float"]),
-        )
+        error.UnexpectedType(index, path, "Bool", ["Str", "Int", "Float"])
+        |> Error
     }
   })
 }
@@ -76,12 +76,14 @@ pub fn get_list(
   |> result.try(fn(it) {
     case it {
       ctx.List(value) -> value |> Ok
-      ctx.Bool(_) -> Error(error.UnexpectedType(index, path, "Bool", ["List"]))
-      ctx.Str(_) -> Error(error.UnexpectedType(index, path, "Str", ["List"]))
-      ctx.Int(_) -> Error(error.UnexpectedType(index, path, "Int", ["List"]))
+      ctx.Str(_) -> error.UnexpectedType(index, path, "Str", ["List"]) |> Error
+      ctx.Int(_) -> error.UnexpectedType(index, path, "Int", ["List"]) |> Error
+      ctx.Bool(_) ->
+        error.UnexpectedType(index, path, "Bool", ["List"]) |> Error
       ctx.Float(_) ->
-        Error(error.UnexpectedType(index, path, "Float", ["List"]))
-      ctx.Dict(_) -> Error(error.UnexpectedType(index, path, "Dict", ["List"]))
+        error.UnexpectedType(index, path, "Float", ["List"]) |> Error
+      ctx.Dict(_) ->
+        error.UnexpectedType(index, path, "Dict", ["List"]) |> Error
     }
   })
 }
@@ -95,12 +97,14 @@ pub fn get_bool(
   |> result.try(fn(it) {
     case it {
       ctx.Bool(value) -> value |> Ok
-      ctx.List(_) -> Error(error.UnexpectedType(index, path, "List", ["Bool"]))
-      ctx.Str(_) -> Error(error.UnexpectedType(index, path, "Str", ["Bool"]))
-      ctx.Int(_) -> Error(error.UnexpectedType(index, path, "Int", ["Bool"]))
+      ctx.List(_) ->
+        error.UnexpectedType(index, path, "List", ["Bool"]) |> Error
+      ctx.Str(_) -> error.UnexpectedType(index, path, "Str", ["Bool"]) |> Error
+      ctx.Int(_) -> error.UnexpectedType(index, path, "Int", ["Bool"]) |> Error
       ctx.Float(_) ->
-        Error(error.UnexpectedType(index, path, "Float", ["Bool"]))
-      ctx.Dict(_) -> Error(error.UnexpectedType(index, path, "Dict", ["Bool"]))
+        error.UnexpectedType(index, path, "Float", ["Bool"]) |> Error
+      ctx.Dict(_) ->
+        error.UnexpectedType(index, path, "Dict", ["Bool"]) |> Error
     }
   })
 }