feat: update for 1.13

Author: cdaringe

gleam.toml

@@ -17,7 +17,7 @@ internal_modules = ["internal", "internal/*"]
 gleam_stdlib = "~> 0.34 or ~> 1.0"
 glance = ">= 6.0.0"
 simplifile = ">= 2.3.1 and < 3.0.0"
-fswalk = ">= 3.0.3 and < 4.0.0"
+fswalk = ">= 3.1.0 and < 4.0.0"
 shellout = "~> 1.5"
 dot_env = ">= 1.2.0 and < 2.0.0"
 justin = "~> 1.0"

manifest.toml

@@ -4,7 +4,7 @@
 packages = [
   { name = "dot_env", version = "1.2.0", build_tools = ["gleam"], requirements = ["gleam_stdlib", "simplifile"], otp_app = "dot_env", source = "hex", outer_checksum = "F2B4815F1B5AF8F20A6EADBB393E715C4C35203EBD5BE8200F766EA83A0B18DE" },
   { name = "filepath", version = "1.1.2", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "filepath", source = "hex", outer_checksum = "B06A9AF0BF10E51401D64B98E4B627F1D2E48C154967DA7AF4D0914780A6D40A" },
-  { name = "fswalk", version = "3.0.3", build_tools = ["gleam"], requirements = ["gleam_community_path", "gleam_stdlib", "gleam_yielder", "simplifile"], otp_app = "fswalk", source = "hex", outer_checksum = "2F0859F297348EAEA080925931B27CD84C0D6D18809D38AE18BE10A3D6512657" },
+  { name = "fswalk", version = "3.1.0", build_tools = ["gleam"], requirements = ["gleam_community_path", "gleam_stdlib", "gleam_yielder", "simplifile"], otp_app = "fswalk", source = "hex", outer_checksum = "579530173EE64EDDF53CE02D21171E4CC0CB4F1D34DAA829D32B6009CD8E6FD5" },
   { name = "glance", version = "6.0.0", build_tools = ["gleam"], requirements = ["gleam_stdlib", "glexer"], otp_app = "glance", source = "hex", outer_checksum = "49E0ED4793BB3F56C3E5ED00528D70CAE21D263F70A735604124B95C5F62E2DB" },
   { name = "gleam_community_path", version = "0.1.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_community_path", source = "hex", outer_checksum = "916C2829E2ED81036BBA180CFD5E8633D05E25C304FDF6E3BC8A048459B89725" },
   { name = "gleam_json", version = "3.1.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_json", source = "hex", outer_checksum = "44FDAA8847BE8FC48CA7A1C089706BD54BADCC4C45B237A992EDDF9F2CDB2836" },
@@ -20,12 +20,12 @@ packages = [
 
 [requirements]
 dot_env = { version = ">= 1.2.0 and < 2.0.0" }
-fswalk = { version = ">= 3.0.3 and < 4.0.0" }
+fswalk = { version = ">= 3.1.0 and < 4.0.0" }
 glance = { version = ">= 6.0.0" }
 gleam_json = { version = ">= 3.1.0 and < 4.0.0" }
 gleam_stdlib = { version = "~> 0.34 or ~> 1.0" }
+gleam_yielder = { version = ">= 1.1.0 and < 2.0.0" }
 gleeunit = { version = "~> 1.0" }
 justin = { version = "~> 1.0" }
 shellout = { version = "~> 1.5" }
 simplifile = { version = ">= 2.3.1 and < 3.0.0" }
-gleam_yielder = { version = ">= 1.1.0 and < 2.0.0" }

src/ast.gleam

@@ -1,20 +1,18 @@
+import evil.{expect}
 import gleam/list
 import gleam/string
 import request.{type Request}
 
-pub fn get_import_path_from_mod_name(module_str: String, req: Request) {
-  let path_res =
-    list.find_map(in: req.module.imports, with: fn(imp) {
-      let full_module_str = imp.definition.module
-      case
-        full_module_str == module_str
-        || string.ends_with(full_module_str, "/" <> module_str)
-      {
-        True -> Ok(full_module_str)
-        _ -> Error(Nil)
-      }
-    })
-  let assert Ok(path) = path_res
-    as { module_str <> ": module not found in import list" }
-  path
+pub fn get_import_path_from_mod_name(module_str: String, req: Request) -> String {
+  list.find_map(in: req.module.imports, with: fn(imp) {
+    let full_module_str = imp.definition.module
+    case
+      full_module_str == module_str
+      || string.ends_with(full_module_str, "/" <> module_str)
+    {
+      True -> Ok(full_module_str)
+      _ -> Error(Nil)
+    }
+  })
+  |> expect(module_str <> ": module not found in import list")
 }

src/evil.gleam

@@ -0,0 +1,11 @@
+import gleam/io
+
+pub fn expect(x, msg) {
+  case x {
+    Ok(v) -> v
+    Error(_) -> {
+      io.print_error(msg)
+      panic
+    }
+  }
+}

src/gserde.gleam

@@ -2,6 +2,7 @@ import dot_env/env
 import fswalk
 import glance
 import gleam/bool
+import gleam/io
 import gleam/list
 import gleam/result
 import gleam/string
@@ -68,7 +69,7 @@ pub fn process_single(src_filename: String, is_debug) {
   let assert Ok(parsed) =
     glance.module(code)
     |> result.map_error(fn(err) {
-      echo err
+      io.print_error(string.inspect(err))
       panic
     })
 
@@ -96,7 +97,6 @@ pub fn process_single(src_filename: String, is_debug) {
         )
       })
     })
-  echo custom_types
   let filecontent =
     list.map(requests, gen)
     |> list.map(fn(it) { it.1 })